rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Search by phone number (JO)" #897

Merged
jankstudio merged 1 commit from 98-search-by-phone-number-jo into master 2018-04-24 17:40:29 +00:00
Conversation 2 Commits 1 Files changed 2 +11 -4
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Controller/JobOrderController.php
View file

@ -1804,9 +1804,9 @@ class JobOrderController extends BaseController
$query->innerJoin('q.cus_vehicle', 'cv') $query->innerJoin('q.cus_vehicle', 'cv')
->innerJoin('q.customer', 'c') ->innerJoin('q.customer', 'c')
->where('q.status IN (:statuses)') ->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('statuses', $status, Connection::PARAM_STR_ARRAY)
->setParameter('plate', $datatable['query']['data-rows-search'] . '%'); ->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
} }
else else
{ {
@ -1818,8 +1818,11 @@ class JobOrderController extends BaseController
if (isset($datatable['query']['data-rows-search'])) if (isset($datatable['query']['data-rows-search']))
{ {
$query->innerJoin('q.cus_vehicle', 'cv') $query->innerJoin('q.cus_vehicle', 'cv')
->where('cv.plate_number like :plate') ->innerJoin('q.customer', 'c')
->setParameter('plate', $datatable['query']['data-rows-search'] . '%'); ->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; break;
default: default:

4
templates/job-order/list.all.html.twig
View file

@ -80,6 +80,10 @@
{ {
field: 'plate_number', field: 'plate_number',
title: 'Plate #' title: 'Plate #'
},
{
field: 'customer_name',
title: 'Customer'
}, },
{ {
field: 'delivery_address', field: 'delivery_address',