From 13d7707cef258d225ec781bc16afdf31e747b8ad Mon Sep 17 00:00:00 2001 From: weichien Date: Fri, 2 Apr 2021 00:20:02 +0800 Subject: [PATCH 1/6] fix: [FE] reset recipient detail form after create new recipient --- .../vue/components/banks/forms/BankAccountFormComponent.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue index a9327b71..428babac 100644 --- a/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue +++ b/resources/assets/vue/components/banks/forms/BankAccountFormComponent.vue @@ -159,6 +159,7 @@ successHandler(response){ this.type !== 2 ? this.closeModal() : this.$emit('createdBank', response.payload.data); this.formHandler(); + this.resetForm(); }, errorHandler(error){ this.formHandler(error.message); From 6f9b7c280a95d758026d5e4d9782f3cb1ba8d47a Mon Sep 17 00:00:00 2001 From: weichien Date: Fri, 2 Apr 2021 00:25:30 +0800 Subject: [PATCH 2/6] fix: [FE] Avoid duplicate when select recipient bank info. --- .../bookings/elements/BookingConfirmationComponent.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue index 04eac563..92966dc5 100644 --- a/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue +++ b/resources/assets/vue/components/bookings/elements/BookingConfirmationComponent.vue @@ -104,7 +104,7 @@
-
+
@@ -257,11 +257,14 @@ }, methods: { updateBank(bank){ - this.parameters.bankAccount = bank; - this.parameters.bankAccount.status = false; + this.selectBank(bank); this.recipientBanks.push(bank); this.createBank = false; }, + selectBank(bank){ + this.parameters.bankAccount = bank; + this.parameters.bankAccount.status = false; + }, }, mixins: [FormHandler] } From 6801b6a77db2f726fa7a5eaa230f3cb0fbe27387 Mon Sep 17 00:00:00 2001 From: weichien Date: Fri, 2 Apr 2021 01:03:03 +0800 Subject: [PATCH 3/6] fix: [FE] avoid trigger parent's updateCalculation method when amount is below RMB100 --- .../vue/components/bookings/forms/CurrencyConverterComponent.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue index 485f73ed..9f86d686 100644 --- a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue +++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue @@ -275,7 +275,6 @@ this.isloading = false; }, errorHandler(error){ - this.$emit('newCalculation', {}); this.error = error.message; this.loading = false; } From 460afc1b3779daad1aa9c80ef504aff15e44a005 Mon Sep 17 00:00:00 2001 From: weichien Date: Fri, 2 Apr 2021 10:16:29 +0800 Subject: [PATCH 4/6] fix: [FE] emit updateCalculation method with total -1 when amount less than RM100. in-order to hide "Transfer Now" button --- .../components/bookings/forms/CurrencyConverterComponent.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue index 9f86d686..8798dd89 100644 --- a/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue +++ b/resources/assets/vue/components/bookings/forms/CurrencyConverterComponent.vue @@ -275,6 +275,9 @@ this.isloading = false; }, errorHandler(error){ + this.$emit('newCalculation', { + calculation: -1 + }); this.error = error.message; this.loading = false; } From ed09e8bb21d48e56879061c285e83d6c5acbb654 Mon Sep 17 00:00:00 2001 From: weichien Date: Fri, 2 Apr 2021 11:14:24 +0800 Subject: [PATCH 5/6] fix: [FE] clear the section prop and default_address vue warning. --- .../vue/components/address/elements/AddressListComponent.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/assets/vue/components/address/elements/AddressListComponent.vue b/resources/assets/vue/components/address/elements/AddressListComponent.vue index b4882ab5..792a84b7 100644 --- a/resources/assets/vue/components/address/elements/AddressListComponent.vue +++ b/resources/assets/vue/components/address/elements/AddressListComponent.vue @@ -1,7 +1,7 @@