Update menu.py

menu.py

@@ -9,6 +9,14 @@ sf = get_salesforce_connection()
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
 def menu():
     selected_category = request.args.get("category", "All")
+    is_veg_only = request.args.get("veg") == 'on'
+
+    # Priority to Customized Dish only if it's selected
+    if request.args.get("category") == "Customized Dish":
+        selected_category = "Customized Dish"
+    else:
+        selected_category = "Veg" if is_veg_only else "All"
+
     user_email = session.get('user_email')
 
     if not user_email:
@@ -37,49 +45,6 @@ def menu():
         referral_code = user_result['records'][0].get('Referral__c', 'N/A')
         reward_points = user_result['records'][0].get('Reward_Points__c', 0)
 
-        # Fetch the most selected add-ons and instructions based on the user's previous orders
-        past_orders_query = f"""
-            SELECT Order_Details__c FROM Order__c
-            WHERE Customer_Email__c = '{user_email}'
-        """
-        past_orders_result = sf.query(past_orders_query)
-        past_orders = past_orders_result.get('records', [])
-
-        # Frequency analysis for add-ons and instructions
-        addon_counts = {}
-        instruction_counts = {}
-
-        for order in past_orders:
-            order_details = order.get('Order_Details__c', '').split('\n')
-
-            for line in order_details:
-                item_parts = line.split('|')
-                if len(item_parts) >= 5:
-                    # Extract Add-Ons and Instructions from the order details string
-                    addons = item_parts[1].strip().replace('Add-Ons:', '').split(', ')
-                    instructions = item_parts[2].strip().replace('Instructions:', '').split(', ')
-
-                    # Count occurrences for add-ons and instructions
-                    for addon in addons:
-                        if addon:
-                            addon_counts[addon] = addon_counts.get(addon, 0) + 1
-
-                    for instruction in instructions:
-                        if instruction:
-                            instruction_counts[instruction] = instruction_counts.get(instruction, 0) + 1
-
-        # Debugging print statements for the most common add-ons and instructions
-        print(f"Most frequent add-ons: {addon_counts}")
-        print(f"Most frequent instructions: {instruction_counts}")
-
-        # Get the most frequent add-ons and instructions
-        most_common_addons = sorted(addon_counts, key=addon_counts.get, reverse=True)[:3]  # Top 3 most frequent addons
-        most_common_instructions = sorted(instruction_counts, key=instruction_counts.get, reverse=True)[:3]  # Top 3 most frequent instructions
-
-        # Debugging print statements to observe the most frequent add-ons and instructions
-        print(f"Top 3 most common add-ons: {most_common_addons}")
-        print(f"Top 3 most common instructions: {most_common_instructions}")
-
         # Query to fetch Menu_Item__c records including Total_Ordered__c for best sellers
         menu_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, Veg_NonVeg__c, Section__c, Total_Ordered__c 
@@ -112,6 +77,7 @@ 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)
 
+        # If the category is "Veg", filter for Veg items
         if selected_category == "Veg":
             best_sellers = [item for item in best_sellers if item.get("Veg_NonVeg__c") in ["Veg", "both"]]
         elif selected_category == "Non veg":
@@ -148,7 +114,49 @@ def menu():
 
         # Remove empty sections
         ordered_menu = {section: items for section, items in ordered_menu.items() if items}
-        print(f"Final ordered menu: {ordered_menu.keys()}")  # Debugging
+
+        # Fetch the most selected add-ons and instructions based on the user's previous orders
+        past_orders_query = f"""
+            SELECT Order_Details__c FROM Order__c
+            WHERE Customer_Email__c = '{user_email}'
+        """
+        past_orders_result = sf.query(past_orders_query)
+        past_orders = past_orders_result.get('records', [])
+
+        # Frequency analysis for add-ons and instructions
+        addon_counts = {}
+        instruction_counts = {}
+
+        for order in past_orders:
+            order_details = order.get('Order_Details__c', '').split('\n')
+
+            for line in order_details:
+                item_parts = line.split('|')
+                if len(item_parts) >= 5:
+                    # Extract Add-Ons and Instructions from the order details string
+                    addons = item_parts[1].strip().replace('Add-Ons:', '').split(', ')
+                    instructions = item_parts[2].strip().replace('Instructions:', '').split(', ')
+
+                    # Count occurrences for add-ons and instructions
+                    for addon in addons:
+                        if addon:
+                            addon_counts[addon] = addon_counts.get(addon, 0) + 1
+
+                    for instruction in instructions:
+                        if instruction:
+                            instruction_counts[instruction] = instruction_counts.get(instruction, 0) + 1
+
+        # Print the add-ons and instructions to check what we're fetching
+        print(f"Add-ons fetched: {addon_counts}")
+        print(f"Instructions fetched: {instruction_counts}")
+
+        # Get the most frequent add-ons and instructions
+        most_common_addons = sorted(addon_counts, key=addon_counts.get, reverse=True)[:3]  # Top 3 most frequent addons
+        most_common_instructions = sorted(instruction_counts, key=instruction_counts.get, reverse=True)[:3]  # Top 3 most frequent instructions
+
+        # Print to check the final most common add-ons and instructions
+        print(f"Most common add-ons: {most_common_addons}")
+        print(f"Most common instructions: {most_common_instructions}")
 
         categories = ["All", "Veg", "Non veg"]
 
@@ -159,7 +167,7 @@ def menu():
         referral_code = 'N/A'
         reward_points = 0
 
-    # Pass the user's first letter (first_letter) to the template
+    # Pass the most common add-ons and instructions to the template
     return render_template(
         "menu.html",
         ordered_menu=ordered_menu,