Merge branch 'develop' of https://github.com/Safelite/DigitalConsumer.ISS into feature/digital/SSR-1135.4

src/constants/query-strings.js

@@ -1,5 +1,21 @@
 const queryStrings = Object.freeze({
-    ISS_PAGE: 'issPage'
+    ISS_PAGE: 'issPage',
+    AUTH_CODE: 'auth_code',
+    BILL_TO_FIRST_NAME: 'billto_firstname',
+    BILL_TO_LAST_NAME: 'billto_lastname',
+    BILL_TO_POSTAL_CODE: 'billto_postalcode',
+    CARD_EXPIRATION_MONTH: 'card_expirationmonth',
+    CARD_EXPIRATION_YEAR: 'card_expirationyear',
+    CARD_TYPE: 'sgcardtype',
+    DISPLAY_PAY_IN_ADVANCE_ALERT: 'displayPayInAdvanceAlert',
+    ERROR: 'error',
+    LAST_FOUR: 'last_four',
+    REFERENCE_NUMBER: 'req_reference_number',
+    REFERRAL_SEQ_NUM: 'referralseqnum',
+    SUBSCRIPTIONID: 'subscriptionid',
+    TRANS_REFERENCE_NUMBER: 'auth_trans_ref_no',
+    TRANSACTION_ID: 'transaction_id'
+
 });
 
 export default queryStrings;

src/constants/web-storage-constants.js

@@ -0,0 +1,5 @@
+const webStorageConstants = Object.freeze({
+    SUBMITTED_ORDER: 'submittedOrder'
+});
+
+export default webStorageConstants;

src/helpers/order-helper.js

@@ -1,24 +1,6 @@
 import { useMainStore } from '@/store';
 import { updateOrCreateISSCookie } from '@/helpers/cookie-helper';
 
-/*
-    Will call API to save existing order, or create new one depending where it's called from.
-    This will also set Referral information in the store after saving, and then
-    update the cookie. To force synchronous behavior pass in 'true' for shouldAwaitSaveSessionQueue
-*/
-export async function saveSession({ shouldAwaitSaveSessionQueue = false }) {
-    const store = useMainStore();
-    var saveSessionPromise = store.applicationUser.saveSessionPromise 
-        ? store.applicationUser.saveSessionPromise.then(() => { return saveSessionHelper(store); }) 
-        : saveSessionHelper(store);
-
-    store.setSaveSessionPromise(saveSessionPromise);
-
-    if (!store.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
-        await saveSessionPromise;
-    }
-}
-
 /*
     Encapsulates asynchronous Save Session logic inside a promise to allow for Save Session queuing
 */
@@ -29,3 +11,38 @@ async function saveSessionHelper(store) {
     }
     updateOrCreateISSCookie();
 }
+
+/*
+    Will call API to save existing order, or create new one depending where it's called from.
+    This will also set Referral information in the store after saving, and then
+    update the cookie. To force synchronous behavior pass in 'true' for shouldAwaitSaveSessionQueue
+*/
+export async function saveSession({ shouldAwaitSaveSessionQueue = false }) {
+    const store = useMainStore();
+    const saveSessionPromise = store.applicationUser.saveSessionPromise
+        ? store.applicationUser.saveSessionPromise.then(() => saveSessionHelper(store))
+        : saveSessionHelper(store);
+
+    store.setSaveSessionPromise(saveSessionPromise);
+
+    if (!store.applicationUser.savedSessionId || shouldAwaitSaveSessionQueue) {
+        await saveSessionPromise;
+    }
+}
+
+/*
+    Will determine if to submitWorkOrder.
+    TODO: Add more description to this
+*/
+export async function submitWorkOrder({
+    pageNameToLog,
+    submitAfterSave = false,
+    createDeleteStatusWorkOrderForPia = false
+}) {
+    await saveSession({
+        pageNameToLog,
+        shouldAwaitSaveSessionQueue: true,
+        submitAfterSave,
+        createDeleteStatusWorkOrderForPia
+    });
+}

src/helpers/querystring-helper.js

@@ -0,0 +1,11 @@
+export default function getQueryStringParameter(key) {
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+    const lowerCaseParams = new URLSearchParams();
+
+    urlParams.forEach((value, name) => {
+        lowerCaseParams.append(name.toLowerCase(), value);
+    });
+
+    return lowerCaseParams.get(key.toLowerCase());
+}

