Update app.py

app.py

@@ -20,7 +20,7 @@ REAL_ADMIN_PASSWORD = os.getenv("ADMIN_PASSWORD") or "2016-11-11"
 supabase: Client = create_client(SUPABASE_URL, SUPABASE_KEY)
 
 # ==========================================
-# 模組 1：訂位與通知管理
+# 模組 1：訂位與通知管理 (包含 No-Show)
 # ==========================================
 
 def get_bookings():
@@ -36,112 +36,73 @@ def send_confirmation_hybrid(booking_id):
     if not booking_id: return "❌ 請輸入訂單 ID"
     
     try:
-        # 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') # 這個就是 LINE ID
+        user_id = booking.get('user_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"
-        
         log_msg = f"🆔 {booking_id} 處理結果: "
-
-        # 2. 智慧判斷：是發送「提醒」還是「確認」？
         is_reminder = "確認" in current_status
 
         if is_reminder:
-            # --- 🔔 提醒模式 (Reminder) ---
-            action_label = "提醒"
+            # --- 🔔 提醒模式 ---
             mail_subject = f"🔔 行前提醒: {booking['date']} - Cié Cié Taipei"
-            line_text = (
-                f"🔔 行前提醒\n\n"
-                f"{booking['name']} 您好，期待今晚與您相見！\n\n"
-                f"📅 日期：{booking['date']}\n"
-                f"⏰ 時間：{booking['time']}\n"
-                f"👥 人數：{booking['pax']} 位\n\n"
-                f"座位已為您準備好，若需變更請聯繫我們。"
-            )
-            mail_html = f"""
-            <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif;">
+            line_text = (f"🔔 行前提醒\n\n{booking['name']} 您好，期待今晚與您相見！\n\n"
+                         f"📅 日期：{booking['date']}\n⏰ 時間：{booking['time']}\n👥 人數：{booking['pax']} 位\n\n"
+                         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>
                 <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，行前提醒：</p>
-                <div style="background:#2a2a2a; padding:15px; border-radius:8px; margin:20px 0; border-left:4px solid #f1c40f;">
-                    <ul style="color:#ddd; padding-left:20px; line-height:1.8;">
-                        <li>📅 日期：<strong style="color:#fff;">{booking['date']}</strong></li>
-                        <li>⏰ 時間：<strong style="color:#fff;">{booking['time']}</strong></li>
-                        <li>👥 人數：<strong style="color:#fff;">{booking['pax']} 位</strong></li>
-                    </ul>
-                </div>
-                <div style="text-align:center; margin-top:30px;">
-                    <span style="color:#888;">無需再次確認。</span><br><br>
-                    <a href="{cancel_link}" style="color:#aaa; font-size:12px;">若無法前來，請點此取消</a>
-                </div>
-            </div>
-            """
+                <ul style="color:#ddd; line-height:1.8;"><li>📅 日期：{booking['date']}</li><li>⏰ 時間：{booking['time']}</li><li>👥 人數：{booking['pax']} 位</li></ul>
+                <div style="text-align:center; margin-top:30px;"><span style="color:#888;">無需再次確認。</span><br><br><a href="{cancel_link}" style="color:#aaa; font-size:12px;">若無法前來，請點此取消</a></div></div>"""
         else:
-            # --- 🚀 確認模式 (Confirmation) ---
-            action_label = "確認信"
+            # --- 🚀 確認模式 ---
             mail_subject = f"訂位確認: {booking['date']} - Cié Cié Taipei"
-            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}"
-            )
-            mail_html = f"""
-            <div style="background:#1a1a1a; color:#d4af37; padding:20px; border-radius:8px; font-family:sans-serif;">
+            line_text = (f"✅ 訂位確認\n\n{booking['name']} 您好，已收到您的預約。\n\n"
+                         f"📅 日期：{booking['date']}\n⏰ 時間：{booking['time']}\n👥 人數：{booking['pax']} 位\n\n"
+                         f"👉 請務必點擊下方連結「確認出席」，謝謝！\n{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>
                 <p style="color:#eee; font-size:16px;"><strong>{booking['name']}</strong> 您好，請確認您的訂位：</p>
-                <div style="background:#2a2a2a; padding:15px; border-radius:8px; margin:20px 0; border-left:4px solid #2ecc71;">
-                    <ul style="color:#ddd; padding-left:20px; line-height:1.8;">
-                        <li>📅 日期：<strong style="color:#fff;">{booking['date']}</strong></li>
-                        <li>⏰ 時間：<strong style="color:#fff;">{booking['time']}</strong></li>
-                        <li>👥 人數：<strong style="color:#fff;">{booking['pax']} 位</strong></li>
-                    </ul>
-                </div>
-                <div style="text-align:center; margin-top:30px;">
-                    <a href="{confirm_link}" style="display:inline-block; background:#d4af37; color:#000; padding:12px 30px; text-decoration:none; border-radius:50px; font-weight:bold; margin-right:10px;">✅ 確認出席</a>
-                    <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:11px 29px; text-decoration:none; border-radius:50px;">🚫 取消</a>
-                </div>
-            </div>
-            """
+                <ul style="color:#ddd; line-height:1.8;"><li>📅 日期：{booking['date']}</li><li>⏰ 時間：{booking['time']}</li><li>👥 人數：{booking['pax']} 位</li></ul>
+                <div style="text-align:center; margin-top:30px;"><a href="{confirm_link}" style="display:inline-block; background:#d4af37; color:#000; padding:12px 30px; text-decoration:none; border-radius:50px; font-weight:bold; margin-right:10px;">✅ 確認出席</a>
+                <a href="{cancel_link}" style="display:inline-block; border:1px solid #555; color:#aaa; padding:11px 29px; text-decoration:none; border-radius:50px;">🚫 取消</a></div></div>"""
 
-        # 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送出 "
-            except Exception as e: log_msg += f"❌ Mail失敗 "
-        else:
-            log_msg += "⚠️ 無Mail "
+            except: log_msg += f"❌ Mail失敗 "
+        else: log_msg += "⚠️ 無Mail "
         
         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}]})
