CSR-747 Fix merge conflict

src/common-components/modal/modal.vue

@@ -2,6 +2,7 @@
     <!-- Modal -->
     <div
         class="modal fade modal-component"
+        v-on="{ 'hidden.bs.modal': resetButtonStyle }"
         :id="this.cmsWidgetName"
         tabindex="-1"
         aria-labelledby="ModalComponentLabel"
@@ -61,16 +62,10 @@ export default {
         },
     },
     methods: {
-        setupModalEventListener() {
+        resetButtonStyle() {
-            const modal = document.querySelector("#" + this.cmsWidgetName);
+            this.$refs.buttonMain.resetButtonStyle();
-            modal.addEventListener("hidden.bs.modal", (event) => {
-                this.$refs.buttonMain.resetButtonStyle();
-            });
         },
     },
-    mounted() {
-        this.setupModalEventListener();
-    },
     components: {
         buttonMain,
     },

src/constants/endpoints.js

@@ -96,7 +96,7 @@ const endpoints = {
     },
     PriceOrderItems: {
         url: "/price/api/v1/price/order-items",
-        method: "POST",
+        method: "GET",
     },
     LogExperimentExposureIfAssigned: {
         url: "/experiments/api/v1/experiments/log-exposure",

src/constants/store-actions.js

@@ -67,6 +67,7 @@ const storeActions = {
     SAVE_CAPABILITY_QUESTION_ANSWERS: "saveCapabilityQuestionAnswers",
     SAVE_QUOTE_PAGE_SELECTIONS: "saveQuotePageSelections",
     SAVE_PAYMENT_TYPE: "savePaymentType",
+    SAVE_ACCOUNT_NUMBER: "saveAccountNumber",
     SAVE_SUPPORTING_ITEMS: "saveSupportingItems",
     SAVE_VAPS: "saveVaps",
 };

src/constants/store-mutations.js

@@ -21,6 +21,7 @@ const storeMutations = {
     UPDATE_GLASS_PARTS: "updateGlassParts",
     UPDATE_VAPS: "updateVaps",
     UPDATE_SUPPORTING_ITEMS: "updateSupportingItems",
+    UPDATE_LINE_ITEMS_SERVER_DATA: "updateLineItemsServerData",
 
     UPDATE_REGISTRATION_LICENSE_PLATE: "updateRegistrationLicensePlate",
     UPDATE_REGISTRATION_ADDRESS: "updateRegistrationAddress",

src/helpers/heritage-integration/navigation-helper.js

@@ -69,7 +69,7 @@ export async function skipVinLookup() {
     return (
         store.getters.damage.isRepair ||
         isVinOptionalVehicle ||
-        experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, true)
+        experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
     );
 }
 
@@ -83,7 +83,7 @@ export async function skipVinLookupNotRepair() {
         (isVinOptionalVehicle ||
             experimentMixin.methods.hasSettingEqualTo(
                 experimentSettings.SUPPRESS_VIN_CAPTURE,
-                true
+                "true"
             ))
     );
 }

src/helpers/heritage-integration/order-helper.js

@@ -109,6 +109,7 @@ async function saveSessionHelper() {
             accountNumber: savedSessionInfo.data.accountNumber?.toString(),
             savedSessionId: savedSessionInfo.data.savedSessionId,
             crmCustomerId: savedSessionInfo.data.crmCustomerId?.toString(),
+            eon: savedSessionInfo.data.eon,
         },
         false
     );

src/layouts/quote/quote.vue

@@ -25,17 +25,19 @@
                     groupName="ServicePackageQuestion"
                     :availableLineItems="availableLineItems"
                     :isInsuranceSelected="isInsuranceSelected"
-                    @vapsItemsSelected="vapsItemsSelectedAction" />
+                    @vapsItemsSelected="vapsItemsSelectedAction"
+                    validationRules="option-required"
+                    isRequired />
 
                 <textBlock
                     cmsWidgetName="quoteDisclaimer"
                     justifyText="left"
                     typeStyle="caption"
                     class="mt-4" />
-                <modal cmsWidgetName="EstimateRainDefenseModal" />
+                <modal cmsWidgetName="RainDefenseModal" />
-                <modal cmsWidgetName="EstimateFrontWiperModal" />
+                <modal cmsWidgetName="FrontWiperModal" />
-                <modal cmsWidgetName="EstimateRearWiperModal" />
+                <modal cmsWidgetName="RearWiperModal" />
-                <modal cmsWidgetName="EstimateRecalModal" />
+                <modal cmsWidgetName="RecalModal" />
                 <funnel-footer
                     cmsWidgetName="FunnelFooterWidget"
                     :isForwardActionDisabled="!meta.valid"
@@ -64,14 +66,19 @@ import { settleAllPromises } from "@/helpers/layout-helper";
 import { storeActions } from "@/constants/store-actions";
 import store from "@/store";
 import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
-import { Form } from "vee-validate";
+import { required } from "@/helpers/validation-rules";
+import { errorMessages } from "@/constants/error-messages";
+import { Form, defineRule } from "vee-validate";
 import { navigateToHeritageFunnel } from "@/helpers/heritage-integration/navigation-helper";
