From 41c039e332ea10daaae8d64c3193ae36275cec99 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 5 Mar 2025 14:14:51 +0530 Subject: [PATCH 01/13] CASH-323 removing extra spaces, cart promo link is taking extra space even not in use at confirmation page. --- src/experiment-components/donation-block.vue | 6 +++--- src/fmg-components/cart/cart.vue | 6 ++++++ src/layouts/confirmation/confirmation.vue | 6 +++++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue index 1daeedc41..ad14052a3 100644 --- a/src/experiment-components/donation-block.vue +++ b/src/experiment-components/donation-block.vue @@ -61,11 +61,11 @@
-
+
.donation-block { - padding: 1rem 0; + padding: 1rem 0 0 0; background-color: $gray-100; border-radius: 0; diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c3db8c830..5f19728ec 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -128,6 +128,7 @@ {{ insuranceCompanyName }}
+ :isNoComp="isNoComp" + :showPromoModalQuestion="ShowPromoModalQuestion" />
Date: Wed, 5 Mar 2025 14:20:47 +0530 Subject: [PATCH 02/13] CASH-323 formating --- src/fmg-components/cart/cart.vue | 10 +++++----- src/layouts/confirmation/confirmation.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 5f19728ec..c7699df74 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -201,11 +201,11 @@ export default { isItac: Boolean, isNoComp: Boolean, isExpandedOnLoad: Boolean, - showPromoModalQuestion:{ - default:true, - type:Boolean, - required:false - } + showPromoModalQuestion: { + default: true, + type: Boolean, + required: false, + }, }, data() { return { diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 27cbdfa8c..6e7391064 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -249,7 +249,7 @@ export default { "true" ); }, - ShowPromoModalQuestion(){ + ShowPromoModalQuestion() { return false; }, isRecalibrationOnOrder() { From c3cd2e346bb38baf565fcd5247bcfbafcb5cd55f Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 5 Mar 2025 14:47:21 +0530 Subject: [PATCH 03/13] CASH-323 revert cart showPromoModalQuestion changes --- src/fmg-components/cart/cart.vue | 6 ------ src/layouts/confirmation/confirmation.vue | 6 +----- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c7699df74..c3db8c830 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -128,7 +128,6 @@ {{ insuranceCompanyName }}
+ :isNoComp="isNoComp" />
Date: Wed, 5 Mar 2025 15:07:12 -0500 Subject: [PATCH 04/13] CASH-70: Pass isMSRFeeApplicable to cart component --- src/fmg-components/cart/cart.vue | 6 ++---- src/layouts/confirmation/confirmation.vue | 6 +++++- src/layouts/payment-method/payment-method.vue | 6 +++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index c3db8c830..b53dd30d7 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -200,6 +200,7 @@ export default { isItac: Boolean, isNoComp: Boolean, isExpandedOnLoad: Boolean, + isMSRFeeApplicable: Boolean, }, data() { return { @@ -846,9 +847,6 @@ export default { isCashItacNoComp() { return !this.isInsurance || this.isITAC || this.isNoComp; }, - getIsMSRFeeApplicableFromStore() { - return this.$store.getters.order.isMSRFeeApplicable; - }, mobileFeeCartItemName() { return this.getCmsContent("MobileServiceTextWidget", "Text"); }, @@ -865,7 +863,7 @@ export default { (mobileFeeLineItem?.sellingPrice ?? 0); if (mobileTotal > 0) { - if (this.getIsMSRFeeApplicableFromStore) { + if (this.isMSRFeeApplicable) { showMobileFeeCartItem = this.isCashItacNoComp; } else { showMobileFeeCartItem = true; diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index ac6ce2ed5..8c4d6cf1a 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -62,7 +62,8 @@ :shouldHideRecalibration="shouldHideRecalibration" :isExpandedOnLoad="false" :isItac="isItac" - :isNoComp="isNoComp" /> + :isNoComp="isNoComp" + :isMSRFeeApplicable="isMSRFeeApplicable" />
+ :isExpandedOnLoad="false" + :isMSRFeeApplicable="isMSRFeeApplicable" />
@@ -683,6 +684,9 @@ export default { damageInfo() { return this.$store.getters.damage; }, + isMSRFeeApplicable() { + return this.$store.getters.order.isMSRFeeApplicable; + }, isInsurance() { return this.hasSubmittedOrder() ? this.getSubmittedOrder()?.payment.isInsurance From 47ad0c9bf8052052189838ba5e389f5b40841b07 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 6 Mar 2025 13:46:45 -0500 Subject: [PATCH 05/13] CASH-309 | Fix whitespace in safeliteHOP add reference to iframeresizer to payment-pia-return --- src/layouts/payment-pia-return/payment-pia-return.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index a7979f8aa..7e76138a0 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -15,6 +15,10 @@ import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue"; import { Form } from "vee-validate"; import { paymentMethods } from "@/constants/payment-method-constants"; import { routerParams } from "@/router/router-constants/router-params"; +// iframeResizer IS loaded into the page and necessary for the package to +// to auto scale the iFrame this page is loaded in +// Do not remove despite showing as "unused" CASH-309 +import iframeResizer from '@iframe-resizer/child' export default { name: "payment-pia-return", From 6d2628823393e8ea73c394053a7ce1d73635dee6 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 6 Mar 2025 13:53:26 -0500 Subject: [PATCH 06/13] Formatting --- src/layouts/payment-pia-return/payment-pia-return.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index 7e76138a0..6bb99f3c8 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -18,7 +18,7 @@ import { routerParams } from "@/router/router-constants/router-params"; // iframeResizer IS loaded into the page and necessary for the package to // to auto scale the iFrame this page is loaded in // Do not remove despite showing as "unused" CASH-309 -import iframeResizer from '@iframe-resizer/child' +import iframeResizer from "@iframe-resizer/child"; export default { name: "payment-pia-return", From 8454ec43068a2790d5f4498b5c6eb8142c0b027d Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Mon, 10 Mar 2025 09:23:55 -0400 Subject: [PATCH 07/13] CASH-309 | Include needed packages --- package-lock.json | 11 +++++++++++ package.json | 1 + 2 files changed, 12 insertions(+) diff --git a/package-lock.json b/package-lock.json index a1f9ca9d3..4eabbf0c9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "Safelite", "version": "0.1.0", "dependencies": { + "@iframe-resizer/child": "^5.3.3", "axios": "^0.23.0", "bootstrap": "^5.3.3", "core-js": "^3.38.1", @@ -2162,6 +2163,16 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/@iframe-resizer/child": { + "version": "5.3.3", + "resolved": "https://registry.npmjs.org/@iframe-resizer/child/-/child-5.3.3.tgz", + "integrity": "sha512-A+avzzQ6R5AaK0RQ/v0sxrN/S7zeS0U7TE/Jcc2Wln0gpVHpkEMHLOYVBAS2ho8ZA6yhbyZeNoDCh3RMtCp14w==", + "license": "GPL-3.0", + "funding": { + "type": "individual", + "url": "https://iframe-resizer.com/pricing/" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/package.json b/package.json index 2cf0e2d98..65de4ba18 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { + "@iframe-resizer/child": "^5.3.3", "axios": "^0.23.0", "bootstrap": "^5.3.3", "core-js": "^3.38.1", From 76fd180de3852c7e40fa3a7585f6a8f0dba16217 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 10 Mar 2025 09:41:00 -0400 Subject: [PATCH 08/13] CASH-369 put link on same line. Change margin. --- src/experiment-components/donation-block.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue index ad14052a3..eb3ed2771 100644 --- a/src/experiment-components/donation-block.vue +++ b/src/experiment-components/donation-block.vue @@ -12,7 +12,7 @@

-

+  
-

+

From 48b45f869a62e1448ab810a13bc0eb7d84e1a971 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Mon, 10 Mar 2025 09:45:52 -0400 Subject: [PATCH 09/13] Format code. --- src/experiment-components/donation-block.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue index eb3ed2771..30fca4fd1 100644 --- a/src/experiment-components/donation-block.vue +++ b/src/experiment-components/donation-block.vue @@ -12,7 +12,8 @@

-   + +   Date: Wed, 12 Mar 2025 13:45:08 -0400 Subject: [PATCH 10/13] Remove extra auto-focus code to prevent early blur event --- .../address-questions/address-questions.vue | 7 ------- src/layouts/address-lookup/address-lookup.vue | 6 +----- .../customer-questions/customer-questions.vue | 10 +--------- 3 files changed, 2 insertions(+), 21 deletions(-) diff --git a/src/fmg-components/address-questions/address-questions.vue b/src/fmg-components/address-questions/address-questions.vue index 1dd52d7ed..6256bedd1 100644 --- a/src/fmg-components/address-questions/address-questions.vue +++ b/src/fmg-components/address-questions/address-questions.vue @@ -124,10 +124,6 @@ export default { type: Boolean, default: false, }, - isAddressFieldFocused: { - type: Boolean, - default: true, - }, }, data() { return { @@ -229,9 +225,6 @@ export default { ).then(() => { // When loaded, trigger the setup this.initializeAutocomplete(); - if (this.isAddressFieldFocused) { - this.addressField1.focus(); - } }); }, initializeAutocomplete() { diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue index 6e3520704..f8cac123b 100644 --- a/src/layouts/address-lookup/address-lookup.vue +++ b/src/layouts/address-lookup/address-lookup.vue @@ -19,8 +19,7 @@ ref="customerQuestions" v-model="customerQuestions" :validationRules="EmailOrSmsValidationRules" - :isEmailOptional="IsEmailOptional" - :isAddressFieldFocused="IsAddressFieldFocused" /> + :isEmailOptional="IsEmailOptional" />
- +
Date: Mon, 17 Mar 2025 13:34:40 -0400 Subject: [PATCH 11/13] CASH-276 CASH-276 add call to location service to determine if a zip code has a provider that can service heavy truck --- src/constants/endpoints.js | 4 ++++ src/constants/store-actions.js | 1 + src/layouts/vehicle/vehicle.vue | 26 ++++++++++++++++++-------- src/store/index.js | 9 +++++++++ 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js index 29d36d091..976696976 100644 --- a/src/constants/endpoints.js +++ b/src/constants/endpoints.js @@ -188,6 +188,10 @@ const endpoints = { url: "/account/api/v1/account/bill-to-account-number", method: "GET", }, + ClosestApplicableShops: { + url: "/location/api/v1/location/closest-applicable-shops", + method: "GET", + }, }; export { endpoints }; diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 6c6ba62b7..4a5e713f4 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -53,6 +53,7 @@ const storeActions = { GET_INSURANCE_COMPANY_LIST: "getInsuranceCompanyList", GET_BILL_TO_ACCOUNT_NUMBER: "getBillToAccountNumber", GET_RECAL_PARTS_AND_SAVE_TO_LINE_ITEMS: "getRecalPartsAndSaveToLineItems", + GET_CLOSEST_APPLICABLE_SHOPS: "getClosestApplicableShops", // Analytics LOG_EXPERIMENT_EXPOSURE_AND_UPDATE_STORE: "logExperimentExposureAndUpdateStore", diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index fafa4c079..521793adc 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -49,7 +49,7 @@ placeHolderText="Select style" customDropdownId="styleQuestionField" /> -
+
Date: Mon, 17 Mar 2025 13:43:49 -0400 Subject: [PATCH 12/13] prettier prettier --- src/layouts/vehicle/vehicle.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index 521793adc..bab3a92e8 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -427,9 +427,7 @@ export default { ); }, isHeavyTruck() { - return ( - this.vehicleSubType === vehicleSubTypes.HEAVY_TRUCK && this.canSafeliteService - ); + return this.vehicleSubType === vehicleSubTypes.HEAVY_TRUCK && this.canSafeliteService; }, }, methods: { From b9f14fdb2d270836c241dc0f8f41c4def2caf5c9 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 18 Mar 2025 03:55:00 -0400 Subject: [PATCH 13/13] CASH-276 CASH-276 persist canSafeliteService field --- src/constants/store-mutations.js | 1 + src/layouts/vehicle/vehicle.vue | 10 +++++++++- src/store/index.js | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js index 6a5873e83..509988c6e 100644 --- a/src/constants/store-mutations.js +++ b/src/constants/store-mutations.js @@ -17,6 +17,7 @@ const storeMutations = { UPDATE_VEHICLE_IMAGE_COLOR: "updateVehicleImageColor", UPDATE_VEHICLE_VIN: "updateVehicleVin", UPDATE_VEHICLE: "updateVehicle", + UPDATE_VEHICLE_CAN_SAFELITE_SERVICE: "updateVehicleCanSafeliteService", UPDATE_IS_REPAIR: "updateIsRepair", UPDATE_NUMBER_OF_CHIPS: "updateNumberOfChips", diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index bab3a92e8..da4ee6689 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -140,7 +140,7 @@ export default { modelOptions: [], styleOptions: [], displayNoServiceAlert: false, - canSafeliteService: false, + canSafeliteService: this.canSafeliteServiceFromStore(), }; }, @@ -316,6 +316,9 @@ export default { }, watch: { + serviceZipCode(newValue, oldValue) { + this.resetAlert(); + }, async selectedYear(year) { this.resetAlert(); this.makeOptions = []; @@ -323,6 +326,7 @@ export default { this.selectedModel = null; this.selectedStyle = null; this.vehicleSubType = null; + this.canSafeliteService = false; this.carId = null; if (year) { const result = await this.getMakeOptions(year); @@ -496,6 +500,7 @@ export default { vehicleSubType: this.vehicleSubType, carId: this.carId, category: this.category, + canSafeliteService: this.canSafeliteService, imageUrl: this.imageUrl, imageVifNumber: this.imageVifNumber, imageVifColor: this.imageVifColor, @@ -553,6 +558,9 @@ export default { selectedStylefromStore() { return store.getters.externalParameterVehicle.style ?? store.getters.vehicle.style; }, + canSafeliteServiceFromStore() { + return store.getters.vehicle.canSafeliteService ?? false; + }, async getMakeOptions(year) { return await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.GET_VEHICLE_MAKES, diff --git a/src/store/index.js b/src/store/index.js index aaee4c996..08307ec12 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -65,6 +65,7 @@ const getDefaultState = () => { carId: null, category: null, vin: null, + canSafeliteService: null, imageUrl: null, imageVifNumber: null, imageColor: null, @@ -221,6 +222,9 @@ export const mutations = { updateVehicleCategory(state, category) { state.order.vehicle.category = category; }, + updateVehicleCanSafeliteService(state, canSafeliteService) { + state.order.vehicle.canSafeliteService = canSafeliteService; + }, updateVehicleImageUrl(state, imageUrl) { state.order.vehicle.imageUrl = imageUrl; }, @@ -2357,6 +2361,7 @@ export const actions = { vehicleSubType, carId, category, + canSafeliteService, imageUrl, imageVifNumber, imageVifColor, @@ -2379,6 +2384,7 @@ export const actions = { context.commit(storeMutations.UPDATE_VEHICLE_SUBTYPE, vehicleSubType); context.commit(storeMutations.UPDATE_CAR_ID, carId); context.commit(storeMutations.UPDATE_VEHICLE_CATEGORY, category); + context.commit(storeMutations.UPDATE_VEHICLE_CAN_SAFELITE_SERVICE, canSafeliteService); context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_URL, imageUrl); context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_VIF_NUMBER, imageVifNumber); context.commit(storeMutations.UPDATE_VEHICLE_IMAGE_COLOR, imageVifColor);