From 1a6af003996d0344dd4d6d22bb688a089ca33cb1 Mon Sep 17 00:00:00 2001
From: Ramon Gutierrez <arcticzero@gmail.com>
Date: Tue, 19 Mar 2024 16:35:51 +0800
Subject: [PATCH] Rename JO progression check method #793

---
 src/Controller/CAPI/RiderAppController.php | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index e54ed55c..0141617f 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -412,7 +412,7 @@ class RiderAppController extends ApiController
             return new APIResponse(false, $msg);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // TODO: refactor this into a jo handler class, so we don't have to repeat for control center
 
@@ -465,7 +465,7 @@ class RiderAppController extends ApiController
             return new APIResponse(true, $msg);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // requeue it, instead of cancelling it
         $jo->requeue();
@@ -526,7 +526,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB);
@@ -569,7 +569,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB_PRE_JO);
@@ -612,7 +612,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO);
@@ -655,7 +655,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_START);
@@ -699,7 +699,7 @@ class RiderAppController extends ApiController
         $jo->setStatus(JOStatus::IN_PROGRESS);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE);
@@ -760,7 +760,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB);
@@ -853,7 +853,7 @@ class RiderAppController extends ApiController
             return new APIResponse(false, $msg);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // need to check if service type is battery sales
         // if so, serial is a required parameter
@@ -1001,7 +1001,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ARRIVE_HUB_POST_JO);
@@ -1045,7 +1045,7 @@ class RiderAppController extends ApiController
         $jo = $rider->getCurrentJobOrder();
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_POST_JO);
@@ -1264,7 +1264,7 @@ class RiderAppController extends ApiController
         $jo = $em->getRepository(JobOrder::class)->find($jo_id);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // check if we have trade in items
         $ti_items = [];
@@ -1375,7 +1375,7 @@ class RiderAppController extends ApiController
             return new APIResponse(false, $msg);
 
         // check if JO can be modified first
-        $this->allowJOProgress($jo, $rider);
+        $this->checkJOProgressionAllowed($jo, $rider);
 
         // check service type
         $stype_id = $req->request->get('stype_id');
@@ -1739,7 +1739,7 @@ class RiderAppController extends ApiController
         return $msg;
     }
 
-    protected function allowJOProgress(JobOrder $jo, $rider)
+    protected function checkJOProgressionAllowed(JobOrder $jo, $rider)
     {
         // TODO: add more statuses to block if needed, hence. this is a failsafe in case MQTT is not working.
         switch ($jo->getStatus())