Update menu.py

menu.py

@@ -8,9 +8,9 @@ sf = get_salesforce_connection()
 
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
 def menu():
-    # Get the current toggle status from the query string (False if not set)
-    veg_selected = request.args.get("veg", "off") == "on"  # Check if the Veg toggle is selected
-    customized_dish_selected = request.args.get("customized_dish", "off") == "on"  # Check if the Customized Dish toggle is selected
+    selected_category = request.args.get("category", "All")
+    veg_toggle = request.args.get("veg-toggle", "off")  # Handle the Veg toggle
+    customized_dish_toggle = request.args.get("customized-dish-toggle", "off")  # Handle Customized Dish toggle
     user_email = session.get('user_email')
 
     if not user_email:
@@ -64,16 +64,6 @@ def menu():
         # Merge both Menu_Item__c and Custom_Dish__c records into the ordered menu
         all_items = food_items + custom_dishes
 
-        # Apply filtering based on toggles (Veg and Customized Dish)
-        if veg_selected:
-            all_items = [item for item in all_items if item.get("Veg_NonVeg__c") in ["Veg", "both"]]  # Show only Veg items
-        if customized_dish_selected:
-            all_items = [item for item in all_items if item.get("Section__c") == "Customized dish"]  # Show only Customized dishes
-
-        # Default to all items if both toggles are off
-        if not veg_selected and not customized_dish_selected:
-            all_items = food_items + custom_dishes  # Show everything
-
         # Define the order of sections, adding "Best Sellers" at the top
         section_order = ["Best Sellers", "Starters", "Biryanis", "Curries", "Breads", "Customized dish", "Apetizer", "Desserts", "Soft Drinks"]
         ordered_menu = {section: [] for section in section_order}
@@ -81,6 +71,12 @@ def menu():
         # Sort items by Total_Ordered__c in descending order and pick top 4 as best sellers
         best_sellers = sorted(all_items, key=lambda x: x.get("Total_Ordered__c", 0), reverse=True)
 
+        # Filter items by Veg if toggle is on
+        if veg_toggle == "on":
+            best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Veg", "both"]]
+        elif selected_category == "Non veg":
+            best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Non veg", "both"]]
+
         # Take only the top 4 best sellers after filtering
         best_sellers = best_sellers[:4]
 
@@ -91,7 +87,7 @@ def menu():
         # Create a set to track item names already added to prevent duplicates
         added_item_names = set()
 
-        # Filter and organize menu items based on section (to avoid duplicates)
+        # Filter and organize menu items based on category and section (to avoid duplicates)
         for item in all_items:
             section = item.get("Section__c", "Others")  # Default to "Others" if missing
             if section not in ordered_menu:
@@ -101,13 +97,18 @@ def menu():
             if item['Name'] in added_item_names:
                 continue
 
+            # Apply category filters
+            if veg_toggle == "on" and item.get("Veg_NonVeg__c") not in ["Veg", "both"]:
+                continue
+            if selected_category == "Non veg" and item.get("Veg_NonVeg__c") not in ["Non veg", "both"]:
+                continue
+
             ordered_menu[section].append(item)
             added_item_names.add(item['Name'])  # Add item to the set of added items
 
         # Remove empty sections
         ordered_menu = {section: items for section, items in ordered_menu.items() if items}
 
-        # Set categories for filtering
         categories = ["All", "Veg", "Non veg"]
 
     except Exception as e:
@@ -117,21 +118,22 @@ def menu():
         referral_code = 'N/A'
         reward_points = 0
 
-    # Pass the necessary variables to the template
+    # If Customized Dish toggle is on, show the form
+    show_custom_dish_form = customized_dish_toggle == "on"
+
+    # Pass the user's first letter (first_letter) and other details to the template
     return render_template(
         "menu.html",
         ordered_menu=ordered_menu,
         categories=categories,
-        veg_selected=veg_selected,
-        customized_dish_selected=customized_dish_selected,
-        selected_category="All",  # Default category is All
+        selected_category=selected_category,
         referral_code=referral_code,
         reward_points=reward_points,
         user_name=user_name,  # Pass name to the template
-        first_letter=first_letter  # Pass first letter to the template
+        first_letter=first_letter,  # Pass first letter to the template
+        show_custom_dish_form=show_custom_dish_form  # Conditionally show the custom dish form
     )
 
-
 @menu_blueprint.route('/api/addons', methods=['GET'])
 def get_addons():
     item_name = request.args.get('item_name')