Update app.py

app.py

@@ -5,69 +5,67 @@ 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")
 LINE_ACCESS_TOKEN = os.getenv("LINE_ACCESS_TOKEN")
-PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space" 
+PUBLIC_SPACE_URL = "https://deeplearning101-ciecietaipei.hf.space" # 您的官網網址
 
-# 取得帳密
 REAL_ADMIN_USER = os.getenv("ADMIN_USER") or "Deep Learning 101"
 REAL_ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD") or "2016-11-11"
 
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
+# ==========================================
+# 模組 1：訂位與通知管理
+# ==========================================
+
 def get_bookings():
     try:
         res = supabase.table("bookings").select("*").order("created_at", desc=True).execute()
         if not res.data: return pd.DataFrame()
         return pd.DataFrame(res.data)
-    except:
+    except Exception as e:
+        print("Fetch bookings error:", e)
         return pd.DataFrame()
 
-# 🔥🔥🔥 核心後端：智慧判斷發送邏輯 (修正 LINE 連結) 🔥🔥🔥
 def send_confirmation_hybrid(booking_id):
     if not booking_id: return "❌ 請輸入訂單 ID"
     
     try:
-        # 1. 撈資料
+        # 1. 撈取訂位資料
         res = supabase.table("bookings").select("*").eq("id", booking_id).execute()
         if not res.data: return f"❌ 找不到 ID: {booking_id}"
         booking = res.data[0]
         
         email = booking.get('email')
-        user_id = booking.get('user_id')
+        user_id = booking.get('user_id') # 這個就是 LINE 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"
+        # 準備回傳網址
+        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}: "
+        log_msg = f"🆔 {booking_id} 處理結果: "
 
-        # 2. 判斷模式
+        # 2. 智慧判斷：是發送「提醒」還是「確認」？
         is_reminder = "確認" in current_status
 
         if is_reminder:
             # --- 🔔 提醒模式 (Reminder) ---
             action_label = "提醒"
             mail_subject = f"🔔 行前提醒: {booking['date']} - Cié Cié Taipei"
-            
-            # 🔥 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"座位已為您準備好。\n"
-                f"若無法前來，請點擊下方連結取消：\n{cancel_link}"
+                f"座位已為您準備好，若需變更請聯繫我們。"
             )
-            
             mail_html = f"""
             <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif;">
                 <h2 style="text-align:center; border-bottom:1px solid #444; padding-bottom:15px;">Cié Cié Taipei</h2>
@@ -81,27 +79,23 @@ def send_confirmation_hybrid(booking_id):
                 </div>
                 <div style="text-align:center; margin-top:30px;">
                     <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>
+                    <a href="{cancel_link}" style="color:#aaa; font-size:12px;">若無法前來，請點此取消</a>
                 </div>
             </div>
             """
         else:
             # --- 🚀 確認模式 (Confirmation) ---
-            action_label = "確認"
+            action_label = "確認信"
             mail_subject = f"訂位確認: {booking['date']} - Cié Cié Taipei"
-            
-            # 🔥 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"請點擊下方連結確認出席：\n"
-                f"👉 確認：{confirm_link}\n\n"
-                f"🚫 取消：{cancel_link}"
+                f"👉 請務���點擊下方連結「確認出席」，謝謝！\n"
+                f"{confirm_link}"
             )
-            
             mail_html = f"""
             <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif;">
                 <h2 style="text-align:center; border-bottom:1px solid #444; padding-bottom:15px;">Cié Cié Taipei</h2>
@@ -120,31 +114,27 @@ def send_confirmation_hybrid(booking_id):
             </div>
             """
 
-        # 3. 執行發送
-        # Email
+        # 3. 執行發送 (自動判斷有無 Email/LINE)
         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_label}) "
-            except Exception as e: log_msg += f"❌ MailErr({str(e)}) "
+                log_msg += f"✅ Mail送出 "
+            except Exception as e: log_msg += f"❌ Mail失敗 "
         else:
             log_msg += "⚠️ 無Mail "
         
-        # LINE
         if user_id and len(str(user_id)) > 5 and LINE_ACCESS_TOKEN:
             try:
                 r = 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}]})
