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

Clear rider's active job order when JO is cancelled via rider app and admin panel. #496 #1390

Merged
korina.cordero merged 2 commits from 496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled into 488-cmb-live 2020-09-16 08:38:05 +00:00
Conversation 2 Commits 2 Files changed 2 +10 -1
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -1124,6 +1124,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
$cancel_reason = $req->request->get('cancel_reason'); $cancel_reason = $req->request->get('cancel_reason');
$obj->cancel($cancel_reason); $obj->cancel($cancel_reason);
// get assigned rider. If not null, clear rider's active JO
$rider = $obj->getRider();
if ($rider != null)
$rider->setActiveJobOrder();
// the event // the event
$event = new JOEvent(); $event = new JOEvent();
$event->setDateHappen(new DateTime()) $event->setDateHappen(new DateTime())

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

@ -1073,8 +1073,12 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$jo->cancel($cancel_reason); $jo->cancel($cancel_reason);
// set rider's active job order to null
// add event log // add event log
$rider = $this->session->getRider(); $rider = $this->session->getRider();
$rider->setActiveJobOrder(null);
$event = new JOEvent(); $event = new JOEvent();
$event->setDateHappen(new DateTime()) $event->setDateHappen(new DateTime())
->setTypeID(CMBJOEventType::REQUEUE) ->setTypeID(CMBJOEventType::REQUEUE)
@ -1156,7 +1160,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
$this->em->persist($event); $this->em->persist($event);
// set rider's active JO to null // set rider's active JO to null
$rider->setActiveJobOrder(); $rider->setActiveJobOrder(null);
$this->em->flush(); $this->em->flush();