From c7c7ee8c0c909807624145adeaef481799bbeda8 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Mon, 4 Dec 2023 12:58:18 +0800
Subject: [PATCH] Fix a problem on voucher expiration date inaccurate

---
 .../Modules/Vouchers/DataTransferObjects/VoucherObject.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
index f624b3cc..d4fd1e7b 100644
--- a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
@@ -3,6 +3,7 @@
 namespace App\Classes\Modules\Vouchers\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use Carbon\Carbon;
 use DateTime;
 use Illuminate\Support\Facades\Log;
 
@@ -86,7 +87,8 @@ class VoucherObject implements DataTransferObject
     {
         try {
             if(!$this->startDate) return null;
-            $dateTime = new DateTime($this->startDate);
+            // $dateTime = new DateTime($this->startDate);
+            $dateTime = Carbon::parse($this->startDate)->tz('Asia/Kuala_Lumpur');
             return $dateTime;
         } catch (\Exception $e) {
             Log::error($e);
@@ -101,7 +103,7 @@ class VoucherObject implements DataTransferObject
     {
         try {
             if(!$this->endDate) return null;
-            $dateTime = new DateTime($this->endDate);
+            $dateTime = Carbon::parse($this->endDate)->tz('Asia/Kuala_Lumpur');
             return $dateTime;
         } catch (\Exception $e) {
             Log::error($e);