Update app.py

app.py

@@ -1,34 +1,13 @@
 from flask import Flask, render_template, request, jsonify, redirect, url_for, session
-from flask_session import Session  # Import the Session class
-from flask.sessions import SecureCookieSessionInterface  # Import the class
+import random
 from salesforce import get_salesforce_connection
-import os
 
 # Initialize Flask app and Salesforce connection
-print("Starting app...")
 app = Flask(__name__)
-print("Flask app initialized.")
-
-# Add debug logs in Salesforce connection setup
 sf = get_salesforce_connection()
-print("Salesforce connection established.")
 
 # Set the secret key to handle sessions securely
-app.secret_key = os.getenv("SECRET_KEY", "sSSjyhInIsUohKpG8sHzty2q")  # Replace with a secure key
-
-# Configure the session type
-app.config["SESSION_TYPE"] = "filesystem"  # Use filesystem for session storage
-#app.config["SESSION_COOKIE_NAME"] = "my_session"  # Optional: Change session cookie name
-app.config["SESSION_COOKIE_SECURE"] = True  # Ensure cookies are sent over HTTPS
-app.config["SESSION_COOKIE_SAMESITE"] = "None"  # Allow cross-site cookies
-
-# Initialize the session
-Session(app)  # Correctly initialize the Session object
-print("Session interface configured.")
-
-# Ensure secure session handling for environments like Hugging Face
-app.session_interface = SecureCookieSessionInterface()
-print("Session interface configured.")
+app.secret_key = 'sSSjyhInIsUohKpG8sHzty2q'  # Replace with a secure key
 
 @app.route("/")
 def home():
@@ -58,52 +37,38 @@ def login():
     if request.method == "POST":
         email = request.form.get("email")
         password = request.form.get("password")
-        print(f"Login attempt with email: {email}")  # Debug log
-
         try:
             query = f"SELECT Id, Name, Email__c FROM Customer_Login__c WHERE Email__c='{email}' AND Password__c='{password}'"
             result = sf.query(query)
-
             if result["records"]:
                 session['user_id'] = result["records"][0]['Id']
                 session['user_email'] = email
-                print(f"Session variables set: user_id={session['user_id']}, user_email={session['user_email']}")
-                #print(f"Session cookie: {request.cookies.get(app.session_cookie_name)}")  # Check session cookie
                 return redirect(url_for("menu"))
             else:
-                print("Invalid credentials!")
                 return render_template("login.html", error="Invalid credentials!")
         except Exception as e:
-            print(f"Error during login: {str(e)}")
             return render_template("login.html", error=f"Error: {str(e)}")
-
     return render_template("login.html")
 
 @app.route("/menu", methods=["GET", "POST"])
 def menu():
     selected_category = request.args.get("category", "All")
     user_id = session.get('user_id')
-    print(f"Cookies on /menu: {request.cookies}")  # Debug: Check cookies sent
-    print(f"Session check in /menu: user_id={user_id}")
-
     if not user_id:
-        print("Session missing, redirecting to login.")
         return redirect(url_for('login'))
-    
     try:
-        query = "SELECT Name, Price__c, Image1__c, Image2__c, Category__c, Description__c FROM Menu_Item__c"
+        query = "SELECT Name, Price__c, Image1__c, Category__c, Description__c FROM Menu_Item__c"
         result = sf.query(query)
         food_items = result['records'] if 'records' in result else []
         categories = {item['Category__c'] for item in food_items if 'Category__c' in item}
         if selected_category != "All":
             food_items = [item for item in food_items if item.get("Category__c") == selected_category]
     except Exception as e:
-        print(f"Error fetching menu data: {str(e)}")
         food_items = []
         categories = []
+        print(f"Error fetching data: {e}")
     return render_template("menu.html", food_items=food_items, categories=categories, selected_category=selected_category)
 
-
 @app.route("/cart", methods=["GET"])
 def cart():
     email = session.get('user_email') # Get logged-in user's email
@@ -129,41 +94,38 @@ def cart():
 @app.route('/cart/add', methods=['POST'])
 def add_to_cart():
     data = request.json
-    item_name = data.get('itemName').strip()
+    item_name = data.get('itemName')
     item_price = data.get('itemPrice')
     item_image = data.get('itemImage')
     addons = data.get('addons', [])
-    customer_email = session.get('user_email')  # Get logged-in user's email from session
+    customer_email = session.get('user_email')
 
-    if not item_name or not item_price:
-        return jsonify({"success": False, "error": "Item name and price are required."})
+    if not customer_email:
+        return jsonify({"success": False, "error": "User not logged in."}), 401
 
     try:
-         # Check if the item already exists in the cart for this custpmer
-         query= f""" SELECT Id, Quantity__c FROM Cart_Item__c
-            WHERE Customer_Email__c = '{customer_email}' AND Name = '{item_name}'
-        """
-         result = sf.query(query)
-         if result['totalSize'] > 0:
-            # Update quantity if the item exists
+        query = f"SELECT Id, Quantity__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}' AND Name = '{item_name}'"
+        result = sf.query(query)
+
+        if result['totalSize'] > 0:
+            # Update existing item quantity
             cart_item = result['records'][0]
             sf.Cart_Item__c.update(cart_item['Id'], {
                 "Quantity__c": cart_item['Quantity__c'] + 1
             })
-         else:
-             # Add a new item if it doesn't exist
-             sf.Cart_Item__c.create({
-                 "Name": item_name,
-            "Price__c": item_price,
-            "Quantity__c": 1,
-            "Add_Ons__c": ";".join(addons) if addons else None,
-            "Image1__c": item_image,
-            "Customer_Email__c": customer_email,  # Associate with the logged-in user
-                 
-             })
-             return jsonify({"success": True, "message": "Item added/updated successfully."})
+        else:
+            # Add new item to the cart
+            sf.Cart_Item__c.create({
+                "Name": item_name,
+                "Price__c": item_price,
+                "Quantity__c": 1,
+                "Add_Ons__c": ";".join(addons) if addons else None,
+                "Image1__c": item_image,
+                "Customer_Email__c": customer_email,
+            })
+        return jsonify({"success": True, "message": "Item added to cart."})
     except Exception as e:
-        return jsonify({"success": False, "error": str(e)})
+        return jsonify({"success": False, "error": str(e)}), 500
 
 @app.route("/cart/add_item", methods=["POST"])
 def add_item_to_cart():
@@ -192,7 +154,7 @@ def add_item_to_cart():
                 "Quantity__c": quantity
             })
 
-        return jsonify({"success": True, "message": "Item added/updated successfully."})
+        return jsonify({"success": True, "message": "Item added/updated successfully.", "redirect": "/menu"})
     except Exception as e:
         return jsonify({"success": False, "error": str(e)}), 500
 
@@ -224,7 +186,7 @@ def get_addons():
         return jsonify({"success": False, "error": "Item name is required."})
 
     try:
-        query = f"SELECT Name, Price__c FROM Add_Ons__c"
+        query = f"SELECT Name, Price__c FROM Add_Ons__c WHERE Menu_Item__r.Name = '{item_name}'"
         addons = sf.query(query)['records']
         return jsonify({"success": True, "addons": addons})
     except Exception as e:
@@ -299,4 +261,5 @@ def checkout():
         return jsonify({"success": False, "error": str(e)})
 
 if __name__ == "__main__":
-    app.run(debug=False, host="0.0.0.0", port=7860)
+    app.run(host="0.0.0.0", port=8080)
+