Update menu.py

menu.py

@@ -20,10 +20,7 @@ if not os.path.exists(PLACEHOLDER_PATH):
     print(f"Created placeholder video at {PLACEHOLDER_PATH}")
 
 def get_valid_video_path(item_name, video_url=None):
-    """
-    Get valid video path for item with placeholder fallback
-    Priority: 1. Video1__c from Salesforce 2. placeholder.mp4
-    """
+    """Get valid video path for item with placeholder fallback."""
     if video_url:
         if video_url.startswith(('http://', 'https://')):
             return video_url
@@ -31,12 +28,10 @@ def get_valid_video_path(item_name, video_url=None):
             return video_url
         elif video_url.startswith('069'):
             return f"https://biryanihub-dev-ed.develop.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
-    
     if not os.path.exists(PLACEHOLDER_PATH):
         with open(PLACEHOLDER_PATH, 'wb') as f:
             f.close()
         print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
-    
     return f"/static/{PLACEHOLDER_VIDEO}"
 
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
@@ -58,112 +53,95 @@ def menu():
 
     first_letter = user_name[0].upper() if user_name else "A"
 
-    try:
-        # Fetch user referral and reward points
-        user_query = f"SELECT Referral__c, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
-        user_result = sf.query(user_query)
-        if not user_result.get('records'):
-            return redirect(url_for('login'))
-
-        referral_code = user_result['records'][0].get('Referral__c', 'N/A')
-        reward_points = user_result['records'][0].get('Reward_Points__c', 0)
-
-        # Get cart item count
-        cart_query = f"SELECT COUNT() FROM Cart_Item__c WHERE Customer_Email__c = '{user_email}'"
-        cart_count_result = sf.query(cart_query)
-        cart_item_count = cart_count_result.get('totalSize', 0)
-
-        # 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
-            FROM Menu_Item__c
-        """
-        menu_result = sf.query_all(menu_query)  # Fetch all records
-        food_items = menu_result.get('records', [])
-
-        # Process menu items
-        for item in food_items:
-            item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
-            item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
-            item['Section__c'] = item.get('Section__c', "Others")
-            item['Description__c'] = item.get('Description__c', "No description available")
-            # Placeholder for missing fields until created in Salesforce
-            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")
-
-        # Fetch all Custom_Dish__c records
-        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_all(custom_dish_query)
-        custom_dishes = custom_dish_result.get('records', [])
-
-        # Process custom dishes
-        for item in custom_dishes:
-            item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
-            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")
-            # Placeholder for missing fields until created in Salesforce
-            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")
-
-        # Merge all items
-        all_items = food_items + custom_dishes
-        ordered_menu = {section: [] for section in SECTION_ORDER}
-
-        # Process best sellers
-        best_sellers = sorted(all_items, key=lambda x: x['Total_Ordered__c'], 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"]]
-        ordered_menu["Best Sellers"] = best_sellers[:4]
-
-        # Organize items into sections
-        added_item_names = set()
-        for item in all_items:
-            section = item['Section__c']
-            if section not in ordered_menu:
-                ordered_menu[section] = []
-
-            if item['Name'] in added_item_names:
-                continue
-
-            veg_nonveg = item.get("Veg_NonVeg__c", "both")
-            if selected_category == "Veg" and veg_nonveg not in ["Veg", "both"]:
-                continue
-            if selected_category == "Non veg" and veg_nonveg not in ["Non veg", "both"]:
-                continue
-
-            ordered_menu[section].append(item)
-            added_item_names.add(item['Name'])
-
-        # Remove empty sections
-        ordered_menu = {section: items for section, items in ordered_menu.items() if items}
-        categories = ["All", "Veg", "Non veg"]
-
-    except Exception as e:
-        print(f"Error fetching menu data: {str(e)}")
-        # Fallback data with all required fields
-        ordered_menu = {section: [] for section in SECTION_ORDER}
-        best_sellers = [
-            {"Name": "Chicken Biryani", "Price__c": 12.99, "Description__c": "Spicy chicken with rice", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Chicken Biryani"), "Total_Ordered__c": 100, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Chicken, rice, spices", "NutritionalInfo__c": "600 cal, 30g protein", "Allergens__c": "None"},
-            {"Name": "Paneer Butter Masala", "Price__c": 11.99, "Description__c": "Creamy paneer curry", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Paneer Butter Masala"), "Total_Ordered__c": 90, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Paneer, cream, tomatoes", "NutritionalInfo__c": "700 cal, 20g protein", "Allergens__c": "Dairy"},
-            {"Name": "Veg Manchurian", "Price__c": 9.99, "Description__c": "Indo-Chinese veggie dish", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Veg Manchurian"), "Total_Ordered__c": 80, "Veg_NonVeg__c": "Veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Vegetables, soy sauce", "NutritionalInfo__c": "400 cal, 10g protein", "Allergens__c": "Soy"},
-            {"Name": "Prawn Fry", "Price__c": 14.99, "Description__c": "Crispy fried prawns", "Image1__c": "/static/placeholder.jpg", "Video1__c": get_valid_video_path("Prawn Fry"), "Total_Ordered__c": 70, "Veg_NonVeg__c": "Non veg", "Section__c": "Best Sellers", "IngredientsInfo__c": "Prawns, spices", "NutritionalInfo__c": "500 cal, 25g protein", "Allergens__c": "Shellfish"}
-        ]
-        ordered_menu["Best Sellers"] = best_sellers
-        categories = ["All", "Veg", "Non veg"]
-        referral_code = 'N/A'
-        reward_points = 0
-        cart_item_count = 0
+    # Fetch user referral and reward points
+    user_query = f"SELECT Referral__c, Reward_Points__c FROM Customer_Login__c WHERE Email__c = '{user_email}'"
+    user_result = sf.query(user_query)
+    if not user_result.get('records'):
+        return redirect(url_for('login'))
+
+    referral_code = user_result['records'][0].get('Referral__c', 'N/A')
+    reward_points = user_result['records'][0].get('Reward_Points__c', 0)
+
+    # Get cart item count
+    cart_query = f"SELECT COUNT() FROM Cart_Item__c WHERE Customer_Email__c = '{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 all required fields
+    menu_query = """
+        SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
+               Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c,
+               IngredientsInfo__c, NutritionalInfo__c, Allergens__c
+        FROM Menu_Item__c
+    """
+    menu_result = sf.query_all(menu_query)
+    food_items = menu_result.get('records', [])
+
+    # Process menu items
+    for item in food_items:
+        item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
+        item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
+        item['Section__c'] = item.get('Section__c', "Others")
+        item['Description__c'] = item.get('Description__c', "No description available")
+        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")
+
+    # Fetch all Custom_Dish__c records with all required fields
+    custom_dish_query = """
+        SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
+               Veg_NonVeg__c, Section__c, Total_Ordered__c,
+               IngredientsInfo__c, NutritionalInfo__c, Allergens__c
+        FROM Custom_Dish__c
+        WHERE CreatedDate >= LAST_N_DAYS:7
+    """
+    custom_dish_result = sf.query_all(custom_dish_query)
+    custom_dishes = custom_dish_result.get('records', [])
+
+    # Process custom dishes
+    for item in custom_dishes:
+        item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0) or 0
+        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['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")
+
+    # Merge all items
+    all_items = food_items + custom_dishes
+    ordered_menu = {section: [] for section in SECTION_ORDER}
+
+    # Process best sellers
+    best_sellers = sorted(all_items, key=lambda x: x['Total_Ordered__c'], 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"]]
+    ordered_menu["Best Sellers"] = best_sellers[:4]
+
+    # Organize items into sections
+    added_item_names = set()
+    for item in all_items:
+        section = item['Section__c']
+        if section not in ordered_menu:
+            ordered_menu[section] = []
+
+        if item['Name'] in added_item_names:
+            continue
+
+        veg_nonveg = item.get("Veg_NonVeg__c", "both")
+        if selected_category == "Veg" and veg_nonveg not in ["Veg", "both"]:
+            continue
+        if selected_category == "Non veg" and veg_nonveg not in ["Non veg", "both"]:
+            continue
+
+        ordered_menu[section].append(item)
+        added_item_names.add(item['Name'])
+
+    # Remove empty sections
+    ordered_menu = {section: items for section, items in ordered_menu.items() if items}
+    categories = ["All", "Veg", "Non veg"]
 
     return render_template(
         "menu.html",
@@ -292,10 +270,15 @@ def add_to_cart():
                 "Section__c": section
             })
 
-        return jsonify({"success": True, "message": "Item added to cart successfully."})
+        # Fetch updated cart for UI update
+        cart_query = f"SELECT Name, Quantity__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", [])]
+        
+        return jsonify({"success": True, "message": "Item added to cart successfully.", "cart": cart})
 
     except ValueError as e:
         return jsonify({"success": False, "error": f"Invalid data format: {str(e)}"}), 400
     except Exception as e:
         print(f"Error adding item to cart: {str(e)}")
-        return jsonify({"success": False, "error": "An error occurred while adding the item to the cart."}), 500
+        return jsonify({"success": False, "error": "An error occurred while adding the item to the cart."}), 500