Merge pull request #2302 from Safelite/feature/CASH-153

Feature/CASH-153

src/constants/store-mutations.js

@@ -16,8 +16,6 @@ const storeMutations = {
     UPDATE_VEHICLE_IMAGE_COLOR: "updateVehicleImageColor",
     UPDATE_VEHICLE_VIN: "updateVehicleVin",
     UPDATE_VEHICLE: "updateVehicle",
-    UPDATE_VEHICLE_MOBILE_STATIC_RECALIBRATION_APPLICABLE:
-        "updateIsMobileStaticRecalibrationApplicable",
 
     UPDATE_IS_REPAIR: "updateIsRepair",
     UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips",

src/layouts/schedule/schedule.vue

@@ -18,7 +18,7 @@
                             marginTopSizeOverride="1" />
                     </template>
                     <locationAlerts cmsWidgetPrefix="LocationAlert-" ref="locationAlerts" />
-                    <datePicker
+                    <datePicker2
                         customComponentId="dateQuestion"
                         selectableDatesSetting="custom"
                         ref="datePicker"
@@ -69,7 +69,7 @@ import navbar from "@/fmg-components/nav-bar/nav-bar";
 import funnelSubHeader from "@/fmg-components/funnel-sub-header/funnel-sub-header";
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import { Form, defineRule } from "vee-validate";
-import datePicker from "@/digital-components/date-picker/date-picker";
+import datePicker2 from "@/digital-components/date-picker/date-picker-2";
 import locationAlerts from "@/layouts/schedule/location-alerts/location-alerts";
 import timeSlotModalQuestion from "./time-slot-modal-question/time-slot-modal-question";
 import textBlock from "@/digital-components/text-block/text-block";
@@ -213,7 +213,7 @@ export default {
             preSelectedDate = null;
         }
 
-        const datePickerInitialDataPromise = await datePicker.methods.loadInitialData({
+        const datePickerInitialDataPromise = await datePicker2.methods.loadInitialData({
             // setup config options for date-picker
             selectableDatesSetting: "custom",
             initialViewRowsToShow: 5,
@@ -537,7 +537,7 @@ export default {
         funnelSubHeader,
         Form,
         loadingModal,
-        datePicker,
+        datePicker2,
         locationAlerts,
         timeSlotModalQuestion,
         textBlock,

src/layouts/service-location/service-location.spec.js

@@ -182,9 +182,6 @@ beforeEach(() => {
                 zipCode: "43235",
                 state: "OH",
             },
-            vehicle: {
-                isMobileStaticRecalibrationApplicable: true,
-            },
         },
         damage: {
             isRepair: false,

src/layouts/service-location/service-location.vue

@@ -192,8 +192,6 @@ export default {
             isRecalibrationServiceableInshop: null,
             isGlassServiceableMobile: null,
             isRecalibrationServiceableMobile: null,
-            isVehicleMobileStaticRecalibrationApplicable:
-                this.getIsVehicleMobileStaticRecalibrationApplicableFromStore(),
             selectedAppointmentType: this.getSelectedAppointmentType(),
             selectedProvider: this.getSelectedProvider(),
             mobileFeePart: null,
@@ -324,9 +322,8 @@ export default {
         isMobileStaticRecalibrationApplicable() {
             return (
                 this.displayMSR &&
-                this.isVehicleMobileStaticRecalibrationApplicable &&
                 this.mobileFeePart?.partNumber == partNumberStrings.MOBILE_STATIC_RECAL_FEE &&
-                (this.isInsurance ? this.mobileFeePart?.isInsurable : true)
+                (this.isInsurance && !this.isITAC ? this.mobileFeePart?.isInsurable : true)
             );
         },
         displayMSR() {
@@ -403,6 +400,9 @@ export default {
         isInsurance() {
             return store.getters.payment.isInsurance;
         },
+        isITAC() {
+            return store.getters.order.policy.isItac;
+        },
     },
     methods: {
         arePagePrerequisitesValid() {
@@ -515,9 +515,6 @@ export default {
         getSelectedProvider() {
             return store.getters.order.serviceLocation.provider;
         },
-        getIsVehicleMobileStaticRecalibrationApplicableFromStore() {
-            return store.getters.order.vehicle.isMobileStaticRecalibrationApplicable;
-        },
         resetMobileLocation() {
             this.streetAddress = "";
             this.apartmentNumberOrBusinessName = "";

src/layouts/vehicle/vehicle.vue

@@ -121,7 +121,6 @@ export default {
             modelOptions: [],
             styleOptions: [],
             displayNoServiceAlert: false,
-            isMobileStaticRecalibrationApplicable: this.getIsMobileStaticRecalibrationApplicable(),
         };
     },
 
@@ -444,8 +443,6 @@ export default {
             this.imageVifNumber = result?.data.imageVifNumber;
             this.imageVifColor = result?.data.imageVifColor;
             this.displayNoServiceAlert = !result?.data.canSafeliteService;
-            this.isMobileStaticRecalibrationApplicable =
-                result?.data.isMobileStaticRecalibrationApplicable;
         },
         resetAlert() {
             this.displayNoServiceAlert = false;
@@ -464,8 +461,6 @@ export default {
                     imageUrl: this.imageUrl,
                     imageVifNumber: this.imageVifNumber,
                     imageVifColor: this.imageVifColor,
-                    isMobileStaticRecalibrationApplicable:
-                        this.isMobileStaticRecalibrationApplicable,
                 },
                 false
             );
@@ -541,9 +536,6 @@ export default {
         getImageVifColorfromStore() {
             return store.getters.vehicle.imageVifColor;
         },
-        getIsMobileStaticRecalibrationApplicable() {
-            return store.getters.vehicle.isMobileStaticRecalibrationApplicable;
-        },
     },
 
     components: {

src/store/index.js

@@ -68,7 +68,6 @@ const getDefaultState = () => {
                 registration: {
                     licensePlate: null,
                 },
-                isMobileStaticRecalibrationApplicable: false,
             },
             serviceLocation: {
                 address: null,
@@ -226,10 +225,6 @@ export const mutations = {
     updateVehicleVin(state, vin) {
         state.order.vehicle.vin = vin;
     },
-    updateIsMobileStaticRecalibrationApplicable(state, isMobileStaticRecalibrationApplicable) {
-        state.order.vehicle.isMobileStaticRecalibrationApplicable =
-            isMobileStaticRecalibrationApplicable;
-    },
     updateIsRepair(state, isRepair) {
         state.order.damage.isRepair = isRepair;
     },
@@ -361,8 +356,6 @@ export const mutations = {
         state.order.vehicle.imageUrl = vehicleInfo.imageUrl;
         state.order.vehicle.imageVifNumber = vehicleInfo.imageVifNumber;
         state.order.vehicle.imageColor = vehicleInfo.imageVifColor;
-        state.order.vehicle.isMobileStaticRecalibrationApplicable =
-            vehicleInfo.isMobileStaticRecalibrationApplicable;
     },
     updateRegistration(state, registrationInfo) {
         state.order.vehicle.registration.licensePlate = registrationInfo?.licensePlate;
@@ -555,7 +548,6 @@ export const mutations = {
         state.order.vehicle.imageUrl = null;
         state.order.vehicle.imageVifNumber = null;
         state.order.vehicle.imageColor = null;
-        state.order.vehicle.isMobileStaticRecalibrationApplicable = false;
     },
     resetDamageState(state) {
         state.order.damage.isRepair = null;
@@ -1701,8 +1693,6 @@ export const actions = {
         const coverageStatus = coverageStatusEnum(order.payment?.insuranceCoverage?.coverageStatus);
         const coverageType = coverageTypeEnum(order.payment?.insuranceCoverage?.coverageType);
         const isItacOptimized = order.policy?.isItac ?? false;
-        const isMobileStaticRecalibrationApplicable =
-            order.vehicle?.isMobileStaticRecalibrationApplicable;
         const zipCode =
             serviceZipCode ??
             order.serviceLocation?.provider?.address?.zipCode ??
@@ -1718,12 +1708,10 @@ export const actions = {
 
         var endPoint = `${endpoints.GetMobileFeePart.url}/?serviceType=${serviceType}&facilityType=${facilityType}&parentAccountNumber=${parentAccountNumber}&billToAccountNumber=${billToAccountNumber}&providerNumber=${providerNumber}&isItacOptimized=${isItacOptimized}&zipCode=${zipCode}`;
 
-        if (isMobileStaticRecalibrationApplicable) {
+        const recalPartNumber = getRecalPartNumber(order.lineItems?.glassParts[0]);
-            const recalPartNumber = getRecalPartNumber(order.lineItems?.glassParts[0]);
+        const carId = order.vehicle?.carId;
-            const carId = order.vehicle?.carId;
+        if (recalPartNumber && carId) {
-            if (recalPartNumber && carId) {
+            endPoint = `${endPoint}&partNumbers=${recalPartNumber}&carId=${carId}`;
-                endPoint = `${endPoint}&partNumbers=${recalPartNumber}&carId=${carId}`;
-            }
         }
 
         if (coverageStatus) {
@@ -2326,18 +2314,7 @@ export const actions = {
     // Vehicle
     saveVehicle(
         context,
-        {
+        { year, make, model, style, carId, category, imageUrl, imageVifNumber, imageVifColor }
-            year,
-            make,
-            model,
-            style,
-            carId,
-            category,
-            imageUrl,
-            imageVifNumber,
-            imageVifColor,
-            isMobileStaticRecalibrationApplicable,
-        }
     ) {
         if (
             context.state.order.vehicle.year != year ||
@@ -2358,10 +2335,6 @@ export const actions = {
             context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, imageUrl);
             context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, imageVifNumber);
             context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, imageVifColor);
-            context.commit(
-                storeMutations.UPDATE_VEHICLE_MOBILE_STATIC_RECALIBRATION_APPLICABLE,
-                isMobileStaticRecalibrationApplicable
-            );
         }
     },