From 4dd708a8ac3ce127158a30941132f7e8c2e43ae6 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Wed, 25 Apr 2018 01:39:21 +0800 Subject: [PATCH] Add customer name and mobile phone searching for view all jo list #98 --- src/Controller/JobOrderController.php | 11 +++++++---- templates/job-order/list.all.html.twig | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index 282532cc..de94f6da 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -1804,9 +1804,9 @@ class JobOrderController extends BaseController $query->innerJoin('q.cus_vehicle', 'cv') ->innerJoin('q.customer', 'c') ->where('q.status IN (:statuses)') - ->andWhere('cv.plate_number like :plate or c.first_name like :plate or c.last_name like :plate') + ->andWhere('cv.plate_number like :filter or c.first_name like :filter or c.last_name like :filter') ->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY) - ->setParameter('plate', $datatable['query']['data-rows-search'] . '%'); + ->setParameter('filter', $datatable['query']['data-rows-search'] . '%'); } else { @@ -1818,8 +1818,11 @@ class JobOrderController extends BaseController if (isset($datatable['query']['data-rows-search'])) { $query->innerJoin('q.cus_vehicle', 'cv') - ->where('cv.plate_number like :plate') - ->setParameter('plate', $datatable['query']['data-rows-search'] . '%'); + ->innerJoin('q.customer', 'c') + ->where('cv.plate_number like :filter') + ->orWhere('c.phone_mobile like :filter') + ->orWhere('c.first_name like :filter or c.last_name like :filter') + ->setParameter('filter', $datatable['query']['data-rows-search'] . '%'); } break; default: diff --git a/templates/job-order/list.all.html.twig b/templates/job-order/list.all.html.twig index 910f5bcd..b907a1b5 100644 --- a/templates/job-order/list.all.html.twig +++ b/templates/job-order/list.all.html.twig @@ -80,6 +80,10 @@ { field: 'plate_number', title: 'Plate #' + }, + { + field: 'customer_name', + title: 'Customer' }, { field: 'delivery_address', -- 2.43.5