Update app.py

app.py

@@ -55,7 +55,6 @@ app.register_blueprint(order_blueprint)
 app.register_blueprint(orderhistory_blueprint, url_prefix='/orderhistory')
 app.register_blueprint(customdish_blueprint, url_prefix='/customdish')
 app.register_blueprint(combined_summary_blueprint, url_prefix='/combined_summary')
-
 @app.route('/login', methods=['GET', 'POST'])
 def login():
     # Your login logic goes here
@@ -73,7 +72,8 @@ def login():
         session.modified = True
         return redirect(url_for("menu.menu"))  # Redirect to menu directly
     return render_template('login.html')
-    
+
+
 @app.route("/")
 def home():
     # Fetch user details from URL parameters
@@ -218,14 +218,17 @@ def submit_customization_ingredients():
     ingredients = data.get('ingredients', [])
     instructions = data.get('instructions', '')
 
-    # Get the session email (this should already be set during login)
     customer_email = session.get('user_email')
-
     if not customer_email:
         return jsonify({"error": "User email not found in session"}), 400
 
     try:
-        if items:  # Cart submission
+        # Fetch customer name from Customer_Login__c using email
+        soql_customer = f"SELECT Name, Email__c FROM Customer_Login__c WHERE Email__c = '{customer_email}' LIMIT 1"
+        customer_record = sf.query(soql_customer)
+        customer_name = customer_record['records'][0]['Name'] if customer_record['records'] else 'Unknown Customer'
+
+        if items:  # Bulk items in cart submission
             for item in items:
                 ingredient_names = ', '.join(i['name'] for i in item.get('ingredients', [])) if item.get('ingredients') else ''
                 base_price = item.get('price', 0.0)
@@ -233,26 +236,23 @@ def submit_customization_ingredients():
                 addons_price = 0
                 total_price = (base_price * quantity) + addons_price
 
-                # Check if item already exists in the cart for the user based on Customer_Email__c and Item Name
+                # Check if item exists in cart
                 soql = f"SELECT Id, Quantity__c, Add_Ons__c, Instructions__c, Price__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}' AND Name = '{item['name']}' LIMIT 1"
                 existing_item = sf.query(soql)
 
-                if existing_item['records']:  # If the item exists, update it
-                    item_id = existing_item['records'][0]['Id']
-                    existing_quantity = existing_item['records'][0]['Quantity__c']
-                    existing_addons = existing_item['records'][0]['Add_Ons__c']
-                    existing_instructions = existing_item['records'][0]['Instructions__c']
-                    existing_price = existing_item['records'][0]['Price__c']
+                if existing_item['records']:
+                    # Update existing cart item
+                    record = existing_item['records'][0]
+                    item_id = record['Id']
+                    existing_quantity = record['Quantity__c'] or 0
+                    existing_addons = record.get('Add_Ons__c') or ''
+                    existing_instructions = record.get('Instructions__c') or ''
 
-                    # Update quantity, addons, and instructions
                     new_quantity = existing_quantity + quantity
-                    new_addons = (existing_addons or '') + (', ' + ingredient_names if ingredient_names else '')
-                    new_instructions = (existing_instructions or '') + ('; ' + instructions if instructions else '')
-
-                    # Calculate the new total price
+                    new_addons = existing_addons + (', ' + ingredient_names if ingredient_names else '')
+                    new_instructions = existing_instructions + ('; ' + instructions if instructions else '')
                     updated_price = (base_price * new_quantity) + addons_price
 
-                    # Update the existing item in Salesforce
                     sf.Cart_Item__c.update(item_id, {
                         'Quantity__c': new_quantity,
                         'Add_Ons__c': new_addons,
@@ -260,7 +260,8 @@ def submit_customization_ingredients():
                         'Price__c': updated_price
                     })
                     logger.debug(f"Updated {item['name']} in Cart_Item__c")
