Upload folder using huggingface_hub

app/ai_features.py

@@ -15,6 +15,7 @@ import os
 import json
 import traceback
 from .xero_utils import trigger_po_creation,trigger_contact_creation
+from .email_utils import send_order_confirmation_email
 # +++ START: WHATSAPP FEATURE IMPORTS +++
 import requests
 from twilio.twiml.messaging_response import MessagingResponse
@@ -598,6 +599,7 @@ def whatsapp_reply():
                     final_response_text = error_msg
                 else: # User was found successfully
                     user_email = user['email']
+                    user_id = mongo.db.users.find_one({'email': user_email})
                     user_name = user.get('contactPerson', 'the customer')
 
                     if function_call.name == 'create_direct_order':
@@ -620,6 +622,15 @@ def whatsapp_reply():
                             "order_id": str(order_id), "user_email": user_email, "items": validated_items,
                             "delivery_address": user.get('businessAddress'), "mobile_number": user.get('phoneNumber'),"deliverydate": args.get('delivery_date')
                             }
+                            order_doc['_id'] = order_id
+                            product_ids = [ObjectId(item['productId']) for item in validated_items]
+                            products_map = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
+                            order_doc['populated_items'] = [{
+                                "name": products_map.get(item['productId'], {}).get('name', 'N/A'),
+                                "quantity": item['quantity'],
+                                "mode": item.get('mode', 'pieces')
+                            } for item in validated_items]
+                            send_order_confirmation_email(order_doc, user_id)
                             trigger_po_creation(order_details_for_xero)
                             final_response_text = f"Thank you! I have directly placed order #{next_serial} for *{user_name}* for delivery on {args.get('delivery_date')}. They can view details at https://matax-express.vercel.app/."
 
@@ -629,7 +640,10 @@ def whatsapp_reply():
                             p_doc = mongo.db.products.find_one({'name': {'$regex': f'^{item.get("product_name")}$', '$options': 'i'}})
                             if p_doc:
                                 db_items.append({"productId": str(p_doc['_id']), "quantity": item.get('quantity'), "mode": item.get('unit')})
-                                added_messages.append(f"{item.get('quantity')} {item.get('unit')} of {p_doc['name']}")
+                                modes=item.get('unit')
+                                if modes == 'weight':
+                                    modes='lb'
+                                added_messages.append(f"{item.get('quantity')} {modes} of {p_doc['name']}")
                             else: added_messages.append(f"could not find '{item.get('product_name')}'")
                         if db_items: mongo.db.carts.update_one({'user_email': user_email}, {'$push': {'items': {'$each': db_items}}, '$set': {'updated_at': datetime.utcnow()}}, upsert=True)
                         final_response_text = f"OK, I've updated the cart for *{user_name}*: I added {', '.join(added_messages)}."
@@ -648,6 +662,15 @@ def whatsapp_reply():
                             "delivery_address": user.get('businessAddress'), "mobile_number": user.get('phoneNumber'),"deliverydate": args.get('delivery_date')
                             }
                             trigger_po_creation(order_details_for_xero)
+                            order_doc['_id'] = order_id
+                            product_ids = [ObjectId(item['productId']) for item in cart['items']]
+                            products_map = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
+                            order_doc['populated_items'] = [{
+                                "name": products_map.get(item['productId'], {}).get('name', 'N/A'),
+                                "quantity": item['quantity'],
+                                "mode": item.get('mode', 'pieces')
+                            } for item in cart['items']]
+                            send_order_confirmation_email(order_doc, user_id)
                             mongo.db.carts.delete_one({'user_email': user_email}) # Clear cart
                             final_response_text = f"Thank you! Order `#{next_serial}` has been placed for *{user_name}* for delivery on {args.get('delivery_date')}. They can view details at https://matax-express.vercel.app/."
                     

app/api.py