+                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送出 "
                 else: log_msg += f"❌ LINE失敗 "
-            except Exception as e: log_msg += f"❌ LINE錯誤 "
-        else:
-            log_msg += "⚠️ 無LINE ID "
+            except: log_msg += f"❌ LINE錯誤 "
+        else: log_msg += "⚠️ 無LINE ID "
 
-        # 4. 更新狀態
         if not is_reminder:
             supabase.table("bookings").update({"status": "已發確認信"}).eq("id", booking_id).execute()
-        
         return log_msg
-
     except Exception as e: return f"嚴重錯誤: {str(e)}"
 
+def mark_no_show(booking_id):
+    """將訂位標記為 No-Show 黑名單"""
+    if not booking_id: return "❌ 請輸入訂單 ID"
+    try:
+        supabase.table("bookings").update({"status": "No-Show"}).eq("id", booking_id).execute()
+        return f"🚫 訂單 {booking_id} 已成功標記為 No-Show！(未來該號碼或LINE將被收取訂金)"
+    except Exception as e:
+        return f"❌ 錯誤: {str(e)}"
+
 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>"
@@ -157,6 +118,7 @@ def render_booking_cards():
         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"
+        elif 'No-Show' in status: status_bg = "#000"; status_tx = "#e74c3c"; border_color = "#e74c3c"
 
         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 ""
 
@@ -168,7 +130,7 @@ def render_booking_cards():
                     <span style="font-size:2.5em; color:#fff; font-weight:900; line-height:1; font-family:monospace;">{row['id']}</span>
                 </div>
                 <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="background:{status_bg}; color:{status_tx}; padding:6px 12px; border-radius:4px; font-weight:bold; font-size:0.9em; display:inline-block; border: 1px solid {border_color};">{status}</div>
                     <div style="margin-top:5px;">{line_badge}</div>
                 </div>
             </div>
@@ -193,57 +155,77 @@ def render_booking_cards():
 
 
 # ==========================================
