Update app.py

app.py

@@ -1,110 +1,73 @@
 import gradio as gr
 import os
 import pandas as pd
-import requests  # 👈 改用 requests 發送 HTTP 請求
+import requests
 from supabase import create_client, Client
-from datetime import datetime, timedelta, timezone
 
-# 設定台北時區 (雖然這個檔案目前沒用到，但保留著好習慣)
-TAIPEI_TZ = timezone(timedelta(hours=8))
-
-# --- 設定 ---
 SUPABASE_URL = os.getenv("SUPABASE_URL")
 SUPABASE_KEY = os.getenv("SUPABASE_KEY")
-GAS_MAIL_URL = os.getenv("GAS_MAIL_URL") # 👈 讀取 GAS 網址
-# ⚠️ 請務必確認這裡填的是您 Space A (前端) 的網址
-PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space"
+GAS_MAIL_URL = os.getenv("GAS_MAIL_URL")
+LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN")
+PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space" # 請確認此網址正確
 
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
-
-# --- 讀取管理員帳號密碼 (從 Secrets 讀取更安全) ---
 ADMIN_USER = os.getenv("ADMIN_USER")
 ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD")
 
 def get_bookings():
-    response = supabase.table("bookings").select("*").order("created_at", desc=True).execute()
-    if not response.data: return pd.DataFrame()
-    df = pd.DataFrame(response.data)
-    # 確保欄位順序與存在
-    cols = ['id', 'date', 'time', 'name', 'tel', 'email', 'pax', 'remarks', 'status']
-    for c in cols:
+    res = supabase.table("bookings").select("*").order("created_at", desc=True).execute()
+    if not res.data: return pd.DataFrame()
+    df = pd.DataFrame(res.data)
+    cols = ['id', 'date', 'time', 'name', 'tel', 'email', 'pax', 'remarks', 'status', 'user_id']
+    for c in cols: 
         if c not in df.columns: df[c] = ""
     return df[cols]
 
-def send_confirmation_email(booking_id):
-    """透過 Google Apps Script 中繼站發信 (包含 確認 與 取消 雙按鈕)"""
+def send_confirmation_hybrid(booking_id):
     try:
-        if not GAS_MAIL_URL:
-            return "❌ 錯誤：未設定 GAS_MAIL_URL Secret"
-
-        # 1. 抓取資料
         res = supabase.table("bookings").select("*").eq("id", booking_id).execute()
-        if not res.data: return "❌ 找不到該訂單"
+        if not res.data: return "❌ 找不到訂單"
         booking = res.data[0]
+        email, user_id = booking.get('email'), booking.get('user_id')
+        log_msg = ""
         
-        email = booking.get('email')
-        if not email or "@" not in email: return "❌ 客人未填寫有效 Email"
-
-        # 2. 產生連結 (⚠️ 修正點：補回取消連結)
         confirm_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=confirm"
         cancel_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=cancel"
 
-        # 3. 準備信件內容 (HTML 包含雙按鈕)
-        html_content = f"""
-        <div style="padding: 20px; background: #111; color: #d4af37; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; border-radius: 10px; max-width: 600px; margin: 0 auto;">
-            <h2 style="border-bottom: 1px solid #d4af37; padding-bottom: 15px; text-align: center; letter-spacing: 2px;">Cié Cié Taipei</h2>
-            
-            <p style="font-size: 16px; margin-top: 20px;">{booking['name']} 您好，</p>
-            <p style="font-size: 16px; color: #ccc;">感謝您的預約，我們已為您保留座位：</p>
-            
-            <div style="background: #222; padding: 15px; border-radius: 8px; margin: 20px 0; border-left: 4px solid #d4af37;">
-                <ul style="color: #eee; list-style: none; padding: 0; margin: 0; line-height: 1.8;">
-                    <li>📅 <b>日期：</b> {booking['date']}</li>
-                    <li>⏰ <b>時間：</b> {booking['time']}</li>
-                    <li>👥 <b>人數：</b> {booking['pax']} 位</li>
-                    <li>📝 <b>備註：</b> {booking.get('remarks') or '無'}</li>
-                </ul>
+        # 1. Email 發送
+        if email and "@" in email:
+            html = f"""
+            <div style="padding:20px; background:#111; color:#d4af37; border-radius:10px; max-width:600px; margin:0 auto; font-family:sans-serif;">
+                <h2 style="border-bottom:1px solid #d4af37; padding-bottom:15px; text-align:center;">Cié Cié Taipei</h2>
+                <p>{booking['name']} 您好，已為您保留座位：</p>
+                <div style="background:#222; padding:15px; border-radius:8px;">
+                    <ul style="color:#eee; list-style:none; padding:0; margin:0; line-height:1.8;">
+                        <li>📅 {booking['date']} | ⏰ {booking['time']}</li>
+                        <li>👥 {booking['pax']} 位</li>
+                        <li>📝 {booking.get('remarks') or '無'}</li>
+                    </ul>
+                </div>
+                <div style="text-align:center; margin-top:25px;">
+                    <a href="{confirm_link}" style="background:#d4af37; color:#000; padding:12px 25px; text-decoration:none; border-radius:5px; margin:0 10px; font-weight:bold;">✅ 確認出���</a>
+                    <a href="{cancel_link}" style="border:1px solid #ff5252; color:#ff5252; padding:11px 24px; text-decoration:none; border-radius:5px; margin:0 10px; font-weight:bold;">🚫 取消</a>
+                </div>
             </div>
