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

Merge branch 'revert-4d06e17f' into 'master'

Browse source 
Revert "Merge branch '247-warranty-data-fixes-for-android' into 'master'"

See merge request jankstudio/resq!292
This commit is contained in:
Kendrick Chan 2019-08-07 17:21:02 +00:00
commit 01a1fe4a9a
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Controller/APIController.php
View file

@ -701,11 +701,11 @@ class APIController extends Controller
$cvs = $cust->getVehicles();
foreach ($cvs as $cv)
{
$battery_id = '';
$battery_id = null;
if ($cv->getCurrentBattery() != null)
$battery_id = $cv->getCurrentBattery()->getID();
$wty_ex = '';
$wty_ex = null;
if ($cv->getWarrantyExpiration() != null)
$wty_ex = $cv->getWarrantyExpiration()->format('Y-m-d');
@ -721,7 +721,7 @@ class APIController extends Controller
'color' => $cv->getColor(),
'condition' => $cv->getStatusCondition(),
'fuel_type' => $cv->getFuelType(),
'wty_code' => $cv->getWarrantyCode() ?? $cv->getWarrantyCode() : '',
'wty_code' => $cv->getWarrantyCode(),
'wty_expire' => $wty_ex,
'curr_batt_id' => $battery_id,
'is_motolite' => $cv->hasMotoliteBattery() ? 1 : 0,
@ -1950,15 +1950,12 @@ class APIController extends Controller
if (!(is_null($warranty->getBatteryModel()))) {
$batt_model = $warranty->getBatteryModel()->getName();
}
if (!(is_null($warranty->getBatterySize()))) {
$batt_size = $warranty->getBatterySize()->getName();
}
if (!(is_null($warranty->getSAPBattery()))) {
$sap_batt = $warranty->getSAPBattery()->getID();
}
if (!(is_null($warranty->getDateClaim()))) {
$claim_date = $warranty->getDateClaim()->format("d M Y");
}
@ -1968,7 +1965,7 @@ class APIController extends Controller
$warr[] = [
'id' => $warranty->getID(),
'serial' => $warranty->getSerial() ?? $warranty->getSerial() : '',
'serial' => $warranty->getSerial(),
'warranty_class' => $warranty->getWarrantyClass(),
'plate_number' => $warranty->getPlateNumber(),
'first_name' => $warranty->getFirstName(),
@ -1982,7 +1979,7 @@ class APIController extends Controller
'date_purchase' => $warranty->getDatePurchase()->format("d M Y"),
'date_expire' => $expiry_date,
'date_claim' => $claim_date,
'claim_from' => $warranty->getClaimedFrom() ?? $warranty->getClaimedFrom() : '',
'claim_from' => $warranty->getClaimedFrom(),
'is_activated' => $warranty->isActivated() ? 1 : 0,
];