Update app.py

app.py

@@ -62,17 +62,17 @@ def load_menu_from_salesforce():
         result = sf.query(query)
         return result['records']
     except Exception as e:
-        print(f"Error loading menu from Salesforce: {e}") 
+        print(f"Error loading menu from Salesforce: {e}")
         return []
 
 # Function to load add-ons data from Salesforce
 def load_add_ons_from_salesforce():
     try:
-        query = "SELECT Name, Price__c, Id FROM Add_Ons__c" 
+        query = "SELECT Name, Price__c, Id FROM Add_Ons__c"
         result = sf.query(query)
         return result['records']
     except Exception as e:
-        print(f"Error loading add-ons from Salesforce: {e}") 
+        print(f"Error loading add-ons from Salesforce: {e}")
         return []
 
 # Cart Management
@@ -83,9 +83,9 @@ cart_id = None
 def add_to_cart(item_name, item_price, quantity, special_instructions, selected_addon_ids):
     global total_cart_cost, cart_id
     total_cost = item_price * quantity
-    
+
     selected_addons = [addon for addon in load_add_ons_from_salesforce() if addon['Id'] in selected_addon_ids]
-    addons_cost = sum([addon['Price__c'] for addon in selected_addons])
+    addons_cost = sum(addon['Price__c'] for addon in selected_addons)
 
     try:
         if not cart_id:
@@ -114,11 +114,10 @@ def add_to_cart(item_name, item_price, quantity, special_instructions, selected_
             'cart_item_id': cart_item['id']
         })
         total_cart_cost += total_cost + addons_cost
-
         return cart, total_cart_cost
 
     except Exception as e:
-        print(f"Error adding to cart: {e}") 
+        print(f"Error adding to cart: {e}")
         return f"Error adding to cart: {str(e)}"
 
 
@@ -126,31 +125,31 @@ def remove_from_cart(index):
     global total_cart_cost, cart_id
     if 0 <= index < len(cart):
         try:
-            cart_item_id = cart[index]['cart_item_id']
-            sf.Cart_Item__c.delete(cart_item_id)
+            cart_item_id = cart[index].get('cart_item_id')  # Use get() to avoid KeyError
+            if cart_item_id:
+                sf.Cart_Item__c.delete(cart_item_id)
 
             total_cart_cost -= cart[index]['total_cost']
-            sf.Cart__c.update(cart_id, {'Total_Cost__c': total_cart_cost})
+            if cart_id:  # Check if cart_id exists before updating
+                sf.Cart__c.update(cart_id, {'Total_Cost__c': total_cart_cost})
 
             cart.pop(index)
-
             return cart, total_cart_cost
 
         except Exception as e:
-            print(f"Error removing from cart: {e}") 
+            print(f"Error removing from cart: {e}")
             return f"Error removing from cart: {str(e)}"
     else:
         return "Invalid item index", total_cart_cost
 
-
 # Checkout Summary
 def proceed_to_checkout():
     summary = ""
     for item in cart:
         summary += f"{item['name']} (x{item['quantity']}) - ${item['total_cost']:.2f}\n"
-        if item['instructions']:
+        if item.get('instructions'):
             summary += f"Instructions: {item['instructions']}\n"
-        if item['addons']:
+        if item.get('addons'):
             summary += f"Add-ons: {', '.join([addon['Name'] for addon in item['addons']])}\n"
     summary += f"Total Bill: <span class="math-inline">\{total\_cart\_cost\:\.2f\}"
 return summary
@@ -161,34 +160,36 @@ filtered\_data \= \{\}
 for item in menu\_data\:
 if "Section\_\_c" not in item or "Veg\_NonVeg\_\_c" not in item\:
 continue
-if item\["Section\_\_c"\] not in filtered\_data\:
-filtered\_data\[item\["Section\_\_c"\]\] \= \[\]
+section \= item\["Section\_\_c"\]\.strip\(\)
+if section not in filtered\_data\:
+filtered\_data\[section\] \= \[\]
 if preference \=\= "All" or \(preference \=\= "Veg" and item\["Veg\_NonVeg\_\_c"\] in \["Veg", "Both"\]\) or \(preference \=\= "Non\-Veg" and item\["Veg\_NonVeg\_\_c"\] in \["Non veg", "Both"\]\)\:
-filtered\_data\[item\["Section\_\_c"\]\.strip\(\)\]\.append\(item\)
+filtered\_data\[section\]\.append\(item\)
+if not any\(filtered\_data\.values\(\)\)\:
+return "<p\>No items match your filter\.</p\>"
 html\_content \= '<div style\="padding\: 0 10px; max\-width\: 1200px; margin\: auto;"\>'
 for section, items in filtered\_data\.items\(\)\:
 html\_content \+\= f"<h2 style\='text\-align\: center; margin\-top\: 5px;'\>\{section\}</h2\>"
 html\_content \+\= '<div style\="display\: grid; grid\-template\-columns\: repeat\(auto\-fit, minmax\(250px, 1fr\)\); gap\: 15px; justify\-content\: center; margin\-top\: 10px;"\>'
 for item in items\:
+image\_url \= item\.get\('Image1\_\_c', ''\)
 html\_content \+\= f"""
 <div style\="border\: 1px solid \#ddd; border\-radius\: 10px; box\-shadow\: 0px 4px 8px rgba\(0, 0, 0, 0\.1\); overflow\: hidden; height\: 350px;"\>
-<img src\="\{item\.get\('Image1\_\_c', ''\)\}" style\="width\: 100%; height\: 200px; object\-fit\: cover; cursor\: pointer;"
+<img src\="\{image\_url\}" style\="width\: 100%; height\: 200px; object\-fit\: cover; cursor\: pointer;"
 onclick\="openModal\('\{item\['Name'\]\}', '\{item\.get\('Image2\_\_c', ''\)\}', '\{item\['Description\_\_c'\]\}', \{item\['Price\_\_c'\]\}\)"\>
 <div style\="padding\: 10px;"\>
 <h3 style\='font\-size\: 1\.2em; text\-align\: center;'\>\{item\['Name'\]\}</h3\>
 <p style\='font\-size\: 1\.1em; color\: green; text\-align\: center;'\></span>{item['Price__c']}</p>
-                    <p style='font-size: 0.9em; text-align: justify; margin: 5px;'>{item['Description__c']}</p>
+                        <p style='font-size: 0.9em; text-align: justify; margin: 5px;'>{item['Description__c'] or ''}</p> 
+                    </div>
                 </div>
-            </div>
             """
         html_content += '</div>'
     html_content += '</div>'
 
-    if not any(filtered_data.values()):
-        return "<p>No items match your filter.</p>"
     return html_content
 
-# Function to generate HTML for the modal popup (no JavaScript)
+# Function to generate HTML for the modal popup
 def generate_modal_html(item_name, item_image, item_description, item_price):
     add_ons = load_add_ons_from_salesforce()
     add_ons_html = ""
@@ -221,7 +222,6 @@ def generate_modal_html(item_name, item_image, item_description, item_price):
     """
     return modal_content
 
-
 # --- Gradio App ---
 with gr.Blocks() as app:
     # Hidden components to store data
@@ -254,29 +254,16 @@ with gr.Blocks() as app:
             preference = gr.Radio(choices=["All", "Veg", "Non-Veg"], label="Filter Preference", value="All")
             menu_output = gr.HTML(filter_menu("All"))
 
-            # Add the modal HTML here
-            modal_html = gr.HTML(generate_modal_html("", "", "", 0))  # Initial empty modal
+            modal_html = gr.HTML(generate_modal_html("", "", "", 0))
 
             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;'>View Cart</div>")
             cart_summary = gr.Textbox(label="Cart Summary", interactive=False)
-            checkout_button = gr.Button("Proceed to Checkout", visible=False)  # Initially hide the checkout button
+            checkout_button = gr.Button("Proceed to Checkout", visible=False)
 
-            with gr.Form():  # Wrap the modal content in a form
-                # Hidden inputs to store item details
+            with gr.Form():
                 item_name_hidden = gr.Textbox(visible=False)
                 item_price_hidden = gr.Number(visible=False)
-
-                # ... (modal_html is already added above) ...
-                submit_button = gr.Button("Add to Cart", visible=False)  # Hidden submit button
-
-            # Handle modal form submission
-            def get_selected_addons(checkbox_values):
-                selected_addon_ids = []
-                for i, value in enumerate(checkbox_values):
-                    if value:
-                        add_on_id = load_add_ons_from_salesforce()[i]['Id']
-                        selected_addon_ids.append(add_on_id)
-                return selected_addon_ids
+                submit_button = gr.Button("Add to Cart", visible=False)
 
             submit_button.click(
                 fn=lambda *args: add_to_cart(*args),
@@ -297,19 +284,33 @@ with gr.Blocks() as app:
 
             checkout_button.click(proceed_to_checkout, [], cart_summary)
 
-    # ... (login_button.click, submit_signup.click, signup_button.click, login_redirect.click remain the same) ...
-
-    # When an image is clicked, open the modal and populate it with item details
-    def open_modal(item_name, item_image, item_description, item_price):
-        return gr.update(value=generate_modal_html(item_name, item_image, item_description, item_price)), gr.update(value=item_name), gr.update(value=item_price)
+    # --- Event Handlers ---
+    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]
+    )
+
+    submit_signup.click(
+        lambda name, email, phone, password: signup(name, email, phone, password),
+        inputs=[signup_name, signup_email, signup_phone, signup_password],
+        outputs=signup_output
+    )
+
+    signup_button.click(
+        lambda: (gr.update(visible=False), gr.update(visible=True)),
+        inputs=[],
+        outputs=[login_page, signup_page]
+    )
+
+    login_redirect.click(
+        lambda: (gr.update(visible=True), gr.update(visible=False)),
+        inputs=[],
+        outputs=[login_page, signup_page]
+    )
 
-    # Update the modal HTML when preference changes
     preference.change(lambda pref: filter_menu(pref), [preference], menu_output)
 
-    # Add an event handler to each image in the menu
-    menu_output.change(
-        None,
-        menu_output,
-        [modal_html, item_name_hidden, item_price_hidden],
-        _js="(html) => {  \
-            const images = gradioApp().querySelectorAll('#menu_
+    # When an image is clicked, open the modal and populate it with item details
+    def open_modal(item_name, item_image, item_description, item_price):
+        return gr.