From df99b06743af3cd60ab92b209bedef7c87a27c3c Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 25 Oct 2024 13:30:24 -0400 Subject: [PATCH 1/2] CSR-2276 restructure the external parm checking for isinsurance to properly check the experimet thresholds CSR-2276 restructure the external parm checking for isinsurance to properly check the experimet thresholds --- src/layouts/quote/quote.vue | 42 ++++++++++++++++++++++--------------- src/router/index.js | 6 ++++++ src/store/index.js | 1 - 3 files changed, 31 insertions(+), 18 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index fc4aa402b..a54e7645e 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -351,16 +351,21 @@ export default { ); const isExternalParameter = store.getters.externalParameterState?.isExternalParameter; - if ( - isExternalParameter === externalParameterStatus.NOT_SET || - isExternalParameter === externalParameterStatus.INACTIVE - ) { - // there are no active or inactive external parameters; use internal threshold - if (isExternalParameter === externalParameterStatus.INACTIVE) { - if (internalThreshold) thresholdToUse = externalThreshold; - } else { - if (internalThreshold) thresholdToUse = internalThreshold; + // prettier-ignore + { + const log = getQuerystringParameter(queryStrings.LOG); + if (eval(log)) { + console.log("------------- quote.vue thresholds start -----------------"); + console.log(new Date() + " isExternalParameter: " + isExternalParameter); + console.log(new Date() + " internalThreshold: " + internalThreshold); + console.log(new Date() + " externalThreshold: " + externalThreshold); + 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.availableLineItems, @@ -368,20 +373,23 @@ export default { ); baseMixin.methods.ResetExternalParamsAndHideModal(); } else { - // user came from an external source - if (store.getters.externalParameterQuote?.isInsurance == true) { + // user came from an external source, however, the externalParms may have been reset on service-zip, property-questions, etc... + if (eval(store.getters.externalParameterQuote?.isInsurance)) { // did user intentionally select insurance? vm.isInsuranceSelected = true; vm.servicePackage = store.getters.externalParameterQuote.servicePackage; await nextTick(); - const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); - if (isValid) { - vm.forwardButtonAction(); - } else { - baseMixin.methods.ResetExternalParamsAndHideModal(); + + if (vm.servicePackage != null && isExternalParameter === externalParameterStatus.ACTIVE) { + const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); + if (isValid) { + baseMixin.methods.ResetExternalParamsAndHideModal(); + vm.forwardButtonAction(); + } } + baseMixin.methods.ResetExternalParamsAndHideModal(); } else { - thresholdToUse = externalThreshold; + if (externalThreshold) thresholdToUse = externalThreshold; vm.isInsuranceSelected = getIsInsuranceSelectedValue( vm.availableLineItems, diff --git a/src/router/index.js b/src/router/index.js index 04eb1fe9e..73605c543 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -669,6 +669,12 @@ function updateExternalParameterState() { if (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") { store.commit(storeMutations.UPDATE_EXTERNAL_PARAMETER_IS_INSURANCE, true); store.commit( diff --git a/src/store/index.js b/src/store/index.js index 9071bcdfc..7fe13f59b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -505,7 +505,6 @@ export const mutations = { saveExternalParameterState(externalParameterState); }, resetExternalParameterQuoteState(state) { - externalParameterState.quote.isInsurance = null; externalParameterState.quote.servicePackage = null; saveExternalParameterState(externalParameterState); }, From 2e7e5d4eaeecc25b826864dd76318223b586f576 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 25 Oct 2024 13:50:05 -0400 Subject: [PATCH 2/2] prettier --- src/layouts/quote/quote.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index a54e7645e..3bd9e26eb 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -361,8 +361,8 @@ export default { console.log(new Date() + " externalThreshold: " + externalThreshold); 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; @@ -379,8 +379,11 @@ export default { vm.isInsuranceSelected = true; vm.servicePackage = store.getters.externalParameterQuote.servicePackage; await nextTick(); - - if (vm.servicePackage != null && isExternalParameter === externalParameterStatus.ACTIVE) { + + if ( + vm.servicePackage != null && + isExternalParameter === externalParameterStatus.ACTIVE + ) { const isValid = await baseMixin.methods.isFormValid(vm.$refs.theForm); if (isValid) { baseMixin.methods.ResetExternalParamsAndHideModal();