From 8460a99085864a8af66583c6e9daff935e3afce8 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Tue, 19 Mar 2024 10:54:25 -0700 Subject: [PATCH] IO-2704 QBO/D Export resolution --- .../components/feature-wrapper/feature-wrapper.component.jsx | 5 ----- server/accounting/qb-receivables-lines.js | 4 ++-- server/accounting/qbxml/qbxml-receivables.js | 2 +- server/cdk/cdk-calculate-allocations.js | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/client/src/components/feature-wrapper/feature-wrapper.component.jsx b/client/src/components/feature-wrapper/feature-wrapper.component.jsx index 7a3ca5b47..f249bfa37 100644 --- a/client/src/components/feature-wrapper/feature-wrapper.component.jsx +++ b/client/src/components/feature-wrapper/feature-wrapper.component.jsx @@ -33,11 +33,6 @@ function FeatureWrapper({ bodyshop, featureName, noauth, children, ...restProps } export function HasFeatureAccess({ featureName, bodyshop }) { - console.log( - 'Feature Name', featureName, - bodyshop?.features.allAccess, - dayjs(bodyshop?.features[featureName]).isAfter(dayjs()) - ); return bodyshop?.features.allAccess || dayjs(bodyshop?.features[featureName]).isAfter(dayjs()); } diff --git a/server/accounting/qb-receivables-lines.js b/server/accounting/qb-receivables-lines.js index 6f20fafa8..1a6c5f339 100644 --- a/server/accounting/qb-receivables-lines.js +++ b/server/accounting/qb-receivables-lines.js @@ -605,9 +605,9 @@ exports.default = function ({ const state_tax = Dinero(job_totals.totals.state_tax); const local_tax = Dinero(job_totals.totals.local_tax); - const RulesetToUse = InstanceManager({imex:"CANADA",rome: "US"}) + const RulesetToUse = InstanceManager({ imex: 'CANADA', rome: 'US', promanager: 'US' }); - if(RulesetToUse = "CANADA"){ + if(RulesetToUse === "CANADA"){ if (federal_tax.getAmount() > 0) { if (qbo) { // do qbo diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js index 758449e25..f0322b0a3 100644 --- a/server/accounting/qbxml/qbxml-receivables.js +++ b/server/accounting/qbxml/qbxml-receivables.js @@ -7,7 +7,7 @@ const builder = require("xmlbuilder2"); const QbXmlUtils = require("./qbxml-utils"); const CreateInvoiceLines = require("../qb-receivables-lines").default; const logger = require('../../utils/logger'); -const InstanceManager = require('../../utils/instanceMgr'); +const InstanceManager = require('../../utils/instanceMgr').default; require("dotenv").config({ path: path.resolve( diff --git a/server/cdk/cdk-calculate-allocations.js b/server/cdk/cdk-calculate-allocations.js index 119c535e3..a1564ab69 100644 --- a/server/cdk/cdk-calculate-allocations.js +++ b/server/cdk/cdk-calculate-allocations.js @@ -13,7 +13,7 @@ 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'); +const InstanceManager = require('../utils/instanceMgr').default; exports.default = async function (socket, jobid) { try {