-                else:  # If the item doesn't exist, create a new one
+                else:
+                    # Create new cart item
                     sf.Cart_Item__c.create({
                         'Name': item['name'],
                         'Base_Price__c': base_price,
@@ -272,9 +273,22 @@ def submit_customization_ingredients():
                         'Instructions__c': item.get('instructions', ''),
                         'Category__c': item.get('veg_nonveg', ''),
                         'Section__c': item.get('section', ''),
-                        'Customer_Email__c': customer_email  # Store session email
+                        'Customer_Email__c': customer_email
                     })
                     logger.debug(f"Created new Cart_Item__c for {item['name']}")
+
+                    # Create corresponding Custom_Dish__c record
+                    sf.Custom_Dish__c.create({
+                        'Name': f"{customer_name} - {item['name']}",
+                        'Price__c': total_price,
+                        'Description__c': (ingredient_names + '; ' + instructions).strip('; '),
+                        'Image1__c': item.get('image_url', ''),
+                        'Veg_NonVeg__c': item.get('veg_nonveg', ''),
+                        'Total_Ordered__c': 1,
+                        'Section__c': 'Customized dish'  # Fixed value here
+                    })
+                    logger.debug(f"Created Custom_Dish__c for {item['name']}")
+
             return jsonify({"success": True, "message": f"Processed {len(items)} items"})
 
         elif menu_item:  # Single item customization
@@ -284,26 +298,22 @@ def submit_customization_ingredients():
             addons_price = 0
             total_price = (base_price * quantity) + addons_price
 
-            # Check if the menu item already exists in the cart for the user
             soql = f"SELECT Id, Quantity__c, Add_Ons__c, Instructions__c, Price__c FROM Cart_Item__c WHERE Customer_Email__c = '{customer_email}' AND Name = '{menu_item['name']}' LIMIT 1"
             existing_item = sf.query(soql)
 
-            if existing_item['records']:  # If the item exists, update it
-                item_id = existing_item['records'][0]['Id']
-                existing_quantity = existing_item['records'][0]['Quantity__c']
-                existing_addons = existing_item['records'][0]['Add_Ons__c']
-                existing_instructions = existing_item['records'][0]['Instructions__c']
-                existing_price = existing_item['records'][0]['Price__c']
+            if existing_item['records']:
+                # Update existing cart item
+                record = existing_item['records'][0]
+                item_id = record['Id']
+                existing_quantity = record['Quantity__c'] or 0
+                existing_addons = record.get('Add_Ons__c') or ''
+                existing_instructions = record.get('Instructions__c') or ''
 
-                # Update quantity, addons, and instructions
                 new_quantity = existing_quantity + quantity
-                new_addons = (existing_addons or '') + (', ' + ingredient_names if ingredient_names else '')
-                new_instructions = (existing_instructions or '') + ('; ' + instructions if instructions else '')
-
-                # Calculate the new total price
+                new_addons = existing_addons + (', ' + ingredient_names if ingredient_names else '')
+                new_instructions = existing_instructions + ('; ' + instructions if instructions else '')
                 updated_price = (base_price * new_quantity) + addons_price
 
-                # Update the existing item in Salesforce
                 sf.Cart_Item__c.update(item_id, {
                     'Quantity__c': new_quantity,
                     'Add_Ons__c': new_addons,
@@ -311,7 +321,8 @@ def submit_customization_ingredients():
                     'Price__c': updated_price
                 })
                 logger.debug(f"Updated customization for {menu_item['name']} in Cart_Item__c")
-            else:  # If the item doesn't exist, create a new one
+            else:
+                # Create new cart item
                 sf.Cart_Item__c.create({
                     'Name': menu_item['name'],
                     'Base_Price__c': base_price,
@@ -323,9 +334,22 @@ def submit_customization_ingredients():
                     'Instructions__c': instructions,
                     'Category__c': menu_item.get('veg_nonveg', ''),
                     'Section__c': menu_item.get('section', ''),
-                    'Customer_Email__c': customer_email  # Store session email
+                    'Customer_Email__c': customer_email
                 })
                 logger.debug(f"Created new Cart_Item__c for {menu_item['name']}")