@@ -1,392 +1,426 @@
-# your_app/api.py
-
-from flask import Blueprint, request, jsonify, current_app, redirect
-from bson.objectid import ObjectId
-from datetime import datetime
-from flask_jwt_extended import create_access_token, jwt_required, get_jwt_identity
-from .extensions import bcrypt, mongo
-from .xero_utils import trigger_po_creation, trigger_contact_creation,sync_user_approval_from_xero
-from .email_utils import send_order_confirmation_email, send_registration_email, send_login_notification_email, send_cart_reminder_email
-from .general_utils import get_next_order_serial
-
-
-api_bp = Blueprint('api', __name__)
-@api_bp.route('/sync_xero_users', methods=['GET'])
-def sync_xero_users():
-    sync_user_approval_from_xero()
-    return "✅"
-
-@api_bp.route('/clear')
-def clear_all():
-    mongo.db.users.delete_many({})
-    mongo.db.orders.delete_many({})
-    return "✅"
-
-@api_bp.route('/register', methods=['POST'])
-def register():
-    data = request.get_json()
-    email = data.get('email')
-    password = data.get('password')
-    company_name = data.get('businessName') 
-    
-    if not all([email, password, company_name]): 
-        return jsonify({"msg": "Missing required fields: Email, Password, and Business Name"}), 400
-    if mongo.db.users.find_one({'email': email}): 
-        return jsonify({"msg": "A user with this email already exists"}), 409
-    
-    hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
-    
-    user_document = data.copy()
-    user_document['password'] = hashed_password
-    user_document['company_name'] = company_name
-    user_document['is_approved'] = False
-    user_document['is_admin'] = False
-    
-    mongo.db.users.insert_one(user_document)
-    trigger_contact_creation(data)
-
-    try:
-        send_registration_email(data)
-    except Exception as e:
-        current_app.logger.error(f"Failed to send registration email to {email}: {e}")
-
-    return jsonify({"msg": "Registration successful! Your application is being processed."}), 201
-
-# ... (the rest of your api.py file remains unchanged)
-@api_bp.route('/login', methods=['POST'])
-def login():
-    data = request.get_json()
-    email, password = data.get('email'), data.get('password')
-    user = mongo.db.users.find_one({'email': email})
-
-    if user and user.get('password') and bcrypt.check_password_hash(user['password'], password):
-        if not user.get('is_approved', False): return jsonify({"msg": "Account pending approval"}), 403
-        
-        try:
-            send_login_notification_email(user)
-        except Exception as e:
-            current_app.logger.error(f"Failed to send login notification email to {email}: {e}")
-
-        access_token = create_access_token(identity=email)
-        return jsonify(access_token=access_token, email=user['email'], companyName=user['businessName'],contactPerson=user.get('contactPerson', '')) , 200
-    
-    return jsonify({"msg": "Bad email or password"}), 401
-
-@api_bp.route('/profile', methods=['GET'])
-@jwt_required()
-def get_user_profile():
-    user_email = get_jwt_identity()
-    user = mongo.db.users.find_one({'email': user_email})
-
-    if not user:
-        return jsonify({"msg": "User not found"}), 404
-
-    profile_data = {
-        'deliveryAddress': user.get('businessAddress', ''),
-        'mobileNumber': user.get('phoneNumber', '')
-    }
-    
-    return jsonify(profile_data), 200
-
-@api_bp.route('/products', methods=['GET'])
-def get_products():
-    products = [{
-        'id': str(p['_id']), 'name': p.get('name'), 'category': p.get('category'),
-        'unit': p.get('unit'), 'image_url': p.get('image_url', ''), 'price': p.get('price', '')
-    } for p in mongo.db.products.find()]
-    return jsonify(products)
-
-
-@api_bp.route('/cart', methods=['GET', 'POST'])
-@jwt_required()
-def handle_cart():
-    user_email = get_jwt_identity()
-
-    if request.method == 'GET':
-        cart = mongo.db.carts.find_one({'user_email': user_email})
-        if not cart:
-            return jsonify({'items': [], 'deliveryDate': None})
-
-        populated_items = []
-        if cart.get('items'):
-            product_ids = [ObjectId(item['productId']) for item in cart['items']]
-            if product_ids:
-                products = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
-                for item in cart['items']:
-                    details = products.get(item['productId'])
-                    if details:
-                        populated_items.append({
-                            'product': {'id': str(details['_id']), 'name': details.get('name'), 'unit': details.get('unit'), 'image_url': details.get('image_url'), 'price': details.get('price')},
-                            'quantity': item['quantity'],
-                            'mode': item.get('mode', 'pieces')
-                        })
-        
-        return jsonify({
-            'items': populated_items,
-            'deliveryDate': cart.get('deliveryDate')
-        })
-
-    if request.method == 'POST':
-        data = request.get_json()
-        
-        update_doc = {
-            'user_email': user_email,
-            'updated_at': datetime.utcnow()
-        }
-        
-        if 'items' in data:
-            update_doc['items'] = data['items']
-
-        if 'deliveryDate' in data:
-            update_doc['deliveryDate'] = data['deliveryDate']
-
-        mongo.db.carts.update_one(
-            {'user_email': user_email},
-            {'$set': update_doc},
-            upsert=True
-        )
-        return jsonify({"msg": "Cart updated successfully"})
-
-@api_bp.route('/orders', methods=['GET', 'POST'])
-@jwt_required()
-def handle_orders():
-    user_email = get_jwt_identity()
-
-    if request.method == 'POST':
-        cart = mongo.db.carts.find_one({'user_email': user_email})
-        if not cart or not cart.get('items'): return jsonify({"msg": "Your cart is empty"}), 400
-        
-        data = request.get_json()
-        if not all([data.get('deliveryDate'), data.get('deliveryAddress'), data.get('mobileNumber')]): return jsonify({"msg": "Missing delivery information"}), 400
-
-        user = mongo.db.users.find_one({'email': user_email})
-        if not user:
-            return jsonify({"msg": "User not found"}), 404
-
-        order_doc = {
-            'user_email': user_email, 'items': cart['items'], 'delivery_date': data['deliveryDate'],
-            'delivery_address': data['deliveryAddress'], 'mobile_number': data['mobileNumber'],
-            'additional_info': data.get('additionalInfo'), 'total_amount': data.get('totalAmount'),
-            'status': 'pending', 'created_at': datetime.utcnow()
-        }
-        order_doc['serial_no'] = get_next_order_serial()
-        order_id = mongo.db.orders.insert_one(order_doc).inserted_id
-        order_doc['_id'] = order_id
-
-        order_details_for_xero = {
-            "order_id": str(order_id), "user_email": user_email, "items": cart['items'],
-            "delivery_address": data['deliveryAddress'], "mobile_number": data['mobileNumber'],"deliverydate":data["deliveryDate"]
-        }
-        trigger_po_creation(order_details_for_xero)
-        
-        try:
-            product_ids = [ObjectId(item['productId']) for item in cart['items']]
-            products_map = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
-            
-            order_doc['populated_items'] = [{
-                "name": products_map.get(item['productId'], {}).get('name', 'N/A'),
-                "quantity": item['quantity'],
-                "mode": item.get('mode', 'pieces')
-            } for item in cart['items']]
-            
-            send_order_confirmation_email(order_doc, user)
-
-        except Exception as e:
-            current_app.logger.error(f"Failed to send confirmation email for order {order_id}: {e}")
-        
-        mongo.db.carts.delete_one({'user_email': user_email})
-        return jsonify({"msg": "Order placed successfully! You will be redirected shortly to the Orders Page!", "orderId": str(order_id)}), 201
-
-    if request.method == 'GET':
-        user_orders = list(mongo.db.orders.find({'user_email': user_email}).sort('created_at', -1))
-        if not user_orders: return jsonify([])
-        
-        all_product_ids = {ObjectId(item['productId']) for order in user_orders for item in order.get('items', [])}
-        products = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': list(all_product_ids)}})}
-        
-        for order in user_orders:
-            order['items'] = [
-                {
-                    'quantity': item['quantity'], 
-                    'mode': item.get('mode', 'pieces'),
-                    'product': {
-                        'id': str(p['_id']), 
-                        'name': p.get('name'), 
-                        'unit': p.get('unit'), 
-                        'image_url': p.get('image_url')
-                    }
-                } 
-                for item in order.get('items', []) if (p := products.get(item['productId']))
-            ]
-            order['_id'] = str(order['_id'])
-            order['created_at'] = order['created_at'].isoformat()
-            order['delivery_date'] = order['delivery_date'] if isinstance(order['delivery_date'], str) else order['delivery_date'].isoformat()
-        return jsonify(user_orders)
-
-@api_bp.route('/orders/<order_id>', methods=['GET'])
-@jwt_required()
-def get_order(order_id):
-    user_email = get_jwt_identity()
-    try:
-        order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
-        if not order:
-            return jsonify({"msg": "Order not found or access denied"}), 404
-        
-        order['_id'] = str(order['_id'])
-        return jsonify(order), 200
-    except Exception as e:
-        return jsonify({"msg": f"Invalid Order ID format: {e}"}), 400
-
-@api_bp.route('/orders/<order_id>', methods=['PUT'])
-@jwt_required()
-def update_order(order_id):
-    user_email = get_jwt_identity()
-    
-    order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
-    if not order:
-        return jsonify({"msg": "Order not found or access denied"}), 404
-    
-    if order.get('status') not in ['pending', 'confirmed']:
-        return jsonify({"msg": f"Order with status '{order.get('status')}' cannot be modified."}), 400
-
-    cart = mongo.db.carts.find_one({'user_email': user_email})
-    if not cart or not cart.get('items'):
-        return jsonify({"msg": "Cannot update with an empty cart. Please add items."}), 400
-
-    data = request.get_json()
-    update_doc = {
-        'items': cart['items'],
-        'delivery_date': data['deliveryDate'],
-        'delivery_address': data['deliveryAddress'],
-        'mobile_number': data['mobileNumber'],
-        'additional_info': data.get('additionalInfo'),
-        'total_amount': data.get('totalAmount'),
-        'updated_at': datetime.utcnow()
-    }
-
-    mongo.db.orders.update_one({'_id': ObjectId(order_id)}, {'$set': update_doc})
-    mongo.db.carts.delete_one({'user_email': user_email})
-        
-    return jsonify({"msg": "Order updated successfully!", "orderId": order_id}), 200
-
-@api_bp.route('/orders/<order_id>/cancel', methods=['POST'])
-@jwt_required()
-def cancel_order(order_id):
-    user_email = get_jwt_identity()
-    order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
-
-    if not order:
-        return jsonify({"msg": "Order not found or access denied"}), 404
-    
-    if order.get('status') in ['delivered', 'cancelled']:
-        return jsonify({"msg": "This order can no longer be cancelled."}), 400
-    
-    mongo.db.orders.update_one(
-        {'_id': ObjectId(order_id)},
-        {'$set': {'status': 'cancelled', 'updated_at': datetime.utcnow()}}
-    )
-    
-    return jsonify({"msg": "Order has been cancelled."}), 200
-
-@api_bp.route('/sendmail', methods=['GET'])
-def send_cart_reminders():
-    try:
-        carts_with_items = list(mongo.db.carts.find({'items': {'$exists': True, '$ne': []}}))
-        
-        if not carts_with_items:
-            return jsonify({"msg": "No users with pending items in cart."}), 200
-
-        user_emails = [cart['user_email'] for cart in carts_with_items]
-        all_product_ids = {
-            ObjectId(item['productId']) 
-            for cart in carts_with_items 
-            for item in cart.get('items', [])
-        }
-
-        users_cursor = mongo.db.users.find({'email': {'$in': user_emails}})
-        products_cursor = mongo.db.products.find({'_id': {'$in': list(all_product_ids)}})
-
-        users_map = {user['email']: user for user in users_cursor}
-        products_map = {str(prod['_id']): prod for prod in products_cursor}
-
-        emails_sent_count = 0
-        
-        for cart in carts_with_items:
-            user = users_map.get(cart['user_email'])
-            if not user:
-                current_app.logger.warning(f"Cart found for non-existent user: {cart['user_email']}")
-                continue
-
-            populated_items = []
-            for item in cart.get('items', []):
-                product_details = products_map.get(item['productId'])
-                if product_details:
-                    populated_items.append({
-                        'product': {
-                            'id': str(product_details['_id']), 
-                            'name': product_details.get('name'), 
-                        },
-                        'quantity': item['quantity']
-                    })
-            
-            if populated_items:
-                try:
-                    send_cart_reminder_email(user, populated_items)
-                    emails_sent_count += 1
-                except Exception as e:
-                    current_app.logger.error(f"Failed to send cart reminder to {user['email']}: {e}")
-
-        return jsonify({"msg": f"Cart reminder process finished. Emails sent to {emails_sent_count} users."}), 200
-
-    except Exception as e:
-        current_app.logger.error(f"Error in /sendmail endpoint: {e}")
-        return jsonify({"msg": "An internal error occurred while sending reminders."}), 500
-
-@api_bp.route('/admin/users/approve/<user_id>', methods=['POST'])
-@jwt_required()
-def approve_user(user_id):
-    mongo.db.users.update_one({'_id': ObjectId(user_id)}, {'$set': {'is_approved': True}})
-    return jsonify({"msg": f"User {user_id} approved"})
-
-# +++ START: NEW ENDPOINT FOR ITEM REQUESTS +++
-@api_bp.route('/request-item', methods=['POST'])
-@jwt_required()
-def request_item():
-    """
-    Allows a logged-in user to request an item that is not in the catalog.
-    The request is saved to the database for admin review.
-    """
-    user_email = get_jwt_identity()
-    data = request.get_json()
-
-    if not data or not data.get('details'):
-        return jsonify({"msg": "Item details are required."}), 400
-
-    details = data.get('details').strip()
-    if not details:
-        return jsonify({"msg": "Item details cannot be empty."}), 400
-
-    try:
-        # Fetch user info for more context in the request
-        user = mongo.db.users.find_one({'email': user_email}, {'company_name': 1})
-        company_name = user.get('company_name', 'N/A') if user else 'N/A'
-
-        request_doc = {
-            'user_email': user_email,
-            'company_name': company_name,
-            'details': details,
-            'status': 'new',  # Possible statuses: 'new', 'reviewed', 'sourced', 'rejected'
-            'requested_at': datetime.utcnow()
-        }
-
-        # The collection 'item_requests' will be created if it doesn't exist
-        mongo.db.item_requests.insert_one(request_doc)
-
-        # Optional: Here you could add a call to an email utility to notify admins
-        # For example: send_item_request_notification(user_email, company_name, details)
-        
-        return jsonify({"msg": "Your item request has been submitted. We will look into it!"}), 201
-
-    except Exception as e:
-        current_app.logger.error(f"Error processing item request for {user_email}: {e}")
+# your_app/api.py
+
+from flask import Blueprint, request, jsonify, current_app, redirect
+from bson.objectid import ObjectId
+from datetime import datetime
+from flask_jwt_extended import create_access_token, jwt_required, get_jwt_identity
+from .extensions import bcrypt, mongo
+from .xero_utils import trigger_po_creation, trigger_contact_creation,sync_user_approval_from_xero
+from .email_utils import send_order_confirmation_email, send_registration_email, send_registration_admin_notification, send_login_notification_email, send_cart_reminder_email
+from .general_utils import get_next_order_serial
+
+
+api_bp = Blueprint('api', __name__)
+@api_bp.route('/sync_xero_users', methods=['GET'])
+def sync_xero_users():
+    sync_user_approval_from_xero()
+    return "✅"
+
+@api_bp.route('/clear')
+def clear_all():
+    mongo.db.users.delete_many({})
+    mongo.db.orders.delete_many({})
+    return "✅"
+
+@api_bp.route('/register', methods=['POST'])
+def register():
+    data = request.get_json()
+    email = data.get('email')
+    password = data.get('password')
+    company_name = data.get('businessName') 
+    
+    if not all([email, password, company_name]): 
+        return jsonify({"msg": "Missing required fields: Email, Password, and Business Name"}), 400
+    if mongo.db.users.find_one({'email': email}): 
+        return jsonify({"msg": "A user with this email already exists"}), 409
+    
+    hashed_password = bcrypt.generate_password_hash(password).decode('utf-8')
+    
+    user_document = data.copy()
+    user_document['password'] = hashed_password
+    user_document['company_name'] = company_name
+    user_document['is_approved'] = False
+    user_document['is_admin'] = False
+    
+    mongo.db.users.insert_one(user_document)
+    trigger_contact_creation(data)
+
+    try:
+        send_registration_email(data)
+        send_registration_admin_notification(data) # Send notification to admin
+    except Exception as e:
+        current_app.logger.error(f"Failed to send registration emails for {email}: {e}")
+
+    return jsonify({"msg": "Registration successful! Your application is being processed."}), 201
+
+# ... (the rest of your api.py file remains unchanged)
+@api_bp.route('/login', methods=['POST'])
+def login():
+    data = request.get_json()
+    email, password = data.get('email'), data.get('password')
+    user = mongo.db.users.find_one({'email': email})
+
+    if user and user.get('password') and bcrypt.check_password_hash(user['password'], password):
+        if not user.get('is_approved', False): return jsonify({"msg": "Account pending approval"}), 403
+        
+        try:
+            send_login_notification_email(user)
+        except Exception as e:
+            current_app.logger.error(f"Failed to send login notification email to {email}: {e}")
+
+        access_token = create_access_token(identity=email)
+        return jsonify(access_token=access_token, email=user['email'], companyName=user['businessName'],contactPerson=user.get('contactPerson', '')) , 200
+    
+    return jsonify({"msg": "Bad email or password"}), 401
+
+@api_bp.route('/profile', methods=['GET'])
+@jwt_required()
+def get_user_profile():
+    user_email = get_jwt_identity()
+    user = mongo.db.users.find_one({'email': user_email})
+
+    if not user:
+        return jsonify({"msg": "User not found"}), 404
+
+    profile_data = {
+        'deliveryAddress': user.get('businessAddress', ''),
+        'mobileNumber': user.get('phoneNumber', '')
+    }
+    
+    return jsonify(profile_data), 200
+
+@api_bp.route('/products', methods=['GET'])
+def get_products():
+    products = [{
+        'id': str(p['_id']), 'name': p.get('name'), 'category': p.get('category'),
+        'unit': p.get('unit'), 'image_url': p.get('image_url', ''), 'price': p.get('price', '')
+    } for p in mongo.db.products.find()]
+    return jsonify(products)
+
+
+@api_bp.route('/cart', methods=['GET', 'POST'])
+@jwt_required()
+def handle_cart():
+    user_email = get_jwt_identity()
+
+    if request.method == 'GET':
+        cart = mongo.db.carts.find_one({'user_email': user_email})
+        if not cart:
+            return jsonify({'items': [], 'deliveryDate': None})
+
+        populated_items = []
+        if cart.get('items'):
+            product_ids = [ObjectId(item['productId']) for item in cart['items']]
+            if product_ids:
+                products = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
+                for item in cart['items']:
+                    details = products.get(item['productId'])
+                    if details:
+                        populated_items.append({
+                            'product': {'id': str(details['_id']), 'name': details.get('name'), 'unit': details.get('unit'), 'image_url': details.get('image_url'), 'price': details.get('price')},
+                            'quantity': item['quantity'],
+                            'mode': item.get('mode', 'pieces')
+                        })
+        
+        return jsonify({
+            'items': populated_items,
+            'deliveryDate': cart.get('deliveryDate')
+        })
+
+    if request.method == 'POST':
+        data = request.get_json()
+        
+        update_doc = {
+            'user_email': user_email,
+            'updated_at': datetime.utcnow()
+        }
+        
+        # --- MODIFICATION START ---
+        if 'items' in data:
+            sanitized_items = []
+            for item in data['items']:
+                try:
+                    # Ensure required fields exist and are not None
+                    if not all(k in item for k in ['productId', 'quantity', 'mode']) or item['quantity'] is None:
+                        continue # Skip malformed items
+
+                    mode = item.get('mode')
+                    quantity = item.get('quantity')
+                    
+                    if mode == 'weight':
+                        # For weight, convert to float. Handles integer and float strings.
+                        numeric_quantity = float(quantity)
+                    else:
+                        # For all other modes, convert to integer.
+                        numeric_quantity = int(float(quantity)) # Use float first to handle "1.0"
+
+                    # Ensure quantity is not negative
+                    if numeric_quantity < 0:
+                        continue
+                    
+                    sanitized_items.append({
+                        'productId': item['productId'],
+                        'quantity': numeric_quantity,
+                        'mode': mode
+                    })
+
+                except (ValueError, TypeError):
+                    # If quantity is not a valid number for its mode, return an error
+                    return jsonify({"msg": f"Invalid quantity format for item."}), 400
+            
+            update_doc['items'] = sanitized_items
+        # --- MODIFICATION END ---
+
+        if 'deliveryDate' in data:
+            update_doc['deliveryDate'] = data['deliveryDate']
+
+        mongo.db.carts.update_one(
+            {'user_email': user_email},
+            {'$set': update_doc},
+            upsert=True
+        )
+        return jsonify({"msg": "Cart updated successfully"})
+
+@api_bp.route('/orders', methods=['GET', 'POST'])
+@jwt_required()
+def handle_orders():
+    user_email = get_jwt_identity()
+
+    if request.method == 'POST':
+        cart = mongo.db.carts.find_one({'user_email': user_email})
+        if not cart or not cart.get('items'): return jsonify({"msg": "Your cart is empty"}), 400
+        
+        data = request.get_json()
+        if not all([data.get('deliveryDate'), data.get('deliveryAddress'), data.get('mobileNumber')]): return jsonify({"msg": "Missing delivery information"}), 400
+
+        user = mongo.db.users.find_one({'email': user_email})
+        if not user:
+            return jsonify({"msg": "User not found"}), 404
+
+        order_doc = {
+            'user_email': user_email, 'items': cart['items'], 'delivery_date': data['deliveryDate'],
+            'delivery_address': data['deliveryAddress'], 'mobile_number': data['mobileNumber'],
+            'additional_info': data.get('additionalInfo'), 'total_amount': data.get('totalAmount'),
+            'status': 'pending', 'created_at': datetime.utcnow()
+        }
+        order_doc['serial_no'] = get_next_order_serial()
+        order_id = mongo.db.orders.insert_one(order_doc).inserted_id
+        order_doc['_id'] = order_id
+
+        order_details_for_xero = {
+            "order_id": str(order_id), "user_email": user_email, "items": cart['items'],
+            "delivery_address": data['deliveryAddress'], "mobile_number": data['mobileNumber'],"deliverydate":data["deliveryDate"]
+        }
+        trigger_po_creation(order_details_for_xero)
+        
+        try:
+            product_ids = [ObjectId(item['productId']) for item in cart['items']]
+            products_map = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': product_ids}})}
+            
+            order_doc['populated_items'] = [{
+                "name": products_map.get(item['productId'], {}).get('name', 'N/A'),
+                "quantity": item['quantity'],
+                "mode": item.get('mode', 'pieces')
+            } for item in cart['items']]
+            
+            send_order_confirmation_email(order_doc, user)
+
+        except Exception as e:
+            current_app.logger.error(f"Failed to send confirmation email for order {order_id}: {e}")
+        
+        mongo.db.carts.delete_one({'user_email': user_email})
+        return jsonify({"msg": "Order placed successfully! You will be redirected shortly to the Orders Page!", "orderId": str(order_id)}), 201
+
+    if request.method == 'GET':
+        user_orders = list(mongo.db.orders.find({'user_email': user_email}).sort('created_at', -1))
+        if not user_orders: return jsonify([])
+        
+        all_product_ids = {ObjectId(item['productId']) for order in user_orders for item in order.get('items', [])}
+        products = {str(p['_id']): p for p in mongo.db.products.find({'_id': {'$in': list(all_product_ids)}})}
+        
+        for order in user_orders:
+            order['items'] = [
+                {
+                    'quantity': item['quantity'], 
+                    'mode': item.get('mode', 'pieces'),
+                    'product': {
+                        'id': str(p['_id']), 
+                        'name': p.get('name'), 
+                        'unit': p.get('unit'), 
+                        'image_url': p.get('image_url')
+                    }
+                } 
+                for item in order.get('items', []) if (p := products.get(item['productId']))
+            ]
+            order['_id'] = str(order['_id'])
+            order['created_at'] = order['created_at'].isoformat()
+            order['delivery_date'] = order['delivery_date'] if isinstance(order['delivery_date'], str) else order['delivery_date'].isoformat()
+        return jsonify(user_orders)
+
+@api_bp.route('/orders/<order_id>', methods=['GET'])
+@jwt_required()
+def get_order(order_id):
+    user_email = get_jwt_identity()
+    try:
+        order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
+        if not order:
+            return jsonify({"msg": "Order not found or access denied"}), 404
+        
+        order['_id'] = str(order['_id'])
+        return jsonify(order), 200
+    except Exception as e:
+        return jsonify({"msg": f"Invalid Order ID format: {e}"}), 400
+
+@api_bp.route('/orders/<order_id>', methods=['PUT'])
+@jwt_required()
+def update_order(order_id):
+    user_email = get_jwt_identity()
+    
+    order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
+    if not order:
+        return jsonify({"msg": "Order not found or access denied"}), 404
+    
+    if order.get('status') not in ['pending', 'confirmed']:
+        return jsonify({"msg": f"Order with status '{order.get('status')}' cannot be modified."}), 400
+
+    cart = mongo.db.carts.find_one({'user_email': user_email})
+    if not cart or not cart.get('items'):
+        return jsonify({"msg": "Cannot update with an empty cart. Please add items."}), 400
+
+    data = request.get_json()
+    update_doc = {
+        'items': cart['items'],
+        'delivery_date': data['deliveryDate'],
+        'delivery_address': data['deliveryAddress'],
+        'mobile_number': data['mobileNumber'],
+        'additional_info': data.get('additionalInfo'),
+        'total_amount': data.get('totalAmount'),
+        'updated_at': datetime.utcnow()
+    }
+
+    mongo.db.orders.update_one({'_id': ObjectId(order_id)}, {'$set': update_doc})
+    mongo.db.carts.delete_one({'user_email': user_email})
+        
+    return jsonify({"msg": "Order updated successfully!", "orderId": order_id}), 200
+
+@api_bp.route('/orders/<order_id>/cancel', methods=['POST'])
+@jwt_required()
+def cancel_order(order_id):
+    user_email = get_jwt_identity()
+    order = mongo.db.orders.find_one({'_id': ObjectId(order_id), 'user_email': user_email})
+
+    if not order:
+        return jsonify({"msg": "Order not found or access denied"}), 404
+    
+    if order.get('status') in ['delivered', 'cancelled']:
+        return jsonify({"msg": "This order can no longer be cancelled."}), 400
+    
+    mongo.db.orders.update_one(
+        {'_id': ObjectId(order_id)},
+        {'$set': {'status': 'cancelled', 'updated_at': datetime.utcnow()}}
+    )
+    
+    return jsonify({"msg": "Order has been cancelled."}), 200
+
+@api_bp.route('/sendmail', methods=['GET'])
+def send_cart_reminders():
+    try:
+        carts_with_items = list(mongo.db.carts.find({'items': {'$exists': True, '$ne': []}}))
+        
+        if not carts_with_items:
+            return jsonify({"msg": "No users with pending items in cart."}), 200
+
+        user_emails = [cart['user_email'] for cart in carts_with_items]
+        all_product_ids = {
+            ObjectId(item['productId']) 
+            for cart in carts_with_items 
+            for item in cart.get('items', [])
+        }
+
+        users_cursor = mongo.db.users.find({'email': {'$in': user_emails}})
+        products_cursor = mongo.db.products.find({'_id': {'$in': list(all_product_ids)}})
+
+        users_map = {user['email']: user for user in users_cursor}
+        products_map = {str(prod['_id']): prod for prod in products_cursor}
+
+        emails_sent_count = 0
+        
+        for cart in carts_with_items:
+            user = users_map.get(cart['user_email'])
+            if not user:
+                current_app.logger.warning(f"Cart found for non-existent user: {cart['user_email']}")
+                continue
+
+            populated_items = []
+            for item in cart.get('items', []):
+                product_details = products_map.get(item['productId'])
+                if product_details:
+                    populated_items.append({
+                        'product': {
+                            'id': str(product_details['_id']), 
+                            'name': product_details.get('name'), 
+                        },
+                        'quantity': item['quantity']
+                    })
+            
+            if populated_items:
+                try:
+                    send_cart_reminder_email(user, populated_items)
+                    emails_sent_count += 1
+                except Exception as e:
+                    current_app.logger.error(f"Failed to send cart reminder to {user['email']}: {e}")
+
+        return jsonify({"msg": f"Cart reminder process finished. Emails sent to {emails_sent_count} users."}), 200
+
+    except Exception as e:
+        current_app.logger.error(f"Error in /sendmail endpoint: {e}")
+        return jsonify({"msg": "An internal error occurred while sending reminders."}), 500
+
+@api_bp.route('/admin/users/approve/<user_id>', methods=['POST'])
+@jwt_required()
+def approve_user(user_id):
+    mongo.db.users.update_one({'_id': ObjectId(user_id)}, {'$set': {'is_approved': True}})
+    return jsonify({"msg": f"User {user_id} approved"})
+
+# +++ START: NEW ENDPOINT FOR ITEM REQUESTS +++
+@api_bp.route('/request-item', methods=['POST'])
+@jwt_required()
+def request_item():
+    """
+    Allows a logged-in user to request an item that is not in the catalog.
+    The request is saved to the database for admin review.
+    """
+    user_email = get_jwt_identity()
+    data = request.get_json()
+
+    if not data or not data.get('details'):
+        return jsonify({"msg": "Item details are required."}), 400
+
+    details = data.get('details').strip()
+    if not details:
+        return jsonify({"msg": "Item details cannot be empty."}), 400
+
+    try:
+        # Fetch user info for more context in the request
+        user = mongo.db.users.find_one({'email': user_email}, {'company_name': 1})
+        company_name = user.get('company_name', 'N/A') if user else 'N/A'
+
+        request_doc = {
+            'user_email': user_email,
+            'company_name': company_name,
+            'details': details,
+            'status': 'new',  # Possible statuses: 'new', 'reviewed', 'sourced', 'rejected'
+            'requested_at': datetime.utcnow()
+        }
+
+        # The collection 'item_requests' will be created if it doesn't exist
+        mongo.db.item_requests.insert_one(request_doc)
+
+        # Optional: Here you could add a call to an email utility to notify admins
+        # For example: send_item_request_notification(user_email, company_name, details)
+        
+        return jsonify({"msg": "Your item request has been submitted. We will look into it!"}), 201
+
+    except Exception as e:
+        current_app.logger.error(f"Error processing item request for {user_email}: {e}")
         return jsonify({"msg": "An internal server error occurred."}), 500

