cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-28 17:03:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/57-second-voucher-first-milestone' into development

Browse Source
This commit is contained in:
Dillon Ngo
2024-04-02 20:26:11 +08:00
parent d1bcda8029 19ef720bc5
commit 5da8d5b43c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+2 -1
View File
@@ -268,7 +268,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">
resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
+1 -1
View File
@@ -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>