From 1e065024640540dfbf3f04ba5f0ed903bdcffa3c Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 24 Apr 2024 10:17:28 -0700 Subject: [PATCH 1/2] Correct instance manager for job totals in other files. --- server/accounting/qb-receivables-lines.js | 8 ++++++-- server/cdk/cdk-calculate-allocations.js | 6 +++++- server/job/job-costing.js | 6 +++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/server/accounting/qb-receivables-lines.js b/server/accounting/qb-receivables-lines.js index c8c7fb174..a19fe64d7 100644 --- a/server/accounting/qb-receivables-lines.js +++ b/server/accounting/qb-receivables-lines.js @@ -1,9 +1,13 @@ const DineroQbFormat = require("./accounting-constants").DineroQbFormat; const Dinero = require("dinero.js"); -const { DiscountNotAlreadyCounted } = require("../job/job-totals"); -const logger = require("../utils/logger"); const InstanceManager = require("../utils/instanceMgr").default; +const { DiscountNotAlreadyCounted } = InstanceManager({ + imex: require("../job/job-totals"), + rome: require("../job/job-totals-USA"), + promanager: "USE_ROME" +}); +const logger = require("../utils/logger"); exports.default = function ({ bodyshop, jobs_by_pk, qbo = false, items, taxCodes, classes }) { const InvoiceLineAdd = []; diff --git a/server/cdk/cdk-calculate-allocations.js b/server/cdk/cdk-calculate-allocations.js index 82e686236..600db20b4 100644 --- a/server/cdk/cdk-calculate-allocations.js +++ b/server/cdk/cdk-calculate-allocations.js @@ -9,8 +9,12 @@ const CdkBase = require("../web-sockets/web-socket"); const Dinero = require("dinero.js"); const _ = require("lodash"); -const { DiscountNotAlreadyCounted } = require("../job/job-totals"); const InstanceManager = require("../utils/instanceMgr").default; +const { DiscountNotAlreadyCounted } = InstanceManager({ + imex: require("../job/job-totals"), + rome: require("../job/job-totals-USA"), + promanager: "USE_ROME" +}); exports.default = async function (socket, jobid) { try { diff --git a/server/job/job-costing.js b/server/job/job-costing.js index 9216c02b9..e1886b1a7 100644 --- a/server/job/job-costing.js +++ b/server/job/job-costing.js @@ -2,7 +2,11 @@ const _ = require("lodash"); const Dinero = require("dinero.js"); const queries = require("../graphql-client/queries"); const logger = require("../utils/logger"); -const { DiscountNotAlreadyCounted } = require("./job-totals"); +const { DiscountNotAlreadyCounted } = InstanceManager({ + imex: require("../job/job-totals"), + rome: require("../job/job-totals-USA"), + promanager: "USE_ROME" +}); // Dinero.defaultCurrency = "USD"; // Dinero.globalLocale = "en-CA"; From 6865fcbffca1cc7412b27002551adf27a3c1469e Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 24 Apr 2024 10:51:09 -0700 Subject: [PATCH 2/2] Missing import instance --- server/job/job-costing.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/job/job-costing.js b/server/job/job-costing.js index e1886b1a7..d82d0ac42 100644 --- a/server/job/job-costing.js +++ b/server/job/job-costing.js @@ -2,6 +2,7 @@ const _ = require("lodash"); const Dinero = require("dinero.js"); const queries = require("../graphql-client/queries"); const logger = require("../utils/logger"); +const InstanceManager = require("../utils/instanceMgr").default; const { DiscountNotAlreadyCounted } = InstanceManager({ imex: require("../job/job-totals"), rome: require("../job/job-totals-USA"),