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

Resolve "Resq - message prompt for non-serviceable area" #1353

Merged
korina.cordero merged 176 commits from 463-resq-message-prompt-for-non-serviceable-area into 465-resq-august-13-release 2020-08-12 05:41:57 +00:00
Conversation 3 Commits 176 Files changed 3 +8 -6
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2f8dca3dbc - Show all commits

14
src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
View file

@ -2083,7 +2083,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$data = $this->checkJO($req, $required_params, $jo); $data = $this->checkJO($req, $required_params, $jo);
if (isset($data['error'])) if (isset($data['error']))
{ {
$data['title'] = 'Failed Verify Job Order'; $data = [
'assigned' => false,
'available' => false,
];
return $data; return $data;
} }
@ -2092,16 +2095,15 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
($jo->getStatus() == JOStatus::CANCELLED)) ($jo->getStatus() == JOStatus::CANCELLED))
{ {
$data = [ $data = [
'title' => 'Failed Verify Job Order', 'assigned' => 'true',
'error' => 'Job order has been fulfilled or cancelled.' 'available' => 'false'
]; ];
return $data; return $data;
} }
$jo_data = $this->formatJobOrderData($req, $jo);
$data = [ $data = [
'job_order' => $jo_data 'assigned' => true,
'available' => true,
]; ];
return $data; return $data;