-# 模組 2：菜單動態管理
+# 模組 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', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態'])
+            return pd.DataFrame(columns=['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
         
         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 "🔴 已下架")
+        # 簡單標示有沒有填網址
+        df['has_image'] = df.get('image_url', pd.Series()).apply(lambda x: "🔗 有" if pd.notnull(x) and str(x).strip() else "無")
 
-        # 整理給畫面顯示用的欄位
-        display_df = df[['id', 'name', 'price', 'category', 'available_times', 'allow_takeout', 'require_prepay', 'is_active']]
-        display_df.columns = ['ID', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態']
+        display_df = df[['name', 'price', 'category', 'available_times', 'allow_takeout', 'require_prepay', 'is_active', 'has_image']]
+        display_df.columns = ['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結']
         return display_df
     except Exception as e:
         print("Fetch menu error:", e)
-        return pd.DataFrame(columns=['ID', '餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態'])
+        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 add_menu_item(name, desc, price, category, available_times, require_prepay, allow_takeout):
+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,
+            "available_times": available_times, 
+            "allow_takeout": allow_takeout, 
             "require_prepay": require_prepay, 
-            "is_active": True
+            "is_active": True, 
+            "image_url": final_image_url  # 寫入直接填���的網址
         }
         supabase.table("menu_items").insert(data).execute()
-        return f"✅ 成功新增餐點：{name}", get_menu_items()
+        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()
 
-def toggle_menu_item(item_id, is_active):
-    if not item_id: return "⚠️ 請輸入餐點 ID", get_menu_items()
+def toggle_menu_item(selected_string, is_active):
+    if not selected_string: return "⚠️ 請選擇餐點", get_menu_items()
     try:
-        supabase.table("menu_items").update({"is_active": is_active}).eq("id", item_id.strip()).execute()
+        # 從選單字串中提取出藏在最後面的 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"✅ 已將餐點 {item_id} 設為 {status_text}", get_menu_items()
+        return f"✅ 餐點狀態已更新為：{status_text}", get_menu_items()
     except Exception as e:
         return f"❌ 錯誤: {str(e)}", get_menu_items()
 
@@ -278,35 +260,41 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
         # --- 分頁 1：訂位與通知管理 ---
         with gr.TabItem("🍷 訂位與通知管理"):
             with gr.Column(elem_id="op-panel"):
-                gr.Markdown("### 🚀 發送確認信 / 行前提醒 (系統自動偵測 LINE 與 Email)")
+                gr.Markdown("### 🚀 發送通知與防鴿子標記")
                 with gr.Row():
-                    id_input = gr.Number(label="輸入訂單 ID 發送通知", precision=0, scale=2)
-                    send_btn = gr.Button("🚀 一鍵發送通知", variant="primary", scale=1)
+                    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 按鈕
                     refresh_btn = gr.Button("🔄 刷新列表", scale=1)
                 log_output = gr.Textbox(label="執行結果日誌", lines=1)
 
             booking_display = gr.HTML(elem_id="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)
+            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)
 
         # --- 分頁 2：菜單動態管理 ---
         with gr.TabItem("🍽️ 菜單動態管理"):
-            gr.Markdown("### ✨ 上架新餐點 (將立即同步至客人的點餐前台)")
+            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_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_times = gr.CheckboxGroup(
                         choices=["白天 (11:00-18:30)", "晚餐 (18:30-21:30)", "宵夜 (21:30後)"],
-                        value=["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], # 預設勾選
-                        label="🕒 適用時段 (可多選) *"
+                        value=["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], label="🕒 適用時段 *"
                     )
                     with gr.Row():
                         m_takeout = gr.Checkbox(label="🛍️ 開放外帶", value=True)
@@ -315,14 +303,15 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                     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("#### ⚙️ 快速上下架操作")
+                    gr.Markdown("#### ⚙️ 快速上下架操作 (免記ID)")
                     with gr.Row():
-                        m_toggle_id = gr.Textbox(label="輸入餐點 ID (UUID)", scale=2)
+                        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)
@@ -330,21 +319,24 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
             # 事件綁定
             m_add_btn.click(
                 add_menu_item, 
-                inputs=[m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout], 
+                inputs=[m_name, m_desc, m_price, m_cat, m_times, m_prepay, m_takeout, m_image_url], 
                 outputs=[m_add_log, menu_df]
-            )
-            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_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])
+            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)
 
-    # 登入事件 (登入成功後，同時載入訂位卡片與菜單)
+    # 登入事件
     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
+    ).then(
+        update_menu_dropdown, outputs=m_toggle_dropdown
     )
 
 if __name__ == "__main__":