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

IO-1475 Totals update for Mitchell Cloud discounts.

Browse Source
This commit is contained in:
Patrick Fic
2021-10-21 08:53:15 -07:00
parent 14af45baf0
commit da08fc74f1
3 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/accounting/qb-receivables-lines.js
View File

@@ -38,7 +38,9 @@ exports.default = function ({
if ( if (
(jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) || (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) ||
jobline.prt_dsmk_m !== 0 ((jobline.db_ref === "900511" || jobline.db_ref === "900510") &&
jobline.prt_dsmk_m &&
jobline.prt_dsmk_m !== 0)
) { ) {
// console.log("Have a part discount", jobline); // console.log("Have a part discount", jobline);
DineroAmount = DineroAmount.add( DineroAmount = DineroAmount.add(

7
server/cdk/cdk-calculate-allocations.js
View File

@@ -70,7 +70,12 @@ exports.default = async function (socket, jobid) {
amount: Math.round(val.act_price * 100), amount: Math.round(val.act_price * 100),
}).multiply(val.part_qty || 1); }).multiply(val.part_qty || 1);
if ((val.prt_dsmk_p && val.prt_dsmk_p !== 0) || val.prt_dsmk_m !== 0) { if (
(val.prt_dsmk_p && val.prt_dsmk_p !== 0) ||
((val.db_ref === "900511" || val.db_ref === "900510") &&
val.prt_dsmk_m &&
val.prt_dsmk_m !== 0)
) {
// console.log("Have a part discount", val); // console.log("Have a part discount", val);
DineroAmount = DineroAmount.add( DineroAmount = DineroAmount.add(
val.prt_dsmk_m && val.prt_dsmk_m !== 0 val.prt_dsmk_m && val.prt_dsmk_m !== 0

13
server/job/job-totals.js
View File

@@ -270,7 +270,10 @@ function CalculatePartsTotals(jobLines) {
}) })
.multiply(value.part_qty || 0) .multiply(value.part_qty || 0)
.add( .add(
value.prt_dsmk_m && value.prt_dsmk_m !== 0 (value.db_ref === "900511" ||
value.db_ref === "900510") &&
value.prt_dsmk_m &&
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
@@ -295,7 +298,9 @@ function CalculatePartsTotals(jobLines) {
parts: { parts: {
...acc.parts, ...acc.parts,
prt_dsmk_total: acc.parts.prt_dsmk_total.add( prt_dsmk_total: acc.parts.prt_dsmk_total.add(
value.prt_dsmk_m && value.prt_dsmk_m !== 0 (value.db_ref === "900511" || value.db_ref === "900510") &&
value.prt_dsmk_m &&
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),
@@ -339,7 +344,9 @@ function CalculatePartsTotals(jobLines) {
}).multiply(value.part_qty || 0) }).multiply(value.part_qty || 0)
) )
.add( .add(
value.prt_dsmk_m && value.prt_dsmk_m !== 0 (value.db_ref === "900511" || value.db_ref === "900510") &&
value.prt_dsmk_m &&
value.prt_dsmk_m !== 0
? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) }) ? Dinero({ amount: Math.round(value.prt_dsmk_m * 100) })
: Dinero({ : Dinero({
amount: Math.round(value.act_price * 100), amount: Math.round(value.act_price * 100),