fix Labor2 part being added to order
This commit is contained in:
parent
7fcf994f70
commit
bd20d47849
2 changed files with 6 additions and 11 deletions
|
|
@ -1934,6 +1934,9 @@ export const useMainStore = defineStore({
|
||||||
this.updateMobileFee(fee);
|
this.updateMobileFee(fee);
|
||||||
} else if (fee.partNumber === partNumberStrings.RECYCLE_FEE) {
|
} else if (fee.partNumber === partNumberStrings.RECYCLE_FEE) {
|
||||||
this.updateRecycleFee(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 {
|
} else {
|
||||||
this.addPartNumberFeeItem(fee, fee.partNumber);
|
this.addPartNumberFeeItem(fee, fee.partNumber);
|
||||||
}
|
}
|
||||||
|
|
@ -1948,8 +1951,8 @@ export const useMainStore = defineStore({
|
||||||
// Process Recycle Fee
|
// Process Recycle Fee
|
||||||
this.updateRecycleFee(partsData.find((rf) => rf.partNumber === partNumberStrings.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;
|
// 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 && i.partNumber !== partNumberStrings.LABOR2);
|
this.order.lineItems.supportingItems = partsData.filter((i) => i.partNumber !== partNumberStrings.RECYCLE_FEE);
|
||||||
},
|
},
|
||||||
|
|
||||||
updateVaps(partsData) {
|
updateVaps(partsData) {
|
||||||
|
|
|
||||||
|
|
@ -2490,16 +2490,12 @@ describe('Store', () => {
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
describe('updateSupportingItems method', () => {
|
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
|
// Arrange
|
||||||
const partsData = [
|
const partsData = [
|
||||||
{
|
{
|
||||||
partNumber: 'RECYCLE FEE',
|
partNumber: 'RECYCLE FEE',
|
||||||
partType: 'REPLACE FEE'
|
partType: 'REPLACE FEE'
|
||||||
},
|
|
||||||
{
|
|
||||||
partNumber: 'LABOR2',
|
|
||||||
partType: 'NON_GLASS'
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -2511,10 +2507,6 @@ describe('Store', () => {
|
||||||
partNumber: 'RECYCLE FEE',
|
partNumber: 'RECYCLE FEE',
|
||||||
partType: 'REPLACE FEE'
|
partType: 'REPLACE FEE'
|
||||||
});
|
});
|
||||||
expect.not.objectContaining({
|
|
||||||
partNumber: 'LABOR2',
|
|
||||||
partType: 'NON_GLASS'
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue