admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated supplementing mechanism.

Browse Source
This commit is contained in:
Patrick Fic
2023-03-20 14:56:02 -07:00
parent b82c04a16a
commit c3749f62fe
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js
View File

@@ -50,7 +50,6 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
.reduce((acc, value, idx) => { .reduce((acc, value, idx) => {
return acc + generateRemoveQuery(value, idx); return acc + generateRemoveQuery(value, idx);
}, ""); }, "");
console.log(insertQueries, updateQueries, removeQueries);
if ((insertQueries + updateQueries + removeQueries).trim() === "") { if ((insertQueries + updateQueries + removeQueries).trim() === "") {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {

31
client/src/components/jobs-available-table/jobs-available-table.container.jsx
View File

@@ -210,6 +210,7 @@ export function JobsAvailableContainer({
let supp = replaceEmpty({ ...estData.est_data }); let supp = replaceEmpty({ ...estData.est_data });
//IO-539 Check for Parts Rate on PAL for SGI use case. //IO-539 Check for Parts Rate on PAL for SGI use case.
await CheckTaxRates(supp, bodyshop); await CheckTaxRates(supp, bodyshop);
await ResolveCCCLineIssues(supp, bodyshop);
delete supp.owner; delete supp.owner;
delete supp.vehicle; delete supp.vehicle;
@@ -498,20 +499,20 @@ async function CheckTaxRates(estData, bodyshop) {
//IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate. //IO-1387 If a sublet line is NOT R&R, use the labor tax. If it is, use the sublet tax rate.
//Currently limited to SK shops only. //Currently limited to SK shops only.
if (bodyshop.region_config === "CA_SK") { if (bodyshop.region_config === "CA_SK") {
estData.joblines.data.forEach((jl, index) => { estData.joblines.data.forEach((jl, index) => {
if ( if (
(jl.part_type === "PASL" || jl.part_type === "PAS") && (jl.part_type === "PASL" || jl.part_type === "PAS") &&
jl.lbr_op !== "OP11" jl.lbr_op !== "OP11"
) { ) {
estData.joblines.data[index].tax_part = jl.lbr_tax; estData.joblines.data[index].tax_part = jl.lbr_tax;
} }
//Set markup lines and tax lines as taxable. //Set markup lines and tax lines as taxable.
//900510 is a mark up. 900510 is a discount. //900510 is a mark up. 900510 is a discount.
if (jl.db_ref === "900510") { if (jl.db_ref === "900510") {
estData.joblines.data[index].tax_part = true; estData.joblines.data[index].tax_part = true;
} }
}); });
} }
} }
@@ -544,8 +545,8 @@ async function ResolveCCCLineIssues(estData, bodyshop) {
); );
estData.joblines.data[nonRefLineIndex + 1] = { estData.joblines.data[nonRefLineIndex + 1] = {
...estData.joblines.data[nonRefLineIndex + 1], ...estData.joblines.data[nonRefLineIndex + 1],
act_price: null, act_price: 0,
db_price: null, db_price: 0,
prt_dsmk_p: 0, prt_dsmk_p: 0,
prt_dsmk_m: 0, prt_dsmk_m: 0,
}; };