From cf12d09ee56ca4bd4ad4575aa9ffc32c32d1ac96 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Sat, 21 Aug 2021 21:35:52 +0800
Subject: [PATCH] Shift from using active jo to current jo for rider related
 stuff #617

---
 src/Controller/CAPI/RiderAppController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index f736faeb..20719535 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -281,7 +281,8 @@ class RiderAppController extends APIController
             return new APIResponse(false, 'No rider found.');
 
         // do we have a job order?
-        $jo = $rider->getActiveJobOrder();
+        // $jo = $rider->getActiveJobOrder();
+        $jo = $rider->getCurrentJobOrder();
         if ($jo == null)
         {
             $data = [
@@ -1284,7 +1285,8 @@ class RiderAppController extends APIController
         }
 
         // check if we have an active JO
-        $jo = $rider->getActiveJobOrder();
+        // $jo = $rider->getActiveJobOrder();
+        $jo = $rider->getCurrentJobOrder();
         if ($jo == null)
         {
             $msg = 'No active job order.';
@@ -1306,5 +1308,4 @@ class RiderAppController extends APIController
         $all = $req->request->all();
         error_log(print_r($all, true));
     }
-
 }