Update app.py

app.py

@@ -29,37 +29,48 @@ def get_bookings():
     except:
         return pd.DataFrame()
 
-# 🔥🔥🔥 核心邏輯：自動判斷是「確認信」還是「提醒信」 🔥🔥🔥
+# 🔥🔥🔥 核心修正：這裡決定「按下去要發什麼」 🔥🔥🔥
 def send_confirmation_hybrid(booking_id):
     if not booking_id: return "❌ 無效 ID"
     try:
+        # 1. 先去資料庫抓最新的狀態
         res = supabase.table("bookings").select("*").eq("id", booking_id).execute()
         if not res.data: return "❌ 找不到訂單"
         booking = res.data[0]
-        email, user_id = booking.get('email'), booking.get('user_id')
-        current_status = booking.get('status', '')
         
-        # 判斷是否為「已確認」狀態
-        is_confirmed = "確認" in current_status
-        
-        log_msg = f"🆔 {booking_id}: "
+        email = booking.get('email')
+        user_id = booking.get('user_id')
+        current_status = booking.get('status', '') # 抓取當前狀態
         
         confirm_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=confirm"
         cancel_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=cancel"
+        
+        log_msg = f"🆔 {booking_id}: "
 
-        # --- 內容生成邏輯 ---
-        if is_confirmed:
-            # 🔔 提醒模式 (Reminder)
-            mail_subject = f"🥂 訂位提醒: {booking['date']} - Cié Cié Taipei"
-            line_text = f"🔔 訂位提醒\n\n{booking['name']} 您好，期待今晚與您相見！\n\n📅 日期：{booking['date']}\n⏰ 時間：{booking['time']}\n👥 人數：{booking['pax']}位\n\n交通資訊：https://g.co/kgs/xxxx"
+        # 2. 判斷邏輯：是「已確認」還是「未確認」？
+        if "顧客已確認" in current_status:
+            # ==========================================
+            # 🔔 模式 A：發送「行前提醒」 (Reminder)
+            # ==========================================
+            action_type = "提醒"
+            mail_subject = f"🔔 行前提醒: {booking['date']} - Cié Cié Taipei"
             
-            # 提醒信 HTML (沒有確認按鈕，語氣為期待光臨)
+            # LINE 內容：強調期待光臨，沒有確認按鈕
+            line_text = (
+                f"🔔 行前提醒\n\n"
+                f"{booking['name']} 您好，期待今晚與您相見！\n\n"
+                f"📅 日期：{booking['date']}\n"
+                f"⏰ 時間：{booking['time']}\n"
+                f"👥 人數：{booking['pax']} 位\n\n"
+                f"若需更改行程，請聯繫我們或點擊下方連結取消。"
+            )
+            
+            # Email 內容：純提醒，只留取消按鈕
             mail_html = f"""
             <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif; border:1px solid #333;">
                 <h2 style="text-align:center; border-bottom:1px solid #444; padding-bottom:15px;">Cié Cié Taipei</h2>
-                <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，期待您的光臨！</p>
-                <p style="color:#aaa;">這是一封貼心提醒，我們已為您準備好座位：</p>
-                <div style="background:#2a2a2a; padding:15px; border-radius:8px; margin:20px 0; border-left:4px solid #2ecc71;">
+                <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，這是您的訂位提醒：</p>
+                <div style="background:#2a2a2a; padding:15px; border-radius:8px; margin:20px 0; border-left:4px solid #d4af37;">
                     <ul style="color:#ddd; padding-left:20px; line-height:1.8;">
                         <li>📅 日期：<strong style="color:#fff;">{booking['date']}</strong></li>
                         <li>⏰ 時間：<strong style="color:#fff;">{booking['time']}</strong></li>
@@ -67,22 +78,34 @@ def send_confirmation_hybrid(booking_id):
                     </ul>
                 </div>
                 <div style="text-align:center; margin-top:30px;">
-                    <span style="color:#888; font-size:0.9em;">若您行程有變，請點擊下方按鈕</span><br><br>
-                    <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:10px 25px; text-decoration:none; border-radius:50px;">🚫 取消或更改</a>
+                    <span style="color:#888;">我們已為您準備好座位，期待您的光臨。</span><br><br>
+                    <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:10px 20px; text-decoration:none; border-radius:50px; font-size:12px;">若無法前來，請點此取消</a>
                 </div>
             </div>
             """
-            action_log = "提醒信"
+            
         else:
-            # 🚀 確認模式 (Confirmation)
+            # ==========================================
+            # 🚀 模式 B：發送「訂位確認」 (Confirmation)
+            # ==========================================
+            action_type = "確認"
             mail_subject = f"訂位確認: {booking['date']} - Cié Cié Taipei"