-
-            <p style="text-align: center; margin-top: 30px; font-weight: bold; color: #fff;">請選擇您的回覆：</p>
-
-            <div style="text-align: center; margin-top: 15px; margin-bottom: 30px;">
-                <a href="{confirm_link}" style="display: inline-block; background: #d4af37; color: #000; padding: 12px 30px; text-decoration: none; border-radius: 5px; font-weight: bold; margin: 0 10px;">
-                    ✅ 確認出席
-                </a>
-                
-                <a href="{cancel_link}" style="display: inline-block; background: transparent; color: #ff5252; padding: 11px 29px; text-decoration: none; border-radius: 5px; font-weight: bold; border: 1px solid #ff5252; margin: 0 10px;">
-                    🚫 取消訂位
-                </a>
-            </div>
-
-            <hr style="border: 0; border-top: 1px solid #333;">
-            <p style="color: #666; font-size: 12px; text-align: center; margin-top: 20px;">
-                此郵件為系統自動發送。<br>
-                如需人工服務，請致電 02-2709-3446
-            </p>
-        </div>
-        """
-
-        # 4. 呼叫 GAS 發信
-        payload = {
-            "to": email,
-            "subject": f"[{booking['date']}] Cié Cié Taipei 訂位確認信",
-            "htmlBody": html_content,
-            "name": "Cié Cié Taipei"
-        }
-        
-        response = requests.post(GAS_MAIL_URL, json=payload)
-        
-        if response.status_code == 200:
-            # 5. 更新狀態
-            supabase.table("bookings").update({"status": "已發確認信"}).eq("id", booking_id).execute()
-            return f"✅ 已透過 GAS 發送確認信給 {booking['name']} ({email})"
-        else:
-            return f"❌ GAS 回傳錯誤: {response.text}"
+            """
+            requests.post(GAS_MAIL_URL, json={"to": email, "subject": f"[{booking['date']}] 訂位確認", "htmlBody": html, "name": "Cié Cié Taipei"})
+            log_msg += f"✅ Email ok "
         
-    except Exception as e:
-        return f"❌ 發信失敗: {str(e)}"
+        # 2. LINE 發送
+        if user_id and len(str(user_id)) > 10 and LINE_ACCESS_TOKEN:
+            try:
+                line_msg = f"【訂位確認】{booking['name']} 您好\n已為您保留 {booking['date']} {booking['time']} ({booking['pax']}位)。\n\n如需取消請直接回覆，期待您的光臨！"
+                requests.post("https://api.line.me/v2/bot/message/push", headers={"Authorization": f"Bearer {LINE_ACCESS_TOKEN}", "Content-Type": "application/json"}, json={"to": user_id, "messages": [{"type": "text", "text": line_msg}]})
+                log_msg += "| ✅ LINE ok"
+            except: log_msg += "| ❌ LINE fail"
+        else: log_msg += "| ℹ️ No LINE ID"
+
+        supabase.table("bookings").update({"status": "已發確認信"}).eq("id", booking_id).execute()
+        return log_msg
+    except Exception as e: return f"❌ Error: {str(e)}"
 
 # --- 介面 ---
 with gr.Blocks(title="Admin") as demo: