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

Merge branch 'master' of gitlab.com:jankstudio/resq into 162-phase-2-changes

Browse source
This commit is contained in:
Kendrick Chan 2018-08-13 04:14:14 +08:00
commit ff8e4090ae
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/APIController.php
View file

@ -1093,6 +1093,9 @@ class APIController extends Controller
'customer' => $cust, 'customer' => $cust,
'status' => [JOStatus::PENDING, JOStatus::RIDER_ASSIGN, JOStatus::IN_TRANSIT, JOStatus::ASSIGNED, JOStatus::IN_PROGRESS], 'status' => [JOStatus::PENDING, JOStatus::RIDER_ASSIGN, JOStatus::IN_TRANSIT, JOStatus::ASSIGNED, JOStatus::IN_PROGRESS],
]); ]);
// $res->setData(['here' => count($ongoing_jos)]);
// return $res->getReturnResponse();
if (count($ongoing_jos) <= 0) if (count($ongoing_jos) <= 0)
{ {
error_log('No pending jo'); error_log('No pending jo');
@ -1163,6 +1166,7 @@ class APIController extends Controller
'lat' => $coord->getLatitude() 'lat' => $coord->getLatitude()
] ]
]; ];
$res->setData($data);
return $res->getReturnResponse(); return $res->getReturnResponse();
} }