Update menu.py

menu.py

@@ -1,27 +1,45 @@
-from flask import Blueprint, render_template, request, session, jsonify, redirect, url_for
+from flask import Flask, Blueprint, render_template, request, session, redirect, url_for, jsonify
 from salesforce import get_salesforce_connection
 import os
 
+app = Flask(__name__)
+app.secret_key = 'your-secret-key-here'  # Change for production
+
+# Initialize Blueprint
 menu_blueprint = Blueprint('menu', __name__)
 
 # Initialize Salesforce connection
 sf = get_salesforce_connection()
 
-# Constants for video handling
-STATIC_DIR = os.path.join(os.path.dirname(__file__), 'static')
+# Define static folder path
+STATIC_DIR = os.path.join(app.root_path, 'static')
+
+# Video configuration
 PLACEHOLDER_VIDEO = 'placeholder.mp4'
 PLACEHOLDER_PATH = os.path.join(STATIC_DIR, PLACEHOLDER_VIDEO)
-SECTION_ORDER = ["Best Sellers", "Starters", "Biryanis", "Curries", "Breads", "Customized dish", "Apetizer", "Desserts", "Soft Drinks"]
 
 # Create placeholder video at startup if it doesn't exist
 if not os.path.exists(PLACEHOLDER_PATH):
     open(PLACEHOLDER_PATH, 'wb').close()
     print(f"Created placeholder video at {PLACEHOLDER_PATH}")
 
+# Menu configuration
+MENU_CONFIG = {
+    "section_order": ["Best Sellers", "Starters", "Biryanis", "Curries", "Breads", 
+                     "Customized dish", "Apetizer", "Desserts", "Soft Drinks"],
+    "section_mapping": {
+        "Main Course": "Curries",
+        "Appetizers": "Starters",
+        "Breads": "Breads",
+        "Soft Drinks": "Soft Drinks"
+    },
+    "categories": ["All", "Veg", "Non veg"]
+}
+
 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
+    Priority: 1. Video1__c from Salesforce 2. Generated filename 3. placeholder.mp4
     """
     # First try: Video1__c from Salesforce if provided
     if video_url:
@@ -35,6 +53,11 @@ def get_valid_video_path(item_name, video_url=None):
         elif video_url.startswith('069'):
             return f"https://yourdomain.my.salesforce.com/sfc/servlet.shepherd/version/download/{video_url}"
     
+    # Second try: Generated filename based on item name
+    video_file = f"{item_name.lower().replace(' ', '_')}.mp4"
+    if os.path.isfile(os.path.join(STATIC_DIR, video_file)):
+        return f"/static/{video_file}"
+    
     # Final fallback: placeholder.mp4
     if not os.path.exists(PLACEHOLDER_PATH):
         open(PLACEHOLDER_PATH, 'wb').close()
@@ -42,113 +65,112 @@ def get_valid_video_path(item_name, video_url=None):
     
     return f"/static/{PLACEHOLDER_VIDEO}"
 
+def organize_menu_items(items, selected_category="All"):
+    """Organize items into the requested section structure with category filtering"""
+    ordered_menu = {section: [] for section in MENU_CONFIG["section_order"]}
+    
+    # Filter by category if needed
+    filtered_items = []
+    for item in items:
+        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
+        filtered_items.append(item)
+    
+    # Get top 4 best sellers
+    best_sellers = sorted(filtered_items, key=lambda x: x.get("Total_Ordered__c", 0), reverse=True)[:4]
+    if best_sellers:
+        ordered_menu["Best Sellers"] = best_sellers
+    
+    # Organize remaining items
+    for item in filtered_items:
+        if item in best_sellers:
+            continue
+            
+        section = MENU_CONFIG["section_mapping"].get(
+            item.get("Section__c", "Others"),
+            item.get("Section__c", "Others")
+        )
+        
+        if section in ordered_menu:
+            ordered_menu[section].append(item)
+        else:
+            if "Others" not in ordered_menu:
+                ordered_menu["Others"] = []
+            ordered_menu["Others"].append(item)
+    
+    # Remove empty sections
+    return {section: items for section, items in ordered_menu.items() if items}
+
 @menu_blueprint.route("/menu", methods=["GET", "POST"])
 def menu():
+    # User session handling
+    user_email = session.get('user_email') or request.args.get("email")
+    user_name = session.get('user_name') or request.args.get("name")
     selected_category = request.args.get("category", "All")
-    user_email = session.get('user_email')
-
+    
     if not user_email:
-        user_email = request.args.get("email")
-        user_name = request.args.get("name")
-
-        if user_email:
-            session['user_email'] = user_email
-            session['user_name'] = user_name
-        else:
-            return redirect(url_for("login"))
-    else:
-        user_name = session.get('user_name')
-
+        return redirect(url_for("login"))
+    
+    session['user_email'] = user_email
+    session['user_name'] = user_name
     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)
-
+        # Get user data from Salesforce
+        user_result = sf.query(f"""
+            SELECT Referral__c, Reward_Points__c 
+            FROM Customer_Login__c 
+            WHERE Email__c = '{user_email}'
+        """)
         if not user_result['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['totalSize']
-
-        # Query to fetch Menu_Item__c records including Video1__c
-        menu_query = """
+        cart_count = sf.query(f"""
+            SELECT COUNT() 
+            FROM Cart_Item__c 
+            WHERE Customer_Email__c = '{user_email}'
+        """)['totalSize']
+        
+        # Get menu items including video field
+        food_items = sf.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
-        """
-        result = sf.query(menu_query)
-        food_items = result['records'] if 'records' in result else []
-
-        # Process items and add video paths
-        for item in food_items:
-            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'))
-
-        # Query to fetch Custom_Dish__c records
-        custom_dish_query = """
+        """).get('records', [])
+        
+        # Get custom dishes
+        custom_dishes = sf.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.get('records', [])
-
-        # Process custom dishes and add video paths
-        for item in custom_dishes:
-            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'])
-
-        # Merge both Menu_Item__c and Custom_Dish__c records
-        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.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"]]
-
-        best_sellers = best_sellers[:4]
-        if best_sellers:
-            ordered_menu["Best Sellers"] = best_sellers
-
-        # Organize other sections
-        added_item_names = set()
-        for item in all_items:
-            section = item.get("Section__c", "Others")
-            if section not in ordered_menu:
-                ordered_menu[section] = []
-
-            if item['Name'] in added_item_names:
-                continue
-
-            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'])
-
-        ordered_menu = {section: items for section, items in ordered_menu.items() if items}
-        categories = ["All", "Veg", "Non veg"]
-
+        """).get('records', [])
+        
+        # Process items and add video paths
+        for item in food_items + custom_dishes:
+            item['Total_Ordered__c'] = item.get('Total_Ordered__c', 0)
+            item['Video1__c'] = get_valid_video_path(
+                item['Name'], 
+                item.get('Video1__c')
+            )
+        
+        ordered_menu = organize_menu_items(food_items + custom_dishes, selected_category)
+        
     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}
