From 25998f35cd991e33069526c17768a6de6a39f522 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 19 Nov 2024 14:25:54 -0500 Subject: [PATCH 1/6] CSR-2404 fix package discount box alignment. --- .../service-package-radio/service-package-radio.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index af8c488f9..473c0bf2f 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -315,7 +315,7 @@ export default { font-weight: 600; font-size: 0.875rem; display: flex; - justify-content: space-between; + justify-content: flex-end div.strikethrough-discount-price { text-decoration: line-through; margin-right: 0.5rem; @@ -393,7 +393,7 @@ export default { display: flex; flex-direction: row; margin: auto; - margin-left: -2rem; + margin-left: -1.25rem; padding: 0.5rem 1rem; border-radius: 0.25rem; margin-top: 0.5rem; From ae6b9234e15a0be5913417496d64273180ad8a74 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 19 Nov 2024 14:45:00 -0500 Subject: [PATCH 2/6] CSR-2404 fix code error. --- .../service-package-radio/service-package-radio.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index 473c0bf2f..f2962631f 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -315,7 +315,7 @@ export default { font-weight: 600; font-size: 0.875rem; display: flex; - justify-content: flex-end + justify-content: flex-end; div.strikethrough-discount-price { text-decoration: line-through; margin-right: 0.5rem; From 67b7efc50ede28fbd10cc2345dd92eebdabeac7f Mon Sep 17 00:00:00 2001 From: CarlNation Date: Wed, 20 Nov 2024 07:03:13 -0500 Subject: [PATCH 3/6] CSR-2401 back navigation issue between NextGen and Heritage CSR-2401 back navigation issue between NextGen and Heritage --- src/helpers/heritage-integration/navigation-helper.js | 6 +++++- src/layouts/service-location/service-location.vue | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index a0a61b7f4..5e71bb5b7 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -109,7 +109,7 @@ export async function getImplicitNavigation(toRoute) { Used to navigate to the heritage funnel with the correct query string and url. */ -export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog }) { +export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLog, navType }) { const log = getQuerystringParameter(queryStrings.LOG); if (log === "true") { console.log("------------- Navigate to heritage start -----------------"); @@ -136,6 +136,10 @@ export async function navigateToHeritageFunnel({ shouldSaveSession, pageNameToLo heritageParms["promo"] = promo; } + if (navType) { + heritageParms["navType"] = navType; + } + if ( (process.env.VUE_APP_HERITAGE_FUNNEL.includes("fixmyglasstest") && process.env.VUE_APP_CURRENT_ENVIRONMENT === "Localhost") || diff --git a/src/layouts/service-location/service-location.vue b/src/layouts/service-location/service-location.vue index 93bdb6f27..9a6e649ec 100644 --- a/src/layouts/service-location/service-location.vue +++ b/src/layouts/service-location/service-location.vue @@ -520,7 +520,11 @@ export default { (payment?.insuranceCoverage?.isVerified || store.getters.order.referralNumber.length === 6) ) { - navigateToHeritageFunnel({ shouldSaveSession: false }); + navigateToHeritageFunnel({ + shouldSaveSession: false, + pageNameToLog: "service-location", + navType: "back", + }); } else { this.$router.navigateWithoutSaving( this.navigationScenarios.CLICKED_BACK, From 990f68fa1558895e4dc382c7ca6b0b7d442de6ad Mon Sep 17 00:00:00 2001 From: CarlNation Date: Wed, 20 Nov 2024 14:32:25 -0500 Subject: [PATCH 4/6] CSR-2405 recal text corrections CSR-2405 recal text corrections. the recal text was being driven by the store getter which is only updated on page transition. Changed it to use the page scoped version of insurance selected. --- src/layouts/quote/quote.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 25826714c..5b8695d3e 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -428,7 +428,8 @@ export default { ); }, shouldHideRecalibration() { - return store.getters.shouldHideRecalibration; + if (this.isInsuranceSelected) return false; + return (experimentMixin.methods.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() === "true" && this.isRecalibrationOnOrder); }, showAfterpayBanner() { return ( From b2cbe754411abee9c40b670b9b0743ac79694ada Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 20 Nov 2024 15:38:40 -0500 Subject: [PATCH 5/6] CSR-2404 fix weight and alignment. --- .../service-package-radio/service-package-radio.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index f2962631f..ec2929691 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -312,10 +312,11 @@ export default { &.service-package-discount { color: $green; text-align: end; - font-weight: 600; + font-weight: 400; font-size: 0.875rem; display: flex; justify-content: flex-end; + align-items: center; div.strikethrough-discount-price { text-decoration: line-through; margin-right: 0.5rem; From 61e7e13fcb3b05df572fae75ae46811a13cbeb51 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Wed, 20 Nov 2024 16:31:22 -0500 Subject: [PATCH 6/6] CSR-2404 fix font weight. --- .../service-package-radio/service-package-radio.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue index ec2929691..6a92c69a7 100644 --- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue +++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue @@ -312,7 +312,7 @@ export default { &.service-package-discount { color: $green; text-align: end; - font-weight: 400; + font-weight: 600; font-size: 0.875rem; display: flex; justify-content: flex-end; @@ -320,7 +320,7 @@ export default { div.strikethrough-discount-price { text-decoration: line-through; margin-right: 0.5rem; - font-weight: 600; + font-weight: 400; font-size: 0.75rem; line-height: 20px; color: $gray-550;