Update app.py

app.py

@@ -3,113 +3,82 @@ import os
 import pandas as pd
 import requests
 from supabase import create_client, Client
-from datetime import datetime, timedelta, timezone
 
-# --- 設定 ---
 SUPABASE_URL = os.getenv("SUPABASE_URL")
 SUPABASE_KEY = os.getenv("SUPABASE_KEY")
 GAS_MAIL_URL = os.getenv("GAS_MAIL_URL")
-LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN") # 記得在 Space B Secrets 也要加這個
-# ⚠️ 請確認這裡填的是您 Space A 的網址
-PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space"
+LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN")
+PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space" 
 
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 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)
+    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:
+    for c in cols: 
         if c not in df.columns: df[c] = ""
     return df[cols]
 
 def send_confirmation_hybrid(booking_id):
-    """混合發送：Email (必發) + LINE (如果客人有 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')
-        user_id = booking.get('user_id') # 抓取 LINE ID
-
-        # 產生連結
         confirm_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=confirm"
         cancel_link = f"{PUBLIC_SPACE_URL}/?id={booking_id}&action=cancel"
-        
-        log_msg = ""
 
-        # --- A. 發送 Email ---
+        # 1. Email 發送
         if email and "@" in email:
-            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>
-                <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>📅 {booking['date']}</li>
-                        <li>⏰ {booking['time']}</li>
+            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: 20px;">
-                    <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; border: 1px solid #ff5252; color: #ff5252; padding: 11px 29px; text-decoration: none; border-radius: 5px; font-weight: bold; margin: 0 10px;">🚫 取消訂位</a>
+                <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>
-                <hr style="border: 0; border-top: 1px solid #333; margin-top: 30px;">
-                <p style="color: #666; font-size: 12px; text-align: center;">此郵件為系統自動發送。</p>
             </div>
             """
-            requests.post(GAS_MAIL_URL, json={"to": email, "subject": f"[{booking['date']}] Cié Cié Taipei 訂位確認信", "htmlBody": html_content, "name": "Cié Cié Taipei"})
-            log_msg += f"✅ Email 已發 ({email}) "
-        else:
-            log_msg += "⚠️ Email 無效 "
-
-        # --- B. 發送 LINE 通知 (如果有 ID) ---
+            requests.post(GAS_MAIL_URL, json={"to": email, "subject": f"[{booking['date']}] 訂位確認", "htmlBody": html, "name": "Cié Cié Taipei"})
+            log_msg += f"✅ Email ok "
+        
+        # 2. LINE 發送
         if user_id and len(str(user_id)) > 10 and LINE_ACCESS_TOKEN:
             try:
-                line_text = f"【訂位確認】{booking['name']} 您好\n我們已為您保留 {booking['date']} {booking['time']} ({booking['pax']}位)。\n\n如需取消，請點擊 Email 中的連結，或直接回覆此訊息。期待您的光臨！"
-                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_text}]}
-                )
-                log_msg += "| ✅ LINE 通知已發"
-            except Exception as e:
-                log_msg += f"| ❌ LINE 失敗: {e}"
-        else:
-            log_msg += "| ℹ️ 無 LINE ID (僅發 Email)"
+                line_msg = f"【訂位確認】{booking['name']} 您好\n已為您保留 {booking['date']} {booking['time']} ({booking['pax']}位)。\n\n如需取消請直接回覆，或點擊 Email 中的連結。期待您的光臨！"
+                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"❌ 發信失敗: {str(e)}"
+    except Exception as e: return f"❌ Error: {str(e)}"
 
-# --- 介面 ---
 with gr.Blocks(title="Admin") as demo:
     gr.Markdown("# 🍷 訂位管理後台")
     refresh_btn = gr.Button("🔄 重新整理")
     booking_table = gr.Dataframe(interactive=False)
-    
     with gr.Row():
         id_input = gr.Number(label="訂單 ID", precision=0)
-        action_btn = gr.Button("📧 發送確認信 (自動判斷)", variant="primary")
-    
-    log_output = gr.Textbox(label="執行結果")
-
+        action_btn = gr.Button("📧 發送確認信 (Hybrid)", variant="primary")
+    log_output = gr.Textbox(label="結果")
     refresh_btn.click(get_bookings, outputs=booking_table)
     action_btn.click(send_confirmation_hybrid, inputs=id_input, outputs=log_output)
 
 if __name__ == "__main__":
-    user = ADMIN_USER if ADMIN_USER else "admin"
-    pwd = ADMIN_PASSWORD if ADMIN_PASSWORD else "123456"
-    demo.launch(auth=(user, pwd))
+    demo.launch(auth=(ADMIN_USER or "admin", ADMIN_PASSWORD or "123456"))