Compare commits

...

6 Commits

Author SHA1 Message Date
Allan Carr
7239698a21 IO-3389 Parts Scanning with Part # Update
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-10-02 15:49:31 -07:00
Allan Carr
01664c52ec Merged in hotfix/2025-10-01 (pull request #2602)
IO-3384 Mitchell OP14 Import USA
2025-10-02 01:03:15 +00:00
Allan Carr
e66d52784f Merged in feature/IO-3387-Mitchell-OP14-Import-USA (pull request #2600)
IO-3384 Mitchell OP14 Import USA

Approved-by: Dave Richer
2025-10-01 23:33:36 +00:00
Allan Carr
a75969097e IO-3384 Mitchell OP14 Import USA
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2025-10-01 16:30:54 -07:00
Allan Carr
a384fd5072 Merged in release/2025-09-26 (pull request #2597)
IO-3330 CARFAX Adjustment
2025-09-27 06:17:33 +00:00
Dave Richer
37624d385f Merged in release/2025-09-26 (pull request #2592)
Release/2025 09 26 into master-AIO - IO-3365 - IO-3373 - IO-3325 - IO-3377 - IO-3330 - IO-3076
2025-09-27 01:35:06 +00:00
2 changed files with 29 additions and 14 deletions

View File

@@ -384,6 +384,8 @@ async function CalculateRatesTotals({ job, client }) {
if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
//Scenario where SGI may pay out hours using a part price.
if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
ret[item.mod_lbr_ty.toLowerCase()].base = Dinero();
ret[item.mod_lbr_ty.toLowerCase()].adjustment = Dinero();
ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
}
ret[item.mod_lbr_ty.toLowerCase()].total = ret[item.mod_lbr_ty.toLowerCase()].total.add(

View File

@@ -82,22 +82,35 @@ exports.partsScan = async function (req, res) {
criticalIds.add(jobline.id);
}
if (update_field && update_value) {
const result = await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
lineId: jobline.id,
line: { [update_field]: update_value, manual_line: true }
});
const auditResult = await client
.setHeaders({ Authorization: BearerToken })
.request(queries.INSERT_AUDIT_TRAIL, {
auditObj: {
bodyshopid: data.jobs_by_pk.bodyshop.id,
jobid,
operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
type: "partscanupdate",
useremail: req.user.email
let actualUpdateField = update_field;
if (update_field === "part_number") {
// Determine which part number field to update based on the match
if (!jobline.oem_partno) {
actualUpdateField = "oem_partno";
} else {
if (regex) {
actualUpdateField = regex.test(jobline.oem_partno || "") ? "oem_partno" : "alt_partno";
} else {
actualUpdateField = jobline.oem_partno === value ? "oem_partno" : "alt_partno";
}
}
}
if (actualUpdateField) {
await client.setHeaders({ Authorization: BearerToken }).request(queries.UPDATE_JOB_LINE, {
lineId: jobline.id,
line: { [actualUpdateField]: update_value, manual_line: true }
});
}
await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_AUDIT_TRAIL, {
auditObj: {
bodyshopid: data.jobs_by_pk.bodyshop.id,
jobid,
operation: `Jobline (#${jobline.line_no} ${jobline.line_desc}/${jobline.id}) ${update_field} updated from ${jobline[update_field]} to ${update_value}. Lined marked as manual line.`,
type: "partscanupdate",
useremail: req.user.email
}
});
}
//break; // No need to evaluate further rules for this jobline