From 41c039e332ea10daaae8d64c3193ae36275cec99 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 5 Mar 2025 14:14:51 +0530 Subject: [PATCH 1/7] CASH-323 removing extra spaces, cart promo link is taking extra space even not in use at confirmation page. --- src/experiment-components/donation-block.vue | 6 +++--- src/fmg-components/cart/cart.vue | 6 ++++++ src/layouts/confirmation/confirmation.vue | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) 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..5f19728ec 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -128,6 +128,7 @@ {{ insuranceCompanyName }}
+ :isNoComp="isNoComp" + :showPromoModalQuestion="ShowPromoModalQuestion" />
Date: Wed, 5 Mar 2025 14:20:47 +0530 Subject: [PATCH 2/7] CASH-323 formating --- src/fmg-components/cart/cart.vue | 10 +++++----- src/layouts/confirmation/confirmation.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 5f19728ec..c7699df74 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -201,11 +201,11 @@ export default { isItac: Boolean, isNoComp: Boolean, isExpandedOnLoad: Boolean, - showPromoModalQuestion:{ - default:true, - type:Boolean, - required:false - } + showPromoModalQuestion: { + default: true, + type: Boolean, + required: false, + }, }, data() { return { diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 27cbdfa8c..6e7391064 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -249,7 +249,7 @@ export default { "true" ); }, - ShowPromoModalQuestion(){ + ShowPromoModalQuestion() { return false; }, isRecalibrationOnOrder() { From c3cd2e346bb38baf565fcd5247bcfbafcb5cd55f Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 5 Mar 2025 14:47:21 +0530 Subject: [PATCH 3/7] CASH-323 revert cart showPromoModalQuestion changes --- src/fmg-components/cart/cart.vue | 6 ------ src/layouts/confirmation/confirmation.vue | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c7699df74..c3db8c830 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -128,7 +128,6 @@ {{ insuranceCompanyName }}
+ :isNoComp="isNoComp" />
Date: Wed, 5 Mar 2025 15:07:12 -0500 Subject: [PATCH 4/7] CASH-70: Pass isMSRFeeApplicable to cart component --- src/fmg-components/cart/cart.vue | 6 ++---- src/layouts/confirmation/confirmation.vue | 6 +++++- src/layouts/payment-method/payment-method.vue | 6 +++++- 3 files changed, 12 insertions(+), 6 deletions(-) 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 From 47ad0c9bf8052052189838ba5e389f5b40841b07 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 6 Mar 2025 13:46:45 -0500 Subject: [PATCH 5/7] CASH-309 | Fix whitespace in safeliteHOP add reference to iframeresizer to payment-pia-return --- src/layouts/payment-pia-return/payment-pia-return.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index a7979f8aa..7e76138a0 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", From 6d2628823393e8ea73c394053a7ce1d73635dee6 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 6 Mar 2025 13:53:26 -0500 Subject: [PATCH 6/7] Formatting --- src/layouts/payment-pia-return/payment-pia-return.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index 7e76138a0..6bb99f3c8 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -18,7 +18,7 @@ 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' +import iframeResizer from "@iframe-resizer/child"; export default { name: "payment-pia-return", From 8454ec43068a2790d5f4498b5c6eb8142c0b027d Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Mon, 10 Mar 2025 09:23:55 -0400 Subject: [PATCH 7/7] CASH-309 | Include needed packages --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index a1f9ca9d3..4eabbf0c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "Safelite", "version": "0.1.0", "dependencies": { + "@iframe-resizer/child": "^5.3.3", "axios": "^0.23.0", "bootstrap": "^5.3.3", "core-js": "^3.38.1", @@ -2162,6 +2163,16 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/@iframe-resizer/child": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@iframe-resizer/child/-/child-5.3.3.tgz", + "integrity": "sha512-A+avzzQ6R5AaK0RQ/v0sxrN/S7zeS0U7TE/Jcc2Wln0gpVHpkEMHLOYVBAS2ho8ZA6yhbyZeNoDCh3RMtCp14w==", + "license": "GPL-3.0", + "funding": { + "type": "individual", + "url": "https://iframe-resizer.com/pricing/" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/package.json b/package.json index 2cf0e2d98..65de4ba18 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@iframe-resizer/child": "^5.3.3", "axios": "^0.23.0", "bootstrap": "^5.3.3", "core-js": "^3.38.1",