Merge branch '406-resq-add-flag_autoassign-to-jo' into 'master'

Resolve "Resq - add flag_autoassign to JO"

Closes #406

See merge request jankstudio/resq!469

src/Controller/APIController.php

@@ -24,6 +24,7 @@ use App\Ramcar\TransactionOrigin;
 use App\Ramcar\TradeInType;
 use App\Ramcar\JOEventType;
 use App\Ramcar\AdvanceOrderSlot;
+use App\Ramcar\AutoAssignStatus;
 
 use App\Service\InvoiceGeneratorInterface;
 use App\Service\RisingTideGateway;
@@ -2360,7 +2361,6 @@ class APIController extends Controller implements LoggedController
         $schedule_date = $req->request->get('date_schedule');
         $slot_id = $req->request->get('slot_id');
         $advance_order = $req->request->get('flag_advance_order');
-
         // check for 'false' text
         if ($advance_order === false || $advance_order === 0 || $advance_order === '0' || $advance_order == 'false')
             $flag_advance_order = false;
@@ -2379,7 +2379,8 @@ class APIController extends Controller implements LoggedController
             ->setDeliveryInstructions($instructions)
             // TODO: error check for valid mode of payment
             ->setModeOfPayment($req->request->get('mode_of_payment'))
-            ->setAdvanceOrder($flag_advance_order);
+            ->setAdvanceOrder($flag_advance_order)
+            ->setStatusAutoAssign(AutoAssignStatus::NOT_ASSIGNED);
 
         // customer
         $cust = $this->session->getCustomer();
@@ -2538,6 +2539,7 @@ class APIController extends Controller implements LoggedController
                     $jo->setHub($nearest_hub);
                     $jo->setRider($assigned_rider);
                     $jo->setStatus(JOStatus::ASSIGNED);
+                    $jo->setStatusAutoAssign(AutoAssignStatus::HUB_AND_RIDER_ASSIGNED);
 
                     $assigned_rider->setAvailable(false);
                 }
@@ -2559,6 +2561,7 @@ class APIController extends Controller implements LoggedController
             
             $jo->setHub($hub);
             $jo->setStatus(JOStatus::RIDER_ASSIGN);
+            $jo->setStatusAutoAssign(AutoAssignStatus::HUB_ASSIGNED);
 
             if ($date_schedule != null)
                 $jo->setDateSchedule($date_schedule); 

src/Entity/JobOrder.php

@@ -288,6 +288,12 @@ class JobOrder
      */
     protected $priority;
 
+    // autoassign status 
+    /**
+     * @ORM\Column(type="string", length=30, nullable=true)
+     */
+    protected $status_autoassign;
+
     // meta
     /**
      * @ORM\Column(type="json")
@@ -845,4 +851,16 @@ class JobOrder
 
         return $this->meta[$id];
     }
+
+    public function setStatusAutoAssign($status_autoassign)
+    {
+        $this->status_autoassign = $status_autoassign;
+        return $this;
+    }
+
+    public function getStatusAutoAssign()
+    {
+        return $this->status_autoassign;
+    }
+
 }

src/Ramcar/AutoAssignStatus.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Ramcar;
+
+class AutoAssignStatus extends NameValue
+{
+    const NOT_ASSIGNED           = 'not_assigned';
+    const HUB_ASSIGNED           = 'hub_assigned';
+    const HUB_AND_RIDER_ASSIGNED = 'hub_and_rider_assigned';
+
+    const COLLECTION = [
+        'not_assigned' => 'Not Assigned',
+        'hub_assigned' => 'Hub Assigned',
+        'hub_and_rider_assgined' => 'Hub and Rider Assigned',
+    ];
+}