From d940e0ee7832bea6c524c6c2174202614edbd96f Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 1 Sep 2021 15:06:52 -0700 Subject: [PATCH 1/3] Remove assist tracker. --- client/package.json | 1 - client/src/App/App.container.jsx | 19 +++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/client/package.json b/client/package.json index 3e76fd995..cf0b8feae 100644 --- a/client/package.json +++ b/client/package.json @@ -84,7 +84,6 @@ "workbox-streams": "^6.2.4" }, "scripts": { - "postinstall": "patch-package", "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "craco start", "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build", diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx index 409329ee6..220676837 100644 --- a/client/src/App/App.container.jsx +++ b/client/src/App/App.container.jsx @@ -11,28 +11,23 @@ import App from "./App"; import trackerGraphQL from "@openreplay/tracker-graphql"; //import trackerRedux from "@openreplay/tracker-redux"; import Tracker from "@openreplay/tracker"; -import trackerAssist from "@openreplay/tracker-assist"; +// import trackerAssist from "@openreplay/tracker-assist"; moment.locale("en-US"); export const tracker = new Tracker({ projectKey: "trDmOZlEXUpjGsMtHroA", + ingestPoint: "https://replay.imex.online/ingest", ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development" ? { __DISABLE_SECURE_MODE: true } : {}), - // beaconSize: 10485760, - onStart: ({ sessionID }) => - console.log( - "******** OpenReplay tracker started with session: ", - sessionID - ), + onStart: ({ sessionID }) => console.log("******** ORS: ", sessionID), }); - -tracker.use( - trackerAssist({ confirmText: "Technical support is about to assist you." }) -); // check the list of available options below -export const recordGraphQL = tracker.use(trackerGraphQL()); tracker.start(); + +// tracker.use(trackerAssist()); // check the list of available options below +tracker.use(trackerGraphQL()); + if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp"); export default function AppContainer() { From 00549d6a881133d4cb6d0cd75c967ec049d1864d Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Wed, 1 Sep 2021 18:10:44 -0700 Subject: [PATCH 2/3] Revert "Remove assist tracker." This reverts commit d940e0ee7832bea6c524c6c2174202614edbd96f. --- client/package.json | 1 + client/src/App/App.container.jsx | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/client/package.json b/client/package.json index cf0b8feae..3e76fd995 100644 --- a/client/package.json +++ b/client/package.json @@ -84,6 +84,7 @@ "workbox-streams": "^6.2.4" }, "scripts": { + "postinstall": "patch-package", "analyze": "source-map-explorer 'build/static/js/*.js'", "start": "craco start", "build": "REACT_APP_GIT_SHA=`git rev-parse --short HEAD` craco build", diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx index 220676837..409329ee6 100644 --- a/client/src/App/App.container.jsx +++ b/client/src/App/App.container.jsx @@ -11,23 +11,28 @@ import App from "./App"; import trackerGraphQL from "@openreplay/tracker-graphql"; //import trackerRedux from "@openreplay/tracker-redux"; import Tracker from "@openreplay/tracker"; -// import trackerAssist from "@openreplay/tracker-assist"; +import trackerAssist from "@openreplay/tracker-assist"; moment.locale("en-US"); export const tracker = new Tracker({ projectKey: "trDmOZlEXUpjGsMtHroA", - ingestPoint: "https://replay.imex.online/ingest", ...(process.env.NODE_ENV === null || process.env.NODE_ENV === "development" ? { __DISABLE_SECURE_MODE: true } : {}), - onStart: ({ sessionID }) => console.log("******** ORS: ", sessionID), + // beaconSize: 10485760, + onStart: ({ sessionID }) => + console.log( + "******** OpenReplay tracker started with session: ", + sessionID + ), }); + +tracker.use( + trackerAssist({ confirmText: "Technical support is about to assist you." }) +); // check the list of available options below +export const recordGraphQL = tracker.use(trackerGraphQL()); tracker.start(); - -// tracker.use(trackerAssist()); // check the list of available options below -tracker.use(trackerGraphQL()); - if (process.env.NODE_ENV === "production") LogRocket.init("gvfvfw/bodyshopapp"); export default function AppContainer() { From 6e0675f28bce3ac905da376f4ac4f6b92836a2bb Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Thu, 2 Sep 2021 15:48:54 -0700 Subject: [PATCH 3/3] IO-1342 Resolve negative parts discount crash on job totals. --- server/accounting/qbxml/qbxml-receivables.js | 2 +- server/job/job-costing.js | 4 ++-- server/job/job-totals.js | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js index ff3c98e4a..8e2d05685 100644 --- a/server/accounting/qbxml/qbxml-receivables.js +++ b/server/accounting/qbxml/qbxml-receivables.js @@ -257,7 +257,7 @@ const generateInvoiceQbxml = ( if (jobline.prt_dsmk_p && jobline.prt_dsmk_p !== 0) { // console.log("Have a part discount", jobline); DineroAmount = DineroAmount.add( - DineroAmount.percentage(jobline.prt_dsmk_p || 0) + DineroAmount.percentage(Math.abs(jobline.prt_dsmk_p || 0)) ); } const account = responsibilityCenters.profits.find( diff --git a/server/job/job-costing.js b/server/job/job-costing.js index a143959a4..235e0fcd7 100644 --- a/server/job/job-costing.js +++ b/server/job/job-costing.js @@ -301,7 +301,7 @@ function GenerateCostingData(job) { amount: Math.round((val.act_price || 0) * 100), }) .multiply(val.part_qty || 0) - .percentage(val.prt_dsmk_p || 0) + .percentage(Math.abs(val.prt_dsmk_p || 0)) ); if (!acc.parts[partsProfitCenter]) acc.parts[partsProfitCenter] = Dinero(); @@ -330,7 +330,7 @@ function GenerateCostingData(job) { amount: Math.round((val.act_price || 0) * 100), }) .multiply(val.part_qty || 0) - .percentage(val.prt_dsmk_p || 0) + .percentage(Math.abs(val.prt_dsmk_p || 0)) ); if (!acc.parts[partsProfitCenter]) diff --git a/server/job/job-totals.js b/server/job/job-totals.js index 2bd40d284..aafd6b955 100644 --- a/server/job/job-totals.js +++ b/server/job/job-totals.js @@ -258,7 +258,7 @@ function CalculatePartsTotals(jobLines) { amount: Math.round((value.act_price || 0) * 100), }) .multiply(value.part_qty || 0) - .percentage(value.prt_dsmk_p || 0) + .percentage(Math.abs(value.prt_dsmk_p || 0)) ), list: { ...acc.parts.list, @@ -289,7 +289,7 @@ function CalculatePartsTotals(jobLines) { amount: Math.round((value.act_price || 0) * 100), }) .multiply(value.part_qty || 0) - .percentage(value.prt_dsmk_p || 0) + .percentage(Math.abs(value.prt_dsmk_p || 0)) ), }, }; @@ -425,7 +425,7 @@ function CalculateTaxesTotals(job, otherTotals) { amount: Math.round((val.act_price || 0) * 100), }) .multiply(val.part_qty || 0) - .percentage(val.prt_dsmk_p || 0) + .percentage(Math.abs(val.prt_dsmk_p || 0)) ) .percentage( ((job.parts_tax_rates &&