Merge branch '94-search-by-phone-name' into 'master'

Resolve "Search by phone / name"

Closes #94

See merge request jankstudio/resq!79

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'] . '%');
                 }

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',