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 +14 -1
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 093a249689 - Show all commits

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

@ -840,6 +840,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
// set jo status to in transit
$jo->setStatus(JOStatus::IN_TRANSIT);
// set rider's active JO
// TODO: send mqtt event (?)
// add event log
@ -1940,7 +1943,17 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
return $data;
}
$jo_data = $this->formatJobOrderData($req, $jo);
$jo_data = [];
// check if JO status is in_progress, in_transit, performed, paid
switch($jo->getStatus())
{
case JOStatus::IN_TRANSIT:
case JOStatus::IN_PROGRESS:
case JOStatus::PERFORMED:
case JOStatus::PAID:
$jo_data = $this->formatJobOrderData($req, $jo);
break;
}
$data = [
'job_order' => $jo_data