From 19ef720bc5db03a8b3489f4cf8ad9a8677cc9a50 Mon Sep 17 00:00:00 2001
From: Dillon Ngo <dillonngoweijoon@gmail.com>
Date: Tue, 2 Apr 2024 20:25:57 +0800
Subject: [PATCH] Small fix on UX when applying voucher

---
 .../bookings/forms/BookingPaymentQuotationComponent.vue        | 3 ++-
 .../companies/sections/CustomerRewardsSectionComponent.vue     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index 10246745..8ba9833e 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -260,7 +260,8 @@
                                     <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>
+                                        <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherValidated && voucherCode.trim()">Voucher applied</span>
+                                        <span class="text-danger" v-else-if="voucherCodeFailedReason === '' && voucherValidated ">No voucher applied</span>
                                     </div>
                                     <div class="row m-l-0 m-r-0" v-show="showApplyVoucher">
                                         <div class="col">
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
index d781d66e..b1f2a5f9 100644
--- a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
@@ -69,7 +69,7 @@
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col" v-if="this.$store.getters.getUserId">
-                                                            <!-- <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details')" :options="{'has_active_reward': true, order_by:{ column:'order', DESC:false}}">
+                                                            <!-- <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details')" :options="{'is_active': true, order_by:{ column:'order', DESC:false}}">
                                                                 <template slot="list" slot-scope="{data}">
                                                                     <single-reward-details-item-component :data="data"></single-reward-details-item-component>
                                                                 </template>