-                if r.status_code == 200:
-                    log_msg += f"✅ LINE({action_label}) "
-                else:
-                    log_msg += f"❌ LINE失敗({r.status_code}: {r.text}) "
-            except Exception as e: log_msg += f"❌ LINEErr({str(e)}) "
+                if r.status_code == 200: log_msg += f"✅ LINE送出 "
+                else: log_msg += f"❌ LINE失敗 "
+            except Exception as e: log_msg += f"❌ LINE錯誤 "
         else:
             log_msg += "⚠️ 無LINE ID "
 
-        # 4. 更新狀態 (僅在非提醒模式下更新)
+        # 4. 更新狀態
         if not is_reminder:
             supabase.table("bookings").update({"status": "已發確認信"}).eq("id", booking_id).execute()
         
@@ -152,7 +142,6 @@ def send_confirmation_hybrid(booking_id):
 
     except Exception as e: return f"嚴重錯誤: {str(e)}"
 
-# 🔥🔥🔥 卡片渲染 (純顯示，無 JS 互動) 🔥🔥🔥
 def render_booking_cards():
     df = get_bookings()
     count_html = f"<div style='color:#bbb; margin-bottom:10px; text-align:right; font-size:14px;'>📊 共 <span style='color:#fff; font-weight:bold;'>{len(df)}</span> 筆資料</div>"
@@ -162,61 +151,38 @@ def render_booking_cards():
     
     for index, row in df.iterrows():
         status = row.get('status', '待處理')
+        has_line = bool(row.get('user_id') and len(str(row.get('user_id'))) > 5)
         
-        # 顏色邏輯
         status_bg = "#ccc"; status_tx = "#000"; border_color = "#444"
-        if '確認' in status: 
-            status_bg = "#2ecc71"; status_tx = "#000"; border_color = "#2ecc71"
-        elif '取消' in status: 
-            status_bg = "#e74c3c"; status_tx = "#fff"; border_color = "#e74c3c"
-        elif '已發' in status: 
-            status_bg = "#f1c40f"; status_tx = "#000"; border_color = "#f1c40f"
+        if '確認' in status: status_bg = "#2ecc71"; status_tx = "#000"; border_color = "#2ecc71"
+        elif '取消' in status: status_bg = "#e74c3c"; status_tx = "#fff"; border_color = "#e74c3c"
+        elif '已發' in status: status_bg = "#f1c40f"; status_tx = "#000"; border_color = "#f1c40f"
+
+        line_badge = "<span style='background:#00B900; color:white; padding:2px 6px; border-radius:4px; font-size:0.7em; margin-left:8px;'>LINE綁定</span>" if has_line else ""
 
         card = f"""
-        <div class="booking-card" style="
-            background: #1a1a1a; 
-            border-left: 6px solid {border_color}; 
-            border-radius: 12px; 
-            padding: 20px; 
-            box-shadow: 0 4px 15px rgba(0,0,0,0.5); 
-            font-family: '微軟正黑體', sans-serif; 
-            position: relative;">
-            
+        <div class="booking-card" style="background:#1a1a1a; border-left:6px solid {border_color}; border-radius:12px; padding:20px; box-shadow:0 4px 15px rgba(0,0,0,0.5); position:relative;">
             <div style="display:flex; justify-content:space-between; align-items:start; margin-bottom:15px;">
                 <div>
                     <span style="font-size:0.9em; color:#666; font-weight:bold; display:block;">訂單 ID</span>
                     <span style="font-size:2.5em; color:#fff; font-weight:900; line-height:1; font-family:monospace;">{row['id']}</span>
                 </div>
-                <div style="background:{status_bg}; color:{status_tx}; padding:6px 12px; border-radius:4px; font-weight:bold; font-size:0.9em;">
-                    {status}
+                <div style="text-align:right;">
+                    <div style="background:{status_bg}; color:{status_tx}; padding:6px 12px; border-radius:4px; font-weight:bold; font-size:0.9em; display:inline-block;">{status}</div>
+                    <div style="margin-top:5px;">{line_badge}</div>
                 </div>
             </div>
-
             <div style="display:grid; grid-template-columns: 1fr 1fr; gap:10px; margin-bottom:15px; border-top:1px solid #333; padding-top:15px;">
-                <div>
-                    <span style="color:#888; font-size:0.85em;">📅 日期 Date</span><br>
-                    <span style="color:#d4af37; font-size:1.2em; font-weight:bold;">{row['date']}</span>
-                </div>
-                <div>
-                    <span style="color:#888; font-size:0.85em;">⏰ 時間 Time</span><br>
-                    <span style="color:#d4af37; font-size:1.5em; font-weight:900;">{row['time']}</span>
-                </div>
+                <div><span style="color:#888; font-size:0.85em;">📅 日期</span><br><span style="color:#d4af37; font-size:1.2em; font-weight:bold;">{row['date']}</span></div>
+                <div><span style="color:#888; font-size:0.85em;">⏰ 時間</span><br><span style="color:#d4af37; font-size:1.5em; font-weight:900;">{row['time']}</span></div>
             </div>
-            
             <div style="background:#222; padding:15px; border-radius:8px; margin-bottom:15px;">
-                <div style="margin-bottom:8px;">
-                    <span style="color:#fff; font-size:1.4em; font-weight:bold;">{row['name']}</span> 
-                    <span style="color:#aaa;">({row['pax']}位)</span>
-                </div>
-                <div style="font-size:1.1em; margin-bottom:5px;">
-                    📞 <a href="tel:{row['tel']}" style="color:#69c0ff; text-decoration:none;">{row['tel']}</a>
-                </div>
+                <div style="margin-bottom:8px;"><span style="color:#fff; font-size:1.4em; font-weight:bold;">{row['name']}</span> <span style="color:#aaa;">({row['pax']}位)</span></div>
+                <div style="font-size:1.1em; margin-bottom:5px;">📞 {row['tel']}</div>
                 <div style="font-size:0.9em; color:#888;">✉️ {row['email'] or '-'}</div>
             </div>
-
             <div style="background:#f1c40f11; padding:12px; border-radius:6px; border:1px solid #f1c40f33;">
-                <span style="color:#aaa; font-size:0.8em;">📝 備註:</span>
-                <span style="color:#f1c40f;">{row.get('remarks') or '無'}</span>
+                <span style="color:#aaa; font-size:0.8em;">📝 備註:</span> <span style="color:#f1c40f;">{row.get('remarks') or '無'}</span>
             </div>
         </div>
         """
