From 6a1cd0eab5e7162fa47f4f3697da88a2e6d1580b Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Sun, 12 Oct 2025 12:11:20 -0400 Subject: [PATCH] updated search --- app/customer/views.py | 4 ++-- app/search/views.py | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/customer/views.py b/app/customer/views.py index 97ceb02..75240d2 100755 --- a/app/customer/views.py +++ b/app/customer/views.py @@ -14,7 +14,7 @@ from app.classes.customer import \ Customer_Tank_Inspection from app.classes.service import Service_Parts from app.classes.admin import Admin_Company -from app.classes.auto import Auto_Delivery +from app.classes.auto import Auto_Delivery,Auto_Delivery_schema from app.classes.stats_customer import Stats_Customer import string import random @@ -475,7 +475,7 @@ def get_all_automatic_deliveries(): """ Get all automatic deliveries for the table. """ - from app.classes.auto import Auto_Delivery, Auto_Delivery_schema + try: deliveries = Auto_Delivery.query.all() schema = Auto_Delivery_schema(many=True) diff --git a/app/search/views.py b/app/search/views.py index 7315062..ed2cb94 100755 --- a/app/search/views.py +++ b/app/search/views.py @@ -2,6 +2,7 @@ from flask import request, jsonify from app.search import search from app import db +from sqlalchemy import or_ from app.classes.customer import Customer_Customer, Customer_Customer_schema from app.classes.delivery import Delivery_Delivery, Delivery_Delivery_schema @@ -54,7 +55,9 @@ def search_customers(): else: customer_list = (db.session .query(Customer_Customer) - .filter(Customer_Customer.customer_last_name.ilike(search)) + .filter(or_(Customer_Customer.customer_last_name.ilike(search), + Customer_Customer.customer_first_name.ilike(search), + Customer_Customer.customer_address.ilike(search))) .all()) @@ -78,4 +81,4 @@ def search_delivery(): delivery_schema = Delivery_Delivery_schema(many=True) - return jsonify(delivery_schema.dump(delivery_ticket)) \ No newline at end of file + return jsonify(delivery_schema.dump(delivery_ticket))