Update app.py

app.py

@@ -12,7 +12,9 @@ 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" # 您的官網網址
+
+# 改回使用 Hugging Face 的網址，作為信件點擊確認的端點
+PUBLIC_SPACE_URL = os.getenv("HF_SPACE_URL", "https://deeplearning101-admin-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"
@@ -20,7 +22,37 @@ REAL_ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD") or "2016-11-11"
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
 # ==========================================
-# 模組 1：訂位與通知管理 (包含 No-Show)
+# 模組 0：信件確認 Webhook (網址參數攔截)
+# ==========================================
+def check_url_action(request: gr.Request):
+    """當客人點擊信件裡的連結來到此頁面時，攔截 action 參數並處理，隱藏登入畫面"""
+    if not request: return gr.update(visible=False), gr.update(visible=True)
+    
+    action = request.query_params.get('action')
+    bid = request.query_params.get('id')
+    
+    if action == 'confirm' and bid:
+        try:
+            supabase.table("bookings").update({"status": "顧客已確認"}).eq("id", bid).execute()
+            msg = f"<div style='text-align:center; padding:50px; color:#2ecc71;'><h1>✅ 訂位已成功確認！</h1><p>感謝您的回覆，期待您的光臨。您現在可以關閉此視窗。</p></div>"
+            return gr.update(value=msg, visible=True), gr.update(visible=False)
+        except Exception as e:
+            return gr.update(value=f"❌ 處理失敗: {str(e)}", visible=True), gr.update(visible=False)
+            
+    elif action == 'cancel' and bid:
+        try:
+            supabase.table("bookings").update({"status": "顧客已取消"}).eq("id", bid).execute()
+            msg = f"<div style='text-align:center; padding:50px; color:#e74c3c;'><h1>🚫 訂位已取消。</h1><p>期待下次為您服務。您現在可以關閉此視窗。</p></div>"
+            return gr.update(value=msg, visible=True), gr.update(visible=False)
+        except Exception as e:
+            return gr.update(value=f"❌ 處理失敗: {str(e)}", visible=True), gr.update(visible=False)
+            
+    # 若沒有參數，則正常顯示老闆登入畫面
+    return gr.update(visible=False), gr.update(visible=True)
+
+
+# ==========================================
+# 模組 1：訂位與通知管理 (包含 No-Show 切換)
 # ==========================================
 
 def get_bookings():
@@ -34,7 +66,6 @@ def get_bookings():
 
 def send_confirmation_hybrid(booking_id):
     if not booking_id: return "❌ 請輸入訂單 ID"
-    
     try:
         res = supabase.table("bookings").select("*").eq("id", booking_id).execute()
         if not res.data: return f"❌ 找不到 ID: {booking_id}"
@@ -94,12 +125,16 @@ def send_confirmation_hybrid(booking_id):
         return log_msg
     except Exception as e: return f"嚴重錯誤: {str(e)}"
 
-def mark_no_show(booking_id):
-    """將訂位標記為 No-Show 黑名單"""
+def toggle_no_show(booking_id, is_noshow=True):
+    """標記或撤銷 No-Show 狀態"""
     if not booking_id: return "❌ 請輸入訂單 ID"
+    status_text = "No-Show" if is_noshow else "待處理"
     try:
-        supabase.table("bookings").update({"status": "No-Show"}).eq("id", booking_id).execute()
-        return f"🚫 訂單 {booking_id} 已成功標記為 No-Show！(未來該號碼或LINE將被收取訂金)"
+        supabase.table("bookings").update({"status": status_text}).eq("id", booking_id).execute()
+        if is_noshow:
+            return f"🚫 訂單 {booking_id} 已成功標記為 No-Show 黑名單！"
+        else:
+            return f"✅ 訂單 {booking_id} 已撤銷 No-Show，恢復為「待處理」。"
     except Exception as e:
         return f"❌ 錯誤: {str(e)}"
 
@@ -155,7 +190,7 @@ def render_booking_cards():
 
 
 # ==========================================
-# 模組 2：菜單動態管理 (改為手動輸入圖片網址)
+# 模組 2：菜單動態管理 (支援編輯、修改、上下架)
 # ==========================================
 
 def get_menu_items():
@@ -170,7 +205,6 @@ def get_menu_items():
         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 "🔴 已下架")
-        # 簡單標示有沒有填網址
         df['has_image'] = df.get('image_url', pd.Series()).apply(lambda x: "🔗 有" if pd.notnull(x) and str(x).strip() else "無")
 
         display_df = df[['name', 'price', 'category', 'available_times', 'allow_takeout', 'require_prepay', 'is_active', 'has_image']]
@@ -181,53 +215,80 @@ def get_menu_items():
         return pd.DataFrame(columns=['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
 
 def update_menu_dropdown():
-    """更新上下架操作用的下拉選單，隱藏難記的 UUID"""
     try:
         res = supabase.table("menu_items").select("id, name, is_active").execute()
         if not res.data: return gr.update(choices=[])
-        # 格式：[🟢販售中] 炭烤肋眼牛排 | uuid
         choices = [f"[{'🟢販售中' if item['is_active'] else '🔴已下架'}] {item['name']} | {item['id']}" for item in res.data]
         return gr.update(choices=choices)
+    except: return gr.update(choices=[])
+
+# --- 新增：將選擇的餐點資料載入到左側表單 ---
+def load_menu_data(selected_string):
+    if not selected_string:
+        return "", "", 0, "main", ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], False, True, "", ""
+    
+    item_id = selected_string.split(" | ")[-1].strip()
+    try:
+        res = supabase.table("menu_items").select("*").eq("id", item_id).execute()
+        if not res.data: return "", "", 0, "main", ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], False, True, "", ""
+        
+        item = res.data[0]
+        times = item.get("available_times", [])
+        if not times: times = ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"] # 預設值防呆
+        
+        return (
+            item.get("name", ""),
+            item.get("description", ""),
+            item.get("price", 0),
+            item.get("category", "main"),
+            times,
+            item.get("require_prepay", False),
+            item.get("allow_takeout", True),
+            item.get("image_url", "") or "",
+            item_id # 將 ID 存入隱藏狀態中
+        )
     except:
-        return gr.update(choices=[])
+        return "", "", 0, "main", ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], False, True, "", ""
 
 def add_menu_item(name, desc, price, category, available_times, require_prepay, allow_takeout, image_url_input):
     if not name or not price: return "⚠️ 名稱與價格為必填", get_menu_items()
     if not available_times: return "⚠️ 請至少選擇一個供應時段", get_menu_items()
-    
-    # 處理圖片網址，確保空字串轉為 None 存入資料庫
     final_image_url = image_url_input.strip() if image_url_input and str(image_url_input).strip() else None
 
     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, 
-            "image_url": final_image_url  # 寫入直接填寫的網址
+            "name": name, "description": desc, "price": int(price), "category": category, 
+            "available_times": available_times, "allow_takeout": allow_takeout, 
+            "require_prepay": require_prepay, "is_active": True, "image_url": final_image_url
         }
         supabase.table("menu_items").insert(data).execute()
-        log_msg = f"✅ 成功新增餐點：{name}"
-        if final_image_url:
-            log_msg += "\n🔗 圖片網址已連結"
-        return log_msg, get_menu_items()
-    except Exception as e:
-        return f"❌ 錯誤: {str(e)}", get_menu_items()
+        return f"✅ 成功新增上架：{name}", get_menu_items()
+    except Exception as e: return f"❌ 錯誤: {str(e)}", get_menu_items()
+
+# --- 新增：儲存修改邏輯 ---
+def update_menu_item(item_id, name, desc, price, category, available_times, require_prepay, allow_takeout, image_url_input):
+    if not item_id: return "⚠️ 請先從右側選擇並「載入編輯」一項餐點", get_menu_items()
+    if not name or not price: return "⚠️ 名稱與價格為必填", get_menu_items()
+    final_image_url = image_url_input.strip() if image_url_input and str(image_url_input).strip() else None
+
+    try:
+        data = {
+            "name": name, "description": desc, "price": int(price), "category": category, 
+            "available_times": available_times, "allow_takeout": allow_takeout, 
+            "require_prepay": require_prepay, "image_url": final_image_url
+        }
+        supabase.table("menu_items").update(data).eq("id", item_id).execute()
+        return f"💾 成功儲存修改：{name}", get_menu_items()
+    except Exception as e: return f"❌ 錯誤: {str(e)}", get_menu_items()
 
 def toggle_menu_item(selected_string, is_active):
     if not selected_string: return "⚠️ 請選擇餐點", get_menu_items()
     try:
-        # 從選單字串中提取出藏在最後面的 UUID
         item_id = selected_string.split(" | ")[-1].strip()
         supabase.table("menu_items").update({"is_active": is_active}).eq("id", item_id).execute()
         status_text = "上架" if is_active else "下架"
         return f"✅ 餐點狀態已更新為：{status_text}", get_menu_items()
-    except Exception as e:
-        return f"❌ 錯誤: {str(e)}", get_menu_items()
+    except Exception as e: return f"❌ 錯誤: {str(e)}", get_menu_items()
 
 
 # ==========================================
@@ -247,6 +308,9 @@ body, .gradio-container { background-color: #0F0F0F; color: #fff; }
 
 with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochrome()) as demo:
     
+    # 網址參數處理 (信件確認 Webhook)
+    url_action_msg = gr.HTML(visible=False)
+    
     with gr.Group(visible=True) as login_row:
         gr.Markdown("# 🔒 老闆/管理員登入")
         with gr.Row():
@@ -264,7 +328,9 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                 with gr.Row():
                     id_input = gr.Number(label="輸入訂單 ID", precision=0, scale=2)
                     send_btn = gr.Button("🚀 發送提醒/確認", variant="primary", scale=1)
-                    noshow_btn = gr.Button("🚫 標記 No-Show", variant="stop", scale=1) # No-Show 按鈕
+                    # No-Show 雙按鈕
+                    noshow_btn = gr.Button("🚫 標記 No-Show", variant="stop", scale=1) 
+                    revert_noshow_btn = gr.Button("✅ 撤銷 No-Show", scale=1) 
                     refresh_btn = gr.Button("🔄 刷新列表", scale=1)
                 log_output = gr.Textbox(label="執行結果日誌", lines=1)
 
