feature/IO-3477-Set-Parts-Location: Done

hotfix/missing-dms-migration - Add Back DMS_ID

Fortellis Notes.md

@@ -1,346 +0,0 @@
-Fortellis Notes
-
-Subscription ID
-
-- Appears to give us a list of all dealerships we have access to, and `apiDmsInfo` contains the integrations that are enabled for that dealership.
-- Will likely need to filter based on the DMS ID or something?
-- Should store the whole subscription object. Contains department information needed in subsequent calls.
-
-Department ID
-
-- May have multiple departments. Appears that financial stuff goes to Accounting, History will go to Service.
-- TODO: How do we handle the multiple departments that may come up.
-
-###Internal Questions
-
-* Overview of the redis storing mechanism to cache this data. 
-* 
-
-# GL Wip Posting
-
-## Org Helper Return Data
-
-```json
-[
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "V",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRITE BACK VMS",
-    "logon": "DEVWB-V"
-  },
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "F",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRITE BACK F&I SALES",
-    "logon": "DEVWB-FI"
-  },
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "CS",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRITE BACK SERVICE",
-    "logon": "DEVWB-S"
-  },
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "A",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRITE BACK ACCTG",
-    "logon": "DEVWB-A"
-  },
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "SL",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRTIE BACK SLS MGMT",
-    "logon": "DEVWB-SL"
-  },
-  {
-    "acctgLgnID": "DEVWB-A",
-    "applCode": "O",
-    "coID": "77",
-    "companyName": "TEST SYS C187092 DEVWB",
-    "lgnDesc": "DEV WRITE BACK PARTS",
-    "logon": "DEVWB-I"
-  }
-]
-```
-
-## Journal Helper Return Data
-
-```json
-[
-  {
-    "companyNo": "77",
-    "jrnlID": "32",
-    "jrnlName": "PARTS SALES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "4",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "92",
-    "jrnlName": "YTD ADJUSTMENTS",
-    "jrnlType": "Y",
-    "intercoFlag": "0",
-    "defaultDocType": "3",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "12",
-    "jrnlName": "FLEET SALES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "9",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "57",
-    "jrnlName": "CASH RECEIPTS (OPEN-ITEM)",
-    "jrnlType": "R",
-    "intercoFlag": "0",
-    "defaultDocType": "1",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "93",
-    "jrnlName": "SET UP HISTORY",
-    "jrnlType": "H",
-    "intercoFlag": "0",
-    "defaultDocType": "10",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "88",
-    "jrnlName": "F/S STATISCAL DATA",
-    "jrnlType": "F",
-    "intercoFlag": "0",
-    "defaultDocType": "10",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "58",
-    "jrnlName": "WARRANTY CREDITS",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "3",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "FC",
-    "jrnlName": "FINANCE CHARGE",
-    "jrnlType": "A",
-    "intercoFlag": "0",
-    "defaultDocType": "12",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "94",
-    "jrnlName": "SET UP SCHEDULES",
-    "jrnlType": "C",
-    "intercoFlag": "0",
-    "defaultDocType": "3",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "95",
-    "jrnlName": "SET UP GENERAL LEDGER",
-    "jrnlType": "B",
-    "intercoFlag": "0",
-    "defaultDocType": "3",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "20",
-    "jrnlName": "USED VEHICLE SALES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "9",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "60",
-    "jrnlName": "CASH DISBURSEMENTS",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "2",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "30",
-    "jrnlName": "SERVICE SALES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "7",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "40",
-    "jrnlName": "PAYROLL",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "11",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "15",
-    "jrnlName": "DEALER TRADES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "9",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "70",
-    "jrnlName": "NEW VEHICLE PURCHASES",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "8",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "25",
-    "jrnlName": "USED WHOLESALE",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "9",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "75",
-    "jrnlName": "GENERAL PURCHASES",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "5",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "10",
-    "jrnlName": "NEW VEHICLE SALES",
-    "jrnlType": "S",
-    "intercoFlag": "0",
-    "defaultDocType": "9",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "80",
-    "jrnlName": "GENERAL JOURNAL",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "3",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "11",
-    "jrnlName": "WORK IN PROGRESS",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "10",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "56",
-    "jrnlName": "CASH RECEIPTS (BALANCE FWD)",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "1",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "81",
-    "jrnlName": "STANDARD ENTRIES",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "6",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "51",
-    "jrnlName": "CASH RECEIPTS JOURNAL - EFT",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "10",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "61",
-    "jrnlName": "CASH DISBURSMENTS -EFT",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "10",
-    "errCode": "",
-    "errMsg": ""
-  },
-  {
-    "companyNo": "77",
-    "jrnlID": "71",
-    "jrnlName": "USED VEHICLE PURCHASES",
-    "jrnlType": "G",
-    "intercoFlag": "0",
-    "defaultDocType": "8",
-    "errCode": "",
-    "errMsg": ""
-  }
-]
-```
-
-# Feedback
-
-- Receiving bad request errors, with no details. API errors page doesn't indicate what's wrong for certain types of error codes.
-- API Error page works on a several minute delay.

client/package.json

