From 222bc81d4930aa2c1e07d2e6c5927e47c9d23065 Mon Sep 17 00:00:00 2001 From: Matt Caimi Date: Thu, 5 Oct 2023 14:16:33 -0400 Subject: [PATCH 1/3] CSR-1391 paypal target updates --- src/layouts/payment/payment.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index 0258f7f82..3555a91b9 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -32,7 +32,7 @@
@@ -219,11 +219,9 @@ export default { lineItems: "Labor|189.99|1||Repair supplies|7.99|1", sgHeaderline1: this.getHeaderLine1(), sgHeaderline2: this.getHeaderLine2(), + paypalPayment: this.isPaypal(), }; }, - async mounted() { - this.fetchSignatureInfo(); - }, async beforeRouteEnter(to, from, next) { // Call APIs const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); @@ -239,8 +237,9 @@ export default { const resultMap = await settleAllPromises(promiseResultMap); // Call the "next" function to complete the transition to this page. - next((vm) => { + next(async vm => { vm.setCmsContent(resultMap.cmsContent); + vm.fetchSignatureInfo(); }); }, methods: { @@ -299,7 +298,9 @@ export default { }, forwardButtonAction() {}, async fetchSignatureInfo() { - this.$refs.loadingModal.showModal(); + if (this.isPaypal()) { + this.$refs.loadingModal.showModal(); + } const signatureInfo = await this.dispatchStoreAction(storeActions.GET_SIGNATURE); this.authToken = signatureInfo.data.token; this.authSignature = signatureInfo.data.signature; From d6d0540d7f751c037baa397910120ad39a3ce792 Mon Sep 17 00:00:00 2001 From: Matt Caimi Date: Thu, 5 Oct 2023 14:22:49 -0400 Subject: [PATCH 2/3] CSR-1391 afterpay button and pop up --- src/layouts/payment-method/payment-method.vue | 19 +++++++++++++++++++ src/layouts/payment/payment.vue | 12 ++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 2b34185f4..7e8415bdf 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -66,6 +66,15 @@ alt="PayPal" /> +
+ +