updated search
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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())
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user