Update app.py

app.py

@@ -4,8 +4,10 @@ import requests
 from supabase import create_client, Client
 from datetime import datetime, timedelta, timezone
 
-# --- 設定 ---
+# 設定台北時區
 TAIPEI_TZ = timezone(timedelta(hours=8))
+
+# --- 1. 連線設定 ---
 LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN")
 LINE_ADMIN_ID = os.getenv("LINE_ADMIN_ID")
 SUPABASE_URL = os.getenv("SUPABASE_URL")
@@ -13,15 +15,10 @@ SUPABASE_KEY = os.getenv("SUPABASE_KEY")
 
 if SUPABASE_URL and SUPABASE_KEY:
     supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
+else:
+    print("⚠️ 警告：SUPABASE 環境變數未設定")
 
-# --- 📅 座位控管設定 (在此修改特殊節日上限) ---
-DEFAULT_LIMIT = 30 
-SPECIAL_DAYS = {
-    "2026-12-31": 10, # 跨年夜
-    "2026-02-14": 15  # 情人節
-}
-
-# --- 輔助函式 ---
+# --- 2. 輔助函式 (日期與時間) ---
 def get_date_options():
     options = []
     today = datetime.now(TAIPEI_TZ)
@@ -41,154 +38,147 @@ def update_time_slots(date_str):
     except: return gr.update(choices=[]), "日期格式錯誤"
 
     slots = ["18:00", "18:30", "19:00", "19:30", "20:00", "20:30", 
-             "21:00", "21:30", "22:00", "22:30", "23:00", "23:30", "00:00", "00:30", "01:00"]
-    if weekday == 4 or weekday == 5: slots.extend(["01:30", "02:00", "02:30"])
-    
-    # 檢查剩餘座位
-    clean_date = date_str.split(" ")[0]
-    daily_limit = SPECIAL_DAYS.get(clean_date, DEFAULT_LIMIT)
+             "21:00", "21:30", "22:00", "22:30", "23:00", "23:30", 
+             "00:00", "00:30", "01:00"]
     
-    try:
-        res = supabase.table("bookings").select("pax").eq("date", date_str).neq("status", "顧客已取消").execute()
-        current_total = sum([item['pax'] for item in res.data])
-        remaining = daily_limit - current_total
-        status_msg = f"✨ {date_str} (剩餘座位: {remaining} 位)"
-    except: status_msg = f"✨ {date_str}"
-
+    if weekday == 4 or weekday == 5: 
+        slots.extend(["01:30", "02:00", "02:30"])
+        status_msg = f"✨ 已選擇 {date_str} (週末營業至 03:00)"
+    else:
+        slots.extend(["01:30"])
+        status_msg = f"🌙 已選擇 {date_str} (平日營業至 02:00)"
+        
     return gr.update(choices=slots, value=slots[0] if slots else None), status_msg
 
-# --- 核心邏輯 ---
+# --- [新功能] 抓取網址中的 LINE ID ---
 def get_line_id_from_url(request: gr.Request):
-    if request: return request.query_params.get("line_id", "")
+    if request:
+        return request.query_params.get("line_id", "")
     return ""
 
-def handle_booking(name, tel, email, date_str, time, pax, remarks, line_id):
+# --- 3. 核心邏輯：處理訂位 ---
+def handle_booking(name, tel, email, date_str, time, pax, remarks, line_id): # 新增 line_id
     if not name or not tel or not date_str or not time:
-        return "⚠️ 請完整填寫必填欄位"
-
-    # 座位檢查
-    clean_date = date_str.split(" ")[0]
-    daily_limit = SPECIAL_DAYS.get(clean_date, DEFAULT_LIMIT)
-    try:
-        res = supabase.table("bookings").select("pax").eq("date", date_str).neq("status", "顧客已取消").execute()
-        if sum([i['pax'] for i in res.data]) + pax > daily_limit:
-            return "⚠️ 抱歉，該時段剩餘座位不足，請調整人數或日期。"
-    except: pass
-
-    # 防重複
+        return "⚠️ 請完整填寫必填欄位 (姓名、電話、日期、時間)"
+    
+    # 防呆機制：檢查是否重複提交
     try:
