feat.例行push

app/Http/Controllers/Admin/MemberController.php

@@ -4,13 +4,14 @@
 
 use App\Http\Controllers\Controller;
 use App\Models\Member;
-
+use App\Models\Promocode;
 class MemberController extends Controller
 {
 
     public function index()
     {
         $data = Member::paginate(20);
-        return view('admin.member.index', ['data' => $data]);
+        $total =Promocode::where('used_count','>',0)->count();
+        return view('admin.member.index', ['data' => $data,'total'=>$total]);
     }
 }

app/Http/Controllers/Admin/SettingController.php

@@ -5,14 +5,14 @@
 use App\Http\Controllers\Controller;
 use App\Imports\PromoImport;
 use App\Models\Promocode;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Log;
 use Maatwebsite\Excel\Facades\Excel;
-use App\Models\User;
+
 class SettingController extends Controller
 {
-
     public function promoCode(Request $request)
     {
         $start = Carbon::now()->month(1)->startOfMonth();
@@ -33,6 +33,7 @@ public function promoCodeCreate(Request $request)
         $request->validate([
             'file' => 'required|mimes:xlsx,xls,csv|max:2048',
         ]);
+        $from = $request->input('from'); // 默認來源為 cafeg
 
         if ($request->hasFile('file')) {
             $file = $request->file('file');
@@ -55,7 +56,7 @@ public function promoCodeCreate(Request $request)
 
         // 讀取並導入 Excel 文件
         try {
-            Excel::import(new PromoImport, $file);
+            Excel::import(new PromoImport($from), $file);
             return back()->with('success', '促銷代碼已成功導入！');
         } catch (\Exception $e) {
             return back()->with('error', '導入失敗: ' . $e->getMessage());
@@ -81,7 +82,6 @@ public function loginStatus(Request $request)
             'can_login' => $user->can_login,
         ]);
 
-
     }
 
 }

app/Http/Controllers/LoginController.php

@@ -42,12 +42,22 @@ public function redirectToProvider(Request $request)
      */
     public function handleProviderCallback(Request $request)
     {
-
+        // 如果用户取消了授权
-        // 从 Session 获取 $redirectTo
+        if ($request->has('error') && $request->get('error') === 'access_denied') {
             $redirectTo = session('redirect_to', 'member');
 
+            if ($redirectTo === 'admin') {
+                return redirect()->route('admin.login')->with('error', '您已取消 LINE 授权');
+            } else {
+                return redirect()->route('login')->with('error', '您已取消 LINE 授权');
+            }
+        }
+
+        try {
+            // 获取 LINE 用户信息
             $user = Socialite::driver('line')->user();
             Log::info('line', ['user' => $user]);
+
             $lineId = $user->getId();
             $name = $user->getName();
             $avatar = $user->getAvatar() ?? '';
@@ -55,9 +65,12 @@ public function handleProviderCallback(Request $request)
 
             Log::info('email', [$email]);
 
-        if ($redirectTo == 'admin') {
+            // 从 Session 获取跳转路径
+            $redirectTo = session('redirect_to', 'member');
+
+            if ($redirectTo === 'admin') {
                 // Admin 登录逻辑
-            $existingUser = $user = User::where('line_id', $lineId)
+                $existingUser = User::where('line_id', $lineId)
                     ->orWhere('email', $email)
                     ->first();
 
@@ -94,7 +107,6 @@ public function handleProviderCallback(Request $request)
                         'password' => bcrypt(env('DEFAULT_PASSWORD')),
                         'source' => 'cafeg',
                         'avatar' => $avatar,
-
                         'email' => $email,
                     ]);
                     Auth::guard('member')->login($newUser);
@@ -105,7 +117,14 @@ public function handleProviderCallback(Request $request)
                     ? redirect()->route('member.index')
                     : redirect()->route('member.profile');
             }
+        } catch (\Exception $e) {
+            Log::error('LINE 登录失败: ' . $e->getMessage());
+
+            // 发生异常时，返回登录页面并提示错误
+            return redirect()->route('login')->with('error', 'LINE 登录失败，请稍后再试');
         }
+    }
+
 
     public function adminLogout()
     {
@@ -138,7 +157,7 @@ public function memberNormalLogin(Request $request)
             return redirect()->route('member.index');
         } else {
 
-            return redirect()->route('front.login.view')->with('error', '帳號密碼錯誤');
+            return redirect()->route('login')->with('error', '帳號密碼錯誤');
         }
     }
 

app/Http/Controllers/front/MemberController.php

@@ -1,13 +1,13 @@
 <?php
+
 namespace App\Http\Controllers\front;
 
 use App\Http\Controllers\Controller;
-use App\Models\EmailVerifications;
 use App\Models\Member;
 use App\Models\Promocode;
