From 5604ffd1a82d923bb55e826d6fccc1202b414be6 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Thu, 28 Dec 2023 09:52:23 -0500 Subject: [PATCH 1/3] Fixed logic that was pulling back available wipers incorrectly --- src/layouts/payment-method/payment-method.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 718573c87..dc25b17e7 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -124,18 +124,21 @@ export default { const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); const lineItemsFromStore = deepClone(store.getters.order.lineItems); + const frontWipersOnOrder = lineItemsFromStore.vaps.filter( (wiper) => wiper.partType == partTypeStrings.FRONT_WIPER ) ?? []; + const rearWipersOnOrder = lineItemsFromStore.vaps.filter( (wiper) => wiper.partType == partTypeStrings.REAR_WIPER ) ?? []; + const orderHasFrontWipers = frontWipersOnOrder.length > 0; const orderHasRearWipers = rearWipersOnOrder.length > 0; - const wipersPromise = orderHasFrontWipers + const wipersPromise = (!orderHasFrontWipers || !orderHasRearWipers) ? baseMixin.methods.dispatchStoreActionWithLogging( storeActions.GET_WIPERS, { @@ -168,7 +171,7 @@ export default { ]; const resultMap = await settleAllPromises(promiseResultMap); - +console.log(resultMap.wipers) const glassParts = lineItemsFromStore.glassParts ?? []; const supportingItems = lineItemsFromStore.supportingItems ?? []; const vaps = lineItemsFromStore.vaps ?? []; From 17e08189a8754284141a8ede5aab84108f124ff3 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Thu, 28 Dec 2023 09:55:36 -0500 Subject: [PATCH 2/3] Prettified --- src/layouts/payment-method/payment-method.vue | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index dc25b17e7..bbc18e017 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -124,7 +124,7 @@ export default { const cmsContentPromise = fetchCmsContentForPage(to.query.fmgPage); const lineItemsFromStore = deepClone(store.getters.order.lineItems); - + const frontWipersOnOrder = lineItemsFromStore.vaps.filter( (wiper) => wiper.partType == partTypeStrings.FRONT_WIPER @@ -138,16 +138,17 @@ export default { const orderHasFrontWipers = frontWipersOnOrder.length > 0; const orderHasRearWipers = rearWipersOnOrder.length > 0; - const wipersPromise = (!orderHasFrontWipers || !orderHasRearWipers) - ? baseMixin.methods.dispatchStoreActionWithLogging( - storeActions.GET_WIPERS, - { - serviceZipCode: store.getters.order.serviceLocation.zipCode, - carId: store.getters.vehicle.carId, - }, - "payment-method" - ) - : Promise.resolve([]); + const wipersPromise = + !orderHasFrontWipers || !orderHasRearWipers + ? baseMixin.methods.dispatchStoreActionWithLogging( + storeActions.GET_WIPERS, + { + serviceZipCode: store.getters.order.serviceLocation.zipCode, + carId: store.getters.vehicle.carId, + }, + "payment-method" + ) + : Promise.resolve([]); const rainDefensePromise = baseMixin.methods.dispatchStoreActionWithLogging( storeActions.GET_RAIN_DEFENSE, @@ -171,7 +172,7 @@ export default { ]; const resultMap = await settleAllPromises(promiseResultMap); -console.log(resultMap.wipers) + console.log(resultMap.wipers); const glassParts = lineItemsFromStore.glassParts ?? []; const supportingItems = lineItemsFromStore.supportingItems ?? []; const vaps = lineItemsFromStore.vaps ?? []; From 1a8375583c204e863ad868f6eb9bc97072aca899 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Thu, 28 Dec 2023 10:05:37 -0500 Subject: [PATCH 3/3] removed console log --- src/layouts/payment-method/payment-method.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index bbc18e017..736065d68 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -172,7 +172,7 @@ export default { ]; const resultMap = await settleAllPromises(promiseResultMap); - console.log(resultMap.wipers); + const glassParts = lineItemsFromStore.glassParts ?? []; const supportingItems = lineItemsFromStore.supportingItems ?? []; const vaps = lineItemsFromStore.vaps ?? [];