Update app.py

app.py

@@ -17,18 +17,14 @@ def verify_password(plain_password, hashed_password):
 def signup(name, email, phone, password):
     try:
         email = email.strip()
-
-        # Check if the email already exists in Salesforce
         query = f"SELECT Id FROM Customer_Login__c WHERE Email__c = '{email}'"
         result = sf.query(query)
 
         if len(result['records']) > 0:
             return "Email already exists! Please use a different email."
 
-        # Hash the password
         hashed_password = hash_password(password)
 
-        # Create the new user record
         sf.Customer_Login__c.create({
             'Name': name.strip(),
             'Email__c': email,
@@ -43,9 +39,6 @@ def signup(name, email, phone, password):
 def login(email, password):
     try:
         email = email.strip()
-        password = password.strip()
-
-        # Query Salesforce for user details
         query = f"SELECT Name, Password__c FROM Customer_Login__c WHERE Email__c = '{email}'"
         result = sf.query(query)
 
@@ -55,8 +48,7 @@ def login(email, password):
         user = result['records'][0]
         stored_password = user['Password__c']
 
-        # Verify the entered password with the stored hash
-        if verify_password(password, stored_password):
+        if verify_password(password.strip(), stored_password):
             return "Login successful!", user['Name']
         else:
             return "Invalid email or password.", None
@@ -72,6 +64,15 @@ def load_menu_from_salesforce():
     except Exception as e:
         return []
 
+# Function to load add-ons data
+def load_add_ons_from_salesforce():
+    try:
+        query = "SELECT Name, Price__c FROM Add_Ons__c"
+        result = sf.query(query)
+        return result['records']
+    except Exception as e:
+        return []
+
 # Function to filter menu items
 def filter_menu(preference):
     menu_data = load_menu_from_salesforce()
@@ -113,7 +114,17 @@ def filter_menu(preference):
 
 # Create Modal Window HTML
 def create_modal_window():
-    modal_html = """
+    add_ons = load_add_ons_from_salesforce()
+    add_ons_html = ""
+    for add_on in add_ons:
+        add_ons_html += f"""
+        <label>
+            <input type="checkbox" name="biryani-extra" value="{add_on['Name']}" data-price="{add_on['Price__c']}" />
+            {add_on['Name']} + ${add_on['Price__c']}
+        </label>
+        """
+
+    modal_html = f"""
     <div id="modal" style="display: none; position: fixed; background: white; border-radius: 8px; box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2); padding: 20px; z-index: 1000;">
         <div style="text-align: right;">
             <button onclick="closeModal()" style="background: none; border: none; font-size: 18px; cursor: pointer;">&times;</button>
@@ -122,21 +133,13 @@ def create_modal_window():
         <h2 id="modal-name"></h2>
         <p id="modal-description"></p>
         <p id="modal-price"></p>
-        <!-- Add-ons Section -->
         <label for="biryani-extras"><strong>Add-ons :</strong></label>
         <div id="biryani-extras-options" style="display: flex; flex-wrap: wrap; gap: 10px; margin: 10px 0;">
-            <label><input type="checkbox" name="biryani-extra" value="Thums up" /> Thums up + $2.00</label>
-            <label><input type="checkbox" name="biryani-extra" value="Sprite" /> Sprite + $2.00</label>
-            <label><input type="checkbox" name="biryani-extra" value="Extra Raitha" /> Extra Raitha + $1.00</label>
-            <label><input type="checkbox" name="biryani-extra" value="Extra Salan" /> Extra Salan + $2.00</label>
+            {add_ons_html}
         </div>
-        <!-- Quantity and Special Instructions -->
         <label for="quantity">Quantity:</label>
         <input type="number" id="quantity" value="1" min="1" style="width: 50px;" />
-        <br><br>
         <textarea id="special-instructions" placeholder="Add your special instructions here..." style="width: 100%; height: 60px;"></textarea>
-        <br><br>
-        <!-- Add to Cart Button -->
         <button style="background-color: #28a745; color: white; border: none; padding: 10px 20px; font-size: 14px; border-radius: 5px; cursor: pointer;" onclick="addToCart()">Add to Cart</button>
     </div>
     """
@@ -146,17 +149,14 @@ def create_modal_window():
 def modal_js():
     modal_script = """
     <script>
+        let cart = [];
+
         function openModal(name, image2, description, price) {
             const modal = document.getElementById('modal');
             modal.style.display = 'block';
             modal.style.position = 'fixed';
-            if (window.innerWidth <= 768) {
-                modal.style.width = '90%';
-                modal.style.top = `${event.touches ? event.touches[0].screenY : event.clientY}px`;
-            } else {
-                modal.style.width = '30%';
-                modal.style.top = `${event.clientY}px`;
-            }
+            modal.style.width = window.innerWidth <= 768 ? '90%' : '30%';
+            modal.style.top = `${event.clientY}px`;
             modal.style.left = '50%';
             modal.style.transform = 'translate(-50%, -50%)';
             document.getElementById('modal-image').src = image2;
@@ -176,13 +176,39 @@ def modal_js():
             const price = parseFloat(document.getElementById('modal-price').innerText.replace('$', ''));
             const quantity = parseInt(document.getElementById('quantity').value) || 1;
             const instructions = document.getElementById('special-instructions').value;
-            const extras = Array.from(document.querySelectorAll('input[name="biryani-extra"]:checked')).map(extra => extra.value);
-            const extrasCost = extras.length * 2;  // Assuming $2 per extra
+            const extras = Array.from(document.querySelectorAll('input[name="biryani-extra"]:checked')).map(extra => ({
+                name: extra.value,
+                price: parseFloat(extra.getAttribute('data-price') || '0')
+            }));
+            const extrasCost = extras.reduce((total, extra) => total + extra.price, 0);
             const totalCost = (price + extrasCost) * quantity;
-
-            alert(`${quantity} x ${name} added to cart! Total: $${totalCost.toFixed(2)}`);
+            cart.push({ name, price, quantity, extras, instructions, totalCost });
+            updateCartUI();
             closeModal();
         }
+
+        function updateCartUI() {
+            const cartContainer = document.getElementById('cart-container');
+            cartContainer.innerHTML = "";
+            cart.forEach((item, index) => {
+                const extrasList = item.extras.map(extra => `${extra.name} (+$${extra.price.toFixed(2)})`).join(', ');
+                cartContainer.innerHTML += `
+                    <div style="border: 1px solid #ddd; padding: 10px; margin-bottom: 10px; border-radius: 8px;">
+                        <h3>${item.name}</h3>
+                        <p>Quantity: ${item.quantity}</p>
+                        <p>Extras: ${extrasList || 'None'}</p>
+                        <p>Special Instructions: ${item.instructions || 'None'}</p>
+                        <p>Total Cost: $${item.totalCost.toFixed(2)}</p>
+                        <button onclick="removeFromCart(${index})" style="color: red;">Remove</button>
+                    </div>
+                `;
+            });
+        }
+
+        function removeFromCart(index) {
+            cart.splice(index, 1);
+            updateCartUI();
+        }
     </script>
     """
     return modal_script
@@ -214,6 +240,7 @@ with gr.Blocks() as app:
         with gr.Column():
             preference = gr.Radio(choices=["All", "Veg", "Non-Veg"], label="Filter Preference", value="All")
             menu_output = gr.HTML()
+            gr.HTML("<div id='cart-container' style='margin-top: 20px; padding: 10px; border: 1px solid #ddd; border-radius: 8px; background-color: #f9f9f9;'>Your cart is empty.</div>")
             gr.HTML(create_modal_window())  # Add modal window HTML
             gr.HTML(modal_js())  # Add modal JavaScript