-        existing = supabase.table("bookings").select("id").eq("tel", tel).eq("date", date_str).eq("time", time).neq("status", "顧客已取消").execute()
-        if existing.data: return "⚠️ 您已預約過此時段，請勿重複提交。"
+        existing = supabase.table("bookings").select("id")\
+            .eq("tel", tel).eq("date", date_str).eq("time", time)\
+            .neq("status", "顧客已取消").execute()
+        if existing.data and len(existing.data) > 0:
+            return "⚠️ 系統偵測到您已預約過此時段，請勿重複提交。"
     except: pass
 
-    data = {"name": name, "tel": tel, "email": email, "date": date_str, "time": time, "pax": pax, "remarks": remarks, "status": "待處理", "user_id": line_id}
+    # 準備資料 (新增 user_id)
+    data = {
+        "name": name, "tel": tel, "email": email, "date": date_str, "time": time, 
+        "pax": pax, "remarks": remarks, "status": "待處理",
+        "user_id": line_id  # 存入 LINE ID
+    }
     
     try:
+        # 寫入資料庫
         supabase.table("bookings").insert(data).execute()
+        
+        # 發送 LINE Notify 給老闆 (顯示來源)
         if LINE_ACCESS_TOKEN and LINE_ADMIN_ID:
-            src = "🟢 LINE用戶" if line_id else "⚪ 訪客"
-            msg = f"🔥 新訂位 ({src})\n{name} / {tel}\n{date_str} {time} ({pax}人)"
-            requests.post("https://api.line.me/v2/bot/message/push", headers={"Authorization": f"Bearer {LINE_ACCESS_TOKEN}", "Content-Type": "application/json"}, json={"to": LINE_ADMIN_ID, "messages": [{"type": "text", "text": msg}]})
+            source = "🟢 LINE用戶" if line_id else "⚪ 一般訪客"
+            msg = f"🔥 新訂位 ({source})\n姓名：{name}\n電話：{tel}\n時間：{date_str} {time}\n人數：{pax}"
+            requests.post("https://api.line.me/v2/bot/message/push", 
+                          headers={"Authorization": f"Bearer {LINE_ACCESS_TOKEN}", "Content-Type": "application/json"},
+                          json={"to": LINE_ADMIN_ID, "messages": [{"type": "text", "text": msg}]})
         
-        return """<div style='text-align: center; color: #fff; padding: 20px; border: 1px solid #d4af37; border-radius: 8px; background: #222;'><h2 style='color: #d4af37; margin: 0;'>Request Received</h2><p style='margin: 10px 0;'>🥂 預約申請已提交</p><p style='font-size: 0.9em; color: #aaa;'>請留意 Email 確認信。</p></div>"""
-    except Exception as e: return f"❌ 系統錯誤: {str(e)}"
-
-# --- Webhook (確認/取消) ---
+        return """
+        <div style='text-align: center; color: #fff; padding: 20px; border: 1px solid #d4af37; border-radius: 8px; background: #222;'>
+            <h2 style='color: #d4af37; margin: 0;'>Request Received</h2>
+            <p style='margin: 10px 0;'>🥂 預約申請已提交</p>
+            <p style='font-size: 0.9em; color: #aaa;'>系統將發送確認信至您的 Email。</p>
+            <p style='font-size: 0.85em; color: #ff5252; margin-top: 5px;'>(若未收到，請檢查您的<b>垃圾信件匣</b>)</p>
+        </div>
+        """
+    except Exception as e:
+        print(f"Error: {e}")
+        return f"❌ 系統錯誤: {str(e)}"
+
+# --- 4. 核心邏輯：處理確認連結 (Webhook) ---
 def check_confirmation(request: gr.Request):
     if not request: return ""
