diff --git a/src/constants/cart-item-types.js b/src/constants/cart-item-types.js index 2f84d22c2..0bb418d43 100644 --- a/src/constants/cart-item-types.js +++ b/src/constants/cart-item-types.js @@ -3,7 +3,7 @@ const cartItemTypes = { REAR_WIPERS: "REAR WIPERS", SUPPORTING_ITEMS: "SUPPORTING ITEMS", GLASS_PARTS: "GLASS PARTS", - RAIN_DEFENSE: "RAIN DEFENSE", + RAIN_REPEL: "RAIN REPEL", RECYCLE_FEE: "RECYCLE FEE", REPLACE_FEE: "REPLACE FEE", MOBILE_FEE: "MOBILE FEE", diff --git a/src/constants/endpoints.js b/src/constants/endpoints.js index 085651f20..eb55495f5 100644 --- a/src/constants/endpoints.js +++ b/src/constants/endpoints.js @@ -64,8 +64,8 @@ const endpoints = { url: "/parts/api/v1/parts/wipers", method: "GET", }, - GetRainDefense: { - url: "/parts/api/v1/parts/rain-defense", + GetRainRepel: { + url: "/parts/api/v1/parts/rain-repel", method: "GET", }, GetMobileFeePart: { diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js index 94e8598bd..741132e28 100644 --- a/src/constants/part-type-strings.js +++ b/src/constants/part-type-strings.js @@ -1,7 +1,7 @@ const partTypeStrings = { FRONT_WIPER: "FRONT WIPER", REAR_WIPER: "REAR WIPER", - RAIN_DEFENSE: "RAIN DEFENSE", + RAIN_REPEL: "RAIN REPEL", ADAS_RECALIBRATION: "ADAS RECALIBRATION", RECALIBRATION: "RECALIBRATION", REPLACE_FEE: "REPLACE FEE", diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 0fc1cc1b0..209266131 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -24,7 +24,7 @@ const storeActions = { GET_PARTS_OR_QUESTIONS: "getPartsOrQuestions", GET_PARTS: "getParts", GET_WIPERS: "getWipers", - GET_RAIN_DEFENSE: "getRainDefense", + GET_RAIN_REPEL: "getRainRepel", GET_SUPPORTING_ITEMS: "getSupportingItems", GET_CAPABILITY_QUESTIONS: "getCapabilityQuestions", SUBMIT_DONATION_PART_TO_SV2: "submitDonationPartToSV2", diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 7eb54f75d..e9152dd9d 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -444,8 +444,8 @@ export default { cartItems.push(this.rearWipersCartItem); } - if (this.rainDefenseCartItem) { - cartItems.push(this.rainDefenseCartItem); + if (this.rainRepelCartItem) { + cartItems.push(this.rainRepelCartItem); } if (this.glassPartCartItems) { @@ -701,40 +701,40 @@ export default { return cartItem; }, - rainDefenseCartItemName() { - return this.getCmsContentForVapsType(partTypeStrings.RAIN_DEFENSE); + rainRepelCartItemName() { + return this.getCmsContentForVapsType(partTypeStrings.RAIN_REPEL); }, - rainDefenseCartItem() { + rainRepelCartItem() { let cartItem = null; - const rainDefenseLineItem = this.vaps.find( - (vapsLineItem) => vapsLineItem.partType == partTypeStrings.RAIN_DEFENSE + const rainRepelLineItem = this.vaps.find( + (vapsLineItem) => vapsLineItem.partType == partTypeStrings.RAIN_REPEL ); - if (rainDefenseLineItem) { + if (rainRepelLineItem) { cartItem = { - name: this.getCmsContentForVapsType(partTypeStrings.RAIN_DEFENSE), + name: this.getCmsContentForVapsType(partTypeStrings.RAIN_REPEL), category: cartItemCategories.VAPS, - cartItemType: cartItemTypes.RAIN_DEFENSE, + cartItemType: cartItemTypes.RAIN_REPEL, isDisplayed: true, isRemovable: true, subTotal: 0, salesTax: 0, lineItems: [], isCoveredByInsurance: cartItemTypesCoveredByInsurance.includes( - cartItemTypes.RAIN_DEFENSE + cartItemTypes.RAIN_REPEL ), }; - rainDefenseLineItem.cartItemType = cartItem.cartItemType; - cartItem.lineItems.push(rainDefenseLineItem); + rainRepelLineItem.cartItemType = cartItem.cartItemType; + cartItem.lineItems.push(rainRepelLineItem); cartItem.subTotal += - (rainDefenseLineItem.kitPrice ?? 0) + - (rainDefenseLineItem.laborAmount ?? 0) + - (rainDefenseLineItem.sellingPrice ?? 0); + (rainRepelLineItem.kitPrice ?? 0) + + (rainRepelLineItem.laborAmount ?? 0) + + (rainRepelLineItem.sellingPrice ?? 0); - cartItem.salesTax += rainDefenseLineItem.salesTax ?? 0; + cartItem.salesTax += rainRepelLineItem.salesTax ?? 0; } return cartItem; diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js index 9155c2f61..c0136bcb3 100644 --- a/src/helpers/promotions-helper.js +++ b/src/helpers/promotions-helper.js @@ -6,13 +6,13 @@ import baseMixin from "@/mixins/base-mixin.js"; export const promoPartNumberStrings = { WIPER_DISCOUNT_PART_NUMBER: "WIPER DISCOUNT", - RAIN_DEFENSE_DISCOUNT_PART_NUMBER: "DISC RAIN DEFEN", + RAIN_REPEL_DISCOUNT_PART_NUMBER: "DISC RAIN REPEL", GLASS_DISCOUNT_PART_NUMBER: "DISCOUNT", GLASS_CLEANER_DISCOUNT_PART_NUMBER: "DISC GLASS CLN", }; export const addableVapsPromoPartNumbers = [ - promoPartNumberStrings.RAIN_DEFENSE_DISCOUNT_PART_NUMBER, + promoPartNumberStrings.RAIN_REPEL_DISCOUNT_PART_NUMBER, promoPartNumberStrings.WIPER_DISCOUNT_PART_NUMBER, ]; @@ -76,7 +76,7 @@ export function getAddableVapsFromAvailableLineItems(availableLineItems) { const addableVaps = []; addableVaps.push(...findLineItemsWithPartType(partTypeStrings.FRONT_WIPER, availableLineItems)); addableVaps.push( - ...findLineItemsWithPartType(partTypeStrings.RAIN_DEFENSE, availableLineItems) + ...findLineItemsWithPartType(partTypeStrings.RAIN_REPEL, availableLineItems) ); return addableVaps; } @@ -88,7 +88,7 @@ export function removeVapsPromosFromPromoArray(promoArray) { const filteredPromoArray = promoArray.filter((promo) => { return ( promo.partNumber != promoPartNumberStrings.WIPER_DISCOUNT_PART_NUMBER && - promo.partNumber != promoPartNumberStrings.RAIN_DEFENSE_DISCOUNT_PART_NUMBER && + promo.partNumber != promoPartNumberStrings.RAIN_REPEL_DISCOUNT_PART_NUMBER && promo.partNumber != promoPartNumberStrings.GLASS_CLEANER_DISCOUNT_PART_NUMBER ); }); @@ -283,6 +283,7 @@ export function getVapsThatNeedToBeAddedToSatisfyPromos( ) { const clonedVaps = deepClone(lineItemsOnOrder?.vaps ?? []); const promosWithAddableVaps = getPromosWithAddableVaps(promos); + console.log(":::::::::::::" + JSON.stringify(promosWithAddableVaps)); if (promosWithAddableVaps.length) { const matchingLineItems = getLineItemsThatMatchPromos( promosWithAddableVaps, diff --git a/src/helpers/service-package-helper.js b/src/helpers/service-package-helper.js index 6e0a6743a..3a0ad2e7b 100644 --- a/src/helpers/service-package-helper.js +++ b/src/helpers/service-package-helper.js @@ -101,7 +101,7 @@ export function getPackageContents(glassToReplace, availableLineItems, isRepair, } if (shouldRainDefenseBeAvailable(glassToReplace, availableLineItems, isRepair, targetTier)) { - vaps.push(partTypeStrings.RAIN_DEFENSE); + vaps.push(partTypeStrings.RAIN_REPEL); } return vaps; diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index 1912a39a7..a9c964268 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -173,8 +173,8 @@ export default { "confirmation" ); - const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_RAIN_DEFENSE, + const rainRepelPromise = baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_RAIN_REPEL, null, "confirmation" ); @@ -190,13 +190,13 @@ export default { promise: wipersPromise, }, { - resultKey: "rainDefense", - promise: rainDefensePromise, + resultKey: "rainRepel", + promise: rainRepelPromise, }, ]; const resultMap = await settleAllPromises(promiseResultMap); - const availableVaps = [resultMap.rainDefense, ...resultMap.wipers]; + const availableVaps = [resultMap.rainRepel, ...resultMap.wipers]; const lineItemsFromSubmittedOrder = deepClone(submittedOrder.lineItems); const isNoComp = submittedOrder?.policy?.isNoComp; diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index a314994d1..1042e30fe 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -201,8 +201,8 @@ export default { "payment-method" ); - const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_RAIN_DEFENSE, + const rainRepelPromise = baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_RAIN_REPEL, null, "payment-method" ); @@ -217,8 +217,8 @@ export default { promise: wipersPromise, }, { - resultKey: "rainDefense", - promise: rainDefensePromise, + resultKey: "rainRepel", + promise: rainRepelPromise, }, ]; @@ -229,7 +229,7 @@ export default { const supportingItems = lineItemsFromStore.supportingItems ?? []; const vaps = lineItemsFromStore.vaps ?? []; - const availableVaps = [resultMap.rainDefense, ...resultMap.wipers]; + const availableVaps = [resultMap.rainRepel, ...resultMap.wipers]; const pricedAvailableVaps = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, diff --git a/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.vue b/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.vue index 40675dbd2..4cf6dae0b 100644 --- a/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.vue +++ b/src/layouts/payment-method/review-dropdown/review-sections/service-package-review/service-package-review.vue @@ -40,8 +40,8 @@ export default { }, "review" ); - const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_RAIN_DEFENSE, + const rainRepelPromise = baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_RAIN_REPEL, null, "review" ); @@ -52,15 +52,15 @@ export default { promise: wipersPromise, }, { - resultKey: "rainDefense", - promise: rainDefensePromise, + resultKey: "rainRepel", + promise: rainRepelPromise, }, ]; return settleAllPromises(promiseResultMap); }, initializeComponent(apiResponses) { - const vapsFromApi = [...apiResponses.wipers, apiResponses.rainDefense]; + const vapsFromApi = [...apiResponses.wipers, apiResponses.rainRepel]; this.availableVaps = vapsFromApi; }, diff --git a/src/layouts/payment/payment.vue b/src/layouts/payment/payment.vue index c051c0bb7..992795321 100644 --- a/src/layouts/payment/payment.vue +++ b/src/layouts/payment/payment.vue @@ -330,8 +330,8 @@ export default { "payment" ); - const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_RAIN_DEFENSE, + const rainRepelPromise = baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_RAIN_REPEL, null, "payment" ); @@ -350,8 +350,8 @@ export default { promise: wipersPromise, }, { - resultKey: "rainDefense", - promise: rainDefensePromise, + resultKey: "rainRepel", + promise: rainRepelPromise, }, ]; @@ -361,12 +361,12 @@ export default { const supportingItems = lineItemsFromStore.supportingItems ?? []; const lineItemsToTax = [ - resultMap.rainDefense, + resultMap.rainRepel, ...supportingItems, ...resultMap.wipers, ...glassParts, ]; - const availableVaps = [resultMap.rainDefense, ...resultMap.wipers]; + const availableVaps = [resultMap.rainRepel, ...resultMap.wipers]; const pricedLineItemsToTax = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA, diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 68add4af2..e80867ee3 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -199,8 +199,8 @@ export default { }, "quote" ); - const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_RAIN_DEFENSE, + const rainRepelPromise = baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_RAIN_REPEL, null, "quote" ); @@ -275,8 +275,8 @@ export default { promise: wipersPromise, }, { - resultKey: "rainDefense", - promise: rainDefensePromise, + resultKey: "rainRepel", + promise: rainRepelPromise, }, { resultKey: "supportingItems", @@ -320,7 +320,7 @@ export default { } } const availableLineItems = [ - resultMap.rainDefense, + resultMap.rainRepel, ...resultMap.supportingItems, ...resultMap.wipers, ...nullSafeGlassParts, @@ -358,7 +358,7 @@ export default { false ); lineItems.supportingItems = resultMap.supportingItems; - const addableVaps = [...resultMap.wipers, resultMap.rainDefense]; + const addableVaps = [...resultMap.wipers, resultMap.rainRepel]; // Promo logic // Populate the previous state of promos for toast message usage in "next()" diff --git a/src/layouts/quote/service-package-question/service-package-question-test-helper.js b/src/layouts/quote/service-package-question/service-package-question-test-helper.js index a352b08d6..eb8e6784b 100644 --- a/src/layouts/quote/service-package-question/service-package-question-test-helper.js +++ b/src/layouts/quote/service-package-question/service-package-question-test-helper.js @@ -21,7 +21,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -48,7 +48,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -75,7 +75,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -102,7 +102,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -129,7 +129,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -156,7 +156,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -183,7 +183,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -210,7 +210,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -237,7 +237,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -264,7 +264,7 @@ export const mockProcessedCmsContent = { HeaderText: "Premium service", SubheaderText: "", BodyText: - "", + "", Image: "", FooterText: "", }, @@ -332,7 +332,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$621.40", buttonFooterCopy: "", }, @@ -362,7 +362,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$621.40", buttonFooterCopy: "", }, @@ -452,7 +452,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$495.88", buttonFooterCopy: "", }, @@ -482,7 +482,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$410.20", buttonFooterCopy: "", }, @@ -512,7 +512,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$471.40", buttonFooterCopy: "", }, @@ -532,7 +532,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$471.40", buttonFooterCopy: "", }, @@ -552,7 +552,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$385.72", buttonFooterCopy: "", }, @@ -572,7 +572,7 @@ export const expectedModifiedAnswers = { buttonLabel: "Premium service", buttonLabelSubCopy: "", buttonBodyCopy: - "", + "", buttonAuxillaryCopy: "$385.72", buttonFooterCopy: "", }, 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 e5c429646..7c123fefc 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -212,7 +212,7 @@ export default { packageNames.TIER_THREE ); }, - rainDefenseApplicableForTierThree() { + rainRepelApplicableForTierThree() { return shouldRainDefenseBeAvailable( this.glassToReplace, this.nullSafeAvailableLineItems, @@ -429,8 +429,8 @@ export default { return this.frontWipersApplicableForTierThree; case "rearWiperApplicableForTierThree": return this.rearWiperApplicableForTierThree; - case "rainDefenseApplicableForTierThree": - return this.rainDefenseApplicableForTierThree; + case "rainRepelApplicableForTierThree": + return this.rainRepelApplicableForTierThree; default: return null; } diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js index d8010b267..a3322a0a8 100644 --- a/src/mixins/analytics-mixin.js +++ b/src/mixins/analytics-mixin.js @@ -576,8 +576,8 @@ export default { lineItem.partType.indexOf("REAR WIPER") !== -1 ); }); - var rainDefense = vaps.filter(function (lineItem) { - return lineItem.partType.indexOf("RAIN DEFENSE") !== -1; + var rainRepel = vaps.filter(function (lineItem) { + return lineItem.partType.indexOf("RAIN REPEL") !== -1; }); // Combine line items @@ -600,8 +600,8 @@ export default { if (wipers) { combinedLineItems = combinedLineItems.concat(wipers); } - if (rainDefense) { - combinedLineItems = combinedLineItems.concat(rainDefense); + if (rainRepel) { + combinedLineItems = combinedLineItems.concat(rainRepel); } //Remove child Parts if any diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 4046fa477..5204178de 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -89,7 +89,7 @@ export default { return ( lineItem.partType != partTypeStrings.FRONT_WIPER && lineItem.partType != partTypeStrings.REAR_WIPER && - lineItem.partType != partTypeStrings.RAIN_DEFENSE + lineItem.partType != partTypeStrings.RAIN_REPEL ); }); diff --git a/src/store/index.js b/src/store/index.js index e8f15de8f..ed84cc636 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1746,10 +1746,10 @@ export const actions = { return response; }, - async getRainDefense(context, { pageNameToLog }) { + async getRainRepel(context, { pageNameToLog }) { const response = await globalMethods.callHttpClient({ - method: endpoints.GetRainDefense.method, - endpoint: endpoints.GetRainDefense.url, + method: endpoints.GetRainRepel.method, + endpoint: endpoints.GetRainRepel.url, logApiCall: true, pageNameToLog: pageNameToLog, }); @@ -3024,7 +3024,7 @@ export const actions = { return pricedLineItems; }, - // The parameter is an array of ALL available front wipers and rain defense + // The parameter is an array of ALL available front wipers and Rain Repel // for the vehicle. There is no need to confirm an addableVap is not already on the order // is an optional parameter if the lineItems in the store may not be up to date async validateOrderPromoAndSaveServerData( diff --git a/src/styles/ux-variables.scss b/src/styles/ux-variables.scss index bec02081f..c0a69a112 100644 --- a/src/styles/ux-variables.scss +++ b/src/styles/ux-variables.scss @@ -123,8 +123,8 @@ $body-color: $gray-600; //Fonts $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; -$font-family-monospace: - UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; +$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", + monospace; // stylelint-enable value-keyword-case $font-family-base: $font-family-sans-serif; $font-family-code: $font-family-monospace;