-use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Mail;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 
 class MemberController extends Controller
@@ -19,25 +19,55 @@ class MemberController extends Controller
      */
     public function index()
     {
-        $code = null;
+        $user = Auth::guard('member')->user();
 
-        if (isset(Auth::guard('member')->user()->id)) {
+        if (! $user) {
-            $user_id = Auth::guard('member')->user()->id;
+            Auth::guard('member')->logout();
-            $code = Promocode::where('used_count', $user_id)->latest()->first();
+            return redirect()->route('login');
+        }
 
-            if (!$code) {
+        $user_id = $user->id;
-                $code = Promocode::where('used_count', 0)->first();
+        $today   = Carbon::today()->format('Y-m-d');
+
+        // 建立一個回傳符合條件的 Promocode 的 function
+        $getAvailableCode = function ($from) use ($today) {
+            return Promocode::where('used_count', 0)
+                ->where('from', $from)
+                ->whereDate('valid_from', '<=', $today)
+                ->whereDate('valid_to', '>=', $today)
+                ->latest()
+                ->first();
+        };
+
+        // 試著找一個未使用的
+        $code    = $getAvailableCode('cafeg');
+        $teacode = $getAvailableCode('teamaster');
+
+        // 如果找不到，就再次找一個未使用的然後標記成首次給予
+        if (! $code) {
+            $code = $getAvailableCode('cafeg');
+            if ($code) {
                 $code->give_to    = '首次';
                 $code->used_count = $user_id;
                 $code->save();
             }
+        }
 
-            return view('front.member.index', ['code' => $code]);
+        if (! $teacode) {
-        } else {
+            $teacode = $getAvailableCode('teacode');
-            Auth::guard('member')->logout();
+            if ($teacode) {
-            return redirect()->route('front.login.view');
+                $teacode->give_to    = '首次';
+                $teacode->used_count = $user_id;
+                $teacode->save();
             }
         }
+
+        return view('front.member.index', [
+            'code'    => $code,
+            'teacode' => $teacode,
+        ]);
+    }
+
     /**
      * Summary of profile 登入後個人資訊沒有menu
      * @return \Illuminate\Contracts\View\View

app/Http/Controllers/front/PromoCodeController.php

@@ -1,11 +1,12 @@
 <?php
+
 namespace App\Http\Controllers\front;
 
 use App\Http\Controllers\Controller;
 use App\Models\Promocode;
 use Auth;
-use Illuminate\Http\Request;
 use Exception;
+use Illuminate\Http\Request;
 
 class PromoCodeController extends Controller
 {
@@ -22,17 +23,25 @@ public function index()
      */
     public function create(Request $request)
     {
+
         $user_id = Auth::guard('member')->user()->id;
         $count   = Promocode::where('used_count', $user_id)->count();
         $give_to = $request->input('give_to');
+        $from    = $request->input('from');
+        $row     = Promocode::where('used_count', 0)
+            ->where('from', $from)
+            ->first();
+
+
+
+        if (!$row) {
+            return response()->json(['status' => 'error', 'msg' => '目前無可用的優惠碼']);
+        }
 
-        $row = Promocode::where('used_count', 0)->first();
         $row->used_count = $user_id;
         $row->give_to    = $give_to;
         $row->save();
         return response()->json(['status' => 'success', 'msg' => '已成功取得', 'promocode' => $row->code, 'give_to' => $row->give_to]);
-
-
     }
     /**
      * Summary of morePromocode
@@ -57,7 +66,6 @@ public function morePromocode()
         }
     }
 
-
     /**
      * Store a newly created resource in storage.
      */

app/Http/Controllers/front/RegisterController.php

@@ -35,14 +35,8 @@ public function create(Request $request)
             'phone' => $request->phone ?? '',
         ]);
 
-        if (isset($newUser->email)) {
+            return redirect()->route('login')->with('sucess', '完成註冊,請登入');
 
-            return redirect()->route('member.index')->with('sucess', '完成註冊');
-
-        } else {
-
-            return redirect()->route('member.profile')->with('sucess', '完成註冊,請完善你得資料');
-        }
 
     }
 
@@ -131,7 +125,7 @@ public function resetPassword(Request $request)
 
         } else {
 
-            return redirect()->route('front.login.view')->with('error', '驗證密碼token 失敗');
+            return redirect()->route('login')->with('error', '驗證密碼token 失敗');
         }
 
 

app/Imports/PromoImport.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\Imports;
 
 use App\Models\Promocode;
@@ -6,31 +7,109 @@
 use Log;
 use Maatwebsite\Excel\Concerns\ToCollection;
 