@@ -225,76 +191,161 @@ def render_booking_cards():
     cards_html += "</div>"
     return cards_html
 
-# --- 登入邏輯 ---
+
+# ==========================================
+# 模組 2：菜單動態管理
+# ==========================================
+
+def get_menu_items():
+    try:
+        res = supabase.table("menu_items").select("*").order("category").order("created_at").execute()
+        if not res.data: 
+            return pd.DataFrame(columns=['ID', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態'])
+        
+        df = pd.DataFrame(res.data)
+        
+        # 處理陣列或空值，讓畫面顯示更漂亮
+        df['available_times'] = df['available_times'].apply(lambda x: "、".join(x) if isinstance(x, list) else "全時段")
+        df['allow_takeout'] = df['allow_takeout'].apply(lambda x: "✅" if x else "❌")
+        df['require_prepay'] = df['require_prepay'].apply(lambda x: "🔥 需預付" if x else "一般")
+        df['is_active'] = df['is_active'].apply(lambda x: "🟢 販售中" if x else "🔴 已下架")
+
+        # 整理給畫面顯示用的欄位
+        display_df = df[['id', 'name', 'price', 'category', 'available_times', 'allow_takeout', 'require_prepay', 'is_active']]
+        display_df.columns = ['ID', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態']
+        return display_df
+    except Exception as e:
+        print("Fetch menu error:", e)
+        return pd.DataFrame(columns=['ID', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態'])
+
+def add_menu_item(name, desc, price, category, available_times, require_prepay, allow_takeout):
+    if not name or not price: return "⚠️ 名稱與價格為必填", get_menu_items()
+    if not available_times: return "⚠️ 請至少選擇一個供應時段", get_menu_items()
+    
+    try:
+        data = {
+            "name": name, 
+            "description": desc, 
+            "price": int(price), 
+            "category": category, 
+            "available_times": available_times, # 儲存為字串陣列
+            "allow_takeout": allow_takeout,
+            "require_prepay": require_prepay, 
+            "is_active": True
+        }
+        supabase.table("menu_items").insert(data).execute()
+        return f"✅ 成功新增餐點：{name}", get_menu_items()
+    except Exception as e:
+        return f"❌ 錯誤: {str(e)}", get_menu_items()
+
+def toggle_menu_item(item_id, is_active):
+    if not item_id: return "⚠️ 請輸入餐點 ID", get_menu_items()
+    try:
+        supabase.table("menu_items").update({"is_active": is_active}).eq("id", item_id.strip()).execute()
+        status_text = "上架" if is_active else "下架"
+        return f"✅ 已將餐點 {item_id} 設為 {status_text}", get_menu_items()
+    except Exception as e:
+        return f"❌ 錯誤: {str(e)}", get_menu_items()
+
+
+# ==========================================
+# Gradio 介面建構
+# ==========================================
+
 def check_login(user, password):
     if user == REAL_ADMIN_USER and password == REAL_ADMIN_PASSWORD:
-        return {
-            login_row: gr.update(visible=False),
-            admin_row: gr.update(visible=True),
-            error_msg: ""
-        }
-    else: return {error_msg: "<span style='color: red'>❌ 帳號或密碼錯誤</span>"}
+        return { login_row: gr.update(visible=False), admin_tabs: gr.update(visible=True), error_msg: "" }
+    return { error_msg: "<span style='color: red'>❌ 帳號或密碼錯誤</span>" }
 
-# --- CSS ---
 custom_css = """
 body, .gradio-container { background-color: #0F0F0F; color: #fff; }
-#op-panel {
-    position: sticky;
-    top: 0;
-    z-index: 100;
-    background: #1a1a1a;
-    border-bottom: 2px solid #d4af37;
-    padding: 15px;
-    margin-bottom: 20px;
-    box-shadow: 0 4px 10px rgba(0,0,0,0.5);
-}
-#booking_display { 
-    height: auto !important; 
-    overflow: visible !important; 
-}
+#op-panel { position: sticky; top: 0; z-index: 100; background: #1a1a1a; border-bottom: 2px solid #d4af37; padding: 15px; margin-bottom: 20px; box-shadow: 0 4px 10px rgba(0,0,0,0.5); }
+#booking_display { height: auto !important; overflow: visible !important; }
 """
 
-# --- 介面 ---
-with gr.Blocks(title="Admin") as demo:
+with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochrome()) as demo:
     
     with gr.Group(visible=True) as login_row:
-        gr.Markdown("# 🔒 Login")
+        gr.Markdown("# 🔒 老闆/管理員登入")
         with gr.Row():
-            username_input = gr.Textbox(label="User")
-            password_input = gr.Textbox(label="Pass", type="password")
-        login_btn = gr.Button("Enter", variant="primary")
+            username_input = gr.Textbox(label="使用者名稱")
+            password_input = gr.Textbox(label="密碼", type="password")
+        login_btn = gr.Button("登入系統", variant="primary")
         error_msg = gr.Markdown("")
         
-    with gr.Group(visible=False) as admin_row:
-        # 🔥 操作區 (固定在頂部)
-        with gr.Column(elem_id="op-panel"):
-            gr.Markdown("### 🍷 Cié Cié 訂位管理")
-            with gr.Row():
-                id_input = gr.Number(label="輸入 ID 發送通知", precision=0, scale=2)
-                send_btn = gr.Button("🚀 發送通知 / 提醒 (Hybrid)", variant="primary", scale=1)
-                refresh_btn = gr.Button("🔄 刷新列表", scale=1)
+    with gr.Tabs(visible=False) as admin_tabs:
+        
+        # --- 分頁 1：訂位與通知管理 ---
+        with gr.TabItem("🍷 訂位與通知管理"):
+            with gr.Column(elem_id="op-panel"):
+                gr.Markdown("### 🚀 發送確認信 / 行前提醒 (系統自動偵測 LINE 與 Email)")
+                with gr.Row():
+                    id_input = gr.Number(label="輸入訂單 ID 發送通知", precision=0, scale=2)
+                    send_btn = gr.Button("🚀 一鍵發送通知", variant="primary", scale=1)
+                    refresh_btn = gr.Button("🔄 刷新列表", scale=1)
+                log_output = gr.Textbox(label="執行結果日誌", lines=1)
+
+            booking_display = gr.HTML(elem_id="booking_display")
             
-            log_output = gr.Textbox(label="執行結果", lines=1)
+            refresh_btn.click(render_booking_cards, outputs=booking_display)
+            send_btn.click(
+                send_confirmation_hybrid, inputs=id_input, outputs=log_output
+            ).then(render_booking_cards, outputs=booking_display)
 
-        # 卡片顯示區
-        booking_display = gr.HTML(elem_id="booking_display")
-        
-        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)
-        
-        send_btn.click(
-            send_confirmation_hybrid, 
-            inputs=id_input, 
-            outputs=log_output
-        ).then(
-            render_booking_cards, 
-            outputs=booking_display
-        )
+        # --- 分頁 2：菜單動態管理 ---
+        with gr.TabItem("🍽️ 菜單動態管理"):
+            gr.Markdown("### ✨ 上架新餐點 (將立即同步至客人的點餐前台)")
+            with gr.Row():
+                with gr.Column(scale=1):
+                    m_name = gr.Textbox(label="餐點名稱 *", placeholder="ex. 炭烤肋眼牛排 12oz")
+                    m_desc = gr.Textbox(label="餐點描述 (選填)", placeholder="ex. 附烤大蒜與特製紅酒醬")
+                    m_price = gr.Number(label="價格 (TWD) *", precision=0)
+                    m_cat = gr.Dropdown(choices=["main", "snack", "drink", "other"], label="分類", value="main")
+                    
+                    # --- 時段與外帶選項 ---
+                    m_times = gr.CheckboxGroup(
+                        choices=["白天 (11:00-18:30)", "晚餐 (18:30-21:30)", "宵夜 (21:30後)"],
+                        value=["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], # 預設勾選
+                        label="🕒 適用時段 (可多選) *"
+                    )
+                    with gr.Row():
+                        m_takeout = gr.Checkbox(label="🛍️ 開放外帶", value=True)
+                        m_prepay = gr.Checkbox(label="🔥 需全額預付", value=False)
+                    
+                    m_add_btn = gr.Button("➕ 新增上架", variant="primary")
+                    m_add_log = gr.Textbox(label="新增結果", interactive=False)
+                
+                with gr.Column(scale=2):
+                    gr.Markdown("### 📋 目前線上菜單")
+                    menu_df = gr.Dataframe(interactive=False, wrap=True)
+                    m_refresh_btn = gr.Button("🔄 刷新菜單")
+                    
+                    gr.Markdown("#### ⚙️ 快速上下架操作")
+                    with gr.Row():
+                        m_toggle_id = gr.Textbox(label="輸入餐點 ID (UUID)", scale=2)
+                        m_set_active = gr.Button("🟢 重新上架", scale=1)
+                        m_set_inactive = gr.Button("🔴 暫時下架", scale=1)
+                    m_toggle_log = gr.Textbox(label="操作結果", interactive=False)
+
+            # 事件綁定
+            m_add_btn.click(
+                add_menu_item, 
+                inputs=[m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout], 
+                outputs=[m_add_log, menu_df]
+            )
+            m_refresh_btn.click(get_menu_items, outputs=menu_df)
+            
+            m_set_active.click(toggle_menu_item, inputs=[m_toggle_id, gr.State(True)], outputs=[m_toggle_log, menu_df])
+            m_set_inactive.click(toggle_menu_item, inputs=[m_toggle_id, gr.State(False)], outputs=[m_toggle_log, menu_df])
 
-    demo.launch(css=custom_css)
+    # 登入事件 (登入成功後，同時載入訂位卡片與菜單)
+    login_btn.click(
+        check_login, inputs=[username_input, password_input], outputs=[login_row, admin_tabs, error_msg]
+    ).then(
+        render_booking_cards, outputs=booking_display
+    ).then(
+        get_menu_items, outputs=menu_df
+    )
 
 if __name__ == "__main__":
     demo.launch()