Merge pull request #2347 from Safelite/rlsmerge/2025.03.13-to-develop

Rlsmerge/2025.03.13 to develop

src/experiment-components/donation-block.vue

@@ -61,11 +61,11 @@
                 <div class="col-12">
                     <div
                         v-if="showDonationSuccess"
-                        class="d-flex justify-content-center align-items-center btn-success w-100 mb-2"
+                        class="d-flex justify-content-center align-items-center btn-success w-100"
                         v-html="DonationThanksAlertWidget"></div>
                 </div>
             </div>
-            <div class="row px-4">
+            <div class="row px-4 mt-2">
                 <div class="col">
                     <alert
                         v-if="showDonationError"
@@ -142,7 +142,7 @@ export default {
 
 <style lang="scss" scoped>
 .donation-block {
-    padding: 1rem 0;
+    padding: 1rem 0 0 0;
     background-color: $gray-100;
     border-radius: 0;
 

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;

src/layouts/confirmation/confirmation.vue

@@ -62,7 +62,8 @@
                                 :shouldHideRecalibration="shouldHideRecalibration"
                                 :isExpandedOnLoad="false"
                                 :isItac="isItac"
-                                :isNoComp="isNoComp" />
+                                :isNoComp="isNoComp"
+                                :isMSRFeeApplicable="isMSRFeeApplicable" />
 
                             <div class="mt-3" v-if="DisplayFosterLove">
                                 <donationBlock
@@ -423,6 +424,9 @@ export default {
         damageInfo() {
             return this.submittedOrder?.damage;
         },
+        isMSRFeeApplicable() {
+            return this.submittedOrder?.isMSRFeeApplicable;
+        },
         isInsurance() {
             return this.submittedOrder?.payment?.isInsurance;
         },

src/layouts/payment-method/payment-method.vue

@@ -36,7 +36,8 @@
                         :shouldHideRecalibration="shouldHideRecalibration"
                         :isItac="isItac"
                         :isNoComp="isNoComp"
-                        :isExpandedOnLoad="false" />
+                        :isExpandedOnLoad="false"
+                        :isMSRFeeApplicable="isMSRFeeApplicable" />
 
                     <hr />
 
@@ -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

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",