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

Merge pull request #2046 from Safelite/feature/CSR-2276

Browse source 
Feature/csr 2276
This commit is contained in:
CarlNation 2024-10-25 14:07:16 -04:00 committed by GitHub
commit c36d9eba27
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -351,16 +351,21 @@ export default {
); );
const isExternalParameter = store.getters.externalParameterState?.isExternalParameter; const isExternalParameter = store.getters.externalParameterState?.isExternalParameter;
if ( // prettier-ignore
isExternalParameter === externalParameterStatus.NOT_SET || {
isExternalParameter === externalParameterStatus.INACTIVE const log = getQuerystringParameter(queryStrings.LOG);
) { if (eval(log)) {
// there are no active or inactive external parameters; use internal threshold console.log("------------- quote.vue thresholds start -----------------");
if (isExternalParameter === externalParameterStatus.INACTIVE) { console.log(new Date() + " isExternalParameter: " + isExternalParameter);
if (internalThreshold) thresholdToUse = externalThreshold; console.log(new Date() + " internalThreshold: " + internalThreshold);
} else { console.log(new Date() + " externalThreshold: " + externalThreshold);
if (internalThreshold) thresholdToUse = internalThreshold; console.log("------------- quote.vue thresholds end -----------------");
} }
}
if (isExternalParameter === externalParameterStatus.NOT_SET) {
// there are no active or inactive external parameters; use internal threshold
if (internalThreshold) thresholdToUse = internalThreshold;
vm.isInsuranceSelected = getIsInsuranceSelectedValue( vm.isInsuranceSelected = getIsInsuranceSelectedValue(
vm.availableLineItems, vm.availableLineItems,
@ -368,20 +373,26 @@ export default {
); );
baseMixin.methods.ResetExternalParamsAndHideModal(); baseMixin.methods.ResetExternalParamsAndHideModal();
} else { } else {
// user came from an external source // user came from an external source, however, the externalParms may have been reset on service-zip, property-questions, etc...
if (store.getters.externalParameterQuote?.isInsurance == true) { if (eval(store.getters.externalParameterQuote?.isInsurance)) {
// did user intentionally select insurance? // did user intentionally select insurance?
vm.isInsuranceSelected = true; vm.isInsuranceSelected = true;
vm.servicePackage = store.getters.externalParameterQuote.servicePackage; vm.servicePackage = store.getters.externalParameterQuote.servicePackage;
await nextTick(); await nextTick();
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) { if (
vm.forwardButtonAction(); vm.servicePackage != null &&
} else { isExternalParameter === externalParameterStatus.ACTIVE
baseMixin.methods.ResetExternalParamsAndHideModal(); ) {
const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm);
if (isValid) {
baseMixin.methods.ResetExternalParamsAndHideModal();
vm.forwardButtonAction();
}
} }
baseMixin.methods.ResetExternalParamsAndHideModal();
} else { } else {
thresholdToUse = externalThreshold; if (externalThreshold) thresholdToUse = externalThreshold;
vm.isInsuranceSelected = getIsInsuranceSelectedValue( vm.isInsuranceSelected = getIsInsuranceSelectedValue(
vm.availableLineItems, vm.availableLineItems,

6
src/router/index.js
View file

@ -669,6 +669,12 @@ function updateExternalParameterState() {
if (externalParameterZipCode) { if (externalParameterZipCode) {
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode); store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_ZIP_CODE, externalParameterZipCode);
} }
if (externalParameterEmail) {
store.commit(
storeMutations.UPDATE_EXTERNAL_PARAMETER_EMAIL_ADDRESS,
externalParameterEmail
);
}
if (externalParameterIsInsurance?.toUpperCase() == "TRUE") { if (externalParameterIsInsurance?.toUpperCase() == "TRUE") {
store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true); store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true);
store.commit( store.commit(

1
src/store/index.js
View file

@ -505,7 +505,6 @@ export const mutations = {
saveExternalParameterState(externalParameterState); saveExternalParameterState(externalParameterState);
}, },
resetExternalParameterQuoteState(state) { resetExternalParameterQuoteState(state) {
externalParameterState.quote.isInsurance = null;
externalParameterState.quote.servicePackage = null; externalParameterState.quote.servicePackage = null;
saveExternalParameterState(externalParameterState); saveExternalParameterState(externalParameterState);
}, },