src/Controller/CAPI/RiderAppController.php

@@ -289,8 +289,9 @@ class RiderAppController extends ApiController
 
         // do we have a job order?
         // $jo = $rider->getActiveJobOrder();
+        // NOTE: we do not include job orders that have been cancelled
         $jo = $rider->getCurrentJobOrder();
-        if ($jo == null)
+        if ($jo == null || $jo->getStatus() == JOStatus::CANCELLED)
         {
             $data = [
                 'job_order' => null