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

Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Conversation 18 Commits 258 Files changed 143 +2 -2
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 15bafe2363 - Show all commits

4
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -2483,7 +2483,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
if (isset($datatable['query']['rider']))
{
$query->innerJoin('q.rider', 'r')
->where('r.id = :rider_id')
->andWhere('r.id = :rider_id')
->setParameter('rider_id', $datatable['query']['rider']);
}
if (isset($datatable['query']['schedule_date']))
@ -2494,7 +2494,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$date_start = DateTime::createFromFormat('m/d/Y H:i:s', $start);
$date_end = DateTime::createFromFormat('m/d/Y H:i:s', $end);
$query->where('q.date_schedule >= :date_start')
$query->andWhere('q.date_schedule >= :date_start')
->andWhere('q.date_schedule <= :date_end')
->setParameter('date_start', $date_start)
->setParameter('date_end', $date_end);