Merge branch 'release/2026.04.09' into feature/CASH-1947

playwright-tests/.env

@@ -10,6 +10,7 @@ SKIP_CONTENT_SITE="false"
 # Experiments Flag
 IS_MOBILEFIRST="false"
 IS_ADYENPAYMENTS="false"
+IS_MULTILOCATIONPOPUP="false"
 
 # Base URLs by environment
 # qa

playwright-tests/.env.dev

@@ -10,6 +10,7 @@ SKIP_CONTENT_SITE="false"
 # Experiments Flag
 IS_MOBILEFIRST="false"
 IS_ADYENPAYMENTS="false"
+IS_MULTILOCATIONPOPUP="false"
 
 # Base URLs by environment
 # qa

playwright-tests/framework/TestData.ts

@@ -18,5 +18,6 @@ export function getDefaultExperimentsData(): IExperiments {
     return {
         isAdyenPayments: !!process.env.IS_ADYENPAYMENTS && process.env.IS_ADYENPAYMENTS !== "" ? process.env.IS_ADYENPAYMENTS === "true" : false,
         isMobileFirst: !!process.env.IS_MOBILEFIRST && process.env.IS_MOBILEFIRST !== "" ? process.env.IS_MOBILEFIRST === "true" : false,
+        isMultiLocationPopup: !!process.env.IS_MULTILOCATIONPOPUP && process.env.IS_MULTILOCATIONPOPUP !== "" ? process.env.IS_MULTILOCATIONPOPUP === "true" : false,
     }
 }

playwright-tests/framework/localTypes/IExperiments.ts

@@ -1,4 +1,5 @@
 export interface IExperiments {
     isMobileFirst: boolean,
-    isAdyenPayments: boolean
+    isAdyenPayments: boolean,
+    isMultiLocationPopup: boolean
 }

playwright-tests/pages/BasePage.ts

@@ -257,8 +257,12 @@ export class BasePage {
                 : "MobileFirstAppointment=MobileFirstAppt_V1=MobileFirstAppt_CONTROL=true";
             
             experimentsURLExtension += experiments?.isAdyenPayments
-                ? ",Adyen%20Payments=Adyen%20Payment%20Test=Adyen%20Payment%20(Test)"
+                ? ",Adyen%20Payments=Adyen%20Payment%20Test=Adyen%20Payment%20(Test)=true"
-                : ",Adyen%20Payments=Adyen%20Payment%20Test=CyberSource%20(Control)";
+                : ",Adyen%20Payments=Adyen%20Payment%20Test=CyberSource%20(Control)=true";
+
+            experimentsURLExtension += experiments?.isMultiLocationPopup
+                ? ",MultiLocationPopup=MultiLocationPopup_V1=MultiLocationPopup_TEST=true"
+                : ",MultiLocationPopup=MultiLocationPopup_V1=MultiLocationPopup_CONTROL=true";
         } else {
             console.log("Url extension without query string");
         }

playwright-tests/pages/HomePage.ts

@@ -20,9 +20,8 @@ export class HomePage extends BasePage {
     readonly paymentOptionDropdown: Locator;
     readonly viewQuoteButton: Locator;
 
-    //Zip Entry
+    //Zip Entry 
-    readonly enterServiceZipTextBox: Locator; 
+    readonly widgetZipEntryField: Locator;
-    readonly zipEntryLetsGetStartedButton: Locator;
     readonly getQuoteAndScheduleButton: Locator;
 
     url = process.env['BASE_URL']!;
@@ -31,7 +30,7 @@ export class HomePage extends BasePage {
         super(page);
 
         this.page = page;
-        this.letsGetStartedButton = this.page.locator('#zipCodeTextboxButton');
+        this.letsGetStartedButton = this.page.getByRole('button', { name: 'Let\'s get started' });
         this.cusmodalPopup = this.page.locator('#Cusmodalpopup');
         this.closePopupButton = this.page.getByRole('button', { name: '×' });
 
@@ -47,8 +46,7 @@ export class HomePage extends BasePage {
         this.viewQuoteButton = this.page.locator('#ctaSubmit');
 
         //Zip Entry
-        this.enterServiceZipTextBox = this.page.locator('#zipCodeTextbox');
+        this.widgetZipEntryField = this.page.getByRole('textbox', { name: 'Enter service ZIP code' });
-        this.zipEntryLetsGetStartedButton = this.page.locator('#zipCodeTextbox');
         this.getQuoteAndScheduleButton = this.page.getByLabel('main').getByRole('link', { name: 'Get quote + schedule' });
     }
 
@@ -63,7 +61,7 @@ export class HomePage extends BasePage {
 
     async letsGetStarted(zip: string, enterFunnelWithZip: boolean) {
         if (enterFunnelWithZip) {
-            await this.zipEntryLetsGetStartedButton.fill(zip);
+            await this.widgetZipEntryField.fill(zip);
             /* await this.letsGetStartedButton.evaluate((element, zip) => {
                 const currentHref = element.getAttribute('href') || '';
                 element.setAttribute('href', `${currentHref}?zipCode=${zip}`);

playwright-tests/pages/PaymentAdyenPage.ts

@@ -0,0 +1,81 @@
+import { type Locator, type Page } from '@playwright/test';
+import { BasePage } from './BasePage';
+import { IPaymentDetails } from 'safelite-playwright-core';
+import { ITestData } from 'framework/TestData';
+import { PaypalPage } from './PaypalPage';
+
+export class PaymentAdyenPage extends BasePage {
+    readonly page: Page;
+    readonly creditOrDebitCardButton: Locator;
+    readonly nameOnCardTextField: Locator;
+    readonly cardNumberTextField: Locator;
+    readonly expiryDateTextField: Locator;
+    readonly cvvTextField: Locator;
+    readonly countryDropDown: Locator;
+    readonly billingAddressTextField: Locator;
+    readonly cityTextField: Locator;
+    readonly stateDropDown: Locator;
+    readonly billingZipTextField: Locator;
+    readonly submitPaymentButton: Locator;
+    readonly payPalButton: Locator;
+    readonly navigateToPaypalButton: Locator;
+    readonly afterPayButton: Locator;
+    readonly navigateToAfterPayButton: Locator;
+
+    constructor(page: Page) {
+        super(page);
+        this.page = page;
+        this.creditOrDebitCardButton = page.locator('.adyen-checkout__payment-method--credit button');
+        this.cardNumberTextField = page.frameLocator('iframe[title="Iframe for card number"]').locator('input[id*="adyen-checkout-encryptedCardNumber"]');
+        this.expiryDateTextField = page.frameLocator('iframe[title="Iframe for expiry date"]').locator('input[id*="adyen-checkout-encryptedExpiryDate"]');   
+        this.cvvTextField = page.frameLocator('iframe[title="Iframe for security code"]').locator('input[id*="adyen-checkout-encryptedSecurityCode"]');
+        this.nameOnCardTextField = page .locator('input[id*="adyen-checkout-holderName"]');
+        this.countryDropDown = page.locator('input[id*="adyen-checkout-country"]');
+        this.billingAddressTextField = page.locator('input[id*="adyen-checkout-street"]');
+        this.cityTextField = page.locator('input[id*="adyen-checkout-city"]');
+        this.stateDropDown = page.locator('input[id*="adyen-checkout-stateOrProvince"]');
+        this.billingZipTextField = page.locator('input[id*="adyen-checkout-postalCode"]');
+        this.submitPaymentButton = page.locator('button.adyen-checkout__button');
+        this.payPalButton = page.locator('button[id*="button-paypal"]');
+        this.navigateToPaypalButton = page.frameLocator('iframe[title="PayPal-paypal"]:first-of-type').locator('div[role="link"][class*="paypal-button"]');
+        this.afterPayButton = page.locator('button[id*="button-redirect"]');
+        this.navigateToAfterPayButton = page.locator('div.adyen-checkout__payment-method--afterpaytouch_US  button.adyen-checkout__button');
+
+    }
+
+    async populateAdyenCreditCardDetails(testData: Partial<ITestData>){
+        const { paymentDetails, customerDetails } = testData;
+
+        paymentDetails!.cardNumber = '5100 0600 0000 0002';
+        paymentDetails!.expirationMonth = "12 - December";
+        paymentDetails!.expirationYear = "2029";
+        paymentDetails!.cvv = "737";
+        
+        await this.creditOrDebitCardButton.click();
+        await this.cardNumberTextField.fill(paymentDetails!.cardNumber || '');
+
+        const expirationDate = `${(paymentDetails!.expirationMonth!.split(' ')[0] || '').padStart(2, '0')} + ${paymentDetails!.expirationYear!.toString().slice(-2)}`;
+        await this.expiryDateTextField.pressSequentially(expirationDate);
+        
+        await this.cvvTextField.fill(paymentDetails!.cvv!);
+        await this.nameOnCardTextField.fill(customerDetails!.firstName! + ' ' + customerDetails!.lastName!);
+        await this.billingAddressTextField.fill(paymentDetails!.billingAddress!.street);
+        await this.countryDropDown.pressSequentially("United States");
+        await this.countryDropDown.click();
+        await this.page.getByRole('option', { name: 'United States', exact: true }).click();
+
+        await this.cityTextField.fill(paymentDetails!.billingAddress!.city);
+        await this.stateDropDown.pressSequentially(paymentDetails!.billingAddress!.state);
+        await this.stateDropDown.click();
+        await this.page.locator(".adyen-checkout__field--stateOrProvince li").nth(0).click();
+        await this.billingZipTextField.fill(paymentDetails!.billingAddress!.postalCode);
+        await this.submitPaymentButton.click();
+    }
+
+    async navigateToAdyenPaypalCheckout(): Promise<PaypalPage> {
+        await this.payPalButton.click();
+        const paypalPage = this.page.waitForEvent('popup');
+        await this.navigateToPaypalButton.click();
+        return new PaypalPage(await paypalPage);
+    }
+}

playwright-tests/pages/PaymentMethodPage.ts

@@ -8,6 +8,8 @@ import { AfterpayPage } from './AfterpayPage';
 import { PaypalPage } from './PaypalPage';
 import { ITestData } from 'framework/TestData';
 import { step } from 'framework/localTypes/Step';
+import { IExperiments } from 'framework/localTypes/IExperiments';
+import { PaymentAdyenPage } from './PaymentAdyenPage';
 
 export class PaymentMethodPage extends BasePage {
     readonly page: Page;
@@ -25,7 +27,9 @@ export class PaymentMethodPage extends BasePage {
     readonly submitButton: Locator;
     readonly recalibrationCheckbox: Locator;
     readonly paymentPage: PaymentPage;
+    readonly paymentAdyenPage: PaymentAdyenPage;
     readonly paypalPage: PaypalPage;
+    readonly afterpayPage: AfterpayPage
     readonly afterPayBreakoutSection: Locator;
     readonly afterPayToggle: Locator;
 
@@ -59,7 +63,9 @@ export class PaymentMethodPage extends BasePage {
         this.recalibrationCheckbox = this.page.locator('label:has(>input[name=\'recalAckOptIn\'])');
         // this.creditCardButton = page.locator('div').filter({ hasText: /^Credit or Debit$/ }).nth(1);
         this.paymentPage = new PaymentPage(page);
+        this.paymentAdyenPage = new PaymentAdyenPage(page);
         this.paypalPage = new PaypalPage(page);
+        this.afterpayPage = new AfterpayPage(page);
 
         // Payment details validation locators
         this.reviewTable = this.page.locator('div.review-table');
@@ -191,35 +197,57 @@ export class PaymentMethodPage extends BasePage {
         return text;
     }
 
-    async executePayment(paymentDetails: IPaymentDetails, isRecalVehicle: boolean) {
+    async executePayment(testData: Partial<ITestData>) {
         const browserContext = this.page.context();
+        const { paymentDetails, isRecalVehicle, experiments } = testData;
 
-        switch (paymentDetails.paymentType) {
+        switch (paymentDetails!.paymentType) {
             case PaymentType.Credit:
                 await this.selectCreditCard();
                 await this.nextPage();
-                await this.paymentPage.populateCreditCardDetails(paymentDetails);
+                experiments!.isAdyenPayments
+                    ? await this.paymentAdyenPage.populateAdyenCreditCardDetails(testData)
+                    : await this.paymentPage.populateCreditCardDetails(paymentDetails!);
                 break;
             case PaymentType.AfterPay:
                 await this.payInFourButton.click();
                 await this.continueButton.click();
 
-                // Capture popup
+                if (experiments?.isAdyenPayments) {
-                const afterpayPopup = await browserContext.waitForEvent('page');
+                    await this.paymentAdyenPage.afterPayButton.click();
-                const afterpayPage = new AfterpayPage(afterpayPopup);
+                    await this.paymentAdyenPage.navigateToAfterPayButton.click();
+                    await this.afterpayPage.executeAfterpayPayment(paymentDetails!);
+                } else {
+                    // Capture popup
+                    const afterpayPopup = await browserContext.waitForEvent('page');
+                    const afterpayPage = new AfterpayPage(afterpayPopup);
+
+                    // Execute payment
+                    await afterpayPage.executeAfterpayPayment(paymentDetails!);
+                }
 
-                // Execute payment
-                await afterpayPage.executeAfterpayPayment(paymentDetails);
                 break;
             case PaymentType.Paypal:
                 await this.selectPaypal();
                 // TODO: Click paypal button
                 await this.nextPage();
-                await this.paymentPage.navigateToPaypalCheckout();
+                const paypalPage = experiments?.isAdyenPayments
-                await this.paypalPage.completePaypalPurchase(paymentDetails);
+                    ? await this.paymentAdyenPage.navigateToAdyenPaypalCheckout()
+                    : await this.paymentPage.navigateToPaypalCheckout();
+
+                /*if (experiments?.isAdyenPayments) {
+                     // Capture popup
+                    const payPalPopup = await this.page.waitForEvent('popup');
+                    const paypalPage = new PaypalPage(payPalPopup);
+                    paypalPage.completePaypalPurchase(testData);
+                } else {
+                    await this.paypalPage.completePaypalPurchase(testData);
+                }*/
+                await paypalPage.completePaypalPurchase(testData);
+
                 break;
             case PaymentType.PayAtService:
-                await this.selectPayAtService(isRecalVehicle);
+                await this.selectPayAtService(isRecalVehicle!);
                 await this.nextPage();
                 break;
             case PaymentType.PayWithInsurance:
@@ -527,7 +555,7 @@ export class PaymentMethodPage extends BasePage {
 
     @step("PaymentMethodPage >> Select Payment Method: ")
     async handlePaymentMethodPage(testData: Partial<ITestData>) {
-        const { servicePackage, isRecalVehicle, paymentDetails, isForcedOEM } = testData;
+        const { servicePackage, isRecalVehicle, paymentDetails, isForcedOEM, experiments } = testData;
 
         await this.validateProgressBar(ProgressBarPercentages.PaymentMethodPage);
         await this.validatePaymentDetailsPage(testData);
@@ -542,7 +570,8 @@ export class PaymentMethodPage extends BasePage {
             await this.verifyVAPS();
         }
         if (paymentDetails?.paymentType) {
-            await this.executePayment(paymentDetails!, isRecalVehicle!);
+            // await this.executePayment(paymentDetails!, isRecalVehicle!, experiments!);
+            await this.executePayment(testData);
         } else {
             await this.nextPage();
         }

playwright-tests/pages/PaymentPage.ts

@@ -1,6 +1,7 @@
 import { type Locator, type Page } from '@playwright/test';
 import { BasePage } from './BasePage';
 import { IPaymentDetails } from 'safelite-playwright-core';
+import { PaypalPage } from './PaypalPage';
 
 export class PaymentPage extends BasePage {
     readonly page: Page;
@@ -43,8 +44,8 @@ export class PaymentPage extends BasePage {
         await this.submitPaymentButton.click();
     }
 
-    async navigateToPaypalCheckout() {
+    async navigateToPaypalCheckout(): Promise<PaypalPage> {
         await this.payPalButton.click();
+        return new PaypalPage(this.page);
     }
-
 }

playwright-tests/pages/PaypalPage.ts

@@ -1,6 +1,6 @@
 import { expect, type Locator, type Page } from '@playwright/test';
 import { BasePage } from './BasePage';
-import { IPaymentDetails } from 'safelite-playwright-core';
+import { ITestData } from 'framework/TestData';
 
 export class PaypalPage extends BasePage {
     readonly page: Page;
@@ -30,24 +30,28 @@ export class PaypalPage extends BasePage {
         this.tryAnotherWayButton = page.getByRole('button', { name: 'Try another way' });
     }
 
-    async completePaypalPurchase(paymentDetails: IPaymentDetails){
+    async completePaypalPurchase(testData: Partial<ITestData>){
+
+        const {paymentDetails, experiments } = testData;
         // Wait for the PayPal login page to load
         await this.page.waitForFunction(() => window.location.href.includes('sandbox.paypal.com'), null, { timeout: 10000 });
 
         // handle flow with and without the "Log in with a password instead" link
         if (await this.loginWithPasswordButton.isVisible()) {
             await this.loginWithPasswordButton.click();
-            await this.passwordTextBox.fill(paymentDetails.password!);
+            await this.passwordTextBox.fill(paymentDetails!.password!);
             await this.paypalLoginButton.click();
             await this.completePurchaseButton.click();
         } else {
             await this.usernameTextBox.waitFor({ state: 'visible' });
             await this.page.screenshot({ path: `test-results\\ortoni-data\\paypal-username-${Date.now()}.png`, fullPage: true });
-            await this.usernameTextBox.fill(paymentDetails.username!);
+            await this.usernameTextBox.fill(paymentDetails!.username!);
             await this.nextButton.click();
-            await this.tryAnotherWayButton.click();
+            if (!experiments!.isAdyenPayments){
-            await this.usePasswordInsteadButton.click();
+                await this.tryAnotherWayButton.click();
-            await this.passwordTextBox.fill(paymentDetails.password!);
+                await this.usePasswordInsteadButton.click();
+            }
+            await this.passwordTextBox.fill(paymentDetails!.password!);
             await this.paypalLoginButton.click();
             await this.payWithRadioButton.click();
             await this.page.waitForTimeout(2000); 

src/assets/img/icons/alert-circle-yellow.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="20" height="21" viewBox="0 0 20 21">
+    <path fill="#E86421" fill-rule="nonzero" d="M10 .5c5.523 0 10 4.477 10 10s-4.477 10-10 10-10-4.477-10-10S4.477.5 10 .5zm.043 13.6a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm.77-9.2h-1.54l-.088.009a.502.502 0 0 0-.299.193.66.66 0 0 0-.125.47l.747 6.806.017.096c.065.249.263.425.495.426l.084-.008c.22-.042.396-.246.427-.51l.793-6.805.004-.102a.651.651 0 0 0-.127-.37.489.489 0 0 0-.388-.205z"/>
+</svg>

src/constants/analytics.js

@@ -43,6 +43,7 @@ const GaLabels = {
     ADDRESS_LOOKUP: "Address_Look_up",
     YES: "yes",
     NO: "no",
+    GLASS_CASH_QUOTE: "GlassCashQuote",
 };
 
 const ValueToLogTypes = {

src/constants/endpoints.js

@@ -180,10 +180,6 @@ const endpoints = {
         url: "/analytics/api/v1/analytics/log-part-questions",
         method: "POST",
     },
-    LogDigitalConsumer: {
-        url: "/analytics/api/v1/analytics/digitalconsumer-log",
-        method: "POST",
-    },
     LogFmgSessionData: {
         url: "/analytics/api/v1/analytics/digitalconsumer-session-logging",
         method: "POST",

src/constants/experiments.js

@@ -19,12 +19,11 @@ const experimentSettings = {
     PIA_INSURANCE: "DisplayPIAInsurance",
     SUBMIT_ORDER_ENABLE_PIA: "SubmitOrder_Enable_PIA",
     IS_EMAIL_OPTIONAL: "isEmailOptional",
-    SERVICE_PACKAGE_DISCOUNT: "OfferServicePackageDiscount",
-    PROMO_ON_PACKAGE: "Offer_Promo_On_Pkg",
     RECAL_PRICE_REMOVE: "RecalPriceRemove",
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL: "NextGen_InternalInsuranceTabDisplayThreshold",
     INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL: "NextGen_ExternalInsuranceTabDisplayThreshold",
     DISPLAY_MSR: "DisplayMSR",
+    ENABLE_MSR_SPLIT_PAY: "EnableMSRSplitPay",
     DISPLAY_WAITLIST: "DisplayWaitlist2.0",
     WAITLIST_THRESHOLD_DAYS: "Waitlist_Threshold_Days",
     PRICING_BY_DAY: "DisplayPricingByDay",

src/constants/part-type-strings.js

@@ -9,7 +9,6 @@ const partTypeStrings = {
     MOBILE_FEE: "MOBILE FEE",
     REPAIR_FEE: "REPAIR FEE",
     EARLY_BIRD: "EARLY BIRD",
-    SERVICE_PACKAGE_DISCOUNT: "SERVICE PACKAGE DISCOUNT",
     QUOTE_PAGE_DISCOUNT: "QUOTE PAGE DISCOUNT",
     DONATION: "DONATION",
     WINDSHIELD: "WINDSHIELD",

src/constants/store-actions.js

@@ -63,7 +63,6 @@ const storeActions = {
     LOG_CUSTOM_EVENT: "logCustomEvent",
     INITIALIZE_SESSION: "initializeSession",
     LOG_PART_QUESTIONS: "logPartQuestions",
-    LOG_DIGITALCONSUMER: "logDigitalConsumer",
     LOG_FMG_SESSION_DATA: "logFmgSessionData",
 
     // DEPENDENCY MUTATIONS
@@ -114,6 +113,7 @@ const storeActions = {
     SAVE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING: "saveIsRecalAcknowledgedForScheduling",
     SAVE_IS_OEM_GLASS_SELECTED: "saveIsOemGlassSelected",
     SAVE_IS_MSR_FEE_APPLICABLE: "saveIsMSRFeeApplicable",
+    SAVE_IS_MSR_FEE_COVERED_BY_INSURANCE: "saveIsMSRFeeCoveredByInsurance",
 
     CREATE_SUBMITTED_STATE: "createSubmittedState",
     RESET_SUBMITTED_STATE: "resetSubmittedState",
@@ -123,6 +123,8 @@ const storeActions = {
 
     SAVE_LOGGING_OPTION: "saveLoggingOption",
     UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
+    GET_VALID_IDEMPOTENCY_KEY: "getValidIdempotencyKey",
+    CORRECT_IDEMPOTENCY_KEY_EXPIRY: "correctIdempotencyKeyExpiry",
 };
 
 export { storeActions };

src/constants/store-mutations.js

@@ -72,6 +72,7 @@ const storeMutations = {
     UPDATE_IS_RECAL_ACKNOWLEDGED_FOR_SCHEDULING: "updateIsRecalAcknowledgedForScheduling",
     UPDATE_IS_OEM_GLASS_SELECTED: "updateIsOemGlassSelected",
     UPDATE_IS_MSR_FEE_APPLICABLE: "updateIsMSRFeeApplicable",
+    UPDATE_IS_MSR_FEE_COVERED_BY_INSURANCE: "updateIsMSRFeeCoveredByInsurance",
     UPDATE_CASH_PRICE_SUBTOTAL: "updateCashPriceSubTotal",
 
     // EVENT BUS MUTATIONS
@@ -98,6 +99,7 @@ const storeMutations = {
     UPDATE_LAST_PAGE_VISITED: "updateLastPageVisited",
     UPDATE_LOGGING_OPTION: "updateLoggingOption",
     UPDATE_HAS_TRIGGERED_ERROR: "updateHasTriggeredError",
+    UPDATE_IDEMPOTENCY_KEY: "updateIdempotencyKey",
 
     // EXPERIMENT MUTATIONS
     UPDATE_EXPERIMENTS: "updateExperiments",

src/fmg-components/cart/cart.vue

@@ -77,7 +77,7 @@
                             i % 2 == 0 ? 'even' : 'odd',
                             cartItem.isRemovable ? 'removable-cart-item' : '',
                         ]">
-                        <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
+                        <span v-if="!this.shouldShowInfoIcon(cartItem)">{{ cartItem.name }}</span>
                         <textLink
                             v-if="allowItemRemoval && cartItem.isRemovable"
                             ref="removeLink"
@@ -93,6 +93,15 @@
                                 <img :src="infoIcon" alt="Info Icon" class="info-icon" />
                             </a>
                         </span>
+                        <span v-if="cartItem == msrFeeCartItem">
+                            {{ msrFeeCartItem.name }}
+                            <a
+                                href="javascript:void(0)"
+                                @click="openModal(msrModalCmsWidgetName)"
+                                id="msr-fee-cartItem">
+                                <img :src="infoIcon" alt="Info Icon" class="info-icon" />
+                            </a>
+                        </span>
                         <span
                             v-if="
                                 !showCoverageAsVerified ||
@@ -138,6 +147,10 @@
                     :pageName="pageName"
                     modalWidgetName="PromoModalWidget"
                     @promoAdded="saveVaps" />
+                <removeMsrFeeModal
+                    modalWidgetName="RemoveMsrFeeModalWidget"
+                    ref="removeMsrFeeModal"
+                    @switchToInshop="switchToInshop" />
             </div>
         </div>
         <div
@@ -153,6 +166,10 @@
         <contentGroupModal ref="RecycleModal" cmsWidgetName="RecycleModal">
             <textBlock cmsWidgetName="RecycleTextBlock" />
         </contentGroupModal>
+        <contentGroupModal
+            ref="MSRModal"
+            cmsWidgetName="MSRModal"
+            :customBodyText="msrModalTextBlock"></contentGroupModal>
     </div>
 </template>
 
@@ -162,6 +179,7 @@ import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
 import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
 import promoModalQuestion from "@/fmg-components/promo-modal-question/promo-modal-question";
+import removeMsrFeeModal from "./remove-msr-fee-modal/remove-msr-fee-modal.vue";
 
 // Mixins
 import baseMixin from "@/mixins/base-mixin.js";
@@ -183,6 +201,7 @@ import {
     getSalesTax,
     getAmountDueWithDonation,
 } from "@/helpers/pricing-helper.js";
+import { formatToUSDollar } from "@/helpers/cms-content-helper";
 
 // Constants
 import { partTypeStrings } from "@/constants/part-type-strings";
@@ -191,6 +210,7 @@ import { cartItemTypes } from "@/constants/cart-item-types";
 import { coverageStatus, cartItemTypesCoveredByInsurance } from "@/constants/insurance";
 import { experimentSettings } from "@/constants/experiments";
 import { quotePageDiscountTable } from "@/constants/quote-page-discounts";
+import { partNumberStrings } from "@/constants/part-number-strings";
 
 export default {
     name: "cart",
@@ -203,6 +223,7 @@ export default {
         pageName: String,
         allowItemRemoval: Boolean,
         recyclingModalCmsWidgetName: String,
+        msrModalCmsWidgetName: String,
         showAsPaid: Boolean,
         isInsurance: Boolean,
         insuranceDeductible: Number,
@@ -214,6 +235,7 @@ export default {
         isExpandedOnLoad: Boolean,
         isCollapsible: { type: Boolean, default: true },
         isMSRFeeApplicable: Boolean,
+        IsMSRFeeCoveredByInsurance: Boolean,
         donationCartItem: Object,
     },
     data() {
@@ -311,6 +333,10 @@ export default {
         },
 
         async removeItem(cartItemType, category) {
+            if (cartItemType == cartItemTypes.MOBILE_FEE && this.isMSRFeeApplicable) {
+                this.$refs.removeMsrFeeModal.openModal();
+                return false;
+            }
             this.lineItems[category] = this.lineItems[category].filter(
                 (lineItemsToKeep) => lineItemsToKeep.cartItemType != cartItemType
             );
@@ -375,6 +401,12 @@ export default {
             }
             return [];
         },
+        shouldShowInfoIcon(cartItem) {
+            return cartItem == this.recycleFeeCartItem || cartItem == this.msrFeeCartItem;
+        },
+        switchToInshop() {
+            this.$emit("switchToInshop");
+        },
     },
     computed: {
         isCartReadyToLoad() {
@@ -490,6 +522,10 @@ export default {
                     cartItems.push(this.mobileFeeCartItem);
                 }
 
+                if (this.msrFeeCartItem) {
+                    cartItems.push(this.msrFeeCartItem);
+                }
+
                 if (this.quotePageDiscountCartItem) {
                     cartItems.push(this.quotePageDiscountCartItem);
                 }
@@ -892,7 +928,9 @@ export default {
             let cartItem = null;
             let showMobileFeeCartItem = false;
             const mobileFeeLineItem = this.supportingItems.find(
-                (lineItem) => lineItem.partType == partTypeStrings.MOBILE_FEE
+                (lineItem) =>
+                    lineItem.partType == partTypeStrings.MOBILE_FEE &&
+                    lineItem.partNumber == partTypeStrings.MOBILE_FEE
             );
 
             var mobileTotal =
@@ -929,6 +967,68 @@ export default {
             }
             return cartItem;
         },
+        msrFeeCartItemName() {
+            return this.getCmsContent("MSRFeeTextWidget", "Text");
+        },
+        getMsrFeeLineItem() {
+            return this.supportingItems.find(
+                (lineItem) =>
+                    lineItem.partType == partTypeStrings.MOBILE_FEE &&
+                    lineItem.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE
+            );
+        },
+        msrFeeCartItem() {
+            let cartItem = null;
+            const msrFeeLineItem = this.getMsrFeeLineItem;
+            const shouldCreateMsrFeeCartItem =
+                this.isMSRFeeApplicable &&
+                this.isInsurance &&
+                !this.IsMSRFeeCoveredByInsurance &&
+                msrFeeLineItem &&
+                this.msrFeeAmount > 0;
+
+            if (shouldCreateMsrFeeCartItem) {
+                cartItem = {
+                    name: this.msrFeeCartItemName,
+                    category: cartItemCategories.SUPPORTING_ITEMS,
+                    cartItemType: cartItemTypes.MOBILE_FEE,
+                    isDisplayed: this.isInsurance,
+                    isRemovable: true,
+                    subTotal: 0,
+                    salesTax: 0,
+                    lineItems: [],
+                    isCoveredByInsurance: this.IsMSRFeeCoveredByInsurance,
+                };
+                msrFeeLineItem.cartItemType = cartItem.cartItemType;
+                cartItem.lineItems.push(msrFeeLineItem);
+                cartItem.subTotal += this.msrFeeAmount;
+                cartItem.salesTax += msrFeeLineItem.salesTax ?? 0;
+            }
+            return cartItem;
+        },
+        msrFeeAmount() {
+            const msrFeeLineItem = this.getMsrFeeLineItem;
+            if (!msrFeeLineItem) {
+                return 0;
+            }
+            return (
+                msrFeeLineItem.laborAmount + msrFeeLineItem.sellingPrice + msrFeeLineItem.kitPrice
+            );
+        },
+        msrModalTextBlock() {
+            let cmsContentText = this.getCmsContent("MSRModal", "BodyText");
+            if (cmsContentText) {
+                cmsContentText = cmsContentText.replaceAll(
+                    "{custom:mobileFee}",
+                    formatToUSDollar(this.msrFeeAmount)
+                );
+                cmsContentText = cmsContentText.replaceAll(
+                    "{custom:submittedOrder.policy.insuranceCompanyName}",
+                    this.insuranceCompanyName
+                );
+            }
+            return cmsContentText;
+        },
         quotePageDiscountCartItemName() {
             return this.getCmsContent("ServicePackageDiscountTextWidget", "Text");
         },
@@ -1189,6 +1289,7 @@ export default {
         textLink,
         contentGroupModal,
         promoModalQuestion,
+        removeMsrFeeModal,
     },
 };
 </script>
@@ -1289,6 +1390,10 @@ export default {
                 order: 3;
                 margin-right: 100%;
                 text-decoration: none;
+
+                &#msr-fee-cartItem {
+                    margin: 0 0 0 0.2rem;
+                }
             }
         }
         .package-type,

src/fmg-components/cart/remove-msr-fee-modal/remove-msr-fee-modal.vue

@@ -0,0 +1,153 @@
+<template>
+    <div id="msr-fee-modal-container">
+        <modal
+            :ref="modalName"
+            :headerText="modalHeaderText"
+            suppressPageScroll
+            :onModalClosedCallback="onModalClosed"
+            :footerButtonText="modalFooterText"
+            :isFooterButtonPrimary="true"
+            @footer-button-event="switchToInshop"
+            @isModalOpened="setIsModalOpen">
+            <p class="modal-body-inner" v-html="modalBodyText"></p>
+            <template v-slot:modal-header-slot>
+                <span>{{ modalSubHeaderText }}</span>
+            </template>
+            <template v-slot:modal-footer-slot>
+                <button
+                    type="button"
+                    class="btn btn-link"
+                    id="cancel-button"
+                    :disabled="isLoading"
+                    @click="closeModal">
+                    {{ buttonText }}
+                </button>
+            </template>
+        </modal>
+    </div>
+</template>
+
+<script>
+// Supporting files
+import modal from "@/digital-components/modal/modal";
+
+export default {
+    name: "remove-msr-fee-modal",
+    props: {
+        cmsWidgetName: String,
+        modalWidgetName: String,
+    },
+    data() {
+        return {
+            isModalOpen: false,
+            switchedToInshop: false,
+        };
+    },
+    methods: {
+        openModal() {
+            this.modal.openModal();
+        },
+        onModalClosed() {
+            this.$emit("close-remove-msr-fee-modal");
+            this.switchedToInshop = false;
+        },
+        closeModal() {
+            this.modal.closeModal();
+        },
+        getIsModalOpen() {
+            return this.isModalOpen;
+        },
+        setIsModalOpen(isOpen) {
+            this.isModalOpen = isOpen;
+        },
+        switchToInshop() {
+            this.switchedToInshop = true;
+            this.$emit("switchToInshop");
+            this.modal.closeModal();
+        },
+    },
+    computed: {
+        modalName() {
+            return this.modalWidgetName;
+        },
+        modal() {
+            return this.$refs[this.modalName];
+        },
+        modalSubHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "SubheaderText");
+        },
+        modalHeaderText() {
+            return this.getCmsContent(this.modalWidgetName, "HeaderText");
+        },
+        modalBodyText() {
+            return this.getCmsContent(this.modalWidgetName, "BodyText");
+        },
+        modalFooterText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText");
+        },
+        buttonText() {
+            return this.getCmsContent(this.modalWidgetName, "FooterText2");
+        },
+    },
+    components: { modal },
+};
+</script>
+<style lang="scss">
+#msr-fee-modal-container {
+    .modal-component {
+        @include media-breakpoint-up(md) {
+            .modal-dialog {
+                left: 0;
+                align-content: center;
+                flex-wrap: wrap;
+                width: 22.063rem;
+                transform: translate(0, 0);
+
+                .modal-content {
+                    border-radius: $border-radius-lg;
+                }
+            }
+        }
+        .modal-dialog {
+            .modal-content {
+                .modal-header {
+                    flex-direction: column;
+                    & > span {
+                        color: $red;
+                        font-size: $font-size-14;
+                        font-weight: $font-weight-600;
+                        text-transform: uppercase;
+                    }
+
+                    .modal-title {
+                        font-size: $font-size-20;
+                        font-weight: $font-weight-normal;
+                    }
+                }
+                .modal-body {
+                    padding: 0.5rem 1rem;
+
+                    .modal-body-inner {
+                        ul {
+                            list-style: none;
+                            padding: 1rem;
+                            background-color: #f4f4f4;
+                            font-size: $font-size-14;
+                        }
+                    }
+                }
+                .modal-footer {
+                    flex-flow: wrap-reverse;
+
+                    #cancel-button {
+                        width: 100%;
+                        text-decoration: none;
+                        margin-top: 1.5rem;
+                        font-weight: $font-weight-600;
+                    }
+                }
+            }
+        }
+    }
+}
+</style>

src/fmg-components/content-group-modal/content-group-modal.vue

@@ -26,6 +26,7 @@ export default {
     name: "content-group-modal",
     props: {
         cmsWidgetName: String,
+        customBodyText: String,
         footerButtonActionName: {
             type: String,
             default: null,
@@ -43,6 +44,9 @@ export default {
             return this.getCmsContent(this.cmsWidgetName, "SubheaderText");
         },
         ModalBodyText() {
+            if (this.customBodyText) {
+                return this.customBodyText;
+            }
             return this.getCmsContent(this.cmsWidgetName, "BodyText");
         },
         ModalSubBodyText() {

src/global-methods.js

@@ -102,7 +102,6 @@ export default {
                 },
                 (error) => {
                     if (
-                        endpoint.toLowerCase().includes(endpoints.LogDigitalConsumer.url) ||
                         endpoint.toLowerCase().includes(endpoints.LogFmgSessionData.url) ||
                         endpoint.toLowerCase().includes(endpoints.LogPageView.url) ||
                         endpoint.toLowerCase().includes(endpoints.LogCustomEvent.url) ||

src/helpers/cms-content-helper.js

@@ -343,3 +343,14 @@ export function splitCMSCopyOnParagraphTag(copy) {
 export function splitCMSCopyOnBR(copy) {
     return copy.split("<br>");
 }
+
+// This function takes in a number and returns it formatted as USD currency, with or without cents depending on if the number is an integer or not.
+export function formatToUSDollar(amount) {
+    const isInteger = amount % 1 === 0;
+    return new Intl.NumberFormat("en-US", {
+        style: "currency",
+        currency: "USD",
+        minimumFractionDigits: isInteger ? 0 : 2,
+        maximumFractionDigits: 2,
+    }).format(amount);
+}

src/helpers/pricing-helper.js

@@ -2,6 +2,7 @@ import store from "@/store";
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
 import { deepClone } from "@/helpers/object-helper";
+import { partNumberStrings } from "@/constants/part-number-strings";
 
 export function getDisplayAmountDue(lineItemsObject, includeTax = true) {
     return getAmountDue(lineItemsObject, includeTax).toLocaleString("en-US", {
@@ -32,6 +33,10 @@ export function getAmountDue(lineItemsObject, includeTax = true) {
 
     if (store.getters.coverageIsVerified && !order.policy.isNoComp && !order.policy.isItac) {
         amountDue = order.policy.currentDeductible;
+
+        if (order.isMSRFeeApplicable && !order.isMSRFeeCoveredByInsurance) {
+            amountDue += getMSRFeePartPrice(lineItemsObject?.supportingItems, includeTax);
+        }
     }
 
     if (lineItemsObject?.vaps) {
@@ -100,6 +105,20 @@ export async function getPricingByDayPartWithPrice(pageNameToLog) {
     return pricingResults[0];
 }
 
+export function getMSRFeePartPrice(supportingItems, includeTax) {
+    let msrFeePrice = 0;
+    const msrFeeLineItem = supportingItems?.find(
+        (lineItem) => lineItem.partNumber === partNumberStrings.MOBILE_STATIC_RECAL_FEE
+    );
+    if (msrFeeLineItem) {
+        msrFeePrice = baseMixin?.methods?.getTotalPriceOfAllLineItemsAndChildParts(
+            [msrFeeLineItem],
+            includeTax
+        );
+    }
+    return msrFeePrice;
+}
+
 export function addPricesToLineItems(lineItems, pricingLineItems) {
     lineItems.forEach((lineItem) => {
         const lineItemIndex = pricingLineItems.findIndex(

src/layouts/confirmation/confirmation.vue

@@ -62,6 +62,7 @@
                         :showAsPaid="isPia"
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         recyclingModalCmsWidgetName="RecycleModal"
+                        msrModalCmsWidgetName="MSRModal"
                         :isInsurance="isInsurance"
                         :insuranceDeductible="currentDeductible"
                         :insuranceCompanyName="insuranceCompanyName"
@@ -70,7 +71,8 @@
                         :isItac="isItac"
                         :isNoComp="isNoComp"
                         :isExpandedOnLoad="false"
-                        :isMSRFeeApplicable="isMSRFeeApplicable" />
+                        :isMSRFeeApplicable="isMSRFeeApplicable"
+                        :IsMSRFeeCoveredByInsurance="isMSRFeeCoveredByInsurance" />
 
                     <hr class="mb-5" />
                 </div>
@@ -419,6 +421,9 @@ export default {
         isMSRFeeApplicable() {
             return this.submittedOrder?.isMSRFeeApplicable;
         },
+        isMSRFeeCoveredByInsurance() {
+            return this.submittedOrder?.isMSRFeeCoveredByInsurance;
+        },
         isInsurance() {
             return this.submittedOrder?.payment?.isInsurance;
         },

src/layouts/estimate/estimate.vue

@@ -62,6 +62,7 @@ import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { nextTick } from "vue";
 import { peekQueryFromStash } from "@/router/methods/helpers/querystring-stash";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -169,7 +170,7 @@ export default {
                         baseMixin.methods.ResetExternalParamsAndHideModal();
                     }
                 } else {
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
+                    showFmgLoadingModal(false);
                 }
             } else {
                 baseMixin.methods.ResetExternalParamsAndHideModal();

src/layouts/payment-adyen/payment-adyen.vue

@@ -29,10 +29,12 @@
                                 v-model="lineItems"
                                 servicePackageOptionsCmsName="ServicePackageTitle"
                                 recyclingModalCmsWidgetName="RecycleModal"
+                                msrModalCmsWidgetName="MSRModal"
                                 :isInsurance="isInsurance"
                                 :insuranceDeductible="currentDeductible"
                                 :insuranceCompanyName="insuranceCompanyName"
                                 :showInsuranceCoverageAs="showInsuranceCoverageAs"
+                                :isMSRFeeApplicable="isMSRFeeApplicable"
                                 :isItac="isItac"
                                 :isNoComp="isNoComp"
                                 :isCollapsible="false" />
@@ -146,13 +148,15 @@ export default {
         arePagePrerequisitesValid() {
             const order = store.getters.order;
             const logQueue = [];
-            const result =
+            const results = [
-                hasServiceLocationInfo(order, logQueue) &&
+                hasServiceLocationInfo(order, logQueue),
-                hasInsuranceInfo(order, logQueue) &&
+                hasInsuranceInfo(order, logQueue),
-                hasSchedulingInfo(order, logQueue) &&
+                hasSchedulingInfo(order, logQueue),
-                hasCustomerInfo(order, logQueue) &&
+                hasCustomerInfo(order, logQueue),
-                hasPaymentMethodInfo(order, logQueue) &&
+                hasPaymentMethodInfo(order, logQueue),
-                hasGlassPartsOrRepairInfo(order, logQueue);
+                hasGlassPartsOrRepairInfo(order, logQueue),
+            ];
+            const result = results.every(Boolean);
             flushPagePrereqsLogs("payment-adyen.vue", result, logQueue);
             return result;
         },
@@ -161,7 +165,7 @@ export default {
             console.log(`Price = ${this.amountDue}`);
             console.log(`Adyen Price = ${this.adyenPriceTotal}`);
 
-            const requestBody = this.getAdyenInitRequestInfo();
+            const requestBody = await this.getAdyenInitRequestInfo();
 
             console.log(`Calling with:`);
             console.log(requestBody);
@@ -255,6 +259,7 @@ export default {
             this.dropinComponent = dropin;
 
             dropin.mount("#adyen-container");
+            await this.dispatchStoreAction(storeActions.CORRECT_IDEMPOTENCY_KEY_EXPIRY, expiryTime);
         },
 
         async handleCompletedPayment(result) {
@@ -436,19 +441,13 @@ export default {
         },
 
         // Now a Method so it is always freshly called and not cached.
-        getIdempotencyKey() {
+        async getIdempotencyKey() {
-            const currentDateTime = new Date();
+            return await this.dispatchStoreAction(storeActions.GET_VALID_IDEMPOTENCY_KEY);
-            const currentHour = currentDateTime.getUTCHours();
-            const currentDate = currentDateTime.getUTCDate();
-            const id = this?.$store?.getters?.order?.referralCorrelationId;
-            const system = this.sourceSystem;
-            const total = this.adyenPriceTotal;
-
-            return `${id}-${system}-${currentDate}-${currentHour}-${total}`;
         },
 
         // Now a Method so it is always freshly called and not cached.
-        getAdyenInitRequestInfo() {
+        async getAdyenInitRequestInfo() {
+            const key = await this.getIdempotencyKey();
             return {
                 sourceSystem: this.sourceSystem,
                 referralSequenceNumber: this.$store.getters.order.referralSequenceNumber,
@@ -462,10 +461,9 @@ export default {
                 stateOrProvince: this.locationInfo.state,
                 returnUrl: applicationConfig.PIA_ADYEN_RETURN_URL,
                 email: this.$store.getters.order.customer.emailAddress,
-                IP: "127.0.0.1", // TODO
                 firstName: this.$store.getters.order.customer.firstName,
                 lastName: this.$store.getters.order.customer.lastName,
-                idempotencyKey: this.getIdempotencyKey(),
+                idempotencyKey: key,
             };
         },
     },
@@ -572,6 +570,9 @@ export default {
         insuranceCompanyName() {
             return this.$store.getters.policy.insuranceCompanyName;
         },
+        isMSRFeeApplicable() {
+            return this.$store.getters.order.isMSRFeeApplicable;
+        },
         lineItems() {
             return deepClone(this.$store.getters.lineItems);
         },

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

@@ -26,6 +26,7 @@
                         pageName="payment-method"
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         recyclingModalCmsWidgetName="RecycleModal"
+                        msrModalCmsWidgetName="MSRModal"
                         :isInsurance="isInsurance"
                         :insuranceDeductible="currentDeductible"
                         :insuranceCompanyName="insuranceCompanyName"
@@ -35,7 +36,9 @@
                         :isNoComp="isNoComp"
                         :isExpandedOnLoad="false"
                         :isMSRFeeApplicable="isMSRFeeApplicable"
-                        @itemRemoved="evaluatePromosAndTaxItemsOnOrder" />
+                        :IsMSRFeeCoveredByInsurance="isMSRFeeCoveredByInsurance"
+                        @itemRemoved="evaluatePromosAndTaxItemsOnOrder"
+                        @switchToInshop="navigateToSchedulePage" />
 
                     <afterpayBreakout
                         v-if="isAfterpayBreakoutDisplay"
@@ -214,6 +217,7 @@ export default {
     name: "paymentMethod",
     props: {
         recyclingModalCmsWidgetName: String,
+        msrModalCmsWidgetName: String,
     },
     async beforeRouteEnter(to, from, next) {
         // Call APIs
@@ -390,12 +394,15 @@ export default {
         arePagePrerequisitesValid() {
             const order = store.getters.order;
             const logQueue = [];
-            const result =
+            const results = [
-                hasServiceLocationInfo(order, logQueue) &&
+                hasServiceLocationInfo(order, logQueue),
-                hasInsuranceInfo(order, logQueue) &&
+                hasInsuranceInfo(order, logQueue),
-                hasSchedulingInfo(order, logQueue) &&
+                hasSchedulingInfo(order, logQueue),
-                hasCustomerInfo(order, logQueue) &&
+                hasCustomerInfo(order, logQueue),
-                hasGlassPartsOrRepairInfo(order, logQueue);
+                hasGlassPartsOrRepairInfo(order, logQueue),
+            ];
+            //false if any check is false but calls all checks for logging purposes
+            const result = results.every(Boolean);
             flushPagePrereqsLogs("payment-method.vue", result, logQueue);
             return result;
         },
@@ -604,6 +611,13 @@ export default {
         openModal(modalName) {
             this.$refs[modalName].openModal();
         },
+        async navigateToSchedulePage() {
+            this.$refs.loadingModal.showModal();
+            this.$router.navigateWithSaving(
+                this.navigationScenarios.CLICKED_SWITCH_TO_INSHOP,
+                this.pageName
+            );
+        },
     },
     computed: {
         AppointmentType() {
@@ -679,6 +693,9 @@ export default {
         isMSRFeeApplicable() {
             return this.$store.getters.order.isMSRFeeApplicable;
         },
+        isMSRFeeCoveredByInsurance() {
+            return this.$store.getters.order.isMSRFeeCoveredByInsurance;
+        },
         isInsurance() {
             return this.hasSubmittedOrder()
                 ? this.getSubmittedOrder()?.payment.isInsurance

src/layouts/payment/payment.vue

@@ -47,10 +47,12 @@
                                 v-model="lineItems"
                                 servicePackageOptionsCmsName="ServicePackageTitle"
                                 recyclingModalCmsWidgetName="RecycleModal"
+                                msrModalCmsWidgetName="MSRModal"
                                 :isInsurance="isInsurance"
                                 :insuranceDeductible="currentDeductible"
                                 :insuranceCompanyName="insuranceCompanyName"
                                 :showInsuranceCoverageAs="showInsuranceCoverageAs"
+                                :isMSRFeeApplicable="isMSRFeeApplicable"
                                 :isItac="isItac"
                                 :isNoComp="isNoComp"
                                 :isCollapsible="false" />
@@ -410,6 +412,9 @@ export default {
         insuranceCompanyName() {
             return this.$store.getters.policy.insuranceCompanyName;
         },
+        isMSRFeeApplicable() {
+            return this.$store.getters.order.isMSRFeeApplicable;
+        },
         isPaypal() {
             if (this.paymentType == "pp") {
                 return true;
@@ -445,13 +450,15 @@ export default {
         arePagePrerequisitesValid() {
             const order = store.getters.order;
             const logQueue = [];
-            const result =
+            const results = [
-                hasServiceLocationInfo(order, logQueue) &&
+                hasServiceLocationInfo(order, logQueue),
-                hasInsuranceInfo(order, logQueue) &&
+                hasInsuranceInfo(order, logQueue),
-                hasSchedulingInfo(order, logQueue) &&
+                hasSchedulingInfo(order, logQueue),
-                hasCustomerInfo(order, logQueue) &&
+                hasCustomerInfo(order, logQueue),
-                hasPaymentMethodInfo(order, logQueue) &&
+                hasPaymentMethodInfo(order, logQueue),
-                hasGlassPartsOrRepairInfo(order, logQueue);
+                hasGlassPartsOrRepairInfo(order, logQueue),
+            ];
+            const result = results.every(Boolean);
             flushPagePrereqsLogs("payment.vue", result, logQueue);
             return result;
         },

src/layouts/quote/quote.spec.js

@@ -100,9 +100,6 @@ const mockExperimentSettings = experimentSettings;
 jest.mock("@/mixins/experiment-mixin.js", () => ({
     methods: {
         getSettingValue(settingName) {
-            if (settingName === mockExperimentSettings.SERVICE_PACKAGE_DISCOUNT) {
-                return true;
-            }
             if (
                 settingName === mockExperimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL
             ) {
@@ -367,9 +364,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         const { wrapper } = setupMocks({});
 
@@ -391,59 +385,6 @@ describe("quote.vue", () => {
         // This should have its own test
         //expect(vm.isInsuranceSelected !== null).toBe(true);
     });
-    test("Returns true if service package discount setting is true", async () => {
-        //Arrange
-        store.getters = {
-            lineItems: {
-                glassParts: ["item", "item2"],
-            },
-            pageData: jest.fn((page) => {
-                if (page === "quote") {
-                    return { saveProgressPopupSkipped: true };
-                }
-                return {};
-            }),
-            applicationUser: {
-                experiments: [],
-            },
-            order: {
-                lineItems: {
-                    glassParts: ["item", "item2"],
-                },
-                payment: {},
-                customer: {
-                    emailAddress: "test@test.com",
-                },
-                serviceLocation: {
-                    zipCode: "12345",
-                    zipCodeCtu: "value",
-                },
-            },
-            vehicle: {
-                cardId: "123",
-            },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
-        };
-        const { wrapper } = setupMocks({});
-
-        wrapper.vm.$route = { query: { isInsurance: "false" } };
-
-        const isServicePackageDiscount = experimentMixin.methods.getSettingValue(
-            experimentSettings.SERVICE_PACKAGE_DISCOUNT
-        );
-
-        //Act
-        await quote.beforeRouteEnter.call(
-            wrapper.vm,
-            { query: { fmgPage: "quote" } },
-            undefined,
-            (c) => c(wrapper.vm)
-        );
-        //Assert
-        expect(isServicePackageDiscount).toBe(true);
-    });
     test("should default to insurance if query param 'isInsurance' is true", async () => {
         //Arrange
         store.getters = {
@@ -476,9 +417,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         const { wrapper } = setupMocks({});
         wrapper.vm.$route = { query: { isInsurance: "true" } };
@@ -526,9 +464,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         mockTierOnePrice = 200;
         const { wrapper } = setupMocks({});
@@ -577,9 +512,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         const { wrapper } = setupMocks({});
         // Ensure that query param isn't overriding selection
@@ -628,9 +560,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         const { wrapper } = setupMocks({});
         // Ensure that query param isn't overriding selection
@@ -680,9 +609,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         mockTierOnePrice = 200;
         const { wrapper } = setupMocks({});
@@ -734,9 +660,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         mockTierOnePrice = 505;
         const { wrapper } = setupMocks({});
@@ -786,9 +709,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         mockTierOnePrice = 505;
         const { wrapper } = setupMocks({});
@@ -839,9 +759,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
         const { wrapper } = setupMocks({});
         wrapper.vm.$route = { query: null };
@@ -962,9 +879,6 @@ describe("quote.vue", () => {
             vehicle: {
                 cardId: "123",
             },
-            experimentSettings: {
-                settingName: "SERVICE_PACKAGE_DISCOUNT",
-            },
         };
 
         // Set up the component

src/layouts/quote/quote.vue

@@ -196,6 +196,7 @@ import {
 } from "@/helpers/page-prerequisites-helper.js";
 import { savePageData } from "@/router/methods/helpers/save-page-data";
 import { quotePageDiscountTable } from "../../constants/quote-page-discounts";
+import { GaLabels } from "@/constants/analytics";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
@@ -595,12 +596,6 @@ export default {
                 }
                 // there are no active or inactive external parameters; use internal threshold
                 if (internalThreshold) thresholdToUse = internalThreshold;
-
-                vm.isInsuranceSelected = getIsInsuranceSelectedValue(
-                    vm.availableLineItems,
-                    thresholdToUse
-                );
-                baseMixin.methods.ResetExternalParamsAndHideModal();
             } else {
                 // user came from an external source, however, the externalParms may have been reset on service-zip, property-questions, etc...
                 if (getBoolFromString(store.getters.externalParameterQuote?.isInsurance)) {
@@ -618,8 +613,6 @@ export default {
                     ) {
                         await vm.skip(insuranceSelection, servicePackage);
                     }
-
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
                 } else {
                     if (externalThreshold) thresholdToUse = externalThreshold;
 
@@ -627,15 +620,17 @@ export default {
                     {
                         debugLog("quote.vue tab select NOT EXTERNAL");
                     }
-
-                    vm.isInsuranceSelected = getIsInsuranceSelectedValue(
-                        vm.availableLineItems,
-                        thresholdToUse
-                    );
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
                 }
             }
 
+            if (vm.isInsuranceSelected == null) {
+                vm.isInsuranceSelected = getIsInsuranceSelectedValue(
+                    vm.availableLineItems,
+                    thresholdToUse
+                );
+            }
+            baseMixin.methods.ResetExternalParamsAndHideModal();
+
             if (vm.skipToInsurance && !vm.showSaveProgressPopup) {
                 // skip ahead only if no email popup.
                 await vm.skip(true, externalParamPackageLabels.GLASS_ONLY);
@@ -746,10 +741,11 @@ export default {
                 order.payment?.insuranceCoverage?.isVerified == null ||
                 order.payment?.insuranceCoverage?.isVerified === false;
 
-            const preReqResult =
+            const results = [
-                hasServiceZipInfo(order, logQueue) &&
+                hasServiceZipInfo(order, logQueue),
-                hasGlassPartsOrRepairInfo(order, logQueue) &&
+                hasGlassPartsOrRepairInfo(order, logQueue),
-                isVerifiedOk;
+            ];
+            const preReqResult = results.every(Boolean) && isVerifiedOk;
 
             logQueue.push(() => {
                 debugLog(
@@ -958,8 +954,7 @@ export default {
                         priceLabel = price.toFixed(2);
                     }
                 }
-                const subTotalLabel = this.Variables?.CASH_SUBTOTAL;
+                this.pushVariableToDataLayer?.({ [this.GaLabels.GLASS_CASH_QUOTE]: priceLabel });
-                this.pushVariableToDataLayer?.({ [subTotalLabel]: priceLabel });
             });
         },
         async skip(insuranceSelection, packageSelection) {

src/layouts/quote/service-package-question/service-package-question.spec.js

@@ -31,14 +31,10 @@ const mockExperimentSettings = experimentSettings;
 jest.mock("@/mixins/experiment-mixin.js", () => ({
     methods: {
         getSettingValue(settingName) {
-            if (settingName === mockExperimentSettings.PROMO_ON_PACKAGE) {
+            return false;
-                return true;
-            }
         },
         hasSetting(settingName) {
-            if (settingName === mockExperimentSettings.PROMO_ON_PACKAGE) {
+            return false;
-                return false;
-            }
         },
         hasSettingEqualTo(settingName, settingValue) {
             return false;

src/layouts/schedule/schedule.vue

@@ -81,6 +81,16 @@
                         cmsWidgetName="AlertNoShopsWidget"
                         v-if="displayNoShopsAlert"
                         alertClass="alert-warning" />
+                    <alert
+                        ref="alertMSRNotCoveredByInsurance"
+                        class="mt-5 mb-5"
+                        v-if="isMSRFeeNotCoveredByInsurance"
+                        :manualHeadline="MSRFeeAlertHeadlineText"
+                        :manualCopy="MSRFeeAlertBodyText"
+                        :showWarningIcon="true"
+                        :hasBorder="true"
+                        :showHorizontalRow="true"
+                        alertClass="alert-warning" />
                 </div>
             </div>
             <div
@@ -229,7 +239,11 @@ import {
     RECAL_ACK_YES,
 } from "@/constants/schedule-constants";
 
-import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
+import {
+    fetchCmsContentForPage,
+    splitCopyOnCMSPlaceHolder,
+    formatToUSDollar,
+} from "@/helpers/cms-content-helper";
 import { settleAllPromises } from "@/helpers/layout-helper";
 import {
     getPricedMobileFeePart,
@@ -247,7 +261,6 @@ import { insuranceCompanyNameStrings } from "@/constants/insurance";
 import store from "@/store";
 
 import { storeActions } from "@/constants/store-actions";
-import { splitCopyOnCMSPlaceHolder } from "@/helpers/cms-content-helper";
 import {
     calcDaysBetweenDates,
     convertDateStringToDate,
@@ -693,9 +706,11 @@ export default {
         },
         isMobileStaticRecalibrationApplicable() {
             return (
-                this.displayMSR &&
+                (this.displayMSR &&
-                this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
+                    this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
-                (this.isCashItacNoComp || this.mobileFeePart?.isInsurable)
+                    this.enableMSRSplitPay) ||
+                this.isCashItacNoComp ||
+                this.mobileFeePart?.isInsurable
             );
         },
         displayMSR() {
@@ -705,6 +720,35 @@ export default {
                     ?.toLowerCase() === "true"
             );
         },
+        enableMSRSplitPay() {
+            return (
+                experimentMixin.methods
+                    .getSettingValue(experimentSettings.ENABLE_MSR_SPLIT_PAY)
+                    ?.toLowerCase() === "true"
+            );
+        },
+        isMSRFeeNotCoveredByInsurance() {
+            return (
+                this.isMobileSelected &&
+                this.isMobileStaticRecalibrationApplicable &&
+                this.mobileFeeHasPrice &&
+                this.isInsurance &&
+                !this.mobileFeePart?.isInsurable
+            );
+        },
+        MSRFeeAlertHeadlineText() {
+            return this.getCmsContent("AlertMSRNotCoveredByInsuranceWidget", "HeadlineText");
+        },
+        MSRFeeAlertBodyText() {
+            const cmsContentText = this.getCmsContent(
+                "AlertMSRNotCoveredByInsuranceWidget",
+                "BodyText"
+            );
+            return cmsContentText.replaceAll(
+                "{custom:mobileFee}",
+                formatToUSDollar(this.mobileFee)
+            );
+        },
         isCashItacNoComp() {
             return !this.isInsurance || this.isITAC || this.isNoComp;
         },
@@ -1141,6 +1185,13 @@ export default {
                 isMSRFeeApplicable
             );
         },
+        updateAndSaveIsMSRFeeCoveredByInsurance() {
+            const isMSRFeeCoveredByInsurance = this.mobileFeePart?.isInsurable;
+            this.dispatchStoreAction(
+                this.storeActions.SAVE_IS_MSR_FEE_COVERED_BY_INSURANCE,
+                isMSRFeeCoveredByInsurance
+            );
+        },
         updateAndSaveSupportingItems() {
             let supportingItems = store.getters.lineItems.supportingItems;
             let shouldSaveSupportingItems = false;
@@ -1496,6 +1547,7 @@ export default {
 
             this.updateAndSaveSupportingItems();
             this.updateAndSaveIsMSRFeeApplicable();
+            this.updateAndSaveIsMSRFeeCoveredByInsurance();
 
             this.updateSupportingItems();
 
@@ -2035,14 +2087,7 @@ export default {
             }
         },
         async showMultiLocationModal() {
-            const showMultiLocationAppointment = experimentMixin.methods.getSettingValue(
+            if (!this.selectedRouteCodeData?.routeCode) {
-                experimentSettings.SHOW_MULTI_LOCATION_APPT
-            );
-
-            if (
-                !this.selectedRouteCodeData?.routeCode &&
-                showMultiLocationAppointment?.toLowerCase() === "true"
-            ) {
                 let maxDayRangeToShowPmTimeslot = experimentMixin.methods.getSettingValue(
                     experimentSettings.SHOW_PM_DAYS_MULTI_LOCATION
                 );

src/layouts/service-zip/service-zip.vue

@@ -80,6 +80,7 @@ import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
 import baseMixin from "@/mixins/base-mixin.js";
 import { queryStrings } from "@/constants/query-strings";
 import { routeData } from "@/router/constants/routes";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 
 // Define Validation Rules
 defineRule("zip-required", required(errorMessages.SERVICE_ZIP_REQUIRED));
@@ -137,6 +138,13 @@ export default {
                         },
                         false
                     );
+                    vm.serviceZipCode = store.getters.externalParameterServiceZip.zipCode;
+                    const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
+                    if (isValid) {
+                        showFmgLoadingModal(true);
+                        vm.forwardButtonAction();
+                        return;
+                    }
                 }
 
                 if (store.getters.externalParameterCustomer?.phoneNumber) {

src/layouts/vehicle-damage/vehicle-damage.vue

@@ -93,6 +93,7 @@ import { errorMessages } from "@/constants/error-messages";
 import { damageLocationsCms } from "@/constants/damage-locations-cms.js";
 import { damageLocationsSelected } from "@/constants/damage-locations-selected.js";
 import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { debugLog } from "@/helpers/debug-log-helper";
 
 import store from "@/store";
@@ -199,7 +200,7 @@ export default {
                             return vm.forwardButtonAction();
                         }
                     }
-                    baseMixin.methods.ResetExternalParamsAndHideModal();
+                    showFmgLoadingModal(false);
 
                     //clear any validation errors for external parameter flow
                     const form = vm.$refs.theForm;
@@ -209,7 +210,7 @@ export default {
                     }
                 }
             } else {
-                baseMixin.methods.ResetExternalParamsAndHideModal();
+                showFmgLoadingModal(false);
             }
         });
     },

src/layouts/vehicle/vehicle.spec.js

@@ -93,8 +93,11 @@ describe("vehicle.vue", () => {
 });
 
 describe("vehicle.vue", () => {
-    test("should call forwardButtonAction if isExternalParameter is true and form is valid", async () => {
+    test("should call forwardButtonAction if isExternalParameter is true, has a year, make and model, and form is valid", async () => {
         store.getters.externalParameterState.isExternalParameter = true;
+        store.getters.externalParameterVehicle.year = "1886";
+        store.getters.externalParameterVehicle.make = "Benz";
+        store.getters.externalParameterVehicle.model = "Patent-Motorwagen";
         // Create a shallow mount of MyComponent
         const { wrapper } = setupMocks();
         // Set displayNoServiceAlert to false

src/layouts/vehicle/vehicle.vue

@@ -109,6 +109,7 @@ import { getFunnelCookie } from "@/helpers/heritage-integration/cookie-helper";
 import { applicationConfig } from "../../constants/application-config";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
+import { showFmgLoadingModal } from "@/helpers/loading-modal-helper";
 import { debugLog } from "@/helpers/debug-log-helper";
 
 //define validation rules
@@ -252,17 +253,17 @@ export default {
                 const matchingMake = resultMap.makeQuestionInitialData?.filter(
                     (item) =>
                         item.toLowerCase() ===
-                        store.getters.externalParameterVehicle.make.toLowerCase()
+                        store.getters.externalParameterVehicle.make?.toLowerCase()
                 );
                 const matchingModel = resultMap.modelQuestionInitialData?.filter(
                     (item) =>
                         item.toLowerCase() ===
-                        store.getters.externalParameterVehicle.model.toLowerCase()
+                        store.getters.externalParameterVehicle.model?.toLowerCase()
                 );
                 const matchingStyle = resultMap.styleQuestionInitialData?.filter(
                     (item) =>
                         item.toLowerCase() ===
-                        store.getters.externalParameterVehicle.style.toLowerCase()
+                        store.getters.externalParameterVehicle.style?.toLowerCase()
                 );
                 baseMixin.methods.dispatchStoreAction(
                     storeActions.UPDATE_EXTERNAL_PARAMETER_MMS,
@@ -291,7 +292,12 @@ export default {
                     resultMap.modelQuestionInitialData,
                     resultMap.styleQuestionInitialData
                 );
-            if (store.getters.externalParameterState?.isExternalParameter) {
+            if (
+                store.getters.externalParameterState?.isExternalParameter &&
+                store.getters.externalParameterVehicle.year &&
+                store.getters.externalParameterVehicle.make &&
+                store.getters.externalParameterVehicle.model
+            ) {
                 await vm.getVehicleDetails();
                 if (!vm.displayNoServiceAlert) {
                     const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
@@ -304,7 +310,7 @@ export default {
                     baseMixin.methods.ResetExternalParamsAndHideModal();
                 }
             } else {
-                baseMixin.methods.ResetExternalParamsAndHideModal();
+                showFmgLoadingModal(false);
             }
         });
     },

src/mixins/analytics-mixin.js

@@ -132,51 +132,6 @@ export default {
             }
         },
 
-        async logDigitalConsumer() {
-            const currentPageName = getPageNameFromRouter();
-            const universes = store.getters.applicationUser.experiments;
-
-            const variationNames = universes
-                .filter((item) => item.universeName === experimentUniverses.CONCEPT_FUNNEL)
-                .map((item) => item.variationName)
-                .filter(Boolean); // removes undefined/null
-
-            const conceptVariation = variationNames.length > 0 ? variationNames[0] : "";
-
-            const isConceptExposed = universes.find(
-                (item) => item.universeName === experimentUniverses.CONCEPT_FUNNEL
-            )?.isExposed;
-
-            const submittedOrder = baseMixin.methods.getSubmittedOrder();
-            const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
-            const hasSubmittedOrderAtConfirmationPage =
-                hasSubmittedOrder && currentPageName?.toLowerCase() == routeData.CONFIRMATION.name;
-
-            var payload = {
-                actionName: `Browser page:${currentPageName}`,
-                referralSequenceNumber: hasSubmittedOrderAtConfirmationPage
-                    ? submittedOrder.referralSequenceNumber
-                    : store.getters.order.referralSequenceNumber,
-                referralNumber: hasSubmittedOrderAtConfirmationPage
-                    ? submittedOrder.referralNumber
-                    : store.getters.order.referralNumber,
-                workOrderId: hasSubmittedOrderAtConfirmationPage
-                    ? submittedOrder.workOrderId
-                    : store.getters.order.workOrderId,
-                workOrderNumber: hasSubmittedOrderAtConfirmationPage
-                    ? submittedOrder.workOrderNumber
-                    : store.getters.order.workOrderNumber,
-                conceptVariation: conceptVariation,
-                isConceptExposed: isConceptExposed,
-            };
-
-            await baseMixin.methods.dispatchStoreAction(
-                storeActions.LOG_DIGITALCONSUMER,
-                payload,
-                false
-            );
-        },
-
         async pushEventForChatsToGA(category, action, label, pushToLogApp = false) {
             const currentPageName = getPageNameFromRouter();
             const value = `2.0_${currentPageName}`;
@@ -206,6 +161,11 @@ export default {
         // S3 bucket, safelite-dev-digitalconsumer-session-data-us-east-2/1.
         // This bucket data is then picked up by snowflake for analytics use.
         async pushFmgSessionData() {
+            var currentPageName = getPageNameFromRouter(true);
+            if (!currentPageName) {
+                return;
+            }
+
             const hasSubmittedOrder = baseMixin.methods.hasSubmittedOrder();
             const submittedOrder = baseMixin.methods.getSubmittedOrder();
             const order = hasSubmittedOrder ? submittedOrder : store.getters.order;
@@ -247,22 +207,6 @@ export default {
             }
 
             var appointment = `${order?.schedule?.date ?? ""} ${order?.schedule?.startTime ?? ""}`;
-            var currentPageName = getPageNameFromRouter();
-
-            // add query strings to the page name for debugging.  on the vehicle page, if from an external link, pull it from the stash
-            if (currentPageName === "vehicle") {
-                if (!window.location.search) {
-                    if (store.getters.externalParameterState?.qsStash) {
-                        currentPageName += `${store.getters.externalParameterState.qsStash}`;
-                    }
-                } else {
-                    currentPageName += `${window.location.search}`;
-                }
-            } else {
-                if (window.location.search) {
-                    currentPageName += `${window.location.search}`;
-                }
-            }
 
             var sessionData = {};
             sessionData.currentPage = currentPageName;
@@ -806,14 +750,14 @@ export default {
                             );
                             coupons = promoString;
                         }
-                        const serviceZipPackage = submittedOrder.lineItems?.supportingItems?.find(
+                        const additionalDiscounts = submittedOrder.lineItems?.supportingItems?.find(
-                            (x) => x.partType == "SERVICE PACKAGE DISCOUNT"
+                            (x) => x.partType == partTypeStrings.QUOTE_PAGE_DISCOUNT
                         );
-                        if (isDefined(serviceZipPackage)) {
+                        if (isDefined(additionalDiscounts)) {
                             if (coupons) {
                                 coupons += ",";
                             }
-                            coupons += serviceZipPackage.partNumber;
+                            coupons += additionalDiscounts.partNumber;
                         }
                         refSequenceNum = submittedOrder.referralSequenceNumber;
 
@@ -846,17 +790,17 @@ export default {
                         }
                     }
                 }
+                pushToDataLayerIfDefined({
+                    event: "commissionJunctionGtmData",
+                    commissionJunctionGtmData: {
+                        cj_commission_junction_event: cjEvent,
+                        cj_referral_sequence_number: refSequenceNum,
+                        cj_amount: amount.toFixed(2),
+                        cj_repair_replace: repairReplace,
+                        cj_coupon: coupons,
+                    },
+                });
             }
-            pushToDataLayerIfDefined({
-                event: "commissionJunctionGtmData",
-                commissionJunctionGtmData: {
-                    cj_commission_junction_event: cjEvent,
-                    cj_referral_sequence_number: refSequenceNum,
-                    cj_amount: amount.toFixed(2),
-                    cj_repair_replace: repairReplace,
-                    cj_coupon: coupons,
-                },
-            });
         },
 
         pushPageErrorToDataLayer(error) {
@@ -911,6 +855,9 @@ export default {
                     setSessionIdIfUnset(response.data.sessionId);
                 }
             }
+
+            // logging on session init so we capture complete query string data
+            await this.pushFmgSessionData();
         },
 
         noSession() {
@@ -977,7 +924,7 @@ function pushToDataLayerIfDefined(data) {
     }
 }
 
-function getPageNameFromRouter() {
+function getPageNameFromRouter(useDefaultUrl = false) {
     if (
         router &&
         router.currentRoute &&
@@ -987,7 +934,9 @@ function getPageNameFromRouter() {
         return router.currentRoute.value.name;
     }
 
-    return window.location.href.replace(/\/$/, "").split("/").pop();
+    return useDefaultUrl
+        ? window.location.search
+        : window.location.href.replace(/\/$/, "").split("/").pop();
 }
 
 function getValueToLog(value, valueToLogType) {

src/router/constants/navigation-scenarios.js

@@ -64,6 +64,7 @@ const navigationScenarios = {
     CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
     CLICKED_PAY_NOW_ADYEN: "CLICKED_PAY_NOW_ADYEN",
     CLICKED_PAY_LATER: "CLICKED_PAY_LATER",
+    CLICKED_SWITCH_TO_INSHOP: "CLICKED_SWITCH_TO_INSHOP",
     PIA_ERROR: "PIA_ERROR",
     PIA_CC_ERROR: "PIA_CC_ERROR",
     PIA_APPLE_ERROR: "PIA_APPLE_ERROR",

src/router/constants/routing-table.js

@@ -553,6 +553,10 @@ const routingTable = function () {
                     scenario: navigationScenarios.CLICKED_INSURANCE,
                     destinationPageData: routeData.INSURANCE_COMPANY,
                 },
+                {
+                    scenario: navigationScenarios.CLICKED_SWITCH_TO_INSHOP,
+                    destinationPageData: routeData.SCHEDULE,
+                },
             ],
         },
         {

src/router/methods/after-each.js

@@ -5,9 +5,6 @@ import { storeMutations } from "@/constants/store-mutations";
 export async function afterEach(to, from) {
     store.commit(storeMutations.UPDATE_LAST_PAGE_VISITED, to.name);
 
-    // digital consumer logging
-    analyticsMixin.methods.logDigitalConsumer();
-
     // digital consumer fmg session logging to snowflake
     analyticsMixin.methods.pushFmgSessionData();
 

src/router/methods/helpers/initialize-from-querystrings.js

@@ -95,6 +95,7 @@ function updateExternalParameterState() {
     }
     if (externalParameterZipCode) {
         store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
+        store.commit(storeMutations.UPDATE_IS_EXTERNAL_PARAMETER, externalParameterStatus.ACTIVE);
     }
     if (externalParameterEmail) {
         store.commit(

src/router/methods/route-logic/error.js

@@ -19,7 +19,6 @@ export async function errorBeforeEnter(to, from) {
             nextPage: to?.name,
         };
 
-        analyticsMixin.methods.logDigitalConsumer();
         await handleHardError(errorPayload);
         return;
     }
@@ -33,7 +32,6 @@ export async function errorBeforeEnter(to, from) {
             nextPage: to?.name,
         };
 
-        analyticsMixin.methods.logDigitalConsumer();
         await handleHardError(errorPayload);
         return;
     } else {

src/store/index.js

@@ -59,7 +59,7 @@ import {
 } from "@/helpers/recal-helper";
 import { externalParameterStatus } from "@/constants/external-parameters";
 import { experimentSettings } from "@/constants/experiments";
-import { addPricesToLineItems } from "@/helpers/pricing-helper";
+import { addPricesToLineItems, getAmountDue } from "@/helpers/pricing-helper";
 
 // Export State
 const getDefaultState = () => {
@@ -192,6 +192,7 @@ const getDefaultState = () => {
             isRecalAckOptIn: false,
             isRecalAcknowledgedForScheduling: "",
             isMSRFeeApplicable: false,
+            isMSRFeeCoveredByInsurance: false,
         },
         applicationUser: {
             eventBus: [],
@@ -207,6 +208,12 @@ const getDefaultState = () => {
             loggingOption: false,
             hasAlreadyTriggeredError: false,
         },
+        idempotencyKeyFields: {
+            referralCorrelationId: null,
+            totalInCents: 0,
+            expiryTime: null,
+            idempotencyKey: null,
+        },
     };
 };
 
@@ -353,6 +360,9 @@ export const mutations = {
     updateIsMSRFeeApplicable(state, isMSRFeeApplicable) {
         state.order.isMSRFeeApplicable = isMSRFeeApplicable;
     },
+    updateIsMSRFeeCoveredByInsurance(state, isMSRFeeCoveredByInsurance) {
+        state.order.isMSRFeeCoveredByInsurance = isMSRFeeCoveredByInsurance;
+    },
     updateCashPriceSubTotal(state, cashPriceSubTotal) {
         state.order.cashPriceSubTotal =
             cashPriceSubTotal === "" ? null : cashPriceSubTotal.toString();
@@ -862,6 +872,15 @@ export const mutations = {
     updateHasTriggeredError(state, hasTriggeredError) {
         state.applicationUser.hasAlreadyTriggeredError = hasTriggeredError;
     },
+    updateIdempotencyKey(
+        state,
+        { idempotencyKey, referralCorrelationId, totalInCents, expiryTime }
+    ) {
+        state.idempotencyKeyFields.idempotencyKey = idempotencyKey;
+        state.idempotencyKeyFields.referralCorrelationId = referralCorrelationId;
+        state.idempotencyKeyFields.totalInCents = totalInCents;
+        state.idempotencyKeyFields.expiryTime = expiryTime;
+    },
 };
 
 // Export Getters
@@ -1105,6 +1124,35 @@ export const getters = {
             state.order.customer.emailAddress
         );
     },
+
+    isIdempotencyKeyValid: (state) => {
+        if (!state.idempotencyKeyFields?.idempotencyKey) {
+            return false;
+        }
+
+        const referralCorrelationId = state.order?.referralCorrelationId;
+        if (
+            !referralCorrelationId ||
+            referralCorrelationId !== state.idempotencyKeyFields?.referralCorrelationId
+        ) {
+            return false;
+        }
+
+        const total = getAmountDue(state.order?.lineItems);
+        const totalInCents = Math.round(total * 100);
+        if (totalInCents !== state.idempotencyKeyFields?.totalInCents) {
+            return false;
+        }
+
+        const currentTime = new Date();
+        const expiryTime = new Date(state.idempotencyKeyFields.expiryTime);
+        if (!expiryTime || expiryTime.getTime() < currentTime.getTime()) {
+            return false;
+        }
+
+        // If all checks pass, then the key is valid.
+        return true;
+    },
 };
 
 // Export Actions
@@ -1586,38 +1634,6 @@ export const actions = {
         });
     },
 
-    logDigitalConsumer(
-        context,
-        {
-            actionName,
-            referralSequenceNumber,
-            referralNumber,
-            workOrderId,
-            workOrderNumber,
-            conceptVariation,
-            isConceptExposed,
-        }
-    ) {
-        var payload = {
-            sessionId: getSessionIdValue(),
-            deviceId: getDeviceIdValue(),
-            actionName: actionName ?? "",
-            referralSequenceNumber: referralSequenceNumber ?? "",
-            referralNumber: referralNumber ?? "",
-            applicationName: baseMixin.methods.isMobileDevice() ? "2.0 Mobile" : "2.0",
-            workOrderId: workOrderId ?? "",
-            workOrderNumber: workOrderNumber ?? "",
-            conceptVariation: conceptVariation,
-            isConceptExposed: isConceptExposed,
-        };
-
-        return globalMethods.callHttpClient({
-            method: endpoints.LogDigitalConsumer.method,
-            endpoint: endpoints.LogDigitalConsumer.url,
-            payload: payload,
-        });
-    },
-
     logFmgSessionData(
         context,
         {
@@ -1726,6 +1742,7 @@ export const actions = {
             method: endpoints.LogFmgSessionData.method,
             endpoint: endpoints.LogFmgSessionData.url,
             payload: payload,
+            logApiCall: false,
         });
     },
 
@@ -2567,6 +2584,7 @@ export const actions = {
                     lockToken: order.lockToken,
                     isRecalAckOptIn: order.isRecalAckOptIn,
                     isMSRFeeApplicable: order.isMSRFeeApplicable,
+                    isMSRFeeCoveredByInsurance: order.isMSRFeeCoveredByInsurance,
                     cashPriceSubTotal: order.cashPriceSubTotal,
                 },
             },
@@ -2999,6 +3017,13 @@ export const actions = {
         context.commit(storeMutations.UPDATE_IS_MSR_FEE_APPLICABLE, isMSRFeeApplicable);
     },
 
+    saveIsMSRFeeCoveredByInsurance(context, isMSRFeeCoveredByInsurance) {
+        context.commit(
+            storeMutations.UPDATE_IS_MSR_FEE_COVERED_BY_INSURANCE,
+            isMSRFeeCoveredByInsurance
+        );
+    },
+
     saveParentAccountNumber(context, parentAccountNumber) {
         context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, parentAccountNumber);
     },
@@ -3665,6 +3690,63 @@ export const actions = {
     updateHasTriggeredError(context, hasAlreadyTriggeredError) {
         context.commit(storeMutations.UPDATE_HAS_TRIGGERED_ERROR, hasAlreadyTriggeredError);
     },
+
+    getValidIdempotencyKey(context) {
+        if (context.getters.isIdempotencyKeyValid) {
+            return context.state.idempotencyKeyFields.idempotencyKey;
+        }
+
+        // If invalid, need to regenerate.
+        const referralCorrelationId = context.state.order?.referralCorrelationId;
+        if (!referralCorrelationId) {
+            // Can't generate!
+            return null;
+        }
+
+        const total = getAmountDue(context.state.order?.lineItems);
+        const totalInCents = Math.round(total * 100);
+        if (Number.isNaN(totalInCents)) {
+            // Can't generate!
+            return null;
+        }
+
+        const currentTime = new Date();
+        const nextHour = currentTime.getUTCHours() + 1;
+        currentTime.setUTCHours(nextHour);
+
+        const newId = crypto.randomUUID();
+
+        const newKeyInfo = {
+            idempotencyKey: newId,
+            referralCorrelationId: referralCorrelationId,
+            totalInCents: totalInCents,
+            expiryTime: currentTime,
+        };
+
+        context.commit(storeMutations.UPDATE_IDEMPOTENCY_KEY, newKeyInfo);
+
+        return newId;
+    },
+
+    correctIdempotencyKeyExpiry(context, expiryTime) {
+        if (!context.getters.isIdempotencyKeyValid) {
+            return;
+        }
+
+        const currentExpiryTime = new Date(context.state.idempotencyKeyFields.expiryTime);
+        const expiryTimeAsDate = new Date(expiryTime);
+
+        if (expiryTimeAsDate.getTime() < currentExpiryTime.getTime()) {
+            const existingKey = context.state.idempotencyKeyFields;
+            const newKey = {
+                referralCorrelationId: existingKey.referralCorrelationId,
+                totalInCents: existingKey.totalInCents,
+                idempotencyKey: existingKey.idempotencyKey,
+                expiryTime: expiryTimeAsDate,
+            };
+            context.commit(storeMutations.UPDATE_IDEMPOTENCY_KEY, newKey);
+        }
+    },
 };
 
 export default createStore({

src/ux-components/alert/alert.vue

@@ -7,9 +7,15 @@
             isDismissible ? 'alert-dismissible' : '',
             this.alertClass,
             this.cssClassNameForCmsWidget,
+            this.hasBorder ? 'bordered' : '',
         ]">
         <p class="mx-6 my-0 fw-bold alert-heading">
             <img v-if="showInfoIcon" :src="infoIcon" alt="Info Icon" class="info-icon" />
+            <img
+                v-if="showWarningIcon"
+                :src="warningIcon"
+                alt="Warning Icon"
+                class="warning-icon" />
             {{ alertHeadline }}
         </p>
         <hr v-if="showHorizontalRow" />
@@ -63,7 +69,9 @@ export default {
     name: "alert",
     props: {
         showInfoIcon: Boolean,
+        showWarningIcon: Boolean,
         showHorizontalRow: Boolean,
+        hasBorder: Boolean,
         isDismissible: Boolean,
         alertClass: String,
         /*
@@ -96,6 +104,9 @@ export default {
         infoIcon() {
             return require(`@/assets/img/icons/info-circle-blue.svg`);
         },
+        warningIcon() {
+            return require(`@/assets/img/icons/alert-circle-yellow.svg`);
+        },
         pageQueryString() {
             return applicationConfig.PAGE_QUERYSTRING;
         },
@@ -211,12 +222,19 @@ export default {
         background-color: $yellow-100;
         .alert-heading {
             color: $yellow-600;
+
+            .warning-icon {
+                height: 1rem;
+            }
         }
         svg {
             fill: $yellow-600;
             width: 1rem;
             height: 1rem;
         }
+        hr {
+            border-color: $yellow-800;
+        }
     }
     &.alert-success {
         background-color: $green-100;
@@ -229,6 +247,9 @@ export default {
             height: 1rem;
         }
     }
+    &.bordered {
+        border: 1px solid;
+    }
     & p {
         font-size: 0.875rem;
     }