From c4e03f861de0fffecad5ed0f3c2df3a2fa8b2611 Mon Sep 17 00:00:00 2001 From: Ramon Gutierrez Date: Tue, 19 Mar 2024 17:33:13 +0800 Subject: [PATCH] Exclude cancelled JOs on rider app API #783 --- src/Controller/CAPI/RiderAppController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php index 0141617f..694ffdd0 100644 --- a/src/Controller/CAPI/RiderAppController.php +++ b/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