From 0d2e84da06972e3a6000f32a0f4eca3abf38c90e Mon Sep 17 00:00:00 2001
From: Kendrick Chan <kc@jankstudio.com>
Date: Mon, 11 Jun 2018 15:45:39 +0800
Subject: [PATCH] Fix date cancel null bug for service history api call #138

---
 src/Controller/APIController.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Controller/APIController.php b/src/Controller/APIController.php
index 3bb99658..8ed36c59 100644
--- a/src/Controller/APIController.php
+++ b/src/Controller/APIController.php
@@ -1379,7 +1379,10 @@ class APIController extends Controller
                         $jo_data['date_fulfilled'] = $jo->getDateFulfill()->format('M d, Y');
                     break;
                 case JOStatus::CANCELLED:
-                    $jo_data['date_cancelled'] = $jo->getDateCancel()->format('M d, Y');
+                    $date_cancel = $jo->getDateCancel();
+                    if ($date_cancel == null)
+                        $date_cancel = new DateTime();
+                    $jo_data['date_cancelled'] = $date_cancel->format('M d, Y');
                     break;
             }