From 6ab421025b384708d81c130a383b25c1ccb71c16 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 6 Jan 2023 11:12:31 -0500 Subject: [PATCH 1/2] CSR-753 | Defect where child parts were not being priced Still needs some refactoring --- src/store/index.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index 5243ed6d1..ebfc404de 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1417,7 +1417,13 @@ export const actions = { // Price order actions async priceOrderItems(context, availableLineItems) { const availableLineItemsFormattedForRequest = availableLineItems - .map((lineItem) => `&LineItems=${lineItem.partNumber}`) + .map((lineItem) => { + let queryStringSnippet = `&LineItems=${lineItem.partNumber}`; + if (lineItem.childParts) { + queryStringSnippet += lineItem.childParts.map(childPart => `&LineItems=${childPart.partNumber}`).join(""); + } + return queryStringSnippet; + }) .join(""); const vehicle = context.getters.order.vehicle; let queryString = @@ -1598,6 +1604,17 @@ function addPricesToLineItems(lineItems, pricingLineItems) { let lineItemIndex = pricingLineItems.findIndex( (pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber ); + if (lineItem.childParts) { + lineItem.childParts.forEach((childPart) => { + let childPartIndex = pricingLineItems.findIndex( + (pricingLineItem) => pricingLineItem.partNumber === childPart.partNumber + ); + let pricedChildPart = pricingLineItems.splice(childPartIndex, 1)[0]; + childPart.laborAmount = pricedChildPart.laborAmount; + childPart.sellingPrice = pricedChildPart.sellingPrice; + childPart.kitPrice = pricedChildPart.kitPrice; + }); + } let pricedLineItem = pricingLineItems.splice(lineItemIndex, 1)[0]; lineItem.laborAmount = pricedLineItem.laborAmount; lineItem.sellingPrice = pricedLineItem.sellingPrice; From 9d2dd8742d6ab54a8f878a22c0d82c35c9dac9f8 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Fri, 6 Jan 2023 12:05:17 -0500 Subject: [PATCH 2/2] CSR-1022 | Refactor child part pricing --- src/store/index.js | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index ebfc404de..265db10d0 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1416,15 +1416,8 @@ export const actions = { }, // Price order actions async priceOrderItems(context, availableLineItems) { - const availableLineItemsFormattedForRequest = availableLineItems - .map((lineItem) => { - let queryStringSnippet = `&LineItems=${lineItem.partNumber}`; - if (lineItem.childParts) { - queryStringSnippet += lineItem.childParts.map(childPart => `&LineItems=${childPart.partNumber}`).join(""); - } - return queryStringSnippet; - }) - .join(""); + const availableLineItemsFormattedForRequest = + getLineItemQueryStringForPricing(availableLineItems); const vehicle = context.getters.order.vehicle; let queryString = `ParentAccountNumber=${applicationConfig.CASH_ACCOUNT_NUMBER}` + @@ -1605,15 +1598,7 @@ function addPricesToLineItems(lineItems, pricingLineItems) { (pricingLineItem) => pricingLineItem.partNumber === lineItem.partNumber ); if (lineItem.childParts) { - lineItem.childParts.forEach((childPart) => { - let childPartIndex = pricingLineItems.findIndex( - (pricingLineItem) => pricingLineItem.partNumber === childPart.partNumber - ); - let pricedChildPart = pricingLineItems.splice(childPartIndex, 1)[0]; - childPart.laborAmount = pricedChildPart.laborAmount; - childPart.sellingPrice = pricedChildPart.sellingPrice; - childPart.kitPrice = pricedChildPart.kitPrice; - }); + addPricesToLineItems(lineItem.childParts, pricingLineItems); } let pricedLineItem = pricingLineItems.splice(lineItemIndex, 1)[0]; lineItem.laborAmount = pricedLineItem.laborAmount; @@ -1622,3 +1607,14 @@ function addPricesToLineItems(lineItems, pricingLineItems) { }); return lineItems; } +function getLineItemQueryStringForPricing(lineItems) { + return lineItems + .map((lineItem) => { + let queryStringSnippet = `&LineItems=${lineItem.partNumber}`; + if (lineItem.childParts) { + queryStringSnippet += getLineItemQueryStringForPricing(lineItem.childParts); + } + return queryStringSnippet; + }) + .join(""); +}