CSR-715 Fix merge conflict

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

@@ -392,7 +392,7 @@ export default {
       return this.$route.params[this.routerParams.DISPLAY_VEHICLE_CHANGE_ALERT];
     },
     shouldHideBackButton() {
-      return this.$store.getters.payment.insuranceCoverage.isVerified || getFunnelCookie().HasDelayedClaimRegistration;
+      return this.$store.getters.payment.insuranceCoverage.isVerified || getFunnelCookie()?.HasDelayedClaimRegistration;
     }
   },
 

src/store/index.js

@@ -661,10 +661,10 @@ export const actions = {
 
       context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
-    }
 
-    //Save new values
+      //Save new values
-    context.commit(storeMutations.UPDATE_YEAR, year);
+      context.commit(storeMutations.UPDATE_YEAR, year);
+    }
   },
   saveVehicleMake(context, make) {
 
@@ -681,10 +681,10 @@ export const actions = {
 
       context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
-    }
 
-    //Save new values
+      //Save new values
-    context.commit(storeMutations.UPDATE_MAKE, make);
+      context.commit(storeMutations.UPDATE_MAKE, make);
+    }
   },
   saveVehicleModel(context, model) {
 
@@ -700,10 +700,10 @@ export const actions = {
 
       context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
-    }
 
-    //Save new values
+      //Save new values
-    context.commit(storeMutations.UPDATE_MODEL, model);
+      context.commit(storeMutations.UPDATE_MODEL, model);
+    }
   },
   saveVehicleStyle(context, style) {
 
@@ -718,10 +718,10 @@ export const actions = {
 
       context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       context.dispatch(storeActions.RESET_REGISTRATION_STATE_AND_DEPENDENCIES);
-    }
 
-    //Save new values
+      //Save new values
-    context.commit(storeMutations.UPDATE_STYLE, style);
+      context.commit(storeMutations.UPDATE_STYLE, style);
+    }
   },
   saveVehicleDamage(context, { isWindshieldRepair, selectedGlassToReplace, selectedWindshieldChipCount }) {
 
@@ -752,14 +752,13 @@ export const actions = {
       if (isCarIdDifferent && !isSelectedGlassAvailableForVehicle) {
         context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       }
+
+      //Save new values
+      context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
+      context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);  
+      context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
+      context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
     }
-
-    //Save new values
-    context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
-    context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);
-
-    context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
-    context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
   },
   saveRegistrationLicensePlateLookup(context, { isCarIdDifferent, isSelectedGlassAvailableForVehicle, vehicleInfo, registrationInfo, serviceLocationInfo, customerEmail }) {
     //Reset dependent state when changing 
@@ -770,14 +769,13 @@ export const actions = {
       if (isCarIdDifferent && !isSelectedGlassAvailableForVehicle) {
         context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       }
+
+      //Save new values
+      context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
+      context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);  
+      context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
+      context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);
     }
-
-    //Save new values
-    context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
-    context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
-
-    context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
-    context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);
   },
   saveRegistrationAddressLookup(context, { isCarIdDifferent, isSelectedGlassAvailableForVehicle, vehicleInfo, registrationInfo, serviceLocationInfo, customerEmail }) {
     //Reset dependent state when changing 
@@ -788,14 +786,13 @@ export const actions = {
       if (isCarIdDifferent && !isSelectedGlassAvailableForVehicle) {
         context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       }
+
+      //Save new values
+      context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
+      context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);  
+      context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
+      context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);
     }
-
-    //Save new values
-    context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
-    context.commit(storeMutations.UPDATE_REGISTRATION, registrationInfo);
-
-    context.dispatch(storeActions.SAVE_EMAIL, customerEmail);
-    context.dispatch(storeActions.SAVE_SERVICE_LOCATION, serviceLocationInfo);
   },
 
   // Misc order actions
@@ -813,6 +810,7 @@ export const actions = {
         context.dispatch(storeActions.RESET_DAMAGE_STATE_AND_DEPENDENCIES);
       }
 
+      //Save new values
       context.commit(storeMutations.UPDATE_VEHICLE, vehicleInfo);
     }
   },

src/ux-components/list-button-horizontal/list-button-horizontal.vue

@@ -119,14 +119,13 @@ export default {
       if(!this.selectingInitiatesLoad) {
         this.handleCheckChange();
       }
-      this.handleChange(this.value);
     },
     triggerButton() {
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
           this.handleCheckChange();
       }
-      this.handleChange(this.value);
+      
       this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
     },
     handleCheckChange() {
@@ -135,6 +134,8 @@ export default {
         value: this.value.toString(),
         buttonId: this.buttonID && this.buttonID.toString(),
       };
+
+      this.handleChange(this.value);
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
     }

src/ux-components/list-card/list-card.vue

@@ -147,14 +147,13 @@ export default {
       if(!this.selectingInitiatesLoad) {
         this.handleCheckChange();
       }
-      this.handleChange(this.value);
     },
     triggerButton() {
       if(this.selectingInitiatesLoad) {
         this.displayLoader();
         this.handleCheckChange();
       }
-      this.handleChange(this.value);
+      
       this.pushEventToGA(this.$route.query[queryStrings.FMG_PAGE], this.GaActions.CLICKED, this.value.toString(), true);
     },
     handleCheckChange() {
@@ -164,6 +163,7 @@ export default {
         buttonId: this.buttonID && this.buttonID.toString(),
       };
       
+      this.handleChange(this.value);
       this.$emit("isCheckedChanged", emitEvent);
       this.$emit("update:modelValue", emitEvent);
     },