Add checking for null on date_expire for warranty. #250
This commit is contained in:
parent
e634f2ee32
commit
2f8eab2236
1 changed files with 11 additions and 1 deletions
|
|
@ -60,7 +60,6 @@ class WarrantyController extends APIController
|
|||
'status' => (string) $warr->getStatus(),
|
||||
'date_create' => (string) $warr->getDateCreate()->format('YmdHis'),
|
||||
'date_purchase' => (string) $warr->getDatePurchase()->format('Ymd'),
|
||||
'date_expire' => (string) $warr->getDateExpire()->format('Ymd'),
|
||||
'flag_activated' => (boolean) $warr->isActivated(),
|
||||
];
|
||||
|
||||
|
|
@ -70,6 +69,12 @@ class WarrantyController extends APIController
|
|||
else
|
||||
$data['date_claim'] = (string) $warr->getDateClaim()->format('Ymd');
|
||||
|
||||
$date_expire = $warr->getDateExpire();
|
||||
if ($date_expire == null)
|
||||
$data['date_expire'] = null;
|
||||
else
|
||||
$data['date_expire'] = (string) $warr->getDateExpire()->format('Ymd');
|
||||
|
||||
return $data;
|
||||
}
|
||||
|
||||
|
|
@ -322,6 +327,11 @@ class WarrantyController extends APIController
|
|||
return new APIResponse(false, 'No warranty found with that id.', null, 404);
|
||||
}
|
||||
|
||||
if ($warr->getStatus() == WarrantyStatus::CANCELLED)
|
||||
{
|
||||
return new APIResponse(false, 'Warranty already cancelled.');
|
||||
}
|
||||
|
||||
// set status to cancelled
|
||||
$warr->setStatus(WarrantyStatus::CANCELLED);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue