Merge branch '495-cmb-rider-cannot-start-second-jo-after-completion-of-first-jo' into '488-cmb-live'

Resolve "CMB - rider cannot start second JO after completion of first JO"

See merge request jankstudio/resq!580

src/Service/RiderAPIHandler/CMBRiderAPIHandler.php

@@ -1680,6 +1680,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
 
         // add event log
         $rider = $this->session->getRider();
+
+        // clear rider's active JO
+        $rider->setActiveJobOrder(null);
+
         $event = new JOEvent();
         $event->setDateHappen(new DateTime())
             ->setTypeID(CMBJOEventType::FULFILL)