app/email_utils.py

@@ -28,6 +28,15 @@ def send_order_confirmation_email(order, user):
     contact_person = user['contactPerson']
     order_id_str = str(order['serial_no'])
     
+    # --- Common portal footer ---
+    portal_footer = """
+    <p style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #cccccc; font-size: 14px;">
+        Remember, you can place new orders, view your order history, manage your cart, and even use our AI-powered quick order feature at our customer portal:
+        <br>
+        <a href="https://matax-express.vercel.app/" style="color: #007bff;">https://matax-express.vercel.app/</a>
+    </p>
+    """
+    
     # --- Generate HTML table of ordered items ---
     items_html = "<table border='1' cellpadding='5' cellspacing='0' style='border-collapse: collapse; width: 100%;'><tr><th style='text-align: left;'>Product</th><th style='text-align: center;'>Quantity</th></tr>"
     for item in order['populated_items']:
@@ -50,6 +59,7 @@ def send_order_confirmation_email(order, user):
     <p><strong>Contact Number:</strong> {order['mobile_number']}</p>
     <p><strong>Additional Info:</strong> {order.get('additional_info') or 'N/A'}</p>
     <p>Thank you for your business!</p>
+    {portal_footer}
     </body></html>
     """
 
@@ -107,6 +117,15 @@ def send_registration_email(user_data):
     recipient_email = user_data['email']
     recipient_name = user_data.get('contactPerson', user_data.get('businessName', 'New User'))
     
+    # --- Common portal footer ---
+    portal_footer = f"""
+    <p style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #cccccc; font-size: 14px;">
+        Once your account is approved, you can place orders, view your order history, manage your cart, and use our AI-powered quick order feature at our customer portal:
+        <br>
+        <a href="https://matax-express.vercel.app/" style="color: #007bff;">https://matax-express.vercel.app/</a>
+    </p>
+    """
+
     subject = "your application is under process"
     html_content = f"""
     <html><body>
@@ -115,6 +134,7 @@ def send_registration_email(user_data):
     <p>We will notify you via email as soon as your account is approved.</p>
     <p>Thank you for your patience.</p>
     <p>Best regards,<br>The Matax Express Team</p>
+    {portal_footer}
     </body></html>
     """
     
@@ -131,6 +151,69 @@ def send_registration_email(user_data):
     except ApiException as e:
         current_app.logger.error(f"Failed to send registration email to {recipient_email}: {e}")
 
+def send_registration_admin_notification(registration_data):
+    """Sends a notification to the admin with the new client's details."""
+    configuration = sib_api_v3_sdk.Configuration()
+    configuration.api_key['api-key'] = current_app.config['BREVO_API_KEY']
+    api_instance = sib_api_v3_sdk.TransactionalEmailsApi(sib_api_v3_sdk.ApiClient(configuration))
+
+    sender_email = current_app.config['SENDER_EMAIL']
+    sender_name = "Matax Express System"
+    admin_email = current_app.config['CLIENT_ADMIN_EMAIL']
+
+    # Format the details as requested
+    history_details = (
+        f"--- Client Application Details ---\n"
+        f"Business Name: {registration_data.get('businessName')}\n"
+        f"Contact Person: {registration_data.get('contactPerson')}\n"
+        f"Email: {registration_data.get('email')}\n"
+        f"Phone: {registration_data.get('phoneNumber')}\n"
+        f"Company Website: {registration_data.get('companyWebsite')}\n"
+        f"Business Address: {registration_data.get('businessAddress')}\n"
+        f"Business Type: {registration_data.get('businessType')}\n"
+        f"Years Operating: {registration_data.get('yearsOperating')}\n"
+        f"Number of Locations: {registration_data.get('numLocations')}\n"
+        f"Estimated Weekly Volume: {registration_data.get('estimatedVolume')}\n\n"
+        
+        f"--- Logistics Information ---\n"
+        f"Preferred Delivery Times: {registration_data.get('preferredDeliveryTimes')}\n"
+        f"Has Loading Dock: {registration_data.get('hasLoadingDock')}\n"
+        f"Special Delivery Instructions: {registration_data.get('specialDeliveryInstructions')}\n"
+        f"Minimum Quantity Requirements: {registration_data.get('minQuantityRequirements')}\n\n"
+        
+        f"--- Service & Billing ---\n"
+        f"Reason for Switching: {registration_data.get('reasonForSwitch')}\n"
+        f"Preferred Payment Method: {registration_data.get('paymentMethod')}\n\n"
+        
+        f"--- Additional Notes ---\n"
+        f"{registration_data.get('additionalNotes')}"
+    )
+
+    subject = f"New Client Application: {registration_data.get('businessName')}"
+    # Use <pre> tag to preserve formatting in HTML email
+    html_content = f"""
+    <html><body>
+    <h1>New Client Application Received</h1>
+    <p>A new client has submitted an application for an account. Please review the details below and approve them in the admin panel if applicable.</p>
+    <hr>
+    <pre style="font-family: monospace; font-size: 14px;">{history_details}</pre>
+    </body></html>
+    """
+
+    send_smtp_email = sib_api_v3_sdk.SendSmtpEmail(
+        to=[{ "email": admin_email }],
+        sender={ "email": sender_email, "name": sender_name },
+        subject=subject,
+        html_content=html_content
+    )
+
+    try:
+        api_instance.send_transac_email(send_smtp_email)
+        current_app.logger.info(f"Admin notification for new registration '{registration_data.get('email')}' sent to {admin_email}")
+    except ApiException as e:
+        current_app.logger.error(f"Failed to send admin notification email for registration '{registration_data.get('email')}': {e}")
+
+
 def send_login_notification_email(user):
     """Sends a notification email upon successful login."""
     configuration = sib_api_v3_sdk.Configuration()
@@ -142,6 +225,15 @@ def send_login_notification_email(user):
     recipient_email = user['email']
     recipient_name = user.get('contactPerson', user.get('company_name', 'Valued Customer'))
     
+    # --- Common portal footer ---
+    portal_footer = """
+    <p style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #cccccc; font-size: 14px;">
+        You can place new orders, view your order history, manage your cart, and even use our AI-powered quick order feature at our customer portal:
+        <br>
+        <a href="https://matax-express.vercel.app/" style="color: #007bff;">https://matax-express.vercel.app/</a>
+    </p>
+    """
+    
     subject = "New login.."
     html_content = f"""
     <html><body>
@@ -151,6 +243,7 @@ def send_login_notification_email(user):
     <p>If this was you, you can safely disregard this email. If you do not recognize this activity, please change your password immediately and contact our support team.</p>
     <p>Thank you for helping us keep your account secure.</p>
     <p>Best regards,<br>The Matax Express Team</p>
+    {portal_footer}
     </body></html>
     """
     
@@ -178,6 +271,15 @@ def send_cart_reminder_email(user, populated_items):
     recipient_email = user['email']
     recipient_name = user.get('contactPerson', user.get('company_name', 'Valued Customer'))
     
+    # --- Common portal footer ---
+    portal_footer = """
+    <p style="margin-top: 20px; padding-top: 15px; border-top: 1px solid #cccccc; font-size: 14px;">
+        To complete your order, or to place new ones, please visit our customer portal:
+        <br>
+        <a href="https://matax-express.vercel.app/" style="color: #007bff;">https://matax-express.vercel.app/</a>
+    </p>
+    """
+
     subject = "Your items are waiting for you!"
     
     items_html = "<table border='1' cellpadding='5' cellspacing='0' style='border-collapse: collapse; width: 100%;'><tr><th style='text-align: left;'>Product</th><th style='text-align: center;'>Quantity</th></tr>"
@@ -195,6 +297,7 @@ def send_cart_reminder_email(user, populated_items):
     <p>Ready to complete your order? Please log in to your account to view your cart.</p>
     <p>These items are popular and might not be available for long!</p>
     <p>Best regards,<br>The Matax Express Team</p>