-            line_text = f"✅ 訂位確認\n\n{booking['name']} 您好，已收到您的預約。\n\n📅 日期：{booking['date']}\n⏰ 時間：{booking['time']}\n👥 人數：{booking['pax']}位\n\n請查收 Email 確認信並點擊確認按鈕，謝謝！"
             
-            # 確認信 HTML (有確認按鈕)
+            # LINE 內容：包含確認請求
+            line_text = (
+                f"✅ 訂位確認\n\n"
+                f"{booking['name']} 您好，已收到您的預約。\n\n"
+                f"📅 日期：{booking['date']}\n"
+                f"⏰ 時間：{booking['time']}\n"
+                f"👥 人數：{booking['pax']} 位\n\n"
+                f"請務必查收 Email 確認信並點擊「確認出席」按鈕，謝謝！"
+            )
+            
+            # Email 內容：包含巨大的確認按鈕
             mail_html = f"""
             <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif; border:1px solid #333;">
                 <h2 style="text-align:center; border-bottom:1px solid #444; padding-bottom:15px;">Cié Cié Taipei</h2>
-                <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，已為您保留座位：</p>
+                <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，請確認您的訂位：</p>
                 <div style="background:#2a2a2a; padding:15px; border-radius:8px; margin:20px 0; border-left:4px solid #d4af37;">
                     <ul style="color:#ddd; padding-left:20px; line-height:1.8;">
                         <li>📅 日期：<strong style="color:#fff;">{booking['date']}</strong></li>
@@ -91,39 +114,37 @@ def send_confirmation_hybrid(booking_id):
                     </ul>
                 </div>
                 <div style="text-align:center; margin-top:30px;">
-                    <a href="{confirm_link}" style="display:inline-block; background:#d4af37; color:#000; padding:12px 30px; text-decoration:none; border-radius:50px; font-weight:bold; margin-right:10px;">✅ 確認出席</a>
-                    <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:11px 29px; text-decoration:none; border-radius:50px;">🚫 取消</a>
+                    <a href="{confirm_link}" style="display:inline-block; background:#d4af37; color:#000; padding:12px 30px; text-decoration:none; border-radius:50px; font-weight:bold; margin-right:10px;">✅ 確認出席 (Confirm)</a>
+                    <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:11px 29px; text-decoration:none; border-radius:50px;">🚫 取消 (Cancel)</a>
                 </div>
             </div>
             """
-            action_log = "確認信"
 
-        # 1. 發送 Email
+        # 3. 執行發送 (共用發送模組)
+        # Send Email
         if email and "@" in email and GAS_MAIL_URL:
             try:
                 requests.post(GAS_MAIL_URL, json={"to": email, "subject": mail_subject, "htmlBody": mail_html, "name": "Cié Cié Taipei"})
-                log_msg += f"✅ Mail({action_log}) "
+                log_msg += f"✅ Mail({action_type}) "
             except: log_msg += "❌ MailErr "
         
-        # 2. 發送 LINE
+        # Send LINE
         if user_id and len(str(user_id)) > 10 and LINE_ACCESS_TOKEN:
             try:
                 requests.post("https://api.line.me/v2/bot/message/push", 
                               headers={"Authorization": f"Bearer {LINE_ACCESS_TOKEN}"}, 
                               json={"to": user_id, "messages": [{"type": "text", "text": line_text}]})
-                log_msg += f"✅ LINE({action_log}) "
+                log_msg += f"✅ LINE({action_type}) "
             except: log_msg += "❌ LINEErr"
 
-        # 3. 狀態更新
-        # 如果本來就是已確認，發送提醒後狀態不變
-        # 如果本來是待處理，發送後變更為已發確認信
-        if not is_confirmed:
+        # 4. 更新資料庫狀態 (只有在非確認狀態下才更新，避免覆蓋「已確認」)
+        if action_type == "確認":
             supabase.table("bookings").update({"status": "已發確認信"}).eq("id", booking_id).execute()
         
         return log_msg
     except Exception as e: return f"Error: {e}"
 
-# 🔥🔥🔥 卡片渲染 (按鈕依狀態變更文字) 🔥🔥🔥
+# 🔥🔥🔥 卡片渲染 (介面邏輯：決定按鈕長怎樣) 🔥🔥🔥
 def render_booking_cards():
     df = get_bookings()
     
@@ -147,23 +168,23 @@ def render_booking_cards():
             status_color = "#f1c40f"; border_color = "#f1c40f"
 
         is_canceled = '取消' in status
-        is_confirmed = '確認' in status
+        is_confirmed = '確認' in status # 判斷是否已確認
         
