From df709aa35382a31c598b8d9b5cb34941d99d8ce8 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Thu, 9 Aug 2018 03:36:27 +0800
Subject: [PATCH] Add delivery_address and delivery_instructions to rider
 status user api call #162

---
 src/Controller/APIController.php | 66 ++++++++++++++------------------
 1 file changed, 28 insertions(+), 38 deletions(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 7c05464d..194c853b 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1088,29 +1088,26 @@ class APIController extends Controller
         $jo = $ongoing_jos[0];
         $dest = $jo->getCoordinates();
 
+        $data = [
+            'jo_id' => $jo->getID(),
+            'service_type' => $jo->getServiceType(),
+            'destination' => [
+                'long' => $dest->getLongitude(),
+                'lat' => $dest->getLatitude(),
+            ],
+            'delivery_address' => $jo->getDeliveryAddress(),
+            'delivery_instructions' => $jo->getDeliveryInstructions(),
+        ];
+
         switch ($jo->getStatus())
         {
             case JOStatus::PENDING:
-                $res->setData([
-                    'status' => APIRiderStatus::OUTLET_ASSIGN,
-                    'jo_id' => $jo->getID(),
-                    'service_type' => $jo->getServiceType(),
-                    'destination' => [
-                        'long' => $dest->getLongitude(),
-                        'lat' => $dest->getLatitude(),
-                    ],
-                ]);
+                $data['status'] = APIRiderStatus::OUTLET_ASSIGN;
+                $res->setData($data);
                 return $res->getReturnResponse();
             case JOStatus::RIDER_ASSIGN:
-                $res->setData([
-                    'status' => APIRiderStatus::RIDER_ASSIGN,
-                    'jo_id' => $jo->getID(),
-                    'service_type' => $jo->getServiceType(),
-                    'destination' => [
-                        'long' => $dest->getLongitude(),
-                        'lat' => $dest->getLatitude(),
-                    ],
-                ]);
+                $data['status'] = APIRiderStatus::RIDER_ASSIGN;
+                $res->setData($data);
                 return $res->getReturnResponse();
             case JOStatus::ASSIGNED:
             case JOStatus::IN_TRANSIT:
@@ -1123,27 +1120,20 @@ class APIController extends Controller
                 $image_url = $url_prefix . '/assets/images/user.gif';
                 if ($rider->getImageFile() != null)
                     $image_url = $url_prefix . '/uploads/' . $rider->getImageFile();
-                $res->setData([
-                    'status' => APIRiderStatus::RIDER_PICK_UP,
-                    'jo_id' => $jo->getID(),
-                    'service_type' => $jo->getServiceType(),
-                    'destination' => [
-                        'long' => $dest->getLongitude(),
-                        'lat' => $dest->getLatitude(),
-                    ],
-                    // TODO: fix this to actual location of rider
-                    'rider' => [
-                        'id' => $rider->getID(),
-                        'name' => $rider->getFullName(),
-                        'plate_num' => $rider->getPlateNumber(),
-                        'contact_num' => $rider->getContactNumber(),
-                        'image_url' => $image_url,
-                        'location' => [
-                            'long' => $coord->getLongitude(),
-                            'lat' => $coord->getLatitude()
-                        ]
+
+                $data['status'] = APIRiderStatus::RIDER_PICK_UP;
+                // TODO: fix this to actual location of rider
+                $data['rider'] = [
+                    'id' => $rider->getID(),
+                    'name' => $rider->getFullName(),
+                    'plate_num' => $rider->getPlateNumber(),
+                    'contact_num' => $rider->getContactNumber(),
+                    'image_url' => $image_url,
+                    'location' => [
+                        'long' => $coord->getLongitude(),
+                        'lat' => $coord->getLatitude()
                     ]
-                ]);
+                ];
                 return $res->getReturnResponse();
         }