Make sure rider's active jo is in an open status #362

2020-03-05 09:20:16 +08:00 · 2020-03-05 09:20:16 +08:00 · bf535e37f5
commit bf535e37f5
parent de9e803ad4
1 changed files with 12 additions and 1 deletions
--- a/src/Entity/Rider.php
+++ b/src/Entity/Rider.php
@ -320,7 +320,18 @@ class Rider
    {
        // check if we have set a custom active
        if ($this->active_job_order != null)
-            return $this->active_job_order;
+        {
+            switch ($this->active_job_order->getStatus())
+            {
+                // if jo is open, return it
+                case JOStatus::ASSIGNED:
+                case JOStatus::IN_TRANSIT:
+                case JOStatus::IN_PROGRESS:
+                    return $this->active_job_order;
+            }
+
+            // if active jo is not open, get the next open one
+        }

        // no custom active job order
        $active_status = [