From 1ac2ac3102c3f2b5e3aff5907d4136fd362e4fb3 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 29 Nov 2023 23:39:15 +0800
Subject: [PATCH 1/8] Voucherify UI update for kexin to take a look

---
 .../forms/BookingPaymentQuotationComponent.vue       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 6f18170c..50c6c701 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -244,17 +244,17 @@
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
-                                                    <!-- <div class="col-auto p-r-10 p-l-10">
+                                                    <div class="col-auto p-r-10 p-l-10">
                                                         <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
                                                             <i class="fa fa-list"></i>
                                                         </button>
-                                                    </div> -->
+                                                    </div>
                                                 </div>
                                             </validation-wrapper-component>
                                         </div>
-                                        <!-- <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
+                                        <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
-                                        </modal-component> -->
+                                        </modal-component>
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
@@ -262,11 +262,11 @@
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
-                                    <!-- <div class="row m-l-0 m-r-0">
+                                    <div class="row m-l-0 m-r-0">
                                         <div class="col">
                                             <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
                                         </div>
-                                    </div> -->
+                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 52c2dade88e485677bf015b4a3d0cc3d60ea5937 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:13:52 +0800
Subject: [PATCH 2/8] Update UI based on kexin feedback

---
 .../elements/AvailableVouchersComponent.vue   | 19 +++++++++++--------
 .../BookingPaymentQuotationComponent.vue      | 14 +++++++-------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 45722aaf..7c3d5494 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -3,18 +3,21 @@
         <div class="col">
             <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
-                    <div class="row parentContainer">
-                        <div class="col">
-                            <p>{{ item.voucher.code }}</p>
+                    <div class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+                    <div class="row">
+                        <!-- <div class="col">
                             <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
                             <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
-                        </div>
-                        <div class="col" v-if="item.voucher.end_date">
+                        </div> -->
+                        <span>{{ item.voucher.code }}</span>
+                    </div>
+                    <div class="row">
+                        <span v-if="item.voucher.end_date">
                             Valid till {{ item.voucher.end_date }}
-                        </div>
-                        <div class="col" v-else>
+                        </span>
+                        <span v-else>
                             No expiry date
-                        </div>
+                        </span>
                     </div>
                 </div>
             </div>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 50c6c701..50a421b5 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -244,11 +244,11 @@
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
-                                                    <div class="col-auto p-r-10 p-l-10">
+                                                    <!-- <div class="col-auto p-r-10 p-l-10">
                                                         <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
                                                             <i class="fa fa-list"></i>
                                                         </button>
-                                                    </div>
+                                                    </div> -->
                                                 </div>
                                             </validation-wrapper-component>
                                         </div>
@@ -256,17 +256,17 @@
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
                                         </modal-component>
                                     </div>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
-                                    <div class="row m-l-0 m-r-0">
-                                        <div class="col">
-                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
-                                        </div>
-                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 19d08242d52715ade37228e3fc6dc3fa88af32f8 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:17:09 +0800
Subject: [PATCH 3/8] Update UI based on kexin feedback

---
 .../forms/BookingPaymentQuotationComponent.vue         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 50a421b5..e0e2ae8d 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -256,17 +256,17 @@
                                             <list-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers-component>
                                         </modal-component>
                                     </div>
-                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
-                                        <div class="col">
-                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
-                                        </div>
-                                    </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>
                                     </div>
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
+                                        <div class="col">
+                                            <available-vouchers-component :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></available-vouchers-component>
+                                        </div>
+                                    </div>
                                     <div class="row m-t-5">
                                         <div class="col">
                                             <div class="row p-l-15 p-r-15">

From 96c00ea66b68aace86afe6272cc7ee8594739028 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:19:31 +0800
Subject: [PATCH 4/8] Update UI based on kexin feedback

---
 .../bookings/forms/BookingPaymentQuotationComponent.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index e0e2ae8d..73f7a006 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -257,7 +257,7 @@
                                         </modal-component>
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
-                                    <div class="row m-l-0 m-r-0" style="height: 20px">
+                                    <div class="row m-l-0 m-r-0" v-show="showApplyVoucher" style="height: 20px">
                                         <i class="fa fa-spinner fa-spin m-b-5" v-if="voucherIsChecking"></i>
                                         <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
                                         <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated">Voucher applied</span>

From 150f6a69d6dc77dcf032723aa49fec3529df3759 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:34:36 +0800
Subject: [PATCH 5/8] Update UI based on kexin feedback

---
 .../bookings/elements/AvailableVouchersComponent.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 7c3d5494..4ac885ff 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -1,9 +1,9 @@
 <template>
      <div class="row">
         <div class="col">
-            <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
+            <div v-if="vouchers" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+            <div class="row text-left no-margin bg-white p-b-10" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
-                    <div class="row fs-10 p-b-5">List of Vouchers, click to select</div>
                     <div class="row">
                         <!-- <div class="col">
                             <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>

From a6cf76ea79cae9ee7d70dc1806f2df92d087a562 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Sun, 3 Dec 2023 23:57:00 +0800
Subject: [PATCH 6/8] Update UI based on kexin feedback

---
 .../components/bookings/elements/AvailableVouchersComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
index 4ac885ff..89a56b0f 100644
--- a/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/AvailableVouchersComponent.vue
@@ -1,7 +1,7 @@
 <template>
      <div class="row">
         <div class="col">
-            <div v-if="vouchers" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
+            <div v-if="vouchers && vouchers.length > 0" class="row fs-10 p-b-5">List of Vouchers, click to select</div>
             <div class="row text-left no-margin bg-white p-b-10" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
                 <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
                     <div class="row">

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 7/8] 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);

From 1212ec37b8997002e1ac3c65aac0f5341eecfdf6 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Wed, 6 Dec 2023 13:37:45 +0800
Subject: [PATCH 8/8] Fix a decimal problem reported by kexin

---
 .../Vouchers/ControllersLogic/ValidateVoucherLogic.php    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
index 4b820eb1..30e7fe12 100644
--- a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
+++ b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
@@ -44,10 +44,16 @@ class ValidateVoucherLogic extends AbstractControllerLogic
     {
         $booking = Booking::find($request->input('itemId'));
         $employee = $booking->company->employees()->first();
+        $amount = $this->floatvalue($request->input('amount'));
 
-        $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($booking->company_id, $request->input('voucherCode'), $request->input('amount'), $employee);
+        $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($booking->company_id, $request->input('voucherCode'), $amount, $employee);
         $result = $this->validatesVoucherifyVoucher->execute($validateVoucherifyVoucherObject);
         return $this->response(['data' => $result]);
     }
 
+    private function floatvalue($val){
+        $val = str_replace(",",".",$val);
+        $val = preg_replace('/\.(?=.*\.)/', '', $val);
+        return floatval($val);
+    }
 }