-    action = request.query_params.get('action')
-    bid = request.query_params.get('id')
+    params = request.query_params
+    action = params.get('action')
+    bid = params.get('id')
     
     if action == 'confirm' and bid:
         try:
             supabase.table("bookings").update({"status": "顧客已確認"}).eq("id", bid).execute()
-            return f"""<script>alert('✅ 訂位已確認 (編號 {bid})');</script><div style='padding:20px; background:#d4af37; color:black; text-align:center; border-radius:8px;'>🎉 感謝確認！</div>"""
+            return f"""<script>document.addEventListener('DOMContentLoaded', function() {{alert('✅ 感謝您！訂位已確認 (編號 {bid})');}});</script><div style='padding:20px; background:#d4af37; color:black; text-align:center; margin-bottom:20px; border-radius:8px; font-weight:bold;'>🎉 感謝您的確認！我們期待您的光臨。 (訂單編號: {bid})</div>"""
         except: return ""
+
     elif action == 'cancel' and bid:
         try:
             supabase.table("bookings").update({"status": "顧客已取消"}).eq("id", bid).execute()
-            return f"""<script>alert('已取消訂位 (編號 {bid})');</script><div style='padding:20px; background:#333; color:#ff5252; text-align:center; border:1px solid #ff5252; border-radius:8px;'>🚫 訂位已取消。</div>"""
+            return f"""<script>document.addEventListener('DOMContentLoaded', function() {{alert('已為您取消訂位 (編號 {bid})');}});</script><div style='padding:20px; background:#333; border: 1px solid #ff5252; color:#ff5252; text-align:center; margin-bottom:20px; border-radius:8px;'>🚫 訂位已取消。<br>期待您下次有機會再來訪。</div>"""
         except: return ""
     return ""
 
-# --- 6. 介面設定 (Theme & CSS) ---
+# --- 5. 介面設定 (保留您的樣式) ---
 theme = gr.themes.Soft(
-    primary_hue="amber",
-    neutral_hue="zinc",
+    primary_hue="amber", neutral_hue="zinc",
     font=[gr.themes.GoogleFont("Playfair Display"), "ui-sans-serif", "sans-serif"],
 ).set(
-    body_background_fill="#0F0F0F",
-    block_background_fill="#1a1a1a",
-    block_border_width="1px",
-    block_border_color="#333",
-    input_background_fill="#262626",
-    input_border_color="#444",
-    body_text_color="#E0E0E0",
-    block_title_text_color="#d4af37",
-    button_primary_background_fill="#d4af37",
-    button_primary_text_color="#000000",
+    body_background_fill="#0F0F0F", block_background_fill="#1a1a1a", block_border_width="1px", block_border_color="#333",
+    input_background_fill="#262626", input_border_color="#444", body_text_color="#E0E0E0", block_title_text_color="#d4af37",
+    button_primary_background_fill="#d4af37", button_primary_text_color="#000000",
 )
 
 custom_css = """
 footer {display: none !important;}
 .gradio-container, .block, .row, .column { overflow: visible !important; }
-.options, .wrap .options {
-    background-color: #262626 !important;
-    border: 1px solid #d4af37 !important;
-    z-index: 10000 !important;
-    box-shadow: 0 5px 15px rgba(0,0,0,0.5);
-}
+.options, .wrap .options { background-color: #262626 !important; border: 1px solid #d4af37 !important; z-index: 10000 !important; box-shadow: 0 5px 15px rgba(0,0,0,0.5); }
 .item, .options .item { color: #E0E0E0 !important; padding: 8px 12px !important; }
 .item:hover, .item.selected, .options .item:hover { background-color: #d4af37 !important; color: black !important; }
 input:focus, .dropdown-trigger:focus-within { border-color: #d4af37 !important; box-shadow: 0 0 8px rgba(212, 175, 55, 0.4) !important; }
 h3 { border-bottom: 1px solid #444; padding-bottom: 5px; margin-bottom: 10px; }
-.legal-footer {
-    text-align: center; margin-top: 15px; padding-top: 15px; border-top: 1px solid #333; color: #666; font-size: 0.75rem; line-height: 1.5; font-family: sans-serif;
-}
+.legal-footer { text-align: center; margin-top: 15px; padding-top: 15px; border-top: 1px solid #333; color: #666; font-size: 0.75rem; line-height: 1.5; font-family: sans-serif; }
 .legal-footer strong { color: #888; }
 """
 