+import { applicationConfig } from "@/constants/application-config";
+
+defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 
 export default {
     name: "quote",
     async beforeRouteEnter(to, from, next) {
         // Call APIs
-        const cmsContent = await fetchCmsContentForPage(to.query.fmgPage);
+        const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage);
         const wipersPromise = baseMixin.methods.dispatchStoreAction(storeActions.GET_WIPERS);
         const rainDefensePromise = baseMixin.methods.dispatchStoreAction(
             storeActions.GET_RAIN_DEFENSE
@@ -81,6 +88,10 @@ export default {
         );
 
         const promiseResultMap = [
+            {
+                resultKey: "cmsContent",
+                promise: cmsContentPromise,
+            },
             {
                 resultKey: "wipers",
                 promise: wipersPromise,
@@ -112,11 +123,10 @@ export default {
 
         // Call the "next" function to complete the transition to this page.
         next((vm) => {
-            vm.setCmsContent(cmsContent);
+            vm.setCmsContent(resultMap.cmsContent);
-
             vm.supportingItems = resultMap.supportingItems;
             vm.availableLineItems = pricingResults;
-            vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue();
+            vm.isInsuranceSelected = vm.getDefaultIsInsuranceSelectedValue(vm.availableLineItems);
         });
     },
     data() {
@@ -137,23 +147,33 @@ export default {
                         store.getters.order.lineItems.glassParts.length > 0))
             );
         },
-        getDefaultIsInsuranceSelectedValue() {
+        getDefaultIsInsuranceSelectedValue(availableLineItems) {
             // Override if coming back from QuoteDetails. Remove override after Quote release
             const isInsuranceOverrideValue = this.$route.query?.isInsurance;
+
             const defaultIsInsuranceSelectedValue = this.$store.getters.order.payment.isInsurance;
             if (isInsuranceOverrideValue != null) {
                 return isInsuranceOverrideValue == "true";
             } else if (defaultIsInsuranceSelectedValue != null) {
                 return defaultIsInsuranceSelectedValue;
             } else {
-                return this.availableLineItems
+                return availableLineItems
-                    ? baseMixin.methods.getTierOnePackagePrice(this.availableLineItems) > 500
+                    ? baseMixin.methods.getTierOnePackagePrice(availableLineItems) > 500
                     : null;
             }
         },
         vapsItemsSelectedAction(vapsItemsSelected) {
             this.selectedVaps = vapsItemsSelected;
         },
+        filterOutFees(currentSupportingItems) {
+            const filteredSupportingItems = currentSupportingItems.filter((item) => {
+                return (
+                    !item.partType.includes("FEE") ||
+                    (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR")
+                );
+            });
+            return filteredSupportingItems;
+        },
         backButtonAction() {
             vehicleQuestionsMixin.methods.navigateBack(this);
         },
@@ -163,6 +183,16 @@ export default {
                 this.isInsuranceSelected,
                 false
             );
+            if (!this.isInsuranceSelected) {
+                this.dispatchStoreAction(
+                    this.storeActions.SAVE_ACCOUNT_NUMBER,
+                    applicationConfig.CASH_ACCOUNT_NUMBER,
+                    false
+                );
+            }
+            if (this.$store.getters.order.accountNumber != applicationConfig.CASH_ACCOUNT_NUMBER) {
+                this.supportingItems = this.filterOutFees(this.supportingItems);
+            }
             this.dispatchStoreAction(
                 this.storeActions.SAVE_SUPPORTING_ITEMS,
                 this.supportingItems,

src/layouts/quote/service-package-question/service-package-question.vue

@@ -5,7 +5,8 @@
         buttonTypeString="servicePackageRadio"
         :buttonTypeObject="servicePackageRadio"
         v-model="selectedPackageName"
-        isRequired />
+        :validationRules="validationRules"
+        :isRequired="isRequired" />
 </template>
 
 <script>
@@ -28,6 +29,8 @@ export default {
         groupName: String,
         cashCmsWidgetName: String,
         insuranceCmsWidgetName: String,
+        validationRules: String,
+        isRequired: Boolean,
         isInsuranceSelected: Boolean,
         availableLineItems: null,
     },
@@ -185,7 +188,7 @@ export default {
                         item.partType.toUpperCase() === partTypeStrings.FRONT_WIPER) ||
                     (priceRearWipers && item.partType.toUpperCase() === partTypeStrings.REAR_WIPER)
                 ) {
-                    vapsPrice += item.price;
+                    vapsPrice += baseMixin.methods.getTotalLineItemPrice(item);
                 }
             });
             return vapsPrice;
@@ -204,7 +207,7 @@ export default {
                     (priceRainDefense &&
                         item.partType.toUpperCase() === partTypeStrings.RAIN_DEFENSE)
                 ) {
-                    vapsPrice += item.price;
+                    vapsPrice += baseMixin.methods.getTotalLineItemPrice(item);
                 }
             });
             return vapsPrice;

src/mixins/base-mixin.js

