From 99401b95e6e4f026d3dd5a39979b86863380556f Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Sat, 10 Mar 2018 02:21:55 +0800
Subject: [PATCH] Add OR Name to job order entity and controller (incoming) and
 templates #UAT

---
 src/Controller/JobOrderController.php |  3 ++-
 src/Entity/JobOrder.php               | 17 +++++++++++++++++
 templates/job-order/form.html.twig    |  8 +++++++-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php
index 3d74d455..78ca5bcc 100644
--- a/src/Controller/JobOrderController.php
+++ b/src/Controller/JobOrderController.php
@@ -205,7 +205,8 @@ class JobOrderController extends BaseController
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
                 ->setTier1Notes($req->request->get('tier1_notes'))
                 ->setTier2Notes($req->request->get('tier2_notes'))
-                ->setDeliveryAddress($req->request->get('delivery_address'));
+                ->setDeliveryAddress($req->request->get('delivery_address'))
+                ->setORName($req->request->get('or_name'));
 
             // check if reference JO is set and validate
             if (!empty($req->request->get('ref_jo'))) {
diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index 84fa3b01..f19d754e 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -198,6 +198,11 @@ class JobOrder
      */
     protected $mode_of_payment;
 
+    /**
+     * @ORM\Column(type="string", length=80)
+     */
+    protected $or_name;
+
     public function __construct()
     {
         $this->date_create = new DateTime();
@@ -206,6 +211,7 @@ class JobOrder
         $this->flag_advance = false;
         $this->source = 'mobile';
         $this->mode_of_payment = ModeOfPayment::CASH;
+        $this->or_name = '';
     }
 
     public function getID()
@@ -516,4 +522,15 @@ class JobOrder
     {
         return $this->mode_of_payment;
     }
+
+    public function setORName($name)
+    {
+        $this->or_name = $name;
+        return $this;
+    }
+
+    public function getORName()
+    {
+        return $this->or_name;
+    }
 }
diff --git a/templates/job-order/form.html.twig b/templates/job-order/form.html.twig
index 57d96d6c..87fb591e 100644
--- a/templates/job-order/form.html.twig
+++ b/templates/job-order/form.html.twig
@@ -267,7 +267,6 @@
                                         <div class="col-lg-12 form-group-inner">
                                             <label data-field="source">Transaction Origin</label>
                                             <select class="form-control m-input" id="source" name="source">
-                                                <!--<option value=""></option>-->
                                                 {% for key, class in sources %}
                                                     <option value="{{ key }}"{{ obj.getSource == key ? ' selected' }}>{{ class }}</option>
                                                 {% endfor %}
@@ -353,6 +352,13 @@
 										Invoice
 									</h3>
 								</div>
+                                <div class="form-group m-form__group row">
+									<div class="col-lg-6">
+								    	<label data-field="or_name">OR Name</label>
+										<input type="text" name="or_name" id="or_name" class="form-control m-input" value="{{ obj.getORName|default('') }}">
+										<div class="form-control-feedback hide" data-field="or_name"></div>
+									</div>
+                                </div>
 								<div class="form-group m-form__group row">
 									<div class="col-lg-6">
 										<label>Discount Type</label>