From 7a8ff5bf429e8656709069348e0cf7cf643c0c0d Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Sat, 20 Jul 2019 12:45:28 +0800 Subject: [PATCH] Add longitude and latitude to partner information in mobile API calls #231 --- src/Controller/APIController.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 953a0edd..7db96743 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -2014,6 +2014,8 @@ class APIController extends Controller 'contact_nums' => $partner->getContactNumbers(), 'time_open' => $partner->getTimeOpen()->format("g:i A"), 'time_close' => $partner->getTimeClose()->format("g:i A"), + 'longitude' => $partner->getCoordinates()->getLongitude(), + 'latitude' => $partner->getCoordinates()->getLatitude(), 'reviews' => $rev, ]; @@ -2051,10 +2053,10 @@ class APIController extends Controller $result = $query->getResult(); $data = []; + $partners = []; foreach($result as $row) { - $partner = []; - $partner[] = [ + $partners[] = [ 'id' => $row[0]->getID(), 'name' => $row[0]->getName(), 'branch' => $row[0]->getBranch(), @@ -2062,14 +2064,14 @@ class APIController extends Controller 'contact_nums' => $row[0]->getContactNumbers(), 'time_open' => $row[0]->getTimeOpen()->format("g:i A"), 'time_close' => $row[0]->getTimeClose()->format("g:i A"), - ]; - - $data[] = [ - 'partner' => $partner, + 'longitude' => $row[0]->getCoordinates()->getLongitude(), + 'latitude' => $row[0]->getCoordinates()->getLatitude(), 'db_distance' => $row['dist'], - ]; + ]; } + $data['partners'] = $partners; + $res->setData($data); return $res->getReturnResponse();