rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Merge branch '107-changes-for-ios-api' into 'master'

Browse source 
Resolve "Changes for ios api"

Closes #107

See merge request jankstudio/resq!93
This commit is contained in:
Kendrick Chan 2018-05-01 13:02:30 +00:00
commit 55bc1b8a01
1 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Controller/APIController.php
View file

@ -549,6 +549,15 @@ class APIController extends Controller
return $res->getReturnResponse(); return $res->getReturnResponse();
} }
protected function getBatteryImageURL($req, $batt)
{
// TODO: workaround for now, we get static image of battery based on model name
$filename = trim(strtolower($batt->getModel()->getName())) . '_mobile.jpg';
$file_path = $req->getSchemeAndHttpHost() . $this->generateUrl('static_battery_image') . '/' . $filename;
return $file_path;
}
public function listVehicles(Request $req) public function listVehicles(Request $req)
{ {
// check required parameters and api key // check required parameters and api key
@ -642,9 +651,6 @@ class APIController extends Controller
$batts = $vehicle->getBatteries(); $batts = $vehicle->getBatteries();
foreach ($batts as $batt) foreach ($batts as $batt)
{ {
// TODO: workaround for now, we get static image of battery based on model name
$filename = trim(strtolower($batt->getModel()->getName())) . '_mobile.jpg';
$file_path = $req->getSchemeAndHttpHost() . $this->generateUrl('static_battery_image') . '/' . $filename;
$batt_list[] = [ $batt_list[] = [
'id' => $batt->getID(), 'id' => $batt->getID(),
'mfg_id' => $batt->getManufacturer()->getID(), 'mfg_id' => $batt->getManufacturer()->getID(),
@ -656,7 +662,7 @@ class APIController extends Controller
'price' => $batt->getSellingPrice(), 'price' => $batt->getSellingPrice(),
'wty_private' => $batt->getWarrantyPrivate(), 'wty_private' => $batt->getWarrantyPrivate(),
'wty_commercial' => $batt->getWarrantyCommercial(), 'wty_commercial' => $batt->getWarrantyCommercial(),
'image_url' => $file_path, 'image_url' => $this->getBatteryImageURL($req, $batt),
]; ];
} }
@ -953,11 +959,19 @@ class APIController extends Controller
$items_data = []; $items_data = [];
foreach ($items as $item) foreach ($items as $item)
{ {
$items_data[] = [ $my_data = [
'title' => $item->getTitle(), 'title' => $item->getTitle(),
'qty' => $item->getQuantity() + 0, 'qty' => $item->getQuantity() + 0,
'price' => $item->getPrice() + 0.0, 'price' => $item->getPrice() + 0.0,
]; ];
$item_batt = $item->getBattery();
if ($item_batt != null)
{
$my_data['image_url'] = $this->getBatteryImageURL($req, $batt);
}
$items_data[] = $my_data;
} }
$data['items'] = $items_data; $data['items'] = $items_data;