Merge branch '100-search-by-plate-number-customer' into 'master'
Resolve "Search by plate number (Customer)" Closes #100 See merge request jankstudio/resq!85
This commit is contained in:
commit
7822797280
1 changed files with 9 additions and 3 deletions
|
|
@ -51,6 +51,10 @@ class CustomerController extends BaseController
|
|||
$this->denyAccessUnlessGranted('customer.list', null, 'No access.');
|
||||
|
||||
// build query
|
||||
$tqb = $this->getDoctrine()
|
||||
->getRepository(Customer::class)
|
||||
->createQueryBuilder('q');
|
||||
|
||||
$qb = $this->getDoctrine()
|
||||
->getRepository(Customer::class)
|
||||
->createQueryBuilder('q');
|
||||
|
|
@ -59,7 +63,7 @@ class CustomerController extends BaseController
|
|||
$datatable = $req->request->get('datatable');
|
||||
|
||||
// count total records
|
||||
$tquery = $qb->select('COUNT(q)');
|
||||
$tquery = $tqb->select('COUNT(q)');
|
||||
|
||||
// add filters to count query
|
||||
$this->setQueryFilters($datatable, $tquery);
|
||||
|
|
@ -676,10 +680,12 @@ class CustomerController extends BaseController
|
|||
// check if datatable filter is present and append to query
|
||||
protected function setQueryFilters($datatable, &$query) {
|
||||
if (isset($datatable['query']['data-rows-search']) && !empty($datatable['query']['data-rows-search'])) {
|
||||
$query->where('q.first_name LIKE :filter')
|
||||
$query->join('q.vehicles', 'cv')
|
||||
->where('q.first_name LIKE :filter')
|
||||
->orWhere('q.last_name LIKE :filter')
|
||||
->orWhere('q.customer_classification LIKE :filter')
|
||||
->setParameter('filter', '%' . $datatable['query']['data-rows-search'] . '%');
|
||||
->orWhere('cv.plate_number LIKE :filter')
|
||||
->setParameter('filter', $datatable['query']['data-rows-search'] . '%');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue