From bd20d47849802aefa4cbcd6a99ba8e12684c89c4 Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Fri, 27 Mar 2026 13:08:45 -0400 Subject: [PATCH 1/5] fix Labor2 part being added to order --- src/store/index.js | 7 +++++-- src/store/store.spec.js | 10 +--------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index aa56015a..da14e3dd 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1934,6 +1934,9 @@ export const useMainStore = defineStore({ this.updateMobileFee(fee); } else if (fee.partNumber === partNumberStrings.RECYCLE_FEE) { this.updateRecycleFee(fee); + } else if (fee.partNumber === partNumberStrings.LABOR2) { + // Do not add Labor2 to feeItems since it's already been added to supportingItems + this.addPartTypeFeeItem(null, partNumberStrings.LABOR2); } else { this.addPartNumberFeeItem(fee, fee.partNumber); } @@ -1948,8 +1951,8 @@ export const useMainStore = defineStore({ // Process Recycle Fee this.updateRecycleFee(partsData.find((rf) => rf.partNumber === partNumberStrings.RECYCLE_FEE)); - // Remove RecycleFee and Labor2 from supporting items as they're saved in feeItems; - this.order.lineItems.supportingItems = partsData.filter((i) => i.partNumber !== partNumberStrings.RECYCLE_FEE && i.partNumber !== partNumberStrings.LABOR2); + // Remove RecycleFee from supporting items since it's already been added to feeItems + this.order.lineItems.supportingItems = partsData.filter((i) => i.partNumber !== partNumberStrings.RECYCLE_FEE); }, updateVaps(partsData) { diff --git a/src/store/store.spec.js b/src/store/store.spec.js index bd601c24..2c6312da 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -2490,16 +2490,12 @@ describe('Store', () => { }); }); describe('updateSupportingItems method', () => { - it('updateSupportingItems removes Recyle Fee and Labor2 Fee from supporting items in store', () => { + it('updateSupportingItems removes Recyle Fee from supporting items in store', () => { // Arrange const partsData = [ { partNumber: 'RECYCLE FEE', partType: 'REPLACE FEE' - }, - { - partNumber: 'LABOR2', - partType: 'NON_GLASS' } ]; @@ -2511,10 +2507,6 @@ describe('Store', () => { partNumber: 'RECYCLE FEE', partType: 'REPLACE FEE' }); - expect.not.objectContaining({ - partNumber: 'LABOR2', - partType: 'NON_GLASS' - }); }); }); }); From 53e7e640c5032b5dfdb45602c0382f1f1e3b171e Mon Sep 17 00:00:00 2001 From: katiekroell <100247286+katiekroell@users.noreply.github.com> Date: Fri, 27 Mar 2026 13:28:49 -0400 Subject: [PATCH 2/5] Update src/store/index.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/store/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/index.js b/src/store/index.js index da14e3dd..5b5b2f57 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1936,7 +1936,7 @@ export const useMainStore = defineStore({ this.updateRecycleFee(fee); } else if (fee.partNumber === partNumberStrings.LABOR2) { // Do not add Labor2 to feeItems since it's already been added to supportingItems - this.addPartTypeFeeItem(null, partNumberStrings.LABOR2); + this.addPartNumberFeeItem(null, partNumberStrings.LABOR2); } else { this.addPartNumberFeeItem(fee, fee.partNumber); } From 5fc719849e8e4c6c2adb1257035c9602694bbc1d Mon Sep 17 00:00:00 2001 From: katiekroell <100247286+katiekroell@users.noreply.github.com> Date: Fri, 27 Mar 2026 13:29:13 -0400 Subject: [PATCH 3/5] Update src/store/store.spec.js Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- src/store/store.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 2c6312da..1050301c 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -2490,7 +2490,7 @@ describe('Store', () => { }); }); describe('updateSupportingItems method', () => { - it('updateSupportingItems removes Recyle Fee from supporting items in store', () => { + it('updateSupportingItems removes Recycle Fee from supporting items in store', () => { // Arrange const partsData = [ { From 2d00e6e1c14b88da9c1904363678d15f2086060b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 27 Mar 2026 17:31:42 +0000 Subject: [PATCH 4/5] Fix ineffective test assertion in updateSupportingItems test Agent-Logs-Url: https://github.com/Safelite/DigitalConsumer.ISS/sessions/fb2f46f9-6e42-4502-8833-3d3cae89de85 Co-authored-by: katiekroell <100247286+katiekroell@users.noreply.github.com> --- src/store/store.spec.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 1050301c..551f0c9b 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -2503,10 +2503,14 @@ describe('Store', () => { store.updateSupportingItems(partsData); // Assert - expect.not.objectContaining({ - partNumber: 'RECYCLE FEE', - partType: 'REPLACE FEE' - }); + expect(store.order.lineItems.supportingItems).not.toEqual( + expect.arrayContaining([ + expect.objectContaining({ + partNumber: 'RECYCLE FEE', + partType: 'REPLACE FEE' + }) + ]) + ); }); }); }); From ce3ff6e6b4a924f2f778d194f6dcacfecb61cd0b Mon Sep 17 00:00:00 2001 From: Katie Kroell Date: Fri, 27 Mar 2026 14:21:58 -0400 Subject: [PATCH 5/5] add unit test --- src/store/store.spec.js | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/store/store.spec.js b/src/store/store.spec.js index 551f0c9b..38a52c16 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -2513,4 +2513,28 @@ describe('Store', () => { ); }); }); -}); + describe('updateGlassFees method', () => { + it('updateGlassFees does not add Labor2 fee to feeItems', () => { + // Arrange + const feeData = [ + { + partNumber: 'LABOR2', + partType: 'LABOR FEE' + } + ]; + + // Act + store.updateGlassFees(feeData); + + // Assert + expect(store.order.lineItems.feeItems).not.toEqual( + expect.arrayContaining([ + expect.objectContaining({ + partNumber: 'LABOR2', + partType: 'LABOR FEE' + }) + ]) + ); + }); + }); +}); \ No newline at end of file