From 2f8eab22368312c1a4f71f5967cc5ff47557909b Mon Sep 17 00:00:00 2001
From: Korina Cordero <cordero.korina@gmail.com>
Date: Fri, 16 Aug 2019 01:53:24 +0000
Subject: [PATCH] Add checking for null on date_expire for warranty. #250

---
 src/Controller/CAPI/WarrantyController.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Controller/CAPI/WarrantyController.php b/src/Controller/CAPI/WarrantyController.php
index be80b25c..e5e367aa 100644
--- a/src/Controller/CAPI/WarrantyController.php
+++ b/src/Controller/CAPI/WarrantyController.php
@@ -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);