jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/CSR-1928

Browse source
This commit is contained in:
CarlNation 2024-10-04 04:54:24 -04:00
commit 29d3b5fae2
5 changed files with 33 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/fmg-components/cart/cart.vue
View file

@ -188,6 +188,8 @@ export default {
insuranceCompanyName: String,
showInsuranceCoverageAs: String,
shouldHideRecalibration: Boolean,
isItac: Boolean,
isNoComp: Boolean,
},
data() {
return {
@ -1007,8 +1009,13 @@ export default {
},
salesTax() {
if (!this.lineItems || this.lineItems.length < 1) return;
if (this.isInsurance && !this.showCoverageAsVerified) {
if (
this.isInsurance &&
!this.showCoverageAsVerified &&
!this.isItac &&
!this.isNoComp
) {
return 0;
}

4
src/layouts/payment-method/payment-method.vue
View file

@ -34,7 +34,9 @@
:insuranceDeductible="currentDeductible"
:insuranceCompanyName="insuranceCompanyName"
:showInsuranceCoverageAs="showInsuranceCoverageAs"
:shouldHideRecalibration="shouldHideRecalibration" />
:shouldHideRecalibration="shouldHideRecalibration"
:isItac="isItac"
:isNocomp="isNocomp" />
<hr class="my-5" />

39
src/layouts/quote/quote.vue
View file

@ -337,17 +337,10 @@ export default {
experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_INTERNAL
);
if (!store.getters.externalParameterState?.isExternalParameter) {
// there are no external parameters
const isExternalParameter = store.getters.externalParameterState?.isExternalParameter;
if (internalThreshold) thresholdToUse = internalThreshold;
vm.isInsuranceSelected = getIsInsuranceSelectedValue(
vm.availableLineItems,
thresholdToUse
);
baseMixin.methods.ResetExternalParamsAndHideModal();
} else {
// there ARE external parameters
if (isExternalParameter !== undefined) {
// user is from an external source (either has value or is null)
if (store.getters.externalParameterQuote.isInsurance == true) {
// did user intentionally select insurance?
@ -361,26 +354,26 @@ export default {
baseMixin.methods.ResetExternalParamsAndHideModal();
}
} else {
// did user come from external source (LeadGen)?
let externalSource = store.getters.externalParameterSource
? store.getters.externalParameterSource
: null;
const externalThreshold = experimentMixin.methods.getSettingValue(
experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL
);
thresholdToUse = externalThreshold;
// Business logic to determine what "external" source is
if (externalSource?.includes("LeadGen")) {
const externalThreshold = experimentMixin.methods.getSettingValue(
experimentSettings.INSURANCE_TAB_TO_DISPLAY_THRESHOLD_EXTERNAL
);
if (externalThreshold) thresholdToUse = externalThreshold;
} else {
if (internalThreshold) thresholdToUse = internalThreshold;
}
vm.isInsuranceSelected = getIsInsuranceSelectedValue(
vm.availableLineItems,
thresholdToUse
);
baseMixin.methods.ResetExternalParamsAndHideModal();
}
} else {
// there are no external parameters; use internal threshold
if (internalThreshold) thresholdToUse = internalThreshold;
vm.isInsuranceSelected = getIsInsuranceSelectedValue(
vm.availableLineItems,
thresholdToUse
);
baseMixin.methods.ResetExternalParamsAndHideModal();
}
});
},

5
src/layouts/service-location/shop-question/shop-question.vue
View file

@ -167,7 +167,10 @@ export default {
if (logFirstShopsDisplayed) {
gaAction = this.GaActions.SHOPS_FIRST_DISPLAYED;
}
if (this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP) {
if (
this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP ||
this.selectedAppointmentType === AppointmentTypeStrings.DROP_OFF
) {
var shops = mappedData.map((shop) => {
if (shop.value.length > 5 && shop.value.startsWith("00")) {
return shop.value.substring(1);

13
src/store/index.js
View file

@ -476,10 +476,6 @@ export const mutations = {
externalParameterState.quote.servicePackage = servicePackage;
saveExternalParameterState(externalParameterState);
},
updateExternalParameterSource(state, source) {
externalParameterState.source = source;
saveExternalParameterState(externalParameterState);
},
//RESET ExternalParameter MUTATIONS
resetExternalParameterVehicleState(state) {
externalParameterState.vehicle.year = null;
@ -510,10 +506,6 @@ export const mutations = {
externalParameterState.quote.servicePackage = null;
saveExternalParameterState(externalParameterState);
},
resetExternalParameterSourceState(state) {
externalParameterState.source = null;
saveExternalParameterState(externalParameterState);
},
resetIsExternalParameter(state) {
externalParameterState.isExternalParameter = null;
saveExternalParameterState(externalParameterState);
@ -936,7 +928,7 @@ export const getters = {
externalParameterQuote: (state) => externalParameterState?.quote,
externalParameterServiceZip: (state) => externalParameterState?.serviceZip,
externalParameterEstimate: (state) => externalParameterState?.estimate,
externalParameterSource: (state) => externalParameterState?.source,
isExternalParameter: (state) => externalParameterState?.isExternalParameter,
};
function getNonFalseValuesOfPropertyInArrayOfObjects(array, propertyName) {
@ -2929,7 +2921,6 @@ export const actions = {
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_ESTIMATE_STATE);
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SERVICEZIP_STATE);
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_QUOTE_STATE);
context.commit(storeMutations.RESET_EXTERNAL_PARAMETER_SOURCE_STATE);
context.commit(storeMutations.RESET_IS_EXTERNAL_PARAMETER);
}
},
@ -3450,7 +3441,6 @@ async function resetScheduleIfUnavailable(context, order, pageNameToLog) {
function createExternalParameterDefaultState() {
// create default externalParameter state
const externalParameterDefaultState = {
isExternalParameter: null,
vehicle: {
year: null,
make: null,
@ -3473,7 +3463,6 @@ function createExternalParameterDefaultState() {
isInsurance: null,
servicePackage: null,
},
source: null,
};
// set to session storage
saveExternalParameterState(externalParameterDefaultState);