@@ -273,25 +339,24 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
             # 按鈕事件
             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)
-            noshow_btn.click(mark_no_show, inputs=id_input, outputs=log_output).then(render_booking_cards, outputs=booking_display)
+            noshow_btn.click(toggle_no_show, inputs=[id_input, gr.State(True)], outputs=log_output).then(render_booking_cards, outputs=booking_display)
+            revert_noshow_btn.click(toggle_no_show, inputs=[id_input, gr.State(False)], outputs=log_output).then(render_booking_cards, outputs=booking_display)
 
         # --- 分頁 2：菜單動態管理 ---
         with gr.TabItem("🍽️ 菜單動態管理"):
-            gr.Markdown("### ✨ 上架新餐點")
+            gr.Markdown("### ✨ 上架與編輯餐點")
+            
+            # 隱藏狀態，用來紀錄正在編輯哪一筆餐點的 ID
+            m_edit_id = gr.State("")
+
             with gr.Row():
-                # 左側：新增餐點表單
+                # 左側：餐點表單
                 with gr.Column(scale=1):
                     m_name = gr.Textbox(label="餐點名稱 *")
                     m_desc = gr.Textbox(label="餐點描述 (選填)")
                     m_price = gr.Number(label="價格 (TWD) *", precision=0)
                     m_cat = gr.Dropdown(choices=["main", "snack", "drink", "other"], label="分類", value="main")
-                    
-                    # --- 改良：手動填寫圖片網址 ---
-                    m_image_url = gr.Textbox(
-                        label="餐點照片網址 (選填)", 
-                        placeholder="例如: https://ciecietaipei.github.io/assets/steak.jpg"
-                    )
-                    
+                    m_image_url = gr.Textbox(label="餐點照片網址 (選填)", placeholder="例如: https://ciecietaipei.github.io/assets/steak.jpg")
                     m_times = gr.CheckboxGroup(
                         choices=["白天 (11:00-18:30)", "晚餐 (18:30-21:30)", "宵夜 (21:30後)"],
                         value=["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], label="🕒 適用時段 *"
@@ -300,34 +365,54 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                         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.Row():
+                        m_add_btn = gr.Button("➕ 作為新餐點上架", variant="primary")
+                        m_update_btn = gr.Button("💾 儲存修改 (需先載入)", variant="secondary")
+                    
+                    m_form_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("#### ⚙️ 快速上下架操作 (免記ID)")
+                    gr.Markdown("#### ⚙️ 快速操作 (編輯與上下架)")
                     with gr.Row():
-                        m_toggle_dropdown = gr.Dropdown(label="選擇要操作的餐點", choices=[], 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_toggle_dropdown = gr.Dropdown(label="選擇要操作的餐點", choices=[], scale=3)
+                        m_load_btn = gr.Button("✏️ 載入編輯", scale=1)
+                        m_set_active = gr.Button("🟢 上架", scale=1)
+                        m_set_inactive = gr.Button("🔴 下架", scale=1)
+                    m_toggle_log = gr.Textbox(label="操作狀態", interactive=False)
+
+            # 事件綁定：載入編輯資料
+            m_load_btn.click(
+                load_menu_data, 
+                inputs=[m_toggle_dropdown], 
+                outputs=[m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout, m_image_url, m_edit_id]
+            ).then(lambda: "✅ 已載入至左側表單，修改後請點擊「儲存修改」", outputs=m_toggle_log)
+
+            # 事件綁定：新增 / 儲存修改
             m_add_btn.click(
                 add_menu_item, 
                 inputs=[m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout, m_image_url], 
-                outputs=[m_add_log, menu_df]
+                outputs=[m_form_log, menu_df]
+            ).then(update_menu_dropdown, outputs=m_toggle_dropdown)
+
+            m_update_btn.click(
+                update_menu_item,
+                inputs=[m_edit_id, m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout, m_image_url],
+                outputs=[m_form_log, menu_df]
             ).then(update_menu_dropdown, outputs=m_toggle_dropdown)
             
+            # 事件綁定：刷新與上下架
             m_refresh_btn.click(get_menu_items, outputs=menu_df).then(update_menu_dropdown, outputs=m_toggle_dropdown)
-            
             m_set_active.click(toggle_menu_item, inputs=[m_toggle_dropdown, gr.State(True)], outputs=[m_toggle_log, menu_df]).then(update_menu_dropdown, outputs=m_toggle_dropdown)
             m_set_inactive.click(toggle_menu_item, inputs=[m_toggle_dropdown, gr.State(False)], outputs=[m_toggle_log, menu_df]).then(update_menu_dropdown, outputs=m_toggle_dropdown)
 
+    # 頁面載入攔截 URL 參數
+    demo.load(check_url_action, inputs=None, outputs=[url_action_msg, login_row])
+
     # 登入事件
     login_btn.click(
         check_login, inputs=[username_input, password_input], outputs=[login_row, admin_tabs, error_msg]