From 2b8c5be3d12fb42b1a2d61d4ddc3f89efbb13dda Mon Sep 17 00:00:00 2001
From: ukyo <ukyo02@gmail.com>
Date: Thu, 4 Jun 2026 10:02:10 +0800
Subject: [PATCH] =?UTF-8?q?feat.=E4=BE=8B=E8=A1=8Cpush?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/front/PromoCodeController.php | 14 ++++++++------
 app/Models/Member.php                              |  5 +++--
 resources/views/front/member/index.blade.php       |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/front/PromoCodeController.php b/app/Http/Controllers/front/PromoCodeController.php
index 3069111..064af7d 100644
--- a/app/Http/Controllers/front/PromoCodeController.php
+++ b/app/Http/Controllers/front/PromoCodeController.php
@@ -23,23 +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)
-            ->where(
-                'valid_from',
-                '<=',
-                now()
-            )->where('valid_to', '>=', now())
             ->first();
+
+
+
+        if (!$row) {
+            return response()->json(['status' => 'error', 'msg' => '目前無可用的優惠碼']);
+        }
+
         $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
diff --git a/app/Models/Member.php b/app/Models/Member.php
index 546c846..7e233ea 100644
--- a/app/Models/Member.php
+++ b/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
     {
diff --git a/resources/views/front/member/index.blade.php b/resources/views/front/member/index.blade.php
index 10ae3a1..a587b4c 100644
--- a/resources/views/front/member/index.blade.php
+++ b/resources/views/front/member/index.blade.php
@@ -278,7 +278,7 @@ class='ri-bar-chart-2-line ri-24px text-body me-4'></i>消費紀錄</h5>
 $(document).ready(function() {
     console.log("Document is ready");
     var id = "{{ Auth::guard('member')->user()->id }}";
-    $("#promocode").hide();
+    $("#promocode-show").hide();
     $("#promocode-show-teamaster").hide();
     $("#tea-give-to").hide();
     // 建立 QR Code