From 782b1e8c00c170546497ec7c0658b832e29a0dc1 Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Wed, 18 Apr 2018 13:49:26 +0800 Subject: [PATCH 1/2] Add customer name in jo open list #94 --- templates/job-order/list.open.html.twig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/job-order/list.open.html.twig b/templates/job-order/list.open.html.twig index 31897d8b..adec8b80 100644 --- a/templates/job-order/list.open.html.twig +++ b/templates/job-order/list.open.html.twig @@ -75,15 +75,19 @@ columns: [ { field: 'id', - title: 'JO Number' + title: 'JO #' }, { field: 'plate_number', title: 'Plate #' }, + { + field: 'customer_name', + title: 'Customer' + }, { field: 'delivery_address', - title: 'Customer Area' + title: 'Area' }, { field: 'type', -- 2.43.5 From 57c9da8adfe86418bc7c8823feb606ea3c2fd42e Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Wed, 18 Apr 2018 13:49:40 +0800 Subject: [PATCH 2/2] Add search for first name or last name in open job order list #94 --- src/Controller/JobOrderController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index a0d8bdac..2f2d379c 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -746,6 +746,7 @@ class JobOrderController extends BaseController foreach ($obj_rows as $orow) { // add row data $row['id'] = $orow->getID(); + $row['customer_name'] = $orow->getCustomer()->getFirstName() . ' ' . $orow->getCustomer()->getLastName(); $row['delivery_address'] = $orow->getDeliveryAddress(); $row['date_schedule'] = $orow->getDateSchedule()->format("d M Y g:i A"); $row['type'] = $orow->isAdvanceOrder() ? 'Advanced Order' : 'Immediate'; @@ -1799,8 +1800,9 @@ class JobOrderController extends BaseController if (isset($datatable['query']['data-rows-search'])) { $query->innerJoin('q.cus_vehicle', 'cv') + ->innerJoin('q.customer', 'c') ->where('q.status IN (:statuses)') - ->andWhere('cv.plate_number like :plate') + ->andWhere('cv.plate_number like :plate or c.first_name like :plate or c.last_name like :plate') ->setParameter('statuses', $status, Connection::PARAM_STR_ARRAY) ->setParameter('plate', $datatable['query']['data-rows-search'] . '%'); } -- 2.43.5