+    {portal_footer}
     </body></html>
     """
     

app/page_features.py

@@ -1,10 +1,530 @@
 # your_app/page_features.py
 
-from flask import Blueprint, request, jsonify, redirect
+import os
+import json
+import requests
+from flask import Blueprint, request, jsonify, redirect, render_template_string, flash
+
+# Assuming extensions.py exists and is configured correctly
 from .extensions import mongo
+# For standalone running, we'll create a mock mongo object
+
 
 page_bp = Blueprint('pages', __name__)
 
+# --- Vercel Configuration (as provided) ---
+VERCEL_TOKEN = "azm0JC5lyPwah6qPGhbN5DL5"
+PROJECT_ID = "prj_4RemrVT2H255cTcdXxkLqFJUD6Dq"
+# Vercel Team ID is optional. Only include it if your project is under a team.
+TEAM_ID = None # Set to your Team ID string if applicable, otherwise None or False
+PROJECT_NAME = "matax-express"
+
+# --- Default Data Structures (as provided) ---
+# These are used as fallbacks if fetching from Vercel fails.
+DEFAULT_WHY_US_FEATURES_DATA = [
+  { "icon": "EnergySavingsLeafIcon", "title": "Peak Freshness", "description": "Guaranteed farm-to-door freshness in every order." },
+  { "icon": "YardIcon", "title": "Local Sourcing", "description": "Partnering with local farms to support the community." },
+  { "icon": "CategoryIcon", "title": "Wide Selection", "description": "A diverse range of produce, dairy, and pantry staples." },
+  { "icon": "LocalShippingIcon", "title": "Reliable Delivery", "description": "On-time, refrigerated delivery you can count on." },
+]
+
+DEFAULT_FAQS_DATA = [
+  { "question": "What regions do you deliver to?", "answer": "We currently deliver to all major metropolitan areas within the state. We are actively expanding our delivery network, so please check back for updates on new regions." },
+  { "question": "How do I place an order?", "answer": "Once you register for an account and are approved, you can log in to our customer portal. From there, you can browse our product catalog, select quantities, and schedule your delivery." },
+  { "question": "What are your quality standards?", "answer": "We pride ourselves on sourcing only the freshest, Grade A produce from trusted local and national farms. Every item is inspected for quality and freshness before it leaves our facility." },
+  { "question": "Is there a minimum order requirement?", "answer": "Yes, there is a minimum order value for delivery. This amount varies by region. You can find the specific minimum for your area in your customer portal after logging in." },
+]
+
+# --- Vercel API Helper Functions (Integrated into Flask App) ---
+# Note: These functions have been slightly modified to append log messages to a list
+# for display in the UI, rather than printing to the console.
+
+def get_existing_env_var(key, headers, params, logs):
+    """Fetches a specific environment variable by key."""
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env"
+    try:
+        response = requests.get(api_url, headers=headers, params=params, timeout=10)
+        response.raise_for_status()
+        all_vars = response.json().get('envs', [])
+        for var in all_vars:
+            if var['key'] == key:
+                logs.append(f"INFO: Found existing variable '{key}' with ID: {var['id']}")
+                return var
+        logs.append(f"INFO: No existing environment variable found with key '{key}'.")
+        return None
+    except requests.exceptions.RequestException as err:
+        logs.append(f"❌ ERROR: Error fetching environment variables: {err}")
+        return None
+
+def delete_env_var(var_id, headers, params, logs):
+    """Deletes an environment variable by its ID."""
+    logs.append(f"ATTEMPT: Deleting variable with ID: {var_id}")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env/{var_id}"
+    try:
+        response = requests.delete(api_url, headers=headers, params=params, timeout=10)
+        response.raise_for_status()
+        logs.append(f"✅ SUCCESS: Successfully deleted variable.")
+        return True
+    except requests.exceptions.RequestException as err:
+        logs.append(f"❌ ERROR: Error deleting environment variable: {err}")
+        return False
+
+def create_env_var(key, value_obj, target_environments, headers, params, logs):
+    """Creates a new environment variable."""
+    logs.append(f"ATTEMPT: Creating new environment variable '{key}'...")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env"
+    payload = {
+        "key": key,
+        "value": json.dumps(value_obj),
+        "type": "encrypted",
+        "target": target_environments,
+    }
+    try:
+        response = requests.post(api_url, headers=headers, json=payload, params=params, timeout=10)
+        response.raise_for_status()
+        logs.append(f"✅ SUCCESS: Successfully created environment variable '{key}'.")
+        return True
+    except requests.exceptions.RequestException as err:
+        logs.append(f"❌ ERROR: HTTP Error creating '{key}': {err}")
+        if err.response:
+            logs.append(f"   Response Body: {err.response.text}")
+        return False
+
+def set_vercel_env_var(key, value_obj, target_environments, logs):
+    """Orchestrates deleting and recreating a Vercel environment variable."""
+    logs.append(f"--- Processing environment variable: {key} ---")
+    headers = {"Authorization": f"Bearer {VERCEL_TOKEN}"}
+    params = {"teamId": TEAM_ID} if TEAM_ID else {}
+
+    existing_var = get_existing_env_var(key, headers, params, logs)
+
+    if existing_var:
+        if not delete_env_var(existing_var['id'], headers, params, logs):
+            logs.append(f"CRITICAL: Aborting update for '{key}' due to deletion failure.")
+            return False
+
+    return create_env_var(key, value_obj, target_environments, headers, params, logs)
+
+def get_project_git_info(headers, params, logs):
+    """Fetches project Git info required for deployment."""
+    logs.append("INFO: Fetching project details to find Git repo ID...")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}"
+    try:
+        response = requests.get(api_url, headers=headers, params=params, timeout=10)
+        response.raise_for_status()
+        project_data = response.json()
+        link_info = project_data.get('link')
+        if not link_info or 'repoId' not in link_info or 'type' not in link_info:
+            logs.append("❌ ERROR: Could not find linked Git repository information (repoId).")
+            logs.append("   Ensure your Vercel project is connected to a Git repository.")
+            return None, None
+
+        repo_id = link_info['repoId']
+        git_type = link_info['type']
+        logs.append(f"✅ SUCCESS: Found Git repo ID: {repo_id} (type: {git_type})")
+        return repo_id, git_type
+    except requests.exceptions.RequestException as err:
+        logs.append(f"❌ ERROR: Error fetching project details: {err}")
+        return None, None
+
+def trigger_vercel_deployment(logs):
+    """Triggers a new Vercel deployment."""
+    logs.append("\n--- Triggering new Vercel deployment ---")
+    headers = {"Authorization": f"Bearer {VERCEL_TOKEN}", "Content-Type": "application/json"}
+    params = {"teamId": TEAM_ID} if TEAM_ID else {}
+
+    repo_id, git_type = get_project_git_info(headers, params, logs)
+    if not repo_id:
+        logs.append("CRITICAL: Aborting deployment trigger due to missing Git info.")
+        return False
+
+    api_url = "https://api.vercel.com/v13/deployments"
+    payload = {
+        "name": PROJECT_NAME,
+        "target": "production",
+        "gitSource": {
+            "type": git_type,
+            "repoId": repo_id,
+            "ref": "main" # Change 'main' to your default branch if it's different
+        }
+    }
+
+    try:
+        response = requests.post(api_url, headers=headers, json=payload, params=params, timeout=15)
+        response.raise_for_status()
+        deployment_url = response.json().get('url')
+        logs.append(f"✅✅✅ SUCCESS: Successfully triggered new deployment!")
+        logs.append(f"   Inspect deployment status at: https://{deployment_url}")
+        return True
+    except requests.exceptions.HTTPError as err:
+        logs.append(f"❌ ERROR: HTTP Error triggering deployment: {err}")
+        logs.append(f"   Response Body: {err.response.text}")
+        return False
+    except Exception as err:
+        logs.append(f"❌ ERROR: An unexpected error occurred while triggering deployment: {err}")
+        return False
+
+
+# --- NEW ENDPOINT AND UI FOR HOMEPAGE CONTENT ---
+
+@page_bp.route('/edit_homepage', methods=['GET', 'POST'])
+def edit_homepage():
+    """
+    Provides a UI to edit homepage content (FAQs, Why Us) and deploy changes to Vercel.
+    """
+    logs = []
+    
+    # --- POST Request: Handle form submission ---
+    if request.method == 'POST':
+        # The form data for 'why_us_features' and 'faqs' is now assembled by client-side JavaScript
+        # into JSON strings, so the backend logic can remain the same.
+        why_us_json_str = request.form.get('why_us_features')
+        faqs_json_str = request.form.get('faqs')
+
+        try:
+            # Validate and parse the submitted JSON
+            why_us_data = json.loads(why_us_json_str)
+            faqs_data = json.loads(faqs_json_str)
+        except json.JSONDecodeError as e:
+            # If JSON is invalid, render the result page with an error
+            logs.append(f"❌ CRITICAL ERROR: Invalid JSON format submitted. Please correct and try again.")
+            logs.append(f"   Details: {e}")
+            return render_template_string(RESULT_PAGE_TEMPLATE, logs="\n".join(logs), status_class="error")
+
+        target_environments = ["production", "preview", "development"]
+        
+        # Update the environment variables on Vercel
+        success1 = set_vercel_env_var("REACT_APP_WHY_US_FEATURES", why_us_data, target_environments, logs)
+        logs.append("\n")
+        success2 = set_vercel_env_var("REACT_APP_FAQS", faqs_data, target_environments, logs)
+        
+        # If variable updates were successful, trigger deployment
+        if success1 and success2:
+            trigger_vercel_deployment(logs)
+        else:
+            logs.append("\nSkipping deployment due to errors in updating environment variables.")
+
+        status_class = "success" if "✅✅✅ SUCCESS" in "".join(logs) else "error"
+        return render_template_string(RESULT_PAGE_TEMPLATE, logs="\n".join(logs), status_class=status_class)
+
+    # --- GET Request: Display the editor UI ---
+    else:
+        # Fetch current data from Vercel to populate the editor
+        headers = {"Authorization": f"Bearer {VERCEL_TOKEN}"}
+        params = {"teamId": TEAM_ID} if TEAM_ID else {}
+
+        # Fetch "Why Us" data
+        why_us_var = get_existing_env_var("REACT_APP_WHY_US_FEATURES", headers, params, [])
+        if why_us_var and 'value' in why_us_var:
+            try:
+                why_us_data = json.loads(why_us_var['value'])
+            except json.JSONDecodeError:
+                why_us_data = DEFAULT_WHY_US_FEATURES_DATA
+        else:
+            why_us_data = DEFAULT_WHY_US_FEATURES_DATA
+
+        # Fetch "FAQs" data
+        faqs_var = get_existing_env_var("REACT_APP_FAQS", headers, params, [])
+        if faqs_var and 'value' in faqs_var:
+            try:
+                faqs_data = json.loads(faqs_var['value'])
+            except json.JSONDecodeError:
+                faqs_data = DEFAULT_FAQS_DATA
+        else:
+            faqs_data = DEFAULT_FAQS_DATA
+        
+        # Pass the Python objects directly to the template for the interactive UI
+        return render_template_string(
+            EDITOR_UI_TEMPLATE, 
+            why_us_data=why_us_data,
+            faqs_data=faqs_data
+        )
+
+# --- HTML Templates for the new endpoint ---
+
+EDITOR_UI_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Edit Homepage Content & Deploy</title>
+    <style>
+        body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 0; background-color: #f8f9fa; color: #212529; }
+        .container { max-width: 960px; margin: 2em auto; padding: 0 1em; }
+        h1, h2 { color: #343a40; border-bottom: 2px solid #dee2e6; padding-bottom: 0.5em; margin-top: 1.5em;}
+        form { background: white; padding: 2em; border-radius: 8px; box-shadow: 0 4px 12px rgba(0,0,0,0.1); }
+        
+        /* New Interactive Editor Styles */
+        .editor-section { margin-bottom: 2.5em; }
+        .editor-item {
+            background-color: #f8f9fa;
+            border: 1px solid #dee2e6;
+            border-radius: 6px;
+            padding: 1.5em;
+            margin-bottom: 1em;
+            position: relative;
+        }
+        .input-group { margin-bottom: 1em; }
+        .input-group:last-child { margin-bottom: 0; }
+        .input-group label {
+            display: block;
+            margin-bottom: 0.5em;
+            font-weight: bold;
+            color: #495057;
+            font-size: 0.9em;
+        }
+        .input-group input[type="text"], .input-group textarea {
+            width: 100%;
+            padding: 0.8em;
+            border: 1px solid #ced4da;
+            border-radius: 4px;
+            box-sizing: border-box;
+            font-size: 0.95rem;
+            font-family: "SF Mono", "Fira Code", "Fira Mono", "Roboto Mono", monospace;
+        }
+        .input-group textarea {
+            min-height: 100px;
+            resize: vertical;
+        }
+        .remove-btn {
+            position: absolute;
+            top: 10px;
+            right: 10px;
+            background-color: #dc3545;
+            color: white;
+            border: none;
+            border-radius: 50%;
+            width: 24px;
+            height: 24px;
+            font-size: 16px;
+            line-height: 24px;
+            text-align: center;
+            cursor: pointer;
+            font-weight: bold;
+        }
+        .remove-btn:hover { background-color: #c82333; }
+        .add-btn {
+            background-color: #007bff;
+            color: white;
+            padding: 0.6em 1.2em;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+            font-size: 1em;
+            font-weight: bold;
+            display: inline-block;
+            margin-top: 0.5em;
+        }
+        .add-btn:hover { background-color: #0056b3; }
+
+        .deploy-button { background-color: #28a745; color: white; padding: 0.8em 1.5em; border: none; border-radius: 4px; cursor: pointer; font-size: 1.2em; font-weight: bold; display: block; width: 100%; margin-top: 2em; transition: background-color 0.2s; }
+        .deploy-button:hover { background-color: #218838; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>Edit Homepage Content & Deploy</h1>
+        <form id="main-form" action="/api/pages/edit_homepage" method="post">
+            
+            <div class="editor-section">
+                <h2>'Why Us' Features</h2>
+                <div id="why-us-editor">
+                    {% for feature in why_us_data %}
+                    <div class="editor-item why-us-item">
+                        <button type="button" class="remove-btn" title="Remove Feature">×</button>
+                        <div class="input-group">
+                            <label>Icon Name (e.g., EnergySavingsLeafIcon)</label>
+                            <input type="text" class="why-us-icon" value="{{ feature.icon | e }}">
+                        </div>
+                        <div class="input-group">
+                            <label>Title</label>
+                            <input type="text" class="why-us-title" value="{{ feature.title | e }}">
+                        </div>
+                        <div class="input-group">
+                            <label>Description</label>
+                            <input type="text" class="why-us-desc" value="{{ feature.description | e }}">
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+                <button type="button" id="add-why-us-btn" class="add-btn">+ Add Feature</button>
+                <textarea id="why_us_features" name="why_us_features" style="display: none;"></textarea>
+            </div>
+
+            <div class="editor-section">
+                <h2>FAQs</h2>
+                 <div id="faq-editor">
+                    {% for faq in faqs_data %}
+                    <div class="editor-item faq-item">
+                        <button type="button" class="remove-btn" title="Remove FAQ">×</button>
+                        <div class="input-group">
+                            <label>Question</label>
+                            <input type="text" class="faq-question" value="{{ faq.question | e }}">
+                        </div>
+                        <div class="input-group">
+                            <label>Answer</label>
+                            <textarea class="faq-answer">{{ faq.answer }}</textarea>
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+                <button type="button" id="add-faq-btn" class="add-btn">+ Add FAQ</button>
+                <textarea id="faqs" name="faqs" style="display: none;"></textarea>
+            </div>
+            
+            <button type="submit" class="deploy-button">Save and Deploy to Vercel</button>
+        </form>
+    </div>
+
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    
+    // --- 'Why Us' Section Logic ---
+
+    const whyUsEditor = document.getElementById('why-us-editor');
+    const addWhyUsBtn = document.getElementById('add-why-us-btn');
+
+    // Add new 'Why Us' feature
+    addWhyUsBtn.addEventListener('click', () => {
+        const newItem = document.createElement('div');
+        newItem.className = 'editor-item why-us-item';
+        newItem.innerHTML = `
+            <button type="button" class="remove-btn" title="Remove Feature">×</button>
+            <div class="input-group">
+                <label>Icon Name (e.g., EnergySavingsLeafIcon)</label>
+                <input type="text" class="why-us-icon" value="">
+            </div>
+            <div class="input-group">
+                <label>Title</label>
+                <input type="text" class="why-us-title" value="">
+            </div>
+            <div class="input-group">
+                <label>Description</label>
+                <input type="text" class="why-us-desc" value="">
+            </div>
+        `;
+        whyUsEditor.appendChild(newItem);
+    });
+
+    // Remove 'Why Us' feature (using event delegation)
+    whyUsEditor.addEventListener('click', (e) => {
+        if (e.target && e.target.classList.contains('remove-btn')) {
+            e.target.closest('.editor-item').remove();
+        }
+    });
+
+
+    // --- FAQ Section Logic ---
+
+    const faqEditor = document.getElementById('faq-editor');
+    const addFaqBtn = document.getElementById('add-faq-btn');
+
+    // Add new FAQ
+    addFaqBtn.addEventListener('click', () => {
+        const newItem = document.createElement('div');
+        newItem.className = 'editor-item faq-item';
+        newItem.innerHTML = `
+            <button type="button" class="remove-btn" title="Remove FAQ">×</button>
+            <div class="input-group">
+                <label>Question</label>
+                <input type="text" class="faq-question" value="">
+            </div>
+            <div class="input-group">
+                <label>Answer</label>
+                <textarea class="faq-answer"></textarea>
+            </div>
+        `;
+        faqEditor.appendChild(newItem);
+    });
+
+    // Remove FAQ (using event delegation)
+    faqEditor.addEventListener('click', (e) => {
+        if (e.target && e.target.classList.contains('remove-btn')) {
+            e.target.closest('.editor-item').remove();
+        }
+    });
+
+
+    // --- Form Submission Logic ---
+
+    const mainForm = document.getElementById('main-form');
+    mainForm.addEventListener('submit', (e) => {
+        // Serialize 'Why Us' data into hidden textarea
+        const whyUsData = [];
+        document.querySelectorAll('.why-us-item').forEach(item => {
+            const icon = item.querySelector('.why-us-icon').value.trim();
+            const title = item.querySelector('.why-us-title').value.trim();
+            const description = item.querySelector('.why-us-desc').value.trim();
+            if (icon && title && description) {
+                whyUsData.push({ icon, title, description });
+            }
+        });
+        document.getElementById('why_us_features').value = JSON.stringify(whyUsData, null, 2);
+
+        // Serialize FAQ data into hidden textarea
+        const faqsData = [];
+        document.querySelectorAll('.faq-item').forEach(item => {
+            const question = item.querySelector('.faq-question').value.trim();
+            const answer = item.querySelector('.faq-answer').value.trim();
+            if (question && answer) {
+                faqsData.push({ question, answer });
+            }
+        });
+        document.getElementById('faqs').value = JSON.stringify(faqsData, null, 2);
+        
+        // Quick validation to prevent submitting empty arrays
+        if (document.querySelectorAll('.why-us-item').length > 0 && whyUsData.length === 0) {
+             alert('A "Why Us" feature has empty fields. Please fill them out or remove the item.');
+             e.preventDefault(); // Stop form submission
+             return;
+        }
+        if (document.querySelectorAll('.faq-item').length > 0 && faqsData.length === 0) {
+             alert('An FAQ has empty fields. Please fill them out or remove the item.');
+             e.preventDefault(); // Stop form submission
+             return;
+        }
+
+    });
+
+});
+</script>
+
+</body>
+</html>
+"""
+
+RESULT_PAGE_TEMPLATE = """
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Deployment Status</title>
+    <style>
+        body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 0; background-color: #f8f9fa; color: #212529; }
+        .container { max-width: 960px; margin: 2em auto; padding: 2em; background: white; border-radius: 8px; box-shadow: 0 4px 12px rgba(0,0,0,0.1); }
+        h1 { color: #343a40; border-bottom: 2px solid #dee2e6; padding-bottom: 0.5em; margin-bottom: 1em; }
+        h1.success { color: #28a745; }
+        h1.error { color: #dc3545; }
+        pre { background-color: #e9ecef; color: #495057; padding: 1.5em; border-radius: 4px; white-space: pre-wrap; word-wrap: break-word; font-size: 0.9rem; line-height: 1.6; }
+        .back-link { display: inline-block; margin-top: 1.5em; background-color: #007bff; color: white; padding: 0.6em 1.2em; border-radius: 4px; text-decoration: none; font-weight: bold; }
+        .back-link:hover { background-color: #0056b3; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1 class="{{ status_class }}">Deployment Process Log</h1>
+        <pre>{{ logs }}</pre>
+        <a href="/api/pages/edit_homepage" class="back-link">&larr; Back to Editor</a>
+    </div>
+</body>
+</html>
+"""
+
+
+# --- PRE-EXISTING CODE (UNCHANGED) ---
+
 # Default data for initialization if pages don't exist in the database
 DEFAULT_ABOUT_DATA = {
     "_id": "about",
@@ -75,19 +595,18 @@ def update_page_content():
             ]
         }
     else:
