From b9750982a4303818f4dde35838ccbdd49b7eee65 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:25:58 -0400 Subject: [PATCH 1/2] CSR-1390 use payment method constants --- .../payment-pia-return/payment-pia-return.vue | 12 +++++++----- src/store/index.js | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index e3e2a84fc..aa9340995 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -13,6 +13,7 @@ import store from "@/store"; import baseMixin from "@/mixins/base-mixin.js"; import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import { Form } from "vee-validate"; +import { paymentMethods } from "@/constants/payment-method-constants"; export default { name: "payment-pia-return", @@ -30,18 +31,19 @@ export default { this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_ERROR, this.$route); } else { switch (store.getters.order.payment.piaType) { - case "cc": - case "ap": + case paymentMethods.CREDIT_CARD: + case paymentMethods.AFTERPAY: await this.processCreditCardResponse(); break; - case "pp": + case paymentMethods.PAYPAL: await this.processPaypalResponse(); break; default: - console.log("Unknown Pia type: " + store.getters.order.payment.piaType); + var msg = "Unknown Pia type: " + store.getters.order.payment.piaType; + console.log(msg); baseMixin.methods.dispatchStoreAction( storeActions.SAVE_PIA_ERROR_CODE, - piaError, + msg, false ); this.$router.navigateWithoutSaving( diff --git a/src/store/index.js b/src/store/index.js index 5d574df17..23fd28b6b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1648,9 +1648,9 @@ export const actions = { isInsurance: order.payment.isInsurance, parentAccountNumber: order.payment.parentAccountNumber, inactivePromos: order.payment.inactivePromos, - isCreditCard: order.payment.piaType == "cc" ? true : false, - isPaypal: order.payment.piaType == "pp" ? true : false, - isAfterPay: order.payment.piaType == "ap" ? true : false, + isCreditCard: order.payment.piaType == paymentMethods.CREDIT_CARD ? true : false, + isPaypal: order.payment.piaType == paymentMethods.PAYPAL ? true : false, + isAfterPay: order.payment.piaType == paymentMethods.AFTERPAY ? true : false, paypalToken: order.payment.paypalToken, ccToken: { subscriptionId: order.payment.ccToken.subscriptionId, From fd72735a8cc8b46d2c72fe99ff65ea4be531b813 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Tue, 24 Oct 2023 08:29:41 -0400 Subject: [PATCH 2/2] CSR-1390 prettier --- src/store/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 23fd28b6b..7f4cb956d 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1648,7 +1648,8 @@ export const actions = { isInsurance: order.payment.isInsurance, parentAccountNumber: order.payment.parentAccountNumber, inactivePromos: order.payment.inactivePromos, - isCreditCard: order.payment.piaType == paymentMethods.CREDIT_CARD ? true : false, + isCreditCard: + order.payment.piaType == paymentMethods.CREDIT_CARD ? true : false, isPaypal: order.payment.piaType == paymentMethods.PAYPAL ? true : false, isAfterPay: order.payment.piaType == paymentMethods.AFTERPAY ? true : false, paypalToken: order.payment.paypalToken,