@@ -8,41 +8,41 @@
   "private": true,
   "proxy": "http://localhost:4000",
   "dependencies": {
-    "@amplitude/analytics-browser": "^2.30.1",
+    "@amplitude/analytics-browser": "^2.25.2",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^3.13.9",
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.19",
-    "@firebase/app": "^0.14.6",
-    "@firebase/auth": "^1.11.1",
+    "@firebase/analytics": "^0.10.17",
+    "@firebase/app": "^0.14.3",
+    "@firebase/auth": "^1.10.8",
     "@firebase/firestore": "^4.9.2",
     "@firebase/messaging": "^0.12.22",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.10.1",
-    "@sentry/cli": "^2.58.2",
+    "@reduxjs/toolkit": "^2.9.0",
+    "@sentry/cli": "^2.56.0",
     "@sentry/react": "^9.43.0",
-    "@sentry/vite-plugin": "^4.6.0",
-    "@splitsoftware/splitio-react": "^2.6.0",
-    "@tanem/react-nprogress": "^5.0.56",
-    "antd": "^5.28.1",
+    "@sentry/vite-plugin": "^4.3.0",
+    "@splitsoftware/splitio-react": "^2.5.0",
+    "@tanem/react-nprogress": "^5.0.53",
+    "antd": "^5.27.4",
     "apollo-link-logger": "^2.0.1",
     "apollo-link-sentry": "^4.4.0",
     "autosize": "^6.0.1",
-    "axios": "^1.13.2",
+    "axios": "^1.12.2",
     "classnames": "^2.5.1",
     "css-box-model": "^1.2.1",
-    "dayjs": "^1.11.19",
-    "dayjs-business-days2": "^1.3.1",
+    "dayjs": "^1.11.18",
+    "dayjs-business-days2": "^1.3.0",
     "dinero.js": "^1.9.1",
     "dotenv": "^17.2.3",
     "env-cmd": "^10.1.0",
     "exifr": "^7.1.3",
-    "graphql": "^16.12.0",
-    "i18next": "^25.6.2",
+    "graphql": "^16.11.0",
+    "i18next": "^25.5.3",
     "i18next-browser-languagedetector": "^8.2.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.26",
+    "libphonenumber-js": "^1.12.23",
     "lightningcss": "^1.30.2",
     "logrocket": "^9.0.2",
     "markerjs2": "^2.32.7",
@@ -50,7 +50,7 @@
     "normalize-url": "^8.1.0",
     "object-hash": "^3.0.0",
     "phone": "^3.1.67",
-    "posthog-js": "^1.294.0",
+    "posthog-js": "^1.271.0",
     "prop-types": "^15.8.1",
     "query-string": "^9.3.1",
     "raf-schd": "^4.0.3",
@@ -68,7 +68,7 @@
     "react-markdown": "^10.1.0",
     "react-number-format": "^5.4.3",
     "react-popopo": "^2.1.9",
-    "react-product-fruits": "^2.2.62",
+    "react-product-fruits": "^2.2.61",
     "react-redux": "^9.2.0",
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.30.0",
@@ -78,10 +78,10 @@
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
     "redux-persist": "^6.0.0",
-    "redux-saga": "^1.4.2",
+    "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.94.0",
+    "sass": "^1.93.2",
     "socket.io-client": "^4.8.1",
     "styled-components": "^6.1.19",
     "subscriptions-transport-ws": "^0.11.0",
@@ -135,35 +135,35 @@
   "devDependencies": {
     "@ant-design/icons": "^6.1.0",
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "@babel/preset-react": "^7.28.5",
-    "@dotenvx/dotenvx": "^1.51.1",
+    "@babel/preset-react": "^7.27.1",
+    "@dotenvx/dotenvx": "^1.51.0",
     "@emotion/babel-plugin": "^11.13.5",
     "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.39.1",
-    "@playwright/test": "^1.56.1",
-    "@sentry/webpack-plugin": "^4.6.0",
+    "@eslint/js": "^9.37.0",
+    "@playwright/test": "^1.56.0",
+    "@sentry/webpack-plugin": "^4.3.0",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.0",
     "@vitejs/plugin-react": "^4.6.0",
-    "browserslist": "^4.28.0",
+    "browserslist": "^4.26.3",
     "browserslist-to-esbuild": "^2.1.1",
     "chalk": "^5.6.2",
-    "eslint": "^9.39.1",
+    "eslint": "^9.37.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "jsdom": "^26.0.0",
-    "memfs": "^4.51.0",
+    "memfs": "^4.48.1",
     "os-browserify": "^0.3.0",
-    "playwright": "^1.56.1",
+    "playwright": "^1.56.0",
     "react-error-overlay": "^6.1.0",
     "redux-logger": "^3.0.6",
     "source-map-explorer": "^2.5.3",
-    "vite": "^7.2.2",
+    "vite": "^7.1.9",
     "vite-plugin-babel": "^1.3.2",
     "vite-plugin-eslint": "^1.8.1",
     "vite-plugin-node-polyfills": "^0.24.0",
-    "vite-plugin-pwa": "^1.1.0",
+    "vite-plugin-pwa": "^1.0.3",
     "vite-plugin-style-import": "^2.0.0",
     "vitest": "^3.2.4",
     "workbox-window": "^7.3.0"

client/src/App/App.jsx

@@ -138,7 +138,7 @@ export function App({
     );
   }
 
-  if (currentEula && !currentUser.eulaIsAccepted) {
+  if (!isPartsEntry && currentEula && !currentUser.eulaIsAccepted) {
     return <Eula />;
   }
 

client/src/App/App.styles.scss

@@ -1,5 +1,3 @@
-@use "react-big-calendar/lib/sass/styles" as rbc;
-
 :root {
   --table-stripe-bg: #f4f4f4; /* Light mode table stripe */
   --menu-divider-color: #74695c; /* Light mode menu divider */
@@ -213,6 +211,9 @@
   --svg-background: #FFF; /* Dark mode SVG background */
 }
 
+// Global Styles
+@import "react-big-calendar/lib/sass/styles";
+
 .ant-menu-item-divider {
   border-bottom: 1px solid var(--menu-divider-color) !important;
 }
@@ -427,4 +428,4 @@
 
 //.rbc-time-header-gutter {
 //  padding: 0;
-//}
+//} 

client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx

@@ -180,7 +180,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
     <Card
       extra={
         <Space wrap>
-          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && !bodyshop.rr_dealerid && (
+          {!bodyshop.cdk_dealerid && !bodyshop.pbs_serialnumber && (
             <>
               <JobMarkSelectedExported
                 jobIds={selectedJobs}
@@ -198,7 +198,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
               />
             </>
           )}
-          {bodyshop.accountingconfig?.qbo && <QboAuthorizeComponent />}
+          {bodyshop.accountingconfig && bodyshop.accountingconfig.qbo && <QboAuthorizeComponent />}
           <Input.Search
             value={state.search}
             onChange={handleSearch}

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -26,6 +26,7 @@ import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -450,7 +451,9 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           setEnterAgain(false);
         }}
       >
-        <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        <RbacWrapper action="bills:enter">
+          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+        </RbacWrapper>
       </Form>
     </Modal>
   );

client/src/components/bill-form-lines-extended/bill-form-lines.extended.formitem.component.jsx

@@ -7,7 +7,6 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import CiecaSelect from "../../utils/Ciecaselect";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -45,7 +44,7 @@ export function BillFormItemsExtendedFormItem({
                 quantity: record.part_qty || 1,
                 actual_price: record.act_price,
                 cost_center: record.part_type
-                  ? bodyshopHasDmsKey(bodyshop)
+                  ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                     ? record.part_type
                     : responsibilityCenters.defaults && (responsibilityCenters.defaults.costs[record.part_type] || null)
                   : null
@@ -101,7 +100,7 @@ export function BillFormItemsExtendedFormItem({
       </Form.Item>
       <Form.Item label={t("billlines.fields.cost_center")} name={["billlineskeys", record.id, "cost_center"]}>
         <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
-          {bodyshopHasDmsKey(bodyshop)
+          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
             ? CiecaSelect(true, false)
             : responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
         </Select>

client/src/components/bill-form/bill-form.component.jsx

@@ -22,7 +22,6 @@ import VendorSearchSelect from "../vendor-search-select/vendor-search-select.com
 import BillFormLines from "./bill-form.lines.component";
 import { CalculateBillTotal } from "./bill-form.totals.utility";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -355,7 +354,7 @@ export function BillFormComponent({
               <Form.Item span={3} label={t("bills.fields.local_tax_rate")} name="local_tax_rate">
                 <CurrencyInput min={0} />
               </Form.Item>
-              {bodyshopHasDmsKey(bodyshop) ? (
+              {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
                 <Form.Item span={2} label={t("bills.labels.federal_tax_exempt")} name="federal_tax_exempt">
                   <Switch onChange={handleFederalTaxExemptSwitchToggle} />
                 </Form.Item>

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -10,7 +10,6 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import BillLineSearchSelect from "../bill-line-search-select/bill-line-search-select.component";
 import BilllineAddInventory from "../billline-add-inventory/billline-add-inventory.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -91,7 +90,7 @@ export function BillEnterModalLinesComponent({
                       actual_price: opt.cost,
                       original_actual_price: opt.cost,
                       cost_center: opt.part_type
-                        ? bodyshopHasDmsKey(bodyshop)
+                        ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                           ? opt.part_type !== "PAE"
                             ? opt.part_type
                             : null
@@ -323,7 +322,7 @@ export function BillEnterModalLinesComponent({
         },
         formInput: () => (
           <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
-            {bodyshopHasDmsKey(bodyshop)
+            {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
               ? CiecaSelect(true, false)
               : responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
           </Select>

client/src/components/dashboard-components/job-lifecycle/job-lifecycle-dashboard.component.jsx

@@ -142,17 +142,37 @@ export default function JobLifecycleDashboardComponent({ data, bodyshop, ...card
             title={t("job_lifecycle.content.legend_title")}
             style={{ marginTop: "10px" }}
           >
-            <div>
+            <div
+              style={{
+                display: "flex",
+                flexWrap: "wrap",
+                gap: 8
+              }}
+            >
               {lifecycleData.summations.map((key) => (
-                <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                <Tag
+                  key={key.status}
+                  color={key.color}
+                  style={{
+                    // IMPORTANT: let the tag grow with its content
+                    width: "auto",
+                    padding: 0,
+                    margin: 0,
+                    display: "inline-flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    boxSizing: "border-box"
+                  }}
+                >
                   <div
                     aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                     style={{
                       backgroundColor: "var(--tag-wrapper-bg)",
                       color: "var(--tag-wrapper-text)",
-                      padding: "4px",
-                      textAlign: "center"
+                      padding: "4px 8px",
+                      textAlign: "center",
+                      whiteSpace: "nowrap" // keep it on one line while letting the pill expand
                     }}
                   >
                     {key.status} [{lifecycleData.statusCounts[key.status]}] ({key.roundedPercentage})

client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx

@@ -55,7 +55,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
       });
     }
   }, [socket, socket.connected, billids]);
-
+  console.log(allocationsSummary);
   const columns = [
     {
       title: t("general.labels.status"),
@@ -122,7 +122,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
         <Form.Item
           name="journal"
           label={t("jobs.fields.dms.journal")}
-          initialValue={bodyshop.cdk_configuration?.default_journal}
+          initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
           rules={[
             {
               required: true

client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx

@@ -1,97 +1,72 @@
 import { Alert, Button, Card, Table, Typography } from "antd";
-import { SyncOutlined } from "@ant-design/icons";
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import Dinero from "dinero.js";
-import { DMS_MAP } from "../../utils/dmsUtils";
-
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import Dinero from "dinero.js";
+import { SyncOutlined } from "@ant-design/icons";
 import { pageLimit } from "../../utils/config";
 
 const mapStateToProps = createStructuredSelector({
+  //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({});
+
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
 
 export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummary);
 
-/**
- * DMS Allocations Summary component
- * @param mode
- * @param socket
- * @param bodyshop
- * @param jobId
- * @param title
- * @returns {JSX.Element}
- * @constructor
- */
-export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title }) {
+export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
   const { t } = useTranslation();
   const [allocationsSummary, setAllocationsSummary] = useState([]);
 
-  // Resolve event name by mode (PBS reuses the CDK event per existing behavior)
-  const allocationsEvent =
-    mode === DMS_MAP.reynolds
-      ? "rr-calculate-allocations"
-      : mode === DMS_MAP.fortellis
-        ? "fortellis-calculate-allocations"
-        : /* "cdk" | "pbs" (legacy) */ "cdk-calculate-allocations";
-
-  const fetchAllocations = useCallback(() => {
-    if (!socket || !jobId || !mode) return;
-
-    try {
-      socket.emit(allocationsEvent, jobId, (ack) => {
-        const list = Array.isArray(ack) ? ack : [];
-        setAllocationsSummary(list);
-        // Preserve side-channel used by the post form for discrepancy checks
-        socket.allocationsSummary = list;
-      });
-    } catch {
-      // Best-effort; leave table empty on error
-      setAllocationsSummary([]);
-      socket && (socket.allocationsSummary = []);
-    }
-  }, [socket, jobId, mode, allocationsEvent]);
-
-  // Initial + whenever mode/socket/jobId changes
   useEffect(() => {
-    fetchAllocations();
-  }, [fetchAllocations]);
+    if (socket.connected) {
+      socket.emit("cdk-calculate-allocations", jobId, (ack) => {
+        setAllocationsSummary(ack);
+        socket.allocationsSummary = ack;
+      });
+    }
+  }, [socket, socket.connected, jobId]);
 
   const columns = [
-    { title: t("jobs.fields.dms.center"), dataIndex: "center", key: "center" },
+    {
+      title: t("jobs.fields.dms.center"),
+      dataIndex: "center",
+      key: "center"
+    },
     {
       title: t("jobs.fields.dms.sale"),
       dataIndex: "sale",
       key: "sale",
-      render: (_text, record) => Dinero(record.sale).toFormat()
+      render: (text, record) => Dinero(record.sale).toFormat()
     },
     {
       title: t("jobs.fields.dms.cost"),
       dataIndex: "cost",
       key: "cost",
-      render: (_text, record) => Dinero(record.cost).toFormat()
+      render: (text, record) => Dinero(record.cost).toFormat()
     },
     {
       title: t("jobs.fields.dms.sale_dms_acctnumber"),
       dataIndex: "sale_dms_acctnumber",
       key: "sale_dms_acctnumber",
-      render: (_text, record) => record.profitCenter?.dms_acctnumber
+      render: (text, record) => record.profitCenter?.dms_acctnumber
     },
     {
       title: t("jobs.fields.dms.cost_dms_acctnumber"),
       dataIndex: "cost_dms_acctnumber",
       key: "cost_dms_acctnumber",
-      render: (_text, record) => record.costCenter?.dms_acctnumber
+      render: (text, record) => record.costCenter?.dms_acctnumber
     },
     {
       title: t("jobs.fields.dms.dms_wip_acctnumber"),
       dataIndex: "dms_wip_acctnumber",
       key: "dms_wip_acctnumber",
-      render: (_text, record) => record.costCenter?.dms_wip_acctnumber
+      render: (text, record) => record.costCenter?.dms_wip_acctnumber
     }
   ];
 
@@ -99,7 +74,11 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
     <Card
       title={title}
       extra={
-        <Button onClick={fetchAllocations} aria-label={t("general.actions.refresh")}>
+        <Button
+          onClick={() => {
+            socket.emit("cdk-calculate-allocations", jobId, (ack) => setAllocationsSummary(ack));
+          }}
+        >
           <SyncOutlined />
         </Button>
       }
@@ -107,7 +86,6 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
       {bodyshop.pbs_configuration?.disablebillwip && (
         <Alert type="warning" message={t("jobs.labels.dms.disablebillwip")} />
       )}
-
       <Table
         pagination={{ position: "top", defaultPageSize: pageLimit }}
         columns={columns}
@@ -116,23 +94,34 @@ export function DmsAllocationsSummary({ mode, socket, bodyshop, jobId, title })
         locale={{ emptyText: t("dms.labels.refreshallocations") }}
         scroll={{ x: true }}
         summary={() => {
-          const totals = allocationsSummary?.reduce(
-            (acc, val) => ({
-              totalSale: acc.totalSale.add(Dinero(val.sale)),
-              totalCost: acc.totalCost.add(Dinero(val.cost))
-            }),
-            { totalSale: Dinero(), totalCost: Dinero() }
-          ) || { totalSale: Dinero(), totalCost: Dinero() };
+          const totals =
+            allocationsSummary &&
+            allocationsSummary.reduce(
+              (acc, val) => {
+                return {
+                  totalSale: acc.totalSale.add(Dinero(val.sale)),
+                  totalCost: acc.totalCost.add(Dinero(val.cost))
+                };
+              },
+              {
+                totalSale: Dinero(),
+                totalCost: Dinero()
+              }
+            );
 
           return (
             <Table.Summary.Row>
               <Table.Summary.Cell>
                 <Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
               </Table.Summary.Cell>
-              <Table.Summary.Cell>{totals.totalSale.toFormat()}</Table.Summary.Cell>
-              <Table.Summary.Cell />
-              <Table.Summary.Cell />
-              <Table.Summary.Cell />
+              <Table.Summary.Cell>{totals && totals.totalSale.toFormat()}</Table.Summary.Cell>
+              <Table.Summary.Cell>
+                {
+                  //  totals.totalCost.toFormat()
+                }
+              </Table.Summary.Cell>
+              <Table.Summary.Cell></Table.Summary.Cell>
+              <Table.Summary.Cell></Table.Summary.Cell>
             </Table.Summary.Row>
           );
         }}

client/src/components/dms-cdk-makes/dms-cdk-makes.refetch.component.jsx

@@ -5,7 +5,6 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -19,26 +18,15 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCdkMakesRefetch);
 export function DmsCdkMakesRefetch({ currentUser, bodyshop }) {
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
-  const {
-    treatments: { Fortellis }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Fortellis"],
-    splitKey: bodyshop.imexshopid
-  });
 
   if (!currentUser.email.includes("@imex.")) return null;
 
   const handleRefetch = async () => {
-    try {
-      setLoading(true);
-      await axios.post(`cdk${Fortellis.treatment === "on" ? "/fortellis" : ""}/getvehicles`, {
-        cdk_dealerid: bodyshop.cdk_dealerid,
-        bodyshopid: bodyshop.id
-      });
-    } catch (error) {
-      console.error(error);
-    }
+    setLoading(true);
+    await axios.post("/cdk/getvehicles", {
+      cdk_dealerid: bodyshop.cdk_dealerid,
+      bodyshopid: bodyshop.id
+    });
 
     setLoading(false);
   };

client/src/components/dms-customer-selector/cdk-customer-selector.jsx

@@ -1,102 +0,0 @@
-import { Button, Checkbox, Col, Table } from "antd";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
-
-export default function CDKCustomerSelector({ bodyshop, socket }) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [customerList, setCustomerList] = useState([]);
-  const [selectedCustomer, setSelectedCustomer] = useState(null);
-
-  useEffect(() => {
-    if (!socket) return;
-    const handleCdkSelectCustomer = (list) => {
-      setOpen(true);
-      setCustomerList(Array.isArray(list) ? list : []);
-      setSelectedCustomer(null);
-    };
-    socket.on("cdk-select-customer", handleCdkSelectCustomer);
-    return () => {
-      socket.off("cdk-select-customer", handleCdkSelectCustomer);
-    };
-  }, [socket]);
-
-  const onUseSelected = () => {
-    if (!selectedCustomer) return;
-    setOpen(false);
-    socket.emit("cdk-selected-customer", selectedCustomer);
-    setSelectedCustomer(null);
-  };
-
-  const onUseGeneric = () => {
-    const generic = bodyshop.cdk_configuration?.generic_customer_number || null;
-    setOpen(false);
-    socket.emit("cdk-selected-customer", generic);
-    setSelectedCustomer(null);
-  };
-
-  const onCreateNew = () => {
-    setOpen(false);
-    socket.emit("cdk-selected-customer", null);
-    setSelectedCustomer(null);
-  };
-
-  if (!open) return null;
-
-  const columns = [
-    { title: t("jobs.fields.dms.id"), dataIndex: ["id", "value"], key: "id" },
-    {
-      title: t("jobs.fields.dms.vinowner"),
-      dataIndex: "vinOwner",
-      key: "vinOwner",
-      render: (_t, r) => <Checkbox disabled checked={r.vinOwner} />
-    },
-    {
-      title: t("jobs.fields.dms.name1"),
-      dataIndex: ["name1", "fullName"],
-      key: "name1",
-      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName)
-    },
-    {
-      title: t("jobs.fields.dms.address"),
-      key: "address",
-      render: (record) =>
-        `${record.address?.addressLine && record.address.addressLine[0]}, ${record.address?.city} ${
-          record.address?.stateOrProvince
-        } ${record.address?.postalCode}`
-    }
-  ];
-
-  const rowKey = (r) => r.id?.value || r.customerId;
-
-  return (
-    <Col span={24}>
-      <Table
-        title={() => (
-          <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-            <Button onClick={onUseSelected} disabled={!selectedCustomer}>
-              {t("jobs.actions.dms.useselected")}
-            </Button>
-            <Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
-              {t("jobs.actions.dms.usegeneric")}
-            </Button>
-            <Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
-          </div>
-        )}
-        pagination={{ position: "top" }}
-        columns={columns}
-        rowKey={rowKey}
-        dataSource={customerList}
-        rowSelection={{
-          onSelect: (r) => {
-            const key = r.id?.value || r.customerId;
-            setSelectedCustomer(key ? String(key) : null);
-          },
-          type: "radio",
-          selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
-        }}
-      />
-    </Col>
-  );
-}

client/src/components/dms-customer-selector/dms-customer-selector.component.jsx

@@ -1,54 +1,134 @@
-import { useMemo } from "react";
+import { Button, Checkbox, Col, Table } from "antd";
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-
+import { socket } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-
-import RRCustomerSelector from "./rr-customer-selector";
-import FortellisCustomerSelector from "./fortellis-customer-selector";
-import CDKCustomerSelector from "./cdk-customer-selector";
-import PBSCustomerSelector from "./pbs-customer-selector";
-import { DMS_MAP } from "../../utils/dmsUtils";
+import { alphaSort } from "../../utils/sorters";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({});
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);
 
-/**
- * DMS Customer Selector component that renders the appropriate customer selector
- * @param props
- * @returns {JSX.Element|null}
- * @constructor
- */
-export function DmsCustomerSelector(props) {
-  const { bodyshop, jobid, socket, rrOptions = {} } = props;
+export function DmsCustomerSelector({ bodyshop }) {
+  const { t } = useTranslation();
+  const [customerList, setcustomerList] = useState([]);
+  const [open, setOpen] = useState(false);
+  const [selectedCustomer, setSelectedCustomer] = useState(null);
+  const [dmsType, setDmsType] = useState("cdk");
 
-  // Centralized "mode" (provider + transport)
-  const mode = props.mode;
+  socket.on("cdk-select-customer", (customerList) => {
+    setOpen(true);
+    setDmsType("cdk");
+    setcustomerList(customerList);
+  });
+  socket.on("pbs-select-customer", (customerList) => {
+    setOpen(true);
+    setDmsType("pbs");
+    setcustomerList(customerList);
+  });
 
-  // Stable base props for children
-  const base = useMemo(() => ({ bodyshop, jobid, socket }), [bodyshop, jobid, socket]);
+  const onUseSelected = () => {
+    setOpen(false);
+    socket.emit(`${dmsType}-selected-customer`, selectedCustomer);
+    setSelectedCustomer(null);
+  };
 
-  switch (mode) {
-    case DMS_MAP.reynolds: {
-      // Map rrOptions to current RR prop shape (you can also just pass rrOptions through and unpack in RR)
-      const rrProps = {
-        rrOpenRoLimit: rrOptions.openRoLimit,
-        onRrOpenRoFinished: rrOptions.onOpenRoFinished,
-        rrValidationPending: rrOptions.validationPending,
-        onValidationFinished: rrOptions.onValidationFinished
-      };
-      return <RRCustomerSelector {...base} {...rrProps} />;
+  const onUseGeneric = () => {
+    setOpen(false);
+    socket.emit(`${dmsType}-selected-customer`, bodyshop.cdk_configuration.generic_customer_number);
+    setSelectedCustomer(null);
+  };
+
+  const onCreateNew = () => {
+    setOpen(false);
+    socket.emit(`${dmsType}-selected-customer`, null);
+    setSelectedCustomer(null);
+  };
+
+  const cdkColumns = [
+    {
+      title: t("jobs.fields.dms.id"),
+      dataIndex: ["id", "value"],
+      key: "id"
+    },
+    {
+      title: t("jobs.fields.dms.vinowner"),
+      dataIndex: "vinOwner",
+      key: "vinOwner",
+      render: (text, record) => <Checkbox disabled checked={record.vinOwner} />
+    },
+    {
+      title: t("jobs.fields.dms.name1"),
+      dataIndex: ["name1", "fullName"],
+      key: "name1",
+      sorter: (a, b) => alphaSort(a.name1?.fullName, b.name1?.fullName)
+    },
+
+    {
+      title: t("jobs.fields.dms.address"),
+      //dataIndex: ["name2", "fullName"],
+      key: "address",
+      render: (record) =>
+        `${record.address?.addressLine && record.address.addressLine[0]}, ${record.address?.city} ${
+          record.address?.stateOrProvince
+        } ${record.address?.postalCode}`
     }
-    case DMS_MAP.fortellis:
-      return <FortellisCustomerSelector {...base} />;
-    case DMS_MAP.cdk:
-      return <CDKCustomerSelector {...base} />;
-    case DMS_MAP.pbs:
-      return <PBSCustomerSelector {...base} />;
-    default:
-      return null;
-  }
+  ];
+
+  const pbsColumns = [
+    {
+      title: t("jobs.fields.dms.id"),
+      dataIndex: "ContactId",
+      key: "ContactId"
+    },
+    {
+      title: t("jobs.fields.dms.name1"),
+      key: "name1",
+      sorter: (a, b) => alphaSort(a.LastName, b.LastName),
+      render: (text, record) => `${record.FirstName || ""} ${record.LastName || ""}`
+    },
+
+    {
+      title: t("jobs.fields.dms.address"),
+      key: "address",
+      render: (record) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
+    }
+  ];
+
+  if (!open) return null;
+  return (
+    <Col span={24}>
+      <Table
+        title={() => (
+          <div>
+            <Button onClick={onUseSelected} disabled={!selectedCustomer}>
+              {t("jobs.actions.dms.useselected")}
+            </Button>
+            <Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
+              {t("jobs.actions.dms.usegeneric")}
+            </Button>
+            <Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
+          </div>
+        )}
+        pagination={{ position: "top" }}
+        columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
+        rowKey={(record) => (dmsType === "cdk" ? record.id.value : record.ContactId)}
+        dataSource={customerList}
+        //onChange={handleTableChange}
+        rowSelection={{
+          onSelect: (record) => {
+            setSelectedCustomer(dmsType === "cdk" ? record.id.value : record.ContactId);
+          },
+          type: "radio",
+          selectedRowKeys: [selectedCustomer]
+        }}
+      />
+    </Col>
+  );
 }

client/src/components/dms-customer-selector/fortellis-customer-selector.jsx

@@ -1,105 +0,0 @@
-import { Button, Checkbox, Col, Table } from "antd";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
-
-export default function FortellisCustomerSelector({ bodyshop, jobid, socket }) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [customerList, setCustomerList] = useState([]);
-  const [selectedCustomer, setSelectedCustomer] = useState(null);
-
-  useEffect(() => {
-    if (!socket) return;
-    const handleFortellisSelectCustomer = (list) => {
-      setOpen(true);
-      setCustomerList(Array.isArray(list) ? list : []);
-      setSelectedCustomer(null);
-    };
-    socket.on("fortellis-select-customer", handleFortellisSelectCustomer);
-    return () => {
-      socket.off("fortellis-select-customer", handleFortellisSelectCustomer);
-    };
-  }, [socket]);
-
-  const onUseSelected = () => {
-    if (!selectedCustomer) return;
-    setOpen(false);
-    socket.emit("fortellis-selected-customer", { selectedCustomerId: selectedCustomer, jobid });
-    setSelectedCustomer(null);
-  };
-
-  const onUseGeneric = () => {
-    const generic = bodyshop.cdk_configuration?.generic_customer_number || null;
-    setOpen(false);
-    socket.emit("fortellis-selected-customer", { selectedCustomerId: generic, jobid });
-    setSelectedCustomer(null);
-  };
-
-  const onCreateNew = () => {
-    setOpen(false);
-    socket.emit("fortellis-selected-customer", { selectedCustomerId: null, jobid });
-    setSelectedCustomer(null);
-  };
-
-  if (!open) return null;
-
-  const columns = [
-    { title: t("jobs.fields.dms.id"), dataIndex: "customerId", key: "id" },
-    {
-      title: t("jobs.fields.dms.vinowner"),
-      dataIndex: "vinOwner",
-      key: "vinOwner",
-      render: (_t, r) => <Checkbox disabled checked={r.vinOwner} />
-    },
-    {
-      title: t("jobs.fields.dms.name1"),
-      dataIndex: ["customerName", "firstName"],
-      key: "firstName",
-      sorter: (a, b) => alphaSort(a.customerName?.firstName, b.customerName?.firstName)
-    },
-    {
-      title: t("jobs.fields.dms.name1"),
-      dataIndex: ["customerName", "lastName"],
-      key: "lastName",
-      sorter: (a, b) => alphaSort(a.customerName?.lastName, b.customerName?.lastName)
-    },
-    {
-      title: t("jobs.fields.dms.address"),
-      key: "address",
-      render: (record) =>
-        `${record.postalAddress?.addressLine1 || ""}${
-          record.postalAddress?.addressLine2 ? `, ${record.postalAddress.addressLine2}` : ""
-        }, ${record.postalAddress?.city || ""} ${record.postalAddress?.state || ""} ${
-          record.postalAddress?.postalCode || ""
-        } ${record.postalAddress?.country || ""}`
-    }
-  ];
-
-  return (
-    <Col span={24}>
-      <Table
-        title={() => (
-          <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-            <Button onClick={onUseSelected} disabled={!selectedCustomer}>
-              {t("jobs.actions.dms.useselected")}
-            </Button>
-            <Button onClick={onUseGeneric} disabled={!bodyshop.cdk_configuration?.generic_customer_number}>
-              {t("jobs.actions.dms.usegeneric")}
-            </Button>
-            <Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
-          </div>
-        )}
-        pagination={{ position: "top" }}
-        columns={columns}
-        rowKey={(r) => r.customerId}
-        dataSource={customerList}
-        rowSelection={{
-          onSelect: (r) => setSelectedCustomer(r?.customerId ? String(r.customerId) : null),
-          type: "radio",
-          selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
-        }}
-      />
-    </Col>
-  );
-}

client/src/components/dms-customer-selector/pbs-customer-selector.jsx

@@ -1,93 +0,0 @@
-import { Button, Col, Table } from "antd";
-import { useEffect, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
-
-export default function PBSCustomerSelector({ bodyshop, socket }) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [customerList, setCustomerList] = useState([]);
-  const [selectedCustomer, setSelectedCustomer] = useState(null);
-
-  useEffect(() => {
-    if (!socket) return;
-    const handlePbsSelectCustomer = (list) => {
-      setOpen(true);
-      setCustomerList(Array.isArray(list) ? list : []);
-      setSelectedCustomer(null);
-    };
-    socket.on("pbs-select-customer", handlePbsSelectCustomer);
-    return () => {
-      socket.off("pbs-select-customer", handlePbsSelectCustomer);
-    };
-  }, [socket]);
-
-  const onUseSelected = () => {
-    if (!selectedCustomer) return;
-    setOpen(false);
-    socket.emit("pbs-selected-customer", selectedCustomer);
-    setSelectedCustomer(null);
-  };
-
-  // Restores old behavior: reuse the CDK-named generic number for PBS too,
-  // matching the previous single-component implementation.
-  const onUseGeneric = () => {
-    const generic = bodyshop?.cdk_configuration?.generic_customer_number || null;
-    if (!generic) return;
-    setOpen(false);
-    socket.emit("pbs-selected-customer", generic);
-    setSelectedCustomer(null);
-  };
-
-  const onCreateNew = () => {
-    setOpen(false);
-    socket.emit("pbs-selected-customer", null);
-    setSelectedCustomer(null);
-  };
-
-  if (!open) return null;
-
-  const columns = [
-    { title: t("jobs.fields.dms.id"), dataIndex: "ContactId", key: "ContactId" },
-    {
-      title: t("jobs.fields.dms.name1"),
-      key: "name1",
-      sorter: (a, b) => alphaSort(a.LastName, b.LastName),
-      render: (_t, r) => `${r.FirstName || ""} ${r.LastName || ""}`
-    },
-    {
-      title: t("jobs.fields.dms.address"),
-      key: "address",
-      render: (r) => `${r.Address}, ${r.City} ${r.State} ${r.ZipCode}`
-    }
-  ];
-
-  const hasGeneric = !!bodyshop?.cdk_configuration?.generic_customer_number;
-
-  return (
-    <Col span={24}>
-      <Table
-        title={() => (
-          <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-            <Button onClick={onUseSelected} disabled={!selectedCustomer}>
-              {t("jobs.actions.dms.useselected")}
-            </Button>
-            <Button onClick={onUseGeneric} disabled={!hasGeneric}>
-              {t("jobs.actions.dms.usegeneric")}
-            </Button>
-            <Button onClick={onCreateNew}>{t("jobs.actions.dms.createnewcustomer")}</Button>
-          </div>
-        )}
-        pagination={{ position: "top" }}
-        columns={columns}
-        rowKey={(r) => r.ContactId}
-        dataSource={customerList}
-        rowSelection={{
-          onSelect: (r) => setSelectedCustomer(r?.ContactId ? String(r.ContactId) : null),
-          type: "radio",
-          selectedRowKeys: selectedCustomer ? [selectedCustomer] : []
-        }}
-      />
-    </Col>
-  );
-}

client/src/components/dms-customer-selector/rr-customer-selector.jsx

@@ -1,267 +0,0 @@
-import { Alert, Button, Checkbox, Col, message, Space, Table } from "antd";
-import { useEffect, useMemo, useState } from "react";
-import { useTranslation } from "react-i18next";
-import { alphaSort } from "../../utils/sorters";
-
-const normalizeRrList = (list) => {
-  if (!Array.isArray(list)) return [];
-  return list
-    .map((row) => {
-      const custNo = row.custNo || row.CustomerId || row.customerId || null;
-      const name =
-        row.name ||
-        [row.CustomerName?.FirstName, row.CustomerName?.LastName].filter(Boolean).join(" ").trim() ||
-        (custNo ? String(custNo) : "");
-      if (!custNo) return null;
-      const vinOwner = !!(row.vinOwner ?? row.isVehicleOwner);
-
-      const address =
-        row.address && typeof row.address === "object"
-          ? {
-              line1: row.address.line1 ?? row.address.addr1 ?? row.address.Address1 ?? undefined,
-              line2: row.address.line2 ?? row.address.addr2 ?? row.address.Address2 ?? undefined,
-              city: row.address.city ?? undefined,
-              state: row.address.state ?? row.address.stateOrProvince ?? undefined,
-              postalCode: row.address.postalCode ?? row.address.zip ?? undefined,
-              country: row.address.country ?? row.address.countryCode ?? undefined
-            }
-          : undefined;
-
-      return { custNo: String(custNo), name, vinOwner, address };
-    })
-    .filter(Boolean);
-};
-
-const rrAddressToString = (addr) => {
-  if (!addr) return "";
-  const parts = [
-    addr.line1,
-    addr.line2,
-    [addr.city, addr.state].filter(Boolean).join(" "),
-    addr.postalCode,
-    addr.country
-  ].filter(Boolean);
-  return parts.join(", ");
-};
-
-export default function RRCustomerSelector({
-  jobid,
-  socket,
-  rrOpenRoLimit = false,
-  onRrOpenRoFinished,
-  rrValidationPending = false,
-  onValidationFinished
-}) {
-  const { t } = useTranslation();
-  const [open, setOpen] = useState(false);
-  const [customerList, setCustomerList] = useState([]);
-  const [selectedCustomer, setSelectedCustomer] = useState(null);
-  const [refreshing, setRefreshing] = useState(false);
-
-  // Show dialog automatically when validation is pending
-  useEffect(() => {
-    if (rrValidationPending) setOpen(true);
-  }, [rrValidationPending]);
-
-  // Listen for RR customer selection list
-  useEffect(() => {
-    if (!socket) return;
-    const handleRrSelectCustomer = (list) => {
-      const normalized = normalizeRrList(list);
-      setOpen(true);
-      setCustomerList(normalized);
-      const firstOwner = normalized.find((r) => r.vinOwner)?.custNo;
-      setSelectedCustomer(firstOwner ? String(firstOwner) : null);
-      setRefreshing(false);
-    };
-    socket.on("rr-select-customer", handleRrSelectCustomer);
-    return () => {
-      socket.off("rr-select-customer", handleRrSelectCustomer);
-    };
-  }, [socket]);
-
-  // VIN owner set
-  const rrOwnerSet = useMemo(() => {
-    return new Set(customerList.filter((c) => c?.vinOwner || c?.isVehicleOwner).map((c) => String(c.custNo)));
-  }, [customerList]);
-  const rrHasVinOwner = rrOwnerSet.size > 0;
-
-  // Enforce VIN owner stays selected if present
-  useEffect(() => {
-    if (!rrHasVinOwner) return;
-    const firstOwner = (customerList.find((c) => c.vinOwner) || {}).custNo;
-    if (firstOwner && String(selectedCustomer) !== String(firstOwner)) {
-      setSelectedCustomer(String(firstOwner));
-    }
-  }, [rrHasVinOwner, customerList, selectedCustomer]);
-
-  const onUseSelected = () => {
-    if (!selectedCustomer) {
-      message.warning(t("general.actions.select"));
-      return;
-    }
-    if (rrHasVinOwner && !rrOwnerSet.has(String(selectedCustomer))) {
-      message.warning(
-        "This VIN is already assigned in Reynolds. Only the VIN owner can be selected. To choose a different customer, change ownership in Reynolds first."
-      );
-      return;
-    }
-    socket.emit("rr-selected-customer", { jobId: jobid, custNo: String(selectedCustomer) }, (ack) => {
-      if (ack?.ok) {
-        message.success(t("dms.messages.customerSelected"));
-      } else if (ack?.error) {
-        message.error(ack.error);
-      }
-    });
-  };
-
-  const onCreateNew = () => {
-    if (rrHasVinOwner) return;
-    socket.emit("rr-selected-customer", { jobId: jobid, create: true }, (ack) => {
-      if (ack?.ok) {
-        if (ack.custNo) setSelectedCustomer(String(ack.custNo));
-        message.success(t("dms.messages.customerCreated"));
-      } else if (ack?.error) {
-        message.error(ack.error);
-      }
-    });
-  };
-
-  const refreshRrSearch = () => {
-    setRefreshing(true);
-    const to = setTimeout(() => setRefreshing(false), 12000);
-    const stop = () => {
-      clearTimeout(to);
-      setRefreshing(false);
-      socket.off("export-failed", stop);
-      socket.off("rr-select-customer", stop);
-    };
-    socket.once("rr-select-customer", stop);
-    socket.once("export-failed", stop);
-    socket.emit("rr-export-job", { jobId: jobid });
-  };
-
-  if (!open) return null;
-
-  const columns = [
-    { title: t("jobs.fields.dms.id"), dataIndex: "custNo", key: "custNo" },
-    {
-      title: t("jobs.fields.dms.vinowner"),
-      dataIndex: "vinOwner",
-      key: "vinOwner",
-      render: (_t, r) => <Checkbox disabled checked={!!(r.vinOwner ?? r.isVehicleOwner)} />
-    },
-    {
-      title: t("jobs.fields.dms.name1"),
-      dataIndex: "name",
-      key: "name",
-      sorter: (a, b) => alphaSort(a?.name, b?.name)
-    },
-    {
-      title: t("jobs.fields.dms.address"),
-      key: "address",
-      render: (record) => rrAddressToString(record.address)
-    }
-  ];
-
-  const rrDisableRow = (record) => {
-    if (!rrHasVinOwner) return false;
-    return !rrOwnerSet.has(String(record.custNo));
-  };
-
-  return (
-    <Col span={24}>
-      <Table
-        title={() => (
-          <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-            {/* Open RO limit banner */}
-            {rrOpenRoLimit && (
-              <Alert
-                type="error"
-                showIcon
-                message="Open RO limit reached in Reynolds"
-                description={
-                  <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-                    <div>
-                      Reynolds has reached the maximum number of open Repair Orders for this Customer. Close or finalize
-                      an RO in Reynolds, then click <strong>Finished</strong> to continue.
-                    </div>
-                    <div>
-                      <Button type="primary" danger onClick={onRrOpenRoFinished}>
-                        Finished
-                      </Button>
-                    </div>
-                  </div>
-                }
-              />
-            )}
-
-            {/* Validation step banner */}
-            {rrValidationPending && (
-              <Alert
-                type="info"
-                showIcon
-                message="Complete Validation in Reynolds"
-                description={
-                  <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
-                    <div>
-                      We created the Repair Order. Please validate the totals and taxes in the DMS system. When done,
-                      click <strong>Finished</strong> to finalize and mark this export as complete.
-                    </div>
-                    <div>
-                      <Space>
-                        <Button type="primary" onClick={onValidationFinished}>
-                          Finished
-                        </Button>
-                      </Space>
-                    </div>
-                  </div>
-                }
-              />
-            )}
-
-            <div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
-              <Button onClick={onUseSelected} disabled={!selectedCustomer || rrOpenRoLimit}>
-                {t("jobs.actions.dms.useselected")}
-              </Button>
-              {/* No generic in RR */}
-              <Button onClick={onCreateNew} disabled={rrHasVinOwner}>
-                {t("jobs.actions.dms.createnewcustomer")}
-              </Button>
-            </div>
-
-            {rrHasVinOwner && (
-              <Alert
-                type="warning"
-                showIcon
-                message="VIN ownership enforced"
-                description={
-                  <div style={{ display: "flex", justifyContent: "space-between", alignItems: "center", gap: 12 }}>
-                    <div>
-                      This VIN is already assigned in Reynolds. Only the VIN owner is selectable here. To use a
-                      different customer, please change the vehicle ownership in Reynolds first, then return to complete
-                      the export.
-                    </div>
-                    <Button onClick={refreshRrSearch} loading={refreshing}>
-                      Refresh
-                    </Button>
-                  </div>
-                }
-              />
-            )}
-          </div>
-        )}
-        pagination={{ position: "top" }}
-        columns={columns}
-        rowKey={(r) => r.custNo}
-        dataSource={customerList}
-        rowSelection={{
-          onSelect: (record) => setSelectedCustomer(record?.custNo ? String(record.custNo) : null),
-          type: "radio",
-          selectedRowKeys: selectedCustomer ? [selectedCustomer] : [],
-          getCheckboxProps: (record) => ({ disabled: rrDisableRow(record) })
-        }}
-      />
-    </Col>
-  );
-}

client/src/components/dms-log-events/dms-log-events.component.jsx

@@ -1,225 +1,50 @@
 import { Divider, Space, Tag, Timeline } from "antd";
-import { useEffect, useMemo, useState } from "react";
 import dayjs from "../../utils/day";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectDarkMode } from "../../redux/application/application.selectors.js";
+import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 
-const mapStateToProps = createStructuredSelector({
-  isDarkMode: selectDarkMode
+const mapStateToProps = createStructuredSelector({});
+
+const mapDispatchToProps = (dispatch) => ({
+  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-const mapDispatchToProps = () => ({});
-
 export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
 
-export function DmsLogEvents({ logs, detailsOpen, detailsNonce, isDarkMode, colorizeJson = false }) {
-  const [openSet, setOpenSet] = useState(() => new Set());
-
-  // Inject JSON highlight styles once (only when colorize is enabled)
-  useEffect(() => {
-    if (!colorizeJson) return;
-    if (typeof document === "undefined") return;
-    if (document.getElementById("json-highlight-styles")) return;
-    const style = document.createElement("style");
-    style.id = "json-highlight-styles";
-    style.textContent = `
-      .json-key { color: #fa8c16; }
-      .json-string { color: #52c41a; }
-      .json-number { color: #722ed1; }
-      .json-boolean { color: #1890ff; }
-      .json-null { color: #faad14; }
-    `;
-    document.head.appendChild(style);
-  }, [colorizeJson]);
-
-  // Trim openSet if logs shrink
-  useEffect(() => {
-    const len = (logs || []).length;
-    setOpenSet((prev) => {
-      const next = new Set();
-      for (let i = 0; i < len; i++) if (prev.has(i)) next.add(i);
-      return next;
-    });
-  }, [logs?.length]);
-
-  // Respond to global toggle button
-  useEffect(() => {
-    if (detailsNonce == null) return;
-    const len = (logs || []).length;
-    setOpenSet(detailsOpen ? new Set(Array.from({ length: len }, (_, i) => i)) : new Set());
-  }, [detailsNonce, detailsOpen, logs?.length]);
-
-  const items = useMemo(
-    () =>
-      (logs || []).map((raw, idx) => {
-        const { level, message, timestamp, meta } = normalizeLog(raw);
-        const hasMeta = !isEmpty(meta);
-        const isOpen = openSet.has(idx);
-
-        return {
-          key: idx,
-          color: logLevelColor(level),
-          children: (
-            <Space direction="vertical" size={4} style={{ display: "flex" }}>
-              {/* Row 1: summary + inline "Details" toggle */}
-              <Space wrap align="start">
-                <Tag color={logLevelColor(level)}>{level}</Tag>
-                <Divider type="vertical" />
-                <span>{dayjs(timestamp).format("MM/DD/YYYY HH:mm:ss")}</span>
-                <Divider type="vertical" />
-                <span>{message}</span>
-                {hasMeta && (
-                  <>
-                    <Divider type="vertical" />
-                    <a
-                      role="button"
-                      aria-expanded={isOpen}
-                      onClick={() =>
-                        setOpenSet((prev) => {
-                          const next = new Set(prev);
-                          if (isOpen) next.delete(idx);
-                          else next.add(idx);
-                          return next;
-                        })
-                      }
-                      style={{ cursor: "pointer", userSelect: "none" }}
-                    >
-                      {isOpen ? "Hide details" : "Details"}
-                    </a>
-                  </>
-                )}
-              </Space>
-
-              {/* Row 2: details body (only when open) */}
-              {hasMeta && isOpen && (
-                <div style={{ marginLeft: 6 }}>
-                  <JsonBlock isDarkMode={isDarkMode} data={meta} colorize={colorizeJson} />
-                </div>
-              )}
-            </Space>
-          )
-        };
-      }),
-    [logs, openSet, colorizeJson]
+export function DmsLogEvents({ logs }) {
+  return (
+    <Timeline
+      pending
+      reverse={true}
+      items={logs.map((log, idx) => ({
+        key: idx,
+        color: LogLevelHierarchy(log.level),
+        children: (
+          <Space wrap align="start" style={{}}>
+            <Tag color={LogLevelHierarchy(log.level)}>{log.level}</Tag>
+            <span>{dayjs(log.timestamp).format("MM/DD/YYYY HH:mm:ss")}</span>
+            <Divider type="vertical" />
+            <span>{log.message}</span>
+          </Space>
+        )
+      }))}
+    />
   );
-
-  return <Timeline pending reverse items={items} />;
 }
 
-/**
- * Normalize various log input formats into a standard structure.
- * @param input
- * @returns {{level: string, message: *|string, timestamp: Date, meta: *}}
- */
-const normalizeLog = (input) => {
-  const n = input?.normalized || input || {};
-  const level = (n.level || input?.level || "INFO").toString().toUpperCase();
-  const message = n.message ?? input?.message ?? "";
-  const meta = input?.meta != null ? input.meta : n.meta != null ? n.meta : undefined;
-  const tsRaw = input?.timestamp ?? n.timestamp ?? input?.ts ?? Date.now();
-  const timestamp = typeof tsRaw === "number" ? new Date(tsRaw) : new Date(tsRaw);
-  return { level, message, timestamp, meta };
-};
-
-/**
- * Map log level to tag color.
- * @param level
- * @returns {string}
- */
-const logLevelColor = (level) => {
-  switch ((level || "").toUpperCase()) {
-    case "SILLY":
-      return "purple";
+function LogLevelHierarchy(level) {
+  switch (level) {
     case "DEBUG":
       return "orange";
     case "INFO":
       return "blue";
     case "WARN":
-    case "WARNING":
       return "yellow";
     case "ERROR":
       return "red";
     default:
-      return "default";
+      return 0;
   }
-};
-
-/**
- * Check if a value is "empty" (null/undefined, empty array, or empty object).
- * @param v
- */
-const isEmpty = (v) => {
-  if (v == null) return true;
-  if (Array.isArray(v)) return v.length === 0;
-  if (typeof v === "object") return Object.keys(v).length === 0;
-  return false;
-};
-
-/**
- * Safely stringify an object to JSON, falling back to String() on failure.
- * @param obj
- * @param spaces
- * @returns {string}
- */
-const safeStringify = (obj, spaces = 2) => {
-  try {
-    return JSON.stringify(obj, null, spaces);
-  } catch {
-    return String(obj);
-  }
-};
-
-/**
- * JSON display block with optional syntax highlighting.
- * @param data
- * @param colorize
- * @param isDarkMode
- * @returns {JSX.Element}
- * @constructor
- */
-const JsonBlock = ({ data, colorize, isDarkMode }) => {
-  const jsonText = safeStringify(data, 2);
-  const preStyle = {
-    margin: "6px 0 0",
-    maxWidth: 720,
-    overflowX: "auto",
-    fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
-    fontSize: 12,
-    lineHeight: 1.45,
-    padding: 8,
-    borderRadius: 6,
-    background: isDarkMode ? "rgba(255,255,255,0.1)" : "rgba(0,0,0,0.04)",
-    border: isDarkMode ? "1px solid rgba(255,255,255,0.12)" : "1px solid rgba(0,0,0,0.08)",
-    color: isDarkMode ? "var(--card-text-fallback)" : "#141414"
-  };
-
-  if (colorize) {
-    const html = syntaxHighlight(jsonText);
-    return <pre style={preStyle} dangerouslySetInnerHTML={{ __html: html }} />;
-  }
-  return <pre style={preStyle}>{jsonText}</pre>;
-};
-
-/**
- * Syntax highlight JSON text for HTML display.
- * @param jsonText
- * @returns {*}
- */
-const syntaxHighlight = (jsonText) => {
-  const esc = jsonText.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-  return esc.replace(
-    /("(?:\\u[\da-fA-F]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(?:true|false|null)\b|-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?)/g,
-    (match) => {
-      let cls = "json-number";
-      if (match.startsWith('"')) {
-        cls = match.endsWith(":") ? "json-key" : "json-string";
-      } else if (match === "true" || match === "false") {
-        cls = "json-boolean";
-      } else if (match === "null") {
-        cls = "json-null";
-      }
-      return `<span class="${cls}">${match}</span>`;
-    }
-  );
-};
+}

client/src/components/dms-post-form/cdklike-dms-post-form.jsx

@@ -1,403 +0,0 @@
-import { DeleteFilled, DownOutlined } from "@ant-design/icons";
-import {
-  Button,
-  Card,
-  Col,
-  Divider,
-  Dropdown,
-  Form,
-  Input,
-  InputNumber,
-  Row,
-  Select,
-  Space,
-  Statistic,
-  Switch,
-  Tooltip,
-  Typography
-} from "antd";
-import Dinero from "dinero.js";
-import { useTranslation } from "react-i18next";
-import { useMemo, useState } from "react";
-import i18n from "../../translations/i18n";
-import dayjs from "../../utils/day";
-import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
-import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
-import CurrencyInput from "../form-items-formatted/currency-form-item.component";
-import { DMS_MAP } from "../../utils/dmsUtils";
-
-/**
- * CDK-like DMS post form:
- *  - CDK / Fortellis / PBS
- *  - CDK vehicle details + make/model selection
- *  - Payer list with discrepancy gating
- *  - Submit: "{mode}-export-job"
- * @param bodyshop
- * @param socket
- * @param job
- * @param logsRef
- * @param mode
- * @returns {JSX.Element}
- * @constructor
- */
-export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode }) {
-  const [form] = Form.useForm();
-  const { t } = useTranslation();
-  const [, /*unused*/ setTick] = useState(0); // handy if you need a forceUpdate later
-
-  const initialValues = useMemo(
-    () => ({
-      story: `${t("jobs.labels.dms.defaultstory", {
-        ro_number: job.ro_number,
-        ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
-        ins_co_nm: job.ins_co_nm || "N/A",
-        clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
-      }).trim()}.${
-        job.area_of_damage?.impact1
-          ? " " +
-            t("jobs.labels.dms.damageto", {
-              area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
-            })
-          : ""
-      }`.slice(0, 239),
-      inservicedate: dayjs(
-        `${
-          (job.v_model_yr &&
-            (job.v_model_yr < 100
-              ? job.v_model_yr >= (dayjs().year() + 1) % 100
-                ? 1900 + parseInt(job.v_model_yr, 10)
-                : 2000 + parseInt(job.v_model_yr, 10)
-              : job.v_model_yr)) ||
-          2019
-        }-01-01`
-      ),
-      journal: bodyshop.cdk_configuration?.default_journal
-    }),
-    [job, bodyshop, t]
-  );
-
-  // Payers helpers
-  const handlePayerSelect = (value, index) => {
-    form.setFieldsValue({
-      payers: (form.getFieldValue("payers") || []).map((payer, mapIndex) => {
-        if (index !== mapIndex) return payer;
-        const cdkPayer =
-          bodyshop.cdk_configuration.payers && bodyshop.cdk_configuration.payers.find((i) => i.name === value);
-        if (!cdkPayer) return payer;
-        return {
-          ...cdkPayer,
-          dms_acctnumber: cdkPayer.dms_acctnumber,
-          controlnumber: job?.[cdkPayer.control_type]
-        };
-      })
-    });
-    setTick((n) => n + 1);
-  };
-
-  const handleFinish = (values) => {
-    if (!socket) return;
-
-    if (mode === DMS_MAP.fortellis) {
-      socket.emit("fortellis-export-job", {
-        jobid: job.id,
-        txEnvelope: { ...values, SubscriptionID: bodyshop.cdk_dealerid }
-      });
-    } else {
-      socket.emit(`${mode}-export-job`, { jobid: job.id, txEnvelope: values });
-    }
-
-    logsRef?.current?.scrollIntoView({ behavior: "smooth" });
-  };
-
-  // Totals & discrepancy
-  const totals = socket?.allocationsSummary
-    ? socket.allocationsSummary.reduce(
-        (acc, val) => ({
-          totalSale: acc.totalSale.add(Dinero(val.sale)),
-          totalCost: acc.totalCost.add(Dinero(val.cost))
-        }),
-        { totalSale: Dinero(), totalCost: Dinero() }
-      )
-    : { totalSale: Dinero(), totalCost: Dinero() };
-
-  return (
-    <Card title={t("jobs.labels.dms.postingform")}>
-      <Form
-        form={form}
-        layout="vertical"
-        onFinish={handleFinish}
-        style={{ width: "100%" }}
-        initialValues={initialValues}
-      >
-        {/* TOP ROW */}
-        <Row gutter={[16, 12]} align="bottom">
-          <Col xs={24} sm={12} md={8} lg={6}>
-            <Form.Item name="journal" label={t("jobs.fields.dms.journal")} rules={[{ required: true }]}>
-              <Input />
-            </Form.Item>
-          </Col>
-
-          <Col xs={12} sm={8} md={6} lg={4}>
-            <Form.Item name="kmin" label={t("jobs.fields.kmin")} initialValue={job?.kmin} rules={[{ required: true }]}>
-              <InputNumber style={{ width: "100%" }} disabled />
-            </Form.Item>
-          </Col>
-
-          <Col xs={12} sm={8} md={6} lg={4}>
-            <Form.Item
-              name="kmout"
-              label={t("jobs.fields.kmout")}
-              initialValue={job?.kmout}
-              rules={[{ required: true }]}
-            >
-              <InputNumber style={{ width: "100%" }} disabled />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        {/* CDK vehicle details (kept for CDK/Fortellis paths when dealer id exists) */}
-        {bodyshop.cdk_dealerid && (
-          <>
-            <Row gutter={[16, 12]}>
-              <Col xs={24} sm={12} md={8}>
-                <Form.Item name="dms_make" label={t("jobs.fields.dms.dms_make")} rules={[{ required: true }]}>
-                  <Input disabled />
-                </Form.Item>
-              </Col>
-              <Col xs={24} sm={12} md={8}>
-                <Form.Item name="dms_model" label={t("jobs.fields.dms.dms_model")} rules={[{ required: true }]}>
-                  <Input disabled />
-                </Form.Item>
-              </Col>
-              <Col xs={24} sm={12} md={8}>
-                <Form.Item name="inservicedate" label={t("jobs.fields.dms.inservicedate")}>
-                  <DateTimePicker isDateOnly />
-                </Form.Item>
-              </Col>
-            </Row>
-
-            <Row gutter={[16, 12]} align="middle">
-              <Col>
-                <DmsCdkMakes form={form} job={job} />
-              </Col>
-              <Col>
-                <DmsCdkMakesRefetch />
-              </Col>
-              <Col>
-                <Form.Item name="dms_unsold" label={t("jobs.fields.dms.dms_unsold")} initialValue={false}>
-                  <Switch />
-                </Form.Item>
-              </Col>
-              <Col>
-                <Form.Item
-                  name="dms_model_override"
-                  label={t("jobs.fields.dms.dms_model_override")}
-                  initialValue={false}
-                >
-                  <Switch />
-                </Form.Item>
-              </Col>
-            </Row>
-          </>
-        )}
-
-        <Row gutter={[16, 12]}>
-          <Col span={24}>
-            <Form.Item name="story" label={t("jobs.fields.dms.story")} rules={[{ required: true }]}>
-              <Input.TextArea maxLength={240} />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Divider />
-
-        {/* Totals */}
-        <Space size="large" wrap align="center" style={{ marginBottom: 16 }}>
-          <Statistic
-            title={t("jobs.fields.ded_amt")}
-            value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
-          />
-          <Statistic
-            title={t("jobs.labels.total_cust_payable")}
-            value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
-          />
-          <Statistic
-            title={t("jobs.labels.net_repairs")}
-            value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
-          />
-        </Space>
-
-        {/* Payers list */}
-        <Divider />
-        <Form.List name={["payers"]}>
-          {(fields, { add, remove }) => (
-            <div>
-              {fields.map((field, index) => (
-                <Card
-                  key={field.key}
-                  size="small"
-                  style={{ marginBottom: 12 }}
-                  title={`${t("jobs.fields.dms.payer.payer_type")} #${index + 1}`}
-                  extra={
-                    <Tooltip title={t("general.actions.remove", "Remove")}>
-                      <Button
-                        type="text"
-                        danger
-                        icon={<DeleteFilled />}
-                        aria-label={t("general.actions.remove", "Remove")}
-                        onClick={() => remove(field.name)}
-                      />
-                    </Tooltip>
-                  }
-                >
-                  <Row gutter={[16, 8]} align="middle">
-                    <Col xs={24} sm={12} md={8} lg={6}>
-                      <Form.Item
-                        label={t("jobs.fields.dms.payer.name")}
-                        name={[field.name, "name"]}
-                        rules={[{ required: true }]}
-                      >
-                        <Select style={{ minWidth: "15rem" }} onSelect={(value) => handlePayerSelect(value, index)}>
-                          {bodyshop.cdk_configuration?.payers?.map((payer) => (
-                            <Select.Option key={payer.name}>{payer.name}</Select.Option>
-                          ))}
-                        </Select>
-                      </Form.Item>
-                    </Col>
-
-                    <Col xs={24} sm={12} md={8} lg={6}>
-                      <Form.Item
-                        label={t("jobs.fields.dms.payer.dms_acctnumber")}
-                        name={[field.name, "dms_acctnumber"]}
-                        rules={[{ required: true }]}
-                      >
-                        <Input disabled />
-                      </Form.Item>
-                    </Col>
-
-                    <Col xs={24} sm={12} md={8} lg={5}>
-                      <Form.Item
-                        label={t("jobs.fields.dms.payer.amount")}
-                        name={[field.name, "amount"]}
-                        rules={[{ required: true }]}
-                      >
-                        <CurrencyInput min={0} />
-                      </Form.Item>
-                    </Col>
-
-                    <Col xs={24} sm={12} md={10} lg={7}>
-                      <Form.Item
-                        label={
-                          <div>
-                            {t("jobs.fields.dms.payer.controlnumber")}{" "}
-                            <Dropdown
-                              trigger={["click"]}
-                              menu={{
-                                items:
-                                  bodyshop.cdk_configuration.controllist?.map((key, idx) => ({
-                                    key: idx,
-                                    label: key.name,
-                                    onClick: () => {
-                                      form.setFieldsValue({
-                                        payers: (form.getFieldValue("payers") || []).map((row, mapIndex) => {
-                                          if (index !== mapIndex) return row;
-                                          return { ...row, controlnumber: key.controlnumber };
-                                        })
-                                      });
-                                    }
-                                  })) ?? []
-                              }}
-                            >
-                              <a href="#" onClick={(e) => e.preventDefault()}>
-                                <DownOutlined />
-                              </a>
-                            </Dropdown>
-                          </div>
-                        }
-                        name={[field.name, "controlnumber"]}
-                        rules={[{ required: true }]}
-                      >
-                        <Input />
-                      </Form.Item>
-                    </Col>
-
-                    <Col xs={24}>
-                      <Form.Item shouldUpdate noStyle>
-                        {() => {
-                          const payers = form.getFieldValue("payers");
-                          const row = payers?.[index];
-                          const cdkPayer =
-                            bodyshop.cdk_configuration.payers &&
-                            bodyshop.cdk_configuration.payers.find((i) => i && row && i.name === row.name);
-                          if (i18n.exists(`jobs.fields.${cdkPayer?.control_type}`))
-                            return <div>{cdkPayer && t(`jobs.fields.${cdkPayer?.control_type}`)}</div>;
-                          else if (i18n.exists(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)) {
-                            return <div>{cdkPayer && t(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)}</div>;
-                          } else {
-                            return null;
-                          }
-                        }}
-                      </Form.Item>
-                    </Col>
-                  </Row>
-                </Card>
-              ))}
-              <Form.Item>
-                <Button
-                  disabled={!(fields.length < 3)}
-                  onClick={() => {
-                    if (fields.length < 3) add();
-                  }}
-                  style={{ width: "100%" }}
-                >
-                  {t("jobs.actions.dms.addpayer")}
-                </Button>
-              </Form.Item>
-            </div>
-          )}
-        </Form.List>
-
-        {/* Validation gates & summary */}
-        <Form.Item shouldUpdate>
-          {() => {
-            let totalAllocated = Dinero();
-            const payers = form.getFieldValue("payers") || [];
-            payers.forEach((payer) => {
-              totalAllocated = totalAllocated.add(Dinero({ amount: Math.round((payer?.amount || 0) * 100) }));
-            });
-
-            const discrep = totals ? totals.totalSale.subtract(totalAllocated) : Dinero();
-
-            // gate: must have payers filled + zero discrepancy when we have a summary
-            const payersOk =
-              payers.length > 0 &&
-              payers.every((p) => p?.name && p.dms_acctnumber && (p.amount ?? "") !== "" && p.controlnumber);
-            const nonRrDiscrepancyGate = socket?.allocationsSummary ? discrep.getAmount() !== 0 : true;
-            const disablePost = !payersOk || nonRrDiscrepancyGate;
-
-            return (
-              <Space size="large" wrap align="center">
-                <Statistic
-                  title={t("jobs.labels.subtotal")}
-                  value={(totals ? totals.totalSale : Dinero()).toFormat()}
-                />
-                <Typography.Title>-</Typography.Title>
-                <Statistic title={t("jobs.labels.dms.totalallocated")} value={totalAllocated.toFormat()} />
-                <Typography.Title>=</Typography.Title>
-                <Statistic
-                  title={t("jobs.labels.dms.notallocated")}
-                  valueStyle={{ color: discrep.getAmount() === 0 ? "green" : "red" }}
-                  value={discrep.toFormat()}
-                />
-                <Button disabled={disablePost} htmlType="submit">
-                  {t("jobs.actions.dms.post")}
-                </Button>
-              </Space>
-            );
-          }}
-        </Form.Item>
-      </Form>
-    </Card>
-  );
-}

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -1,40 +1,396 @@
+import { DeleteFilled, DownOutlined } from "@ant-design/icons";
+import {
+  Button,
+  Card,
+  Divider,
+  Dropdown,
+  Form,
+  Input,
+  InputNumber,
+  Select,
+  Space,
+  Statistic,
+  Switch,
+  Typography
+} from "antd";
+import Dinero from "dinero.js";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { determineDmsType } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { DMS_MAP } from "../../utils/dmsUtils";
-import RRPostForm from "./rr-dms-post-form";
-import CdkLikePostForm from "./cdklike-dms-post-form";
+import i18n from "../../translations/i18n";
+import dayjs from "../../utils/day";
+import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
+import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
+import CurrencyInput from "../form-items-formatted/currency-form-item.component";
+import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({});
-
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
 export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
 
-/**
- * DMS Post Form component that renders the appropriate post form
- * @param mode
- * @param bodyshop
- * @param socket
- * @param job
- * @param logsRef
- * @returns {JSX.Element|null}
- * @constructor
- */
-export function DmsPostForm({ mode, bodyshop, socket, job, logsRef }) {
-  switch (mode) {
-    case DMS_MAP.reynolds:
-      return <RRPostForm bodyshop={bodyshop} socket={socket} job={job} logsRef={logsRef} />;
+export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
+  const [form] = Form.useForm();
+  const { t } = useTranslation();
 
-    // CDK (legacy /ws), Fortellis (CDK-over-WSS), and PBS share the same UI;
-    // we pass mode down so the child can choose the correct event name.
-    case DMS_MAP.fortellis:
-    case DMS_MAP.cdk:
-    case DMS_MAP.pbs:
-      return <CdkLikePostForm mode={mode} bodyshop={bodyshop} socket={socket} job={job} logsRef={logsRef} />;
+  const handlePayerSelect = (value, index) => {
+    form.setFieldsValue({
+      payers: form.getFieldValue("payers").map((payer, mapIndex) => {
+        if (index !== mapIndex) return payer;
+        const cdkPayer =
+          bodyshop.cdk_configuration.payers && bodyshop.cdk_configuration.payers.find((i) => i.name === value);
 
-    default:
-      return null;
-  }
+        if (!cdkPayer) return payer;
+
+        return {
+          ...cdkPayer,
+          dms_acctnumber: cdkPayer.dms_acctnumber,
+          controlnumber: job && job[cdkPayer.control_type]
+        };
+      })
+    });
+  };
+
+  const handleFinish = (values) => {
+    socket.emit(`${determineDmsType(bodyshop)}-export-job`, {
+      jobid: job.id,
+      txEnvelope: values
+    });
+    console.log(logsRef);
+    if (logsRef) {
+      console.log("executing", logsRef);
+      logsRef.curent &&
+        logsRef.current.scrollIntoView({
+          behavior: "smooth"
+        });
+    }
+  };
+
+  return (
+    <Card title={t("jobs.labels.dms.postingform")}>
+      <Form
+        form={form}
+        layout="vertical"
+        onFinish={handleFinish}
+        initialValues={{
+          story: `${t("jobs.labels.dms.defaultstory", {
+            ro_number: job.ro_number,
+            ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
+            ins_co_nm: job.ins_co_nm || "N/A",
+            clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
+          }).trim()}.${
+            job.area_of_damage && job.area_of_damage.impact1
+              ? " " +
+                t("jobs.labels.dms.damageto", {
+                  area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
+                })
+              : ""
+          }`.slice(0, 239),
+          inservicedate: dayjs(
+            `${(job.v_model_yr && (job.v_model_yr < 100 ? (job.v_model_yr >= (dayjs().year() + 1) % 100 ? 1900 + parseInt(job.v_model_yr) : 2000 + parseInt(job.v_model_yr)) : job.v_model_yr)) || 2019}-01-01`
+          )
+        }}
+      >
+        <LayoutFormRow grow>
+          <Form.Item
+            name="journal"
+            label={t("jobs.fields.dms.journal")}
+            initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <Input />
+          </Form.Item>
+          <Form.Item
+            name="kmin"
+            label={t("jobs.fields.kmin")}
+            initialValue={job && job.kmin}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <InputNumber disabled />
+          </Form.Item>
+          <Form.Item
+            name="kmout"
+            label={t("jobs.fields.kmout")}
+            initialValue={job && job.kmout}
+            rules={[
+              {
+                required: true
+                //message: t("general.validation.required"),
+              }
+            ]}
+          >
+            <InputNumber disabled />
+          </Form.Item>
+        </LayoutFormRow>
+
+        {bodyshop.cdk_dealerid && (
+          <div>
+            <LayoutFormRow style={{ justifyContent: "center" }} grow>
+              <Form.Item
+                name="dms_make"
+                label={t("jobs.fields.dms.dms_make")}
+                rules={[
+                  {
+                    required: true
+                  }
+                ]}
+              >
+                <Input disabled />
+              </Form.Item>
+              <Form.Item
+                name="dms_model"
+                label={t("jobs.fields.dms.dms_model")}
+                rules={[
+                  {
+                    required: true
+                  }
+                ]}
+              >
+                <Input disabled />
+              </Form.Item>
+              <Form.Item name="inservicedate" label={t("jobs.fields.dms.inservicedate")}>
+                <DateTimePicker isDateOnly />
+              </Form.Item>
+            </LayoutFormRow>
+            <Space>
+              <DmsCdkMakes form={form} socket={socket} job={job} />
+              <DmsCdkMakesRefetch />
+              <Form.Item name="dms_unsold" label={t("jobs.fields.dms.dms_unsold")} initialValue={false}>
+                <Switch />
+              </Form.Item>
+              <Form.Item name="dms_model_override" label={t("jobs.fields.dms.dms_model_override")} initialValue={false}>
+                <Switch />
+              </Form.Item>
+            </Space>
+          </div>
+        )}
+        <Form.Item
+          name="story"
+          label={t("jobs.fields.dms.story")}
+          rules={[
+            {
+              required: true
+            }
+          ]}
+        >
+          <Input.TextArea maxLength={240} />
+        </Form.Item>
+
+        <Divider />
+        <Space size="large" wrap align="center">
+          <Statistic
+            title={t("jobs.fields.ded_amt")}
+            value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.total_cust_payable")}
+            value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
+          />
+          <Statistic
+            title={t("jobs.labels.net_repairs")}
+            value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
+          />
+        </Space>
+        <Form.List name={["payers"]}>
+          {(fields, { add, remove }) => {
+            return (
+              <div>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key}>
+                    <Space wrap>
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.name")}
+                        key={`${index}name`}
+                        name={[field.name, "name"]}
+                        rules={[
+                          {
+                            required: true
+                          }
+                        ]}
+                      >
+                        <Select style={{ minWidth: "15rem" }} onSelect={(value) => handlePayerSelect(value, index)}>
+                          {bodyshop.cdk_configuration &&
+                            bodyshop.cdk_configuration.payers &&
+                            bodyshop.cdk_configuration.payers.map((payer) => (
+                              <Select.Option key={payer.name}>{payer.name}</Select.Option>
+                            ))}
+                        </Select>
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.dms_acctnumber")}
+                        key={`${index}dms_acctnumber`}
+                        name={[field.name, "dms_acctnumber"]}
+                        rules={[
+                          {
+                            required: true
+                          }
+                        ]}
+                      >
+                        <Input disabled />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("jobs.fields.dms.payer.amount")}
+                        key={`${index}amount`}
+                        name={[field.name, "amount"]}
+                        rules={[
+                          {
+                            required: true
+                          }
+                        ]}
+                      >
+                        <CurrencyInput min={0} />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={
+                          <div>
+                            {t("jobs.fields.dms.payer.controlnumber")}{" "}
+                            <Dropdown
+                              menu={{
+                                items: bodyshop.cdk_configuration.controllist?.map((key, idx) => ({
+                                  key: idx,
+                                  label: key.name,
+                                  onClick: () => {
+                                    form.setFieldsValue({
+                                      payers: form.getFieldValue("payers").map((row, mapIndex) => {
+                                        if (index !== mapIndex) return row;
+                                        return {
+                                          ...row,
+                                          controlnumber: key.controlnumber
+                                        };
+                                      })
+                                    });
+                                  }
+                                }))
+                              }}
+                            >
+                              <a href=" #" onClick={(e) => e.preventDefault()}>
+                                <DownOutlined />
+                              </a>
+                            </Dropdown>
+                          </div>
+                        }
+                        key={`${index}controlnumber`}
+                        name={[field.name, "controlnumber"]}
+                        rules={[
+                          {
+                            required: true
+                          }
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+
+                      <Form.Item shouldUpdate>
+                        {() => {
+                          const payers = form.getFieldValue("payers");
+
+                          const row = payers && payers[index];
+
+                          const cdkPayer =
+                            bodyshop.cdk_configuration.payers &&
+                            bodyshop.cdk_configuration.payers.find((i) => i && row && i.name === row.name);
+                          if (i18n.exists(`jobs.fields.${cdkPayer?.control_type}`))
+                            return <div>{cdkPayer && t(`jobs.fields.${cdkPayer?.control_type}`)}</div>;
+                          else if (i18n.exists(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)) {
+                            return <div>{cdkPayer && t(`jobs.fields.dms.control_type.${cdkPayer?.control_type}`)}</div>;
+                          } else {
+                            return null;
+                          }
+                        }}
+                      </Form.Item>
+
+                      <DeleteFilled
+                        onClick={() => {
+                          remove(field.name);
+                        }}
+                      />
+                    </Space>
+                  </Form.Item>
+                ))}
+                <Form.Item>
+                  <Button
+                    disabled={!(fields.length < 3)}
+                    onClick={() => {
+                      if (fields.length < 3) add();
+                    }}
+                    style={{ width: "100%" }}
+                  >
+                    {t("jobs.actions.dms.addpayer")}
+                  </Button>
+                </Form.Item>
+              </div>
+            );
+          }}
+        </Form.List>
+        <Form.Item shouldUpdate>
+          {() => {
+            //Perform Calculation to determine discrepancy.
+            let totalAllocated = Dinero();
+
+            const payers = form.getFieldValue("payers");
+            payers &&
+              payers.forEach((payer) => {
+                totalAllocated = totalAllocated.add(Dinero({ amount: Math.round((payer?.amount || 0) * 100) }));
+              });
+
+            const totals =
+              socket.allocationsSummary &&
+              socket.allocationsSummary.reduce(
+                (acc, val) => {
+                  return {
+                    totalSale: acc.totalSale.add(Dinero(val.sale)),
+                    totalCost: acc.totalCost.add(Dinero(val.cost))
+                  };
+                },
+                {
+                  totalSale: Dinero(),
+                  totalCost: Dinero()
+                }
+              );
+            const discrep = totals ? totals.totalSale.subtract(totalAllocated) : Dinero();
+            return (
+              <Space size="large" wrap align="center">
+                <Statistic
+                  title={t("jobs.labels.subtotal")}
+                  value={(totals ? totals.totalSale : Dinero()).toFormat()}
+                />
+                <Typography.Title>-</Typography.Title>
+                <Statistic title={t("jobs.labels.dms.totalallocated")} value={totalAllocated.toFormat()} />
+                <Typography.Title>=</Typography.Title>
+                <Statistic
+                  title={t("jobs.labels.dms.notallocated")}
+                  valueStyle={{
+                    color: discrep.getAmount() === 0 ? "green" : "red"
+                  }}
+                  value={discrep.toFormat()}
+                />
+                <Button disabled={!socket.allocationsSummary || discrep.getAmount() !== 0} htmlType="submit">
+                  {t("jobs.actions.dms.post")}
+                </Button>
+              </Space>
+            );
+          }}
+        </Form.Item>
+      </Form>
+    </Card>
+  );
 }

client/src/components/dms-post-form/rr-dms-post-form.jsx

@@ -1,242 +0,0 @@
-import { ReloadOutlined } from "@ant-design/icons";
-import {
-  Button,
-  Card,
-  Col,
-  Divider,
-  Form,
-  Input,
-  InputNumber,
-  Row,
-  Select,
-  Space,
-  Statistic,
-  Tooltip,
-  Typography
-} from "antd";
-import Dinero from "dinero.js";
-import { useTranslation } from "react-i18next";
-import { useEffect, useMemo, useState } from "react";
-import dayjs from "../../utils/day";
-
-/**
- * RR DMS Post Form component
- * Submit: "rr-export-job"
- * @param bodyshop
- * @param socket
- * @param job
- * @param logsRef
- * @returns {JSX.Element}
- * @constructor
- */
-export default function RRPostForm({ bodyshop, socket, job, logsRef }) {
-  const [form] = Form.useForm();
-  const { t } = useTranslation();
-
-  // Advisors
-  const [advisors, setAdvisors] = useState([]);
-  const [advLoading, setAdvLoading] = useState(false);
-
-  const getAdvisorNumber = (a) => a?.advisorId;
-
-  const getAdvisorLabel = (a) => `${a?.firstName || ""} ${a?.lastName || ""}`.trim();
-
-  const fetchRrAdvisors = (refresh = false) => {
-    if (!socket) return;
-    setAdvLoading(true);
-
-    const onResult = (payload) => {
-      try {
-        const list = payload?.result ?? payload ?? [];
-        setAdvisors(Array.isArray(list) ? list : []);
-      } finally {
-        setAdvLoading(false);
-        socket.off("rr-get-advisors:result", onResult);
-      }
-    };
-
-    socket.once("rr-get-advisors:result", onResult);
-    socket.emit("rr-get-advisors", { departmentType: "B", refresh }, (ack) => {
-      if (ack?.ok) {
-        const list = ack.result ?? [];
-        setAdvisors(Array.isArray(list) ? list : []);
-      } else if (ack) {
-        console.error("Something went wrong fetching DMS Advisors");
-      }
-      setAdvLoading(false);
-      socket.off("rr-get-advisors:result", onResult);
-    });
-  };
-
-  useEffect(() => {
-    fetchRrAdvisors(false);
-  }, [bodyshop?.id, socket]);
-
-  const initialValues = useMemo(
-    () => ({
-      story: `${t("jobs.labels.dms.defaultstory", {
-        ro_number: job.ro_number,
-        ownr_nm: `${job.ownr_fn || ""} ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`.trim(),
-        ins_co_nm: job.ins_co_nm || "N/A",
-        clm_po: `${job.clm_no ? `${job.clm_no} ` : ""}${job.po_number || ""}`
-      }).trim()}.${
-        job.area_of_damage?.impact1
-          ? " " +
-            t("jobs.labels.dms.damageto", {
-              area_of_damage: (job.area_of_damage && job.area_of_damage.impact1.padStart(2, "0")) || "UNKNOWN"
-            })
-          : ""
-      }`.slice(0, 239),
-      inservicedate: dayjs(
-        `${
-          (job.v_model_yr &&
-            (job.v_model_yr < 100
-              ? job.v_model_yr >= (dayjs().year() + 1) % 100
-                ? 1900 + parseInt(job.v_model_yr, 10)
-                : 2000 + parseInt(job.v_model_yr, 10)
-              : job.v_model_yr)) ||
-          2019
-        }-01-01`
-      )
-    }),
-    [job, t]
-  );
-
-  const handleFinish = (values) => {
-    if (!socket) return;
-    socket.emit("rr-export-job", {
-      bodyshopId: bodyshop?.id,
-      jobId: job.id,
-      job,
-      txEnvelope: values
-    });
-    logsRef?.current?.scrollIntoView({ behavior: "smooth" });
-  };
-
-  // Discrepancy is ignored for RR; we still show totals for operator context
-  const totals = socket?.allocationsSummary
-    ? socket.allocationsSummary.reduce(
-        (acc, val) => ({
-          totalSale: acc.totalSale.add(Dinero(val.sale)),
-          totalCost: acc.totalCost.add(Dinero(val.cost))
-        }),
-        { totalSale: Dinero(), totalCost: Dinero() }
-      )
-    : { totalSale: Dinero(), totalCost: Dinero() };
-
-  return (
-    <Card title={t("jobs.labels.dms.postingform")}>
-      <Form
-        form={form}
-        layout="vertical"
-        onFinish={handleFinish}
-        style={{ width: "100%" }}
-        initialValues={initialValues}
-      >
-        <Row gutter={[16, 12]} align="bottom">
-          {/* Advisor + inline Refresh */}
-          <Col xs={24} sm={24} md={12} lg={8}>
-            <Form.Item label={t("jobs.fields.dms.advisor")} required>
-              <Space.Compact block>
-                <Form.Item
-                  name="advisorNo"
-                  noStyle
-                  rules={[{ required: true, message: t("general.validation.required") }]}
-                >
-                  <Select
-                    style={{ flex: 1 }}
-                    loading={advLoading}
-                    allowClear
-                    placeholder={t("general.actions.select", "Select...")}
-                    popupMatchSelectWidth
-                    options={advisors
-                      .map((a) => {
-                        const value = getAdvisorNumber(a);
-                        if (value == null) return null;
-                        return { value: String(value), label: getAdvisorLabel(a) || String(value) };
-                      })
-                      .filter(Boolean)}
-                    notFoundContent={advLoading ? t("general.labels.loading") : t("general.labels.none")}
-                  />
-                </Form.Item>
-                <Tooltip title={t("general.actions.refresh")}>
-                  <Button
-                    aria-label={t("general.actions.refresh")}
-                    icon={<ReloadOutlined />}
-                    onClick={() => fetchRrAdvisors(true)}
-                    loading={advLoading}
-                  />
-                </Tooltip>
-              </Space.Compact>
-            </Form.Item>
-          </Col>
-
-          {/* Make Override */}
-          <Col xs={24} sm={12} md={12} lg={8}>
-            <Form.Item name="makeOverride" label={t("jobs.fields.dms.make_override")}>
-              <Input allowClear placeholder={t("general.actions.optional")} />
-            </Form.Item>
-          </Col>
-
-          <Col xs={12} sm={8} md={6} lg={4}>
-            <Form.Item name="kmin" label={t("jobs.fields.kmin")} initialValue={job?.kmin} rules={[{ required: true }]}>
-              <InputNumber style={{ width: "100%" }} disabled />
-            </Form.Item>
-          </Col>
-
-          <Col xs={12} sm={8} md={6} lg={4}>
-            <Form.Item
-              name="kmout"
-              label={t("jobs.fields.kmout")}
-              initialValue={job?.kmout}
-              rules={[{ required: true }]}
-            >
-              <InputNumber style={{ width: "100%" }} disabled />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Row gutter={[16, 12]}>
-          <Col span={24}>
-            <Form.Item name="story" label={t("jobs.fields.dms.story")} rules={[{ required: true }]}>
-              <Input.TextArea maxLength={240} />
-            </Form.Item>
-          </Col>
-        </Row>
-
-        <Divider />
-
-        <Space size="large" wrap align="center" style={{ marginBottom: 16 }}>
-          <Statistic
-            title={t("jobs.fields.ded_amt")}
-            value={Dinero(job.job_totals.totals.custPayable.deductible).toFormat()}
-          />
-          <Statistic
-            title={t("jobs.labels.total_cust_payable")}
-            value={Dinero(job.job_totals.totals.custPayable.total).toFormat()}
-          />
-          <Statistic
-            title={t("jobs.labels.net_repairs")}
-            value={Dinero(job.job_totals.totals.net_repairs).toFormat()}
-          />
-        </Space>
-
-        {/* Validation  */}
-        <Form.Item shouldUpdate>
-          {() => {
-            const advisorOk = !!form.getFieldValue("advisorNo");
-            return (
-              <Space size="large" wrap align="center">
-                <Statistic title={t("jobs.labels.subtotal")} value={totals.totalSale.toFormat()} />
-                <Typography.Title>=</Typography.Title>
-                <Button disabled={!advisorOk} htmlType="submit">
-                  {t("jobs.actions.dms.post")}
-                </Button>
-              </Space>
-            );
-          }}
-        </Form.Item>
-      </Form>
-    </Card>
-  );
-}

client/src/components/eula/eula.component.jsx

@@ -55,7 +55,8 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
     const useremail = currentUser.email;
 
     try {
-      const { ...otherFormValues } = formValues;
+      // eslint-disable-next-line no-unused-vars
+      const { accepted_terms, ...otherFormValues } = formValues;
 
       // Trim the values of the fields before submitting
       const trimmedFormValues = Object.entries(otherFormValues).reduce((acc, [key, value]) => {

client/src/components/header/buildAccountingChildren.jsx

@@ -141,7 +141,7 @@ const buildAccountingChildren = ({
           </Link>
         )
       },
-      ...(!(bodyshop?.cdk_dealerid || bodyshop?.pbs_serialnumber || bodyshop?.rr_dealerid) || DmsAp.treatment === "on"
+      ...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber)) || DmsAp.treatment === "on"
         ? [
             {
               key: "payables",
@@ -156,7 +156,7 @@ const buildAccountingChildren = ({
             }
           ]
         : []),
-      ...(!(bodyshop?.cdk_dealerid || bodyshop?.pbs_serialnumber || bodyshop?.rr_dealerid) || DmsAp.treatment === "on"
+      ...(!((bodyshop && bodyshop.cdk_dealerid) || (bodyshop && bodyshop.pbs_serialnumber))
         ? [
             {
               key: "payments",

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -9,10 +9,10 @@ import {
   WarningFilled
 } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Input, Space, Table, Tag } from "antd";
+import { gql, useMutation } from "@apollo/client";
+import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd";
 import axios from "axios";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,6 +47,19 @@ import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
+const UPDATE_JOB_LINES_LOCATION_BULK = gql`
+  mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
+    update_joblines(where: { id: { _in: $ids } }, _set: { location: $location }) {
+      affected_rows
+      returning {
+        id
+        location
+      }
+    }
+  }
+`;
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -83,6 +96,9 @@ export function JobLinesComponent({
   isPartsEntry
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
+  const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
+  const notification = useNotification();
+
   const {
     treatments: { Enhanced_Payroll }
   } = useSplitTreatments({
@@ -103,9 +119,83 @@ export function JobLinesComponent({
     }
   });
 
+  // Bulk location modal state
+  const [bulkLocationOpen, setBulkLocationOpen] = useState(false);
+  const [bulkLocation, setBulkLocation] = useState(null);
+  const [bulkLocationSaving, setBulkLocationSaving] = useState(false);
+
   const { t } = useTranslation();
   const jobIsPrivate = bodyshop.md_ins_cos.find((c) => c.name === job.ins_co_nm)?.private;
 
+  const selectedLineIds = useMemo(() => selectedLines.map((l) => l?.id).filter(Boolean), [selectedLines]);
+
+  const commonSelectedLocation = useMemo(() => {
+    const locs = selectedLines
+      .map((l) => (typeof l?.location === "string" ? l.location : ""))
+      .map((x) => x.trim())
+      .filter(Boolean);
+
+    if (locs.length === 0) return null;
+
+    const uniq = _.uniq(locs);
+    return uniq.length === 1 ? uniq[0] : null;
+  }, [selectedLines]);
+
+  const openBulkLocationModal = () => {
+    setBulkLocation(commonSelectedLocation);
+    setBulkLocationOpen(true);
+    logImEXEvent("joblines_bulk_location_open", { count: selectedLineIds.length });
+  };
+
+  const closeBulkLocationModal = () => {
+    setBulkLocationOpen(false);
+    setBulkLocation(null);
+  };
+
+  const saveBulkLocation = async () => {
+    if (selectedLineIds.length === 0) return;
+
+    setBulkLocationSaving(true);
+
+    try {
+      const locationToSave = (bulkLocation ?? "").toString();
+
+      const result = await bulkUpdateLocations({
+        variables: {
+          ids: selectedLineIds,
+          location: locationToSave
+        }
+      });
+
+      if (!result?.errors) {
+        // Keep UI selection consistent without waiting for refetch
+        setSelectedLines((prev) =>
+          prev.map((l) => (l && selectedLineIds.includes(l.id) ? { ...l, location: locationToSave } : l))
+        );
+
+        notification["success"]({ message: t("joblines.successes.saved") });
+
+        logImEXEvent("joblines_bulk_location_saved", {
+          count: selectedLineIds.length,
+          location: locationToSave
+        });
+
+        closeBulkLocationModal();
+        if (refetch) refetch();
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.saving", { error: JSON.stringify(result.errors) })
+        });
+      }
+    } catch (error) {
+      notification["error"]({
+        message: t("joblines.errors.saving", { error: error?.message || String(error) })
+      });
+    } finally {
+      setBulkLocationSaving(false);
+    }
+  };
+
   const columns = [
     {
       title: "#",
@@ -171,46 +261,16 @@ export function JobLinesComponent({
             ? ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
             : ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"]
         },
-        {
-          text: t("joblines.fields.part_types.PAN"),
-          value: ["PAN"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAP"),
-          value: ["PAP"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAL"),
-          value: ["PAL"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAA"),
-          value: ["PAA"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAG"),
-          value: ["PAG"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAS"),
-          value: ["PAS"]
-        },
-        {
-          text: t("joblines.fields.part_types.PASL"),
-          value: ["PASL"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAC"),
-          value: ["PAC"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAR"),
-          value: ["PAR"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAM"),
-          value: ["PAM"]
-        },
+        { text: t("joblines.fields.part_types.PAN"), value: ["PAN"] },
+        { text: t("joblines.fields.part_types.PAP"), value: ["PAP"] },
+        { text: t("joblines.fields.part_types.PAL"), value: ["PAL"] },
+        { text: t("joblines.fields.part_types.PAA"), value: ["PAA"] },
+        { text: t("joblines.fields.part_types.PAG"), value: ["PAG"] },
+        { text: t("joblines.fields.part_types.PAS"), value: ["PAS"] },
+        { text: t("joblines.fields.part_types.PASL"), value: ["PASL"] },
+        { text: t("joblines.fields.part_types.PAC"), value: ["PAC"] },
+        { text: t("joblines.fields.part_types.PAR"), value: ["PAR"] },
+        { text: t("joblines.fields.part_types.PAM"), value: ["PAM"] },
         ...(isPartsEntry
           ? [
               {
@@ -220,7 +280,6 @@ export function JobLinesComponent({
             ]
           : [])
       ],
-
       onFilter: (value, record) => value.includes(record.part_type),
       render: (text, record) => (record.part_type ? t(`joblines.fields.part_types.${record.part_type}`) : null)
     },
@@ -246,7 +305,6 @@ export function JobLinesComponent({
             title: t("joblines.fields.mod_lbr_ty"),
             dataIndex: "mod_lbr_ty",
             key: "mod_lbr_ty",
-
             sorter: (a, b) => alphaSort(a.mod_lbr_ty, b.mod_lbr_ty),
             sortOrder: state.sortedInfo.columnKey === "mod_lbr_ty" && state.sortedInfo.order,
             render: (text, record) => (record.mod_lbr_ty ? t(`joblines.fields.lbr_types.${record.mod_lbr_ty}`) : null)
@@ -255,7 +313,6 @@ export function JobLinesComponent({
             title: t("joblines.fields.mod_lb_hrs"),
             dataIndex: "mod_lb_hrs",
             key: "mod_lb_hrs",
-
             sorter: (a, b) => a.mod_lb_hrs - b.mod_lb_hrs,
             sortOrder: state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order
           },
@@ -310,18 +367,12 @@ export function JobLinesComponent({
       sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       filteredValue: state.filteredInfo.status || null,
-
       filters:
         (jobLines &&
           jobLines
             .map((l) => l.status)
             .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || t("dashboard.errors.status"),
-                value: [s]
-              };
-            })) ||
+            .map((s) => ({ text: s || t("dashboard.errors.status"), value: [s] }))) ||
         [],
       onFilter: (value, record) => value.includes(record.status),
       render: (text, record) => <JobLineStatusPopup jobline={record} disabled={jobRO} />
@@ -376,9 +427,7 @@ export function JobLinesComponent({
                           });
                         }
                       });
-                      await axios.post("/job/totalsssu", {
-                        id: job.id
-                      });
+                      await axios.post("/job/totalsssu", { id: job.id });
                       if (refetch) refetch();
                     }}
                   >
@@ -448,6 +497,36 @@ export function JobLinesComponent({
   return (
     <div>
       <PartsOrderModalContainer />
+
+      <Modal
+        open={bulkLocationOpen}
+        title={t("joblines.actions.updatelocation")}
+        onCancel={closeBulkLocationModal}
+        onOk={saveBulkLocation}
+        okButtonProps={{
+          disabled: jobRO || technician || selectedLineIds.length === 0,
+          loading: bulkLocationSaving
+        }}
+        destroyOnHidden
+      >
+        <Space direction="vertical" style={{ width: "100%" }}>
+          <Typography.Text type="secondary">
+            {t("general.labels.selected")}: {selectedLineIds.length}
+          </Typography.Text>
+
+          <Select
+            allowClear
+            placeholder={t("joblines.fields.location")}
+            value={bulkLocation}
+            style={{ width: "100%" }}
+            popupMatchSelectWidth={false}
+            onChange={(val) => setBulkLocation(val ?? null)}
+            options={(bodyshop?.md_parts_locations || []).map((loc) => ({ label: loc, value: loc }))}
+          />
+          <Typography.Text type="secondary">{t("joblines.labels.bulk_location_help")}</Typography.Text>
+        </Space>
+      </Modal>
+
       {!technician && (
         <PartsOrderDrawer
           job={job}
@@ -457,6 +536,7 @@ export function JobLinesComponent({
           setTaskUpsertContext={setTaskUpsertContext}
         />
       )}
+
       <PageHeader
         title={t("jobs.labels.estimatelines")}
         extra={
@@ -465,6 +545,16 @@ export function JobLinesComponent({
               <SyncOutlined />
             </Button>
 
+            {/* Bulk Update Location */}
+            <Button
+              id="job-lines-bulk-update-location-button"
+              disabled={jobRO || technician || selectedLineIds.length === 0}
+              onClick={openBulkLocationModal}
+            >
+              {t("joblines.actions.updatelocation")}
+              {selectedLineIds.length > 0 && ` (${selectedLineIds.length})`}
+            </Button>
+
             {job.special_coverage_policy && (
               <Tag color="tomato">
                 <Space>
@@ -473,6 +563,7 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
+
             {!isPartsEntry && (
               <JobLineDispatchButton
                 selectedLines={selectedLines}
@@ -481,9 +572,11 @@ export function JobLinesComponent({
                 disabled={technician}
               />
             )}
+
             {Enhanced_Payroll.treatment === "on" && (
               <JobLineBulkAssignComponent selectedLines={selectedLines} setSelectedLines={setSelectedLines} job={job} />
             )}
+
             {!isPartsEntry && (
               <Button
                 disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -499,27 +592,20 @@ export function JobLinesComponent({
                         isinhouse: true,
                         date: dayjs(),
                         total: 0,
-                        billlines: selectedLines.map((p) => {
-                          return {
-                            joblineid: p.id,
-                            actual_price: p.act_price,
-                            actual_cost: 0, //p.act_price,
-                            line_desc: p.line_desc,
-                            line_remarks: p.line_remarks,
-                            part_type: p.part_type,
-                            quantity: p.quantity || 1,
-                            applicable_taxes: {
-                              local: false,
-                              state: false,
-                              federal: false
-                            }
-                          };
-                        })
+                        billlines: selectedLines.map((p) => ({
+                          joblineid: p.id,
+                          actual_price: p.act_price,
+                          actual_cost: 0,
+                          line_desc: p.line_desc,
+                          line_remarks: p.line_remarks,
+                          part_type: p.part_type,
+                          quantity: p.quantity || 1,
+                          applicable_taxes: { local: false, state: false, federal: false }
+                        }))
                       }
                     }
                   });
 
-                  //Clear out the selected lines. IO-785
                   setSelectedLines([]);
                 }}
               >
@@ -528,6 +614,7 @@ export function JobLinesComponent({
                 {selectedLines.length > 0 && ` (${selectedLines.length})`}
               </Button>
             )}
+
             <Button
               id="job-lines-order-parts-button"
               disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -544,13 +631,13 @@ export function JobLinesComponent({
                   }
                 });
 
-                //Clear out the selected lines. IO-785
                 setSelectedLines([]);
               }}
             >
               {t("parts.actions.order")}
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
+
             {!isPartsEntry && (
               <Button
                 id="job-lines-filter-parts-only-button"
@@ -567,9 +654,11 @@ export function JobLinesComponent({
                 <FilterFilled /> {t("jobs.actions.filterpartsonly")}
               </Button>
             )}
+
             <Dropdown menu={markMenu} trigger={["click"]}>
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
+
             {!isPartsEntry && (
               <Button
                 disabled={jobRO || technician}
@@ -583,9 +672,12 @@ export function JobLinesComponent({
                 {t("joblines.actions.new")}
               </Button>
             )}
+
             {!isPartsEntry &&
               InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} disabled={technician} /> })}
+
             <JobCreateIOU job={job} selectedJobLines={selectedLines} />
+
             <Input.Search
               placeholder={t("general.labels.search")}
               onChange={(e) => {
@@ -596,6 +688,7 @@ export function JobLinesComponent({
           </Space>
         }
       />
+
       <Table
         columns={columns}
         rowKey="id"
@@ -603,9 +696,7 @@ export function JobLinesComponent({
         pagination={false}
         dataSource={jobLines}
         onChange={handleTableChange}
-        scroll={{
-          x: true
-        }}
+        scroll={{ x: true }}
         expandable={{
           expandedRowRender: (record) =>
             isPartsEntry ? (
@@ -614,7 +705,6 @@ export function JobLinesComponent({
               <JobLinesExpander jobline={record} jobid={job.id} />
             ),
           rowExpandable: () => true,
-          //expandRowByClick: true,
           expandIcon: ({ expanded, onExpand, record }) =>
             expanded ? (
               <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
@@ -627,17 +717,15 @@ export function JobLinesComponent({
               />
             )
         }}
-        onRow={(record) => {
-          return {
-            onDoubleClick: () => {
-              logImEXEvent("joblines_double_click_select", {});
-              const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
-              notMatchingLines.length !== selectedLines.length
-                ? setSelectedLines(notMatchingLines)
-                : setSelectedLines([...selectedLines, record]);
-            } // double click row
-          };
-        }}
+        onRow={(record) => ({
+          onDoubleClick: () => {
+            logImEXEvent("joblines_double_click_select", {});
+            const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
+            notMatchingLines.length !== selectedLines.length
+              ? setSelectedLines(notMatchingLines)
+              : setSelectedLines([...selectedLines, record]);
+          }
+        })}
         rowSelection={{
           selectedRowKeys: selectedLines.map((item) => item && item.id),
           onSelectAll: (selected, selectedRows) => {

client/src/components/job-lifecycle/job-lifecycle.component.jsx

@@ -222,17 +222,37 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
                 </div>
               </BlurWrapperComponent>
               <Card type="inner" title={t("job_lifecycle.content.legend_title")} style={{ marginTop: "10px" }}>
-                <div>
+                <div
+                  style={{
+                    display: "flex",
+                    flexWrap: "wrap",
+                    gap: 8
+                  }}
+                >
                   {lifecycleData.durations.summations.map((key) => (
-                    <Tag key={key.status} color={key.color} style={{ width: "13vh", padding: "4px", margin: "4px" }}>
+                    <Tag
+                      key={key.status}
+                      color={key.color}
+                      style={{
+                        // let the tag grow with its content
+                        width: "auto",
+                        padding: 0,
+                        margin: 0,
+                        display: "inline-flex",
+                        alignItems: "center",
+                        justifyContent: "center",
+                        boxSizing: "border-box"
+                      }}
+                    >
                       <div
                         aria-label={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         title={`${key.status} | ${key.roundedPercentage} | ${key.humanReadable}`}
                         style={{
                           backgroundColor: "var(--tag-wrapper-bg)",
                           color: "var(--tag-wrapper-text)",
-                          padding: "4px",
-                          textAlign: "center"
+                          padding: "4px 8px",
+                          textAlign: "center",
+                          whiteSpace: "nowrap" // single line; tag gets wider instead of text escaping
                         }}
                       >
                         {key.status} (

client/src/components/job-line-location-popup/job-line-location-popup.component.jsx

@@ -1,25 +1,23 @@
 import { useMutation } from "@apollo/client";
-import { Select, Space } from "antd";
-import { useEffect, useState } from "react";
+import { Select, Space, Tag } from "antd";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = () => ({});
+
+const CLEAR_VALUE = "__CLEAR_LOCATION__";
 
 export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
   const [editing, setEditing] = useState(false);
-  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
   const [location, setLocation] = useState(jobline.location);
   const [updateJob] = useMutation(UPDATE_JOB_LINE);
   const { t } = useTranslation();
@@ -29,55 +27,78 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
     if (editing) setLocation(jobline.location);
   }, [editing, jobline.location]);
 
-  const handleChange = (e) => {
-    setLocation(e);
-  };
+  const options = useMemo(() => {
+    const locs = bodyshop?.md_parts_locations || [];
+    return [
+      { label: t("general.labels.none", "No location"), value: CLEAR_VALUE },
+      ...locs.map((loc) => ({ label: loc, value: loc }))
+    ];
+  }, [bodyshop?.md_parts_locations, t]);
 
-  const handleSave = async () => {
-    setLoading(true);
-    const result = await updateJob({
-      variables: { lineId: jobline.id, line: { location: location || "" } }
-    });
+  const saveLocation = async (nextLocation) => {
+    setSaving(true);
 
-    if (!result.errors) {
-      notification["success"]({ message: t("joblines.successes.saved") });
-    } else {
-      notification["error"]({
-        message: t("joblines.errors.saving", {
-          error: JSON.stringify(result.errors)
-        })
+    try {
+      const result = await updateJob({
+        variables: { lineId: jobline.id, line: { location: nextLocation || "" } }
       });
+
+      if (!result.errors) {
+        notification["success"]({ message: t("joblines.successes.saved") });
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.saving", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      }
+    } catch (error) {
+      notification["error"]({
+        message: t("joblines.errors.saving", { error: error?.message || String(error) })
+      });
+    } finally {
+      setSaving(false);
+      setEditing(false);
     }
-    setLoading(false);
-    setEditing(false);
   };
 
-  if (editing)
+  const handleChange = async (value) => {
+    const next = value === CLEAR_VALUE ? null : value;
+    setLocation(next);
+    await saveLocation(next);
+  };
+
+  if (editing) {
     return (
-      <div>
-        <LoadingSpinner loading={loading}>
-          <Select
-            autoFocus
-            allowClear
-            popupMatchSelectWidth={100}
-            value={location}
-            onClear={() => setLocation(null)}
-            onSelect={handleChange}
-            onBlur={handleSave}
-          >
-            {bodyshop.md_parts_locations.map((loc, idx) => (
-              <Select.Option key={idx} value={loc}>
-                {loc}
-              </Select.Option>
-            ))}
-          </Select>
-        </LoadingSpinner>
+      <div style={{ width: "100%", display: "flex", alignItems: "center" }}>
+        <Select
+          autoFocus
+          size="small"
+          value={location ?? undefined}
+          loading={saving}
+          disabled={saving}
+          style={{ flex: 1, minWidth: 0 }}
+          popupMatchSelectWidth={false}
+          getPopupContainer={(triggerNode) => triggerNode.parentNode}
+          onChange={handleChange}
+          onBlur={() => !saving && setEditing(false)}
+          options={options}
+        />
       </div>
     );
+  }
+
   return (
-    <div style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }} onClick={() => !disabled && setEditing(true)}>
+    <div
+      style={{ width: "100%", minHeight: "2rem", cursor: disabled ? "default" : "pointer" }}
+      onClick={() => !disabled && setEditing(true)}
+    >
       <Space wrap>
-        {jobline.location}
+        {jobline.location ? (
+          <Tag>{jobline.location}</Tag>
+        ) : (
+          <span style={{ opacity: 0.6 }}>{t("general.labels.none")}</span>
+        )}
         {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
       </Space>
     </div>

client/src/components/jobs-close-auto-allocate/jobs-close-auto-allocate.component.jsx

@@ -6,7 +6,6 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -15,8 +14,6 @@ const mapStateToProps = createStructuredSelector({
 export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
   const { t } = useTranslation();
 
-  const hasDmsKey = bodyshopHasDmsKey(bodyshop);
-
   const handleAllocate = (defaults) => {
     form.setFieldsValue({
       joblines: joblines.map((jl) => {
@@ -67,20 +64,21 @@ export function JobsCloseAutoAllocate({ bodyshop, joblines, form, disabled }) {
     handleAllocate(bodyshop.md_responsibility_centers.dms_defaults.find((x) => x.name === key));
   };
 
-  const menu = hasDmsKey
-    ? {
-        items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
-          key: mapping.name,
-          label: mapping.name,
-          disabled: disabled
-        })),
-        onClick: handleMenuClick
-      }
-    : {
-        items: []
-      };
+  const menu =
+    bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+      ? {
+          items: bodyshop.md_responsibility_centers.dms_defaults.map((mapping) => ({
+            key: mapping.name,
+            label: mapping.name,
+            disabled: disabled
+          })),
+          onClick: handleMenuClick
+        }
+      : {
+          items: []
+        };
 
-  return hasDmsKey ? (
+  return bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? (
     <Dropdown menu={menu}>
       <Button disabled={disabled}>{t("jobs.actions.dmsautoallocate")}</Button>
     </Dropdown>

client/src/components/jobs-close-export-button/jobs-close-export-button.component.jsx

@@ -10,7 +10,6 @@ import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { INSERT_EXPORT_LOG } from "../../graphql/accounting.queries";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import client from "../../utils/GraphQLClient";
@@ -46,7 +45,7 @@ export function JobsCloseExportButton({ bodyshop, currentUser, jobId, disabled,
 
   const handleQbxml = async () => {
     //Check if it's a CDK setup.
-    if (bodyshopHasDmsKey(bodyshop)) {
+    if (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) {
       history(`/manage/dms?jobId=${jobId}`);
       return;
     }

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx

@@ -609,7 +609,7 @@ export function JobsDetailHeaderActions({
             <FormDateTimePickerComponent
               onBlur={() => {
                 const start = form.getFieldValue("start");
-                form.setFieldsValue({ end: start.add(30, "minutes") });
+                form.setFieldsValue({ end: start?.add(30, "minutes") });
               }}
             />
           </Form.Item>

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -29,7 +29,6 @@ import ProductionListColumnProductionNote from "../production-list-columns/produ
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
 import getPartsBasePath from "../../utils/getPartsBasePath.js";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -310,7 +309,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
               </DataLabel>
               <DataLabel key="4" label={t("vehicles.fields.v_vin")}>
                 <VehicleVinDisplay>{`${job.v_vin || t("general.labels.na")}`}</VehicleVinDisplay>
-                {bodyshopHasDmsKey(bodyshop) ? (
+                {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (
                   job.v_vin?.length !== 17 ? (
                     <WarningFilled style={{ color: "tomato", marginLeft: ".3rem" }} />
                   ) : null

client/src/components/jobs-documents-imgproxy-gallery/jobs-document-imgproxy-gallery.download.component.jsx

@@ -35,16 +35,14 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
     ...galleryImages.other.filter((image) => image.isSelected)
   ];
 
-  function downloadProgress(progressEvent) {
-    setDownload((currentDownloadState) => {
-      return {
-        downloaded: progressEvent.loaded || 0,
-        speed: (progressEvent.loaded || 0) - ((currentDownloadState && currentDownloadState.downloaded) || 0)
-      };
-    });
-  }
+  const downloadProgress = ({ loaded }) => {
+    setDownload((currentDownloadState) => ({
+      downloaded: loaded ?? 0,
+      speed: (loaded ?? 0) - (currentDownloadState?.downloaded ?? 0)
+    }));
+  };
 
-  function standardMediaDownload(bufferData) {
+  const standardMediaDownload = (bufferData) => {
     try {
       const a = document.createElement("a");
       const url = window.URL.createObjectURL(new Blob([bufferData]));
@@ -55,29 +53,26 @@ export function JobsDocumentsImgproxyDownloadButton({ galleryImages, identifier,
       setLoading(false);
       setDownload(null);
     }
-  }
+  };
 
   const handleDownload = async () => {
     logImEXEvent("jobs_documents_download");
     setLoading(true);
     try {
-      const response = await axios({
+      const { data } = await axios({
         url: "/media/imgproxy/download",
         method: "POST",
         responseType: "blob",
         data: { jobId, documentids: imagesToDownload.map((_) => _.id) },
         onDownloadProgress: downloadProgress
       });
-
-      setLoading(false);
-      setDownload(null);
-
       // Use the response data (Blob) to trigger download
-      standardMediaDownload(response.data);
+      standardMediaDownload(data);
     } catch {
+      // handle error (optional)
+    } finally {
       setLoading(false);
       setDownload(null);
-      // handle error (optional)
     }
   };
 

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -76,14 +76,14 @@ function JobsDocumentsImgproxyComponent({
               <SyncOutlined />
             </Button>
             <JobsDocumentsGallerySelectAllComponent galleryImages={galleryImages} setGalleryImages={setGalleryImages} />
+            {!billId && (
+              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
+            )}
             <JobsDocumentsDownloadButton galleryImages={galleryImages} identifier={downloadIdentifier} jobId={jobId} />
             <JobsDocumentsDeleteButton
               galleryImages={galleryImages}
               deletionCallback={billsCallback || fetchThumbnails || refetch}
             />
-            {!billId && (
-              <JobsDocumentsGalleryReassign galleryImages={galleryImages} callback={fetchThumbnails || refetch} />
-            )}
           </Space>
         </Col>
         {!hasMediaAccess && (

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.delete.component.jsx

@@ -67,7 +67,7 @@ export default function JobsDocumentsImgproxyDeleteButton({ galleryImages, delet
       okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button disabled={imagesToDelete.length < 1} loading={loading}>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
         {t("documents.actions.delete")}
       </Button>
     </Popconfirm>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx

@@ -107,8 +107,8 @@ export function JobsDocumentsLocalGallery({
             <a href={CreateExplorerLinkForJob({ jobid: job.id })}>
               <Button>{t("documents.labels.openinexplorer")}</Button>
             </a>
-            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsDocumentsLocalGallerySelectAllComponent jobid={job.id} />
+            <JobsDocumentsLocalGalleryReassign jobid={job.id} />
             <JobsLocalGalleryDownloadButton job={job} />
             <JobsDocumentsLocalDeleteButton jobid={job.id} />
           </Space>

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.delete.component.jsx

@@ -28,6 +28,8 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   const [loading, setLoading] = useState(false);
 
+  const imagesToDelete = (allMedia?.[jobid] || []).filter((i) => i.isSelected);
+
   const handleDelete = async () => {
     logImEXEvent("job_documents_delete");
     setLoading(true);
@@ -36,7 +38,7 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
       `${bodyshop.localmediaserverhttp}/jobs/delete`,
       {
         jobid: jobid,
-        files: (allMedia?.[jobid] || []).filter((i) => i.isSelected).map((i) => i.filename)
+        files: imagesToDelete.map((i) => i.filename)
       },
       { headers: { ims_token: bodyshop.localmediatoken } }
     );
@@ -60,14 +62,17 @@ export function JobsDocumentsLocalDeleteButton({ bodyshop, getJobMedia, allMedia
 
   return (
     <Popconfirm
+      disabled={imagesToDelete.length < 1}
       icon={<QuestionCircleOutlined style={{ color: "red" }} />}
       onConfirm={handleDelete}
       title={t("documents.labels.confirmdelete")}
       okText={t("general.actions.delete")}
-      okButtonProps={{ type: "danger" }}
+      okButtonProps={{ danger: true }}
       cancelText={t("general.actions.cancel")}
     >
-      <Button loading={loading}>{t("documents.actions.delete")}</Button>
+      <Button danger disabled={imagesToDelete.length < 1} loading={loading}>
+        {t("documents.actions.delete")}
+      </Button>
     </Popconfirm>
   );
 }

client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.download.jsx

@@ -1,8 +1,8 @@
-import { Button } from "antd";
+import { Button, Space } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import cleanAxios from "../../utils/CleanAxios";
-
+import formatBytes from "../../utils/formatbytes";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectAllMedia } from "../../redux/media/media.selectors";
@@ -19,45 +19,63 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobsLocalGalleryDown
 
 export function JobsLocalGalleryDownloadButton({ bodyshop, allMedia, job }) {
   const { t } = useTranslation();
-  const [download, setDownload] = useState(null);
+  const [loading, setLoading] = useState(false);
+  const [download, setDownload] = useState(false);
 
-  function downloadProgress(progressEvent) {
-    setDownload((currentDownloadState) => {
-      return {
-        downloaded: progressEvent.loaded || 0,
-        speed: (progressEvent.loaded || 0) - (currentDownloadState?.downloaded || 0)
-      };
-    });
-  }
+  const imagesToDownload = (allMedia?.[job.id] || []).filter((i) => i.isSelected);
+
+  const downloadProgress = ({ loaded }) => {
+    setDownload((currentDownloadState) => ({
+      downloaded: loaded || 0,
+      speed: (loaded || 0) - (currentDownloadState?.downloaded || 0)
+    }));
+  };
+
+  const standardMediaDownload = (bufferData, filename) => {
+    try {
+      const a = document.createElement("a");
+      const url = window.URL.createObjectURL(new Blob([bufferData]));
+      a.href = url;
+      a.download = `${filename}.zip`;
+      a.click();
+    } catch {
+      setLoading(false);
+      setDownload(null);
+    }
+  };
 
   const handleDownload = async () => {
-    const theDownloadedZip = await cleanAxios.post(
-      `${bodyshop.localmediaserverhttp}/jobs/download`,
-      {
-        jobid: job.id,
-        files: (allMedia?.[job.id] || []).filter((i) => i.isSelected).map((i) => i.filename)
-      },
-      {
-        headers: { ims_token: bodyshop.localmediatoken },
-        responseType: "arraybuffer",
-        onDownloadProgress: downloadProgress
-      }
-    );
-    setDownload(null);
-    standardMediaDownload(theDownloadedZip.data, job.ro_number);
+    const { localmediaserverhttp, localmediatoken } = bodyshop;
+    const { id, ro_number } = job;
+    setLoading(true);
+    try {
+      const response = await cleanAxios.post(
+        `${localmediaserverhttp}/jobs/download`,
+        {
+          jobid: id,
+          files: imagesToDownload.map((i) => i.filename)
+        },
+        {
+          headers: { ims_token: localmediatoken },
+          responseType: "arraybuffer",
+          onDownloadProgress: downloadProgress
+        }
+      );
+      standardMediaDownload(response.data, ro_number);
+    } catch {
+      // handle error (optional)
+    } finally {
+      setLoading(false);
+      setDownload(null);
+    }
   };
 
   return (
-    <Button loading={!!download} onClick={handleDownload}>
-      {t("documents.actions.download")}
+    <Button disabled={imagesToDownload < 1} loading={download || loading} onClick={handleDownload}>
+      <Space>
+        <span>{t("documents.actions.download")}</span>
+        {download && <span>{`(${formatBytes(download.downloaded)} @ ${formatBytes(download.speed)} / second)`}</span>}
+      </Space>
     </Button>
   );
 }
-
-function standardMediaDownload(bufferData, filename) {
-  const a = document.createElement("a");
-  const url = window.URL.createObjectURL(new Blob([bufferData]));
-  a.href = url;
-  a.download = `${filename}.zip`;
-  a.click();
-}

client/src/components/labor-allocations-table/labor-allocations-table.utility.js

@@ -1,5 +1,4 @@
 import i18next from "i18next";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 export const CalculateAllocationsTotals = (bodyshop, joblines, timetickets, adjustments = []) => {
   const responsibilitycenters = bodyshop.md_responsibility_centers;
@@ -15,9 +14,10 @@ export const CalculateAllocationsTotals = (bodyshop, joblines, timetickets, adju
   const r = allCodes.reduce((acc, value) => {
     const r = {
       opcode: value,
-      cost_center: bodyshopHasDmsKey(bodyshop)
-        ? i18next.t(`joblines.fields.lbr_types.${value && value.toUpperCase()}`)
-        : responsibilitycenters.defaults.costs[value],
+      cost_center:
+        bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+          ? i18next.t(`joblines.fields.lbr_types.${value && value.toUpperCase()}`)
+          : responsibilitycenters.defaults.costs[value],
       mod_lbr_ty: value,
       total: joblines.reduce((acc2, val2) => {
         return val2.mod_lbr_ty === value ? acc2 + val2.mod_lb_hrs : acc2;

client/src/components/partner-ping/partner-ping.component.jsx

@@ -44,7 +44,6 @@ export async function checkPartnerStatus(bodyshop) {
     //     bodyshop &&
     //     (bodyshop.cdk_dealerid ||
     //       bodyshop.pbs_serialnumber ||
-    //       bodyshop.rr_dealerid ||
     //       bodyshop.accountingconfig.qbo)
     //   )
     // ) {

client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx

@@ -28,7 +28,6 @@ import PartsOrderDeleteLine from "../parts-order-delete-line/parts-order-delete-
 import PartsOrderLineBackorderButton from "../parts-order-line-backorder-button/parts-order-line-backorder-button.component";
 import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-modal.container";
 import PrintWrapper from "../print-wrapper/print-wrapper.component";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -197,7 +196,7 @@ export function PartsOrderListTableDrawerComponent({
                     quantity: pol.quantity,
                     actual_price: pol.act_price,
                     cost_center: pol.jobline?.part_type
-                      ? bodyshopHasDmsKey(bodyshop)
+                      ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                         ? pol.jobline.part_type !== "PAE"
                           ? pol.jobline.part_type
                           : null

client/src/components/parts-order-list-table/parts-order-list-table.component.jsx

@@ -20,7 +20,6 @@ import PartsReceiveModalContainer from "../parts-receive-modal/parts-receive-mod
 import PrintWrapper from "../print-wrapper/print-wrapper.component";
 import PartsOrderDrawer from "./parts-order-list-table-drawer.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -70,7 +69,6 @@ export function PartsOrderListTableComponent({
 
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
-
   const recordActions = (record, showView = false) => (
     <Space direction="horizontal" wrap>
       <ShareToTeamsButton
@@ -174,7 +172,7 @@ export function PartsOrderListTableComponent({
                       actual_price: pol.act_price,
 
                       cost_center: pol.jobline?.part_type
-                        ? bodyshopHasDmsKey(bodyshop)
+                        ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
                           ? pol.jobline.part_type !== "PAE"
                             ? pol.jobline.part_type
                             : null

client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx

@@ -144,7 +144,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
       <Spin spinning={loading}>
         {record[type] ? (
           <div>
-            <span>{`${theEmployee.first_name || ""} ${theEmployee.last_name || ""}`}</span>
+            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
             <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
           </div>
         ) : (

client/src/components/report-center-modal/report-center-modal.component.jsx

@@ -143,7 +143,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
 
   //TODO: Find a way to filter out / blur on demand.
   return (
-    <div>
+    <div className="report-center-modal">
       <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
         <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
         <Form.Item name="defaultSorters" hidden />
@@ -163,13 +163,14 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
               {Object.keys(grouped)
                 //.filter((key) => !groupExcludeKeyFilter.includes(key))
                 .map((key) => (
-                  <Col md={8} sm={12} key={key}>
+                  <Col xs={24} sm={12} md={Object.keys(grouped).length === 1 ? 24 : 8} key={key}>
                     <Card.Grid
                       style={{
                         width: "100%",
                         height: "100%",
                         maxHeight: "33vh",
-                        overflowY: "scroll"
+                        overflowY: "scroll",
+                        minWidth: "200px"
                       }}
                     >
                       <Typography.Title level={4}>{t(`reportcenter.labels.groups.${key}`)}</Typography.Title>
@@ -177,7 +178,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                         <BlurWrapperComponent
                           featureName={groupExcludeKeyFilter.find((g) => g.key === key).featureName}
                         >
-                          <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                          <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                             {grouped[key].map((item) => (
                               <li key={item.key}>
                                 <Radio key={item.key} value={item.key}>
@@ -188,7 +189,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                           </ul>
                         </BlurWrapperComponent>
                       ) : (
-                        <ul style={{ listStyleType: "none", columns: "2 auto" }}>
+                        <ul style={{ listStyleType: "none", columns: grouped[key].length > 4 ? "2 auto" : "1", padding: 0, margin: 0 }}>
                           {grouped[key].map((item) =>
                             item.featureNameRestricted ? (
                               <li key={item.key}>

client/src/components/report-center-modal/report-center-modal.styles.scss

@@ -11,3 +11,38 @@
     }
   }
 }
+
+// Report center modal fixes for column layout
+.report-center-modal {
+  .ant-form-item .ant-radio-group {
+    width: 100%;
+    
+    .ant-card-grid {
+      padding: 16px;
+      box-sizing: border-box;
+      
+      ul {
+        width: 100%;
+        
+        li {
+          margin-bottom: 8px;
+          break-inside: avoid;
+          page-break-inside: avoid;
+          
+          .ant-radio-wrapper {
+            display: flex;
+            align-items: flex-start;
+            width: 100%;
+            
+            span:not(.ant-radio) {
+              word-break: break-word;
+              overflow-wrap: break-word;
+              hyphens: auto;
+              flex: 1;
+            }
+          }
+        }
+      }
+    }
+  }
+}

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -331,10 +331,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                             {t("timetickets.labels.shift")}
                           </Select.Option>
 
-                          {bodyshop.cdk_dealerid ||
-                          bodyshop.pbs_serialnumber ||
-                          bodyshop.rr_dealerid ||
-                          Enhanced_Payroll.treatment === "on"
+                          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                             ? CiecaSelect(false, true)
                             : bodyshop.md_responsibility_centers.costs.map((c) => (
                                 <Select.Option key={c.name} value={c.name}>

client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx

@@ -16,6 +16,7 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
       <Text type="secondary">{t("bodyshop.labels.notifications.followers")}</Text>
       {employeeOptions.length > 0 ? (
         <Form.Item
+          normalize={(value) => (value || []).filter((id) => typeof id === "string" && id.trim() !== "")}
           name="notification_followers"
           rules={[
             {
@@ -42,11 +43,6 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
             options={employeeOptions}
             placeholder={t("bodyshop.fields.notifications.placeholder")}
             showEmail={true}
-            onChange={(value) => {
-              // Filter out null or invalid values before passing to Form
-              const cleanedValue = value?.filter((id) => id != null && typeof id === "string" && id.trim() !== "");
-              return cleanedValue;
-            }}
           />
         </Form.Item>
       ) : (

client/src/components/shop-info/shop-info.responsibilitycenters.taxes.component.jsx

@@ -5,7 +5,6 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -2127,7 +2126,7 @@ function TaxFormItems({ typeNum, typeNumIterator, rootElements, bodyshop }) {
         >
           <Input />
         </Form.Item>
-        {bodyshopHasDmsKey(bodyshop) && (
+        {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
           <Form.Item
             label={t("bodyshop.fields.dms.dms_acctnumber")}
             rules={[

client/src/components/tech-header/tech-header.component.jsx

@@ -16,7 +16,7 @@ const mapDispatchToProps = () => ({
 export function TechHeader({ technician }) {
   const { t } = useTranslation();
   return (
-    <Header style={{ textAlign: "center" }}>
+    <Header style={{ textAlign: "center", height: "auto", overflow: "visible" }}>
       <Typography.Title style={{ color: "#fff" }}>
         {technician
           ? t("tech.labels.loggedin", {

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx

@@ -63,10 +63,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
                 <Select.Option key={item.cost_center} value={item.cost_center}>
                   {item.cost_center === "timetickets.labels.shift"
                     ? t(item.cost_center)
-                    : bodyshop.cdk_dealerid ||
-                        bodyshop.pbs_serialnumber ||
-                        bodyshop.rr_dealerid ||
-                        Enhanced_Payroll.treatment === "on"
+                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                       ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
                       : item.cost_center}
                 </Select.Option>

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -75,10 +75,7 @@ export function TechClockInContainer({ setTimeTicketContext, technician, bodysho
             jobid: values.jobid,
             cost_center: values.cost_center,
             ciecacode:
-              bodyshop.cdk_dealerid ||
-              bodyshop.pbs_serialnumber ||
-              bodyshop.rr_dealerid ||
-              Enhanced_Payroll.treatment === "on"
+              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                 ? values.cost_center
                 : Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
                     return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Card, Col, Form, InputNumber, Popover, Row, Select } from "antd";
+import { Button, Card, Form, InputNumber, Popover, Select, Space } from "antd";
 import axios from "axios";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -16,7 +16,6 @@ import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-o
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -54,9 +53,7 @@ export function TechClockOffButton({
     nextFetchPolicy: "network-only"
   });
   const { t } = useTranslation();
-
-  const emps = bodyshop.employees.filter((e) => e.id === technician?.id)[0];
-  const hasDmsKey = bodyshopHasDmsKey(bodyshop);
+  const emps = bodyshop.employees.filter((e) => e.id === (technician && technician.id))[0];
 
   const handleFinish = async (values) => {
     logImEXEvent("tech_clock_out_job");
@@ -72,10 +69,7 @@ export function TechClockOffButton({
           rate: emps && emps.rates.filter((r) => r.cost_center === values.cost_center)[0]?.rate,
           flat_rate: emps && emps.flat_rate,
           ciecacode:
-            bodyshop.cdk_dealerid ||
-            bodyshop.pbs_serialnumber ||
-            bodyshop.rr_dealerid ||
-            Enhanced_Payroll.treatment === "on"
+            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
               ? values.cost_center
               : Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find((key) => {
                   return bodyshop.md_responsibility_centers.defaults.costs[key] === values.cost_center;
@@ -130,102 +124,12 @@ export function TechClockOffButton({
             cost_center: isShiftTicket ? "timetickets.labels.shift" : technician ? technician.cost_center : null
           }}
         >
-          <Row gutter={[16, 16]}>
-            <Col span={!isShiftTicket ? 8 : 24}>
-              {!isShiftTicket ? (
-                <div>
-                  <Form.Item
-                    label={t("timetickets.fields.actualhrs")}
-                    name="actualhrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      }
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                  <Form.Item
-                    label={t("timetickets.fields.productivehrs")}
-                    name="productivehrs"
-                    rules={[
-                      {
-                        required: true
-                        //message: t("general.validation.required"),
-                      },
-                      ({ getFieldValue }) => ({
-                        validator(rule, value) {
-                          if (!bodyshop.tt_enforce_hours_for_tech_console) {
-                            return Promise.resolve();
-                          }
-                          if (!value || getFieldValue("cost_center") === null || !lineTicketData)
-                            return Promise.resolve();
-
-                          //Check the cost center,
-                          const totals = CalculateAllocationsTotals(
-                            bodyshop,
-                            lineTicketData.joblines,
-                            lineTicketData.timetickets,
-                            lineTicketData.jobs_by_pk.lbr_adjustments
-                          );
-
-                          const fieldTypeToCheck = hasDmsKey ? "mod_lbr_ty" : "cost_center";
-
-                          const costCenterDiff =
-                            Math.round(
-                              totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
-                                ?.difference * 10
-                            ) / 10;
-
-                          if (value > costCenterDiff)
-                            return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
-                          else {
-                            return Promise.resolve();
-                          }
-                        }
-                      })
-                    ]}
-                  >
-                    <InputNumber min={0} precision={1} />
-                  </Form.Item>
-                </div>
-              ) : null}
-              <Form.Item
-                name="cost_center"
-                label={t("timetickets.fields.cost_center")}
-                rules={[
-                  {
-                    required: true
-                    //message: t("general.validation.required"),
-                  }
-                ]}
-              >
-                <Select disabled={isShiftTicket}>
-                  {isShiftTicket ? (
-                    <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
-                  ) : (
-                    emps &&
-                    emps.rates.map((item) => (
-                      <Select.Option key={item.cost_center}>
-                        {item.cost_center === "timetickets.labels.shift"
-                          ? t(item.cost_center)
-                          : hasDmsKey
-                            ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
-                            : item.cost_center}
-                      </Select.Option>
-                    ))
-                  )}
-                </Select>
-              </Form.Item>
-
-              {isShiftTicket ? (
-                <div></div>
-              ) : (
+          <Space direction="vertical">
+            {!isShiftTicket ? (
+              <div>
                 <Form.Item
-                  name="status"
-                  label={t("jobs.fields.status")}
-                  initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                  label={t("timetickets.fields.actualhrs")}
+                  name="actualhrs"
                   rules={[
                     {
                       required: true
@@ -233,35 +137,117 @@ export function TechClockOffButton({
                     }
                   ]}
                 >
-                  <Select>
-                    {bodyshop.md_ro_statuses.production_statuses.map((item) => (
-                      <Select.Option key={item}></Select.Option>
-                    ))}
-                  </Select>
+                  <InputNumber min={0} precision={1} />
                 </Form.Item>
-              )}
-              <Button type="primary" htmlType="submit" loading={loading}>
-                {t("general.actions.save")}
-              </Button>
-              <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
-            </Col>
-            {!isShiftTicket && (
-              <Col span={16}>
-                <LaborAllocationContainer
-                  jobid={jobId || null}
-                  loading={queryLoading}
-                  lineTicketData={lineTicketData}
-                />
-              </Col>
+                <Form.Item
+                  label={t("timetickets.fields.productivehrs")}
+                  name="productivehrs"
+                  rules={[
+                    {
+                      required: true
+                      //message: t("general.validation.required"),
+                    },
+                    ({ getFieldValue }) => ({
+                      validator(rule, value) {
+                        if (!bodyshop.tt_enforce_hours_for_tech_console) {
+                          return Promise.resolve();
+                        }
+                        if (!value || getFieldValue("cost_center") === null || !lineTicketData)
+                          return Promise.resolve();
+                        //Check the cost center,
+                        const totals = CalculateAllocationsTotals(
+                          bodyshop,
+                          lineTicketData.joblines,
+                          lineTicketData.timetickets,
+                          lineTicketData.jobs_by_pk.lbr_adjustments
+                        );
+                        const fieldTypeToCheck =
+                          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
+                        const costCenterDiff =
+                          Math.round(
+                            totals.find((total) => total[fieldTypeToCheck] === getFieldValue("cost_center"))
+                              ?.difference * 10
+                          ) / 10;
+                        if (value > costCenterDiff)
+                          return Promise.reject(t("timetickets.validation.hoursenteredmorethanavailable"));
+                        else {
+                          return Promise.resolve();
+                        }
+                      }
+                    })
+                  ]}
+                >
+                  <InputNumber min={0} precision={1} />
+                </Form.Item>
+              </div>
+            ) : null}
+            <Form.Item
+              name="cost_center"
+              label={t("timetickets.fields.cost_center")}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select disabled={isShiftTicket}>
+                {isShiftTicket ? (
+                  <Select.Option value="timetickets.labels.shift">{t("timetickets.labels.shift")}</Select.Option>
+                ) : (
+                  emps &&
+                  emps.rates.map((item) => (
+                    <Select.Option key={item.cost_center}>
+                      {item.cost_center === "timetickets.labels.shift"
+                        ? t(item.cost_center)
+                        : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
+                          : item.cost_center}
+                    </Select.Option>
+                  ))
+                )}
+              </Select>
+            </Form.Item>
+            {isShiftTicket ? (
+              <div></div>
+            ) : (
+              <Form.Item
+                name="status"
+                label={t("jobs.fields.status")}
+                initialValue={lineTicketData && lineTicketData.jobs_by_pk.status}
+                rules={[
+                  {
+                    required: true
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_ro_statuses.production_statuses.map((item) => (
+                    <Select.Option key={item}></Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
             )}
-          </Row>
+            <Button type="primary" htmlType="submit" loading={loading}>
+              {t("general.actions.save")}
+            </Button>
+            <TechJobClockoutDelete completedCallback={completedCallback} timeTicketId={timeTicketId} />
+            {!isShiftTicket && (
+              <LaborAllocationContainer jobid={jobId || null} loading={queryLoading} lineTicketData={lineTicketData} />
+            )}
+          </Space>
         </Form>
       </div>
     </Card>
   );
 
   return (
-    <Popover content={overlay} trigger="click">
+    <Popover 
+      content={<div style={{ maxHeight: "75vh", overflowY: "auto" }}>{overlay}</div>} 
+      trigger="click"
+      getPopupContainer={() => document.querySelector('#time-ticket-modal')}
+    >
       <Button loading={loading} {...otherBtnProps}>
         {t("timetickets.actions.clockout")}
       </Button>

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -14,7 +14,6 @@ import {
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import LaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.component";
 import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
@@ -61,10 +60,7 @@ export function TimeTicketModalComponent({
             <Select.Option key={item.cost_center} value={item.cost_center}>
               {item.cost_center === "timetickets.labels.shift"
                 ? t(item.cost_center)
-                : bodyshop.cdk_dealerid ||
-                    bodyshop.pbs_serialnumber ||
-                    bodyshop.rr_dealerid ||
-                    Enhanced_Payroll.treatment === "on"
+                : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                   ? t(`joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`)
                   : item.cost_center}
             </Select.Option>
@@ -128,7 +124,7 @@ export function TimeTicketModalComponent({
             onSelect={(value) => {
               const emps = employeeAutoCompleteOptions && employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
 
-              form.setFieldsValue({ flat_rate: emps?.flat_rate });
+              form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
             }}
           />
         </Form.Item>
@@ -190,7 +186,8 @@ export function TimeTicketModalComponent({
                         lineTicketData.jobs_by_pk.lbr_adjustments
                       );
 
-                      const fieldTypeToCheck = bodyshopHasDmsKey(bodyshop) ? "mod_lbr_ty" : "cost_center";
+                      const fieldTypeToCheck =
+                        bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber ? "mod_lbr_ty" : "cost_center";
 
                       const costCenterDiff =
                         Math.round(
@@ -264,7 +261,7 @@ export function TimeTicketModalComponent({
                     if (!value) return Promise.resolve();
                     if (!clockon && value) return Promise.reject(t("timetickets.validation.clockoffwithoutclockon"));
                     // TODO - Verify this exists
-                    if (value?.isSameOrAfter && !value.isSameOrAfter(clockon))
+                    if (value && value.isSameOrAfter && !value.isSameOrAfter(clockon))
                       return Promise.reject(t("timetickets.validation.clockoffmustbeafterclockon"));
 
                     return Promise.resolve();

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -137,10 +137,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
     if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
       form.setFieldsValue({
         ciecacode:
-          bodyshop.cdk_dealerid ||
-          bodyshop.pbs_serialnumber ||
-          bodyshop.rr_dealerid ||
-          Enhanced_Payroll.treatment === "on"
+          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
             ? changedFields.cost_center
             : Object.keys(bodyshop.md_responsibility_centers.defaults.costs).find(
                 (key) => bodyshop.md_responsibility_centers.defaults.costs[key] === changedFields.cost_center

client/src/contexts/SocketIO/socketProvider.jsx

@@ -149,7 +149,7 @@ const SocketProvider = ({ children, bodyshop, navigate, currentUser }) => {
 
   useEffect(() => {
     const initializeSocket = async (token) => {
-      if (!bodyshop?.id || socketRef.current) return;
+      if (!bodyshop || !bodyshop.id || socketRef.current) return;
 
       const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "";
       const socketInstance = SocketIO(endpoint, {

client/src/firebase/firebase.utils.js

@@ -5,7 +5,7 @@ import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js'
+// import posthog from 'posthog-js'
 
 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
 initializeApp(config);
@@ -74,7 +74,6 @@ onMessage(messaging, (payload) => {
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   try {
-
     const state = stateProp || store.getState();
 
     const eventParams = {
@@ -99,8 +98,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
     // );
     logEvent(analytics, eventName, eventParams);
     //amplitude.track(eventName, eventParams);
-    posthog.capture(eventName, eventParams);
-
+    //posthog.capture(eventName, eventParams);
   } finally {
     //If it fails, just keep going.
   }

client/src/graphql/bodyshop.queries.js

@@ -111,7 +111,6 @@ export const QUERY_BODYSHOP = gql`
       jc_hourly_rates
       md_jobline_presets
       cdk_dealerid
-      rr_dealerid
       features
       attach_pdf_to_email
       tt_allow_post_to_invoiced
@@ -124,7 +123,6 @@ export const QUERY_BODYSHOP = gql`
       md_email_cc
       timezone
       ss_configuration
-      rr_configuration
       md_from_emails
       last_name_first
       md_parts_order_comment
@@ -247,7 +245,6 @@ export const UPDATE_SHOP = gql`
         jc_hourly_rates
         md_jobline_presets
         cdk_dealerid
-        rr_dealerid
         attach_pdf_to_email
         tt_allow_post_to_invoiced
         cdk_configuration
@@ -259,7 +256,6 @@ export const UPDATE_SHOP = gql`
         md_email_cc
         timezone
         ss_configuration
-        rr_configuration
         md_from_emails
         last_name_first
         md_parts_order_comment

client/src/graphql/jobs.queries.js

@@ -714,7 +714,7 @@ export const GET_JOB_BY_PK = gql`
       v_model_yr
       v_model_desc
       v_vin
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
         created_at
         created_by
         critical
@@ -1000,6 +1000,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         key
         type
       }
+
     }
   }
 `;
@@ -2171,8 +2172,6 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       ownr_fn
       ownr_ln
       ownr_co_nm
-      ownr_ph1
-      ownr_ph2
       ins_co_nm
       kmin
       kmout
@@ -2181,10 +2180,6 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       v_model_desc
       area_of_damage
       date_exported
-      v_vin
-      plate_no
-      plate_st
-      ownr_co_nm
     }
   }
 `;
@@ -2420,7 +2415,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
         start
         status
       }
-      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
+      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
         created_at
         created_by
         critical

client/src/pages/accounting-payables/accounting-payables.container.jsx

@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
 import { Card } from "antd";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -55,7 +54,8 @@ export function AccountingPayablesContainer({ bodyshop, setBreadcrumbs, setSelec
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   const noPath =
-    !partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
+    !partnerVersion?.qbpath &&
+    !(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
 
   return (
     <div>

client/src/pages/accounting-payments/accounting-payments.container.jsx

@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
 import { Card } from "antd";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -53,10 +52,9 @@ export function AccountingPaymentsContainer({ bodyshop, setBreadcrumbs, setSelec
   });
 
   if (error) return <AlertComponent message={error.message} type="error" />;
-
   const noPath =
-    !partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
-
+    !partnerVersion?.qbpath &&
+    !(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
   return (
     <div>
       <FeatureWrapperComponent

client/src/pages/accounting-receivables/accounting-receivables.container.jsx

@@ -15,7 +15,6 @@ import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wr
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { Card } from "antd";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -58,7 +57,8 @@ export function AccountingReceivablesContainer({ bodyshop, setBreadcrumbs, setSe
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   const noPath =
-    !partnerVersion?.qbpath && !(bodyshop && (bodyshopHasDmsKey(bodyshop) || bodyshop?.accountingconfig?.qbo));
+    !partnerVersion?.qbpath &&
+    !(bodyshop && (bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.accountingconfig.qbo));
 
   return (
     <div>

client/src/pages/dms-payables/dms-payables.container.jsx

@@ -90,7 +90,6 @@ export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
     });
 
     if (socket.disconnected) socket.connect();
-
     return () => {
       socket.removeAllListeners();
       socket.disconnect();
@@ -140,10 +139,17 @@ export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
               </Space>
             }
           >
-            <DmsLogEvents logs={logs} />
+            <DmsLogEvents socket={socket} logs={logs} />
           </Card>
         </div>
       </Col>
     </Row>
   );
 }
+
+export const determineDmsType = (bodyshop) => {
+  if (bodyshop.cdk_dealerid) return "cdk";
+  else {
+    return "pbs";
+  }
+};

client/src/pages/dms/dms.container.jsx

@@ -1,31 +1,26 @@
-import { useEffect, useMemo, useRef, useState } from "react";
-import { Link, useLocation, useNavigate } from "react-router-dom";
-import { connect } from "react-redux";
-import { useTranslation } from "react-i18next";
-import { createStructuredSelector } from "reselect";
-import queryString from "query-string";
 import { useQuery } from "@apollo/client";
-import { Button, Card, Col, Result, Row, Select, Space, Switch } from "antd";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { useSocket } from "../../contexts/SocketIO/useSocket.js";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
+import { Button, Card, Col, Result, Row, Select, Space } from "antd";
+import queryString from "query-string";
+import { useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
+import SocketIO from "socket.io-client";
+import AlertComponent from "../../components/alert/alert.component";
+import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
+import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
+import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
+import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
+import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
+import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
+import { auth } from "../../firebase/firebase.utils";
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
-import { bodyshopHasDmsKey, DMS_MAP, getDmsMode, isWssMode } from "../../utils/dmsUtils.js";
-import legacySocket from "../../utils/legacySocket";
-
-import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
-import AlertComponent from "../../components/alert/alert.component";
-import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
-import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
-import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
-import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -39,357 +34,130 @@ const mapDispatchToProps = (dispatch) => ({
 
 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 
-const DMS_SOCKET_EVENTS = {
-  [DMS_MAP.reynolds]: {
-    log: "rr-log-event",
-    partialResult: "rr-export-job:result",
-    validationNeeded: "rr-validation-required",
-    exportSuccess: "export-success",
-    exportFailed: "export-failed"
-  },
-  [DMS_MAP.fortellis]: {
-    log: "fortellis-log-event",
-    exportSuccess: "export-success",
-    exportFailed: "export-failed"
-  },
-  [DMS_MAP.cdk]: {
-    log: "log-event",
-    exportSuccess: "export-success",
-    exportFailed: "export-failed"
-  },
-  [DMS_MAP.pbs]: {
-    log: "log-event",
-    exportSuccess: "export-success",
-    exportFailed: "export-failed"
+export const socket = SocketIO(
+  import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", // for dev testing,
+  {
+    path: "/ws",
+    withCredentials: true,
+    auth: async (callback) => {
+      const token = auth.currentUser && (await auth.currentUser.getIdToken());
+      callback({ token });
+    }
   }
-};
+);
 
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
   const { t } = useTranslation();
+  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
   const history = useNavigate();
+  const [logs, setLogs] = useState([]);
   const search = queryString.parse(useLocation().search);
   const { jobId } = search;
-
   const notification = useNotification();
 
-  const {
-    treatments: { Fortellis }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Fortellis"],
-    splitKey: bodyshop.imexshopid
-  });
-
-  // Compute a single normalized mode and pick the proper socket
-  const mode = getDmsMode(bodyshop, Fortellis.treatment); // "rr" | "fortellis" | "cdk" | "pbs" | "none"
-
-  const { socket: wsssocket } = useSocket();
-  const activeSocket = useMemo(() => (isWssMode(mode) ? wsssocket : legacySocket), [mode, wsssocket]);
-
-  const [isConnected, setIsConnected] = useState(!!activeSocket?.connected);
-
-  // One place to set log level
-  const [logLevel, setLogLevel] = useState(mode === DMS_MAP.pbs ? "INFO" : "DEBUG");
-
-  const setActiveLogLevel = (level) => {
-    if (!activeSocket) return;
-    activeSocket.emit("set-log-level", level);
-  };
-
-  const [logs, setLogs] = useState([]);
-  const [detailsOpen, setDetailsOpen] = useState(false);
-  const [detailsNonce, setDetailsNonce] = useState(0);
-  const [colorizeJson, setColorizeJson] = useState(false);
-
-  const [rrOpenRoLimit, setRrOpenRoLimit] = useState(false);
-  const clearRrOpenRoLimit = () => setRrOpenRoLimit(false);
-
-  const [rrValidationPending, setrrValidationPending] = useState(false);
-
   const { loading, error, data } = useQuery(QUERY_JOB_EXPORT_DMS, {
     variables: { id: jobId },
     skip: !jobId,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
-
   const logsRef = useRef(null);
 
-  const toggleDetailsAll = () => {
-    setDetailsOpen((v) => !v);
-    setDetailsNonce((n) => n + 1);
-  };
-
-  // Channel names per mode to avoid branching everywhere
-  const channels = useMemo(() => DMS_SOCKET_EVENTS[mode] || {}, [mode]);
-
-  const providerLabel = useMemo(
-    () =>
-      ({
-        [DMS_MAP.reynolds]: "Reynolds",
-        [DMS_MAP.fortellis]: "Fortellis",
-        [DMS_MAP.cdk]: "CDK",
-        [DMS_MAP.pbs]: "PBS"
-      })[mode] || "DMS",
-    [mode]
-  );
-
-  const transportLabel = isWssMode(mode) ? "App Socket (WSS)" : "Legacy Socket (WS)";
-
-  const bannerMessage = `Posting to ${providerLabel} | ${transportLabel} | ${
-    isConnected ? "Connected" : "Disconnected"
-  }`;
-
-  const handleExportFailed = (payload = {}) => {
-    const { title, friendlyMessage, error: errText, severity, errorCode, vendorStatusCode } = payload;
-
-    const msg =
-      friendlyMessage ||
-      errText ||
-      t("dms.errors.exportfailedgeneric", "We couldn't complete the export. Please try again.");
-
-    const vendorTitle = title || (mode === DMS_MAP.reynolds ? "Reynolds" : "DMS");
-
-    const isRrOpenRoLimit =
-      mode === DMS_MAP.reynolds &&
-      (vendorStatusCode === 507 ||
-        /MAX_OPEN_ROS/i.test(String(errorCode || "")) ||
-        /maximum number of open repair orders/i.test(String(msg || "").toLowerCase()));
-
-    const sev = severity || (isRrOpenRoLimit ? "warning" : "error");
-
-    if (!isRrOpenRoLimit) {
-      const notifyKind = sev === "warning" && typeof notification.warning === "function" ? "warning" : "error";
-      notification[notifyKind]({ message: vendorTitle, description: msg, duration: 10 });
-    } else {
-      setRrOpenRoLimit(true);
-    }
-
-    setLogs((prev) => [
-      ...prev,
-      {
-        timestamp: new Date(),
-        level: (sev || "error").toUpperCase(),
-        message: `${vendorTitle}: ${msg}`,
-        meta: { errorCode, vendorStatusCode, raw: payload, blockedByOpenRoLimit: !!isRrOpenRoLimit }
-      }
-    ]);
-  };
-
-  // keep this in sync if mode/socket flips
-  useEffect(() => {
-    setIsConnected(!!activeSocket?.connected);
-  }, [activeSocket]);
-
   useEffect(() => {
     document.title = t("titles.dms", {
-      app: InstanceRenderManager({ imex: "$t(titles.imexonline)", rome: "$t(titles.romeonline)" })
+      app: InstanceRenderManager({
+        imex: "$t(titles.imexonline)",
+        rome: "$t(titles.romeonline)"
+      })
     });
     setSelectedHeader("dms");
     setBreadcrumbs([
-      { link: "/manage/accounting/receivables", label: t("titles.bc.accounting-receivables") },
-      { link: "/manage/dms", label: t("titles.bc.dms") }
+      {
+        link: "/manage/accounting/receivables",
+        label: t("titles.bc.accounting-receivables")
+      },
+      {
+        link: "/manage/dms",
+        label: t("titles.bc.dms")
+      }
     ]);
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
-  // Socket wiring (mode-aware)
   useEffect(() => {
-    if (!activeSocket) return;
-
-    // Connect legacy socket if needed
-    if (!isWssMode(mode)) {
-      if (activeSocket.disconnected) activeSocket.connect();
-    }
-
-    // Set log level now and on connect/reconnect
-    setActiveLogLevel(logLevel);
-
-    const onConnect = () => {
-      setIsConnected(true);
-      setActiveLogLevel(logLevel);
-    };
-
-    const onDisconnect = () => setIsConnected(false);
-
-    const onReconnect = () => {
-      setIsConnected(true);
-      setLogs((prev) => [
-        ...prev,
-        {
-          timestamp: new Date(),
-          level: "warn",
-          message: `Reconnected to ${mode === DMS_MAP.reynolds ? "RR" : mode === DMS_MAP.fortellis ? "Fortellis" : "DMS"} Export Service`
-        }
-      ]);
-    };
-
-    const onConnectError = (err) => {
-      // Legacy and WSS both emit this
+    socket.on("connect", () => socket.emit("set-log-level", logLevel));
+    socket.on("reconnect", () => {
+      setLogs((logs) => {
+        return [
+          ...logs,
+          {
+            timestamp: new Date(),
+            level: "warn",
+            message: "Reconnected to CDK Export Service"
+          }
+        ];
+      });
+    });
+    socket.on("connect_error", (err) => {
       console.log(`connect_error due to ${err}`, err);
       notification.error({ message: err.message });
-    };
-
-    activeSocket.on("disconnect", onDisconnect);
-    activeSocket.on("connect", onConnect);
-    activeSocket.on("reconnect", onReconnect);
-    activeSocket.on("connect_error", onConnectError);
-
-    // Logs
-    const onLog =
-      mode === DMS_MAP.reynolds
-        ? (payload = {}) => {
-            const normalized = {
-              timestamp: payload.timestamp
-                ? new Date(payload.timestamp)
-                : payload.ts
-                  ? new Date(payload.ts)
-                  : new Date(),
-              level: (payload.level || "INFO").toUpperCase(),
-              message: payload.message || payload.msg || "",
-              meta: payload.meta ?? payload.ctx ?? payload.details ?? null
-            };
-            setLogs((prev) => [...prev, normalized]);
-          }
-        : (payload) => setLogs((prev) => [...prev, payload]);
-
-    if (channels.log) activeSocket.on(channels.log, onLog);
-
-    // Success / Failed
-    const onExportSuccess = (payload) => {
-      const jobIdResolved = payload?.jobId ?? payload;
-      notification.success({ message: t("jobs.successes.exported") });
-
-      // Clear RR Validation flag if any
-      setrrValidationPending(false);
-
+    });
+    socket.on("log-event", (payload) => {
+      setLogs((logs) => {
+        return [...logs, payload];
+      });
+    });
+    socket.on("export-success", (payload) => {
+      notification.success({
+        message: t("jobs.successes.exported")
+      });
       insertAuditTrail({
-        jobid: jobIdResolved,
+        jobid: payload,
         operation: AuditTrailMapping.jobexported(),
         type: "jobexported"
       });
       history("/manage/accounting/receivables");
-    };
-
-    if (channels.exportSuccess) activeSocket.on(channels.exportSuccess, onExportSuccess);
-    if (channels.exportFailed) activeSocket.on(channels.exportFailed, handleExportFailed);
-
-    // RR-only extras
-
-    const onPartialResult = () => {
-      setrrValidationPending(true);
-      setLogs((prev) => [
-        ...prev,
-        {
-          timestamp: new Date(),
-          level: "INFO",
-          message:
-            "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize."
-        }
-      ]);
-      notification.info({
-        message: "Reynolds RO created",
-        description:
-          "Complete validation in Reynolds, then click Finished/Close to finalize and mark this export complete.",
-        duration: 8
-      });
-    };
-
-    const onValidationRequired = (payload) => {
-      setrrValidationPending(true);
-      setLogs((prev) => [
-        ...prev,
-        {
-          timestamp: new Date(),
-          level: "INFO",
-          message:
-            "Repair Order created in Reynolds. Complete validation in Reynolds, then click Finished/Close to finalize.",
-          meta: { payload }
-        }
-      ]);
-    };
-
-    if (mode === DMS_MAP.reynolds && channels.partialResult) activeSocket.on(channels.partialResult, onPartialResult);
-    if (mode === DMS_MAP.reynolds && channels.validationNeeded)
-      activeSocket.on(channels.validationNeeded, onValidationRequired);
-
-    return () => {
-      activeSocket.off("connect", onConnect);
-      activeSocket.off("reconnect", onReconnect);
-      activeSocket.off("connect_error", onConnectError);
-      activeSocket.off("disconnect", onDisconnect);
-
-      if (channels.log) activeSocket.off(channels.log, onLog);
-      if (channels.exportSuccess) activeSocket.off(channels.exportSuccess, onExportSuccess);
-      if (channels.exportFailed) activeSocket.off(channels.exportFailed, handleExportFailed);
-
-      if (mode === DMS_MAP.reynolds && channels.partialResult)
-        activeSocket.off(channels.partialResult, onPartialResult);
-      if (mode === DMS_MAP.reynolds && channels.validationNeeded)
-        activeSocket.off(channels.validationNeeded, onValidationRequired);
-
-      // Only tear down legacy socket listeners; don't disconnect WSS from here
-      if (!isWssMode(mode)) {
-        activeSocket.removeAllListeners();
-        activeSocket.disconnect();
-      }
-    };
-  }, [mode, activeSocket, channels, logLevel, notification, t, insertAuditTrail, history]);
-
-  // RR finalize callback (unchanged public behavior)
-  const handleRrValidationFinished = () => {
-    if (!jobId) return;
-    if (!isWssMode(mode)) return; // RR is WSS-only
-    activeSocket.emit("rr-finalize-repair-order", { jobId }, (ack) => {
-      if (ack?.ok) return;
-      if (ack?.error) notification.error({ message: ack.error });
     });
-  };
+
+    if (socket.disconnected) socket.connect();
+    return () => {
+      socket.removeAllListeners();
+      socket.disconnect();
+    };
+  }, []);
 
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent message={error.message} type="error" />;
 
-  if (!jobId || !bodyshopHasDmsKey(bodyshop) || !data?.jobs_by_pk)
+  if (!jobId || !(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) || !(data && data.jobs_by_pk))
     return <Result status="404" title={t("general.errors.notfound")} />;
 
-  if (data.jobs_by_pk?.date_exported) return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
+  if (data.jobs_by_pk && data.jobs_by_pk.date_exported)
+    return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
 
   return (
     <div>
-      <AlertComponent style={{ marginBottom: 10 }} message={bannerMessage} type="warning" showIcon closable />
-
       <Row gutter={[16, 16]}>
         <Col md={24} lg={10}>
           <DmsAllocationsSummary
             title={
               <span>
-                <Link
-                  to={`/manage/jobs/${data && data.jobs_by_pk.id}`}
-                >{`${data?.jobs_by_pk && data.jobs_by_pk.ro_number}`}</Link>
-                {` | ${OwnerNameDisplayFunction(data.jobs_by_pk)} | ${data.jobs_by_pk.v_model_yr || ""} ${data.jobs_by_pk.v_make_desc || ""} ${data.jobs_by_pk.v_model_desc || ""}`}
+                <Link to={`/manage/jobs/${data && data.jobs_by_pk.id}`}>{`${
+                  data && data.jobs_by_pk && data.jobs_by_pk.ro_number
+                }`}</Link>
+                {` | ${OwnerNameDisplayFunction(data.jobs_by_pk)} | ${
+                  data.jobs_by_pk.v_model_yr || ""
+                } ${data.jobs_by_pk.v_make_desc || ""} ${data.jobs_by_pk.v_model_desc || ""}`}
               </span>
             }
-            socket={activeSocket}
+            socket={socket}
             jobId={jobId}
-            mode={mode}
           />
         </Col>
-
         <Col md={24} lg={14}>
-          <DmsPostForm socket={activeSocket} job={data?.jobs_by_pk} logsRef={logsRef} mode={mode} />
+          <DmsPostForm socket={socket} jobId={jobId} job={data && data.jobs_by_pk} logsRef={logsRef} />
         </Col>
 
-        <DmsCustomerSelector
-          jobid={jobId}
-          bodyshop={bodyshop}
-          socket={activeSocket}
-          mode={mode}
-          rrOptions={{
-            openRoLimit: rrOpenRoLimit,
-            onOpenRoFinished: clearRrOpenRoLimit,
-            validationPending: rrValidationPending,
-            onValidationFinished: handleRrValidationFinished
-          }}
-        />
+        <DmsCustomerSelector />
 
         <Col span={24}>
           <div ref={logsRef}>
@@ -397,22 +165,14 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
               title={t("jobs.labels.dms.logs")}
               extra={
                 <Space wrap>
-                  <Switch
-                    checked={colorizeJson}
-                    onChange={setColorizeJson}
-                    checkedChildren="Color JSON"
-                    unCheckedChildren="Plain JSON"
-                  />
-                  <Button onClick={toggleDetailsAll}>{detailsOpen ? "Collapse All" : "Expand All"}</Button>
                   <Select
                     placeholder="Log Level"
                     value={logLevel}
                     onChange={(value) => {
                       setLogLevel(value);
-                      setActiveLogLevel(value);
+                      socket.emit("set-log-level", value);
                     }}
                   >
-                    <Select.Option key="SILLY">SILLY</Select.Option>
                     <Select.Option key="DEBUG">DEBUG</Select.Option>
                     <Select.Option key="INFO">INFO</Select.Option>
                     <Select.Option key="WARN">WARN</Select.Option>
@@ -422,11 +182,8 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                   <Button
                     onClick={() => {
                       setLogs([]);
-                      if (isWssMode(mode)) {
-                        setActiveLogLevel(logLevel);
-                      }
-                      activeSocket.disconnect();
-                      activeSocket.connect();
+                      socket.disconnect();
+                      socket.connect();
                     }}
                   >
                     Reconnect
@@ -434,12 +191,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                 </Space>
               }
             >
-              <DmsLogEvents
-                logs={logs}
-                detailsOpen={detailsOpen}
-                detailsNonce={detailsNonce}
-                colorizeJson={colorizeJson}
-              />
+              <DmsLogEvents socket={socket} logs={logs} />
             </Card>
           </div>
         </Col>
@@ -447,3 +199,10 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
     </div>
   );
 }
+
+export const determineDmsType = (bodyshop) => {
+  if (bodyshop.cdk_dealerid) return "cdk";
+  else {
+    return "pbs";
+  }
+};

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -42,7 +42,6 @@ import { setModalContext } from "../../redux/modals/modals.actions.js";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
-import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -70,8 +69,6 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
   const [loading, setLoading] = useState(false);
   const notification = useNotification();
 
-  const hasDMSKey = bodyshopHasDmsKey(bodyshop);
-
   const {
     treatments: { Qb_Multi_Ar, ClosingPeriod }
   } = useSplitTreatments({
@@ -194,7 +191,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                   {t("general.actions.close")}
                 </Button>
               </Popconfirm>
-              {bodyshopHasDmsKey(bodyshop) && (
+              {(bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid) && (
                 <Link to={`/manage/dms?jobId=${job.id}`}>
                   <Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
                 </Link>
@@ -314,7 +311,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
               <Switch />
             </Form.Item>
           )}
-          {hasDMSKey && (
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmin")}
               name="kmin"
@@ -327,7 +324,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
               <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
-          {hasDMSKey && (
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.kmout")}
               name="kmout"
@@ -351,7 +348,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
               <InputNumber precision={0} disabled={jobRO} />
             </Form.Item>
           )}
-          {hasDMSKey && (
+          {(bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber) && (
             <Form.Item
               label={t("jobs.fields.dms_allocation")}
               name="dms_allocation"

client/src/redux/user/user.sagas.js

@@ -50,7 +50,7 @@ import {
 } from "./user.actions";
 import UserActionTypes from "./user.types";
 //import * as amplitude from '@amplitude/analytics-browser';
-import posthog from 'posthog-js';
+import posthog from "posthog-js";
 
 const fpPromise = FingerprintJS.load();
 
@@ -269,11 +269,11 @@ export function* signInSuccessSaga({ payload }) {
         instanceSeg,
         ...(isParts
           ? [
-            InstanceRenderManager({
-              imex: "ImexPartsManagement",
-              rome: "RomePartsManagement"
-            })
-          ]
+              InstanceRenderManager({
+                imex: "ImexPartsManagement",
+                rome: "RomePartsManagement"
+              })
+            ]
           : [])
       ];
       window.$crisp.push(["set", "session:segments", [segs]]);
@@ -375,17 +375,31 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       const isParts = yield select((state) => state.application.isPartsEntry === true);
       const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
 
-      let featureSegments;
-      if (payload.features?.allAccess === true) {
-        featureSegments = ["allAccess"];
-      } else {
-        const featureKeys = Object.keys(payload.features).filter(
-          (key) =>
-            payload.features[key] === true ||
-            (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
-        );
-        featureSegments = ["basic", ...featureKeys];
-      }
+      const featureSegments =
+        payload.features?.allAccess === true
+          ? ["allAccess"]
+          : [
+              "basic",
+              ...Object.keys(payload.features).filter(
+                (key) =>
+                  payload.features[key] === true ||
+                  (typeof payload.features[key] === "string" && !isNaN(Date.parse(payload.features[key])))
+              )
+            ];
+
+      const additionalSegments = [
+        payload.cdk_dealerid && "CDK",
+        payload.pbs_serialnumber && "PBS",
+        // payload.rr_dealerid && "Reynolds",
+        payload.accountingconfig.qbo === true && "QBO",
+        payload.accountingconfig.qbo === false &&
+          !payload.cdk_dealerid &&
+          !payload.pbs_serialnumber &&
+          // !payload.rr_dealerid &&
+          "QBD"
+      ].filter(Boolean);
+
+      featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
       const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];

client/src/translations/en_us/common.json

@@ -558,14 +558,6 @@
         "responsibilitycenter_tax_tier": "Tax {{typeNum}} Tier {{typeNumIterator}}",
         "responsibilitycenter_tax_type": "Tax {{typeNum}} Type",
         "responsibilitycenters": {
-          "gogcode": "GOG Code (BreakOut)",
-          "item_type": "Item Type",
-          "item_type_gog": "GOG",
-          "item_type_paint": "Paint Materials",
-          "item_type_freight": "Freight",
-          "taxable_flag": "Taxable?",
-          "taxable": "Taxable",
-          "nontaxable": "Non-taxable",
           "ap": "Accounts Payable",
           "ar": "Accounts Receivable",
           "ats": "ATS",
@@ -696,7 +688,6 @@
             "payers": "Payers"
           },
           "cdk_dealerid": "CDK Dealer ID",
-          "rr_dealerid": "Reynolds Store Number",
           "costsmapping": "Costs Mapping",
           "dms_allocations": "DMS Allocations",
           "pbs_serialnumber": "PBS Serial Number",
@@ -1044,7 +1035,7 @@
         "alreadyexported": "This job has already been sent to the DMS. If you need to resend it, please use admin permissions to mark the job for re-export."
       },
       "labels": {
-        "refreshallocations": "Refresh to see DMS Allocations."
+        "refreshallocations": "Refresh to see DMS Allocataions."
       }
     },
     "documents": {
@@ -1221,8 +1212,6 @@
     },
     "general": {
       "actions": {
-        "select": "Select",
-        "optional": "Optional",
         "add": "Add",
         "autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
         "calculate": "Calculate",
@@ -1281,6 +1270,7 @@
         "vehicle": "Vehicle"
       },
       "labels": {
+        "selected": "Selected",
         "settings": "Settings",
         "actions": "Actions",
         "areyousure": "Are you sure?",
@@ -1502,7 +1492,8 @@
         "assign_team": "Assign Team",
         "converttolabor": "Convert amount to Labor.",
         "dispatchparts": "Dispatch Parts ({{count}})",
-        "new": "New Line"
+        "new": "New Line",
+        "updatelocation": "Update Location"
       },
       "errors": {
         "creating": "Error encountered while creating job line.  {{message}}",
@@ -1583,7 +1574,8 @@
         "ioucreated": "IOU",
         "new": "New Line",
         "nostatus": "No Status",
-        "presets": "Jobline Presets"
+        "presets": "Jobline Presets",
+        "bulk_location_help": "This will set the same location on all selected lines."
       },
       "successes": {
         "created": "Job line created successfully.",
@@ -1788,8 +1780,6 @@
           "id": "DMS ID",
           "inservicedate": "In Service Date",
           "journal": "Journal #",
-          "make_override": "Make Override",
-          "advisor": "Advisor #",
           "lines": "Posting Lines",
           "name1": "Customer Name",
           "payer": {
@@ -1797,8 +1787,7 @@
             "control_type": "Control Type",
             "controlnumber": "Control Number",
             "dms_acctnumber": "DMS Account #",
-            "name": "Payer Name",
-            "payer_type": "Payer"
+            "name": "Payer Name"
           },
           "sale": "Sale",
           "sale_dms_acctnumber": "Sale DMS Acct #",
@@ -1865,7 +1854,7 @@
         "loss_of_use": "Loss of Use",
         "lost_sale_reason": "Lost Sale Reason",
         "ma2s": "2 Stage Paint",
-        "ma3s": "3 Stage Paint",
+        "ma3s": "3 Stage Pain",
         "mabl": "MABL?",
         "macs": "MACS?",
         "mahw": "Hazardous Waste",
@@ -3223,6 +3212,7 @@
         "parts_not_recieved_vendor": "Parts Not Received by Vendor",
         "parts_received_not_scheduled": "Parts Received for Jobs Not Scheduled",
         "payments_by_date": "Payments by Date",
+        "payments_by_date_excel": "Payments by Date - Excel",
         "payments_by_date_payment": "Payments by Date and Payment Type",
         "payments_by_date_type": "Payments by Date and Customer Type",
         "production_by_category": "Production by Category",

client/src/translations/es/common.json

@@ -558,14 +558,6 @@
         "responsibilitycenter_tax_tier": "",
         "responsibilitycenter_tax_type": "",
         "responsibilitycenters": {
-          "gogcode": "",
-          "item_type": "Item Type",
-          "item_type_gog": "",
-          "item_type_paint": "",
-          "item_type_freight": "",
-          "taxable_flag": "",
-          "taxable": "",
-          "nontaxable": "",
           "ap": "",
           "ar": "",
           "ats": "",
@@ -696,7 +688,6 @@
             "payers": ""
           },
           "cdk_dealerid": "",
-          "rr_dealerid": "",
           "costsmapping": "",
           "dms_allocations": "",
           "pbs_serialnumber": "",
@@ -1279,6 +1270,7 @@
         "vehicle": ""
       },
       "labels": {
+        "selected": "",
         "actions": "Comportamiento",
         "settings": "",
         "areyousure": "",
@@ -1500,7 +1492,8 @@
         "assign_team": "",
         "converttolabor": "",
         "dispatchparts": "",
-        "new": ""
+        "new": "",
+        "updatelocation": ""
       },
       "errors": {
         "creating": "",
@@ -1581,7 +1574,8 @@
         "ioucreated": "",
         "new": "Nueva línea",
         "nostatus": "",
-        "presets": ""
+        "presets": "",
+        "bulk_location_help": ""
       },
       "successes": {
         "created": "",
@@ -1781,8 +1775,6 @@
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
-          "make_override": "",
-          "advisor": "",
           "dms_unsold": "",
           "dms_wip_acctnumber": "",
           "id": "",
@@ -3220,6 +3212,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/translations/fr/common.json

@@ -558,14 +558,6 @@
         "responsibilitycenter_tax_tier": "",
         "responsibilitycenter_tax_type": "",
         "responsibilitycenters": {
-          "gogcode": "",
-          "item_type": "Item Type",
-          "item_type_gog": "",
-          "item_type_paint": "",
-          "item_type_freight": "",
-          "taxable_flag": "",
-          "taxable": "",
-          "nontaxable": "",
           "ap": "",
           "ar": "",
           "ats": "",
@@ -696,7 +688,6 @@
             "payers": ""
           },
           "cdk_dealerid": "",
-          "rr_dealerid": "",
           "costsmapping": "",
           "dms_allocations": "",
           "pbs_serialnumber": "",
@@ -1279,6 +1270,7 @@
         "vehicle": ""
       },
       "labels": {
+        "selected": "",
         "settings": "",
         "actions": "actes",
         "areyousure": "",
@@ -1500,7 +1492,8 @@
         "assign_team": "",
         "converttolabor": "",
         "dispatchparts": "",
-        "new": ""
+        "new": "",
+        "updatelocation": ""
       },
       "errors": {
         "creating": "",
@@ -1581,7 +1574,8 @@
         "ioucreated": "",
         "new": "Nouvelle ligne",
         "nostatus": "",
-        "presets": ""
+        "presets": "",
+        "bulk_location_help": ""
       },
       "successes": {
         "created": "",
@@ -1781,8 +1775,6 @@
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
-          "make_override": "",
-          "advisor": "",
           "dms_unsold": "",
           "dms_wip_acctnumber": "",
           "id": "",
@@ -3220,6 +3212,7 @@
         "parts_not_recieved_vendor": "",
         "parts_received_not_scheduled": "",
         "payments_by_date": "",
+        "payments_by_date_excel": "",
         "payments_by_date_payment": "",
         "payments_by_date_type": "",
         "production_by_category": "",

client/src/utils/TemplateConstants.js

@@ -1218,6 +1218,18 @@ export const TemplateList = (type, context) => {
             },
             group: "customers"
           },
+          payments_by_date_excel: {
+            title: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            subject: i18n.t("reportcenter.templates.payments_by_date_excel"),
+            key: "payments_by_date_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.payments"),
+              field: i18n.t("payments.fields.date")
+            },
+            group: "customers"
+          },
           schedule: {
             title: i18n.t("reportcenter.templates.schedule"),
             subject: i18n.t("reportcenter.templates.schedule"),

client/src/utils/dmsUtils.js

@@ -1,72 +0,0 @@
-/**
- * DMS type mapping constants.
- * CAREFUL: the values here are used as canonical "mode" strings elsewhere in the app.
- * @type {{reynolds: string, cdk: string, pbs: string, fortellis: string}}
- */
-export const DMS_MAP = {
-  reynolds: "rr",
-  cdk: "cdk",
-  pbs: "pbs",
-  fortellis: "fortellis"
-};
-
-/**
- * Determines the DMS type for a given bodyshop object.
- * @param bodyshop
- * @returns {*|string}
- */
-export const determineDMSTypeByBodyshop = (bodyshop) => {
-  const dmsMapping = {
-    cdk_dealerid: DMS_MAP.cdk,
-    pbs_serialnumber: DMS_MAP.pbs,
-    rr_dealerid: DMS_MAP.reynolds
-  };
-
-  return Object.keys(dmsMapping).find((key) => bodyshop[key])
-    ? dmsMapping[Object.keys(dmsMapping).find((key) => bodyshop[key])]
-    : DMS_MAP.pbs;
-};
-
-/**
- * Determines the translation key for a given DMS type.
- * @param dmsType
- * @returns {*|string}
- */
-export const determineDmsTypeTranslationKey = (dmsType) => {
-  const dmsTypeMapping = {
-    [DMS_MAP.cdk]: "bodyshop.labels.dms.cdk",
-    [DMS_MAP.pbs]: "bodyshop.labels.dms.pbs",
-    [DMS_MAP.reynolds]: "bodyshop.labels.dms.rr"
-  };
-
-  return dmsTypeMapping[dmsType] || dmsTypeMapping[DMS_MAP.pbs];
-};
-
-/**
- * Returns a normalized "mode" we can switch on:
- * @param bodyshop
- * @param fortellisTreatment
- * @returns {*|string|string}
- */
-export const getDmsMode = (bodyshop, fortellisTreatment) => {
-  const base = determineDMSTypeByBodyshop(bodyshop); // "rr" | "cdk" | "pbs" | undefined
-  if (base === DMS_MAP.cdk && fortellisTreatment === "on") return DMS_MAP.fortellis;
-  return base ?? "none";
-};
-
-/**
- * Checks if the DMS mode uses WSS.
- * @param mode
- * @returns {boolean}
- */
-export const isWssMode = (mode) => {
-  return mode === DMS_MAP.reynolds || mode === DMS_MAP.fortellis;
-};
-
-/**
- * Checks if the bodyshop has any DMS key configured.
- * @param bodyshop
- * @returns {*|string}
- */
-export const bodyshopHasDmsKey = (bodyshop) =>
-  bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.rr_dealerid;

client/src/utils/legacySocket.js

@@ -1,16 +0,0 @@
-// client/src/utils/legacySocket.js
-import SocketIO from "socket.io-client";
-import { auth } from "../firebase/firebase.utils";
-
-// Create once, reuse everywhere.
-const legacySocket = SocketIO(import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "", {
-  path: "/ws",
-  withCredentials: true,
-  autoConnect: false,
-  auth: async (callback) => {
-    const token = auth.currentUser && (await auth.currentUser.getIdToken());
-    callback({ token });
-  }
-});
-
-export default legacySocket;

client/src/utils/sentry.js

@@ -31,7 +31,8 @@ if (!import.meta.env.DEV) {
       "Module specifier, 'fs' does not start",
       "Module specifier, 'zlib' does not start with",
       "Messaging: This browser doesn't support the API's required to use the Firebase SDK.",
-      "Failed to update a ServiceWorker for scope"
+      "Failed to update a ServiceWorker for scope",
+      "Network Error"
     ],
     integrations: [
       // See docs for support of different versions of variation of react router

client/vite.config.js

@@ -24,11 +24,13 @@ const lightningCssTargets = browserslistToTargets(
   })
 );
 
-const currentDatePST = new Date()
-  .toLocaleDateString("en-US", { timeZone: "America/Los_Angeles", year: "numeric", month: "2-digit", day: "2-digit" })
-  .split("/")
-  .reverse()
-  .join("-");
+const pstFormatter = new Intl.DateTimeFormat("en-CA", {
+  timeZone: "America/Los_Angeles",
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit"
+});
+const currentDatePST = pstFormatter.format(new Date());
 
 const getFormattedTimestamp = () =>
   new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");

hasura/metadata/tables.yaml

@@ -1156,7 +1156,11 @@
         enable_manual: false
         update:
           columns:
+            - imexshopid
+            - timezone
             - shopname
+            - notification_followers
+            - state
             - md_order_statuses
       retry_conf:
         interval_sec: 10
@@ -3698,6 +3702,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -3975,6 +3980,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr
@@ -4264,6 +4270,7 @@
           - deliverchecklist
           - depreciation_taxes
           - dms_allocation
+          - dms_id
           - driveable
           - employee_body
           - employee_csr

hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "unique_documents" numeric
+--  null;

hasura/migrations/1763425916748_alter_table_public_media_analytics_add_column_unique_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "unique_documents" numeric
+ null;

hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics" add column "duplicate_documents" numeric
+--  null;

hasura/migrations/1763425927136_alter_table_public_media_analytics_add_column_duplicate_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics" add column "duplicate_documents" numeric
+ null;

hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "unique_documents" numeric
+--  null;

hasura/migrations/1763425947348_alter_table_public_media_analytics_detail_add_column_unique_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "unique_documents" numeric
+ null;

hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."media_analytics_detail" add column "duplicate_documents" numeric
+--  null;

hasura/migrations/1763425960252_alter_table_public_media_analytics_detail_add_column_duplicate_documents/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."media_analytics_detail" add column "duplicate_documents" numeric
+ null;

hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/down.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "unique_document_count" to "unique_documents";

hasura/migrations/1763426307543_alter_table_public_media_analytics_detail_alter_column_unique_documents/up.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "unique_documents" to "unique_document_count";

hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/down.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "duplicate_count" to "duplicate_documents";

hasura/migrations/1763426323408_alter_table_public_media_analytics_detail_alter_column_duplicate_documents/up.sql

@@ -0,0 +1 @@
+alter table "public"."media_analytics_detail" rename column "duplicate_documents" to "duplicate_count";

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "dms_id" text
+--  null;

hasura/migrations/1764704225560_alter_table_public_jobs_add_column_dms_id/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "dms_id" text
+ null;

package.json

@@ -18,25 +18,24 @@
     "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.932.0",
-    "@aws-sdk/client-elasticache": "^3.932.0",
-    "@aws-sdk/client-s3": "^3.932.0",
-    "@aws-sdk/client-secrets-manager": "^3.932.0",
-    "@aws-sdk/client-ses": "^3.932.0",
-    "@aws-sdk/credential-provider-node": "^3.932.0",
-    "@aws-sdk/lib-storage": "^3.932.0",
-    "@aws-sdk/s3-request-presigner": "^3.932.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.901.0",
+    "@aws-sdk/client-elasticache": "^3.901.0",
+    "@aws-sdk/client-s3": "^3.901.0",
+    "@aws-sdk/client-secrets-manager": "^3.901.0",
+    "@aws-sdk/client-ses": "^3.901.0",
+    "@aws-sdk/credential-provider-node": "^3.901.0",
+    "@aws-sdk/lib-storage": "^3.903.0",
+    "@aws-sdk/s3-request-presigner": "^3.901.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.1",
     "aws4": "^1.13.2",
-    "axios": "^1.13.2",
-    "axios-curlirize": "^2.0.0",
+    "axios": "^1.12.2",
     "better-queue": "^3.8.12",
-    "bullmq": "^5.63.2",
-    "chart.js": "^4.5.1",
-    "cloudinary": "^2.8.0",
+    "bullmq": "^5.61.0",
+    "chart.js": "^4.5.0",
+    "cloudinary": "^2.7.0",
     "compression": "^1.8.1",
     "cookie-parser": "^1.4.7",
     "cors": "^2.8.5",
@@ -44,43 +43,40 @@
     "dinero.js": "^1.9.1",
     "dotenv": "^17.2.3",
     "express": "^4.21.1",
-    "fast-xml-parser": "^5.3.2",
-    "firebase-admin": "^13.6.0",
-    "graphql": "^16.12.0",
+    "firebase-admin": "^13.5.0",
+    "graphql": "^16.11.0",
     "graphql-request": "^6.1.0",
-    "intuit-oauth": "^4.2.2",
-    "ioredis": "^5.8.2",
-    "json-2-csv": "^5.5.10",
+    "intuit-oauth": "^4.2.0",
+    "ioredis": "^5.8.1",
+    "json-2-csv": "^5.5.9",
     "jsonwebtoken": "^9.0.2",
     "juice": "^11.0.3",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "moment-timezone": "^0.6.0",
-    "multer": "^2.0.2",
-    "mustache": "^4.2.0",
+    "multer": "^1.4.5-lts.1",
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
     "phone": "^3.1.67",
     "query-string": "7.1.3",
     "recursive-diff": "^1.0.9",
-    "rimraf": "^6.1.0",
+    "rimraf": "^6.0.1",
     "skia-canvas": "^3.0.8",
-    "soap": "^1.6.0",
+    "soap": "^1.5.0",
     "socket.io": "^4.8.1",
     "socket.io-adapter": "^2.5.5",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.10.5",
+    "twilio": "^5.10.2",
     "uuid": "^11.1.0",
     "winston": "^3.18.3",
     "winston-cloudwatch": "^6.3.0",
-    "xml-formatter": "^3.6.7",
     "xml2js": "^0.6.2",
-    "xmlbuilder2": "^4.0.0",
+    "xmlbuilder2": "^3.1.1",
     "yazl": "^3.3.1"
   },
   "devDependencies": {
-    "@eslint/js": "^9.39.1",
-    "eslint": "^9.39.1",
+    "@eslint/js": "^9.37.0",
+    "eslint": "^9.37.0",
     "eslint-plugin-react": "^7.37.5",
     "globals": "^15.15.0",
     "mock-require": "^3.0.3",

server.js

@@ -38,7 +38,7 @@ const { registerCleanupTask, initializeCleanupManager } = require("./server/util
 
 const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
 const { loadAppQueue } = require("./server/notifications/queues/appQueue");
-const { SetLegacyWebsocketHandlers } = require("./server/web-sockets/web-socket");
+
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
 const CLUSTER_RETRY_JITTER = 100;
@@ -247,29 +247,6 @@ const connectToRedisCluster = async () => {
       });
       reject(err);
     });
-
-    redisCluster.on("+node", (node) => {
-      logger.log(`Redis cluster node added`, "INFO", "redis", "api", {
-        host: node.options.host,
-        port: node.options.port
-      });
-    });
-
-    redisCluster.on("-node", (node) => {
-      logger.log(`Redis cluster node removed`, "WARN", "redis", "api", {
-        host: node.options.host,
-        port: node.options.port
-      });
-    });
-
-    redisCluster.on("node error", (error, node) => {
-      console.dir(error);
-      logger.log(`Redis node error`, "ERROR", "redis", "api", {
-        host: node.options.host,
-        port: node.options.port,
-        message: error.message
-      });
-    });
   });
 };
 
@@ -347,9 +324,6 @@ const applySocketIO = async ({ server, app }) => {
     }
   });
 
-  // Legacy Socket Events
-  SetLegacyWebsocketHandlers(io);
-
   const api = {
     pubClient,
     io,
@@ -413,6 +387,9 @@ const main = async () => {
   const redisHelpers = applyRedisHelpers({ pubClient, app, logger });
   const ioHelpers = applyIOHelpers({ app, redisHelpers, ioRedis, logger });
 
+  // Legacy Socket Events
+  require("./server/web-sockets/web-socket");
+
   // Initialize Queues
   await loadQueues({ pubClient: pubClient, logger, redisHelpers, ioRedis });
 

server/accounting/pbs/pbs-ap-allocations.js

@@ -1,7 +1,7 @@
 const GraphQLClient = require("graphql-request").GraphQLClient;
 
 const queries = require("../../graphql-client/queries");
-const WsLogger = require("../../web-sockets/createLogEvent");
+const CdkBase = require("../../web-sockets/web-socket");
 const moment = require("moment");
 const Dinero = require("dinero.js");
 const AxiosLib = require("axios").default;
@@ -23,7 +23,7 @@ axios.interceptors.request.use((x) => {
   } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
   //console.log(printable);
 
-  WsLogger.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -33,14 +33,14 @@ axios.interceptors.response.use((x) => {
 
   const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
   //console.log(printable);
-  WsLogger.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
 
   return x;
 });
 
 async function PbsCalculateAllocationsAp(socket, billids) {
   try {
-    WsLogger.createLogEvent(socket, "DEBUG", `Received request to calculate allocations for ${billids}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Received request to calculate allocations for ${billids}`);
     const { bills, bodyshops } = await QueryBillData(socket, billids);
     const bodyshop = bodyshops[0];
     socket.bodyshop = bodyshop;
@@ -50,7 +50,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
 
     const transactionlist = [];
     if (bills.length === 0) {
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "ERROR",
         `No bills found for export. Ensure they have not already been exported and try again.`
@@ -147,9 +147,7 @@ async function PbsCalculateAllocationsAp(socket, billids) {
             ...billHash[key],
             Amount: billHash[key].Amount.toFormat("0.00")
           });
-          //Calculate the total expense for the bill iteratively to
-          // create the corresponding credit to AP.
-          APAmount = APAmount.add(billHash[key].Amount);
+          APAmount = APAmount.add(billHash[key].Amount); //Calculate the total expense for the bill iteratively to create the corresponding credit to AP.
         }
       });
 
@@ -168,21 +166,19 @@ async function PbsCalculateAllocationsAp(socket, billids) {
 
     return transactionlist;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsCalculateAllocationsAp. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsCalculateAllocationsAp. ${error}`);
   }
 }
 
 exports.PbsCalculateAllocationsAp = PbsCalculateAllocationsAp;
 
 async function QueryBillData(socket, billids) {
-  WsLogger.createLogEvent(socket, "DEBUG", `Querying bill data for id(s) ${billids}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Querying bill data for id(s) ${billids}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.GET_PBS_AP_ALLOCATIONS, { billids: billids });
-
-  WsLogger.createLogEvent(socket, "SILLY", `Bill data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Bill data query result ${JSON.stringify(result, null, 2)}`);
 
   return result;
 }
@@ -196,10 +192,40 @@ function getCostAccount(billline, respcenters) {
   return respcenters.costs.find((c) => c.name === acctName);
 }
 
-async function MarkApExported(socket, billids) {
-  WsLogger.createLogEvent(socket, "DEBUG", `Marking bills as exported for id ${billids}`);
-  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
+exports.PbsExportAp = async function (socket, { billids, txEnvelope }) {
+  CdkBase.createLogEvent(socket, "DEBUG", `Exporting selected AP.`);
 
+  //apAllocations has the same shap as the lines key for the accounting posting to PBS.
+  socket.apAllocations = await PbsCalculateAllocationsAp(socket, billids);
+  socket.txEnvelope = txEnvelope;
+  for (const allocation of socket.apAllocations) {
+    const { billid, ...restAllocation } = allocation;
+    const { data: AccountPostingChange } = await axios.post(PBS_ENDPOINTS.AccountingPostingChange, restAllocation, {
+      auth: PBS_CREDENTIALS,
+      socket
+    });
+
+    CheckForErrors(socket, AccountPostingChange);
+
+    if (AccountPostingChange.WasSuccessful) {
+      CdkBase.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
+      await MarkApExported(socket, [billid]);
+
+      socket.emit("ap-export-success", billid);
+    } else {
+      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
+      socket.emit("ap-export-failure", {
+        billid,
+        error: AccountPostingChange.Message
+      });
+    }
+  }
+  socket.emit("ap-export-complete");
+};
+
+async function MarkApExported(socket, billids) {
+  CdkBase.createLogEvent(socket, "DEBUG", `Marking bills as exported for id ${billids}`);
+  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.MARK_BILLS_EXPORTED, {
@@ -218,36 +244,3 @@ async function MarkApExported(socket, billids) {
 
   return result;
 }
-
-const defaultHandler = async (socket, { billids, txEnvelope }) => {
-  WsLogger.createLogEvent(socket, "DEBUG", `Exporting selected AP.`);
-
-  //apAllocations has the same shap as the lines key for the accounting posting to PBS.
-  socket.apAllocations = await PbsCalculateAllocationsAp(socket, billids);
-  socket.txEnvelope = txEnvelope;
-  for (const allocation of socket.apAllocations) {
-    const { billid, ...restAllocation } = allocation;
-    const { data: AccountPostingChange } = await axios.post(PBS_ENDPOINTS.AccountingPostingChange, restAllocation, {
-      auth: PBS_CREDENTIALS,
-      socket
-    });
-
-    CheckForErrors(socket, AccountPostingChange);
-
-    if (AccountPostingChange.WasSuccessful) {
-      WsLogger.createLogEvent(socket, "DEBUG", `Marking bill as exported.`);
-      await MarkApExported(socket, [billid]);
-
-      socket.emit("ap-export-success", billid);
-    } else {
-      WsLogger.createLogEvent(socket, "ERROR", `Export was not successful.`);
-      socket.emit("ap-export-failure", {
-        billid,
-        error: AccountPostingChange.Message
-      });
-    }
-  }
-  socket.emit("ap-export-complete");
-};
-
-exports.PbsExportAp = defaultHandler;

server/accounting/pbs/pbs-job-export.js

@@ -2,12 +2,10 @@ const GraphQLClient = require("graphql-request").GraphQLClient;
 const AxiosLib = require("axios").default;
 const queries = require("../../graphql-client/queries");
 const { PBS_ENDPOINTS, PBS_CREDENTIALS } = require("./pbs-constants");
-const WsLogger = require("../../web-sockets/createLogEvent");
-const fs = require("fs");
-const path = require("path");
 
 //const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
 const CalculateAllocations = require("../../cdk/cdk-calculate-allocations").default;
+const CdkBase = require("../../web-sockets/web-socket");
 const moment = require("moment-timezone");
 const Dinero = require("dinero.js");
 const InstanceManager = require("../../utils/instanceMgr").default;
@@ -21,12 +19,11 @@ axios.interceptors.request.use((x) => {
     ...x.headers[x.method],
     ...x.headers
   };
-  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
-    x.url
-  } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
+  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${x.url
+    } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
   //logRequestToFile(printable);
 
-  WsLogger.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);
 
   return x;
 });
@@ -36,11 +33,13 @@ axios.interceptors.response.use((x) => {
 
   const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
   //logRequestToFile(printable);
-  WsLogger.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);
 
   return x;
 });
 
+const fs = require('fs');
+const path = require("path");
 function logRequestToFile(printable) {
   try {
     const logDir = path.join(process.cwd(), "logs");
@@ -54,20 +53,21 @@ function logRequestToFile(printable) {
   }
 }
 
-const defaultHandler = async (socket, { txEnvelope, jobid }) => {
+
+exports.default = async function (socket, { txEnvelope, jobid }) {
   socket.logEvents = [];
   socket.recordid = jobid;
   socket.txEnvelope = txEnvelope;
   try {
-    WsLogger.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
+    CdkBase.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);
 
     const JobData = await QueryJobData(socket, jobid);
     socket.JobData = JobData;
-    WsLogger.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
+    CdkBase.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
     //Query for the Vehicle record to get the associated customer.
     socket.DmsVeh = await QueryVehicleFromDms(socket);
     //Todo: Need to validate the lines and methods below.
-    if (socket.DmsVeh?.CustomerRef) {
+    if (socket.DmsVeh && socket.DmsVeh.CustomerRef) {
       //Get the associated customer from the Vehicle Record.
       socket.DMSVehCustomer = await QueryCustomerBycodeFromDms(socket, socket.DmsVeh.CustomerRef);
     }
@@ -78,39 +78,35 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
       ...socket.DMSCustList
     ]);
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsJobExport. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsJobExport. ${error}`);
   }
 };
 
-exports.default = defaultHandler;
-
 exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
   try {
     socket.selectedCustomerId = selectedCustomerId;
     if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
-      WsLogger.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
+      CdkBase.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);
 
       //Upsert the contact information as per Wafaa's Email.
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "INFO",
-        `Upserting contact information to DMS for ${
-          socket.JobData.ownr_fn || ""
+        `Upserting contact information to DMS for ${socket.JobData.ownr_fn || ""
         } ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
       );
       const ownerRef = await UpsertContactData(socket, selectedCustomerId);
       socket.ownerRef = ownerRef;
-
-      WsLogger.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
+      CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
       const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
       socket.vehicleRef = vehicleRef;
     } else {
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "INFO",
         `Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
       );
-      //Must query for records to insert $0 RO.
+      //Must query for records to insert $0 RO. 
       if (!socket.ownerRef) {
         const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
         socket.ownerRef = ownerRef;
@@ -118,21 +114,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
       const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
       socket.vehicleRef = vehicleRef;
     }
-    WsLogger.createLogEvent(socket, "INFO", `Inserting account posting data...`);
+    CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
     const insertResponse = await InsertAccountPostingData(socket);
 
     if (insertResponse.WasSuccessful) {
       if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {
-        await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef);
+
+        await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
       }
-      WsLogger.createLogEvent(socket, "INFO", `Marking job as exported.`);
+      CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
       await MarkJobExported(socket, socket.JobData.id);
       socket.emit("export-success", socket.JobData.id);
     } else {
-      WsLogger.createLogEvent(socket, "ERROR", `Export was not successful.`);
+      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
     }
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
     await InsertFailedExportLog(socket, error);
   }
 };
@@ -140,24 +137,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
 // Was Successful
 async function CheckForErrors(socket, response) {
   if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
-    WsLogger.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
+    CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
   } else {
-    WsLogger.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
-    WsLogger.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
   }
 }
 
 exports.CheckForErrors = CheckForErrors;
 
 async function QueryJobData(socket, jobid) {
-  WsLogger.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
-
-  //WsLogger.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
@@ -196,7 +191,7 @@ async function QueryVehicleFromDms(socket) {
     CheckForErrors(socket, VehicleGetResponse);
     return VehicleGetResponse;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryVehicleFromDms - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryVehicleFromDms - ${error}`);
     throw new Error(error);
   }
 }
@@ -225,9 +220,9 @@ async function QueryCustomersFromDms(socket) {
       { auth: PBS_CREDENTIALS, socket }
     );
     CheckForErrors(socket, CustomerGetResponse);
-    return CustomerGetResponse?.Contacts;
+    return CustomerGetResponse && CustomerGetResponse.Contacts;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
     throw new Error(error);
   }
 }
@@ -258,9 +253,9 @@ async function QueryCustomerBycodeFromDms(socket, CustomerRef) {
       { auth: PBS_CREDENTIALS, socket }
     );
     CheckForErrors(socket, CustomerGetResponse);
-    return CustomerGetResponse?.Contacts;
+    return CustomerGetResponse && CustomerGetResponse.Contacts;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryCustomersFromDms - ${error}`);
     throw new Error(error);
   }
 }
@@ -277,15 +272,15 @@ async function UpsertContactData(socket, selectedCustomerId) {
           Code: socket.JobData.owner.accountingid,
           ...(socket.JobData.ownr_co_nm
             ? {
-                //LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_co_nm,
-                IsBusiness: true
-              }
+              //LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_co_nm,
+              IsBusiness: true
+            }
             : {
-                LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_fn,
-                IsBusiness: false
-              }),
+              LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_fn,
+              IsBusiness: false
+            }),
 
           //Salutation: "String",
           //MiddleName: "String",
@@ -342,7 +337,7 @@ async function UpsertContactData(socket, selectedCustomerId) {
     CheckForErrors(socket, ContactChangeResponse);
     return ContactChangeResponse;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertContactData - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertContactData - ${error}`);
     throw new Error(error);
   }
 }
@@ -362,10 +357,10 @@ async function UpsertVehicleData(socket, ownerRef) {
           //FleetNumber: "String",
           //Status: "String",
           OwnerRef: ownerRef, // "00000000000000000000000000000000",
-          // ModelNumber: socket.JobData.vehicle?.v_makecode,
+          // ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
           Make: socket.JobData.v_make_desc,
           Model: socket.JobData.v_model_desc,
-          Trim: socket.JobData.vehicle?.v_trimcode,
+          Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
           //VehicleType: "String",
           Year: socket.JobData.v_model_yr,
           Odometer: socket.JobData.kmout,
@@ -495,16 +490,14 @@ async function UpsertVehicleData(socket, ownerRef) {
     CheckForErrors(socket, VehicleChangeResponse);
     return VehicleChangeResponse;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
     throw new Error(error);
   }
 }
 
 async function GetVehicleData(socket, ownerRef) {
   try {
-    const {
-      data: { Vehicles }
-    } = await axios.post(
+    const { data: { Vehicles } } = await axios.post(
       PBS_ENDPOINTS.VehicleGet,
       {
         SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
@@ -517,7 +510,7 @@ async function GetVehicleData(socket, ownerRef) {
         // "Trim": "String",
         // "ModelNumber": "String",
         // "StockNumber": "String",
-        VIN: socket.JobData.v_vin
+        VIN: socket.JobData.v_vin,
         // "LicenseNumber": "String",
         // "Lot": "String",
         // "Status": "String",
@@ -535,21 +528,24 @@ async function GetVehicleData(socket, ownerRef) {
         // "LotAccessDivisions": [0],
         // "OdometerTo": 0,
         // "OdometerFrom": 0
-      },
+      }
+      ,
       { auth: PBS_CREDENTIALS, socket }
     );
     CheckForErrors(socket, Vehicles);
     if (Vehicles.length === 1) {
       return Vehicles[0];
+
     } else {
-      WsLogger.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
+      CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
     }
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
     throw new Error(error);
   }
 }
 
+
 async function InsertAccountPostingData(socket) {
   try {
     const allocations = await CalculateAllocations(socket, socket.JobData.id);
@@ -633,8 +629,7 @@ async function InsertAccountPostingData(socket) {
         Posting: {
           Reference: socket.JobData.ro_number,
           JournalCode: socket.txEnvelope.journal,
-          //Sample TransactionDate: "0001-01-01T00:00:00.0000000Z",
-          TransactionDate: moment(socket.JobData.date_invoiced).tz(socket.JobData.bodyshop.timezone).toISOString(),
+          TransactionDate: moment(socket.JobData.date_invoiced).tz(socket.JobData.bodyshop.timezone).toISOString(), //"0001-01-01T00:00:00.0000000Z",
           Description: socket.txEnvelope.story,
           //AdditionalInfo: "String",
           Source: InstanceManager({ imex: "ImEX Online", rome: "Rome Online" }),
@@ -647,15 +642,14 @@ async function InsertAccountPostingData(socket) {
     CheckForErrors(socket, AccountPostingChange);
     return AccountPostingChange;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertAccountPostingData - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertAccountPostingData - ${error}`);
     throw new Error(error);
   }
 }
 
 async function MarkJobExported(socket, jobid) {
-  WsLogger.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-
   const result = await client
     .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.MARK_JOB_EXPORTED, {
@@ -683,52 +677,47 @@ async function MarkJobExported(socket, jobid) {
 async function InsertFailedExportLog(socket, error) {
   try {
     const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-
     const result = await client
       .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
       .request(queries.INSERT_EXPORT_LOG, {
-        logs: [{
+        log: {
           bodyshopid: socket.JobData.bodyshop.id,
           jobid: socket.JobData.id,
           successful: false,
           message: JSON.stringify(error),
           useremail: socket.user.email
-        }]
+        }
       });
 
     return result;
   } catch (error2) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
   }
 }
 
+
 async function CreateRepairOrderInPBS(socket) {
   try {
     const { RepairOrders } = await RepairOrderGet(socket);
     if (RepairOrders.length === 0) {
-      const InsertedRepairOrder = await RepairOrderChange(socket);
+      const InsertedRepairOrder = await RepairOrderChange(socket)
       socket.InsertedRepairOrder = InsertedRepairOrder;
-      WsLogger.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
+      CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
+
     } else if (RepairOrders.length > 0) {
-      //Find out if it's a matching RO.
-      //This logic is used because the integration will simply add another line to an open RO if it exists.
-      const matchingRo = RepairOrders.find((ro) =>
-        ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase())
-      );
+      //Find out if it's a matching RO. 
+      //This logic is used because the integration will simply add another line to an open RO if it exists. 
+      const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
       if (!matchingRo) {
-        WsLogger.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
-        const InsertedRepairOrder = await RepairOrderChange(socket);
+        CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
+        const InsertedRepairOrder = await RepairOrderChange(socket)
         socket.InsertedRepairOrder = InsertedRepairOrder;
       } else {
-        WsLogger.createLogEvent(
-          socket,
-          "WARN",
-          `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`
-        );
+        CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
       }
     }
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
   }
 }
 
@@ -744,7 +733,7 @@ async function RepairOrderGet(socket) {
         // "Tag": "String",
         //"ContactRef": socket.contactRef,
         // "ContactRefList": ["00000000000000000000000000000000"],
-        VehicleRef: socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId
+        "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
         // "VehicleRefList": ["00000000000000000000000000000000"],
         // "Status": "String",
         // "CashieredSince": "0001-01-01T00:00:00.0000000Z",
@@ -760,7 +749,7 @@ async function RepairOrderGet(socket) {
     CheckForErrors(socket, RepairOrderGet);
     return RepairOrderGet;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
     throw new Error(error);
   }
 }
@@ -769,32 +758,31 @@ async function RepairOrderChange(socket) {
   try {
     const { data: RepairOrderChangeResponse } = await axios.post(
       PBS_ENDPOINTS.RepairOrderChange,
-      {
-        //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
-        RepairOrderInfo: {
+      { //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
+        "RepairOrderInfo": {
           //"Id": "string/00000000-0000-0000-0000-000000000000",
           //"RepairOrderId": "00000000000000000000000000000000",
           SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
-          RepairOrderNumber: "00000000000000000000000000000000", //This helps force a new RO.
-          RawRepairOrderNumber: "00000000000000000000000000000000",
+          "RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO. 
+          "RawRepairOrderNumber": "00000000000000000000000000000000",
           // "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
           // "RawRepairOrderNumber": socket.JobData.ro_number,
-          DateOpened: moment(),
+          "DateOpened": moment(),
           // "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
           // "DateCashiered": "0001-01-01T00:00:00.0000000Z",
           // "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
-          DatePromised: socket.JobData.scheduled_completion,
+          "DatePromised": socket.JobData.scheduled_completion,
           // "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
-          DateVehicleCompleted: socket.JobData.actual_completion,
+          "DateVehicleCompleted": socket.JobData.actual_completion,
           // "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
           // "CSR": "String",
           // "CSRRef": "00000000000000000000000000000000",
           // "BookingUser": "String",
           // "BookingUserRef": "00000000000000000000000000000000",
-          ContactRef: socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
-          VehicleRef: socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
-          MileageIn: socket.JobData.km_in,
-          Tag: "BODYSHOP",
+          "ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
+          "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
+          "MileageIn": socket.JobData.km_in,
+          "Tag": "BODYSHOP",
           //"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
           Requests: [
             {
@@ -803,59 +791,61 @@ async function RepairOrderChange(socket) {
               // "CSR": "PBS",
               // "CSRRef": "1ce12ac692564e94bda955d529ee911a",
               // "Skill": "GEN",
-              RequestCode: "MISC",
-              RequestDescription: `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
-              Status: "Completed",
+              "RequestCode": "MISC",
+              "RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
+              "Status": "Completed",
               // "TechRef": "00000000000000000000000000000000",
-              AllowedHours: 0,
-              EstimateLabour: 0,
-              EstimateParts: 0,
-              ComeBack: false,
-              AddedOperation: true,
-              PartLines: [],
-              PartRequestLines: [],
-              LabourLines: [],
-              SubletLines: [],
-              TimePunches: [],
-              Summary: {
-                Labour: 0,
-                Parts: 0,
-                OilGas: 0,
-                SubletTow: 0,
-                Misc: 0,
-                Environment: 0,
-                ShopSupplies: 0,
-                Freight: 0,
-                WarrantyDeductible: 0,
-                Discount: 0,
-                SubTotal: 0,
-                Tax1: 0,
-                Tax2: 0,
-                InvoiceTotal: 0,
-                CustomerDeductible: 0,
-                GrandTotal: 0,
-                LabourDiscount: 0,
-                PartDiscount: 0,
-                ServiceFeeTotal: 0,
-                OEMDiscount: 0
+              "AllowedHours": 0,
+              "EstimateLabour": 0,
+              "EstimateParts": 0,
+              "ComeBack": false,
+              "AddedOperation": true,
+              "PartLines": [],
+              "PartRequestLines": [],
+              "LabourLines": [],
+              "SubletLines": [],
+              "TimePunches": [],
+              "Summary": {
+                "Labour": 0,
+                "Parts": 0,
+                "OilGas": 0,
+                "SubletTow": 0,
+                "Misc": 0,
+                "Environment": 0,
+                "ShopSupplies": 0,
+                "Freight": 0,
+                "WarrantyDeductible": 0,
+                "Discount": 0,
+                "SubTotal": 0,
+                "Tax1": 0,
+                "Tax2": 0,
+                "InvoiceTotal": 0,
+                "CustomerDeductible": 0,
+                "GrandTotal": 0,
+                "LabourDiscount": 0,
+                "PartDiscount": 0,
+                "ServiceFeeTotal": 0,
+                "OEMDiscount": 0
               },
-              LineType: "RequestLine"
-            }
+              "LineType": "RequestLine",
+            },
           ],
 
-          Memo: socket.txEnvelope.story
+          "Memo": socket.txEnvelope.story,
+
         },
-        IsAsynchronous: false
+        "IsAsynchronous": false,
         // "UserRequest": "String",
         // "UserRef": "00000000000000000000000000000000"
-      },
+      }
 
+      ,
       { auth: PBS_CREDENTIALS, socket }
     );
     CheckForErrors(socket, RepairOrderChangeResponse);
     return RepairOrderChangeResponse;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
     throw new Error(error);
   }
-}
+}

server/cdk/cdk-calculate-allocations.js

@@ -1,11 +1,10 @@
 const GraphQLClient = require("graphql-request").GraphQLClient;
 
 const queries = require("../graphql-client/queries");
-const CreateFortellisLogEvent = require("../fortellis/fortellis-logger");
+const CdkBase = require("../web-sockets/web-socket");
+
 const Dinero = require("dinero.js");
 const _ = require("lodash");
-const WsLogger = require("../web-sockets/createLogEvent");
-
 const InstanceManager = require("../utils/instanceMgr").default;
 const { DiscountNotAlreadyCounted } = InstanceManager({
   imex: require("../job/job-totals"),
@@ -14,40 +13,37 @@ const { DiscountNotAlreadyCounted } = InstanceManager({
 
 exports.defaultRoute = async function (req, res) {
   try {
-    WsLogger.createLogEvent(req, "DEBUG", `Received request to calculate allocations for ${req.body.jobid}`);
+    CdkBase.createLogEvent(req, "DEBUG", `Received request to calculate allocations for ${req.body.jobid}`);
     const jobData = await QueryJobData(req, req.BearerToken, req.body.jobid);
     return res.status(200).json({ data: calculateAllocations(req, jobData) });
   } catch (error) {
-    WsLogger.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
-    WsLogger.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error.stack}`);
+    ////console.log(error);
+    CdkBase.createLogEvent(req, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
     res.status(500).json({ error: `Error encountered in CdkCalculateAllocations. ${error}` });
   }
 };
 
-exports.default = async function (socket, jobid, isFortellis = false) {
+exports.default = async function (socket, jobid) {
   try {
-    const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid, isFortellis);
-    return calculateAllocations(socket, jobData, isFortellis);
+    const jobData = await QueryJobData(socket, "Bearer " + socket.handshake.auth.token, jobid);
+    return calculateAllocations(socket, jobData);
   } catch (error) {
-    const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
-    loggingFunction(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
-    loggingFunction(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error.stack}`);
+    ////console.log(error);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkCalculateAllocations. ${error}`);
   }
 };
 
-async function QueryJobData(connectionData, token, jobid, isFortellis) {
-  const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
-
-  loggingFunction(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
+async function QueryJobData(connectionData, token, jobid) {
+  CdkBase.createLogEvent(connectionData, "DEBUG", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
   const result = await client.setHeaders({ Authorization: token }).request(queries.GET_CDK_ALLOCATIONS, { id: jobid });
-  //loggingFunction(connectionData, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(connectionData, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
-function calculateAllocations(connectionData, job, isFortellis) {
+function calculateAllocations(connectionData, job) {
   const { bodyshop } = job;
-  const loggingFunction = isFortellis ? CreateFortellisLogEvent : WsLogger.createLogEvent;
+
   const taxAllocations = InstanceManager({
     executeFunction: true,
     deubg: true,
@@ -163,7 +159,7 @@ function calculateAllocations(connectionData, job, isFortellis) {
   const selectedDmsAllocationConfig = bodyshop.md_responsibility_centers.dms_defaults.find(
     (d) => d.name === job.dms_allocation
   );
-  loggingFunction(
+  CdkBase.createLogEvent(
     connectionData,
     "DEBUG",
     `Using DMS Allocation ${selectedDmsAllocationConfig && selectedDmsAllocationConfig.name} for cost export.`
@@ -364,10 +360,10 @@ function calculateAllocations(connectionData, job, isFortellis) {
           Dinero(job.job_totals.parts.adjustments[key])
         );
       } else {
-        loggingFunction(
+        CdkBase.createLogEvent(
           connectionData,
           "ERROR",
-          `Error encountered in CdkCalculateAllocations. Unable to find adjustment account: ${accountName}`
+          `Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
         );
       }
     });
@@ -387,10 +383,10 @@ function calculateAllocations(connectionData, job, isFortellis) {
             Dinero(job.job_totals.rates[key].adjustments)
           );
         } else {
-          loggingFunction(
+          CdkBase.createLogEvent(
             connectionData,
             "ERROR",
-            `Error encountered in CdkCalculateAllocations. Unable to find adjustment account: ${accountName}`
+            `Error encountered in CdkCalculateAllocations. Unable to find adjustment account. ${error}`
           );
         }
       }

server/cdk/cdk-get-makes.js

@@ -5,12 +5,6 @@ const CdkWsdl = require("./cdk-wsdl").default;
 const logger = require("../utils/logger");
 
 const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
-const {
-  MakeFortellisCall,
-  FortellisActions,
-  GetAuthToken,
-  GetDepartmentId
-} = require("../fortellis/fortellis-helpers");
 
 // exports.default = async function (socket, cdk_dealerid) {
 //   try {
@@ -111,85 +105,3 @@ async function GetCdkMakes(req, cdk_dealerid) {
     throw new Error(error);
   }
 }
-
-async function GetFortellisMakes(req, cdk_dealerid) {
-  logger.log("fortellis-replace-makes-models", "DEBUG", req.user.email, null, {
-    cdk_dealerid
-  });
-  try {
-    const result = await MakeFortellisCall({
-      ...FortellisActions.GetMakeModel,
-      headers: {},
-      redisHelpers: {
-        setSessionTransactionData: () => {
-          return null;
-        },
-        getSessionTransactionData: () => {
-          return null;
-        }
-      },
-      socket: { emit: () => null },
-      jobid: null,
-      body: {},
-      SubscriptionObject: {
-        SubscriptionID: cdk_dealerid
-      }
-    });
-
-    logger.log("fortellis-replace-makes-models-response", "ERROR", req.user.email, null, {
-      cdk_dealerid,
-      xml: result
-    });
-    return result.data;
-  } catch (error) {
-    logger.log("fortellis-replace-makes-models-error", "ERROR", req.user.email, null, {
-      cdk_dealerid,
-      error
-    });
-
-    throw new Error(error);
-  }
-}
-
-exports.fortellis = async function ReloadFortellisMakes(req, res) {
-  const { bodyshopid, cdk_dealerid } = req.body;
-  try {
-    //Query all CDK Models
-    const newList = await GetFortellisMakes(req, cdk_dealerid);
-
-    const BearerToken = req.BearerToken;
-    const client = req.userGraphQLClient;
-
-    const deleteResult = await client
-      .setHeaders({ Authorization: BearerToken })
-      .request(queries.DELETE_ALL_DMS_VEHICLES, {});
-
-    //Insert the new ones.
-
-    const insertResult = await client.setHeaders({ Authorization: BearerToken }).request(queries.INSERT_DMS_VEHICLES, {
-      vehicles: newList.map((i) => {
-        return {
-          bodyshopid,
-          makecode: i.makeCode,
-          modelcode: i.modelCode,
-          make: i.makeFullName,
-          model: i.modelFullName
-        };
-      })
-    });
-
-    logger.log("fortellis-replace-makes-models-success", "DEBUG", req.user.email, null, {
-      cdk_dealerid,
-      count: newList.length
-    });
-
-    res.sendStatus(200);
-  } catch (error) {
-    logger.log("fortellis-replace-makes-models-error", "ERROR", req.user.email, null, {
-      cdk_dealerid,
-      error: error.message,
-      stack: error.stack
-    });
-    res.status(500).json(error);
-  }
-};

server/cdk/cdk-job-export.js

@@ -1,36 +1,33 @@
 const GraphQLClient = require("graphql-request").GraphQLClient;
 const soap = require("soap");
 const queries = require("../graphql-client/queries");
+const CdkBase = require("../web-sockets/web-socket");
 const CdkWsdl = require("./cdk-wsdl").default;
 const { CDK_CREDENTIALS, CheckCdkResponseForError } = require("./cdk-wsdl");
 const CalcualteAllocations = require("./cdk-calculate-allocations").default;
 const InstanceMgr = require("../utils/instanceMgr").default;
-const WsLogger = require("../web-sockets/createLogEvent");
 
 const moment = require("moment-timezone");
 
 const replaceSpecialRegex = /[^a-zA-Z0-9 .,\n #]+/g;
 
-const defaultHandler = async (socket, { txEnvelope, jobid }) => {
-  ////Store the following information into the redis store for this transaction.
+exports.default = async function (socket, { txEnvelope, jobid }) {
   socket.logEvents = [];
   socket.recordid = jobid;
   socket.txEnvelope = txEnvelope;
-  ////
-
   try {
-    WsLogger.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
 
     const JobData = await QueryJobData(socket, jobid);
     socket.JobData = JobData;
     const DealerId = JobData.bodyshop.cdk_dealerid;
-    WsLogger.createLogEvent(socket, "DEBUG", `Dealer ID detected: ${JSON.stringify(DealerId)}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Dealer ID detected: ${JSON.stringify(DealerId)}`);
 
-    WsLogger.createLogEvent(socket, "DEBUG", `{1} Begin Calculate DMS Vehicle ID using VIN: ${JobData.v_vin}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `{1} Begin Calculate DMS Vehicle ID using VIN: ${JobData.v_vin}`);
     socket.DMSVid = await CalculateDmsVid(socket, JobData);
 
     if (socket.DMSVid.newId === "N") {
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "DEBUG",
         `{2.1} Querying the Vehicle using the DMSVid: ${socket.DMSVid.vehiclesVehId}`
@@ -38,10 +35,10 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
       socket.DMSVeh = await QueryDmsVehicleById(socket, JobData, socket.DMSVid);
 
       const DMSVehCustomer =
-        socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
+        socket.DMSVeh && socket.DMSVeh.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
 
-      if (DMSVehCustomer?.id && DMSVehCustomer.id.value) {
-        WsLogger.createLogEvent(
+      if (DMSVehCustomer && DMSVehCustomer.id && DMSVehCustomer.id.value) {
+        CdkBase.createLogEvent(
           socket,
           "DEBUG",
           `{2.2} Querying the Customer using the ID from DMSVeh: ${DMSVehCustomer.id.value}`
@@ -50,7 +47,7 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
       }
     }
 
-    WsLogger.createLogEvent(socket, "DEBUG", `{2.3} Querying the Customer using the name.`);
+    CdkBase.createLogEvent(socket, "DEBUG", `{2.3} Querying the Customer using the name.`);
 
     socket.DMSCustList = await QueryDmsCustomerByName(socket, JobData);
 
@@ -59,48 +56,43 @@ const defaultHandler = async (socket, { txEnvelope, jobid }) => {
       ...socket.DMSCustList
     ]);
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error encountered in CdkJobExport. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkJobExport. ${error}`);
   }
 };
-exports.default = defaultHandler;
 
 async function CdkSelectedCustomer(socket, selectedCustomerId) {
   try {
     socket.selectedCustomerId = selectedCustomerId;
     if (selectedCustomerId) {
-      WsLogger.createLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
       socket.DMSCust = await QueryDmsCustomerById(socket, socket.JobData, selectedCustomerId);
     } else {
-      WsLogger.createLogEvent(socket, "DEBUG", `{3.2} Generating a new customer ID.`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{3.2} Generating a new customer ID.`);
       const newCustomerId = await GenerateDmsCustomerNumber(socket);
-      WsLogger.createLogEvent(socket, "DEBUG", `{3.3} Inserting new customer with ID: ${newCustomerId}`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{3.3} Inserting new customer with ID: ${newCustomerId}`);
       socket.DMSCust = await InsertDmsCustomer(socket, newCustomerId);
     }
 
     if (socket.DMSVid.newId === "Y") {
-      WsLogger.createLogEvent(
-        socket,
-        "DEBUG",
-        `{4.1} Inserting new vehicle with ID: ID ${socket.DMSVid.vehiclesVehId}`
-      );
+      CdkBase.createLogEvent(socket, "DEBUG", `{4.1} Inserting new vehicle with ID: ID ${socket.DMSVid.vehiclesVehId}`);
       socket.DMSVeh = await InsertDmsVehicle(socket);
     } else {
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "DEBUG",
         `{4.2} Querying Existing Vehicle using ID ${socket.DMSVid.vehiclesVehId}`
       );
       socket.DMSVeh = await QueryDmsVehicleById(socket, socket.JobData, socket.DMSVid);
-      WsLogger.createLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
       socket.DMSVeh = await UpdateDmsVehicle(socket);
     }
 
-    WsLogger.createLogEvent(socket, "DEBUG", `{5} Creating Transaction header with Dms Start WIP`);
+    CdkBase.createLogEvent(socket, "DEBUG", `{5} Creating Transaction header with Dms Start WIP`);
     socket.DMSTransHeader = await InsertDmsStartWip(socket);
-    WsLogger.createLogEvent(socket, "DEBUG", `{5.1} Creating Transaction with ID ${socket.DMSTransHeader.transID}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `{5.1} Creating Transaction with ID ${socket.DMSTransHeader.transID}`);
 
     socket.DMSBatchTxn = await InsertDmsBatchWip(socket);
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "DEBUG",
       `{6} Attempting to post Transaction with ID ${socket.DMSTransHeader.transID}`
@@ -108,23 +100,23 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
     socket.DmsBatchTxnPost = await PostDmsBatchWip(socket);
     if (socket.DmsBatchTxnPost.code === "success") {
       //something
-      WsLogger.createLogEvent(socket, "DEBUG", `{6} Successfully posted sransaction to DMS.`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{6} Successfully posted sransaction to DMS.`);
 
       await MarkJobExported(socket, socket.JobData.id);
 
-      WsLogger.createLogEvent(socket, "DEBUG", `{5} Updating Service Vehicle History.`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{5} Updating Service Vehicle History.`);
       socket.DMSVehHistory = await InsertServiceVehicleHistory(socket);
       socket.emit("export-success", socket.JobData.id);
     } else {
       //Get the error code
-      WsLogger.createLogEvent(
+      CdkBase.createLogEvent(
         socket,
         "DEBUG",
         `{6.1} Getting errors for Transaction ID ${socket.DMSTransHeader.transID}`
       );
       socket.DmsError = await QueryDmsErrWip(socket);
       //Delete the transaction
-      WsLogger.createLogEvent(socket, "DEBUG", `{6.2} Deleting Transaction ID ${socket.DMSTransHeader.transID}`);
+      CdkBase.createLogEvent(socket, "DEBUG", `{6.2} Deleting Transaction ID ${socket.DMSTransHeader.transID}`);
       socket.DmsBatchTxnPost = await DeleteDmsWip(socket);
 
       socket.DmsError.errMsg
@@ -133,33 +125,29 @@ async function CdkSelectedCustomer(socket, selectedCustomerId) {
           (e) =>
             e !== null &&
             e !== "" &&
-            WsLogger.createLogEvent(socket, "ERROR", `Error(s) encountered in posting transaction. ${e}`)
+            CdkBase.createLogEvent(socket, "ERROR", `Error(s) encountered in posting transaction. ${e}`)
         );
     }
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
     await InsertFailedExportLog(socket, error);
   } finally {
     //Ensure we always insert logEvents
     //GQL to insert logevents.
 
-    WsLogger.createLogEvent(socket, "DEBUG", `Capturing log events to database.`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Capturing log events to database.`);
   }
 }
 
 exports.CdkSelectedCustomer = CdkSelectedCustomer;
 
 async function QueryJobData(socket, jobid) {
-  WsLogger.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-  const currentToken =
-    (socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
-
   const result = await client
-    .setHeaders({ Authorization: `Bearer ${currentToken}` })
+    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.QUERY_JOBS_FOR_CDK_EXPORT, { id: jobid });
-
-  //WsLogger.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
   return result.jobs_by_pk;
 }
 
@@ -173,11 +161,11 @@ async function CalculateDmsVid(socket, JobData) {
     });
 
     const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`);
 
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.getVehIdsAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.getVehIdsAsync response.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientVehicleInsertUpdate.getVehIdsAsync Result ${JSON.stringify(result, null, 2)}`
@@ -190,15 +178,15 @@ async function CalculateDmsVid(socket, JobData) {
 
     //return result && result.return && result.return[0];
   } catch (error) {
-    WsLogger.createXmlEvent(socket, error.request, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`, true);
+    CdkBase.createXmlEvent(socket, error.request, `soapClientVehicleInsertUpdate.getVehIdsAsync request.`, true);
 
-    WsLogger.createXmlEvent(
+    CdkBase.createXmlEvent(
       socket,
-      error.response?.data,
+      error.response && error.response.data,
       `soapClientVehicleInsertUpdate.getVehIdsAsync response.`,
       true
     );
-    WsLogger.createLogEvent(socket, "ERROR", `{1} Error in CalculateDmsVid - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `{1} Error in CalculateDmsVid - ${error}`);
     throw new Error(error);
   }
 }
@@ -218,19 +206,19 @@ async function QueryDmsVehicleById(socket, JobData, DMSVid) {
 
     const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.readAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.readAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientVehicleInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.readAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.readAsync response.`);
     CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
-    const VehicleFromDMS = result?.return && result.return.vehicle;
+    const VehicleFromDMS = result && result.return && result.return.vehicle;
     return VehicleFromDMS;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsVehicleById - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsVehicleById - ${error}`);
     throw new Error(error);
   }
 }
@@ -249,23 +237,28 @@ async function QueryDmsCustomerById(socket, JobData, CustomerId) {
 
     const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.readAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.readAsync request.`);
 
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.readAsync response.`);
-    WsLogger.createLogEvent(
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.readAsync response.`);
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientCustomerInsertUpdate.readAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
-    const CustomersFromDms = result?.return && result.return.customerParty;
+    const CustomersFromDms = result && result.return && result.return.customerParty;
     return CustomersFromDms;
   } catch (error) {
-    WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.readAsync request.`, true);
+    CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.readAsync request.`, true);
 
-    WsLogger.createXmlEvent(socket, error.response?.data, `soapClientCustomerInsertUpdate.readAsync response.`, true);
+    CdkBase.createXmlEvent(
+      socket,
+      error.response && error.response.data,
+      `soapClientCustomerInsertUpdate.readAsync response.`,
+      true
+    );
 
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerById - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerById - ${error}`);
     throw new Error(error);
   }
 }
@@ -277,7 +270,7 @@ async function QueryDmsCustomerByName(socket, JobData) {
       : `${JobData.ownr_ln},${JobData.ownr_fn}`
   ).replace(replaceSpecialRegex, "");
 
-  WsLogger.createLogEvent(socket, "DEBUG", `Begin Query DMS Customer by Name using: ${ownerName}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Begin Query DMS Customer by Name using: ${ownerName}`);
 
   try {
     const soapClientCustomerSearch = await soap.createClientAsync(CdkWsdl.CustomerSearch);
@@ -292,29 +285,29 @@ async function QueryDmsCustomerByName(socket, JobData) {
 
     const [result, rawResponse, , rawRequest] = soapResponseCustomerSearch;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerSearch.executeSearchBulkAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerSearch.executeSearchBulkAsync request.`);
 
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerSearch.executeSearchBulkAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerSearch.executeSearchBulkAsync response.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientCustomerSearch.executeSearchBulkAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerSearch);
-    const CustomersFromDms = result?.return || [];
+    const CustomersFromDms = (result && result.return) || [];
     return CustomersFromDms;
   } catch (error) {
-    WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerSearch.executeSearchBulkAsync request.`, true);
+    CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerSearch.executeSearchBulkAsync request.`, true);
 
-    WsLogger.createXmlEvent(
+    CdkBase.createXmlEvent(
       socket,
-      error.response?.data,
+      error.response && error.response.data,
       `soapClientCustomerSearch.executeSearchBulkAsync response.`,
       true
     );
 
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerByName - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsCustomerByName - ${error}`);
     throw new Error(error);
   }
 }
@@ -325,8 +318,7 @@ async function GenerateDmsCustomerNumber(socket) {
     const soapResponseCustomerInsertUpdate = await soapClientCustomerInsertUpdate.getCustomerNumberAsync(
       {
         arg0: CDK_CREDENTIALS,
-        //TODO: Verify why this does not follow the other standards.
-        arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid },
+        arg1: { dealerId: socket.JobData.bodyshop.cdk_dealerid }, //TODO: Verify why this does not follow the other standards.
         arg2: { userId: null }
       },
 
@@ -335,33 +327,33 @@ async function GenerateDmsCustomerNumber(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`);
 
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientCustomerInsertUpdate.getCustomerNumberAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
-    const customerNumber = result?.return && result.return.customerNumber;
+    const customerNumber = result && result.return && result.return.customerNumber;
     return customerNumber;
   } catch (error) {
-    WsLogger.createXmlEvent(
+    CdkBase.createXmlEvent(
       socket,
       error.request,
       `soapClientCustomerInsertUpdate.getCustomerNumberAsync request.`,
       true
     );
 
-    WsLogger.createXmlEvent(
+    CdkBase.createXmlEvent(
       socket,
-      error.response?.data,
+      error.response && error.response.data,
       `soapClientCustomerInsertUpdate.getCustomerNumberAsync response.`,
       true
     );
-    WsLogger.createLogEvent(socket, "ERROR", `Error in GenerateDmsCustomerNumber - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in GenerateDmsCustomerNumber - ${error}`);
     throw new Error(error);
   }
 }
@@ -424,22 +416,27 @@ async function InsertDmsCustomer(socket, newCustomerNumber) {
     );
 
     const [result, rawResponse, , rawRequest] = soapResponseCustomerInsertUpdate;
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.insertAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientCustomerInsertUpdate.insertAsync request.`);
 
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.insertAsync response.`);
-    WsLogger.createLogEvent(
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientCustomerInsertUpdate.insertAsync response.`);
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientCustomerInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
     );
     CheckCdkResponseForError(socket, soapResponseCustomerInsertUpdate);
-    const customer = result?.return && result.return.customerParty;
+    const customer = result && result.return && result.return.customerParty;
     return customer;
   } catch (error) {
-    WsLogger.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.insertAsync request.`, true);
+    CdkBase.createXmlEvent(socket, error.request, `soapClientCustomerInsertUpdate.insertAsync request.`, true);
 
-    WsLogger.createXmlEvent(socket, error.response?.data, `soapClientCustomerInsertUpdate.insertAsync response.`, true);
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsCustomer - ${error}`);
+    CdkBase.createXmlEvent(
+      socket,
+      error.response && error.response.data,
+      `soapClientCustomerInsertUpdate.insertAsync response.`,
+      true
+    );
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsCustomer - ${error}`);
     throw new Error(error);
   }
 }
@@ -500,19 +497,19 @@ async function InsertDmsVehicle(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.insertAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.insertAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientVehicleInsertUpdate.insertAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.insertAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.insertAsync response.`);
     CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
-    const VehicleFromDMS = result?.return && result.return.vehicle;
+    const VehicleFromDMS = result && result.return && result.return.vehicle;
     return VehicleFromDMS;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsVehicle - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsVehicle - ${error}`);
     throw new Error(error);
   }
 }
@@ -526,10 +523,12 @@ async function UpdateDmsVehicle(socket) {
     //if it's a generic customer, don't update the vehicle owners.
 
     if (socket.selectedCustomerId === socket.JobData.bodyshop.cdk_configuration.generic_customer_number) {
-      ids = socket.DMSVeh?.owners && socket.DMSVeh.owners;
+      ids = socket.DMSVeh && socket.DMSVeh.owners && socket.DMSVeh.owners;
     } else {
       const existingOwnerinVeh =
-        socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.value === socket.DMSCust.id.value);
+        socket.DMSVeh &&
+        socket.DMSVeh.owners &&
+        socket.DMSVeh.owners.find((o) => o.id.value === socket.DMSCust.id.value);
 
       if (existingOwnerinVeh) {
         ids = socket.DMSVeh.owners.map((o) => {
@@ -541,7 +540,10 @@ async function UpdateDmsVehicle(socket) {
           };
         });
       } else {
-        const oldOwner = socket.DMSVeh?.owners && socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
+        const oldOwner =
+          socket.DMSVeh &&
+          socket.DMSVeh.owners &&
+          socket.DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
 
         ids = [
           {
@@ -601,19 +603,19 @@ async function UpdateDmsVehicle(socket) {
     });
     const [result, rawResponse, , rawRequest] = soapResponseVehicleInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.updateAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientVehicleInsertUpdate.updateAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "DEBUG",
       `soapClientVehicleInsertUpdate.updateAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.updateAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientVehicleInsertUpdate.updateAsync response.`);
     CheckCdkResponseForError(socket, soapResponseVehicleInsertUpdate);
-    const VehicleFromDMS = result?.return && result.return.vehicle;
+    const VehicleFromDMS = result && result.return && result.return.vehicle;
     return VehicleFromDMS;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in UpdateDmsVehicle - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpdateDmsVehicle - ${error}`);
     throw new Error(error);
   }
 }
@@ -640,18 +642,18 @@ async function InsertServiceVehicleHistory(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseServiceHistoryInsert;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientServiceHistoryInsert.serviceHistoryHeaderInsert response.`);
     CheckCdkResponseForError(socket, soapResponseServiceHistoryInsert);
-    return result?.return;
+    return result && result.return;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertServiceVehicleHistory - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertServiceVehicleHistory - ${error}`);
     throw new Error(error);
   }
 }
@@ -667,10 +669,8 @@ async function InsertDmsStartWip(socket) {
         acctgDate: moment().tz(socket.JobData.bodyshop.timezone).format("YYYY-MM-DD"),
         //socket.JobData.invoice_date
         desc: socket.txEnvelope.story && socket.txEnvelope.story.replace(replaceSpecialRegex, ""),
-        docType: 10, // Need to check what this usually would be? Apparently it is almost always 10 or 7.
-        //1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair
-        // Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge,
-        // 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo
+        docType: 10 || 7, //Need to check what this usually would be? Apparently it is almost always 10 or 7.
+        //1 Cash Receipt , 2 Check, 3 Journal Voucher, 4 Parts invoice, 5 Payable Invoice, 6 Recurring Entry, 7 Repair Order Invoice, 8 Vehicle Purchase Invoice, 9 Vehicle Sale Invoice, 10 Other, 11 Payroll, 12 Finance Charge, 13 FMLR Invoice, 14 Parts Credit Memo, 15 Manufacturer Document, 16 FMLR Credit Memo
         m13Flag: 0,
         refer: socket.JobData.ro_number,
         srcCo: socket.JobData.bodyshop.cdk_configuration.srcco,
@@ -682,19 +682,19 @@ async function InsertDmsStartWip(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doStartWIPAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doStartWIPAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientAccountingGLInsertUpdate.doStartWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doStartWIPAsync response.`);
     CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
-    const TransactionHeader = result?.return;
+    const TransactionHeader = result && result.return;
     return TransactionHeader;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsStartWip - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsStartWip - ${error}`);
     throw new Error(error);
   }
 }
@@ -713,19 +713,19 @@ async function InsertDmsBatchWip(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doTransBatchWIPAsync response.`);
     CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
-    const BatchWipResult = result?.return;
+    const BatchWipResult = result && result.return;
     return BatchWipResult;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertDmsBatchWip - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertDmsBatchWip - ${error}`);
     throw new Error(error);
   }
 }
@@ -877,19 +877,19 @@ async function PostDmsBatchWip(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
     // CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
-    const PostResult = result?.return;
+    const PostResult = result && result.return;
     return PostResult;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
     throw new Error(error);
   }
 }
@@ -906,19 +906,19 @@ async function QueryDmsErrWip(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doErrWIPAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doErrWIPAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "DEBUG",
       `soapClientAccountingGLInsertUpdate.doErrWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doErrWIPAsync response.`);
     CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
-    const PostResult = result?.return;
+    const PostResult = result && result.return;
     return PostResult;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in QueryDmsErrWip - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in QueryDmsErrWip - ${error}`);
     throw new Error(error);
   }
 }
@@ -937,31 +937,28 @@ async function DeleteDmsWip(socket) {
 
     const [result, rawResponse, , rawRequest] = soapResponseAccountingGLInsertUpdate;
 
-    WsLogger.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
+    CdkBase.createXmlEvent(socket, rawRequest, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync request.`);
 
-    WsLogger.createLogEvent(
+    CdkBase.createLogEvent(
       socket,
       "SILLY",
       `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync Result ${JSON.stringify(result, null, 2)}`
     );
-    WsLogger.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
+    CdkBase.createXmlEvent(socket, rawResponse, `soapClientAccountingGLInsertUpdate.doPostBatchWIPAsync response.`);
     CheckCdkResponseForError(socket, soapResponseAccountingGLInsertUpdate);
-    const PostResult = result?.return;
+    const PostResult = result && result.return;
     return PostResult;
   } catch (error) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in PostDmsBatchWip - ${error}`);
     throw new Error(error);
   }
 }
 
 async function MarkJobExported(socket, jobid) {
-  WsLogger.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
   const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-  const currentToken =
-    (socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
-
   const result = await client
-    .setHeaders({ Authorization: `Bearer ${currentToken}` })
+    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
     .request(queries.MARK_JOB_EXPORTED, {
       jobId: jobid,
       job: {
@@ -987,23 +984,20 @@ async function MarkJobExported(socket, jobid) {
 async function InsertFailedExportLog(socket, error) {
   try {
     const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
-    const currentToken =
-      (socket?.data && socket.data.authToken) || (socket?.handshake?.auth && socket.handshake.auth.token);
-
     const result = await client
-      .setHeaders({ Authorization: `Bearer ${currentToken}` })
+      .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
       .request(queries.INSERT_EXPORT_LOG, {
-        logs: [{
+        log: {
           bodyshopid: socket.JobData.bodyshop.id,
           jobid: socket.JobData.id,
           successful: false,
           message: JSON.stringify(error),
           useremail: socket.user.email
-        }]
+        }
       });
 
     return result;
   } catch (error2) {
-    WsLogger.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
   }
 }

server/data/autohouse.js

@@ -736,7 +736,7 @@ const CreateCosts = (job) => {
     PASL: "PASL"
   };
   const defaultCosts =
-    job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber || job.bodyshop.rr_dealerid
+    job.bodyshop.cdk_dealerid || job.bodyshop.pbs_serialnumber
       ? ciecaObj
       : job.bodyshop.md_responsibility_centers.defaults.costs;
 

server/data/carfax-rps.js

@@ -117,44 +117,46 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         json: JSON.stringify(carfaxObject, null, 2),
         filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
-        count: carfaxObject.job.length
+        count: carfaxObject?.job?.length || 0
       };
 
       if (skipUpload) {
         fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
         uploadToS3(jsonObj, S3_BUCKET_NAME);
       } else {
-        await uploadViaSFTP(jsonObj);
+        if (jsonObj.count > 0) {
+          await uploadViaSFTP(jsonObj);
 
-        await sendMexicoBillingEmail({
-          subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
-          text: `Errors:\n${JSON.stringify(
-            erroredJobs.map((ej) => ({
-              jobid: ej.job?.id,
-              error: ej.error
-            })),
-            null,
-            2
-          )}\n\nUploaded:\n${JSON.stringify(
-            {
-              bodyshopid: bodyshop.id,
-              imexshopid: shopid,
-              count: jsonObj.count,
-              filename: jsonObj.filename,
-              result: jsonObj.result
-            },
-            null,
-            2
-          )}`
-        });
+          await sendMexicoBillingEmail({
+            subject: `${shopid.replace(/_/g, "").toUpperCase()}_MexicoRPS_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+            text: `Errors:\n${JSON.stringify(
+              erroredJobs.map((ej) => ({
+                jobid: ej.job?.id,
+                error: ej.error
+              })),
+              null,
+              2
+            )}\n\nUploaded:\n${JSON.stringify(
+              {
+                bodyshopid: bodyshop.id,
+                imexshopid: shopid,
+                count: jsonObj.count,
+                filename: jsonObj.filename,
+                result: jsonObj.result
+              },
+              null,
+              2
+            )}`
+          });
+        }
       }
 
-      allJSONResults.push({
+      jsonObj.count > 0 && allJSONResults.push({
         bodyshopid: bodyshop.id,
         imexshopid: shopid,
         count: jsonObj.count,
         filename: jsonObj.filename,
-        result: jsonObj.result
+        result: jsonObj.result || "No Upload Result Available"
       });
 
       logger.log("CARFAX-RPS-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -234,11 +236,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     const ret = {
       ro_number: crypto.createHash("md5").update(job.id, "utf8").digest("hex"),
       v_vin: job.v_vin || "",
-      v_year: job.v_model_yr
-        ? parseInt(job.v_model_yr.match(/\d/g))
-          ? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
-          : ""
-        : "",
+      v_year: (() => {
+        const y = parseInt(job.v_model_yr);
+        return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
+      })(),
       v_make: job.v_makedesc || "",
       v_model: job.v_model || "",
 

server/data/carfax.js

@@ -160,40 +160,42 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         json: JSON.stringify(carfaxObject, null, 2),
         filename: `${shopid}_${moment().format("DDMMYYYY_HHMMss")}.json`,
-        count: carfaxObject.job.length
+        count: carfaxObject?.job?.length || 0
       };
 
       if (skipUpload) {
         fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
         uploadToS3(jsonObj);
       } else {
-        await uploadViaSFTP(jsonObj);
+        if (jsonObj.count > 0) {
+          await uploadViaSFTP(jsonObj);
 
-        await sendMexicoBillingEmail({
-          subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
-            imex: "IO",
-            rome: "RO"
-          })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
-          text: `Errors:\n${JSON.stringify(
-            erroredJobs.map((ej) => ({
-              ro_number: ej.job?.ro_number,
-              jobid: ej.job?.id,
-              error: ej.error
-            })),
-            null,
-            2
-          )}\n\nUploaded:\n${JSON.stringify(
-            {
-              bodyshopid: bodyshop.id,
-              imexshopid: shopid,
-              count: jsonObj.count,
-              filename: jsonObj.filename,
-              result: jsonObj.result
-            },
-            null,
-            2
-          )}`
-        });
+          await sendMexicoBillingEmail({
+            subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
+              imex: "IO",
+              rome: "RO"
+            })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+            text: `Errors:\n${JSON.stringify(
+              erroredJobs.map((ej) => ({
+                ro_number: ej.job?.ro_number,
+                jobid: ej.job?.id,
+                error: ej.error
+              })),
+              null,
+              2
+            )}\n\nUploaded:\n${JSON.stringify(
+              {
+                bodyshopid: bodyshop.id,
+                imexshopid: shopid,
+                count: jsonObj.count,
+                filename: jsonObj.filename,
+                result: jsonObj.result
+              },
+              null,
+              2
+            )}`
+          });
+        }
       }
 
       allJSONResults.push({
@@ -201,7 +203,7 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat
         imexshopid: shopid,
         count: jsonObj.count,
         filename: jsonObj.filename,
-        result: jsonObj.result
+        result: jsonObj.result || "No Upload Result Available"
       });
 
       logger.log("CARFAX-end-shop-extract", "DEBUG", "api", bodyshop.id, {
@@ -286,11 +288,10 @@ const CreateRepairOrderTag = (job, errorCallback) => {
     const ret = {
       ro_number: crypto.createHash("md5").update(job.ro_number, "utf8").digest("hex"),
       v_vin: job.v_vin || "",
-      v_year: job.v_model_yr
-        ? parseInt(job.v_model_yr.match(/\d/g))
-          ? parseInt(job.v_model_yr.match(/\d/g).join(""), 10)
-          : ""
-        : "",
+      v_year: (() => {
+        const y = parseInt(job.v_model_yr);
+        return isNaN(y) ? null : y < 100 ? y + (y >= (new Date().getFullYear() + 1) % 100 ? 1900 : 2000) : y;
+      })(),
       v_make: job.v_make_desc || "",
       v_model: job.v_model_desc || "",