Update app.py

app.py

@@ -489,7 +489,7 @@ def menu():
         referral_code = user_result['records'][0].get('Referral__c', 'N/A')
         reward_points = user_result['records'][0].get('Reward_Points__c', 0)
 
-        # Query to fetch menu items including Total_Ordered__c for best sellers
+        # 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 
             FROM Menu_Item__c
@@ -504,14 +504,26 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0  # Default value
 
-       
+        # 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"]
+        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(food_items, key=lambda x: x.get("Total_Ordered__c", 0), reverse=True)
+        best_sellers = sorted(all_items, key=lambda x: x.get("Total_Ordered__c", 0), reverse=True)
         print(f"Best sellers: {[item['Name'] for item in best_sellers]}")  # Debugging
+
         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":
@@ -524,8 +536,8 @@ def menu():
         if best_sellers:
             ordered_menu["Best Sellers"] = best_sellers
 
-        # Filter and organize menu items based on category and section
-        for item in food_items:
+        # 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] = []