From 1ce6b895cc4db3466bae3602b32fd9c8fc75428f Mon Sep 17 00:00:00 2001 From: Omair Saleh Date: Fri, 17 May 2024 13:42:54 +0800 Subject: [PATCH 1/2] hide the estimate for when the recipient will receive the payment --- .../components/bookings/elements/PaymentHistoryComponent.vue | 2 +- .../components/bookings/forms/CurrencyConverterComponent.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue index 7679b807..33cc6db5 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue @@ -233,7 +233,7 @@
Our Payment Proof
-
+

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

diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue index c8c581ee..59291ed1 100644 --- a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue +++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue @@ -6,7 +6,7 @@ {{error}}
-
+
The recipient will receive the transfer amount by
{{ this.calculation.receive_date }}
@@ -225,7 +225,7 @@ if (!this.currentSegmentNames.includes('enable enter MYR rate')) { return true; } - + return false; }, }, From e88cdf75f69e049aaa21d74ef589cdeddbb65196 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 18 May 2024 11:25:40 +0800 Subject: [PATCH 2/2] code review - correct indentation & add tooltip --- resources/assets/vue/app.js | 7 +++ .../bookings/elements/PaymentComponent.vue | 2 +- .../elements/TransactionGroupComponent.vue | 51 +++++++++---------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/resources/assets/vue/app.js b/resources/assets/vue/app.js index abb7a17e..39e22279 100644 --- a/resources/assets/vue/app.js +++ b/resources/assets/vue/app.js @@ -34,6 +34,13 @@ Vue.use(VueTheMask); Vue.use(filters); Vue.directive('closable', closable); +Vue.directive('tooltip', function(el, binding){ + $(el).tooltip({ + title: binding.value, + placement: binding.arg, + trigger: 'hover' + }) +}) Vue.mixin({ methods: { route: route diff --git a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue index 1db46493..1f9a606f 100644 --- a/resources/assets/vue/components/bookings/elements/PaymentComponent.vue +++ b/resources/assets/vue/components/bookings/elements/PaymentComponent.vue @@ -13,7 +13,7 @@
-
+
diff --git a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue index 1ff74398..24794be1 100644 --- a/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue +++ b/resources/assets/vue/components/bookings/elements/TransactionGroupComponent.vue @@ -19,37 +19,32 @@
-
Currency Rate