+        # 🟢 修正重點：只要不是已取消，按鈕永遠可以點擊，只是文字不同
         btn_onclick = "" if is_canceled else f"cardAction({row['id']})"
         
-        # 按鈕樣式邏輯
         if is_canceled:
             btn_style = "background: #333; color: #666; cursor: not-allowed;"
             btn_text = "🚫 已取消"
         elif is_confirmed:
-            # 🔔 已確認狀態 -> 顯示發送提醒
-            btn_style = "background: #2c3e50; color: #fff; border: 1px solid #555; box-shadow: 0 0 10px rgba(46, 204, 113, 0.2);"
-            btn_text = "🔔 發送提醒" 
+            # 🔔 狀態是「顧客已確認」時，按鈕變成「發送提醒」
+            # 點擊後 -> 觸發 send_confirmation_hybrid -> 函式內會判斷狀態 -> 發送「提醒信」
+            btn_style = "background: #2c3e50; color: #fff; border: 1px solid #555; box-shadow: 0 0 8px rgba(46, 204, 113, 0.3);"
+            btn_text = "🔔 發送提醒"
         elif '已發' in status:
-            btn_style = "background: #444; color: #ddd; border: 1px solid #666;"
+            btn_style = "background: #2c3e50; color: #ddd; border: 1px solid #555;"
             btn_text = "🔄 重發確認"
         else:
-            # 待處理狀態 -> 顯示發送確認
             btn_style = "background: #d4af37; color: #000; font-weight:800; box-shadow: 0 4px 12px rgba(212, 175, 55, 0.5);"
             btn_text = "🚀 發送確認"
 
@@ -276,7 +297,6 @@ def check_login(user, password):
 js_logic = """
 function() {
     window.cardAction = function(id) {
-        // 抓取輸入框 (兼容 Number 和 Textbox 結構)
         let idInput = document.querySelector('#hidden_id_input input') || 
                       document.querySelector('#hidden_id_input textarea');
         
@@ -293,7 +313,7 @@ function() {
 }
 """
 
-# --- CSS (隱藏操作區的關鍵) ---
+# --- CSS (修復元件隱藏問題) ---
 custom_css = """
 body, .gradio-container { background-color: #0F0F0F; color: #fff; }
 
@@ -313,7 +333,6 @@ button:active { transform: scale(0.96); }
     border-radius: 10px;
 }
 
-/* 🔥 關鍵：隱藏操作區，但保持 visible=True 以供 JS 存取 */
 #hidden_ops {
     display: none !important;
 }
@@ -322,7 +341,6 @@ button:active { transform: scale(0.96); }
 # --- 介面 ---
 with gr.Blocks(title="Admin") as demo:
     
-    # 1. 登入
     with gr.Group(visible=True) as login_row:
         gr.Markdown("# 🔒 Login")
         with gr.Row():
@@ -331,30 +349,26 @@ with gr.Blocks(title="Admin") as demo:
         login_btn = gr.Button("Enter", variant="primary")
         error_msg = gr.Markdown("")
         
-    # 2. 後台
     with gr.Group(visible=False) as admin_row:
         with gr.Row(variant="panel", elem_id="header-panel"):
             gr.Markdown("### 🍷 Cié Cié Dashboard")
             refresh_btn = gr.Button("🔄 刷新列表", size="sm", variant="secondary")
         
-        # 卡片顯示區
         booking_display = gr.HTML(elem_id="booking_display")
         
-        # 🔥 隱藏的操作區 (visible=True, CSS隱藏)
+        # 🔥 隱藏的操作區 (確保 visible=True)
         with gr.Column(visible=True, elem_id="hidden_ops"):
             hidden_id_input = gr.Number(elem_id="hidden_id_input", precision=0)
             hidden_send_btn = gr.Button("Send", elem_id="hidden_send_btn")
         
         log_output = gr.Textbox(label="系統日誌 (System Log)", lines=1, interactive=False)
         
-        # 綁定事件
         login_btn.click(check_login, inputs=[username_input, password_input], outputs=[login_row, admin_row, error_msg]).then(
             render_booking_cards, outputs=booking_display
         )
         
         refresh_btn.click(render_booking_cards, outputs=booking_display)
         
-        # 發送事件
         hidden_send_btn.click(
             send_confirmation_hybrid, 
             inputs=hidden_id_input, 
@@ -364,7 +378,6 @@ with gr.Blocks(title="Admin") as demo:
             outputs=booking_display
         )
 
-    # 載入 JS 與 CSS
     demo.launch(css=custom_css, js=js_logic)
 
 if __name__ == "__main__":