Update app.py

app.py

@@ -4,104 +4,110 @@ from simple_salesforce import Salesforce
 # Salesforce Connection
 sf = Salesforce(username='[email protected]', password='Sati@1020', security_token='sSSjyhInIsUohKpG8sHzty2q')
 
-# Fetch menu items from Salesforce
-def fetch_menu():
-    query = """
-    SELECT Name, Description__c, Price__c, Veg_NonVeg__c, Section__c, Image1__c
-    FROM Menu_Item__c
-    """
-    return sf.query_all(query)['records']
-
-# Fetch Add-ons from Salesforce
-def fetch_add_ons():
-    query = """
-    SELECT Name, Price__c, Description__c, Menu_Item__c
-    FROM Add_Ons__c
-    WHERE Available_In_Menu__c = TRUE
-    """
-    return sf.query_all(query)['records']
-
-# Function to generate HTML for the menu with popups
-def generate_menu_html(menu, add_ons):
-    menu_html = ""
-    add_ons_by_item = {}
 
-    # Organize add-ons by menu item
+# Function to fetch menu items from Salesforce
+def load_menu_from_salesforce():
+    try:
+        query = "SELECT Id, Name, Price__c, Description__c, Image1__c, Veg_NonVeg__c, Section__c FROM Menu_Item__c"
+        result = sf.query(query)
+        return result['records']
+    except Exception as e:
+        print(f"Error fetching menu items: {e}")
+        return []
+
+# Function to fetch add-ons from Salesforce
+def load_add_ons_from_salesforce():
+    try:
+        query = "SELECT Name, Price__c, Menu_Item__c FROM Add_Ons__c"
+        result = sf.query(query)
+        return result['records']
+    except Exception as e:
+        print(f"Error fetching add-ons: {e}")
+        return []
+
+# Function to generate HTML for menu items
+def generate_menu_html(menu_items, add_ons):
+    add_ons_by_item = {}
     for add_on in add_ons:
-        item_id = add_on['Menu_Item__c']
-        if item_id not in add_ons_by_item:
-            add_ons_by_item[item_id] = []
-        add_ons_by_item[item_id].append(add_on)
-
-    # Generate HTML for menu items
-    sections = {}
-    for item in menu:
-        section = item['Section__c'] or 'Others'
-        if section not in sections:
-            sections[section] = []
-
-        item_html = f"""
-        <div class='menu-item'>
-            <img src='{item['Image1__c']}' alt='{item['Name']}' class='menu-item-image'>
+        menu_item_id = add_on.get('Menu_Item__c', None)
+        if menu_item_id:
+            if menu_item_id not in add_ons_by_item:
+                add_ons_by_item[menu_item_id] = []
+            add_ons_by_item[menu_item_id].append({
+                "name": add_on["Name"],
+                "price": add_on["Price__c"]
+            })
+
+    html = ""
+    current_section = None
+    for item in menu_items:
+        if item["Section__c"] != current_section:
+            if current_section is not None:
+                html += "</div>"
+            current_section = item["Section__c"]
+            html += f"<h2>{current_section}</h2><div class='menu-section'>"
+
+        add_ons_list = add_ons_by_item.get(item['Id'], [])
+        html += f"""
+        <div class="menu-item">
+            <img src="{item.get('Image1__c', '')}" alt="{item['Name']}" style="width: 150px; height: 150px; object-fit: cover;">
             <h3>{item['Name']}</h3>
-            <p>{item['Description__c']}</p>
-            <p><strong>Price: ${item['Price__c']}</strong></p>
-            <button onclick=\"openPopup('{item['Name']}', '{item['Price__c']}', {add_ons_by_item.get(item['Id'], [])})\">Customize & Add</button>
+            <p>{item.get('Description__c', 'No description available.')}</p>
+            <p>Price: ${item['Price__c']}</p>
+            <button onclick="openPopup('{item['Name']}', '{item['Price__c']}', {add_ons_list})">Customize & Add</button>
         </div>
         """
-        sections[section].append(item_html)
 
-    # Generate sections
-    for section, items in sections.items():
-        menu_html += f"<h2>{section}</h2><div class='menu-section'>{''.join(items)}</div>"
+    if current_section is not None:
+        html += "</div>"
+    return html
+
+# JavaScript for popup functionality
+popup_script = """
+<script>
+    function openPopup(name, price, addOns) {
+        const popup = document.getElementById('popup');
+        const addOnsContainer = document.getElementById('add-ons-container');
+        
+        popup.style.display = 'block';
+        document.getElementById('popup-item-name').innerText = name;
+        document.getElementById('popup-item-price').innerText = `Price: $${price}`;
+
+        addOnsContainer.innerHTML = "";
+        addOns.forEach(addOn => {
+            const addOnElement = document.createElement('div');
+            addOnElement.innerHTML = `${addOn.name} (+$${addOn.price}) <input type='checkbox' value='${addOn.name}'>`;
+            addOnsContainer.appendChild(addOnElement);
+        });
+    }
 
-    return menu_html
+    function closePopup() {
+        document.getElementById('popup').style.display = 'none';
+    }
+</script>
+"""
 
-# Frontend
-menu_items = fetch_menu()
-add_ons = fetch_add_ons()
+# Load data from Salesforce
+menu_items = load_menu_from_salesforce()
+add_ons = load_add_ons_from_salesforce()
 menu_html = generate_menu_html(menu_items, add_ons)
 
 # Gradio app
 with gr.Blocks() as app:
-    gr.HTML("<h1>Welcome to Biryani Hub</h1>")
-    gr.HTML("<div id='menu-container'>" + menu_html + "</div>")
+    with gr.Row():
+        gr.HTML("<h1>Welcome to Biryani Hub</h1>")
 
+    with gr.Row():
+        gr.HTML(menu_html)
+
+    gr.HTML(popup_script)
     gr.HTML("""
-    <div id='popup' style='display:none;'>
-        <h2 id='popup-title'></h2>
-        <p id='popup-price'></p>
-        <div id='popup-add-ons'></div>
+    <div id="popup" style="display: none; position: fixed; top: 20%; left: 30%; width: 40%; background: white; padding: 20px; border: 1px solid #ccc; box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);">
+        <h2 id="popup-item-name"></h2>
+        <p id="popup-item-price"></p>
+        <div id="add-ons-container"></div>
         <button onclick="closePopup()">Close</button>
     </div>
     """)
 
-    gr.HTML("""
-    <script>
-    function openPopup(itemName, price, addOns) {
-        document.getElementById('popup-title').innerText = itemName;
-        document.getElementById('popup-price').innerText = `Price: $${price}`;
-
-        let addOnsContainer = document.getElementById('popup-add-ons');
-        addOnsContainer.innerHTML = '';
-
-        if (addOns.length > 0) {
-            addOns.forEach(addOn => {
-                let addOnDiv = document.createElement('div');
-                addOnDiv.innerHTML = `<input type='checkbox' value='${addOn.Name}' data-price='${addOn.Price__c}'> ${addOn.Name} ($${addOn.Price__c}) - ${addOn.Description__c}`;
-                addOnsContainer.appendChild(addOnDiv);
-            });
-        } else {
-            addOnsContainer.innerHTML = '<p>No Add-ons available for this item.</p>';
-        }
-
-        document.getElementById('popup').style.display = 'block';
-    }
-
-    function closePopup() {
-        document.getElementById('popup').style.display = 'none';
-    }
-    </script>
-    """)
-
 app.launch()