Merge branch 'develop' into feature/jzimmerman/INSR-8742

src/constants/part-number-strings.js

@@ -1,5 +1,6 @@
 const partNumberStrings = Object.freeze({
-    RECYCLE_FEE: 'RECYCLE FEE'
+    RECYCLE_FEE: 'RECYCLE FEE',
+    LABOR2: 'LABOR2',
 });
 
 export default partNumberStrings;

src/store/index.js

@@ -1943,8 +1943,8 @@ export const useMainStore = defineStore({
             // Process Recycle Fee
             this.updateRecycleFee(partsData.find((rf) => rf.partNumber === partNumberStrings.RECYCLE_FEE));
 
-            // Remove RecycleFee from supported items as it's saved in feeItems;
-            this.order.lineItems.supportingItems = partsData.filter((i) => i.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);
         },
 
         updateVaps(partsData) {

src/store/store.spec.js

@@ -2489,4 +2489,32 @@ describe('Store', () => {
             expect(store.order.contactInfo.alternativePhone).toBeUndefined();
         });
     });
+    describe('updateSupportingItems method', () => {
+        it('updateSupportingItems removes Recyle Fee and Labor2 Fee from supporting items in store', () => {
+            // Arrange
+            const partsData = [
+                {
+                    partNumber: 'RECYCLE FEE',
+                    partType: 'REPLACE FEE'
+                },
+                {
+                    partNumber: 'LABOR2',
+                    partType: 'NON_GLASS'
+                }
+            ];
+
+            // Act
+            store.updateSupportingItems(partsData);
+
+            // Assert
+            expect.not.objectContaining({
+                partNumber: 'RECYCLE FEE',
+                partType: 'REPLACE FEE'
+            });
+            expect.not.objectContaining({
+                partNumber: 'LABOR2',
+                partType: 'NON_GLASS'
+            });
+        });
+    });
 });