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

Updated UI and added tech elements.

Browse Source
This commit is contained in:
Patrick Fic
2023-07-21 13:40:39 -07:00
parent 8dfcda6c5e
commit 7b49a94edd
14 changed files with 210 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/payroll/claim-task.js
View File

@@ -33,7 +33,7 @@ exports.claimtask = async function (req, res) {
);
//Get all of the assignments that are filtered.
const { employeeHash } = CalculateExpectedHoursForJob(
const { assignmentHash, employeeHash } = CalculateExpectedHoursForJob(
job,
theTaskPreset.hourstype
);
@@ -83,7 +83,7 @@ exports.claimtask = async function (req, res) {
},
});
}
res.json(ticketsToInsert);
res.json({ unassignedHours: assignmentHash.unassigned, ticketsToInsert });
} catch (error) {
logger.log("job-payroll-claim-task-error", "ERROR", req.user.email, jobid, {
jobid: jobid,

10
server/payroll/pay-all.js
View File

@@ -62,7 +62,7 @@ exports.payall = async function (req, res) {
cost_center:
job.bodyshop.md_responsibility_centers.defaults.costs[key],
flat_rate: true,
memo: "*System* Hours added during Pay All function. (multi)",
memo: `*SYS-PAY* Add unclaimed hours. (${req.user.email})`,
});
});
} else {
@@ -79,7 +79,7 @@ exports.payall = async function (req, res) {
job.bodyshop.md_responsibility_centers.defaults.costs[
path.mod_lbr_ty
],
memo: "*System* Hours added during Pay All function.",
memo: `*SYS-PAY* Add unclaimed hours. (${req.user.email})`,
});
}
} else if (diff.op === "update") {
@@ -97,7 +97,7 @@ exports.payall = async function (req, res) {
job.bodyshop.md_responsibility_centers.defaults.costs[
path.mod_lbr_ty
],
memo: "*System* Hours adjustment during Pay All function. (Update)",
memo: `*SYS-PAY* Adjust claimed hours per assignment. (${req.user.email})`,
});
} else {
//Has to be a delete
@@ -123,7 +123,7 @@ exports.payall = async function (req, res) {
cost_center:
job.bodyshop.md_responsibility_centers.defaults.costs[key],
flat_rate: true,
memo: "*System* Hours removed during Pay All function. (Change in rate, unassignment, etc.) *multi*",
memo: `*SYS-PAY* Remove claimed hours per assignment. (${req.user.email})`,
});
});
} else {
@@ -140,7 +140,7 @@ exports.payall = async function (req, res) {
path.mod_lbr_ty
],
flat_rate: true,
memo: "*System* Hours removed during Pay All function. (Change in rate, unassignment, etc.)",
memo: `*SYS-PAY* Remove claimed hours per assignment. (${req.user.email})`,
});
}
}