+use function Illuminate\Log\log;
+
 class PromoImport implements ToCollection
 {
+    protected $from;
 
+    public function __construct($from = 'cafeg')
+    {
+        $this->from = $from;
+    }
     public function collection(Collection $rows)
     {
-        // 打印每一行數據（這是從 Excel 讀取的行）
+        if ($this->from == 'cafeg') {
 
             foreach ($rows as $row) {
+                $data = $row->toArray();
 
-            Log::info('Row data: ', ['value' => $row->toArray()[3]]);
+                if ($data[3] != '提货码') { // 跳過標題行
+                    $code = $data[3];
 
-            if ($row->toArray()[3] != '提货码') // 跳過第一行
+                    $promo = Promocode::where('code', $code)
-            {
+                        ->where('from', 'cafeg')
-                Promocode::create([
+                        ->first();
-                    'code' => $row->toArray()[3], // 使用 "提货码" 列
+
-                    'discount' => 100, // 假設折扣為固定值 100
+                    if ($promo) {
-                    'type' => 'percent', // 默認為百分比
+                        // 如果已存在，且 give_to 不為 null，就更新
-                    'usage_limit' => 1, // 默認每個代碼只能使用一次
+                        if ($promo->give_to !== null) {
-                    'valid_from' => date('Y-m-d'), // 當前日期
+                            $promo->update([
-                    'valid_to' => date('Y-m-d', strtotime('1 day')), // 默認有效期至第二天
+                                'discount'    => 100,
-                    'is_active' => 1, // 默認啟用
+                                'type'        => 'percent',
+                                'usage_limit' => 1,
+                                'valid_from'  => date('Y-m-d'),
+                                'valid_to'    => date('Y-m-d', strtotime('+1 day')),
+                                'is_active'   => 1,
+                                'from'        => 'cafeg',
                             ]);
+                            Log::info("已更新：{$code}");
+                        } else {
+                            Log::info("跳過（give_to 為 null）：{$code}");
+                        }
+                    } else {
+                        // 不存在就新增
+                        Promocode::create([
+                            'code'        => $code,
+                            'discount'    => 100,
+                            'type'        => 'percent',
+                            'usage_limit' => 1,
+                            'valid_from'  => date('Y-m-d'),
+                            'valid_to'    => date('Y-m-d', strtotime('+1 day')),
+                            'is_active'   => 1,
+                            'from'        => 'cafeg',
+                        ]);
+                        Log::info("已新增：{$code}");
+                    }
+                }
+            }
+        }
+
+        if ($this->from == 'teamaster') {
+            Log::info('import-from: teamaster');
+            Log::info('row', );
+            foreach ($rows->toArray() as $row) {
+
+                $code  = $row[0];
+                $promo = Promocode::where('code', $code)
+                    ->where('from', 'teamaster')
+                    ->first();
+
+                if ($promo) {
+                    // 如果已存在，且 give_to 不為 null，就更新
+                    if ($promo->give_to != null) {
+                        $promo->update([
+                            'discount'    => 70,
+                            'type'        => 'amount',
+                            'usage_limit' => 1,
+                            'valid_from'  => date('Y-m-d'),
+                            'valid_to'    => date('Y-m-d', strtotime('+7 day')),
+                            'is_active'   => 1,
+                            'from'        => 'teamaster',
+                        ]);
+                        Log::info("已更新：{$code}");
+                    } else {
+                        Log::info("跳過（give_to 為 null）：{$code}");
+                    }
+                } else {
+                    Log::info("新增代碼：{$code}");
+                    // 不存在就新增
+                    Promocode::create([
+                        'code'        => $code,
+                        'discount'    => 70,
+                        'type'        => 'amount',
+                        'usage_limit' => 1,
+                        'valid_from'  => date('Y-m-d'),
+                        'valid_to'    => date('Y-m-d', strtotime('+7 day')),
+                        'is_active'   => 1,
+                        'from'        => 'teamaster',
+                    ]);
+                    Log::info("已新增：{$code}");
+                }
             }
 
         }
 
     }
+
 }

app/Models/Member.php

@@ -10,7 +10,8 @@
 
 class Member extends Authenticatable
 {
-    use HasApiTokens, Notifiable;
+    use HasApiTokens;
+    use Notifiable;
 
     protected $table = 'members';
     /**
@@ -64,7 +65,7 @@ public function getLevelNameAttribute()
 
     public function getPromoCode()
     {
-        return $this->hasMany(Promocode::class, 'used_count', 'id');
+        return $this->hasMany(Promocode::class, 'giveto_mem_id', 'id');
     }
     protected function casts(): array
     {

app/Models/Promocode.php

@@ -8,19 +8,18 @@ class Promocode extends Model
 {
     //
     protected $table   = 'promocodes';
-    protected $fillable = [
+    protected $guarded = [];
-        'code',
-        'discount',
-        'type',
-        'usage_limit',
-        'used_count',
-        'valid_from',
-        'valid_to',
-        'is_active',
-    ];
 
     public function getMember()
     {
         return $this->hasOne(Member::class, 'id', 'used_count');
     }
+    public function getFromLabelAttribute()
+    {
+        return match ($this->from) {
+            'cafeg' => '朗立臣',
+            'teamaster' => '飲力星球',
+            default => '未知來源',
+        };
+    }
 }

database/migrations/2025_08_06_102845_create_promocodes_table.php

@@ -0,0 +1,25 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class () extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('promocodes', function (Blueprint $table) {
+            $table->enum('from', ['cafeg', 'teamaster', 'unknown'])->comment('來源')->after('id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('promocodes');
+    }
+};

resources/views/admin/login.blade.php

@@ -231,10 +231,17 @@
 </body>
 <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
 
+
+
+</body>
+
+</html>
+
+<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+
 @if (session('error'))
 <script>
     document.addEventListener("DOMContentLoaded", function() {
-        console.log('go there');
         Swal.fire({
             title: '失敗'
             , text: "{{ session('error') }}"
@@ -245,10 +252,3 @@
 
 </script>
 @endif
-
-</body>
-
-</html>
-
-<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
-

resources/views/admin/member/index.blade.php

@@ -3,7 +3,7 @@
 @endsection
 @section('content')
     <style>
-        .table th{
+        .table th {
             white-space: nowrap;
             /* 禁止文字換行 */
             text-align: center;
@@ -13,7 +13,8 @@
             text-overflow: ellipsis;
             /* 超出用省略號顯示 */
         }
-        .table td{
+
+        .table td {
             white-space: nowrap;
 
         }
@@ -31,8 +32,6 @@
         table {
             position: static !important;
         }
-
-
     </style>
     <div class="row">
         <div class="col-md-12">
@@ -138,7 +137,9 @@
                         </div>
                     </div>
                 </div>
-
+                @php
+                $pageTotal = 0;
+                @endphp
                 <!-- Users List Table -->
                 <div class="card">
                     <div class="card-header border-bottom">
@@ -209,12 +210,16 @@ class="rounded-circle">
                                                     {{ $item->getPromoCode[0]->code }}
                                                 </span>
                                             @endif
+                                            @php
+                                            $pageTotal +=  count($item->getPromoCode) ;
+                                            @endphp
                                             @if (count($item->getPromoCode) > 1)
                                                 <a class="text-danger" style="font-size:20px" data-bs-toggle="collapse"
                                                     href="#multiCollapseExample-{{ $item->id }}" role="button"
                                                     aria-expanded="false" aria-controls="multiCollapseExample1">
                                                     {{ $item->getPromoCode[0]->code }} ({{ count($item->getPromoCode) }}
                                                     筆)
+
                                                 </a>
                                             @endif
                                         </td>
@@ -273,13 +278,16 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text-
                                                             </tr>
                                                         </thead>
                                                         <tbody>
-                                                            @php $i = 1 ; @endphp
+                                                            @php
-                                                            @foreach ($item->getPromoCode as $key => $val)
+                                                            $i=1;
+                                                            $promoCodes = $item->getPromoCode()->paginate(30); // 每頁30筆優惠碼
+                                                        @endphp
+                                                        @foreach ($promoCodes as $val)
                                                                 @if ($i == 1)
                                                                     <tr>
                                                                 @endif
-                                                                <td>{{ $i }} {{ $val->code }}</td>
+                                                                <td class="text-danger"> {{ $val->code }}</td>
-                                                                <td>{{ $val->give_to }}</td>
+                                                                <td  class="text-info">{{ $val->give_to }}</td>
                                                                 @if ($i == 5)
                                     </tr>
                                     @php $i = 0 @endphp
@@ -287,6 +295,13 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text-
                                 @php $i++; @endphp
                                 @endforeach
                             </tbody>
+                            <tfoot>
+                                <th colspan="10">
+                                    @if($promoCodes->count()>29)
+                                    {{ $promoCodes->links() }}
+                                    @endif
+                                </th>
+                            </tfoot>
                         </table>
                         {{-- <span class="text-danger " style="font-size:20px">
                                                     @foreach ($item->getPromoCode as $key => $val)
@@ -303,6 +318,16 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text-
                 </tr>
                 @endforeach
                 </tbody>
+                <tfoot>
+                    <tr>
+                        <th colspan="3">本頁兌換碼計數</th>
+                        <th colspan="4">總兌換碼計數</th>
+                    </tr>
+                    <tr>
+                        <th colspan="3" class="text-start-center"><h3 class="mb-1 me-2 text-info">{{ $pageTotal }}</h3></th>
+                        <th colspan="4" class="text-start-center"><h3 class="mb-1 me-2 text-info">{{  $total}} </h3></th>
+                    </tr>
+                </tfoot>
                 </table>
             </div>
         </div>
@@ -336,7 +361,6 @@ class="d-grid d-sm-flex p-4 border justify-content-center table-responsive text-
         });
 
         function changeLevel(id, lv) {
-
         Swal.fire({
             title: "確定",
             text: "你即將修改此用戶權限！",
@@ -356,37 +380,26 @@ function changeLevel(id, lv) {
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
                     },
-
                     success: function(response) {
                         if (response.status == 'success') {
-                                console.log(lv);
+                            let name = response.name;
-                                // lv = response.level;
+                            let view = '';
-                                name = response.name;
-                                var view ='';
                             if (lv == 0) {
-                                 view =      '<i class = "ri-user-line ri-22px text-danger me-2" ></i>' + name;
+                                view = '<i class="ri-user-line ri-22px text-danger me-2"></i>' + name;
+                            } else if (lv == 1) {
+                                view = '<i class="ri-user-line ri-22px text-info me-2"></i>' + name;
+                            } else if (lv == 2) {
+                                view = '<i class="ri-user-line ri-22px text-sucess me-2"></i>' + name;
+                            } else if (lv == 9) {
+                                view = '<i class="ri-user-line ri-22px text-warning me-2"></i>' + name;
                             }
-                                if (lv == 1) {
+                            $("#user-" + id).html(view);
-                                    view =   '<i class = "ri-user-line ri-22px text-info me-2" ></i>'+ name;
-                                }
-                                if (lv == 2) {
-                                    view =   '<i class = "ri-user-line ri-22px text-sucess me-2" > </i>'+ name;
-                                }
-                                if (lv == 9) {
-                                    view =   '<i class = "ri-user-line ri-22px text-warning me-2" > </i>'+ name;
-                                }
-                                $("#user-"+id).html(view);
-                            }
-
-
                             Swal.fire("成功", "修改成功", "success");
-
+                        }
                     }
                 });
-
             } else if (result.dismiss === Swal.DismissReason.cancel) {
                 Swal.fire("取消", "使用者取消操作", "error");
-                    console.log("使用者取消操作");
             }
         });
     }

