Update app.py

app.py

@@ -112,40 +112,14 @@ def filter_menu(preference):
 
     return html_content
 
-# Function to save cart details to Salesforce
-def save_cart_to_salesforce(cart):
-    try:
-        # Loop through each cart item and create a new Order__c record
-        for item in cart:
-            order_data = {
-                'Name2__c': item['name'],  # Custom name for the order (can be the item name or order ID)
-                'Item_Name__c': item['name'],  # Name of the item in the order
-                'Quantity__c': item['quantity'],  # Quantity of the item
-                'Price__c': item['price'],  # Price of the item
-                'Total_Cost__c': item['totalCost'],  # Total cost for the item
-                'Special_Instructions__c': item['instructions'],  # Special instructions (if any)
-            }
-
-            # Handle add-ons if available
-            if item['extras']:
-                add_ons = ", ".join([add_on['name'] for add_on in item['extras']])
-                order_data['Add_Ons__c'] = add_ons  # Add-ons associated with the item
-
-            # Create the order in Salesforce
-            sf.Order__c.create(order_data)
-        
-        return "Cart saved successfully to Salesforce!"
-    except Exception as e:
-        return f"Error while saving cart to Salesforce: {str(e)}"
-
-# Function to create the modal window with add-ons
+# Create Modal Window HTML
 def create_modal_window():
     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']}" checked="checked" />
+            <input type="checkbox" name="biryani-extra" value="{add_on['Name']}" data-price="{add_on['Price__c']}" />
             {add_on['Name']} + ${add_on['Price__c']}
         </label>
         <br>
@@ -206,14 +180,14 @@ def modal_js():
             const extras = selectedAddOns.map(extra => ({
                 name: extra.value,
                 price: parseFloat(extra.getAttribute('data-price')),
+                quantity: 1  // Default quantity for add-ons is 1
             }));
-            const extrasCost = extras.reduce((total, extra) => total + (extra.price * 1), 0); // Default quantity for add-ons set to 1
+            const extrasCost = extras.reduce((total, extra) => total + (extra.price * extra.quantity), 0);
             const totalCost = (price * quantity) + extrasCost;
-            // Add the item to the cart with its specific add-ons
             cart.push({ name, price, quantity, extras, instructions, totalCost });
-            totalCartCost += totalCost;  // Update the total cost of the cart
+            totalCartCost += totalCost;
             updateCartButton();
