Add Tier 1 and Tier 2 notes #33

src/Controller/APIController.php

@@ -693,7 +693,8 @@ class APIController extends Controller
         $jo->setSource('mobile')
             ->setStatus(JOStatus::PENDING)
             ->setDeliveryInstructions('')
-            ->setAgentNotes('')
+            ->setTier1Notes('')
+            ->setTier2Notes('')
             ->setDeliveryAddress('Set by mobile application');
 
         // customer

src/Controller/JobOrderController.php

@@ -187,7 +187,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::PENDING)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'));
 
             // check if reference JO is set and validate
@@ -667,7 +668,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::RIDER_ASSIGN)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setHub($hub);
 
@@ -821,7 +823,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::ASSIGNED)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setAssignedBy($this->getUser())
                 ->setDateAssign(new DateTime())
@@ -936,7 +939,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::FULFILLED)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'));
 
             // validate
@@ -1079,7 +1083,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::RIDER_ASSIGN)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setHub($hub)
                 ->clearRider();
@@ -1200,7 +1205,8 @@ class JobOrderController extends BaseController
                 ->setSource('web')
                 ->setStatus(JOStatus::ASSIGNED)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
-                ->setAgentNotes($req->request->get('agent_notes'))
+                ->setTier1Notes($req->request->get('tier1_notes'))
+                ->setTier2Notes($req->request->get('tier2_notes'))
                 ->setDeliveryAddress($req->request->get('delivery_address'))
                 ->setAssignedBy($this->getUser())
                 ->setDateAssign(new DateTime())

src/Entity/JobOrder.php

@@ -148,11 +148,17 @@ class JobOrder
      */
     protected $delivery_instructions;
 
-    // agent notes
+    // agent tier I notes
     /**
      * @ORM\Column(type="text", nullable=true)
      */
-    protected $agent_notes;
+    protected $tier1_notes;
+
+    // agent tier II notes
+    /**
+     * @ORM\Column(type="text", nullable=true)
+     */
+    protected $tier2_notes;
 
     // delivery address
     /**
@@ -420,15 +426,26 @@ class JobOrder
         return $this->delivery_instructions;
     }
 
-    public function setAgentNotes($agent_notes)
+    public function setTier1Notes($notes)
     {
-        $this->agent_notes = $agent_notes;
+        $this->tier1_notes = $notes;
         return $this;
     }
 
-    public function getAgentNotes()
+    public function getTier1Notes()
     {
-        return $this->agent_notes;
+        return $this->tier1_notes;
+    }
+
+    public function setTier2Notes($notes)
+    {
+        $this->tier2_notes = $notes;
+        return $this;
+    }
+
+    public function getTier2Notes()
+    {
+        return $this->tier2_notes;
     }
 
     public function setDeliveryAddress($delivery_address)

templates/job-order/form.html.twig

@@ -240,18 +240,25 @@
 										<div class="form-control-feedback hide" data-field="date_schedule_time"></div>
 									</div>
 								</div>
+								<div class="form-group m-form__group row">
+									<div class="col-lg-6">
+										<label data-field="tier1_notes">Tier 1 Notes</label>
+										<textarea name="tier1_notes" class="form-control m-input" rows="4">{{ obj.getTier1Notes }}</textarea>
+										<div class="form-control-feedback hide" data-field="tier1_notes"></div>
+									</div>
+									<div class="col-lg-6">
+										<label data-field="tier2_notes">Tier 2 Notes</label>
+										<textarea name="tier2_notes" class="form-control m-input" rows="4">{{ obj.getTier1Notes }}</textarea>
+										<div class="form-control-feedback hide" data-field="tier2_notes"></div>
+									</div>
+								</div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
 										<label data-field="delivery_instructions">Delivery Instructions</label>
 										<textarea name="delivery_instructions" class="form-control m-input" rows="4">{{ obj.getDeliveryInstructions }}</textarea>
 										<div class="form-control-feedback hide" data-field="delivery_instructions"></div>
 									</div>
-									<div class="col-lg-6">
+                                </div>
-										<label data-field="agent_notes">Agent Notes</label>
-										<textarea name="agent_notes" class="form-control m-input" rows="4">{{ obj.getAgentNotes }}</textarea>
-										<div class="form-control-feedback hide" data-field="agent_notes"></div>
-									</div>
-								</div>
 								<!--
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">