resources/views/admin/setting/promocode.blade.php

@@ -49,28 +49,57 @@
 
         <!-- Basic Layout -->
         <div class="row">
-            <div class="col-xl">
+<div class="col-xl">
     <div class="card mb-12" style="margin-bottom: 20px;">
-
+        <h5 class="card-header">Excel 匯入</h5>
         <div class="card-body">
-                        <form action="{{route('admin.promocode.create')}}" method="POST" enctype="multipart/form-data">
+
+            <!-- Tabs -->
+            <ul class="nav nav-tabs" id="importTabs" role="tablist">
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link active" id="cafeg-tab" data-bs-toggle="tab" data-bs-target="#cafeg-form"
+                        type="button" role="tab" aria-controls="cafeg-form" aria-selected="true">朗立臣</button>
+                </li>
+                <li class="nav-item" role="presentation">
+                    <button class="nav-link" id="teamaster-tab" data-bs-toggle="tab" data-bs-target="#teamaster-form"
+                        type="button" role="tab" aria-controls="teamaster-form" aria-selected="false">飲力星球</button>
+                </li>
+            </ul>
+
+            <!-- Tab Content -->
+            <div class="tab-content mt-4" id="importTabsContent">
+
+                <!-- 朗立臣 (cafeg) -->
+                <div class="tab-pane fade show active" id="cafeg-form" role="tabpanel" aria-labelledby="cafeg-tab">
+                    <form action="{{ route('admin.promocode.create') }}" method="POST" enctype="multipart/form-data">
                         @csrf