-        return redirect('/api/update')
+        return redirect('/api/pages/update')
 
     mongo.db.pages.update_one(
         {'_id': page_name},
         {'$set': update_data},
         upsert=True
     )
-    return redirect('/api/update')
+    return redirect('/api/pages/update_ui') # Corrected redirect to the UI page
 
 @page_bp.route('/update_ui', methods=['GET'])
 def update_ui():
     """Serves the simple HTML UI for editing page content."""
-    # Note: Route changed to /update_ui to avoid conflict with /pages/update
     about_data = mongo.db.pages.find_one({'_id': 'about'}) or DEFAULT_ABOUT_DATA
     contact_data = mongo.db.pages.find_one({'_id': 'contact'}) or DEFAULT_CONTACT_DATA
 

app/templates/base.html

@@ -2,15 +2,95 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>{% if title %}{{ title }}{% else %}Welcome to Xero Python oauth starter{% endif %}</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{% if title %}{{ title }}{% else %}Welcome to Xero Python OAuth Starter{% endif %}</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+    <style>
+        body {
+            font-family: 'Inter', sans-serif;
+        }
+        .link-card {
+            transition: transform 0.3s ease, box-shadow 0.3s ease;
+        }
+        .link-card:hover {
+            transform: translateY(-4px);
+            box-shadow: 0 8px 20px rgba(0,0,0,0.08);
+        }
+        .code-block {
+            background: #f8fafc;
+            border: 1px solid #e2e8f0;
+            border-radius: 0.75rem;
+            padding: 1rem;
+            font-family: 'Fira Code', monospace;
+            font-size: 0.9rem;
+            color: #334155;
+            overflow-x: auto;
+            box-shadow: 0 4px 12px rgba(0,0,0,0.05);
+        }
+        .code-block pre {
+            margin: 0;
+        }
+    </style>
 </head>