@@ -72,11 +72,14 @@ export default {
                     partType != partTypeStrings.REAR_WIPER &&
                     partType != partTypeStrings.RAIN_DEFENSE
                 ) {
-                    totalPrice += lineItem.price;
+                    totalPrice += this.getTotalLineItemPrice(lineItem);
                 }
             });
             return totalPrice;
         },
+        getTotalLineItemPrice(lineItem) {
+            return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice;
+        },
     },
     computed: {
         storeActions() {

src/mixins/vehicle-questions-mixin.js

@@ -42,7 +42,9 @@ export default {
                         requiresCapabilityQuestions: singlePart.requiresCapabilityQuestions,
                         recalibrationType: singlePart.recalibrationType,
                         childParts: singlePart.childParts,
-                        price: singlePart.price,
+                        kitPrice: singlePart.kitPrice,
+                        sellingPrice: singlePart.sellingPrice,
+                        laborAmount: singlePart.laborAmount,
                     });
                 }
             });

src/store/index.js

@@ -149,6 +149,9 @@ export const mutations = {
     updateSupportingItems(state, partsData) {
         state.order.lineItems.supportingItems = partsData;
     },
+    updateLineItemsServerData(state, serverData) {
+        state.order.lineItems.serverData = serverData;
+    },
     updatePageData(state, pageData) {
         state.applicationUser.pageData[pageData.page] = pageData.data;
     },
@@ -1022,6 +1025,7 @@ export const actions = {
                     referralDate: order.referralDate,
                     referralNumber: order.referralNumber?.toString(), // TODO It'd be nice to save these as strings in the first place
                     referralSequenceNumber: order.referralNumber?.toString(), // TODO Pass the referralSequence number once insurance flow creates it
+                    eon: order.eon,
                 },
             },
         });
@@ -1382,6 +1386,9 @@ export const actions = {
     savePaymentType(context, isInsurance) {
         context.commit(storeMutations.UPDATE_IS_INSURANCE, isInsurance);
     },
+    saveAccountNumber(context, accountNumber) {
+        context.commit(storeMutations.UPDATE_PARENT_ACCT_NUMBER, accountNumber);
+    },
     saveSupportingItems(context, supportingItems) {
         context.commit(storeMutations.UPDATE_SUPPORTING_ITEMS, supportingItems);
     },
@@ -1389,11 +1396,34 @@ export const actions = {
         context.commit(storeMutations.UPDATE_VAPS, vaps);
     },
     // Price order actions
-    // PLACEHOLDER, WILL CHANGE WHEN PRICING END POINT IS IMPLEMENTED
+    async priceOrderItems(context, availableLineItems) {
-    priceOrderItems(context, availableLineItems) {
+        const availableLineItemsFormattedForRequest = availableLineItems
-        availableLineItems.forEach((lineItem) => {
+            .map((lineItem) => `&LineItems=${lineItem.partNumber}`)
-            lineItem["price"] = parseFloat((Math.random() * 100).toFixed(2));
+            .join("");
+        const vehicle = context.getters.order.vehicle;
+        let queryString =
+            `ParentAccountNumber=${applicationConfig.CASH_ACCOUNT_NUMBER}` +
+            `&CTU=${context.getters.order.serviceLocation.zipCodeCtu}` +
+            `&CarId=${vehicle.carId}` +
+            `&Make=${vehicle.make}` +
+            `&Model=${vehicle.model}` +
+            `&Year=${vehicle.year}` +
+            `&EON=${context.getters.order.eon}` +
+            `&ZipCode=${context.getters.order.serviceLocation.zipCode}` +
+            `${availableLineItemsFormattedForRequest}`;
+        const lineItemServerData = context.getters.order.lineItems.serverData;
+        if (lineItemServerData) {
+            queryString += `&ServerData=${lineItemServerData}`;
+        }
+        const response = await globalMethods.callHttpClient({
+            method: endpoints.PriceOrderItems.method,
+            endpoint: `${endpoints.PriceOrderItems.url}?${queryString}`,
         });
+
+        context.commit(storeMutations.UPDATE_LINE_ITEMS_SERVER_DATA, response.data.serverData);
+
+        availableLineItems = addPricesToLineItems(availableLineItems, response.data.lineItems);
+
         return availableLineItems;
     },
     // Misc order actions
@@ -1543,3 +1573,15 @@ function convertGlassPieceNamingFromApi(glassArray) {
     });
     return glassArray;
 }
+
+function addPricesToLineItems(lineItems, pricingLineItems) {
+    lineItems.forEach((lineItem) => {
+        let pricedLineItem = pricingLineItems.find(
+            (pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber
+        );
+        lineItem.laborAmount = pricedLineItem.laborAmount;
+        lineItem.sellingPrice = pricedLineItem.sellingPrice;
+        lineItem.kitPrice = pricedLineItem.kitPrice;
+    });
+    return lineItems;
+}

src/ux-components/button-main/button-main.vue

@@ -55,9 +55,6 @@ export default {
             this.isLoaderDisplayed = false;
         },
     },
-    mounted() {
-        this.isLoaderDisplayed = false;
-    },
     components: {
         loader,
     },