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

Merge branch '133-fix-alerts-for-ios-app-from-rider-app-initiated-events' into 'master'

Browse source 
Resolve "Fix alerts for ios app from rider app initiated events"

Closes #133

See merge request jankstudio/resq!126
This commit is contained in:
Kendrick Chan 2018-06-05 19:48:12 +00:00
commit fec66d3725
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Controller/APIController.php
View file

@ -1060,7 +1060,7 @@ class APIController extends Controller
// check if we have an ongoing job order // check if we have an ongoing job order
$ongoing_jos = $em->getRepository(JobOrder::class)->findBy([ $ongoing_jos = $em->getRepository(JobOrder::class)->findBy([
'customer' => $cust, 'customer' => $cust,
'status' => [JOStatus::PENDING, JOStatus::RIDER_ASSIGN, JOStatus::ASSIGNED, JOStatus::IN_PROGRESS], 'status' => [JOStatus::PENDING, JOStatus::RIDER_ASSIGN, JOStatus::IN_TRANSIT, JOStatus::ASSIGNED, JOStatus::IN_PROGRESS],
]); ]);
if (count($ongoing_jos) <= 0) if (count($ongoing_jos) <= 0)
{ {