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

Resolve "Data archiving" #1687

Open
korina.cordero wants to merge 139 commits from 762-data-archiving into 746-resq-2-0-final
pull from: 762-data-archiving
merge into: rgutierrez:746-resq-2-0-final
Conversation 30 Commits 139 Files changed 69 +2 -1
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c4e03f861d - Show all commits

3
src/Controller/CAPI/RiderAppController.php
View file

@ -289,8 +289,9 @@ class RiderAppController extends ApiController
// do we have a job order? // do we have a job order?
// $jo = $rider->getActiveJobOrder(); // $jo = $rider->getActiveJobOrder();
// NOTE: we do not include job orders that have been cancelled
$jo = $rider->getCurrentJobOrder(); $jo = $rider->getCurrentJobOrder();
if ($jo == null) if ($jo == null || $jo->getStatus() == JOStatus::CANCELLED)
{ {
$data = [ $data = [
'job_order' => null 'job_order' => null