Update app.py

app.py

@@ -305,7 +305,7 @@ 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=['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
+            return pd.DataFrame(columns=['餐點名稱', '價格', '限量', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
         
         df = pd.DataFrame(res.data)
         
@@ -314,13 +314,15 @@ def get_menu_items():
         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 "無")
+        # 顯示限量 (999 顯示為無限制)
+        df['daily_limit_display'] = df.get('daily_limit', pd.Series(999)).apply(lambda x: "無限制" if x >= 999 else f"剩 {x} 份")
 
-        display_df = df[['name', 'price', 'category', 'available_times', 'allow_takeout', 'require_prepay', 'is_active', 'has_image']]
-        display_df.columns = ['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結']
+        display_df = df[['name', 'price', 'daily_limit_display', '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=['餐點名稱', '價格', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
+        return pd.DataFrame(columns=['餐點名稱', '價格', '限量', '分類', '供應時段', '可外帶', '預付規則', '狀態', '照片連結'])
 
 def update_menu_dropdown():
     try:
@@ -330,15 +332,15 @@ def update_menu_dropdown():
         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, "", ""
+        return "", "", 0, 999, "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, "", ""
+        if not res.data: return "", "", 0, 999, "main", ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], False, True, "", ""
         
         item = res.data[0]
         times = item.get("available_times", [])
@@ -348,6 +350,7 @@ def load_menu_data(selected_string):
             item.get("name", ""),
             item.get("description", ""),
             item.get("price", 0),
+            item.get("daily_limit", 999), # 🌟 讀取限量，預設 999
             item.get("category", "main"),
             times,
             item.get("require_prepay", False),
@@ -356,35 +359,35 @@ def load_menu_data(selected_string):
             item_id # 將 ID 存入隱藏狀態中
         )
     except:
-        return "", "", 0, "main", ["晚餐 (18:30-21:30)", "宵夜 (21:30後)"], False, True, "", ""
+        return "", "", 0, 999, "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):
-    # 🌟 修改這裡：把 not price 改成 price is None，這樣 0 元就能順利過關！
+def add_menu_item(name, desc, price, limit, category, available_times, require_prepay, allow_takeout, image_url_input):
     if not name or price is None: return "⚠️ 名稱與價格為必填", get_menu_items()
     if not available_times: 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, 
+            "name": name, "description": desc, "price": int(price), 
+            "daily_limit": int(limit) if limit else 999, # 🌟 儲存限量
+            "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()
         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):
+# --- 儲存修改邏輯 ---
+def update_menu_item(item_id, name, desc, price, limit, category, available_times, require_prepay, allow_takeout, image_url_input):
     if not item_id: return "⚠️ 請先從右側選擇並「載入編輯」一項餐點", get_menu_items()
-    # 🌟 修改這裡：同樣把 not price 改成 price is None
     if not name or price is None: 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, 
+            "name": name, "description": desc, "price": int(price), 
+            "daily_limit": int(limit) if limit else 999, # 🌟 儲存限量修改
+            "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()
@@ -436,7 +439,6 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
             with gr.Column(elem_id="op-panel"):
                 gr.Markdown("### 🚀 訂單操作控制台")
                 
-                # 第一排：ID 輸入與狀態變更選單
                 with gr.Row():
                     id_input = gr.Number(label="輸入訂單 ID", precision=0, scale=1)
                     new_status_dropdown = gr.Dropdown(
@@ -445,11 +447,10 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                         scale=1
                     )
                     
-                # 第二排：各式操作按鈕
                 with gr.Row():
                     send_btn = gr.Button("🚀 發信/LINE", variant="primary", scale=1)
                     update_status_btn = gr.Button("💾 變更狀態", variant="secondary", scale=1)
-                    check_lp_btn = gr.Button("🔍 查 LINE Pay", variant="secondary", scale=1)
+                    check_lp_btn = gr.Button("🔍 查 LINE Pay (自動救援)", variant="secondary", scale=1)
                     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)
@@ -458,16 +459,8 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
 
             booking_display = gr.HTML(elem_id="booking_display")
             
-            # 🌟 新增：手動更新狀態的按鈕事件 🌟
-            update_status_btn.click(
-                update_booking_status, 
-                inputs=[id_input, new_status_dropdown], 
-                outputs=log_output
-            ).then(render_booking_cards, outputs=booking_display)
-
+            update_status_btn.click(update_booking_status, inputs=[id_input, new_status_dropdown], outputs=log_output).then(render_booking_cards, outputs=booking_display)
             check_lp_btn.click(check_linepay_status, inputs=[id_input], outputs=log_output)
-
-            # 其餘按鈕事件
             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(toggle_no_show, inputs=[id_input, gr.State(True)], outputs=log_output).then(render_booking_cards, outputs=booking_display)
@@ -485,7 +478,12 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                 with gr.Column(scale=1):
                     m_name = gr.Textbox(label="餐點名稱 *")
                     m_desc = gr.Textbox(label="餐點描述 (選填)")
-                    m_price = gr.Number(label="價格 (TWD) *", precision=0)
+                    
+                    with gr.Row():
+                        m_price = gr.Number(label="價格 (TWD) *", precision=0)
+                        # 🌟 這裡就是新加入的「每日限量」輸入框 🌟
+                        m_limit = gr.Number(label="每日限量 (999代表無限制)", value=999, 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(
@@ -516,27 +514,25 @@ with gr.Blocks(title="Cié Cié Admin", css=custom_css, theme=gr.themes.Monochro
                         m_set_inactive = gr.Button("🔴 下架", scale=1)
                     m_toggle_log = gr.Textbox(label="操作狀態", interactive=False)
 
-            # 事件綁定：載入編輯資料
+            # 🌟 注意這裡：按鈕綁定的陣列中，已經幫您把 m_limit 都完美補進去了 🌟
             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]
+                outputs=[m_name, m_desc, m_price, m_limit, 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], 
+                inputs=[m_name, m_desc, m_price, m_limit, 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_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],
+                inputs=[m_edit_id, m_name, m_desc, m_price, m_limit, 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)