-<body>
-<a href="{{ url_for('xero.index') }}">Index</a> |
-<a href="{{ url_for('xero.login') }}">Login</a> |
-<a href="{{ url_for('xero.logout') }}">Logout</a> |
-
-<a href="{{ url_for('xero.fetch_inventory') }}">Sync Xero Inventory with Website</a> |
-{% block content %}{% endblock %}
-<!--<script src="https://cdn.jsdelivr.net/gh/google/code-prettify@master/loader/run_prettify.js"></script>-->
+<body class="bg-white text-gray-800">
+
+    <!-- Navbar -->
+    <nav class="bg-white shadow-sm fixed top-0 left-0 w-full z-10">
+        <div class="max-w-6xl mx-auto px-6 py-4 flex justify-between items-center">
+            <h1 class="text-2xl font-bold text-gray-900">Matax Express Admin Panel</h1>
+            <div class="space-x-6 text-gray-600">
+                <a href="{{ url_for('xero.logs') }}" class="hover:text-blue-600 transition">Index</a>
+                <a href="{{ url_for('xero.login') }}" class="hover:text-blue-600 transition">Login</a>
+                <a href="{{ url_for('xero.logout') }}" class="hover:text-blue-600 transition">Logout</a>
+            </div>
+        </div>
+    </nav>
+
+    <!-- Content -->
+    <div class="max-w-5xl mx-auto px-6 pt-28 pb-10">
+        <h2 class="text-3xl font-bold mb-8 text-gray-900">Quick Actions</h2>
+        <div class="grid md:grid-cols-2 lg:grid-cols-3 gap-6">
+
+            <a href="{{ url_for('xero.fetch_inventory') }}" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Sync Xero Inventory</h3>
+                <p class="text-gray-500 text-sm">Update your website inventory directly from Xero in one click.</p>
+            </a>
+
+            <a href="/api/edit_inventory" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Edit Product Images</h3>
+                <p class="text-gray-500 text-sm">Manage and update product catalog images effortlessly.</p>
+            </a>
+
+            <a href="/api/sync_xero_users" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Sync Xero Users</h3>
+                <p class="text-gray-500 text-sm">Keep your approved Xero users up to date in the database.</p>
+            </a>
+
+            <a href="/api/sendmail" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Send Reminder Emails</h3>
+                <p class="text-gray-500 text-sm">Notify users with pending items in their cart.</p>
+            </a>
+
+            <a href="/api/pages/update_ui" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Update Pages UI</h3>
+                <p class="text-gray-500 text-sm">Revamp the look of the Contact and About Us pages.</p>
+            </a>
+
+            <a href="/api/pages/edit_homepage" class="link-card bg-white p-6 rounded-2xl shadow-sm border border-gray-100 hover:border-blue-200">
+                <h3 class="text-lg font-semibold text-gray-900 mb-2">Update Homepage UI</h3>
+                <p class="text-gray-500 text-sm">Edit the Faq and Why choose us page.This may take some time to take effect</p>
+            </a>
+        </div>
+
+        <!-- Beautiful Code Block for Block Content -->
+        <div class="mt-12">
+            <h3 class="text-xl font-bold text-gray-800 mb-4">Output</h3>
+            <div class="code-block">
+                <pre>{% block content %}{% endblock %}</pre>
+            </div>
+        </div>
+
+    </div>
+
 </body>
 </html>

