修改編輯活動、移除bug

app/Http/Controllers/ActivityController.php

@@ -74,7 +74,7 @@ class ActivityController extends Controller
      * @param  \App\Models\Activity  $activity
      * @return \Illuminate\Http\Response
      */
-    public function show(Request $request,Activity $activity)
+    public function show(Request $request, Activity $activity)
     {
         //
         $activity = Activity::where('id', '=', $request->activity_id)->first();
@@ -122,44 +122,7 @@ class ActivityController extends Controller
         //
     }
 
-    public function claim(Request $request)
-    {
-        $prize = '';
-        $prize_id = 0;
-        $isClaimed = false;
-        $user_id = $request->user_id;
-        $activity_id = $request->activity_id;
-        $user = CheckIn::where('activity_id', '=', $activity_id)
-            ->where('user_id', '=', $user_id)->get()[0];
-
-        if (Recipients::where('user_id', '=', $user_id)->exists()) {
-            $recipients = Recipients::where('user_id', '=', $user_id)->get()[0];
-            $prize_id = $recipients->prize_id;
-            //因為重新匯入後prize_id在prize下面有改動，但是在recipients下面沒有改動，因此會有問題產生
-            //檢查prize_id是不是在activity_id底下
-            $aid = Prize::where('id', '=', $prize_id)->get()[0]->activity_id;
-
-            if ($aid == $activity_id) {
-                $isRecipients = true;
-                $isClaimed = $recipients->is_claimed;
-                $prize = Prize::where('id', '=', $prize_id)->get()[0]->name;
-            } else {
-                $isRecipients = false;
-            }
-        } else {
-            $isRecipients = false;
-        }
-
-        $response = [
-            'user' => $user,
-            'isRecipients' => $isRecipients,
-            'isClaimed' => $isClaimed,
-            'prize' => $prize,
-            'prize_id' => $prize_id,
-        ];
 
-        return response($response, 201);
-    }
 
 
     //這邊有兩種insert，要怎麼處理StoreRequest?
