Update menu.py

menu.py

@@ -52,7 +52,7 @@ def fetch_menu_data(selected_category, user_email):
         cart_count_result = sf.query(cart_query)
         cart_item_count = cart_count_result.get('totalSize', 0)
 
-        # Fetch all Menu_Item__c records with required fields
+        # Fetch all Menu_Item__c records
         menu_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
                    Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c,
@@ -71,14 +71,13 @@ def fetch_menu_data(selected_category, user_email):
             item['IngredientsInfo__c'] = item.get('IngredientsInfo__c', "Not specified")
             item['NutritionalInfo__c'] = item.get('NutritionalInfo__c', "Not available")
             item['Allergens__c'] = item.get('Allergens__c', "None listed")
-            item['is_menu_item'] = True  # Flag to identify Menu_Item__c records
+            item['is_menu_item'] = True
 
-        # Fetch all Custom_Dish__c records with only existing fields
+        # Fetch all Custom_Dish__c records (no time or order limit to show all custom dishes)
         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 AND Total_Ordered__c > 10
         """
         custom_dish_result = sf.query_all(custom_dish_query)
         custom_dishes = custom_dish_result.get('records', [])
@@ -89,7 +88,10 @@ def fetch_menu_data(selected_category, user_email):
             item['Video1__c'] = get_valid_video_path(item['Name'])
             item['Section__c'] = item.get('Section__c', "Customized dish")
             item['Description__c'] = item.get('Description__c', "No description available")
-            item['is_menu_item'] = False  # Flag to identify Custom_Dish__c records
+            item['IngredientsInfo__c'] = "Customized ingredients"
+            item['NutritionalInfo__c'] = "Not available"
+            item['Allergens__c'] = "Customized, check description"
+            item['is_menu_item'] = False
 
         # Merge all items
         all_items = food_items + custom_dishes
@@ -159,11 +161,8 @@ def fetch_menu_data(selected_category, user_email):
                         if instruction:
                             instruction_counts[instruction] = instruction_counts.get(instruction, 0) + 1
 
-        # Get most common add-ons and instructions (top 3)
-        most_common_addons = sorted(addon_counts, key=addon_counts.get, reverse=True)
+        most_common_addons = sorted(addon_counts, key=addon_counts.get, reverse=True)[:3]
         most_common_instructions = sorted(instruction_counts, key=instruction_counts.get, reverse=True)[:3]
-        print(f"Most common add-ons: {most_common_addons}")
-        print(f"Most common instructions: {most_common_instructions}")
 
         return ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions
 
@@ -173,19 +172,15 @@ def fetch_menu_data(selected_category, user_email):
 
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
 def menu():
-    # Handle filter parameters
     selected_category = request.args.get("category", "All")
     is_veg_only = request.args.get("veg") == 'on'
 
-    # Prioritize Customized Dish, then Veg, then All
     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')
-
-    # Handle user authentication
     if not user_email:
         user_email = request.args.get("email")
         user_name = request.args.get("name")
@@ -198,8 +193,6 @@ def menu():
         user_name = session.get('user_name')
 
     first_letter = user_name[0].upper() if user_name else "A"
-
-    # Fetch menu data
     ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions = fetch_menu_data(selected_category, user_email)
     if ordered_menu is None:
         return redirect(url_for('login'))
@@ -224,14 +217,11 @@ def menu():
 def search():
     selected_category = request.args.get("category", "All")
     user_email = session.get('user_email')
-
-    # Handle user authentication
     if not user_email:
         return redirect(url_for("login"))
     user_name = session.get('user_name')
     first_letter = user_name[0].upper() if user_name else "A"
 
-    # Fetch menu data
     ordered_menu, referral_code, reward_points, cart_item_count, most_common_addons, most_common_instructions = fetch_menu_data(selected_category, user_email)
     if ordered_menu is None:
         return redirect(url_for('login'))
@@ -250,7 +240,6 @@ def search():
 def get_addons():
     item_name = request.args.get('item_name')
     item_section = request.args.get('item_section')
-
     if not item_name or not item_section:
         return jsonify({"success": False, "error": "Item name and section are required."}), 400
 
@@ -362,9 +351,18 @@ def add_to_cart():
             })
 
         # Fetch updated cart for UI update
-        cart_query = f"SELECT Name, Quantity__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}'"
+        cart_query = f"SELECT Name, Quantity__c, Price__c, Image1__c, Add_Ons__c, Instructions__c, Category__c, Section__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}'"
         cart_result = sf.query_all(cart_query)
-        cart = [{"itemName": item["Name"], "quantity": item["Quantity__c"]} for item in cart_result.get("records", [])]
+        cart = [{
+            "itemName": item["Name"],
+            "quantity": item["Quantity__c"],
+            "price": item["Price__c"],
+            "image": item["Image1__c"],
+            "addons": item["Add_Ons__c"],
+            "instructions": item["Instructions__c"],
+            "category": item["Category__c"],
+            "section": item["Section__c"]
+        } for item in cart_result.get("records", [])]
         
         return jsonify({"success": True, "message": "Item added to cart successfully.", "cart": cart})