From ce5a9cb79d395fd07f33cd5e7e2d98a983c59dd0 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Thu, 30 Apr 2020 08:08:33 +0000 Subject: [PATCH] Fix when name is null when returning customer vehicle info. #393 --- src/Controller/APIController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php index 719eec9b..10a5d26e 100644 --- a/src/Controller/APIController.php +++ b/src/Controller/APIController.php @@ -718,21 +718,25 @@ class APIController extends Controller implements LoggedController $cvs = $cust->getVehicles(); foreach ($cvs as $cv) { - $battery_id = null; + $battery_id = ''; if ($cv->getCurrentBattery() != null) $battery_id = $cv->getCurrentBattery()->getID(); - $wty_ex = null; + $wty_ex = ''; if ($cv->getWarrantyExpiration() != null) $wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d'); $warranty = $this->findWarranty($cv->getPlateNumber()); + $cv_name = ''; + if ($cv->getName() != null) + $cv_name = $cv->getName(); + $cv_list[] = [ 'cv_id' => $cv->getID(), 'mfg_id' => $cv->getVehicle()->getManufacturer()->getID(), 'make_id' => $cv->getVehicle()->getID(), - 'name' => $cv->getName(), + 'name' => $cv_name, 'plate_num' => $cv->getPlateNumber(), 'model_year' => $cv->getModelYear(), 'color' => $cv->getColor(),