@@ -167,7 +130,7 @@ class ActivityController extends Controller
     {
         $option = $request->option;
         $activity_id = $request->activity_id;
-        if($activity_id == 'undefined'){
+        if ($activity_id == 'undefined') {
             $activity_id = Activity::orderBy('id', 'DESC')->first()->id;
         }
 
@@ -195,38 +158,47 @@ class ActivityController extends Controller
         $highestRow = $worksheet->getHighestDataRow();
 
         if ($option == 'prize') {
-            DB::table('prizes')->where('activity_id', '=', $activity_id)->delete();
-            date_default_timezone_set('Asia/Taipei');
-            for ($row = 2; $row <= $highestRow; $row++) {
-                DB::table('prizes')->insert([
-                    'activity_id' => $activity_id,
-                    'name' => $worksheet->getCell([1, $row])->getValue(),
-                    'count' => $worksheet->getCell([2, $row])->getValue(),
-                    'provider' => $worksheet->getCell([3, $row])->getValue(),
-                    'created_at' => now(),
-                    'updated_at' => now(),
-                ]);
+            if ($worksheet->getCell([1, 1])->getValue() == '獎品') {
+                DB::table('prizes')->where('activity_id', '=', $activity_id)->delete();
+                date_default_timezone_set('Asia/Taipei');
+                for ($row = 2; $row <= $highestRow; $row++) {
+                    DB::table('prizes')->insert([
+                        'activity_id' => $activity_id,
+                        'name' => $worksheet->getCell([1, $row])->getValue(),
+                        'count' => $worksheet->getCell([2, $row])->getValue(),
+                        'provider' => $worksheet->getCell([3, $row])->getValue(),
+                        'created_at' => now(),
+                        'updated_at' => now(),
+                    ]);
+                }
+                $isSuccess = true;
+            } else {
+                $isSuccess = false;
             }
         } else if ($option == 'guest') {
-            DB::table('check_ins')->where('region', '=', '來賓')->delete();
-            date_default_timezone_set('Asia/Taipei');
-            for ($row = 2; $row <= $highestRow; $row++) {
-                DB::table('check_ins')->insert([
-                    'user_id' => $worksheet->getCell([1, $row])->getValue(),
-                    'name' => $worksheet->getCell([2, $row])->getValue(),
-                    'department_id' => '空',
-                    'region' => '來賓',
-                    'is_checked_in' => false,
-                    'activity_id' => $activity_id,
-                    'created_at' => now(),
-                    'updated_at' => now(),
-                ]);
+            if ($worksheet->getCell([1, 1])->getValue() == '來賓編號') {
+                DB::table('check_ins')->where('activity_id', '=', $activity_id)->where('region', '=', '來賓')->delete();
+                date_default_timezone_set('Asia/Taipei');
+                for ($row = 2; $row <= $highestRow; $row++) {
+                    DB::table('check_ins')->insert([
+                        'user_id' => $worksheet->getCell([1, $row])->getValue(),
+                        'name' => $worksheet->getCell([2, $row])->getValue(),
+                        'department_id' => '空',
+                        'region' => '來賓',
+                        'is_checked_in' => false,
+                        'activity_id' => $activity_id,
+                        'created_at' => now(),
+                        'updated_at' => now(),
+                    ]);
+                }
+                $isSuccess = true;
+            } else {
+                $isSuccess = false;
             }
         }
 
-        $successText = 'You have successfully uploaded "' . $file_name . '"';
         $response = [
-            'success' => $successText,
+            'isSuccess' => $isSuccess,
         ];
 
         return response($response, 201);

app/Http/Controllers/RecipientsController.php

@@ -3,9 +3,12 @@
 namespace App\Http\Controllers;
 
 use App\Models\Recipients;
+use App\Models\Prize;
+use App\Models\CheckIn;
+use App\Models\User;
+use App\Models\Department;
 use App\Http\Requests\StoreRecipientsRequest;
 use App\Http\Requests\UpdateRecipientsRequest;
-use App\Models\Prize;
 use Illuminate\Http\Request;
 
 class RecipientsController extends Controller
@@ -119,6 +122,51 @@ class RecipientsController extends Controller
         //
     }
 
+    public function claim(Request $request)
+    {
+        $prize = '';
+        $prize_id = 0;
+        $isClaimed = false;
+        $user_id = $request->user_id;
+        $activity_id = $request->activity_id;
+        $user = CheckIn::where('activity_id', '=', $activity_id)
+            ->where('user_id', '=', $user_id)->get()[0];
+        $department_id = CheckIn::where('user_id', '=', $user_id)->get()[0]->department_id;
+        if($department_id != '空'){
+            $department_name = Department::where('department_id', '=', $department_id)->get()[0]->department_name;
+        }else{
+            $department_name = '空';
+        }
+
+        if (Recipients::where('user_id', '=', $user_id)->exists()) {
+            $recipients = Recipients::where('user_id', '=', $user_id)->get()[0];
+            $prize_id = $recipients->prize_id;
+            //因為重新匯入後prize_id在prize下面有改動，但是在recipients下面沒有改動，因此會有問題產生
+            //檢查prize_id是不是在activity_id底下
+            $aid = Prize::where('id', '=', $prize_id)->get()[0]->activity_id;
+            if ($aid == $activity_id) {
+                $isRecipients = true;
+                $isClaimed = $recipients->is_claimed;
+                $prize = Prize::where('id', '=', $prize_id)->get()[0]->name;
+            } else {
+                $isRecipients = false;
+            }
+        } else {
+            $isRecipients = false;
+        }
+
+        $response = [
+            'user' => $user,
+            'isRecipients' => $isRecipients,
+            'isClaimed' => $isClaimed,
+            'prize' => $prize,
+            'prize_id' => $prize_id,
+            'department_name' => $department_name,
+        ];
+
+        return response($response, 201);
+    }
+
     public function isClaimed(UpdateRecipientsRequest $request)
     {
         $recipient = Recipients::where('prize_id', '=', $request->prize_id)

database/seeders/DatabaseSeeder.php

@@ -26,7 +26,7 @@ class DatabaseSeeder extends Seeder
     {
         $admin = ["3520","3444","3606"];
         User::truncate();
-        
+
         $json = File::get("database/MAA.json");
         $countries = json_decode($json);
 
@@ -42,14 +42,14 @@ class DatabaseSeeder extends Seeder
                 'account' => "maa".$value->user_id,
                 'role' => $role,
             ]);
-        
+
         }
 
         $this->call([
             ActivitySeeder::class,
             CheckInSeeder::class,
-            PrizeSeeder::class,
-            RecipientsSeeder::class,
+            //PrizeSeeder::class,
+            //RecipientsSeeder::class,
             DepartmentSeeder::class,
         ]);
     }

resources/js/src/views/lottery/Activities/ActivityPage.vue

@@ -34,12 +34,6 @@
                 </b-card>
             </b-col>
         </b-row>
-        <!-- <div class="redirect-back">
-            <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" variant="primary" class="btn-icon"
-                :to="{ name: 'activityList' }">
-                返回頁面
-            </b-button>
-        </div> -->
     </div>
 </template>
 

resources/js/src/views/lottery/Activities/ActivityStore.vue

@@ -1,57 +1,74 @@
 <template>
     <div>
-        <b-card-code title="新增活動">
-            <b-form @submit.prevent>
+        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="Submit"
+            back-button-text="Previous" class="wizard-vertical mb-3" @on-complete="formSubmitted">
+
+            <tab-content title="新增活動">
+
+                    <b-form @submit.prevent>
+                        <b-row>
+                            <b-col cols="12">
+                                <b-form-group label="活動名稱" label-for="activity-name" label-cols-md="4">
+                                    <b-form-input v-model="activity_name" id="activity-name" placeholder="活動名稱" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="活動時間" label-for="date" label-cols-md="4">
+                                    <b-form-input v-model="date" id="date" type="date" placeholder="活動時間" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="活動地點" label-for="place" label-cols-md="4">
+                                    <b-form-input v-model="place" id="place" placeholder="活動地點" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="報名截止時間" label-for="deadline" label-cols-md="4">
+                                    <b-form-input v-model="deadline" id="deadline" type="time" placeholder="報名截止時間" />
+                                </b-form-group>
+                            </b-col>
+
+                            <!-- submit and reset -->
+                            <b-col offset-md="4">
+                                <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" type="submit" variant="primary"
+                                    class="mr-1" @click="postData">
+                                    送出
+                                </b-button>
+                                <b-button v-ripple.400="'rgba(186, 191, 199, 0.15)'" type="reset"
+                                    variant="outline-secondary">
+                                    取消
+                                </b-button>
+                            </b-col>
+                        </b-row>
+                    </b-form>
+
+            </tab-content>
+
+            <tab-content title="匯入獎項列表">
                 <b-row>
-                    <b-col cols="12">
-                        <b-form-group label="活動名稱" label-for="activity-name" label-cols-md="4">
-                            <b-form-input v-model="activity_name" id="activity-name" placeholder="活動名稱" />
-                        </b-form-group>
-                    </b-col>
-                    <b-col cols="12">
-                        <b-form-group label="活動時間" label-for="date" label-cols-md="4">
-                            <b-form-input v-model="date" id="date" type="date" placeholder="活動時間" />
-                        </b-form-group>
-                    </b-col>
-                    <b-col cols="12">
-                        <b-form-group label="活動地點" label-for="place" label-cols-md="4">
-                            <b-form-input v-model="place" id="place" placeholder="活動地點" />
-                        </b-form-group>
-                    </b-col>
-                    <b-col cols="12">
-                        <b-form-group label="報名截止時間" label-for="deadline" label-cols-md="4">
-                            <b-form-input v-model="deadline" id="deadline" type="time" placeholder="報名截止時間" />
-                        </b-form-group>
+                    <b-col>
+                        <b-card title="匯入獎項列表">
+                            <b-form-file ref="prizeList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案"
+                                drop-placeholder="Drop file here..." accept=".xls, .xlsx, .csv"
+                                @change="importFile($event, 'prize')"></b-form-file>
+                        </b-card>
                     </b-col>
+                </b-row>
+            </tab-content>
 
-                    <!-- submit and reset -->
-                    <b-col offset-md="4">
-                        <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" type="submit" variant="primary"
-                            class="mr-1" @click="postData">
-                            送出
-                        </b-button>
-                        <b-button v-ripple.400="'rgba(186, 191, 199, 0.15)'" type="reset" variant="outline-secondary">
-                            取消
-                        </b-button>
+            <tab-content title="匯入來賓列表">
+                <b-row>
+                    <b-col>
+                        <b-card title="匯入來賓列表">
+                            <b-form-file ref="guestList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案"
+                                drop-placeholder="Drop file here..." accept=".xls, .xlsx, .csv"
+                                @change="importFile($event, 'guest')"></b-form-file>
+                        </b-card>
                     </b-col>
                 </b-row>
-            </b-form>
-        </b-card-code>
-
-        <b-row>
-            <b-col md="6" lg="6">
-                <b-card title="匯入獎項列表" class="mb-6">
-                    <b-form-file ref="prizeList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案" drop-placeholder="Drop file here..."
-                        accept=".xls, .xlsx, .csv" @change="importFile($event, 'prize')"></b-form-file>
-                </b-card>
-            </b-col>
-            <b-col md="6" lg="6">
-                <b-card title="匯入來賓列表" class="mb-6">
-                    <b-form-file ref="guestList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案" drop-placeholder="Drop file here..."
-                        accept=".xls, .xlsx, .csv" @change="importFile($event, 'guest')"></b-form-file>
-                </b-card>
-            </b-col>
-        </b-row>
+            </tab-content>
+
+        </form-wizard>
 
         <b-modal ref="confirm-modal" title="成功設定活動" centered ok-only ok-title="確認">
             <b-card-text>
@@ -61,22 +78,28 @@
 
         <b-modal ref="insert-success-modal" title="成功上傳" ok-only ok-title="確認">
             <b-card-text>
-                成功上傳資料。
+                上傳資料成功。
             </b-card-text>
         </b-modal>
-        <!-- <div class="redirect-back">
-            <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" variant="primary" class="btn-icon" :to="{ name: 'activityList' }">
-                返回頁面
-            </b-button>
-        </div> -->
+
+        <b-modal ref="insert-fail-modal" title="沒有中獎" ok-only ok-title="確認">
+            <b-card-text>
+                上傳資料失敗，{{ errorText }}。
+            </b-card-text>
+        </b-modal>
+
     </div>
 
 </template>
 
 <script>
+import { FormWizard, TabContent } from 'vue-form-wizard'
+import vSelect from 'vue-select'
+import 'vue-form-wizard/dist/vue-form-wizard.min.css'
+import ToastificationContent from '@core/components/toastification/ToastificationContent.vue'
 import BCardCode from '@core/components/b-card-code'
 import {
-    BRow, BCol, BFormGroup, BFormInput, BFormCheckbox, BForm, BButton, BFormFile, BModal, BCardText, BCard
+    BRow, BCol, BFormGroup, BFormInput, BFormCheckbox, BForm, BButton, BFormFile, BModal, BCardText, BCard,
 } from 'bootstrap-vue'
 import Ripple from 'vue-ripple-directive'
 import useJwt from '@/auth/jwt/useJwt'
@@ -85,6 +108,8 @@ import { getUserData } from '@/auth/utils'
 
 export default {
     components: {
+        FormWizard,
+        TabContent,
         BCardCode,
         BRow,
         BCol,
@@ -97,6 +122,8 @@ export default {
         BModal,
         BCardText,
         BCard,
+        vSelect,
+        ToastificationContent,
     },
     directives: {
         Ripple,
@@ -108,7 +135,8 @@ export default {
             date: '',
             place: '',
             deadline: '',
-            successText: '',
+            isSuccess: false,
+            errorText: '',
         }
     },
     methods: {
@@ -134,23 +162,36 @@ export default {
             formData.append('option', option);
             formData.append('activity_id', this.$route.params.activity_id);
             useJwt.postData('/api/activity/uploadFile', formData).then(response => {
-                console.log(response.data);
-                this.successText = response.data.success;
-                this.$refs['insert-success-modal'].toggle();
-                this.$refs[refOption].reset();
+                this.isSuccess = response.data.isSuccess;
+                if (this.isSuccess == true) {
+                    this.$refs['insert-success-modal'].toggle();
+                    this.$refs[refOption].reset();
+                } else if (this.isSuccess == false) {
+                    console.log('issuccess false')
+                    this.errorText = '匯入Excel檔案錯誤';
+                    this.$refs['insert-fail-modal'].toggle();
+                }
             }).catch(error => {
-                console.log(error);
+                console.log('error: ' + error);
+                this.errorText = error;
+                this.$refs['insert-fail-modal'].toggle();
             });
         },
+        formSubmitted() {
+            this.$toast({
+                component: ToastificationContent,
+                props: {
+                    title: '資料成功上傳',
+                    icon: 'EditIcon',
+                    variant: 'success',
+                },
+            })
+        },
     }
 }
 </script>
 
-<style>
-.redirect-back {
-    position: fixed;
-    bottom: 5%;
-    right: 30px;
-    z-index: 99;
-}
+<style lang="scss">
+@import '~@resources/scss/vue/libs/vue-wizard.scss';
+@import '~@resources/scss/vue/libs/vue-select.scss';
 </style>

resources/js/src/views/lottery/Activities/ActivityUpdate.vue

@@ -1,6 +1,77 @@
 <template>
     <div>
-        <b-card-code title="編輯活動">
+        <form-wizard color="#7367F0" :title="null" :subtitle="null" layout="vertical" finish-button-text="Submit"
+            back-button-text="Previous" class="wizard-vertical mb-3" @on-complete="formSubmitted">
+
+            <tab-content title="新增活動">
+
+                    <b-form @submit.prevent>
+                        <b-row>
+                            <b-col cols="12">
+                                <b-form-group label="活動名稱" label-for="activity-name" label-cols-md="4">
+                                    <b-form-input v-model="activity_name" id="activity-name" placeholder="活動名稱" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="活動時間" label-for="date" label-cols-md="4">
+                                    <b-form-input v-model="date" id="date" type="date" placeholder="活動時間" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="活動地點" label-for="place" label-cols-md="4">
+                                    <b-form-input v-model="place" id="place" placeholder="活動地點" />
+                                </b-form-group>
+                            </b-col>
+                            <b-col cols="12">
+                                <b-form-group label="報名截止時間" label-for="deadline" label-cols-md="4">
+                                    <b-form-input v-model="deadline" id="deadline" type="time" placeholder="報名截止時間" />
+                                </b-form-group>
+                            </b-col>
+
+                            <!-- submit and reset -->
+                            <b-col offset-md="4">
+                                <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" type="submit" variant="primary"
+                                    class="mr-1" @click="postData">
+                                    送出
+                                </b-button>
+                                <b-button v-ripple.400="'rgba(186, 191, 199, 0.15)'" type="reset"
+                                    variant="outline-secondary">
+                                    取消
+                                </b-button>
+                            </b-col>
+                        </b-row>
+                    </b-form>
+
+            </tab-content>
+
+            <tab-content title="匯入獎項列表">
+                <b-row>
+                    <b-col>
+                        <b-card title="匯入獎項列表">
+                            <b-form-file ref="prizeList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案"
+                                drop-placeholder="Drop file here..." accept=".xls, .xlsx, .csv"
+                                @change="importFile($event, 'prize')"></b-form-file>
+                        </b-card>
+                    </b-col>
+                </b-row>
+            </tab-content>
+
+            <tab-content title="匯入來賓列表">
+                <b-row>
+                    <b-col>
+                        <b-card title="匯入來賓列表">
+                            <b-form-file ref="guestList" placeholder="請將檔案拉至此處或是點擊欄位選擇檔案"
+                                drop-placeholder="Drop file here..." accept=".xls, .xlsx, .csv"
+                                @change="importFile($event, 'guest')"></b-form-file>
+                        </b-card>
+                    </b-col>
+                </b-row>
+            </tab-content>
+
+        </form-wizard>
+
+
+        <!-- <b-card-code title="編輯活動">
             <b-form @submit.prevent>
                 <b-row>
                     <b-col cols="12">
@@ -24,7 +95,6 @@
                         </b-form-group>
                     </b-col>
 
-                    <!-- submit and reset -->
                     <b-col offset-md="4">
                         <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" type="submit" variant="primary"
                             class="mr-1" @click="postData">
@@ -51,7 +121,7 @@
                         accept=".xls, .xlsx, .csv" @change="importFile($event, 'guest')"></b-form-file>
                 </b-card>
             </b-col>
-        </b-row>
+        </b-row> -->
 
         <b-modal ref="confirm-modal" title="成功設定活動" centered ok-only ok-title="確認">
             <b-card-text>
@@ -64,16 +134,21 @@
                 成功上傳資料。
             </b-card-text>
         </b-modal>
-        <!-- <div class="redirect-back">
-            <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" variant="primary" class="btn-icon" :to="{ name: 'activityList' }">
-                返回頁面
-            </b-button>
-        </div> -->
+
+        <b-modal ref="insert-fail-modal" title="沒有中獎" ok-only ok-title="確認">
+            <b-card-text>
+                上傳資料失敗，{{ errorText }}。
+            </b-card-text>
+        </b-modal>
     </div>
 
 </template>
 
 <script>
+import { FormWizard, TabContent } from 'vue-form-wizard'
+import vSelect from 'vue-select'
+import 'vue-form-wizard/dist/vue-form-wizard.min.css'
+import ToastificationContent from '@core/components/toastification/ToastificationContent.vue'
 import BCardCode from '@core/components/b-card-code'
 import {
     BRow, BCol, BFormGroup, BFormInput, BFormCheckbox, BForm, BButton, BFormFile, BModal, BCardText, BCard
@@ -85,6 +160,8 @@ import { getUserData } from '@/auth/utils'
 
 export default {
     components: {
+        FormWizard,
+        TabContent,
         BCardCode,
         BRow,
         BCol,
@@ -97,6 +174,8 @@ export default {
         BModal,
         BCardText,
         BCard,
+        vSelect,
+        ToastificationContent,
     },
     directives: {
         Ripple,
@@ -108,11 +187,12 @@ export default {
             date: '',
             place: '',
             deadline: '',
-            successText: '',
+            isSuccess: false,
+            errorText: '',
         }
     },
-    created(){
-        useJwt.postData('/api/activity/show', {'activity_id': this.$route.params.activity_id}).then(response => {
+    created() {
+        useJwt.postData('/api/activity/show', { 'activity_id': this.$route.params.activity_id }).then(response => {
             this.activity_name = response.data.activity_name;
             this.date = response.data.date;
             this.place = response.data.place;
@@ -144,23 +224,35 @@ export default {
             formData.append('option', option);
             formData.append('activity_id', this.$route.params.activity_id);
             useJwt.postData('/api/activity/uploadFile', formData).then(response => {
-                console.log(response.data);
-                this.successText = response.data.success;
-                this.$refs['insert-success-modal'].toggle();
-                this.$refs[refOption].reset();
+                this.isSuccess = response.data.isSuccess;
+                if (this.isSuccess == true) {
+                    this.$refs['insert-success-modal'].toggle();
+                    this.$refs[refOption].reset();
+                } else if (this.isSuccess == false) {
+                    this.errorText = '匯入Excel檔案錯誤';
+                    this.$refs['insert-fail-modal'].toggle();
+                }
             }).catch(error => {
                 console.log(error);
+                this.errorText = error;
+                this.$refs['insert-fail-modal'].toggle();
             });
         },
+        formSubmitted() {
+            this.$toast({
+                component: ToastificationContent,
+                props: {
+                    title: 'Form Submitted',
+                    icon: 'EditIcon',
+                    variant: 'success',
+                },
+            })
+        },
     }
 }
 </script>
 
-<style>
-.redirect-back {
-    position: fixed;
-    bottom: 5%;
-    right: 30px;
-    z-index: 99;
-}
+<style lang="scss">
+@import '~@resources/scss/vue/libs/vue-wizard.scss';
+@import '~@resources/scss/vue/libs/vue-select.scss';
 </style>

resources/js/src/views/lottery/PrizeClaim.vue

@@ -17,7 +17,7 @@
                     <h5 class="mt-0">編號</h5>
                     <b-card-text>{{ user.user_id }}</b-card-text>
                     <h5 class="mt-0">部門</h5>
-                    <b-card-text>{{ user.department_id }}</b-card-text>
+                    <b-card-text>{{ department_name }}</b-card-text>
                 </b-media-body>
             </b-media>
         </b-card>
@@ -34,8 +34,8 @@
         </b-modal>
         <b-modal ref="wrong-id-modal" title="沒有此員工編號" ok-only ok-title="確認">
             <b-card-text>
-                是不是輸入錯誤的員工編號或是來賓編號了呢?
-                再次確認一下喔!
+                該員工編號或是來賓編號不存在，或是該編號並沒有報到。
+                請再次確認。
             </b-card-text>
         </b-modal>
         <b-modal ref="confirm-modal" title="確認領取" ok-only ok-title="確認">
@@ -45,16 +45,9 @@
         </b-modal>
         <b-modal ref="already-modal" title="重複領取" ok-only ok-title="確認">
             <b-card-text>
-                {{ user.name }}已經領過獎品了喔。
+                {{ user.name }}已經領過獎品 {{ prize }} 了喔。
             </b-card-text>
         </b-modal>
-<!--
-        <div class="redirect-back">
-            <b-button v-ripple.400="'rgba(255, 255, 255, 0.15)'" variant="primary" class="btn-icon"
-                :to="{ name: 'activityPage', params: { 'activity_id': this.$route.params.activity_id } }">
-                返回頁面
-            </b-button>
-        </div> -->
     </div>
 </template>
 <script>
@@ -78,10 +71,6 @@ export default {
     directives: {
         Ripple,
     },
-    created(){
-        this.$route.meta.breadcrumb[1].to += '/' + this.$route.params.activity_id;
-        console.log(this.$route.meta.breadcrumb[1].to);
-    },
     data() {
         return {
             user: {},
@@ -90,6 +79,7 @@ export default {
             prize: "",
             prize_id: "",
             isClaimed: false,
+            department_name: "",
         }
     },
     methods: {
@@ -101,6 +91,7 @@ export default {
                     this.prize = response.data.prize;
                     this.prize_id = response.data.prize_id;
                     this.isClaimed = response.data.isClaimed;
+                    this.department_name = response.data.department_name;
                     if (!this.isRecipients) {
                         this.$refs['false-modal'].toggle();
                     } else if (this.isClaimed == 1) {
@@ -127,12 +118,3 @@ export default {
 }
 
 </script>
-
-<style>
-.redirect-back {
-    position: fixed;
-    bottom: 5%;
-    right: 30px;
-    z-index: 99;
-}
-</style>

resources/scss/vue/libs/vue-wizard.scss

@@ -123,7 +123,7 @@
           background-color: rgba($secondary, 0.04) !important;
         }
         &::before {
-          content: '\e843';
+          content: '<';
           font-family: feather !important;
           speak: none;
           font-style: normal;
@@ -143,7 +143,7 @@
           box-shadow: 0 8px 25px -8px $primary;
         }
         &::after {
-          content: '\e844';
+          content: '>';
           font-family: feather !important;
           speak: none;
           font-style: normal;

routes/api.php

@@ -94,7 +94,7 @@ Route::middleware(['auth:sanctum', 'abilities:Admin'])->group(function () {
     Route::post('/activity/store', [ActivityController::class, 'store']);
     Route::post('/activity/update', [ActivityController::class, 'update']);
     Route::post('/activity/sql', [ActivityController::class, 'sql']);
-    Route::post('/activity/claim', [ActivityController::class, 'claim']);
+    Route::post('/activity/claim', [RecipientsController::class, 'claim']);
     Route::post('/activity/isClaimed', [RecipientsController::class, 'isClaimed']);
     Route::post('/activity/uploadFile', [ActivityController::class, 'uploadFile']);
     Route::post('/activity/show', [ActivityController::class, 'show']);