From 052f3dfe62ba8c984923e25245173213ee527f20 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Thu, 5 Jul 2018 15:19:44 +0800
Subject: [PATCH 1/2] Add or number to JobOrder entity #153

---
 src/Controller/RAPIController.php |  2 ++
 src/Entity/JobOrder.php           | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index 8f4533e9..8018d4cb 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -385,6 +385,8 @@ class RAPIController extends Controller
                         'plate_number' => $cv->getPlateNumber(),
                         'color' => $cv->getColor(),
                     ],
+                    'or_num' => $jo->getORNum(),
+                    'or_name' => $jo->getORName(),
                     'delivery_instructions' => $jo->getDeliveryInstructions(),
                     'delivery_address' => $jo->getDeliveryAddress(),
                     'landmark' => $jo->getLandmark(),
diff --git a/src/Entity/JobOrder.php b/src/Entity/JobOrder.php
index f1baa42d..a5a191df 100644
--- a/src/Entity/JobOrder.php
+++ b/src/Entity/JobOrder.php
@@ -208,6 +208,12 @@ class JobOrder
      */
     protected $mode_of_payment;
 
+    // OR number
+    /**
+     * @ORM\Column(type="string", length=80, nullable=true)
+     */
+    protected $or_num;
+
     // name to put in OR
     /**
      * @ORM\Column(type="string", length=80)
@@ -235,6 +241,7 @@ class JobOrder
         $this->source = 'mobile';
         $this->mode_of_payment = ModeOfPayment::CASH;
         $this->or_name = '';
+        $this->or_num = '';
         $this->landmark = '';
         $this->promo_detail = '';
 
@@ -571,6 +578,17 @@ class JobOrder
         return $this->mode_of_payment;
     }
 
+    public function setORNum($num)
+    {
+        $this->or_num = $num;
+        return $this;
+    }
+
+    public function getORNum()
+    {
+        return $this->or_num;
+    }
+
     public function setORName($name)
     {
         $this->or_name = $name;

From 584652d31da28d11ac30857f9a89a63f94fc418c Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Thu, 5 Jul 2018 15:49:22 +0800
Subject: [PATCH 2/2] Unrequire batt_id and trade_in for change service rider
 api call and add or_num #153

---
 src/Controller/RAPIController.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/Controller/RAPIController.php b/src/Controller/RAPIController.php
index 8018d4cb..0d6bbf43 100644
--- a/src/Controller/RAPIController.php
+++ b/src/Controller/RAPIController.php
@@ -668,7 +668,7 @@ class RAPIController extends Controller
     {
         // allow rider to change service, promo, battery and trade-in options
         $em = $this->getDoctrine()->getManager();
-        $required_params = ['jo_id', 'stype_id', 'promo_id', 'batt_id', 'trade_in'];
+        $required_params = ['jo_id', 'stype_id', 'promo_id'];
         $res = $this->checkJO($req, $required_params, $jo);
         if ($res->isError())
             return $res->getReturnResponse();
@@ -698,10 +698,15 @@ class RAPIController extends Controller
             }
         }
 
+        // check or number
+        $or_num = $req->request->get('or_num');
+        if ($or_num != null)
+            $jo->setORNum($or_num);
+
         // check battery id
         $batt_id = $req->request->get('batt_id');
         // no battery
-        if ($batt_id == 0)
+        if ($batt_id == 0 || $batt_id == null)
             $battery = null;
         else
         {