-
-                            <h5 class="card-header">輸入檔案</h5>
-                            <div class="card-body">
                         <div class="mb-4">
-                                    <label for="formFile" class="form-label">檔案類型 excels</label>
+                            <label for="formFile1" class="form-label">匯入 Excel（朗立臣）</label>
-                                    <input class="form-control" name="file" type="file" id="formFile">
+                            <input class="form-control" name="file" type="file" id="formFile1">
+                            <input type="hidden" name="from" value="cafeg">
                         </div>
-
+                        <button type="submit" class="btn btn-primary">送出</button>
-
-                            </div>
-
-                            <button type="submit" class="btn btn-primary">Send</button>
                     </form>
                 </div>
+
+                <!-- 飲力星球 (teamaster) -->
+                <div class="tab-pane fade" id="teamaster-form" role="tabpanel" aria-labelledby="teamaster-tab">
+                    <form action="{{ route('admin.promocode.create') }}" method="POST" enctype="multipart/form-data">
+                        @csrf
+                        <div class="mb-4">
+                            <label for="formFile2" class="form-label">匯入 Excel（飲力星球）</label>
+                            <input class="form-control" name="file" type="file" id="formFile2">
+                            <input type="hidden" name="from" value="teamaster">
+                        </div>
+                        <button type="submit" class="btn btn-success">送出</button>
+                    </form>
+                </div>
+
             </div>
         </div>
