From 70fa638c3784e0d22f15d1302f4bb7da77c16830 Mon Sep 17 00:00:00 2001 From: Dave Date: Thu, 21 Aug 2025 11:45:38 -0400 Subject: [PATCH] feature/IO-3255-simplified-parts-management - Remove unnecessary dotenv calls --- client/src/components/eula/eula.component.jsx | 7 ++-- server/accounting/pbs/pbs-ap-allocations.js | 4 -- server/accounting/pbs/pbs-constants.js | 5 --- server/accounting/pbs/pbs-job-export.js | 4 -- server/accounting/qbo/qbo-authorize.js | 4 -- server/accounting/qbo/qbo-callback.js | 6 +-- server/accounting/qbo/qbo-payables.js | 9 ++--- server/accounting/qbo/qbo-payments.js | 33 +++++++++++---- server/accounting/qbo/qbo-receivables.js | 14 +++---- server/accounting/qbo/qbo.js | 5 --- server/accounting/qbxml/qbxml-payables.js | 5 --- server/accounting/qbxml/qbxml-payments.js | 5 --- server/accounting/qbxml/qbxml-receivables.js | 5 --- server/admin/adminops.js | 6 --- server/ccc/partspricechange.js | 5 --- server/cdk/cdk-calculate-allocations.js | 6 +-- server/cdk/cdk-get-makes.js | 4 -- server/cdk/cdk-job-export.js | 4 -- server/cdk/cdk-wsdl.js | 4 -- server/csi/lookup.js | 4 -- server/csi/submit.js | 4 -- server/data/arms.js | 7 +--- server/data/autohouse.js | 5 +-- server/data/carfax.js | 6 +-- server/data/chatter.js | 15 +++++-- server/data/claimscorp.js | 5 +-- server/data/kaizen.js | 5 +-- server/data/podium.js | 5 +-- server/data/usageReport.js | 4 -- server/email/sendemail.js | 40 ++++++++++++++----- server/email/tasksEmails.js | 8 +--- server/email/tasksEmailsQueue.js | 4 -- server/ioevent/ioevent.js | 4 -- server/job/job-status-transition.js | 5 --- server/mixdata/mixdata.js | 4 -- server/opensearch/os-handler.js | 4 -- server/scheduling/scheduling-job.js | 5 --- server/stripe/payment.js | 6 --- server/tasks/tasks.js | 4 -- server/tech/tech.js | 4 -- server/utils/getHostNameOrIP.js | 5 --- server/utils/logger.js | 3 -- server/web-sockets/web-socket.js | 3 -- 43 files changed, 90 insertions(+), 204 deletions(-) diff --git a/client/src/components/eula/eula.component.jsx b/client/src/components/eula/eula.component.jsx index d915814eb..f21824388 100644 --- a/client/src/components/eula/eula.component.jsx +++ b/client/src/components/eula/eula.component.jsx @@ -102,14 +102,15 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => { size="large" htmlType="submit" disabled={!formReady} - children={t("eula.buttons.accept")} - /> + > + {t("eula.buttons.accept")} + )} closable={false} >
- + {currentEula?.content?.replace(/\\n|\\r|\\n\\r|\\r\\n/g, "\n")}
diff --git a/server/accounting/pbs/pbs-ap-allocations.js b/server/accounting/pbs/pbs-ap-allocations.js index 62bd84270..f5092030c 100644 --- a/server/accounting/pbs/pbs-ap-allocations.js +++ b/server/accounting/pbs/pbs-ap-allocations.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const GraphQLClient = require("graphql-request").GraphQLClient; const queries = require("../../graphql-client/queries"); diff --git a/server/accounting/pbs/pbs-constants.js b/server/accounting/pbs/pbs-constants.js index 4c562c10d..c8a6d54f3 100644 --- a/server/accounting/pbs/pbs-constants.js +++ b/server/accounting/pbs/pbs-constants.js @@ -1,8 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - const IMEX_PBS_USER = process.env.IMEX_PBS_USER, IMEX_PBS_PASSWORD = process.env.IMEX_PBS_PASSWORD; const PBS_CREDENTIALS = { diff --git a/server/accounting/pbs/pbs-job-export.js b/server/accounting/pbs/pbs-job-export.js index da7a690a1..127c9d5e2 100644 --- a/server/accounting/pbs/pbs-job-export.js +++ b/server/accounting/pbs/pbs-job-export.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const GraphQLClient = require("graphql-request").GraphQLClient; const AxiosLib = require("axios").default; const queries = require("../../graphql-client/queries"); diff --git a/server/accounting/qbo/qbo-authorize.js b/server/accounting/qbo/qbo-authorize.js index b58b0f4c8..53dea8fcd 100644 --- a/server/accounting/qbo/qbo-authorize.js +++ b/server/accounting/qbo/qbo-authorize.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const OAuthClient = require("intuit-oauth"); const logger = require("../../utils/logger"); diff --git a/server/accounting/qbo/qbo-callback.js b/server/accounting/qbo/qbo-callback.js index 7dfa6adfa..281ab9d9a 100644 --- a/server/accounting/qbo/qbo-callback.js +++ b/server/accounting/qbo/qbo-callback.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const logger = require("../../utils/logger"); const OAuthClient = require("intuit-oauth"); const client = require("../../graphql-client/graphql-client").client; @@ -13,7 +9,7 @@ const oauthClient = new OAuthClient({ clientId: process.env.QBO_CLIENT_ID, clientSecret: process.env.QBO_SECRET, environment: process.env.NODE_ENV === "production" ? "production" : "sandbox", - redirectUri: process.env.QBO_REDIRECT_URI, + redirectUri: process.env.QBO_REDIRECT_URI }); const url = InstanceEndpoints(); diff --git a/server/accounting/qbo/qbo-payables.js b/server/accounting/qbo/qbo-payables.js index dd56a5a04..9f0aacc42 100644 --- a/server/accounting/qbo/qbo-payables.js +++ b/server/accounting/qbo/qbo-payables.js @@ -1,9 +1,6 @@ const urlBuilder = require("./qbo").urlBuilder; const StandardizeName = require("./qbo").StandardizeName; -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + const logger = require("../../utils/logger"); const Dinero = require("dinero.js"); const DineroQbFormat = require("../accounting-constants").DineroQbFormat; @@ -396,7 +393,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) { qbo_realmId, "query", `select * - From TaxCode` + From TaxCode` ), method: "POST", headers: { @@ -416,7 +413,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) { qbo_realmId, "query", `select * - From Class` + From Class` ), method: "POST", headers: { diff --git a/server/accounting/qbo/qbo-payments.js b/server/accounting/qbo/qbo-payments.js index db288efe5..fee383acb 100644 --- a/server/accounting/qbo/qbo-payments.js +++ b/server/accounting/qbo/qbo-payments.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const logger = require("../../utils/logger"); const Dinero = require("dinero.js"); @@ -274,7 +270,13 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef) async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditMemo, parentTierRef, bodyshopid) { const invoice = await oauthClient.makeApiCall({ - url: urlBuilder(qbo_realmId, "query", `select * From Invoice where DocNumber like '${ro_number}%'`), + url: urlBuilder( + qbo_realmId, + "query", + `select * + From Invoice + where DocNumber like '${ro_number}%'` + ), method: "POST", headers: { "Content-Type": "application/json" @@ -290,7 +292,12 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM email: req.user.email }); const paymentMethods = await oauthClient.makeApiCall({ - url: urlBuilder(qbo_realmId, "query", `select * From PaymentMethod`), + url: urlBuilder( + qbo_realmId, + "query", + `select * + From PaymentMethod` + ), method: "POST", headers: { "Content-Type": "application/json" @@ -341,7 +348,12 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM if (isCreditMemo) { const taxCodes = await oauthClient.makeApiCall({ - url: urlBuilder(qbo_realmId, "query", `select * From TaxCode`), + url: urlBuilder( + qbo_realmId, + "query", + `select * + From TaxCode` + ), method: "POST", headers: { "Content-Type": "application/json" @@ -357,7 +369,12 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM email: req.user.email }); const items = await oauthClient.makeApiCall({ - url: urlBuilder(qbo_realmId, "query", `select * From Item`), + url: urlBuilder( + qbo_realmId, + "query", + `select * + From Item` + ), method: "POST", headers: { "Content-Type": "application/json" diff --git a/server/accounting/qbo/qbo-receivables.js b/server/accounting/qbo/qbo-receivables.js index 559bc675d..550dafec8 100644 --- a/server/accounting/qbo/qbo-receivables.js +++ b/server/accounting/qbo/qbo-receivables.js @@ -1,10 +1,6 @@ const urlBuilder = require("./qbo").urlBuilder; const StandardizeName = require("./qbo").StandardizeName; -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const logger = require("../../utils/logger"); const apiGqlClient = require("../../graphql-client/graphql-client").client; const queries = require("../../graphql-client/queries"); @@ -492,8 +488,8 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) { qbo_realmId, "query", `select * - From Item - where active = true maxresults 1000` + From Item + where active = true maxresults 1000` ), method: "POST", headers: { @@ -515,8 +511,8 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) { qbo_realmId, "query", `select * - From TaxCode - where active = true` + From TaxCode + where active = true` ), method: "POST", headers: { @@ -537,7 +533,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid, jobid) { qbo_realmId, "query", `select * - From Class` + From Class` ), method: "POST", headers: { diff --git a/server/accounting/qbo/qbo.js b/server/accounting/qbo/qbo.js index 9abce0805..bf90bfb2f 100644 --- a/server/accounting/qbo/qbo.js +++ b/server/accounting/qbo/qbo.js @@ -1,8 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - function urlBuilder(realmId, object, query = null) { return `https://${ process.env.NODE_ENV === "production" ? "" : "sandbox-" diff --git a/server/accounting/qbxml/qbxml-payables.js b/server/accounting/qbxml/qbxml-payables.js index aa65eb1d6..9e658ecea 100644 --- a/server/accounting/qbxml/qbxml-payables.js +++ b/server/accounting/qbxml/qbxml-payables.js @@ -1,4 +1,3 @@ -const path = require("path"); const DineroQbFormat = require("../accounting-constants").DineroQbFormat; const queries = require("../../graphql-client/queries"); const Dinero = require("dinero.js"); @@ -8,10 +7,6 @@ const moment = require("moment-timezone"); const logger = require("../../utils/logger"); const InstanceManager = require("../../utils/instanceMgr").default; -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - exports.default = async (req, res) => { const { bills: billsToQuery } = req.body; diff --git a/server/accounting/qbxml/qbxml-payments.js b/server/accounting/qbxml/qbxml-payments.js index 68e7b8778..c51db4889 100644 --- a/server/accounting/qbxml/qbxml-payments.js +++ b/server/accounting/qbxml/qbxml-payments.js @@ -1,4 +1,3 @@ -const path = require("path"); const DineroQbFormat = require("../accounting-constants").DineroQbFormat; const queries = require("../../graphql-client/queries"); const Dinero = require("dinero.js"); @@ -8,10 +7,6 @@ const QbXmlUtils = require("./qbxml-utils"); const QbxmlReceivables = require("./qbxml-receivables"); const logger = require("../../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - const { generateJobTier, generateOwnerTier, generateSourceTier } = QbXmlUtils; exports.default = async (req, res) => { diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js index c4353704e..3e7b56744 100644 --- a/server/accounting/qbxml/qbxml-receivables.js +++ b/server/accounting/qbxml/qbxml-receivables.js @@ -1,4 +1,3 @@ -const path = require("path"); const DineroQbFormat = require("../accounting-constants").DineroQbFormat; const queries = require("../../graphql-client/queries"); const Dinero = require("dinero.js"); @@ -9,10 +8,6 @@ const CreateInvoiceLines = require("../qb-receivables-lines").default; const logger = require("../../utils/logger"); const InstanceManager = require("../../utils/instanceMgr").default; -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - Dinero.globalRoundingMode = "HALF_EVEN"; const { generateJobTier, generateOwnerTier, generateSourceTier } = QbXmlUtils; diff --git a/server/admin/adminops.js b/server/admin/adminops.js index 67c6399bd..a62a1fde3 100644 --- a/server/admin/adminops.js +++ b/server/admin/adminops.js @@ -1,10 +1,4 @@ -const path = require("path"); - const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - const client = require("../graphql-client/graphql-client").client; exports.createAssociation = async (req, res) => { diff --git a/server/ccc/partspricechange.js b/server/ccc/partspricechange.js index f2d2371dd..eb9112231 100644 --- a/server/ccc/partspricechange.js +++ b/server/ccc/partspricechange.js @@ -1,13 +1,8 @@ -const path = require("path"); const logger = require("../utils/logger"); const queries = require("../graphql-client/queries"); const GraphQLClient = require("graphql-request").GraphQLClient; const moment = require("moment-timezone"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - exports.generatePpc = async (req, res) => { const { jobid } = req.body; const BearerToken = req.headers.authorization; diff --git a/server/cdk/cdk-calculate-allocations.js b/server/cdk/cdk-calculate-allocations.js index 81600707c..7c90aef20 100644 --- a/server/cdk/cdk-calculate-allocations.js +++ b/server/cdk/cdk-calculate-allocations.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const GraphQLClient = require("graphql-request").GraphQLClient; const queries = require("../graphql-client/queries"); @@ -248,7 +244,7 @@ function calculateAllocations(connectionData, job) { // Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting), // typeof Number.isInteger(bodyshop?.cdk_configuration?.sendmaterialscosting) // ); - if (!!bodyshop?.cdk_configuration?.sendmaterialscosting) { + if (bodyshop?.cdk_configuration?.sendmaterialscosting) { //Manually send the percentage of the costing. //Paint Mat diff --git a/server/cdk/cdk-get-makes.js b/server/cdk/cdk-get-makes.js index 90accf64e..b5d28cd5a 100644 --- a/server/cdk/cdk-get-makes.js +++ b/server/cdk/cdk-get-makes.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const soap = require("soap"); const queries = require("../graphql-client/queries"); diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js index 90001fa28..b93ee3637 100644 --- a/server/cdk/cdk-job-export.js +++ b/server/cdk/cdk-job-export.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const GraphQLClient = require("graphql-request").GraphQLClient; const soap = require("soap"); const queries = require("../graphql-client/queries"); diff --git a/server/cdk/cdk-wsdl.js b/server/cdk/cdk-wsdl.js index 8926e98ae..0175a9f6e 100644 --- a/server/cdk/cdk-wsdl.js +++ b/server/cdk/cdk-wsdl.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const CdkBase = require("../web-sockets/web-socket"); const IMEX_CDK_USER = process.env.IMEX_CDK_USER, diff --git a/server/csi/lookup.js b/server/csi/lookup.js index 57c9a0ef6..5536140ed 100644 --- a/server/csi/lookup.js +++ b/server/csi/lookup.js @@ -1,9 +1,5 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const client = require("../graphql-client/graphql-client").client; diff --git a/server/csi/submit.js b/server/csi/submit.js index 45d8e56c0..3913df791 100644 --- a/server/csi/submit.js +++ b/server/csi/submit.js @@ -1,9 +1,5 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const client = require("../graphql-client/graphql-client").client; diff --git a/server/data/arms.js b/server/data/arms.js index cd86da6ae..4df941c63 100644 --- a/server/data/arms.js +++ b/server/data/arms.js @@ -1,4 +1,3 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const Dinero = require("dinero.js"); const moment = require("moment-timezone"); @@ -6,9 +5,7 @@ const fs = require("fs"); const storage = require("node-persist"); const _ = require("lodash"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + const soap = require("soap"); const { sendServerEmail } = require("../email/sendemail"); @@ -24,7 +21,7 @@ const momentFormat = "yyyy-MM-DDTHH:mm:ss.SSS"; function pollFunc(fn, timeout, interval) { var startTime = new Date().getTime(); - (interval = interval || 1000), (canPoll = true); + ((interval = interval || 1000), (canPoll = true)); (function p() { canPoll = timeout === 0 ? true : new Date().getTime() - startTime <= timeout; diff --git a/server/data/autohouse.js b/server/data/autohouse.js index 586d9789b..d050158ef 100644 --- a/server/data/autohouse.js +++ b/server/data/autohouse.js @@ -1,13 +1,10 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const Dinero = require("dinero.js"); const moment = require("moment-timezone"); var builder = require("xmlbuilder2"); const logger = require("../utils/logger"); const fs = require("fs"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + let Client = require("ssh2-sftp-client"); const client = require("../graphql-client/graphql-client").client; diff --git a/server/data/carfax.js b/server/data/carfax.js index e1583a365..b25e371a8 100644 --- a/server/data/carfax.js +++ b/server/data/carfax.js @@ -1,4 +1,3 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const Dinero = require("dinero.js"); const moment = require("moment-timezone"); @@ -11,9 +10,6 @@ const { sendServerEmail } = require("../email/sendemail"); const { uploadFileToS3 } = require("../utils/s3"); const crypto = require("crypto"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); let Client = require("ssh2-sftp-client"); const AHDateFormat = "YYYY-MM-DD"; @@ -124,7 +120,7 @@ exports.default = async (req, res) => { async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allXMLResults, allErrors) { for (const bodyshop of shopsToProcess) { - const shopid = bodyshop.imexshopid?.toLowerCase() || bodyshop.shopname.replace(/[^a-zA-Z0-9]/g, "").toLowerCase() + const shopid = bodyshop.imexshopid?.toLowerCase() || bodyshop.shopname.replace(/[^a-zA-Z0-9]/g, "").toLowerCase(); const erroredJobs = []; try { logger.log("CARFAX-start-shop-extract", "DEBUG", "api", bodyshop.id, { diff --git a/server/data/chatter.js b/server/data/chatter.js index c54a58c2c..45402a67e 100644 --- a/server/data/chatter.js +++ b/server/data/chatter.js @@ -1,11 +1,9 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const moment = require("moment-timezone"); const converter = require("json-2-csv"); const logger = require("../utils/logger"); const fs = require("fs"); const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager"); -require("dotenv").config({ path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) }); let Client = require("ssh2-sftp-client"); const client = require("../graphql-client/graphql-client").client; @@ -77,7 +75,15 @@ exports.default = async (req, res) => { await sendServerEmail({ subject: `Chatter Report ${moment().format("MM-DD-YY")}`, text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\n - Uploaded:\n${JSON.stringify({ filename: csvToUpload.filename, count: csvToUpload.count, result: csvToUpload.result }, null, 2)}` + Uploaded:\n${JSON.stringify( + { + filename: csvToUpload.filename, + count: csvToUpload.count, + result: csvToUpload.result + }, + null, + 2 + )}` }); logger.log("chatter-end", "DEBUG", "api", null, null); @@ -107,7 +113,8 @@ async function processBatch(shopsToProcess, start, end, allChatterObjects, allEr transaction_id: j.ro_number, email: j.ownr_ea, phone_number: j.ownr_ph1, - transaction_time: (j.actual_delivery && moment(j.actual_delivery).tz(bodyshop.timezone).format("YYYYMMDD-HHmm")) || "" + transaction_time: + (j.actual_delivery && moment(j.actual_delivery).tz(bodyshop.timezone).format("YYYYMMDD-HHmm")) || "" }; }); allChatterObjects.push(...chatterObject); diff --git a/server/data/claimscorp.js b/server/data/claimscorp.js index cadeef606..d5700c866 100644 --- a/server/data/claimscorp.js +++ b/server/data/claimscorp.js @@ -1,13 +1,10 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const Dinero = require("dinero.js"); const moment = require("moment-timezone"); var builder = require("xmlbuilder2"); const logger = require("../utils/logger"); const fs = require("fs"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + let Client = require("ssh2-sftp-client"); const client = require("../graphql-client/graphql-client").client; diff --git a/server/data/kaizen.js b/server/data/kaizen.js index d8d3a9dc5..86068c1ea 100644 --- a/server/data/kaizen.js +++ b/server/data/kaizen.js @@ -1,13 +1,10 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const Dinero = require("dinero.js"); const moment = require("moment-timezone"); var builder = require("xmlbuilder2"); const logger = require("../utils/logger"); const fs = require("fs"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + let Client = require("ssh2-sftp-client"); const client = require("../graphql-client/graphql-client").client; diff --git a/server/data/podium.js b/server/data/podium.js index 5490b00db..06b4e8fda 100644 --- a/server/data/podium.js +++ b/server/data/podium.js @@ -1,12 +1,9 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const moment = require("moment-timezone"); const converter = require("json-2-csv"); const logger = require("../utils/logger"); const fs = require("fs"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); + let Client = require("ssh2-sftp-client"); const client = require("../graphql-client/graphql-client").client; diff --git a/server/data/usageReport.js b/server/data/usageReport.js index ead4b0bba..cd03bbda2 100644 --- a/server/data/usageReport.js +++ b/server/data/usageReport.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const client = require("../graphql-client/graphql-client").client; const emailer = require("../email/sendemail"); const moment = require("moment-timezone"); diff --git a/server/email/sendemail.js b/server/email/sendemail.js index 0c6ce4015..6622cb6ce 100644 --- a/server/email/sendemail.js +++ b/server/email/sendemail.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const axios = require("axios"); const InstanceManager = require("../utils/instanceMgr").default; const logger = require("../utils/logger"); @@ -101,7 +97,10 @@ const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => { imex: "Welcome to the ImEX Online platform.", rome: "Welcome to the Rome Online platform." }), - subHeader: `Your ${InstanceManager({imex: features?.allAccess ? "ImEX Online": "ImEX Lite", rome: features?.allAccess ? "RO Manager" : "RO Basic"})} shop setup has been completed, and this email will include all the information you need to begin.`, + subHeader: `Your ${InstanceManager({ + imex: features?.allAccess ? "ImEX Online" : "ImEX Lite", + rome: features?.allAccess ? "RO Manager" : "RO Basic" + })} shop setup has been completed, and this email will include all the information you need to begin.`, body: `

To finish setting up your account, visit this link and enter your desired password. Reset Password

@@ -110,12 +109,25 @@ const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => {
-

To access your ${InstanceManager({imex: features.allAccess ? "ImEX Online": "ImEX Lite", rome: features.allAccess ? "RO Manager" : "RO Basic"})} shop, visit ${InstanceManager({imex: "imex.online", rome: "romeonline.io"})}. Your username is your email, and your password is what you previously set up. Contact support for additional logins.

+

To access your ${InstanceManager( + { + imex: features.allAccess ? "ImEX Online" : "ImEX Lite", + rome: features.allAccess ? "RO Manager" : "RO Basic" + } + )} shop, visit ${InstanceManager( + { + imex: "imex.online", + rome: "romeonline.io" + } + )}. Your username is your email, and your password is what you previously set up. Contact support for additional logins.
${InstanceManager({ - rome: ` + rome: `
@@ -161,7 +173,12 @@ const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => {
-

In addition to the training tour, you can also book a live one-on-one demo to see exactly how our system can help streamline the repair process at your shop, schedule by clicking this link - ${InstanceManager({imex: "ImEX Lite", rome: "Rome Basic"})} Demo Booking

+

In addition to the training tour, you can also book a live one-on-one demo to see exactly how our system can help streamline the repair process at your shop, schedule by clicking this link - ${InstanceManager( + { + imex: "ImEX Lite", + rome: "Rome Basic" + } + )} Demo Booking
@@ -175,7 +192,12 @@ const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => {
-

The ${InstanceManager({imex: "ImEX Online", rome: "Rome Online"})} Team

+

The ${InstanceManager( + { + imex: "ImEX Online", + rome: "Rome Online" + } + )} Team

`, dateLine }) diff --git a/server/email/tasksEmails.js b/server/email/tasksEmails.js index 2f434b0bc..927662845 100644 --- a/server/email/tasksEmails.js +++ b/server/email/tasksEmails.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const InstanceManager = require("../utils/instanceMgr").default; const logger = require("../utils/logger"); const client = require("../graphql-client/graphql-client").client; @@ -23,7 +19,7 @@ const tasksEmailQueueCleanup = async () => { // Example async operation // console.log("Performing Tasks Email Reminder process cleanup..."); await new Promise((resolve) => tasksEmailQueue.destroy(() => resolve())); - // eslint-disable-next-line no-unused-vars + // eslint-disable-next-line no-unused-vars } catch (err) { // console.error("Tasks Email Reminder process cleanup failed:", err); } @@ -264,7 +260,7 @@ const tasksRemindEmail = async (req, res) => {
  • ${task.title} - Priority: ${formatTaskPriority(task.priority)} ${task.due_date ? `${formatDate(task.due_date)}` : ""} | Bodyshop: ${task.bodyshop.shopname}
    • - `.trim() + `.trim() ) .join("")} ` diff --git a/server/email/tasksEmailsQueue.js b/server/email/tasksEmailsQueue.js index c1828b858..3ac49233c 100644 --- a/server/email/tasksEmailsQueue.js +++ b/server/email/tasksEmailsQueue.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const Queue = require("better-queue"); const moment = require("moment"); const { client } = require("../graphql-client/graphql-client"); diff --git a/server/ioevent/ioevent.js b/server/ioevent/ioevent.js index 4366230ce..369bdd20b 100644 --- a/server/ioevent/ioevent.js +++ b/server/ioevent/ioevent.js @@ -1,10 +1,6 @@ const path = require("path"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - // Emit this to bodyshop room exports.default = async (req, res) => { diff --git a/server/job/job-status-transition.js b/server/job/job-status-transition.js index dc2559769..37bf67ea5 100644 --- a/server/job/job-status-transition.js +++ b/server/job/job-status-transition.js @@ -5,13 +5,8 @@ const logger = require("../utils/logger"); // Dinero.defaultCurrency = "USD"; // Dinero.globalLocale = "en-CA"; Dinero.globalRoundingMode = "HALF_EVEN"; -const path = require("path"); const client = require("../graphql-client/graphql-client").client; -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - async function StatusTransition(req, res) { const { id: jobid, status: value, shopid: bodyshopid } = req.body.event.data.new; diff --git a/server/mixdata/mixdata.js b/server/mixdata/mixdata.js index ab37ce031..93a236673 100644 --- a/server/mixdata/mixdata.js +++ b/server/mixdata/mixdata.js @@ -3,10 +3,6 @@ const xml2js = require("xml2js"); const queries = require("../graphql-client/queries"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - exports.mixdataUpload = async (req, res) => { const client = req.userGraphQLClient; diff --git a/server/opensearch/os-handler.js b/server/opensearch/os-handler.js index 3292233c9..663e8a015 100644 --- a/server/opensearch/os-handler.js +++ b/server/opensearch/os-handler.js @@ -1,7 +1,3 @@ -require("dotenv").config({ - path: require("path").resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - //const client = require("../graphql-client/graphql-client").client; const logger = require("../utils/logger"); const queries = require("../graphql-client/queries"); diff --git a/server/scheduling/scheduling-job.js b/server/scheduling/scheduling-job.js index 40b1006f1..1ba412a84 100644 --- a/server/scheduling/scheduling-job.js +++ b/server/scheduling/scheduling-job.js @@ -1,13 +1,8 @@ -const path = require("path"); const queries = require("../graphql-client/queries"); const moment = require("moment-timezone"); const logger = require("../utils/logger"); const _ = require("lodash"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - exports.job = async (req, res) => { const { jobId } = req.body; diff --git a/server/stripe/payment.js b/server/stripe/payment.js index 7b7bc1dc8..5a9453b7b 100644 --- a/server/stripe/payment.js +++ b/server/stripe/payment.js @@ -3,12 +3,6 @@ * If required, remember to re-install stripe 14.19.0 */ -const path = require("path"); - -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - const stripe = require("stripe")(process.env.STRIPE_SECRET_KEY); const processor = async (req, res) => { diff --git a/server/tasks/tasks.js b/server/tasks/tasks.js index 46a7b2d92..023098b85 100644 --- a/server/tasks/tasks.js +++ b/server/tasks/tasks.js @@ -1,7 +1,3 @@ -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const client = require("../graphql-client/graphql-client").client; const emailer = require("../email/sendemail"); const moment = require("moment-timezone"); diff --git a/server/tech/tech.js b/server/tech/tech.js index 794958f5d..f92535f5f 100644 --- a/server/tech/tech.js +++ b/server/tech/tech.js @@ -1,10 +1,6 @@ const client = require("../graphql-client/graphql-client").client; const queries = require("../graphql-client/queries"); -const path = require("path"); const logger = require("../utils/logger"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); exports.techLogin = async (req, res) => { const { shopid, employeeid, pin } = req.body; diff --git a/server/utils/getHostNameOrIP.js b/server/utils/getHostNameOrIP.js index 94dace70f..9f56c820b 100644 --- a/server/utils/getHostNameOrIP.js +++ b/server/utils/getHostNameOrIP.js @@ -1,9 +1,4 @@ // Load environment variables THIS MUST BE AT THE TOP -const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); - const { networkInterfaces, hostname } = require("node:os"); const getHostNameOrIP = () => { diff --git a/server/utils/logger.js b/server/utils/logger.js index c9f06dcf1..2b28d95f5 100644 --- a/server/utils/logger.js +++ b/server/utils/logger.js @@ -1,8 +1,5 @@ // Load environment variables THIS MUST BE AT THE TOP const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const InstanceManager = require("../utils/instanceMgr").default; const winston = require("winston"); diff --git a/server/web-sockets/web-socket.js b/server/web-sockets/web-socket.js index 1e468c387..c55313a86 100644 --- a/server/web-sockets/web-socket.js +++ b/server/web-sockets/web-socket.js @@ -1,7 +1,4 @@ const path = require("path"); -require("dotenv").config({ - path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || "development"}`) -}); const { io } = require("../../server"); const { admin } = require("../firebase/firebase-handler");