-            updateCartTotalCost();  // Update total cost displayed
+            updateCartTotalCost();
             closeModal();
         }
         function updateCartButton() {
@@ -225,7 +199,7 @@ def modal_js():
             const cartItemsContainer = document.getElementById('cart-items');
             cartItemsContainer.innerHTML = "";
             cart.forEach((item, index) => {
-                const extrasList = item.extras.map(extra => `${extra.name} (+$${extra.price})`).join(', ');
+                const extrasList = item.extras.map(extra => `${extra.name} x<input type="number" value="${extra.quantity}" min="1" style="width: 50px;" onchange="updateCartItem(${index}, 'extra', this.value)" /> (+$${(extra.price * extra.quantity).toFixed(2)})`).join(', ');
                 cartItemsContainer.innerHTML += `
                     <div style="border: 1px solid #ddd; padding: 10px; margin-bottom: 10px; border-radius: 8px;">
                         <h3>${item.name}</h3>
@@ -243,22 +217,24 @@ def modal_js():
             document.getElementById('cart-modal').style.display = 'none';
         }
         function removeFromCart(index) {
-            totalCartCost -= cart[index].totalCost;  // Deduct the cost of the removed item from total cost
+            totalCartCost -= cart[index].totalCost;
             cart.splice(index, 1);
             updateCartButton();
-            updateCartTotalCost();  // Update total cost displayed
+            updateCartTotalCost();
             openCartModal();
         }
         function updateCartItem(index, type, value) {
             if (type === 'item') {
                 cart[index].quantity = parseInt(value);
+            } else if (type === 'extra') {
+                cart[index].extras[0].quantity = parseInt(value);
             }
             const item = cart[index];
             const price = item.price;
-            const extrasCost = item.extras.reduce((total, extra) => total + (extra.price * 1), 0);
+            const extrasCost = item.extras.reduce((total, extra) => total + (extra.price * extra.quantity), 0);
             item.totalCost = (price * item.quantity) + extrasCost;
             document.getElementById(`item-${index}-total`).innerText = item.totalCost.toFixed(2);
-            updateCartTotalCost();  // Update total cost displayed
+            updateCartTotalCost();
         }
         function updateCartTotalCost() {
             const totalCostElement = document.getElementById('cart-total-cost');
@@ -266,14 +242,11 @@ def modal_js():
             totalCostElement.innerText = `Total Cart Cost: $${totalCartCost.toFixed(2)}`;
         }
         function proceedToCheckout() {
-            // Save the cart to Salesforce when the user checks out
-            save_cart_to_salesforce(cart);
-            alert("Proceeding to checkout...");
+            window.location.href = '/final-order-page';  // Redirect to final order page
         }
-        // Reset all selected add-ons when opening a new item modal
         function resetAddOns() {
             const checkboxes = document.querySelectorAll('input[name="biryani-extra"]');
-            checkboxes.forEach(checkbox => checkbox.checked = true);  // Set all add-ons to be checked by default
+            checkboxes.forEach(checkbox => checkbox.checked = false);
         }
     </script>
     """
@@ -284,6 +257,7 @@ with gr.Blocks() as app:
     with gr.Row():
         gr.HTML("<h1 style='text-align: center;'>Welcome to Biryani Hub</h1>")
 
+    # Login Page
     with gr.Row(visible=True) as login_page:
         with gr.Column():
             login_email = gr.Textbox(label="Email")
@@ -292,6 +266,7 @@ with gr.Blocks() as app:
             signup_button = gr.Button("Go to Signup")
             login_output = gr.Textbox(label="Status")
 
+    # Signup Page
     with gr.Row(visible=False) as signup_page:
         with gr.Column():
             signup_name = gr.Textbox(label="Name")
@@ -302,20 +277,30 @@ with gr.Blocks() as app:
             login_redirect = gr.Button("Go to Login")
             signup_output = gr.Textbox(label="Status")
 
+    # Menu Page
     with gr.Row(visible=False) as menu_page:
         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-button' style='position: fixed; top: 20px; right: 20px; background: #28a745; color: white; padding: 10px 20px; border-radius: 30px; cursor: pointer; z-index: 1000;' onclick='openCartModal()'>View Cart</div>")
-            gr.HTML("<div id='cart-modal' style='display: none; position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: white; z-index: 1000; overflow-y: auto;'><div style='padding: 20px;'><div style='text-align: right;'><button onclick='closeCartModal()' style='background: none; border: none; font-size: 24px; cursor: pointer;'>&times;</button></div><h1>Your Cart</h1><div id='cart-items'></div><p id='cart-total-cost' style='font-size: 1.2em; font-weight: bold;'>Total Cart Cost: $0.00</p><button style='background: #ff5722; color: white; padding: 10px 20px; border-radius: 5px; border: none; cursor: pointer;' onclick='proceedToCheckout()'>Proceed to Checkout</button></div></div>")
             gr.HTML(create_modal_window())
             gr.HTML(modal_js())
 
+    # Final Order Page
+    with gr.Row(visible=False) as final_order_page:
+        with gr.Column():
+            final_order_output = gr.HTML()
+
+    # Login button action
     login_button.click(
         lambda email, password: (gr.update(visible=False), gr.update(visible=True), gr.update(value=filter_menu("All")), "Login successful!")
         if login(email, password)[0] == "Login successful!" else (gr.update(), gr.update(), gr.update(), "Invalid email or password."),
         [login_email, login_password], [login_page, menu_page, menu_output, login_output]
     )
+
+    # Signup button action
+    signup_button.click(lambda: gr.update(visible=False), [], login_page)
+
+    # Menu preference change
     preference.change(lambda pref: filter_menu(pref), [preference], menu_output)
 
-app.launch()
+    app.launch()