+    </div>
+</div>
+
 
             <!-- DataTable with Buttons -->
             <div class="card">
@@ -78,7 +107,7 @@
                     <table class="datatables-basic table table-bordered">
                         <thead>
                             <tr>
-
+                                <th style="width: 20%; !important">來源</th>
                                 <th style="width: 20%; !important"> 優惠碼</th>
                                 <th style="width: 15%; !important">優惠類型</th>
                                 <th style="width: 20%; !important">折扣比例</th>
@@ -89,6 +118,7 @@
                         <tbody>
                             @foreach($data as $item)
                             <tr>
+                                <td>{{$item->getFromLabelAttribute()}}</td>
                                 <td><strong class="text-danger blod">{{$item->code}}</strong></td>
                                 <td>{{$item->type}}</td>
                                 <td> {{ number_format($item->discount, 0) }}</td>

resources/views/front/auth/forgot-password.blade.php

@@ -117,7 +117,7 @@
             <button class="btn btn-primary d-grid w-100"   id="confirm">發送連結</button>
           </form>
           <div class="text-center">
-            <a href="{{ route('front.login.view') }}" class="d-flex align-items-center justify-content-center">
+            <a href="{{ route('login') }}" class="d-flex align-items-center justify-content-center">
               <i class="ri-arrow-left-s-line scaleX-n1-rtl ri-20px me-1_5"></i>
              回到登入
             </a>

resources/views/front/member/auth-register.blade.php

@@ -157,7 +157,7 @@
 
                         <p class="text-center">
                             <span>已經有帳號?</span>
-                            <a href="{{ route('front.login.view') }}" class="text-body">
+                            <a href="{{ route('login') }}" class="text-body">
                                 <span>由此登入</span>
                             </a>
                         </p>