app/templates/edit_inventory.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>{{ title }}</title>
+    <style>
+        body { font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif; margin: 2em; background-color: #f8f9fa; color: #333; }
+        .container { max-width: 700px; margin: auto; background-color: #fff; padding: 2em; border-radius: 8px; box-shadow: 0 4px 6px rgba(0,0,0,0.1); }
+        h1 { color: #005c9e; }
+        .form-group { margin-bottom: 1.5em; }
+        label { display: block; margin-bottom: 0.5em; font-weight: bold; }
+        input[type="url"], select { width: 100%; padding: 0.8em; border: 1px solid #ccc; border-radius: 4px; box-sizing: border-box; }
+        .btn { display: inline-block; padding: 0.8em 1.5em; background-color: #007bff; color: white; border: none; border-radius: 4px; cursor: pointer; text-align: center; font-size: 1em; }
+        .btn:hover { background-color: #0056b3; }
+        .alert { padding: 1em; margin-bottom: 1em; border-radius: 5px; border: 1px solid transparent; }
+        .alert-success { background-color: #d4edda; color: #155724; border-color: #c3e6cb; }
+        .alert-error { background-color: #f8d7da; color: #721c24; border-color: #f5c6cb; }
+        #image_preview { max-width: 200px; max-height: 200px; margin-top: 1em; border-radius: 4px; border: 1px solid #ddd; }
+    </style>
+</head>
+<body>
+    <div class="container">
+        <h1>{{ title }}</h1>
+
+        <!-- Display flashed messages -->
+        {% with messages = get_flashed_messages(with_categories=true) %}
+          {% if messages %}
+            {% for category, message in messages %}
+              <div class="alert alert-{{ category }}">{{ message }}</div>
+            {% endfor %}
+          {% endif %}
+        {% endwith %}
+
+        <form action="{{ url_for('xero.edit_inventory') }}" method="post">
+            <div class="form-group">
+                <label for="product_code">Select Product:</label>
+                <select name="product_code" id="product_code" required>
+                    <option value="">-- Please choose a product --</option>
+                    {% for product in products %}
+                        <option value="{{ product.code }}">{{ product.name }} (Code: {{ product.code }})</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <div class="form-group">
+                <label for="image_url">New Image URL:</label>
+                <input type="url" name="image_url" id="image_url" placeholder="https://example.com/new_image.jpg" required>
+            </div>
+            <div class="form-group">
+               <p><strong>Current Image:</strong> <span id="current_url_display">N/A</span></p>
+               <img id="image_preview" src="" alt="Image Preview" style="display: none;">
+            </div>
+            <button type="submit" class="btn">Update Image</button>
+        </form>
+    </div>
+
+    <script>
+        // Safely pass product data from Flask to JavaScript
+        const products = {{ products|tojson }};
+        const productSelect = document.getElementById('product_code');
+        const currentUrlSpan = document.getElementById('current_url_display');
+        const imagePreview = document.getElementById('image_preview');
+
+        productSelect.addEventListener('change', (event) => {
+            const selectedCode = event.target.value;
+            // Reset if no product is selected
+            if (!selectedCode) {
+                currentUrlSpan.textContent = 'N/A';
+                imagePreview.style.display = 'none';
+                imagePreview.src = '';
+                return;
+            }
+            // Find the selected product from our data
+            const selectedProduct = products.find(p => p.code === selectedCode);
+            if (selectedProduct && selectedProduct.image_url) {
+                currentUrlSpan.textContent = selectedProduct.image_url;
+                imagePreview.src = selectedProduct.image_url;
+                imagePreview.style.display = 'block';
+            } else {
+                currentUrlSpan.textContent = 'No image URL set.';
+                imagePreview.style.display = 'none';
+                imagePreview.src = '';
+            }
+        });
+    </script>
+</body>
+</html>

app/xero_routes.py

@@ -1,6 +1,6 @@
 import json
 import logging
-from flask import Blueprint, render_template, redirect, url_for, jsonify, request
+from flask import Blueprint, render_template, redirect, url_for, jsonify, request,flash
 from pymongo import UpdateOne
 from xero_python.accounting import AccountingApi
 from utils import jsonify as jsonify_xero
@@ -12,8 +12,8 @@ xero_bp = Blueprint('xero', __name__)
 logger = logging.getLogger(__name__)
 
 
-@xero_bp.route("/")
-def index():
+@xero_bp.route("/logs")
+def logs():
     xero_access = dict(obtain_xero_oauth2_token() or {})
     return render_template(
         "code.html",
@@ -21,6 +21,15 @@ def index():
         code=json.dumps(xero_access, sort_keys=True, indent=4),
     )
 
+@xero_bp.route("/")
+def index():
+    xero_access = dict(obtain_xero_oauth2_token() or {})
+    return render_template(
+        "code.html",
+        title="Home",
+        code="",
+    )
+
 @xero_bp.route("/login")
 def login():
     redirect_url = url_for("xero.oauth_callback", _external=True)
@@ -51,13 +60,13 @@ def fetch_inventory():
     try:
         xero_tenant_id = get_xero_tenant_id()
         accounting_api = AccountingApi(api_client)
-        
         xero_items = accounting_api.get_items(xero_tenant_id=xero_tenant_id).items
         fetched_products = [{
             "code": item.code, "name": item.name,
-            "price": float(item.sales_details.unit_price) if item.sales_details else 0.0,
+            "price": float(item.sales_details.unit_price) if item.sales_details.unit_price else 0.0,
             "unit": item.description, "on_hand": item.quantity_on_hand  if item.quantity_on_hand else 1,
         } for item in xero_items]
+        print(fetched_products)
 
         # Use mongo.db directly
         db_products = list(mongo.db.products.find({}))
@@ -102,3 +111,41 @@ def fetch_inventory():
 
     return render_template("code.html", title="Inventory Sync", sub_title=sub_title, code=code_to_display)
 
+@xero_bp.route("/api/edit_inventory", methods=["GET", "POST"])
+def edit_inventory():
+    """
+    Provides a UI to edit the image_url for inventory items.
+    On GET, it displays a form with all products.
+    On POST, it updates the product's image URL in the database.
+    """
+    # Note: For the flash() functionality to work, you must have a SECRET_KEY configured for your Flask app.
+    # For example: app.config['SECRET_KEY'] = 'a-secret-key'
+
+    if request.method == "POST":
+        product_code = request.form.get("product_code")
+        new_image_url = request.form.get("image_url")
+
+        if not product_code or not new_image_url:
+            flash("Product and a new image URL are required.", "error")
+            return redirect(url_for("xero.edit_inventory"))
+
+        # Update the document in MongoDB
+        # Use mongo.db directly
+        result = mongo.db.products.update_one(
+            {"code": product_code},
+            {"$set": {"image_url": new_image_url}}
+        )
+
+        if result.matched_count:
+            flash(f"Image for product '{product_code}' updated successfully!", "success")
+        else:
+            flash(f"Product with code '{product_code}' not found.", "error")
+        
+        return redirect(url_for("xero.edit_inventory"))
+
+    # For a GET request, fetch all products and render the edit page
+    # Fetch only the necessary fields to populate the form and sort by name
+    products = list(mongo.db.products.find({}, {"_id": 0, "code": 1, "name": 1, "image_url": 1}).sort("name", 1))
+    return render_template("edit_inventory.html", title="Edit Inventory Image", products=products)
+
+# --- NEW FEATURE CODE ENDS HERE ---

app/xero_utils.py

@@ -295,10 +295,13 @@ def create_xero_purchase_order_async(app_context, xero_tenant_id, order_details)
                 if product:
                     product_name = product.get('name', 'N/A')
                     item_code = xero_item_map.get(product_name, "")
+                    unitss=item["mode"]
+                    if unitss == "weight":
+                        unitss = "lb"
                     line_items.append(
                         LineItem(
                             item_code=item_code,
-                            description=product_name+" ("+str(item["mode"]) + ")",
+                            description=str(item['quantity']) + " " + unitss + " of " + product_name,
                             quantity=item['quantity'],
                             unit_amount=float(product.get('price', 0))
                         )

env_test.py

@@ -0,0 +1,197 @@
+VERCEL_TOKEN = "azm0JC5lyPwah6qPGhbN5DL5"
+PROJECT_ID = "prj_4RemrVT2H255cTcdXxkLqFJUD6Dq"
+# Vercel Team ID is optional. Only include it if your project is under a team.
+TEAM_ID = False
+PROJECT_NAME = "matax-express"
+# update_vercel_env.py
+import os
+import json
+import requests
+import sys
+
+# --- Configuration ---
+
+# --- Data to be Set ---
+# This data will be converted to a JSON string and sent to Vercel.
+# You can modify this data directly in the script before running it.
+
+WHY_US_FEATURES_DATA = [
+  { "icon": "EnergySavingsLeafIcon", "title": "Peak Freshness", "description": "Guaranteed farm-to-door freshness in every order." },
+  { "icon": "YardIcon", "title": "Local Sourcing", "description": "Partnering with local farms to support the community." },
+  { "icon": "CategoryIcon", "title": "Wide Selection", "description": "A diverse range of produce, dairy, and pantry staples." },
+  { "icon": "LocalShippingIcon", "title": "Reliable Delivery", "description": "On-time, refrigerated delivery you can count on." },
+]
+
+FAQS_DATA = [
+  { "question": "What regions do you deliver to?", "answer": "We currently deliver to all major metropolitan areas within the state. We are actively expanding our delivery network, so please check back for updates on new regions." },
+  { "question": "How do I place an order?", "answer": "Once you register for an account and are approved, you can log in to our customer portal. From there, you can browse our product catalog, select quantities, and schedule your delivery." },
+  { "question": "What are your quality standards?", "answer": "We pride ourselves on sourcing only the freshest, Grade A produce from trusted local and national farms. Every item is inspected for quality and freshness before it leaves our facility." },
+  { "question": "Is there a minimum order requirement?", "answer": "Yes, there is a minimum order value for delivery. This amount varies by region. You can find the specific minimum for your area in your customer portal after logging in." },
+]
+
+def get_existing_env_var(key, headers, params):
+    """Fetches all environment variables and returns the one matching the key."""
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env"
+    try:
+        response = requests.get(api_url, headers=headers, params=params)
+        response.raise_for_status()
+        all_vars = response.json().get('envs', [])
+        for var in all_vars:
+            if var['key'] == key:
+                print(f"Found existing variable '{key}' with ID: {var['id']}")
+                return var
+        return None
+    except requests.exceptions.RequestException as err:
+        print(f"❌ Error fetching environment variables: {err}")
+        return None
+
+def delete_env_var(var_id, headers, params):
+    """Deletes an environment variable by its ID."""
+    print(f"Attempting to delete variable with ID: {var_id}")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env/{var_id}"
+    try:
+        response = requests.delete(api_url, headers=headers, params=params)
+        response.raise_for_status()
+        print(f"✅ Successfully deleted variable.")
+        return True
+    except requests.exceptions.RequestException as err:
+        print(f"❌ Error deleting environment variable: {err}")
+        return False
+
+def create_env_var(key, value_obj, target_environments, headers, params):
+    """Creates a new environment variable."""
+    print(f"Creating new environment variable '{key}'...")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}/env"
+    payload = {
+        "key": key,
+        "value": json.dumps(value_obj),
+        "type": "encrypted",
+        "target": target_environments,
+    }
+    try:
+        response = requests.post(api_url, headers=headers, json=payload, params=params)
+        response.raise_for_status()
+        print(f"✅ Successfully created environment variable '{key}'.")
+        return True
+    except requests.exceptions.RequestException as err:
+        print(f"❌ HTTP Error creating '{key}': {err}")
+        if err.response:
+            print(f"   Response Body: {err.response.text}")
+        return False
+
+def set_vercel_env_var(key, value_obj, target_environments):
+    """
+    Main function to set an environment variable.
+    It deletes the variable if it exists, then creates it.
+    """
+    print(f"--- Processing environment variable: {key} ---")
+    headers = {"Authorization": f"Bearer {VERCEL_TOKEN}"}
+    params = {"teamId": TEAM_ID} if TEAM_ID else {}
+
+    existing_var = get_existing_env_var(key, headers, params)
+
+    if existing_var:
+        if not delete_env_var(existing_var['id'], headers, params):
+            print(f"Aborting update for '{key}' due to deletion failure.")
+            return False
+
+    return create_env_var(key, value_obj, target_environments, headers, params)
+
+def get_project_git_info(headers, params):
+    """Fetches project details to get the linked Git repository ID and type."""
+    print("Fetching project details to find Git repo ID...")
+    api_url = f"https://api.vercel.com/v9/projects/{PROJECT_ID}"
+    try:
+        response = requests.get(api_url, headers=headers, params=params)
+        response.raise_for_status()
+        project_data = response.json()
+        
+        link_info = project_data.get('link')
+        if not link_info or 'repoId' not in link_info or 'type' not in link_info:
+            print("❌ Error: Could not find linked Git repository information (repoId).")
+            print("   Please ensure your Vercel project is connected to a Git repository.")
+            return None, None
+
+        repo_id = link_info['repoId']
+        git_type = link_info['type']
+        print(f"✅ Found Git repo ID: {repo_id} (type: {git_type})")
+        return repo_id, git_type
+
+    except requests.exceptions.RequestException as err:
+        print(f"❌ Error fetching project details: {err}")
+        return None, None
+
+def trigger_vercel_deployment():
+    """Triggers a new Vercel deployment for the project."""
+    print("\n--- Triggering new Vercel deployment ---")
+    headers = {"Authorization": f"Bearer {VERCEL_TOKEN}", "Content-Type": "application/json"}
+    params = {"teamId": TEAM_ID} if TEAM_ID else {}
+
+    # Dynamically get the Git repo ID and type required for the deployment payload
+    repo_id, git_type = get_project_git_info(headers, params)
+    if not repo_id:
+        print("Aborting deployment trigger due to missing Git info.")
+        return
+
+    api_url = "https://api.vercel.com/v13/deployments"
+    
+    # The payload now correctly includes the repoId
+    payload = {
+        "name": PROJECT_NAME,
+        "target": "production",
+        "gitSource": {
+            "type": git_type,
+            "repoId": repo_id,
+            "ref": "main"  # Change 'main' to your default branch if it's different
+        }
+    }
+
+    try:
+        response = requests.post(api_url, headers=headers, json=payload, params=params)
+        response.raise_for_status()
+        deployment_url = response.json().get('url')
+        print(f"✅ Successfully triggered new deployment.")
+        print(f"   Inspect deployment: https://{deployment_url}")
+
+    except requests.exceptions.HTTPError as err:
+        print(f"❌ HTTP Error triggering deployment: {err}")
+        print(f"   Response Body: {err.response.text}")
+    except Exception as err:
+        print(f"❌ An unexpected error occurred while triggering deployment: {err}")
+
+
+def main():
+    """Main function to run the script."""
+    print("Starting Vercel environment variable update process...")
+    
+    if not all([VERCEL_TOKEN, PROJECT_ID, PROJECT_NAME]):
+        print("❌ Error: Missing required environment variables.")
+        print("   Please set VERCEL_TOKEN, VERCEL_PROJECT_ID, and VERCEL_PROJECT_NAME.")
+        sys.exit(1)
+
+    target_environments = ["production", "preview", "development"]
+    
+    success1 = set_vercel_env_var(
+        key="REACT_APP_WHY_US_FEATURES",
+        value_obj=WHY_US_FEATURES_DATA,
+        target_environments=target_environments
+    )
+    
+    print("\n")
+
+    success2 = set_vercel_env_var(
+        key="REACT_APP_FAQS",
+        value_obj=FAQS_DATA,
+        target_environments=target_environments
+    )
+    
+    if success1 and success2:
+        trigger_vercel_deployment()
+    else:
+        print("\nSkipping deployment due to errors in updating environment variables.")
+
+    print("\nScript finished.")
+
+
+if __name__ == "__main__":
+    main()

search_engine.py

@@ -19,7 +19,7 @@ def categorise(product):
     
         response = client.models.generate_content(
             model="gemini-2.5-flash-lite-preview-06-17",
-            contents=f"Categorise this product:{product} , into one of the following categories: `Fruits,Vegetables,Bakery,Others`",
+            contents=f"Categorise this product:{product} , into one of the following categories: `Fruits,Vegetables,Bakery`",
             config={
                 "response_mime_type": "application/json",
                 "response_schema": list[Categorise],
@@ -30,7 +30,7 @@ def categorise(product):
         time.sleep(2)
         response = client.models.generate_content(
             model="gemini-2.5-flash",
-            contents=f"Categorise this product:{product} , into one of the following categories: `Fruits,Vegetables,Bakery,Others`",
+            contents=f"Categorise this product:{product} , into one of the following categories: `Fruits,Vegetables,Bakery`",
             config={
                 "response_mime_type": "application/json",
                 "response_schema": list[Categorise],