From e9da017ae98a600f8306c35600df1db611dcfba4 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 5 Jan 2023 16:29:18 -0500 Subject: [PATCH 1/3] CSR-1042 | Changing how price is displayed on Quote Removing fees from cash pricing --- src/layouts/quote/quote.vue | 11 +---------- .../service-package-question.vue | 2 +- src/mixins/base-mixin.js | 9 +++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 4cb2dcf55..606bee5ae 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -159,22 +159,13 @@ export default { return defaultIsInsuranceSelectedValue; } else { return availableLineItems - ? baseMixin.methods.getTierOnePackagePrice(availableLineItems) > 500 + ? baseMixin.methods.getTierOnePackagePrice(baseMixin.methods.filterOutFees(availableLineItems)) > 500 : null; } }, vapsItemsSelectedAction(vapsItemsSelected) { this.selectedVaps = vapsItemsSelected; }, - filterOutFees(currentSupportingItems) { - const filteredSupportingItems = currentSupportingItems.filter((item) => { - return ( - !item.partType.includes("FEE") || - (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR") - ); - }); - return filteredSupportingItems; - }, backButtonAction() { vehicleQuestionsMixin.methods.navigateBack(this); }, 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 35bb104ef..ebc86cc7e 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -165,7 +165,7 @@ export default { getPackagePrice(packageName) { let priceFloat = this.isInsuranceSelected ? 0 - : baseMixin.methods.getTierOnePackagePrice(this.nullSafeAvailableLineItems); + : baseMixin.methods.getTierOnePackagePrice(baseMixin.methods.filterOutFees(this.nullSafeAvailableLineItems)); if (packageName === packageNames.TIER_TWO) { priceFloat += this.getTierTwoPackageVapsPrice(); } else if (packageName === packageNames.TIER_THREE) { diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index f6c3518ba..0bebdc372 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -77,6 +77,15 @@ export default { }); return totalPrice; }, + filterOutFees(lineItems) { + const filteredLineItems = lineItems.filter((item) => { + return ( + !item.partType.includes("FEE") || + (item.partType === "REPAIR FEE" && item.partNumber != "SUPPLIES-REPAIR") + ); + }); + return filteredLineItems; + }, getTotalLineItemPrice(lineItem) { return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice; }, From 1458236f3350ff4b5b3a49a829154c9e9012118e Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 5 Jan 2023 16:31:48 -0500 Subject: [PATCH 2/3] CSR-1042 | Formatting --- .../service-package-question/service-package-question.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ebc86cc7e..1d9235374 100644 --- a/src/layouts/quote/service-package-question/service-package-question.vue +++ b/src/layouts/quote/service-package-question/service-package-question.vue @@ -165,7 +165,9 @@ export default { getPackagePrice(packageName) { let priceFloat = this.isInsuranceSelected ? 0 - : baseMixin.methods.getTierOnePackagePrice(baseMixin.methods.filterOutFees(this.nullSafeAvailableLineItems)); + : baseMixin.methods.getTierOnePackagePrice( + baseMixin.methods.filterOutFees(this.nullSafeAvailableLineItems) + ); if (packageName === packageNames.TIER_TWO) { priceFloat += this.getTierTwoPackageVapsPrice(); } else if (packageName === packageNames.TIER_THREE) { From ebf1a81e58d922eb1047beabd7556b4a1bc5fd47 Mon Sep 17 00:00:00 2001 From: Scott Kiener Date: Thu, 5 Jan 2023 16:38:33 -0500 Subject: [PATCH 3/3] CSR-1042 | Formattingv2 --- src/layouts/quote/quote.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index 606bee5ae..dfada2db0 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -159,7 +159,9 @@ export default { return defaultIsInsuranceSelectedValue; } else { return availableLineItems - ? baseMixin.methods.getTierOnePackagePrice(baseMixin.methods.filterOutFees(availableLineItems)) > 500 + ? baseMixin.methods.getTierOnePackagePrice( + baseMixin.methods.filterOutFees(availableLineItems) + ) > 500 : null; } },