@@ -388,6 +388,11 @@ function validateEmailField(field) {
 
             // 如果所有欄位均有效，執行表單提交
             if (isFormValid && isPhoneValid) {
+                $.ajaxSetup({
+    headers: {
+        'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
+    }
+});
                 $.ajax({
                     url: "{{ route('member.register.create') }}",
                     type: 'POST',

resources/views/front/member/index.blade.php

@@ -102,15 +102,17 @@ class="fw-medium">{{ Auth::guard('member')->user()->Level_Name }}</span>
                                                 <ul class="nav nav-pills " role="tablist">
                                                     <li class="nav-item">
                                                         <button type="button"
+                                                            id="cafeg-tab"
                                                             class="nav-link d-flex flex-column gap-1 active" role="tab"
                                                             data-bs-toggle="tab"
                                                             data-bs-target="#navs-pills-within-card-active"
                                                             aria-controls="navs-pills-within-card-active"
                                                             aria-selected="true"><i class="tf-icons ri-home-smile-line"></i>
+
                                                             國王&皇后</button>
                                                     </li>
                                                     <li class="nav-item">
-                                                        <button type="button" class="nav-link d-flex flex-column gap-1"
+                                                        <button id= "tea-tab" type="button" class="nav-link d-flex flex-column gap-1"
                                                             role="tab" data-bs-toggle="tab"
                                                             data-bs-target="#navs-pills-within-card-link"
                                                             aria-controls="navs-pills-within-card-link"
@@ -157,10 +159,38 @@ class="nav-link d-flex flex-column gap-1 active" role="tab"
 
                                                     </div>
                                                 </div>
-                                                <div class="tab-pane fade" id="navs-pills-within-card-link" role="tabpanel">
+                                                <div class="tab-pane fade" id="navs-pills-within-card-link"
+                                                    role="tabpanel">
                                                     <h4 class="card-title">茶飲大師手搖機 飲品兌換卷</h4>
-                                                    <p class="card-text">施工中 ....</p>
+                                                    <div class="form-floating form-floating-outline">
-                                                    {{-- <a href="javascript:void(0)" class="btn btn-secondary">Go somewhere</a> --}}
+                                                        @if (Auth::guard('member')->user()->level != 9)
+                                                            <input type="text" class="form-control text-danger"
+                                                                style="font-size:24px; font-weight: bold;"
+                                                                id="floatingInput4" aria-describedby="floatingInputHelp">
+                                                            <label for="floatingInput">兌換碼</label>
+                                                            {{-- <div id="floatingInputHelp" class="form-text">We'll never share your details with anyone else.</div> --}}
+                                                        @else
+                                                            {{-- 顯示給予誰 --}}
+                                                            <div class="input-group" id ="tea-give-to">
+                                                                <input type="text" class="form-control text-info"
+                                                                    style="font-size:24px; font-weight: bold;"
+                                                                    id="floatingInput5" aria-describedby="button-addon3"
+                                                                    placeholder="給予誰" required=true>
+                                                                <button class="btn btn-outline-primary" type="button"
+                                                                    id="button-addon4">獲取兌換碼</button>
+                                                            </div>
+
+                                                            {{-- 顯示兌換碼 --}}
+                                                            <div class="input-group" id="promocode-show-teamaster">
+                                                                <input type="text" class="form-control text-danger"
+                                                                    style="font-size:24px; font-weight: bold;"
+                                                                    id="floatingInput6" aria-describedby="button-addon7">
+                                                                <button class="btn btn-outline-primary" type="button"
+                                                                    id="button-addon7">重新獲取</button>
+                                                            </div>
+                                                        @endif
+
+
                                                     </div>
                                                 </div>
                                             </div>
@@ -175,7 +205,8 @@ class="nav-link d-flex flex-column gap-1 active" role="tab"
                                 <div class="card mb-6">
                                     <div class="card-body" style="padding-top: 3%">
                                         <small class="card-text text-uppercase text-muted small">QRCode</small>
-                                    <div class="d-flex justify-content-center" id="qrcode" style="padding-top: 3%">
+                                        <div class="d-flex justify-content-center" id="qrcode"
+                                            style="padding-top: 3%">
                                         </div>
                                         <!-- Flexbox居中 -->
                                     </div>
@@ -244,77 +275,131 @@ class='ri-bar-chart-2-line ri-24px text-body me-4'></i>消費紀錄</h5>
 
 
         <script>
-        $(document).ready(function() {
+$(document).ready(function() {
+    console.log("Document is ready");
     var id = "{{ Auth::guard('member')->user()->id }}";
-            $("#promocode").hide();
+    $("#promocode-show").hide();
-            // $("#promocode-show").hide();
+    $("#promocode-show-teamaster").hide();
+    $("#tea-give-to").hide();
+    // 建立 QR Code
     var qrcode = new QRCode(document.getElementById("qrcode"), {
-                text: id, // 要顯示的內容
+        text: id,
-                width: 250, // QR code 的寬度
+        width: 250,
-                height: 250 // QR code 的高度
+        height: 250
     });
-        });
-        $("#submit-btn").on('click', function() {
-            var id = "{{ Auth::guard('member')->user()->id }}";
-            $("#promocode").show();
-            var give_to = "{{ $code->give_to }}";
-            var code  ="{{ $code->code }}";
 
-            console.log('code:',code);
+    // 顯示資料按鈕
+    $("#submit-btn").on('click', function() {
+        $("#promocode").show();
+        console.log('submit button clicked');
+        var give_to = "{{ $code->give_to ?? '' }}";
+        var code = "{{ $code->code ?? '' }}";
+        var t_give_to = "{{ $teacode->give_to ?? '' }}";
+        var t_code = "{{ $teacode->code ?? '' }}";
+
         if (code) {
             $("#give-to").hide();
             $("#floatingInput2").val(code);
             $("#last-give-to").html("最後給予 : " + give_to);
         } else {
             $("#give-to").show();
-
         }
 
-            console.log('id:', id);
+        if (t_code) {
+            $("#tea-give-to").hide();
+            $("#floatingInput6").val(t_code);
+            $("#last-give-to").html("最後給予 : " + give_to);
+
+        } else {
+            $("#tea-give-to").show();
+        }
+    });
+    //tab 切換
+    $("#cafeg-tab").on('click', function() {
+        $("#promocode-show").show();
 
 
     });
+    $("#tea-tab").on('click', function() {
+        $("#promocode-show-teamaster").show();
+        $("#promocode-show").hide();
+        $("#tea-give-to").hide();
+    });
+
+
+    // cafeg 請求
+    $("#button-addon3").on('click', function(event) {
+        event.preventDefault();
+
+        var give_to = $("#floatingInput3").val();
+        if (!give_to) return alert("請輸入給予誰的資訊");
+
+        $.ajax({
+            url: "{{ route('member.getpromocode') }}",
+            type: 'POST',
+            data: {
+                _token: '{{ csrf_token() }}',
+                id: id,
+                give_to: give_to,
+                from: 'cafeg',
+            },
+            success: function(res) {
+                $("#promocode-show").show();
+                $("#give-to").hide();
+                $("#floatingInput2").val(res.promocode);
+            },
+            error: function(xhr) {
+                console.log(xhr.responseText);
+            }
+        });
+    });
+
+    // teamaster 請求
+    $("#button-addon4").on('click', function(event) {
+        event.preventDefault();
+
+        var give_to = $("#floatingInput5").val();
+        if (!give_to) return alert("請輸入給予誰的資訊");
+
+        $.ajax({
+            url: "{{ route('member.getpromocode') }}",
+            type: 'POST',
+            data: {
+                _token: '{{ csrf_token() }}',
+                id: id,
+                give_to: give_to,
+                from: 'teamaster',
+            },
+            success: function(res) {
+                $("#promocode-show-teamaster").show();
+                $("#tea-give-to").hide();
+                $("#floatingInput6").val(res.promocode);
+            },
+            error: function(xhr) {
+                console.log(xhr.responseText);
+            }
+        });
+    });
+});
+        //給予誰
         $("#button-addon2").on('click', function() {
             var id = "{{ Auth::guard('member')->user()->id }}";
             $("#promocode").show();
             $("#give-to").show();
+            $("#floatingInput3").val("");
             $("#promocode-show").hide();
             console.log('id:', id);
 
         });
-
+        //給予誰
-        $("#button-addon3").on('click', function(event) {
+        $("#button-addon7").on('click', function() {
-            event.preventDefault(); // 阻止表单的默认提交行为
-
             var id = "{{ Auth::guard('member')->user()->id }}";
-            var give_to = $("#floatingInput3").val();
+            $("#promocode").show();
-
+            $("#tea-give-to").show();
-            // 检查输入框的值是否为空
+            $("#floatingInput5").val("");
-            if (!give_to) {
+            $("#promocode-show-teamaster").hide();
-                alert("請輸入給予誰的資訊");
-                return;
-            }
-
-            // 發送 AJAX 請求
-            $.ajax({
-                url: "{{ route('member.getpromocode') }}", // 設定你的路由 URL
-                type: 'POST',
-                data: {
-                    _token: '{{ csrf_token() }}', // CSRF token
-                    id: id,
-                    give_to: give_to
-                },
-                success: function(response) {
-                    $("#promocode-show").show();
-                    $("#give-to").hide();
-                    $("#floatingInput").val(response.promocode);
-                    $("#floatingInput2").val(response.promocode);
-                    console.log(response); // 顯示後端回應資料
-                },
-                error: function(xhr, status, error) {
-                    console.log(xhr.responseText); // 顯示錯誤資訊
-                }
         });
-        });
+
-    </script>
+</script>
-@endsection
+
+    @endsection

routes/admin.php

@@ -2,6 +2,7 @@
 use App\Http\Controllers\LoginController;
 use App\Http\Middleware\AdminRedirect;
 use App\Http\Middleware\AdminAuth;
+use App\Http\Controllers\Admin\RegisterController;
 
 use Illuminate\Support\Facades\Route;
 
@@ -13,14 +14,20 @@
 Route::get('/phpinfo', function () {
     return phpinfo();
 });
+/** no middleware
+ * ajxa 丟這
+ */
+Route::get('register', [RegisterController::class, 'index'])->name('register');
+Route::post('register/create', [RegisterController::class, 'registerCreate'])->name('register.create');
 
+/**
+ * has middleware admin 需登入
+ */
 Route::
         namespace('App\Http\Controllers\Admin') // 設置命名空間
     ->middleware([AdminRedirect::class, AdminAuth::class])
     ->group(function () {
         Route::get('/', 'IndexController@index')->name('index');
-        Route::get('register', 'RegisterController@index')->name('register');
-        Route::post('register/create', 'RegisterController@registerCreate')->name('register.create');
         Route::get('profile', 'IndexController@profile')->name('profile');
         Route::get('page-profile', 'IndexController@pageProfile')->name('page.profile');
 

routes/web.php

@@ -6,7 +6,6 @@
 use App\Http\Controllers\front\RegisterController;
 use App\Http\Controllers\LoginController;
 use App\Http\Middleware\GuestRedirect;
-use App\Http\Middleware\memberAuth;
 use App\Http\Middleware\MemberRedirect;
 use Illuminate\Support\Facades\Route;
 
@@ -48,9 +47,6 @@
 Route::get('google/callback', [LoginController::class, 'handleGoogleCallback'])->name('google.redirect');
 Route::patch('changelevel', [MemberController::class, 'changeLevel'])->name('member.changelevel');
 
-
-
-
 //前台route 登入後;
 Route::prefix('member')
     ->middleware(['auth:member']) // 使用自定义守卫的中间件