From 36a8b706f0fbb571491bf91a7384e9f014974733 Mon Sep 17 00:00:00 2001 From: brydon1 Date: Tue, 25 Jul 2023 15:35:12 -0400 Subject: [PATCH] Incorporating isClaimRegistrationRequired logic into verifiedDeductible --- src/helpers/cms-content-helper.js | 2 +- .../loading-modal/loading-modal.vue | 31 ----------- .../coverage-statement/coverage-statement.vue | 54 ++++++++++--------- .../provider-preference.vue | 6 --- src/styles/client-customizations.scss | 4 ++ src/styles/common-styles.scss | 7 +++ 6 files changed, 41 insertions(+), 63 deletions(-) diff --git a/src/helpers/cms-content-helper.js b/src/helpers/cms-content-helper.js index 24a64ca8..4871f28f 100644 --- a/src/helpers/cms-content-helper.js +++ b/src/helpers/cms-content-helper.js @@ -165,7 +165,7 @@ function mapStringToModal(str) { const params = linkToReplace.substring((dynamicStrings.MODAL_LINK).length + 2, linkToReplace.length - 1); const splitParams = params.split(','); - const bodyText = '' + splitParams[1] + ''; + const bodyText = ''; let returnVal = str.replace(linkToReplace, bodyText); diff --git a/src/iss-components/loading-modal/loading-modal.vue b/src/iss-components/loading-modal/loading-modal.vue index 1bbc981e..e9df91e6 100644 --- a/src/iss-components/loading-modal/loading-modal.vue +++ b/src/iss-components/loading-modal/loading-modal.vue @@ -20,37 +20,6 @@ . .

- - diff --git a/src/layouts/coverage-statement/coverage-statement.vue b/src/layouts/coverage-statement/coverage-statement.vue index 2e095aaa..04d59df8 100644 --- a/src/layouts/coverage-statement/coverage-statement.vue +++ b/src/layouts/coverage-statement/coverage-statement.vue @@ -169,11 +169,10 @@ export default { }, data() { return { - isVerified: store.order.payment.insuranceCoverage.isVerified, availableLineItems: [], selectedProvider: '', deductibleText: 'Your deductible is:', - isLoading: true, + // TODO update when design team gives appropriate text loadingText: [ 'Connecting to your insurance company', 'Nearly there', @@ -230,7 +229,7 @@ export default { return damageString === 'match' ? '' : damageString; }, vehicleDeductible() { - if (this.coverageVerified) { + if (this.policyLookupSuccessful) { if (store.order.damage.isRepair) { const repairDeductible = store.order.policy.deductible.repair; return repairDeductible; @@ -250,38 +249,40 @@ export default { deductibleOverZero() { return this.verifiedDeductible && !this.isDeductibleZero; }, - coverageVerified() { + policyLookupSuccessful() { return useMainStore().order.policy.policyLookupSuccessful; }, - coverageUnverified() { - return !this.coverageVerified; + registerClaimSuccessful() { + return useMainStore().payment.insuranceCoverage.isVerified; + }, + policyLookupUnsuccessful() { + return !this.policyLookupSuccessful; }, verifiedNoComp() { - return this.coverageVerified ? store.order.policy.noCoverage : false; + return this.policyLookupSuccessful ? store.order.policy.noCoverage : false; }, verifiedITAC() { - return this.coverageVerified + return this.policyLookupSuccessful && !this.verifiedNoComp && this.vehicleDeductible > this.totalServicePrice; }, + coveredAndServicePriceAboveOrEqualDeductible() { + return !this.verifiedNoComp && this.totalServicePrice >= this.vehicleDeductible; + }, verifiedDeductible() { - return this.coverageVerified - && !this.verifiedNoComp - && this.totalServicePrice > this.vehicleDeductible; + return this.isClaimRegistrationRequired + ? this.registerClaimSuccessful && this.coveredAndServicePriceAboveOrEqualDeductible + : this.policyLookupSuccessful && this.coveredAndServicePriceAboveOrEqualDeductible; + }, + isADAS() { + const parts = store.order.lineItems.glassParts; + return parts != null && parts.find((part) => part.requiresRecalibration); }, ADASReplace() { - if (!store.order.damage.isRepair) { - const parts = store.order.lineItems.glassParts; - - if (parts != null && parts.filter((part) => - part.requiresRecalibration).length > 0) { - return true; - } - } - return false; + return !store.order.damage.isRepair && this.isADAS; }, nonADASReplace() { - return !this.ADASReplace; + return !store.order.damage.isRepair && !this.isADAS; }, nonADASRepair() { return store.order.damage.isRepair; @@ -324,12 +325,15 @@ export default { this.$refs.loadingModal.showModal(); setupModalLinks(this); const vm = this; - if (useMainStore().policy.coverageVerified + if (this.policyLookupSuccessful && useMainStore().isClaimRegistrationRequired - && !useMainStore().policy.noCoverage) { + && this.coveredAndServicePriceAboveOrEqualDeductible) { useMainStore().registerClaim().then((r) => { vm.$refs.loadingModal.hideModal(); return r; + }, (r) => { + vm.$refs.loadingModal.hideModal(); + return r; }); } else { vm.$refs.loadingModal.hideModal(); @@ -346,7 +350,7 @@ export default { return this.navigateForward(); }, async navigateForward() { - if (!this.coverageVerified || this.verifiedDeductible) { + if (!this.policyLookupSuccessful || this.verifiedDeductible) { this.$router.navigate(this.navigationScenarios.CLICKED_FORWARD, this.$route); } else if (this.verifiedITAC || this.verifiedNoComp) { @@ -389,7 +393,7 @@ export default { getCustomValueFromString(str) { switch (str) { case 'coverageUnverified': - return this.coverageUnverified; + return this.policyLookupUnsuccessful; case 'verifiedDeductible': return this.verifiedDeductible; case 'verifiedITAC': diff --git a/src/layouts/provider-preference/provider-preference.vue b/src/layouts/provider-preference/provider-preference.vue index d1374d67..de8b3e5f 100644 --- a/src/layouts/provider-preference/provider-preference.vue +++ b/src/layouts/provider-preference/provider-preference.vue @@ -205,12 +205,6 @@ export default { color: $black; } -.modal-link a{ - color: $blue-700; - font-size: 14px; - line-height: 24px; - font-weight: 500; -} .question-text { margin-top: 0; margin-bottom: .5rem; diff --git a/src/styles/client-customizations.scss b/src/styles/client-customizations.scss index 5e0db1ec..e1955587 100644 --- a/src/styles/client-customizations.scss +++ b/src/styles/client-customizations.scss @@ -22,6 +22,10 @@ $limu-button-color: #A9E3E9; color: $limu-link !important; } + .modal-text { + color: $limu-link !important; + } + .btn { &.btn-override[aria-disabled="false"]{ &.btn-primary { diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 82aef9b5..fd69b0f8 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -69,5 +69,12 @@ body { color: $blue; cursor: pointer; text-decoration: underline; + border: none; + background-color: transparent; + padding: 0; + text-underline-offset: 5px; + font-size: 14px; + line-height: 24px; + font-weight: 500; } }