+        print(f"Error: {str(e)}")
+        # Fallback data
+        ordered_menu = {section: [] for section in MENU_CONFIG["section_order"]}
+        referral_code = 'N/A'
+        reward_points = 0
+        cart_count = 0
+        
+        # Sample best sellers with video support
         best_sellers = ["Chicken Biryani", "Paneer Butter Masala", "Veg Manchurian", "Prawn Fry"]
         ordered_menu["Best Sellers"] = [{
             "Name": name,
@@ -159,22 +181,105 @@ def menu():
             "Total_Ordered__c": 100,
             "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"]
-        referral_code = 'N/A'
-        reward_points = 0
-        cart_item_count = 0
 
     return render_template(
         "menu.html",
         ordered_menu=ordered_menu,
-        categories=categories,
+        categories=MENU_CONFIG["categories"],
         selected_category=selected_category,
         referral_code=referral_code,
         reward_points=reward_points,
         user_name=user_name,
         first_letter=first_letter,
-        cart_item_count=cart_item_count
+        cart_item_count=cart_count
     )
 
-# [Rest of your existing routes...]
+# [Rest of your routes remain unchanged...]
+@menu_blueprint.route('/api/addons', methods=['GET'])
+def get_addons():
+    try:
+        item_section = request.args.get('item_section')
+        if not item_section:
+            return jsonify({"success": False, "error": "Section required"}), 400
+            
+        addons = sf.query(f"""
+            SELECT Name, Customization_Type__c, Options__c, Max_Selections__c,
+                   Extra_Charge__c, Extra_Charge_Amount__c
+            FROM Customization_Options__c
+            WHERE Section__c = '{item_section}'
+        """).get('records', [])
+        
+        return jsonify({
+            "success": True,
+            "addons": [{
+                "name": a["Name"],
+                "type": a["Customization_Type__c"],
+                "options": a.get("Options__c", "").split(", "),
+                "max_selections": a.get("Max_Selections__c", 1),
+                "extra_charge": a.get("Extra_Charge__c", False),
+                "extra_charge_amount": float(a.get("Extra_Charge_Amount__c", 0))
+            } for a in addons]
+        })
+        
+    except Exception as e:
+        return jsonify({"success": False, "error": str(e)}), 500
+
+@menu_blueprint.route('/cart/add', methods=['POST'])
+def add_to_cart():
+    try:
+        data = request.json
+        required_fields = ['itemName', 'itemPrice', 'category', 'section']
+        if not all(field in data for field in required_fields):
+            return jsonify({"success": False, "error": "Missing required fields"}), 400
+            
+        customer_email = session.get('user_email')
+        if not customer_email:
+            return jsonify({"success": False, "error": "Not authenticated"}), 401
+        
+        # Prepare cart item data
+        item_data = {
+            "Name": data['itemName'],
+            "Price__c": float(data['itemPrice']),
+            "Base_Price__c": float(data['itemPrice']),
+            "Quantity__c": int(data.get('quantity', 1)),
+            "Image1__c": data.get('itemImage', ''),
+            "Customer_Email__c": customer_email,
+            "Instructions__c": data.get('instructions', ''),
+            "Category__c": data['category'],
+            "Section__c": data['section']
+        }
+        
+        # Handle addons
+        addons = data.get('addons', [])
+        if addons:
+            item_data["Add_Ons__c"] = "; ".join(
+                f"{a['name']} (${a['price']})" for a in addons
+            )
+            item_data["Add_Ons_Price__c"] = sum(float(a.get('price', 0)) for a in addons)
+            item_data["Price__c"] += item_data["Add_Ons_Price__c"]
+        
+        # Check if item already in cart
+        existing = sf.query(f"""
+            SELECT Id FROM Cart_Item__c 
+            WHERE Customer_Email__c = '{customer_email}' AND Name = '{data['itemName']}'
+        """).get('records', [])
+        
+        if existing:
+            sf.Cart_Item__c.update(existing[0]['Id'], item_data)
+        else:
+            sf.Cart_Item__c.create(item_data)
+            
+        return jsonify({"success": True, "message": "Added to cart"})
+        
+    except Exception as e:
+        return jsonify({"success": False, "error": str(e)}), 500
+
+# Register blueprint and routes
+app.register_blueprint(menu_blueprint)
+
+@app.route('/')
+def home():
+    return redirect(url_for('menu.menu'))
+
+if __name__ == "__main__":
+    app.run(debug=True)