Add JO status checking for getOngoingJobOrder. #424

This commit is contained in:
Korina Cordero 2020-06-23 02:33:24 +00:00
parent 16b136b0d3
commit 093a249689

View file

@ -840,6 +840,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
// set jo status to in transit // set jo status to in transit
$jo->setStatus(JOStatus::IN_TRANSIT); $jo->setStatus(JOStatus::IN_TRANSIT);
// set rider's active JO
// TODO: send mqtt event (?) // TODO: send mqtt event (?)
// add event log // add event log
@ -1940,7 +1943,17 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
return $data; 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 = [ $data = [
'job_order' => $jo_data 'job_order' => $jo_data