src/layouts/order-confirmation/order-confirmation.spec.js

@@ -12,7 +12,8 @@ import { createTestingPinia } from '@pinia/testing';
 jest.mock('@/helpers/layout-helper.js', () => jest.fn());
 
 jest.mock('@/helpers/cms-content-helper', () => ({
-    fetchCmsContentForPage: jest.fn()
+    fetchCmsContentForPage: jest.fn(),
+    processIfStatements: jest.fn()
 }));
 const wordingText = 'wording Text {custom:address}';
 
@@ -34,12 +35,18 @@ const headerStub = {
     render: () => {}
 };
 
+const vehicleBannerStub = {
+    render: () => {}
+};
+
 const initialStore = {
     order: {
         schedule: {
             date: '2024-03-01',
             startTime: '09:00',
-            endTime: '10:00'
+            endTime: '10:00',
+            jobMinMinutes: 60,
+            jobMaxMinutes: 90
         },
         serviceLocation: {
             address: '123 Test Way',
@@ -70,7 +77,8 @@ function getMountedComponent(mainInitialState = {}, initialData = {}, methodToRu
 
     mountOptions.global.stubs = {
         siteFooter: footerStub,
-        siteHeader: headerStub
+        siteHeader: headerStub,
+        vehicleBanner: vehicleBannerStub
     };
 
     const testingPinia = createTestingPinia({
@@ -110,6 +118,16 @@ describe('OrderConfirmation.vue', () => {
             // Assert
             expect(siteHeader.exists()).toBe(true);
         });
+        test('Should render Vehicle Banner', () => {
+            // Arrange
+            const { wrapper } = getMountedComponent(initialStore);
+
+            // Act
+            const vehicleBanner = wrapper.findComponent(vehicleBannerStub);
+
+            // Assert
+            expect(vehicleBanner.exists()).toBe(true);
+        });
         test('If Advanced flow, should display Site Footer', () => {
             // Arrange
             const testStore = {
@@ -215,7 +233,7 @@ describe('OrderConfirmation.vue', () => {
                         endTime: '10:00'
                     },
                     serviceLocation: {
-                        appointmentType: 'Drop Off'
+                        appointmentType: 'Dropoff'
                     }
                 }
             };
@@ -282,7 +300,7 @@ describe('OrderConfirmation.vue', () => {
                                 zipCode: '12345'
                             }
                         },
-                        appointmentType: 'Drop Off'
+                        appointmentType: 'Dropoff'
                     }
                 }
             };
@@ -324,5 +342,74 @@ describe('OrderConfirmation.vue', () => {
             // Assert
             expect(testValue).toEqual('<br/>123 Safelite Street,<br/> Mesa, AZ 12345<br/>');
         });
+        test('appointmentWordingText2 should return Mobile text in expected format', () => {
+            // Arrange
+            const testStore = {
+                order: {
+                    schedule: {
+                        date: '2019-01-01',
+                        startTime: '09:00',
+                        endTime: '10:00'
+                    },
+                    serviceLocation: {
+                        address: '123 Test Way',
+                        address2: '#1',
+                        city: 'Mesa',
+                        state: 'AZ',
+                        zipCode: '12345',
+                        appointmentType: 'Mobile'
+                    }
+                }
+            };
+            const { wrapper } = getMountedComponent(testStore);
+
+            // Act
+            const testValue = wrapper.vm.appointmentWordingText2;
+
+            // Assert
+            expect(testValue).toEqual(wordingText);
+        });
+        test('appointmentWordingText2 should return Drop Off and text in expected format', () => {
+            // Arrange
+            const testStore = {
+                order: {
+                    schedule: {
+                        date: '2019-01-01',
+                        startTime: '09:00',
+                        endTime: '10:00'
+                    },
+                    serviceLocation: {
+                        provider: {
+                            address: {
+                                streetAddress: '123 Safelite Street',
+                                city: 'Mesa',
+                                state: 'AZ',
+                                zipCode: '12345'
+                            }
+                        },
+                        appointmentType: 'Dropoff'
+                    }
+                }
+            };
+            const { wrapper } = getMountedComponent(testStore);
+
+            // Act
+            const testValue = wrapper.vm.appointmentWordingText2;
+            const expected = wrapper.vm.getBodyText2FromCms('Test Widget');
+
+            // Assert
+            expect(testValue).toEqual(expected);
+        });
+        test('appointmentWordingText2 should return In Shop text in expected format', () => {
+            // Arrange
+            const { wrapper } = getMountedComponent(initialStore);
+
+            // Act
+            const testValue = wrapper.vm.appointmentWordingText2;
+            const expected = wrapper.vm.getBodyText2FromCms('Test Widget');
+
+            // Assert
+            expect(testValue).toEqual(expected);
+        });
     });
 });

src/layouts/order-confirmation/order-confirmation.vue

@@ -26,9 +26,13 @@
                             <p>{{ appointmentTimeFormatted }}</p>
                         </div>
                         <div
-                            class="appointment-text text-center text-color--black lh-base"
+                            class="appointment-text text-center lh-base"
                             v-html="appointmentWordingText">
                         </div>
+                        <div
+                            class="appointment-text text-center lh-base mt-2"
+                            v-html="appointmentWordingText2">
+                        </div>
                     </div>
                     <siteFooter
                         v-if="carrierUrl"
@@ -49,13 +53,15 @@ import siteHeader from '@/iss-components/site-header/site-header.vue';
 import vehicleBanner from '@/iss-components/vehicle-banner/vehicle-banner.vue';
 import siteFooter from '@/iss-components/site-footer/site-footer.vue';
 // Supporting files
-import { fetchCmsContentForPage } from '@/helpers/cms-content-helper';
+import { fetchCmsContentForPage, processIfStatements } from '@/helpers/cms-content-helper';
 import settleAllPromises from '@/helpers/layout-helper';
 import { Form } from 'vee-validate';
 import BaseFormMixin from '@/mixins/base-form-mixin.js';
 import { useMainStore } from '@/store';
-import { get12HourTimeFormat, get12HourTimeMobileFormat, convertDateStringToDate } from '@/helpers/date-helper.js';
+import { get12HourTimeFormat, get12HourTimeMobileFormat, convertDateStringToDate,
+    getDisplayTextForDurationLength } from '@/helpers/date-helper.js';
 import { toTitleCase } from '@/helpers/text-helper.js';
+import { AppointmentTypeStrings } from '@/constants/schedule-constants';
 
 export default {
     name: 'order-confirmation',
@@ -100,7 +106,7 @@ export default {
             return this.getCmsContent('OrderConfirmationContent', 'Image');
         },
         appointmentType() {
-            return this.mainStore.order.serviceLocation.appointmentType.toUpperCase();
+            return this.mainStore.order.serviceLocation.appointmentType;
         },
         appointmentDate() {
             return this.mainStore.order.schedule.date;
@@ -128,9 +134,15 @@ export default {
         mobileWordingText() {
             return this.getCmsContent('MobileWordingWidget', 'BodyText');
         },
+        mobileWordingText2() {
+            return this.getCmsContent('MobileWordingWidget', 'BodyText2');
+        },
         dropOffAndInShopWordingText() {
             return this.getCmsContent('DropOffAndInShopWordingWidget', 'BodyText');
         },
+        dropOffAndInShopWordingText2() {
+            return this.getBodyText2FromCms('DropOffAndInShopWordingWidget');
+        },
         serviceLocationAddress() {
             return this.mainStore.order.serviceLocation.address;
         },
@@ -167,7 +179,58 @@ export default {
             return `<br/>${this.providerAddress},<br/> ${this.providerCity}, ${this.providerState} ${this.providerZipCode}<br/>`;
         },
         appointmentWordingText() {
-            return this.formatWordingText(this.appointmentType);
+            switch (this.appointmentType) {
+                case AppointmentTypeStrings.MOBILE:
+                case AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP:
+                    return this.mobileWordingText?.replaceAll(
+                        '{custom:address}',
+                        this.serviceLocationFullAddress
+                    );
+                case AppointmentTypeStrings.DROP_OFF:
+                    return this.dropOffAndInShopWordingText?.replaceAll(
+                        '{custom:address}',
+                        this.providerFullAddress
+                    );
+                case AppointmentTypeStrings.IN_SHOP:
+                    return this.dropOffAndInShopWordingText?.replaceAll(
+                        '{custom:address}',
+                        this.providerFullAddress
+                    );
+                default:
+                    return null;
+            }
+        },
+        appointmentWordingText2() {
+            switch (this.appointmentType) {
+                case AppointmentTypeStrings.MOBILE:
+                case AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP:
+                    return this.mobileWordingText2;
+                case AppointmentTypeStrings.DROP_OFF:
+                    return this.dropOffAndInShopWordingText2;
+                case AppointmentTypeStrings.IN_SHOP:
+                    return this.dropOffAndInShopWordingText2?.replaceAll(
+                        '{custom:inShopDuration}',
+                        this.inShopAppointmentDuration
+                    );
+                default:
+                    return null;
+            }
+        },
+        mobileAppointment() {
+            return this.mainStore.isMobileAppointment;
+        },
+        inShopAppointment() {
+            return this.mainStore.isInShopAppointment;
+        },
+        dropOffAppointment() {
+            return this.mainStore.isDropOffAppointment;
+        },
+        inShopAppointmentDuration() {
+            const inshopDurationTime = getDisplayTextForDurationLength(
+                this.mainStore.order.schedule.jobMinMinutes,
+                this.mainStore.order.schedule.jobMaxMinutes
+            );
+            return inshopDurationTime;
         }
     },
     mounted() {
@@ -181,34 +244,29 @@ export default {
         },
         formatAppointmentTime(appointmentType) {
             switch (appointmentType) {
-                case 'MOBILE':
+                case AppointmentTypeStrings.MOBILE:
+                case AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP:
                     // eslint-disable-next-line max-len
                     return `Between ${get12HourTimeMobileFormat(this.appointmentStartTime)} - ${get12HourTimeMobileFormat(this.appointmentEndTime)}`;
-                case 'DROP OFF':
+                case AppointmentTypeStrings.DROP_OFF:
                     return 'Drop off before 9:30 AM';
-                case 'INSHOP':
+                case AppointmentTypeStrings.IN_SHOP:
                     return `at ${get12HourTimeFormat(this.appointmentStartTime)}`;
                 default:
                     return null;
             }
         },
-        formatWordingText(appointmentType) {
+        processIfStatements,
-            switch (appointmentType) {
+        getBodyText2FromCms(cmsWidgetName) {
-                case 'MOBILE':
+            const body2Text = this.getCmsContent(cmsWidgetName, 'BodyText2');
-                    return this.mobileWordingText?.replaceAll(
+            return this.processIfStatements(body2Text, 'custom', this.getCustomValueFromString);
-                        '{custom:address}',
+        },
-                        this.serviceLocationFullAddress
+        getCustomValueFromString(str) {
-                    );
+            switch (str) {
-                case 'DROP OFF':
+                case 'inShopAppointment':
-                    return this.dropOffAndInShopWordingText?.replaceAll(
+                    return this.inShopAppointment;
-                        '{custom:address}',
+                case 'dropOffAppointment':
-                        this.providerFullAddress
+                    return this.dropOffAppointment;
-                    );
-                case 'INSHOP':
-                    return this.dropOffAndInShopWordingText?.replaceAll(
-                        '{custom:address}',
-                        this.providerFullAddress
-                    );
                 default:
                     return null;
             }
@@ -254,6 +312,7 @@ $page-side-padding: 1.5rem;
 .appointment-text {
     :deep(strong) {
         font-weight: $font-weight-bold;
+        color: $black;
     }
 }
 </style>

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

@@ -178,7 +178,8 @@ export default {
                 && providerLocation.zipCode
             );
 
-            const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE;
+            const isMobile = serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE
+             || serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP;
             const serviceLocationReqs =
                 (isMobile && mobileReqs) || (!isMobile && dropOffInshopReqs);
 

src/layouts/payment-page/payment-page.vue

@@ -460,15 +460,11 @@ export default {
     computed: {
         payInAdvanceResponseUrl() {
             const { protocol, host } = window.location;
-            return `${protocol}//${host}/?issPage=${
+            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_RETURN}&src=iss-nextgen`;
-                issPageValues.PAYMENT_RETURN
-            }&src=iss-nextgen`;
         },
         payInAdvanceCancelUrl() {
             const { protocol, host } = window.location;
-            return `${protocol}//${host}/?issPage=${
+            return `${protocol}//${host}/?issPage=${issPageValues.PAYMENT_METHOD}&src=iss-nextgen`;
-                issPageValues.PAYMENT_METHOD
-            }&src=iss-nextgen`;
         },
         dynamicCSSUrl() {
             const { protocol, hostname, port } = window.location;

src/layouts/payment-return/payment-return.vue

@@ -0,0 +1,143 @@
+<template>
+    <Form
+        ref="theForm"
+        @submit="onSubmit"
+        @invalidSubmit="onInvalidSubmit">
+    </Form>
+</template>
+
+<script>
+import { Form } from 'vee-validate';
+import BaseFormMixin from '@/mixins/base-form-mixin.js';
+import { useMainStore } from '@/store/index.js';
+import queryStrings from '@/constants/query-strings';
+import getQueryStringParameter from '@/helpers/querystring-helper.js';
+import { paymentMethods } from '@/constants/payment-method-constants.js';
+import { submitWorkOrder } from '@/helpers/order-helper.js';
+import showIssLoadingModal from '@/helpers/loading-modal-helper';
+
+export default {
+    name: 'payment-return',
+    components: {
+        // eslint-disable-next-line vue/no-reserved-component-names
+        Form
+    },
+    mixins: [BaseFormMixin],
+    computed: {
+        creditCardToken() {
+            return {
+                subscriptionId: getQueryStringParameter(queryStrings.SUBSCRIPTIONID),
+                expMonth: getQueryStringParameter(queryStrings.CARD_EXPIRATION_MONTH),
+                expYear: getQueryStringParameter(queryStrings.CARD_EXPIRATION_YEAR),
+                cardType: getQueryStringParameter(queryStrings.CARD_TYPE),
+                billToPostalCode: getQueryStringParameter(queryStrings.BILL_TO_POSTAL_CODE),
+                billToFirstName: getQueryStringParameter(queryStrings.BILL_TO_FIRST_NAME),
+                billToLastName: getQueryStringParameter(queryStrings.BILL_TO_LAST_NAME),
+                referenceNumber: getQueryStringParameter(queryStrings.REFERENCE_NUMBER),
+                authCode: getQueryStringParameter(queryStrings.AUTH_CODE),
+                transactionId: getQueryStringParameter(queryStrings.TRANSACTION_ID),
+                transReferenceNumber: getQueryStringParameter(queryStrings.TRANS_REFERENCE_NUMBER),
+                lastFour: getQueryStringParameter(queryStrings.LAST_FOUR)
+            };
+        }
+    },
+    async mounted() {
+        showIssLoadingModal(true);
+        const payInAdvanceError = getQueryStringParameter(queryStrings.ERROR);
+        const { payInAdvanceType } = useMainStore().order.payment;
+
+        if (payInAdvanceError) {
+            console.error(`Error during payment: ${payInAdvanceError}`);
+            const paymentPageNavScenario =
+                payInAdvanceType === paymentMethods.CREDIT_CARD || payInAdvanceType === paymentMethods.AFTERPAY;
+            if (paymentPageNavScenario) {
+                this.$router.navigate(
+                    this.navigationScenarios.PAY_IN_ADVANCE_CREDIT_CARD_ERROR,
+                    this.$route,
+                    {
+                        [queryStrings.DISPLAY_PAY_IN_ADVANCE_ALERT]: payInAdvanceType
+                    }
+                );
+            } else {
+                this.$router.navigate(
+                    this.navigationScenarios.PAY_IN_ADVANCE_ERROR,
+                    this.$route,
+                    {
+                        [queryStrings.DISPLAY_PAY_IN_ADVANCE_ALERT]: true
+                    }
+                );
+            }
+        } else {
+            switch (payInAdvanceType) {
+                case paymentMethods.CREDIT_CARD:
+                case paymentMethods.AFTERPAY:
+                    await this.processCreditCardResponse();
+                    break;
+                case paymentMethods.PAYPAL:
+                    break;
+                default:
+                    console.log(`Unknown pay in advance type: ${payInAdvanceType}`);
+                    this.$router.navigate(
+                        this.navigationScenarios.PAY_IN_ADVANCE_ERROR,
+                        this.$route,
+                        {
+                            [queryStrings.DISPLAY_PAY_IN_ADVANCE_ALERT]: true
+                        }
+                    );
+            }
+        }
+    },
+    methods: {
+        arePagePrerequisitesValid() {
+            return true;
+        },
+        navigateOnPayInAdvanceError() {
+            this.$router.navigate(
+                this.navigationScenarios.PAY_IN_ADVANCE_ERROR,
+                this.$route,
+                {
+                    [queryStrings.DISPLAY_PAY_IN_ADVANCE_ALERT]: true
+                }
+            );
+        },
+        async processPaypalResponse() {
+            const token = getQueryStringParameter(queryStrings.TOKEN);
+            this.mainStore.updatePaypalToken(token);
+
+            await this.saveAndSubmitWorkOrder();
+        },
+        async processCreditCardResponse() {
+            const referralSeqNum = getQueryStringParameter(queryStrings.REFERRAL_SEQ_NUM);
+            if (referralSeqNum !== useMainStore().order.referralSequenceNumber) {
+                console.error(`error: unknown ref:${referralSeqNum} ${useMainStore().order.referralSequenceNumber}`);
+                this.navigateOnPayInAdvanceError();
+            } else {
+                useMainStore().updateCreditCardToken(this.creditCardToken);
+                await this.saveAndSubmitWorkOrder();
+            }
+        },
+        async saveAndSubmitWorkOrder() {
+            // Final work order submit after returning from pay in advance.
+            useMainStore().resetSubmittedOrder();
+            try {
+                await submitWorkOrder({
+                    pageNameToLog: 'payment-return',
+                    submitAfterSave: true
+                });
+            } catch (error) {
+                console.error(`error: response from submit work order:${error.message}`);
+                this.navigateOnPayInAdvanceError();
+                showIssLoadingModal(false);
+                return;
+            }
+
+            showIssLoadingModal(false);
+            useMainStore().createSubmittedOrder();
+            this.$router.navigate(
+                this.navigationScenarios.PAY_IN_ADVANCE_SUCCESS,
+                this.$route
+            );
+        }
+    }
+};
+</script>

src/router/index.js

@@ -2,7 +2,7 @@
 import { createWebHistory, createRouter } from 'vue-router';
 import lazyLoadComponent from '@/router/dynamic-routing/component-loader';
 import issPageValues from '@/router/router-constants/issPage-values';
-import { routingTable } from '@/router/router-constants/routing-table';
+import routingTable from '@/router/router-constants/routing-table';
 import { useMainStore } from '@/store';
 import eventBus from '@/helpers/event-bus/event-bus';
 import { globalEvents, globalEventTypes } from '@/constants/events';
@@ -16,11 +16,9 @@ import showIssLoadingModal from '@/helpers/loading-modal-helper';
 import analyticsMixin from '@/mixins/analytics-mixin';
 import { saveSession } from '@/helpers/order-helper.js';
 import routerParams from '@/router/router-constants/router-params';
-import bailoutCode from '@/constants/bailoutCode';
+import canBailoutNavigateBack from '@/helpers/bailout-helper';
-import IssPageValues from '@/router/router-constants/issPage-values';
+import bailoutMessage from '@/constants/bailoutMessage';
 import navigationScenarios from './router-constants/navigation-scenarios';
-import canBailoutNavigateBack from "@/helpers/bailout-helper";
-import bailoutMessage from "@/constants/bailoutMessage";
 
 const routes = [
     {
@@ -129,7 +127,7 @@ router.beforeEach(async (to, from) => {
         showIssLoadingModal(true);
     }
 
-    const isInIframe = fromQueryPage === IssPageValues.PAYMENT_PAGE;
+    const isInIframe = fromQueryPage === issPageValues.PAYMENT_PAGE;
     if (isInIframe) {
         // need to set window.top.location.href directly when navigating out of an iframe
         // especially when navigating with browser buttons
@@ -139,7 +137,7 @@ router.beforeEach(async (to, from) => {
 
     const store = useMainStore();
     // Prevent navigating backwards if we enter a bailout that we are not allowed to go back on
-    if (store.isBailout && from.name === IssPageValues.BAILOUT_PAGE && to.name !== 'root' && to.name !== IssPageValues.CONTACT_CONFIRMATION
+    if (store.isBailout && from.name === issPageValues.BAILOUT_PAGE && to.name !== 'root' && to.name !== issPageValues.CONTACT_CONFIRMATION
         && !canBailoutNavigateBack()) {
         return false;
     }

src/router/router-constants/navigation-scenarios.js

@@ -96,6 +96,9 @@ const navigationScenarios = Object.freeze({
 
     // Payment
     CLICKED_PAY_NOW: 'CLICKED_PAY_NOW',
+    PAY_IN_ADVANCE_ERROR: 'PAY_IN_ADVANCE_ERROR',
+    PAY_IN_ADVANCE_CREDIT_CARD_ERROR: 'PAY_IN_ADVANCE_CREDIT_CARD_ERROR',
+    PAY_IN_ADVANCE_SUCCESS: 'PAY_IN_ADVANCE_SUCCESS',
 
     // Bailout
     CLICKED_FORWARD_WITH_BAILOUT: 'CLICKED_FORWARD_WITH_BAILOUT'

src/router/router-constants/routing-table.js

@@ -641,6 +641,23 @@ const routingTable = () => [
             }
         ]
     },
+    {
+        issPageValue: issPageValues.PAYMENT_RETURN,
+        maps: [
+            {
+                scenario: navigationScenarios.PAY_IN_ADVANCE_ERROR,
+                destinationIssPageValue: issPageValues.PAYMENT_METHOD
+            },
+            {
+                scenario: navigationScenarios.PAY_IN_ADVANCE_CREDIT_CARD_ERROR,
+                destinationIssPageValue: issPageValues.PAYMENT_PAGE
+            },
+            {
+                scenario: navigationScenarios.PAY_IN_ADVANCE_SUCCESS,
+                destinationIssPageValue: issPageValues.CONFIRMATION
+            }
+        ]
+    },
     {
         issPageValue: issPageValues.TPA_CONFIRMATION,
         maps: [
@@ -746,4 +763,4 @@ const routingTable = () => [
 
 ];
 
-export { routingTable };
+export default routingTable;

src/store/index.js

@@ -14,6 +14,7 @@ import coverageStatuses from '@/constants/coverage-statuses';
 import { AppointmentTypeStrings } from '@/constants/schedule-constants';
 import { convertDateStringToDate, getDateDifferenceInDays, militaryToTwelveHourTime } from '@/helpers/date-helper';
 import { paymentMethods } from '@/constants/payment-method-constants';
+import webStorageConstants from '@/constants/web-storage-constants';
 import {
     deductibleForSelectedVehicle, endorsementsForSelectedVehicle,
     noCoverageForSelectedVehicle,
@@ -155,7 +156,22 @@ const getDefaultState = () => ({
             },
             parentAccountNumber: 0,
             isPayInAdvance: null,
-            payInAdvanceType: null
+            payInAdvanceType: null,
+            paypalToken: null,
+            creditCardToken: {
+                subscriptionId: null,
+                expMonth: null,
+                expYear: null,
+                cardType: null,
+                billToPostalCode: null,
+                billToFirstName: null,
+                billToLastName: null,
+                referenceNumber: null,
+                authCode: null,
+                transactionId: null,
+                transReferenceNumber: null,
+                lastFour: null
+            }
         },
         contactInfo: {
             firstName: null,
@@ -237,6 +253,7 @@ export const useMainStore = defineStore({
         isMobileAppointment: (state) => state.order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE
             || state.order.serviceLocation.appointmentType === AppointmentTypeStrings.MOBILE_NOT_ITAC_AND_NOT_NOCOMP,
         isDropOffAppointment: (state) => state.order.serviceLocation.appointmentType === AppointmentTypeStrings.DROP_OFF,
+        isInShopAppointment: (state) => state.order.serviceLocation.appointmentType === AppointmentTypeStrings.IN_SHOP,
         isClaimRegistrationRequired: (state) => state.issConfig.isClaimRegistrationRequired,
         isClaimAlreadyRegistered: (state) => state.order.payment.insuranceCoverage.claimNumber !== null,
         isBailout: (state) => state.applicationUser.pageData[issPageValues.BAILOUT_PAGE] != null,
@@ -933,7 +950,6 @@ export const useMainStore = defineStore({
                 }).then((response) => resolve(response), (error) => reject(error));
             });
         },
-
         getCarrierAccountInfo() {
             return new Promise((resolve, reject) => {
                 globalMethods.callHttpClient({
@@ -945,12 +961,10 @@ export const useMainStore = defineStore({
                 }).catch((error) => reject(error));
             });
         },
-
         async getSupportingItems() {
             const { glassParts } = this.lineItems;
             const { carId } = this.vehicle;
             const { isRepair, numberOfChips } = this.damage;
-            const { parentAccountNumber } = this.issConfig;
 
             return globalMethods
                 .callHttpClient({
@@ -959,7 +973,7 @@ export const useMainStore = defineStore({
                     payload: {
                         carId,
                         damageType: isRepair ? 'Repair' : 'Replace',
-                        parentAccountNumber,
+                        parentAccountNumber: applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
                         parts: glassParts ?? [],
                         numberOfRepairChips: isRepair ? numberOfChips : 0
                     }
@@ -1199,7 +1213,7 @@ export const useMainStore = defineStore({
                         submitToMainframe: !!this.order.referralNumber,
                         loadedFromDupeCheck
                     },
-                    additionalSuccessEventDataHandler: (response) =>
+                    additionalSuccessEventDataHandler: () =>
                         `Email provided: ${customer.emailAddress ? 'true' : 'false'}`
                 }).then((response) => {
                     if (loadedFromDupeCheck) {
@@ -1301,7 +1315,23 @@ export const useMainStore = defineStore({
                 throw ex;
             }
         },
-
+        updateCreditCardToken(token) {
+            this.order.payment.creditCardToken.subscriptionId = token.subscriptionId;
+            this.order.payment.creditCardToken.expMonth = token.expMonth;
+            this.order.payment.creditCardToken.expYear = token.expYear;
+            this.order.payment.creditCardToken.cardType = token.cardType;
+            this.order.payment.creditCardToken.billToPostalCode = token.billToPostalCode;
+            this.order.payment.creditCardToken.billToFirstName = token.billToFirstName;
+            this.order.payment.creditCardToken.billToLastName = token.billToLastName;
+            this.order.payment.creditCardToken.referenceNumber = token.referenceNumber;
+            this.order.payment.creditCardToken.authCode = token.authCode;
+            this.order.payment.creditCardToken.transactionId = token.transactionId;
+            this.order.payment.creditCardToken.transReferenceNumber = token.transReferenceNumber;
+            this.order.payment.creditCardToken.lastFour = token.lastFour;
+        },
+        updatePaypalToken(token) {
+            this.order.payment.paypalToken = token;
+        },
         setSaveSessionPromise(promise) {
             this.applicationUser.saveSessionPromise = promise;
         },
@@ -1383,6 +1413,10 @@ export const useMainStore = defineStore({
             this.order.serviceLocation.searchFilter = serviceLocationInfo.searchFilter;
         },
 
+        resetState() {
+            Object.assign(this, getDefaultState());
+        },
+
         resetRegistrationState() {
             this.order.vehicle.registration.licensePlate = null;
             this.order.vehicle.registration.address = null;
@@ -1392,7 +1426,7 @@ export const useMainStore = defineStore({
             this.order.vehicle.registration.firstName = null;
             this.order.vehicle.registration.lastName = null;
         },
-        resetServiceLocationAndDependencies(context) {
+        resetServiceLocationAndDependencies() {
             this.resetServiceLocationAppointmentType();
             this.resetServiceLocationProvider();
             this.resetSchedule();
@@ -2123,7 +2157,6 @@ export const useMainStore = defineStore({
             this.resetInsurance();
             this.resetBailout();
         },
-
         savePaymentMethodChoice(paymentMethod) {
             const isPayInAdvance = paymentMethod !== paymentMethods.PAY_AT_TIME_OF_SERVICE;
             this.order.payment.isPayInAdvance = isPayInAdvance;
@@ -2135,8 +2168,33 @@ export const useMainStore = defineStore({
                 method: endpoints.GetPaymentSignature.method,
                 endpoint: endpoints.GetPaymentSignature.url
             });
-        }
+        },
 
+        hasSubmittedOrder() {
+            return window.sessionStorage.getItem(webStorageConstants.SUBMITTED_ORDER) !== null;
+        },
+
+        createSubmittedOrder() {
+            if (this.hasSubmittedOrder()) {
+                return;
+            }
+            const submittedOrder = this.order;
+            const { experiments } = this.applicationUser;
+
+            // set to local storage
+            window.sessionStorage.setItem(webStorageConstants.SUBMITTED_ORDER, JSON.stringify(submittedOrder));
+
+            // clear vuex
+            this.resetState();
+
+            // restore user's experiments
+            this.applicationUser.experiments = experiments;
+        },
+
+        resetSubmittedOrder() {
+            // clear from local storage
+            window.sessionStorage.removeItem(webStorageConstants.SUBMITTED_ORDER);
+        }
     },
     persist: true
 });