Update app.py

app.py

@@ -277,36 +277,28 @@ def login():
 def menu():
     selected_category = request.args.get("category", "All")
     user_id = session.get('user_id')
-    user_email = session.get('user_email')  # Fetch the user's email
-    print(f"Session check in /menu: user_id={user_id}, user_email={user_email}")
-    
+    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  # If needed
-
-            print(f"✅ User session set: {user_email}, {user_name}")
+            session['user_name'] = user_name
         else:
-            print("❌ No email in URL, redirecting to login.")
             return redirect(url_for("login"))
 
-    print(f"Session check in /menu: user_email={user_email}")
-
-    
     try:
-        # Fetch the user's Referral__c and Reward_Points__c
+        # 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['records']:
-            print("❌ User not found!")
             return redirect(url_for('login'))
 
-        referral_code = user_result['records'][0].get('Referral__c', 'N/A')  # Default to 'N/A' if empty
-        reward_points = user_result['records'][0].get('Reward_Points__c', 0)  # Default to 0 if empty
+        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
         menu_query = """
@@ -316,32 +308,45 @@ def menu():
         result = sf.query(menu_query)
         food_items = result['records'] if 'records' in result else []
 
-        # Filter categories dynamically
-        categories = {item.get("Veg_NonVeg__c").capitalize() for item in food_items if item.get("Veg_NonVeg__c")}
-        categories = {"Veg", "Non veg"}  # Ensure valid categories only
+        # Define the order of sections
+        section_order = ["Breads", "Curries", "Starters", "Biryanis", "Desserts", "Soft Drinks"]
+        ordered_menu = {section: [] for section in section_order}
 
-        # Filter food items based on the selected category
-        if selected_category == "Veg":
-            food_items = [item for item in food_items if item.get("Veg_NonVeg__c") in ["Veg", "both"]]
-        elif selected_category == "Non veg":
-            food_items = [item for item in food_items if item.get("Veg_NonVeg__c") in ["Non veg", "both"]]
+        # Filter and organize menu items based on category and section
+        for item in food_items:
+            section = item.get("Section__c", "Others")  # Default to "Others" if missing
+            if section not in ordered_menu:
+                ordered_menu[section] = []
+
+            # Apply category filters
+            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)
+
+        # 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)}")
-        food_items = []
-        categories = {"All", "Veg", "Non veg"}  # Default categories on error
+        ordered_menu = {}
+        categories = ["All", "Veg", "Non veg"]
         referral_code = 'N/A'
         reward_points = 0
 
-    # Render the menu page with the fetched data
     return render_template(
         "menu.html",
-        food_items=food_items,
-        categories=sorted(categories),  # Sort categories alphabetically if needed
+        ordered_menu=ordered_menu,
+        categories=categories,
         selected_category=selected_category,
         referral_code=referral_code,
         reward_points=reward_points
     )
+
 @app.route("/cart", methods=["GET"])
 def cart():
     email = session.get('user_email')