-# --- 7. 介面佈局 (完整版) ---
+# --- 6. 介面佈局 ---
 with gr.Blocks(theme=theme, css=custom_css, title="Booking") as demo:
     
-    # [隱藏] 用來接收 URL 確認參數的區塊
+    # [新功能] 隱藏欄位接收 LINE ID
+    line_id_state = gr.Textbox(visible=False)
     confirm_msg_box = gr.HTML()
     
-    # 頁面載入時，執行 check_confirmation
-    demo.load(check_confirmation, inputs=None, outputs=confirm_msg_box)
+    # 載入時執行 JS 抓取參數
+    demo.load(get_line_id_from_url, None, line_id_state)
+    demo.load(check_confirmation, None, confirm_msg_box)
 
     with gr.Row():
         with gr.Column():
             gr.Markdown("### 📅 預約資訊 Booking Info")
-
-            date_options = get_date_options()
-            booking_date = gr.Dropdown(choices=date_options, label="選擇日期 Select Date", interactive=True)
+            booking_date = gr.Dropdown(choices=get_date_options(), label="選擇日期 Select Date", interactive=True)
             pax_count = gr.Slider(minimum=1, maximum=10, value=2, step=1, label="用餐人數 Guest Count")
-
         with gr.Column():
              gr.Markdown("### 🕰️ 選擇時段 Time Slot")
              status_box = gr.Markdown("請先選擇日期...", visible=True)
              time_slot = gr.Dropdown(choices=[], label="可用時段 Available Time", interactive=True)
 
     gr.HTML("<div style='height: 10px'></div>")
-
     gr.Markdown("### 👤 聯絡人資料 Contact，收到確認 E-Mail 並點擊 確認出席 才算訂位成功")
     with gr.Group():
         with gr.Row():
             cust_name = gr.Textbox(label="訂位姓名 Name *", placeholder="ex. 王小明")
             cust_tel = gr.Textbox(label="手機號碼 Phone *", placeholder="ex. 0912-xxx-xxx")
-        
         with gr.Row():
             cust_email = gr.Textbox(label="電子信箱 E-mail (接收確認信用，請記得檢查垃圾信件匣。)", placeholder="example@gmail.com")
         with gr.Row():
             cust_remarks = gr.Textbox(label="備註 Remarks (過敏/慶生/特殊需求)", lines=2)
 
     gr.HTML("<div style='height: 15px'></div>")
-    
     submit_btn = gr.Button("確認預約 Request Booking (系統會記錄是否曾 No Show)", size="lg", variant="primary")
     output_msg = gr.HTML()
-
-    # 頁尾警語
+    
     gr.HTML("""
     <div class="legal-footer">
         <p style="margin-bottom: 5px;">© 2026 CIE CIE TAIPEI. All Rights Reserved.</p>
@@ -197,14 +187,12 @@ with gr.Blocks(theme=theme, css=custom_css, title="Booking") as demo:
     </div>
     """)
 
-    # --- 互動事件綁定 ---
-    # 1. 日期改變 -> 更新時段
     booking_date.change(update_time_slots, inputs=booking_date, outputs=[time_slot, status_box])
     
-    # 2. 送出按鈕 -> 處理訂位
+    # [關鍵] 送出時把 line_id_state 也傳進去
     submit_btn.click(
         handle_booking, 
-        inputs=[cust_name, cust_tel, cust_email, booking_date, time_slot, pax_count, cust_remarks], 
+        inputs=[cust_name, cust_tel, cust_email, booking_date, time_slot, pax_count, cust_remarks, line_id_state], 
         outputs=output_msg
     )