From 7ea7e238ccf9fda85d7d6b720a72100edb782003 Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Tue, 6 Feb 2018 16:15:09 +0800
Subject: [PATCH] Add hub branch in outlest list table

---
 src/Controller/OutletController.php | 5 +++--
 src/Ramcar/Location.php             | 7 ++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/Controller/OutletController.php b/src/Controller/OutletController.php
index 506b5333..7b1c4f8d 100644
--- a/src/Controller/OutletController.php
+++ b/src/Controller/OutletController.php
@@ -67,7 +67,8 @@ class OutletController extends BaseController
 
         // build query
         $query = $qb->select('q')
-            ->addSelect('hub.name as hub_name');
+            ->addSelect('hub.name as hub_name')
+            ->addSelect('hub.branch as hub_branch');
 
         $this->setQueryFilters($datatable, $query);
 
@@ -101,7 +102,7 @@ class OutletController extends BaseController
             $row['contact_nums'] = $orow[0]->getContactNumbers();
             $row['time_open'] = $orow[0]->getTimeOpen()->format('g:i A');
             $row['time_close'] = $orow[0]->getTimeClose()->format('g:i A');
-            $row['hub_name'] = $orow['hub_name'];
+            $row['hub_name'] = $orow['hub_name'] . ' ' . $orow['hub_branch'];
 
             // add row metadata
             $row['meta'] = [
diff --git a/src/Ramcar/Location.php b/src/Ramcar/Location.php
index 4c74a051..eae3e3a4 100644
--- a/src/Ramcar/Location.php
+++ b/src/Ramcar/Location.php
@@ -93,6 +93,11 @@ trait Location
         return $this->branch;
     }
 
+    public function getFullName()
+    {
+        return $this->name . ' ' . $this->branch;
+    }
+
     public function setAddress($address)
     {
         $this->address = $address;
@@ -147,4 +152,4 @@ trait Location
     {
         return $this->time_close;
     }
-}
\ No newline at end of file
+}