Merge branch '496-cmb-clear-rider-s-active-jo-when-jo-is-cancelled' into '488-cmb-live'

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

See merge request jankstudio/resq!579

src/Service/JobOrderHandler/CMBJobOrderHandler.php

@@ -1124,6 +1124,11 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $cancel_reason = $req->request->get('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
         $event = new JOEvent();
         $event->setDateHappen(new DateTime())

src/Service/RiderAPIHandler/CMBRiderAPIHandler.php

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