diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue index 1daeedc41..ad14052a3 100644 --- a/src/experiment-components/donation-block.vue +++ b/src/experiment-components/donation-block.vue @@ -61,11 +61,11 @@
-
+
.donation-block { - padding: 1rem 0; + padding: 1rem 0 0 0; background-color: $gray-100; border-radius: 0; diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c3db8c830..b53dd30d7 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -200,6 +200,7 @@ export default { isItac: Boolean, isNoComp: Boolean, isExpandedOnLoad: Boolean, + isMSRFeeApplicable: Boolean, }, data() { return { @@ -846,9 +847,6 @@ export default { isCashItacNoComp() { return !this.isInsurance || this.isITAC || this.isNoComp; }, - getIsMSRFeeApplicableFromStore() { - return this.$store.getters.order.isMSRFeeApplicable; - }, mobileFeeCartItemName() { return this.getCmsContent("MobileServiceTextWidget", "Text"); }, @@ -865,7 +863,7 @@ export default { (mobileFeeLineItem?.sellingPrice ?? 0); if (mobileTotal > 0) { - if (this.getIsMSRFeeApplicableFromStore) { + if (this.isMSRFeeApplicable) { showMobileFeeCartItem = this.isCashItacNoComp; } else { showMobileFeeCartItem = true; diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index ac6ce2ed5..8c4d6cf1a 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -62,7 +62,8 @@ :shouldHideRecalibration="shouldHideRecalibration" :isExpandedOnLoad="false" :isItac="isItac" - :isNoComp="isNoComp" /> + :isNoComp="isNoComp" + :isMSRFeeApplicable="isMSRFeeApplicable" />
+ :isExpandedOnLoad="false" + :isMSRFeeApplicable="isMSRFeeApplicable" />
@@ -683,6 +684,9 @@ export default { damageInfo() { return this.$store.getters.damage; }, + isMSRFeeApplicable() { + return this.$store.getters.order.isMSRFeeApplicable; + }, isInsurance() { return this.hasSubmittedOrder() ? this.getSubmittedOrder()?.payment.isInsurance diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index a7979f8aa..6bb99f3c8 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -15,6 +15,10 @@ import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import { Form } from "vee-validate"; import { paymentMethods } from "@/constants/payment-method-constants"; import { routerParams } from "@/router/router-constants/router-params"; +// iframeResizer IS loaded into the page and necessary for the package to +// to auto scale the iFrame this page is loaded in +// Do not remove despite showing as "unused" CASH-309 +import iframeResizer from "@iframe-resizer/child"; export default { name: "payment-pia-return",