Add search for first name or last name in open job order list #94

This commit is contained in:
Kendrick Chan 2018-04-18 13:49:40 +08:00
parent 782b1e8c00
commit 57c9da8adf

View file

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