Update menu.py

menu.py

@@ -1,3 +1,4 @@
+	
 from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
 from salesforce import get_salesforce_connection
 import os
@@ -23,14 +24,19 @@ 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
     """
+    # First try: Video1__c from Salesforce if provided
     if video_url:
+        # If it's a complete URL (http/https)
         if video_url.startswith(('http://', 'https://')):
             return video_url
+        # If it's a relative path (/videos/xxx.mp4)
         elif video_url.startswith('/'):
             return video_url
+        # If it's a Salesforce File ID (starts with '069')
         elif video_url.startswith('069'):
             return f"https://yourdomain.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     
+    # Final fallback: placeholder.mp4
     if not os.path.exists(PLACEHOLDER_PATH):
         open(PLACEHOLDER_PATH, 'wb').close()
         print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
@@ -72,10 +78,10 @@ def menu():
         cart_count_result = sf.query(cart_query)
         cart_item_count = cart_count_result['totalSize']
 
-        # Query to fetch Menu_Item__c records including Ingredients__c
+        # Query to fetch Menu_Item__c records including Video1__c
         menu_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c, Ingredients__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c
             FROM Menu_Item__c
         """
         result = sf.query(menu_query)
@@ -86,14 +92,11 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
-            # Ensure Ingredients__c and Description__c are present
-            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
-            item['Description__c'] = item.get('Description__c', 'No description available')
 
         # Query to fetch 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, Ingredients__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c
             FROM Custom_Dish__c
             WHERE CreatedDate >= LAST_N_DAYS:7
         """
@@ -105,8 +108,6 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'])
-            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
-            item['Description__c'] = item.get('Description__c', 'No description available')
 
         # Merge both Menu_Item__c and Custom_Dish__c records
         all_items = food_items + custom_dishes
@@ -147,6 +148,7 @@ def menu():
 
     except Exception as e:
         print(f"Error fetching menu data: {str(e)}")
+        # Fallback data with video support
         ordered_menu = {section: [] for section in SECTION_ORDER}
         best_sellers = ["Chicken Biryani", "Paneer Butter Masala", "Veg Manchurian", "Prawn Fry"]
         ordered_menu["Best Sellers"] = [{
@@ -156,8 +158,7 @@ def menu():
             "Image1__c": "/static/placeholder.jpg",
             "Video1__c": get_valid_video_path(name),
             "Total_Ordered__c": 100,
-            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg",
-            "Ingredients__c": "Sample ingredients",
+            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg"
         } for name in best_sellers]
         
         categories = ["All", "Veg", "Non veg"]
@@ -308,7 +309,9 @@ def add_to_cart():
 
     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."}), 500from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
+        return jsonify({"success": False, "error": "An error occurred while adding the item to the cart."}), 500
+	
+from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
 from salesforce import get_salesforce_connection
 import os
 
@@ -333,14 +336,19 @@ 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
     """
+    # First try: Video1__c from Salesforce if provided
     if video_url:
+        # If it's a complete URL (http/https)
         if video_url.startswith(('http://', 'https://')):
             return video_url
+        # If it's a relative path (/videos/xxx.mp4)
         elif video_url.startswith('/'):
             return video_url
+        # If it's a Salesforce File ID (starts with '069')
         elif video_url.startswith('069'):
             return f"https://yourdomain.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     
+    # Final fallback: placeholder.mp4
     if not os.path.exists(PLACEHOLDER_PATH):
         open(PLACEHOLDER_PATH, 'wb').close()
         print(f"Created missing placeholder video at {PLACEHOLDER_PATH}")
@@ -382,10 +390,10 @@ def menu():
         cart_count_result = sf.query(cart_query)
         cart_item_count = cart_count_result['totalSize']
 
-        # Query to fetch Menu_Item__c records including Ingredients__c
+        # Query to fetch Menu_Item__c records including Video1__c
         menu_query = """
             SELECT Name, Price__c, Description__c, Image1__c, Image2__c, 
-                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c, Ingredients__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c, Video1__c
             FROM Menu_Item__c
         """
         result = sf.query(menu_query)
@@ -396,14 +404,11 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'], item.get('Video1__c'))
-            # Ensure Ingredients__c and Description__c are present
-            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
-            item['Description__c'] = item.get('Description__c', 'No description available')
 
         # Query to fetch 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, Ingredients__c
+                   Veg_NonVeg__c, Section__c, Total_Ordered__c
             FROM Custom_Dish__c
             WHERE CreatedDate >= LAST_N_DAYS:7
         """
@@ -415,8 +420,6 @@ def menu():
             if 'Total_Ordered__c' not in item or item['Total_Ordered__c'] is None:
                 item['Total_Ordered__c'] = 0
             item['Video1__c'] = get_valid_video_path(item['Name'])
-            item['Ingredients__c'] = item.get('Ingredients__c', 'Not specified')
-            item['Description__c'] = item.get('Description__c', 'No description available')
 
         # Merge both Menu_Item__c and Custom_Dish__c records
         all_items = food_items + custom_dishes
@@ -457,6 +460,7 @@ def menu():
 
     except Exception as e:
         print(f"Error fetching menu data: {str(e)}")
+        # Fallback data with video support
         ordered_menu = {section: [] for section in SECTION_ORDER}
         best_sellers = ["Chicken Biryani", "Paneer Butter Masala", "Veg Manchurian", "Prawn Fry"]
         ordered_menu["Best Sellers"] = [{
@@ -466,8 +470,7 @@ def menu():
             "Image1__c": "/static/placeholder.jpg",
             "Video1__c": get_valid_video_path(name),
             "Total_Ordered__c": 100,
-            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg",
-            "Ingredients__c": "Sample ingredients",
+            "Veg_NonVeg__c": "Veg" if "Paneer" in name or "Veg" in name else "Non veg"
         } for name in best_sellers]
         
         categories = ["All", "Veg", "Non veg"]
@@ -618,4 +621,4 @@ def add_to_cart():
 
     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