From b613623aa0c9b349fdba2188217e9b299861e53b Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Wed, 30 Nov 2022 10:32:16 -0500 Subject: [PATCH 1/7] CSR-774 | Default package selection Fixed a bug with save/load session --- .../service-package-question.vue | 70 ++++++++++++++++--- src/store/index.js | 4 +- 2 files changed, 61 insertions(+), 13 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue index 99982004b..712d7166a 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -4,7 +4,7 @@ :groupName="groupName" buttonTypeString="servicePackageRadio" :buttonTypeObject="servicePackageRadio" - v-model="selectedValues" + v-model="selectedPackageName" isRequired /> @@ -35,19 +35,23 @@ export default { data() { return { servicePackageRadio: servicePackageRadio, + selectedPackageName: null, }; }, - computed: { - selectedValues: { - get: function () { - return this.modelValue; - }, - set: function (newValue) { - const VapsProductsInSelectedPackage = - this.getVapsLineItemsForSelectedPackage(newValue); - this.$emit("update:modelValue", VapsProductsInSelectedPackage); - }, + watch: { + availableLineItems() { + console.log('supportingItems from store', this.$store.getters.lineItems.supportingItems); + if(this.$store.getters.lineItems.vaps) { + this.selectDefaultPackage(); + } }, + selectedPackageName(newValue) { + const VapsProductsInSelectedPackage = + this.getVapsLineItemsForSelectedPackage(newValue); + this.$emit("update:modelValue", VapsProductsInSelectedPackage); + }, + }, + computed: { nullSafeAvailableLineItems() { return this.availableLineItems ?? []; }, @@ -208,6 +212,50 @@ export default { }); return vapsPrice; }, + selectDefaultPackage() { + const vapsFromStore = this.$store.getters.lineItems.vaps; + let lowestTierForPackage = packageNames.TIER_ONE; + vapsFromStore.every(vapsItem => { + let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem); + if (lowestTierForThisItem === packageNames.TIER_THREE) { + lowestTierForPackage = packageNames.TIER_THREE; + return false; + } else if (lowestTierForThisItem === packageNames.TIER_TWO) { + lowestTierForPackage = packageNames.TIER_TWO; + return true; + } else { + return true; + } + }); + this.selectedPackageName = lowestTierForPackage; + }, + getLowestTierForThisItem(vapsItem) { + let lowestTierForThisItem = null; + switch (vapsItem.partType) { + case partTypeStrings.FRONT_WIPER: + if (this.frontWipersApplicableForTierThree) { + lowestTierForThisItem = packageNames.TIER_THREE; + } + if (this.frontWipersApplicableForTierTwo) { + lowestTierForThisItem = packageNames.TIER_TWO; + } + break; + case partTypeStrings.REAR_WIPER: + if (this.rearWiperApplicableForTierThree) { + lowestTierForThisItem = packageNames.TIER_THREE; + } + if (this.rearWiperApplicableForTierTwo) { + lowestTierForThisItem = packageNames.TIER_TWO; + } + break; + case partTypeStrings.RAIN_DEFENSE: + if(this.rainDefenseApplicableForTierThree) { + lowestTierForThisItem = packageNames.TIER_THREE; + } + break; + } + return lowestTierForThisItem; + }, getVapsLineItemsForSelectedPackage(packageName) { const vapsLineItemsForSelectedPackage = []; if (packageName === packageNames.TIER_TWO) { diff --git a/src/store/index.js b/src/store/index.js index fc7c02402..29bd7c0c6 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -356,7 +356,7 @@ export const mutations = { state.order.lineItems.glassParts = sessionInformation.order.lineItems.glassParts; state.order.lineItems.supportingItems = sessionInformation.order.lineItems.supportingItems; - state.order.lineItems.vapsItems = sessionInformation.order.lineItems.vapsItems; + state.order.lineItems.vaps = sessionInformation.order.lineItems.vaps; state.order.lineItems.serverData = sessionInformation.order.lineItems.serverData; state.order.accountNumber = sessionInformation.order.accountNumber; state.order.providerNumber = sessionInformation.order.providerNumber; @@ -1011,7 +1011,7 @@ export const actions = { lineItems: { glassParts: lineItems.glassParts, supportingItems: lineItems.supportingItems, - vapsItems: lineItems.vapsItems, + vaps: lineItems.vaps, serverData: lineItems.serverData, }, payment: { From 12209733aaeacc82e5d54061f1015e454399ced5 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Wed, 30 Nov 2022 10:47:07 -0500 Subject: [PATCH 2/7] CSR-774 | Fix Formatting and Tests --- .../service-package-question.spec.js | 6 ++++-- .../service-package-question.vue | 10 ++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/layouts/quote/service-package-question/service-package-question.spec.js b/src/layouts/quote/service-package-question/service-package-question.spec.js index bd24ac752..e0608e713 100644 --- a/src/layouts/quote/service-package-question/service-package-question.spec.js +++ b/src/layouts/quote/service-package-question/service-package-question.spec.js @@ -6,6 +6,7 @@ import { mockProcessedCmsContent, inputQuestionWidgetAnswers, } from "./service-package-question-test-helper"; +import { nextTick } from "vue"; jest.mock("@/store", () => ({ commit: jest.fn(), @@ -49,11 +50,12 @@ describe("service-package-question.vue", () => { const packageNameKey = "05_01_CSR_Quote_Standard_Repair"; Object.assign(processedCmsContent, mockProcessedCmsContent[packageNameKey]); }); - it("should emit relevant VAPS items in an array", () => { + it("should emit relevant VAPS items in an array", async () => { // Arrange const wrapper = setupMocks({}); // Act - wrapper.componentVM.selectedValues = "TierThree"; + wrapper.componentVM.selectedPackageName = "TierThree"; + await nextTick(); // Assert expect(wrapper.emitted()["update:modelValue"][0][0]).toEqual([ diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue index 712d7166a..3c88b43c0 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -40,14 +40,12 @@ export default { }, watch: { availableLineItems() { - console.log('supportingItems from store', this.$store.getters.lineItems.supportingItems); - if(this.$store.getters.lineItems.vaps) { + if (this.$store.getters.lineItems.supportingItems) { this.selectDefaultPackage(); } }, selectedPackageName(newValue) { - const VapsProductsInSelectedPackage = - this.getVapsLineItemsForSelectedPackage(newValue); + const VapsProductsInSelectedPackage = this.getVapsLineItemsForSelectedPackage(newValue); this.$emit("update:modelValue", VapsProductsInSelectedPackage); }, }, @@ -215,7 +213,7 @@ export default { selectDefaultPackage() { const vapsFromStore = this.$store.getters.lineItems.vaps; let lowestTierForPackage = packageNames.TIER_ONE; - vapsFromStore.every(vapsItem => { + vapsFromStore.every((vapsItem) => { let lowestTierForThisItem = this.getLowestTierForThisItem(vapsItem); if (lowestTierForThisItem === packageNames.TIER_THREE) { lowestTierForPackage = packageNames.TIER_THREE; @@ -249,7 +247,7 @@ export default { } break; case partTypeStrings.RAIN_DEFENSE: - if(this.rainDefenseApplicableForTierThree) { + if (this.rainDefenseApplicableForTierThree) { lowestTierForThisItem = packageNames.TIER_THREE; } break; From fd5db4e206df6c87928306d9436bcdf343ec72ca Mon Sep 17 00:00:00 2001 From: CarlNation Date: Wed, 30 Nov 2022 15:42:44 -0500 Subject: [PATCH 3/7] CSR-944 vin optional alert info --- src/layouts/estimate/estimate.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue index 20a47e357..3d0d16b4a 100644 --- a/src/layouts/estimate/estimate.vue +++ b/src/layouts/estimate/estimate.vue @@ -22,7 +22,7 @@
@@ -250,6 +250,11 @@ export default { skipVinLookup() { return this.isRepair || this.isVinOptionalVehicle; }, + alertInfo() { + return this.isVinOptionalVehicle && !this.isRepair + ? "AlertQuoteVinOptional" + : "AlertQuoteReady"; + }, }, watch: { serviceZipCode() { From be75efbad4b77b48fa6763bd49d368873058878f Mon Sep 17 00:00:00 2001 From: CarlNation Date: Thu, 1 Dec 2022 12:30:36 -0500 Subject: [PATCH 4/7] CSR-944 fix JS error when make is null or undefined --- src/helpers/heritage-integration/navigation-helper.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js index 6d2b98e90..2c28d1d49 100644 --- a/src/helpers/heritage-integration/navigation-helper.js +++ b/src/helpers/heritage-integration/navigation-helper.js @@ -74,7 +74,9 @@ async function getLatestPageForRedirection() { fmgPageValues.CAPABILITY_QUESTIONS ); - const isVinOptionalVehicle = await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE); + const isVinOptionalVehicle = store.getters.order.vehicle.make + ? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE) + : false; if (!vehicleMakeComponent.methods.arePagePrerequisitesValid()) { return fmgPageValues.VEHICLE_YEAR; From 295392d851fd007b6ff54eb27698295bd87ae79c Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 2 Dec 2022 14:10:37 -0500 Subject: [PATCH 5/7] Update error state colors of search icon and background. --- src/styles/common-error-styles.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss index cc5c08248..6b67159d3 100644 --- a/src/styles/common-error-styles.scss +++ b/src/styles/common-error-styles.scss @@ -126,6 +126,12 @@ html { background-position: right 0.75rem center; background-size: 16px 12px; } + .has-search-icon { + button[type="submit"] { + background-color: $red-100; + background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.7817 14.7328L11.8252 10.7762C12.8833 9.45005 13.3936 7.76911 13.2513 6.07849C13.1091 4.38788 12.325 2.81587 11.0601 1.6852C9.79515 0.554524 8.14538 -0.0490261 6.44946 -0.00154744C4.75353 0.0459312 3.14012 0.740836 1.94045 1.94051C0.740775 3.14018 0.0458701 4.75359 -0.00160848 6.44952C-0.0490871 8.14545 0.554463 9.79521 1.68514 11.0601C2.81581 12.325 4.38782 13.1091 6.07843 13.2514C7.76905 13.3937 9.44999 12.8834 10.7762 11.8252L14.7349 15.7839C14.8044 15.8527 14.8869 15.907 14.9774 15.9439C15.068 15.9808 15.165 15.9995 15.2628 15.9989C15.3606 15.9983 15.4573 15.9784 15.5475 15.9405C15.6376 15.9025 15.7194 15.8471 15.7881 15.7776C15.8568 15.708 15.9112 15.6256 15.9481 15.535C15.985 15.4444 16.0036 15.3474 16.0031 15.2496C16.0025 15.1518 15.9826 15.0551 15.9446 14.965C15.9067 14.8748 15.8513 14.7931 15.7817 14.7243V14.7328ZM6.63737 11.7913C5.61803 11.7913 4.62157 11.4891 3.77402 10.9228C2.92646 10.3564 2.26587 9.5515 1.87578 8.60975C1.4857 7.668 1.38363 6.63172 1.5825 5.63196C1.78136 4.6322 2.27222 3.71386 2.99301 2.99307C3.7138 2.27229 4.63214 1.78142 5.6319 1.58256C6.63166 1.38369 7.66793 1.48576 8.60969 1.87585C9.55144 2.26593 10.3564 2.92652 10.9227 3.77408C11.489 4.62163 11.7913 5.61809 11.7913 6.63743C11.7896 8.00382 11.2461 9.31376 10.2799 10.2799C9.3137 11.2461 8.00376 11.7897 6.63737 11.7913Z' fill='%23d4281c'/%3E%3C/svg%3E%0A"); + } + } } } //Restore to default style if alert box is present From a6b169d4f5adc1943f72c8286f46a4ca165de339 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 2 Dec 2022 15:04:15 -0500 Subject: [PATCH 6/7] Fix border color. --- src/styles/common-error-styles.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/common-error-styles.scss b/src/styles/common-error-styles.scss index 6b67159d3..a9cef8dd5 100644 --- a/src/styles/common-error-styles.scss +++ b/src/styles/common-error-styles.scss @@ -130,6 +130,8 @@ html { button[type="submit"] { background-color: $red-100; background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.7817 14.7328L11.8252 10.7762C12.8833 9.45005 13.3936 7.76911 13.2513 6.07849C13.1091 4.38788 12.325 2.81587 11.0601 1.6852C9.79515 0.554524 8.14538 -0.0490261 6.44946 -0.00154744C4.75353 0.0459312 3.14012 0.740836 1.94045 1.94051C0.740775 3.14018 0.0458701 4.75359 -0.00160848 6.44952C-0.0490871 8.14545 0.554463 9.79521 1.68514 11.0601C2.81581 12.325 4.38782 13.1091 6.07843 13.2514C7.76905 13.3937 9.44999 12.8834 10.7762 11.8252L14.7349 15.7839C14.8044 15.8527 14.8869 15.907 14.9774 15.9439C15.068 15.9808 15.165 15.9995 15.2628 15.9989C15.3606 15.9983 15.4573 15.9784 15.5475 15.9405C15.6376 15.9025 15.7194 15.8471 15.7881 15.7776C15.8568 15.708 15.9112 15.6256 15.9481 15.535C15.985 15.4444 16.0036 15.3474 16.0031 15.2496C16.0025 15.1518 15.9826 15.0551 15.9446 14.965C15.9067 14.8748 15.8513 14.7931 15.7817 14.7243V14.7328ZM6.63737 11.7913C5.61803 11.7913 4.62157 11.4891 3.77402 10.9228C2.92646 10.3564 2.26587 9.5515 1.87578 8.60975C1.4857 7.668 1.38363 6.63172 1.5825 5.63196C1.78136 4.6322 2.27222 3.71386 2.99301 2.99307C3.7138 2.27229 4.63214 1.78142 5.6319 1.58256C6.63166 1.38369 7.66793 1.48576 8.60969 1.87585C9.55144 2.26593 10.3564 2.92652 10.9227 3.77408C11.489 4.62163 11.7913 5.61809 11.7913 6.63743C11.7896 8.00382 11.2461 9.31376 10.2799 10.2799C9.3137 11.2461 8.00376 11.7897 6.63737 11.7913Z' fill='%23d4281c'/%3E%3C/svg%3E%0A"); + border: 1px solid $red; + border-left: none; } } } From 1e77948ce3e2e75b4e6a54c7cc4fbb04aae92a00 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Fri, 2 Dec 2022 15:19:24 -0500 Subject: [PATCH 7/7] Remove props for test search input. --- src/layouts/vin-lookup/vin-lookup.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue index 1548a74dc..135956b26 100644 --- a/src/layouts/vin-lookup/vin-lookup.vue +++ b/src/layouts/vin-lookup/vin-lookup.vue @@ -9,11 +9,7 @@
-