cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into export-currency-vendor-order-module

Browse Source
This commit is contained in:
edmondlang
2024-05-18 11:25:57 +08:00
parent e88cdf75f6 4ecebdd977
commit e6eee4aa93
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
+1 -1
View File
@@ -233,7 +233,7 @@
<div class="font-heading all-caps fs-10 m-b-5">Our Payment Proof</div>
<div class="row" v-if="item.transaction_bill">
<div class="col">
<div class="row" v-if="item.transaction_bill.status !== 2 && item.transaction_bill.status !== 3">
<div class="row hide" v-if="item.transaction_bill.status !== 2 && item.transaction_bill.status !== 3">
<div class="col">
<p class="fs-12 muted">Payment proof will be uploaded {{ (parseFloat(item.interval.duration) + 1) <= 0 ? 'today' : (parseFloat(item.interval.duration) + 1) === 2 ? 'tomorrow' : 'in '+(parseFloat(item.interval.duration) + 1)+' days'}} at 4:00 PM</p>
</div>
resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue
+2 -2
View File
@@ -6,7 +6,7 @@
<small class="bold fs-10 text-danger">{{error}}</small>
</div>
</div>
<div class="row m-b-15" v-show="calculation.date && !error">
<div class="row m-b-15 hide" v-show="calculation.date && !error">
<div class="col padding-15 bg-master-lightest text-center m-l-15 m-r-15">
<div class="fs-14 muted" >The recipient will receive the transfer amount by <br><span class="bold text-success">{{ this.calculation.receive_date }}</span></div>
</div>
@@ -225,7 +225,7 @@
if (!this.currentSegmentNames.includes('enable enter MYR rate')) {
return true;
}
return false;
},
},