Update menu.py

menu.py

@@ -9,14 +9,6 @@ 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:
@@ -76,10 +68,18 @@ def menu():
                         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 
@@ -93,8 +93,64 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0  # Default value
 
-        # Handle other menu logic (filtering, ordering, etc.)
-        # ... (Same as your existing code)
+        # Query to fetch Custom_Dish__c records created within the last 7 days with Total_Ordered__c > 10
+        custom_dish_query = """
+            SELECT Name, Price__c, Description__c, Image1__c, Image2__c, Veg_NonVeg__c, Section__c, Total_Ordered__c 
+            FROM Custom_Dish__c
+            WHERE CreatedDate >= LAST_N_DAYS:7
+        """
+        custom_dish_result = sf.query(custom_dish_query)
+        custom_dishes = custom_dish_result['records'] if 'records' in custom_dish_result else []
+
+        # Merge both Menu_Item__c and Custom_Dish__c records into the ordered menu
+        all_items = food_items + custom_dishes
+
+        # 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}
+
+        # 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 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":
+            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]
+
+        # Ensure "Best Sellers" is added only if there are items after filtering
+        if best_sellers:
+            ordered_menu["Best Sellers"] = best_sellers
+
+        # Create a set to track item names already added to prevent duplicates
+        added_item_names = set()
+
+        # 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:
+                ordered_menu[section] = []
+
+            # Skip item if it's already been added to avoid duplicates
+            if item['Name'] in added_item_names:
+                continue
+
+            # Apply category filters
+            if selected_category == "Veg" 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}
+        print(f"Final ordered menu: {ordered_menu.keys()}")  # Debugging
+
+        categories = ["All", "Veg", "Non veg"]
 
     except Exception as e:
         print(f"Error fetching menu data: {str(e)}")
@@ -103,7 +159,7 @@ def menu():
         referral_code = 'N/A'
         reward_points = 0
 
-    # Pass the most common add-ons and instructions to the template
+    # Pass the user's first letter (first_letter) to the template
     return render_template(
         "menu.html",
         ordered_menu=ordered_menu,
@@ -117,6 +173,7 @@ def menu():
         most_common_instructions=most_common_instructions  # Pass most common instructions
     )
 
+
 @menu_blueprint.route('/api/addons', methods=['GET'])
 def get_addons():
     item_name = request.args.get('item_name')