+
+                # Create corresponding Custom_Dish__c record
+                sf.Custom_Dish__c.create({
+                    'Name': f"{customer_name} - {menu_item['name']}",
+                    'Price__c': total_price,
+                    'Description__c': (ingredient_names + '; ' + instructions).strip('; '),
+                    'Image1__c': menu_item.get('image_url', ''),
+                    'Veg_NonVeg__c': menu_item.get('veg_nonveg', ''),
+                    'Total_Ordered__c': 1,
+                    'Section__c': 'Customized dish'  # Fixed value here
+                })
+                logger.debug(f"Created Custom_Dish__c for {menu_item['name']}")
+
             return jsonify({"success": True, "message": "Customization submitted"})
 
         else:
@@ -336,5 +360,96 @@ def submit_customization_ingredients():
         return jsonify({"error": f"Failed to submit: {str(e)}"}), 500
 
 
+from flask import Flask, render_template, request, jsonify
+import os
+import base64
+import requests
+import logging
+from requests.adapters import HTTPAdapter
+from urllib3.util.retry import Retry
+
+# Configure logging
+logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(levelname)s - %(message)s')
+
+
+
+# Configuration
+UPLOAD_FOLDER = 'static/captures'
+os.makedirs(UPLOAD_FOLDER, exist_ok=True)
+app.config['UPLOAD_FOLDER'] = UPLOAD_FOLDER
+
+# Zapier webhook settings
+ZAPIER_WEBHOOK_URL = os.getenv('ZAPIER_WEBHOOK_URL')  # Load webhook URL from environment variable
+
+def send_to_zapier(image_path):
+    if not ZAPIER_WEBHOOK_URL:
+        logging.error("Zapier webhook URL not set.")
+        return {"error": "Zapier webhook URL not set. Please set the ZAPIER_WEBHOOK_URL environment variable."}
+    try:
+        payload = {
+            'image_url': request.url_root + image_path,
+            'filename': os.path.basename(image_path),
+            'content_type': 'image/jpeg'
+        }
+
+        session = requests.Session()
+        retries = Retry(total=3, backoff_factor=1, status_forcelist=[502, 503, 504])
+        session.mount('https://', HTTPAdapter(max_retries=retries))
+        logging.debug(f"Sending image URL to Zapier webhook: {ZAPIER_WEBHOOK_URL}")
+        response = session.post(ZAPIER_WEBHOOK_URL, json=payload, timeout=10)
+        response.raise_for_status()
+        logging.debug("Image URL sent to Zapier successfully.")
+        return {"status": "success"}
+    except requests.exceptions.RequestException as e:
+        logging.error(f"Failed to send to Zapier: {str(e)}")
+        if e.response is not None:
+            logging.error(f"Response details: {e.response.text}")
+        return {"error": f"Failed to send to Zapier: {str(e)}"}
+
+
+
+@app.route('/camera')
+def camera():
+    return render_template('camera.html')
+
+@app.route('/capture', methods=['POST'])
+def capture():
+    try:
+        data = request.form['image']
+        header, encoded = data.split(",", 1)
+        binary_data = base64.b64decode(encoded)
+        
+        filename = f"capture_{len(os.listdir(app.config['UPLOAD_FOLDER'])) + 1}.jpg"
+        filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+        with open(filepath, "wb") as f:
+            f.write(binary_data)
+        
+        image_url = f"/{filepath}"
+        return jsonify({
+            'status': 'success',
+            'image_url': image_url
+        })
+    except Exception as e:
+        logging.error(f"Error in capture: {str(e)}")
+        return jsonify({'status': 'error', 'message': str(e)})
+
+@app.route('/upload_zapier', methods=['POST'])
+def upload_zapier():
+    try:
+        image_url = request.form['image_url']
+        if not image_url.startswith('/static/captures/'):
+            return jsonify({'status': 'error', 'message': 'Invalid image path.'})
+        
+        result = send_to_zapier(image_url.lstrip('/'))
+        if 'error' in result:
+            return jsonify({'status': 'error', 'message': result['error']})
+        return jsonify({'status': 'success'})
+    except Exception as e:
+        logging.error(f"Error in upload_zapier: {str(e)}")
+        return jsonify({'status': 'error', 'message': str(e)})
+
+
+
+
 if __name__ == "__main__":
     app.run(debug=True, host="0.0.0.0", port=7860)