Merge branch '159-general-fixes-and-tweaking' into 'master'

Resolve "General fixes and tweaking"

Closes #159

See merge request jankstudio/resq!159

src/Controller/RAPIController.php

@@ -482,6 +482,9 @@ class RAPIController extends Controller
         $jo->setStatus(JOStatus::CANCELLED)
             ->setDateCancel(new DateTime());
 
+        // make rider available
+        $this->session->getRider()->setAvailable(true);
+
         $em->flush();
         
         // send mqtt event
@@ -490,7 +493,7 @@ class RAPIController extends Controller
             'reason' => 'mobile cancellation',
             'jo_id' => $jo->getID(),
         ];
-        $mclient->sendEvent($obj, $payload);
+        $mclient->sendEvent($jo, $payload);
 
 
         // TODO: add event