IO-3515 Minor improvements to Bill AI.

feature/IO-3523-Fortellis-Corrections-2 - Fix

Approved-by: Allan Carr

.ebignore

@@ -13,4 +13,5 @@
 .env.development.local
 .env.test.local
 .env.production.local
-bodyshop_translations.babel
+.env.localstack.docker
+bodyshop_translations.babel

client/package-lock.json

@@ -12,6 +12,10 @@
         "@amplitude/analytics-browser": "^2.34.0",
         "@ant-design/pro-layout": "^7.22.6",
         "@apollo/client": "^4.1.3",
+        "@dnd-kit/core": "^6.3.1",
+        "@dnd-kit/modifiers": "^9.0.0",
+        "@dnd-kit/sortable": "^10.0.0",
+        "@dnd-kit/utilities": "^3.2.2",
         "@emotion/is-prop-valid": "^1.4.0",
         "@fingerprintjs/fingerprintjs": "^5.0.1",
         "@firebase/analytics": "^0.10.19",
@@ -60,7 +64,6 @@
         "react-color": "^2.19.3",
         "react-cookie": "^8.0.1",
         "react-dom": "^19.2.4",
-        "react-drag-listview": "^2.0.0",
         "react-grid-gallery": "^1.0.1",
         "react-grid-layout": "^2.2.2",
         "react-i18next": "^16.5.4",
@@ -2494,6 +2497,73 @@
         "node": ">=10"
       }
     },
+    "node_modules/@dnd-kit/accessibility": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
+      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/core": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
+      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/accessibility": "^3.1.1",
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0",
+        "react-dom": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/modifiers": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/modifiers/-/modifiers-9.0.0.tgz",
+      "integrity": "sha512-ybiLc66qRGuZoC20wdSSG6pDXFikui/dCNGthxv4Ndy8ylErY0N3KVxY2bgo7AWwIbxDmXDg3ylAFmnrjcbVvw==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@dnd-kit/core": "^6.3.0",
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/sortable": {
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
+      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
+      "license": "MIT",
+      "dependencies": {
+        "@dnd-kit/utilities": "^3.2.2",
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@dnd-kit/core": "^6.3.0",
+        "react": ">=16.8.0"
+      }
+    },
+    "node_modules/@dnd-kit/utilities": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
+      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "react": ">=16.8.0"
+      }
+    },
     "node_modules/@dotenvx/dotenvx": {
       "version": "1.52.0",
       "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.52.0.tgz",
@@ -8396,16 +8466,6 @@
         "@babel/types": "^7.26.0"
       }
     },
-    "node_modules/babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
-      "license": "MIT",
-      "dependencies": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
     "node_modules/bail": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
@@ -9192,14 +9252,6 @@
         "node": ">=18"
       }
     },
-    "node_modules/core-js": {
-      "version": "2.6.12",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-      "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==",
-      "deprecated": "core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.",
-      "hasInstallScript": true,
-      "license": "MIT"
-    },
     "node_modules/core-js-compat": {
       "version": "3.47.0",
       "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.47.0.tgz",
@@ -15376,16 +15428,6 @@
         "react": "^19.2.4"
       }
     },
-    "node_modules/react-drag-listview": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/react-drag-listview/-/react-drag-listview-2.0.0.tgz",
-      "integrity": "sha512-7Apx/1Xt4qu+JHHP0rH6aLgZgS7c2MX8ocHVGCi03KfeIWEu0t14MhT3boQKM33l5eJrE/IWfExFTvoYq22fsg==",
-      "license": "MIT",
-      "dependencies": {
-        "babel-runtime": "^6.26.0",
-        "prop-types": "^15.5.8"
-      }
-    },
     "node_modules/react-draggable": {
       "version": "4.5.0",
       "resolved": "https://registry.npmjs.org/react-draggable/-/react-draggable-4.5.0.tgz",
@@ -15972,12 +16014,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "license": "MIT"
-    },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",

client/package.json

@@ -11,6 +11,10 @@
     "@amplitude/analytics-browser": "^2.34.0",
     "@ant-design/pro-layout": "^7.22.6",
     "@apollo/client": "^4.1.3",
+    "@dnd-kit/core": "^6.3.1",
+    "@dnd-kit/modifiers": "^9.0.0",
+    "@dnd-kit/sortable": "^10.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@emotion/is-prop-valid": "^1.4.0",
     "@fingerprintjs/fingerprintjs": "^5.0.1",
     "@firebase/analytics": "^0.10.19",
@@ -59,7 +63,6 @@
     "react-color": "^2.19.3",
     "react-cookie": "^8.0.1",
     "react-dom": "^19.2.4",
-    "react-drag-listview": "^2.0.0",
     "react-grid-gallery": "^1.0.1",
     "react-grid-layout": "^2.2.2",
     "react-i18next": "^16.5.4",

client/src/App/App.styles.scss

@@ -446,3 +446,32 @@
 //.rbc-time-header-gutter {
 //  padding: 0;
 //}
+
+/* globally allow shrink inside table cells */
+.prod-list-table .ant-table-cell,
+.prod-list-table .ant-table-cell > * {
+  min-width: 0;
+}
+
+/* common AntD offenders */
+.prod-list-table > .ant-table-cell .ant-space,
+.ant-table-cell .ant-space-item {
+  min-width: 0;
+}
+
+/* Keep your custom header content on the left, push AntD sorter to the far right */
+.prod-list-table .ant-table-column-sorters {
+  display: flex !important;
+  align-items: center;
+  width: 100%;
+}
+
+.prod-list-table .ant-table-column-title {
+  flex: 1 1 auto;
+  min-width: 0; /* allows ellipsis to work */
+}
+
+.prod-list-table .ant-table-column-sorter {
+  margin-left: auto;
+  flex: 0 0 auto;
+}

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

@@ -182,7 +182,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, bills, ref
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -195,7 +195,7 @@ export function AccountingPayablesTableComponent({ bodyshop, loading, payments,
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

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

@@ -212,7 +212,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
       <Table
         loading={loading}
         dataSource={dataSource}
-        pagination={{ placement: "top", pageSize: exportPageLimit }}
+        pagination={{ placement: "top", pageSize: exportPageLimit, showSizeChanger: false }}
         columns={columns}
         rowKey="id"
         onChange={handleTableChange}

client/src/components/bill-cm-returns-table/bill-cm-returns-table.component.jsx

@@ -52,6 +52,9 @@ export default function BillCmdReturnsTableComponent({ form, returnLoading, retu
                       {fields.map((field, index) => (
                         <tr key={field.key}>
                           <td>
+                            <Form.Item hidden key={`${index}id`} name={[field.name, "id"]}>
+                              <ReadOnlyFormItemComponent />
+                            </Form.Item>
                             <Form.Item
                               //   label={t("joblines.fields.line_desc")}
                               key={`${index}line_desc`}

client/src/components/bill-enter-ai-scan/bill-enter-ai-scan.component.jsx

@@ -0,0 +1,203 @@
+import { Button, Tag, Modal, Typography } from "antd";
+import axios from "axios";
+import { useState } from "react";
+import { FaWandMagicSparkles } from "react-icons/fa6";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext";
+import { selectBillEnterModal } from "../../redux/modals/modals.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTranslation } from "react-i18next";
+
+const mapStateToProps = createStructuredSelector({
+  billEnterModal: selectBillEnterModal,
+  bodyshop: selectBodyshop
+});
+
+function BillEnterAiScan({
+  billEnterModal,
+  bodyshop,
+  pollingIntervalRef,
+  setPollingIntervalRef,
+  form,
+  fileInputRef,
+  scanLoading,
+  setScanLoading,
+  setIsAiScan
+}) {
+  const notification = useNotification();
+  const { t } = useTranslation();
+  const [showBetaModal, setShowBetaModal] = useState(false);
+  const BETA_ACCEPTANCE_KEY = "ai_scan_beta_acceptance";
+  const handleBetaAcceptance = () => {
+    localStorage.setItem(BETA_ACCEPTANCE_KEY, "true");
+    setShowBetaModal(false);
+    fileInputRef.current?.click();
+  };
+
+  const checkBetaAcceptance = () => {
+    const hasAccepted = localStorage.getItem(BETA_ACCEPTANCE_KEY);
+    if (hasAccepted) {
+      fileInputRef.current?.click();
+    } else {
+      setShowBetaModal(true);
+    }
+  };
+
+  // Polling function for multipage PDF status
+  const pollJobStatus = async (textractJobId) => {
+    try {
+      const { data } = await axios.get(`/ai/bill-ocr/status/${textractJobId}`);
+
+      if (data.status === "COMPLETED") {
+        // Stop polling
+        if (pollingIntervalRef.current) {
+          clearInterval(pollingIntervalRef.current);
+          setPollingIntervalRef(null);
+        }
+        setScanLoading(false);
+
+        // Update form with the extracted data
+        if (data?.data?.billForm) {
+          form.setFieldsValue(data.data.billForm);
+          await form.validateFields(["billlines"], { recursive: true });
+          notification.success({
+            title: t("bills.labels.ai.scancomplete")
+          });
+        }
+      } else if (data.status === "FAILED") {
+        // Stop polling on failure
+        if (pollingIntervalRef.current) {
+          clearInterval(pollingIntervalRef.current);
+          setPollingIntervalRef(null);
+        }
+        setScanLoading(false);
+
+        notification.error({
+          title: t("bills.labels.ai.scanfailed"),
+          description: data.error || ""
+        });
+      }
+      // If status is IN_PROGRESS, continue polling
+    } catch (error) {
+      // Stop polling on error
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+        setPollingIntervalRef(null);
+      }
+      setScanLoading(false);
+
+      notification.error({
+        title: t("bills.labels.ai.scanfailed"),
+        description: error.response?.data?.message || error.message || "Failed to check scan status"
+      });
+    }
+  };
+
+  return (
+    <>
+      <input
+        ref={fileInputRef}
+        type="file"
+        accept="image/*,application/pdf"
+        style={{ display: "none" }}
+        onChange={async (e) => {
+          const file = e.target.files?.[0];
+          if (file) {
+            setScanLoading(true);
+            setIsAiScan(true);
+            const formdata = new FormData();
+            formdata.append("billScan", file);
+            formdata.append("jobid", form.getFieldValue("jobid") || billEnterModal.context.job?.id);
+            formdata.append("bodyshopid", bodyshop.id);
+            formdata.append("partsorderid", billEnterModal.context.parts_order?.id);
+
+            try {
+              const { data, status } = await axios.post("/ai/bill-ocr", formdata);
+
+              // Add the scanned file to the upload field
+              const currentUploads = form.getFieldValue("upload") || [];
+              form.setFieldValue("upload", [
+                ...currentUploads,
+                {
+                  uid: `ai-scan-${Date.now()}`,
+                  name: file.name,
+                  originFileObj: file,
+                  status: "done"
+                }
+              ]);
+              if (status === 202) {
+                // Multipage PDF - start polling
+                notification.info({
+                  title: t("bills.labels.ai.scanstarted"),
+                  description: t("bills.labels.ai.multipage")
+                });
+
+                //Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
+                setPollingIntervalRef(
+                  setInterval(() => {
+                    pollJobStatus(data.textractJobId);
+                  }, 3000)
+                );
+
+                // Initial poll
+                pollJobStatus(data.textractJobId);
+              } else if (status === 200) {
+                // Single page - immediate response
+                setScanLoading(false);
+
+                form.setFieldsValue(data.data.billForm);
+                await form.validateFields(["billlines"], { recursive: true });
+
+                notification.success({
+                  title: t("bills.labels.ai.scancomplete")
+                });
+              }
+            } catch (error) {
+              setScanLoading(false);
+              notification.error({
+                title: t("bills.labels.ai.scanfailed"),
+                description: error.response?.data?.message || error.message || t("bills.labels.ai.generic_failure")
+              });
+            }
+          }
+          // Reset the input so the same file can be selected again
+          e.target.value = "";
+        }}
+      />
+
+      <Button onClick={checkBetaAcceptance} icon={<FaWandMagicSparkles />} loading={scanLoading} disabled={scanLoading}>
+        {scanLoading ? t("bills.labels.ai.processing") : t("bills.labels.ai.scan")}
+        <Tag color="red">{t("general.labels.beta")}</Tag>
+      </Button>
+
+      <Modal
+        title={t("bills.labels.ai.disclaimer_title")}
+        open={showBetaModal}
+        onOk={handleBetaAcceptance}
+        onCancel={() => setShowBetaModal(false)}
+        okText={t("bills.labels.ai.accept_and_continue")}
+        cancelText={t("general.actions.cancel")}
+      >
+        {
+          //This is explicitly not translated.
+        }
+        <Typography.Text>
+          This AI scanning feature is currently in <strong>beta</strong>. While it can accelerate data entry, you{" "}
+          <strong>must carefully review all extracted results</strong> for accuracy.
+        </Typography.Text>
+        <Typography.Text>The AI may make mistakes or miss information. Always verify:</Typography.Text>
+        <ul>
+          <li>All line items and quantities</li>
+          <li>Prices and totals</li>
+          <li>Part numbers and descriptions</li>
+          <li>Any other critical invoice details</li>
+        </ul>
+        <Typography.Text>
+          By continuing, you acknowledge that you will review and verify all AI-generated data before posting.
+        </Typography.Text>
+      </Modal>
+    </>
+  );
+}
+export default connect(mapStateToProps, null)(BillEnterAiScan);

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

@@ -2,10 +2,11 @@ import { useApolloClient, useMutation } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Modal, Space } from "antd";
 import _ from "lodash";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { INSERT_NEW_BILL } from "../../graphql/bills.queries";
 import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
@@ -21,12 +22,12 @@ import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import confirmDialog from "../../utils/asyncConfirm";
 import useLocalStorage from "../../utils/useLocalStorage";
+import BillEnterAiScan from "../bill-enter-ai-scan/bill-enter-ai-scan.component.jsx";
 import BillFormContainer from "../bill-form/bill-form.container";
 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";
+import { handleUpload } from "../documents-upload/documents-upload.utility";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -50,18 +51,22 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const [updatePartsOrderLines] = useMutation(MUTATION_MARK_RETURN_RECEIVED);
   const [updateInventoryLines] = useMutation(UPDATE_INVENTORY_LINES);
   const [loading, setLoading] = useState(false);
+  const [scanLoading, setScanLoading] = useState(false);
+  const [isAiScan, setIsAiScan] = useState(false);
   const client = useApolloClient();
   const [generateLabel, setGenerateLabel] = useLocalStorage("enter_bill_generate_label", false);
   const notification = useNotification();
+  const fileInputRef = useRef(null);
+  const pollingIntervalRef = useRef(null);
 
   const {
-    treatments: { Enhanced_Payroll, Imgproxy }
+    treatments: { Enhanced_Payroll, Imgproxy, Bill_OCR_AI }
   } = useTreatmentsWithConfig({
     attributes: {},
-    names: ["Enhanced_Payroll", "Imgproxy"],
+    names: ["Enhanced_Payroll", "Imgproxy", "Bill_OCR_AI"],
     splitKey: bodyshop.imexshopid
   });
-
+  
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -113,6 +118,8 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
                     create_ppc,
                     // eslint-disable-next-line no-unused-vars
                     original_actual_price,
+                    // eslint-disable-next-line no-unused-vars
+                    confidence,
                     ...restI
                   } = i;
 
@@ -378,6 +385,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
         vendorid: values.vendorid,
         billlines: []
       });
+      setIsAiScan(false);
       // form.resetFields();
     } else {
       toggleModalVisible();
@@ -388,10 +396,22 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const handleCancel = () => {
     const r = window.confirm(t("general.labels.cancel"));
     if (r === true) {
+      // Clean up polling on cancel
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+        pollingIntervalRef.current = null;
+      }
+      setScanLoading(false);
+      setIsAiScan(false);
       toggleModalVisible();
     }
   };
 
+  //Workaround needed to bypass react-compiler error about manipulating refs in child components. Refactor may be needed in the future to clean this up.
+  const setPollingIntervalRef = (func) => {
+    pollingIntervalRef.current = func;
+  };
+
   useEffect(() => {
     if (enterAgain) form.submit();
   }, [enterAgain, form]);
@@ -401,12 +421,44 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
       form.setFieldsValue(formValues);
     } else {
       form.resetFields();
+      // Clean up polling on modal close
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+        pollingIntervalRef.current = null;
+      }
+      setScanLoading(false);
+      setIsAiScan(false);
     }
   }, [billEnterModal.open, form, formValues]);
 
+  // Cleanup on unmount
+  useEffect(() => {
+    return () => {
+      if (pollingIntervalRef.current) {
+        clearInterval(pollingIntervalRef.current);
+        pollingIntervalRef.current = null;
+      }
+    };
+  }, []);
+
   return (
     <Modal
-      title={t("bills.labels.new")}
+      title={
+        <Space size="large">
+          {t("bills.labels.new")}
+          {Bill_OCR_AI.treatment === "on" && (
+            <BillEnterAiScan
+              fileInputRef={fileInputRef}
+              form={form}
+              pollingIntervalRef={pollingIntervalRef}
+              setPollingIntervalRef={setPollingIntervalRef}
+              scanLoading={scanLoading}
+              setScanLoading={setScanLoading}
+              setIsAiScan={setIsAiScan}
+            />
+          )}
+        </Space>
+      }
       width={"98%"}
       open={billEnterModal.open}
       okText={t("general.actions.save")}
@@ -452,7 +504,11 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
         }}
       >
         <RbacWrapper action="bills:enter">
-          <BillFormContainer form={form} disableInvNumber={billEnterModal.context.disableInvNumber} />
+          <BillFormContainer
+            form={form}
+            isAiScan={isAiScan}
+            disableInvNumber={billEnterModal.context.disableInvNumber}
+          />
         </RbacWrapper>
       </Form>
     </Modal>

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

@@ -8,12 +8,15 @@ import { MdOpenInNew } from "react-icons/md";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { CHECK_BILL_INVOICE_NUMBER } from "../../graphql/bills.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AlertComponent from "../alert/alert.component";
 import BillFormLinesExtended from "../bill-form-lines-extended/bill-form-lines-extended.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
@@ -21,8 +24,6 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 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
@@ -43,11 +44,14 @@ export function BillFormComponent({
   loadOutstandingReturns,
   loadInventory,
   preferredMake,
-  disableInHouse
+  disableInHouse,
+  isAiScan
 }) {
   const { t } = useTranslation();
   const client = useApolloClient();
   const [discount, setDiscount] = useState(0);
+  const notification = useNotification();
+  const jobIdFormWatch = Form.useWatch("jobid", form);
 
   const {
     treatments: { Extended_Bill_Posting, ClosingPeriod }
@@ -123,6 +127,23 @@ export function BillFormComponent({
     bodyshop.inhousevendorid
   ]);
 
+  useEffect(() => {
+    // When the jobid is set by AI scan, we need to reload the lines. This prevents having to hoist the apollo query.
+    if (jobIdFormWatch !== null) {
+      if (form.getFieldValue("jobid") !== null && form.getFieldValue("jobid") !== undefined) {
+        loadLines({ variables: { id: form.getFieldValue("jobid") } });
+        if (form.getFieldValue("vendorid") !== null && form.getFieldValue("vendorid") !== undefined) {
+          loadOutstandingReturns({
+            variables: {
+              jobId: form.getFieldValue("jobid"),
+              vendorId: form.getFieldValue("vendorid")
+            }
+          });
+        }
+      }
+    }
+  }, [jobIdFormWatch, form]);
+
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -373,9 +394,19 @@ export function BillFormComponent({
               "local_tax_rate"
             ]);
             let totals;
-            if (!!values.total && !!values.billlines && values.billlines.length > 0)
-              totals = CalculateBillTotal(values);
-            if (totals)
+            if (!!values.total && !!values.billlines && values.billlines.length > 0) {
+              try {
+                totals = CalculateBillTotal(values);
+              } catch (error) {
+                notification.error({
+                  title: t("bills.errors.calculating_totals"),
+                  message: error.message || t("bills.errors.calculating_totals_generic"),
+                  key: "bill_totals_calculation_error"
+                });
+              }
+            }
+
+            if (totals) {
               return (
                 // TODO: Align is not correct
                 // eslint-disable-next-line react/no-unknown-property
@@ -414,7 +445,7 @@ export function BillFormComponent({
                     <Statistic
                       title={t("bills.labels.discrepancy")}
                       styles={{
-                        value: {
+                        content: {
                           color: totals.discrepancy.getAmount() === 0 ? "green" : "red"
                         }
                       }}
@@ -427,6 +458,7 @@ export function BillFormComponent({
                   ) : null}
                 </div>
               );
+            }
             return null;
           }}
         </Form.Item>
@@ -449,6 +481,7 @@ export function BillFormComponent({
           responsibilityCenters={responsibilityCenters}
           disabled={disabled}
           billEdit={billEdit}
+          isAiScan={isAiScan}
         />
       )}
       <Divider titlePlacement="left" style={{ display: billEdit ? "none" : null }}>

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

@@ -15,7 +15,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 
-export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse }) {
+export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableInvNumber, disableInHouse,isAiScan }) {
   const {
     treatments: { Simple_Inventory }
   } = useTreatmentsWithConfig({
@@ -50,6 +50,7 @@ export function BillFormContainer({ bodyshop, form, billEdit, disabled, disableI
         loadOutstandingReturns={loadOutstandingReturns}
         loadInventory={loadInventory}
         preferredMake={lineData ? lineData.jobs_by_pk.v_make_desc : null}
+        isAiScan={isAiScan}
       />
       {!billEdit && <BillCmdReturnsTableComponent form={form} returnLoading={returnLoading} returnData={returnData} />}
       {Simple_Inventory.treatment === "on" && (

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

@@ -1,17 +1,19 @@
 import { DeleteFilled, DollarCircleFilled } from "@ant-design/icons";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Input, InputNumber, Select, Space, Switch, Table, Tooltip } from "antd";
+import { useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { selectDarkMode } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 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";
+import ConfidenceDisplay from "./bill-form.lines.confidence.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -28,10 +30,12 @@ export function BillEnterModalLinesComponent({
   discount,
   form,
   responsibilityCenters,
-  billEdit
+  billEdit,
+  isAiScan
 }) {
   const { t } = useTranslation();
   const { setFieldsValue, getFieldsValue, getFieldValue } = form;
+  const firstFieldRefs = useRef({});
 
   const CONTROL_HEIGHT = 32;
 
@@ -137,6 +141,29 @@ export function BillEnterModalLinesComponent({
 
   const columns = (remove) => {
     return [
+      ...(isAiScan
+        ? [
+            {
+              title: t("billlines.fields.confidence"),
+              dataIndex: "confidence",
+              editable: true,
+              width: "5rem",
+              formItemProps: (field) => ({
+                key: `${field.index}confidence`,
+                name: [field.name, "confidence"],
+                label: t("billlines.fields.confidence")
+              }),
+              formInput: (record) => {
+                const rowValue = getFieldValue(["billlines", record.name]);
+                return (
+                  <div style={{ display: "flex", alignItems: "center", justifyContent: "center" }}>
+                    <ConfidenceDisplay rowValue={rowValue} />
+                  </div>
+                );
+              }
+            }
+          ]
+        : []),
       {
         title: t("billlines.fields.jobline"),
         dataIndex: "joblineid",
@@ -155,6 +182,9 @@ export function BillEnterModalLinesComponent({
         ),
         formInput: (record, index) => (
           <BillLineSearchSelect
+            ref={(el) => {
+              firstFieldRefs.current[index] = el;
+            }}
             disabled={disabled}
             options={lineData}
             style={{
@@ -205,8 +235,9 @@ export function BillEnterModalLinesComponent({
           label: t("billlines.fields.line_desc"),
           rules: [{ required: true }]
         }),
-        formInput: () => <Input.TextArea disabled={disabled} autoSize />
+        formInput: () => <Input.TextArea disabled={disabled} autoSize tabIndex={0} />
       },
+
       {
         title: t("billlines.fields.quantity"),
         dataIndex: "quantity",
@@ -234,7 +265,7 @@ export function BillEnterModalLinesComponent({
             })
           ]
         }),
-        formInput: () => <InputNumber precision={0} min={1} disabled={disabled} />
+        formInput: () => <InputNumber precision={0} min={1} disabled={disabled} tabIndex={0} />
       },
       {
         title: t("billlines.fields.actual_price"),
@@ -245,12 +276,22 @@ export function BillEnterModalLinesComponent({
           key: `${field.name}actual_price`,
           name: [field.name, "actual_price"],
           label: t("billlines.fields.actual_price"),
-          rules: [{ required: true }]
+          rules: [
+            { required: true },
+            {
+              validator: (_, value) => {
+                return Math.abs(parseFloat(value)) < 0.01 ? Promise.reject() : Promise.resolve();
+              },
+              warningOnly: true
+            }
+          ],
+          hasFeedback: true
         }),
         formInput: (record, index) => (
           <CurrencyInput
             min={0}
             disabled={disabled}
+            tabIndex={0}
             // NOTE: Autofill should only happen on forward Tab out of Retail
             onKeyDown={(e) => {
               if (e.key === "Tab" && !e.shiftKey) autofillActualCost(index);
@@ -328,8 +369,9 @@ export function BillEnterModalLinesComponent({
                     min={0}
                     disabled={disabled}
                     controls={false}
+                    tabIndex={0}
                     style={{ width: "100%", height: CONTROL_HEIGHT }}
-                    // NOTE: No auto-fill on focus/blur; only triggered from Retail on Tab
+                    onFocus={() => autofillActualCost(index)}
                   />
                 </Form.Item>
               </div>
@@ -392,7 +434,7 @@ export function BillEnterModalLinesComponent({
           rules: [{ required: true }]
         }),
         formInput: () => (
-          <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled}>
+          <Select showSearch style={{ minWidth: "3rem" }} disabled={disabled} tabIndex={0}>
             {bodyshopHasDmsKey(bodyshop)
               ? CiecaSelect(true, false)
               : responsibilityCenters.costs.map((item) => <Select.Option key={item.name}>{item.name}</Select.Option>)}
@@ -412,7 +454,7 @@ export function BillEnterModalLinesComponent({
                 name: [field.name, "location"]
               }),
               formInput: () => (
-                <Select disabled={disabled}>
+                <Select disabled={disabled} tabIndex={0}>
                   {bodyshop.md_parts_locations.map((loc, idx) => (
                     <Select.Option key={idx} value={loc}>
                       {loc}
@@ -432,7 +474,7 @@ export function BillEnterModalLinesComponent({
           key: `${field.name}deductedfromlbr`,
           name: [field.name, "deductedfromlbr"]
         }),
-        formInput: () => <Switch disabled={disabled} />,
+        formInput: () => <Switch disabled={disabled} tabIndex={0} />,
         additional: (record, index) => (
           <Form.Item shouldUpdate noStyle style={{ display: "inline-block" }}>
             {() => {
@@ -517,9 +559,13 @@ export function BillEnterModalLinesComponent({
             formItemProps: (field) => ({
               key: `${field.name}fedtax`,
               valuePropName: "checked",
-              name: [field.name, "applicable_taxes", "federal"]
+              name: [field.name, "applicable_taxes", "federal"],
+              initialValue: InstanceRenderManager({
+                imex: true,
+                rome: false
+              })
             }),
-            formInput: () => <Switch disabled={disabled} />
+            formInput: () => <Switch disabled={disabled} tabIndex={0} />
           }
         ]
       }),
@@ -534,7 +580,7 @@ export function BillEnterModalLinesComponent({
           valuePropName: "checked",
           name: [field.name, "applicable_taxes", "state"]
         }),
-        formInput: () => <Switch disabled={disabled} />
+        formInput: () => <Switch disabled={disabled} tabIndex={0} />
       },
 
       ...InstanceRenderManager({
@@ -550,7 +596,7 @@ export function BillEnterModalLinesComponent({
               valuePropName: "checked",
               name: [field.name, "applicable_taxes", "local"]
             }),
-            formInput: () => <Switch disabled={disabled} />
+            formInput: () => <Switch disabled={disabled} tabIndex={0} />
           }
         ]
       }),
@@ -570,6 +616,7 @@ export function BillEnterModalLinesComponent({
                     icon={<DeleteFilled />}
                     disabled={disabled || invLen > 0}
                     onClick={() => remove(record.name)}
+                    tabIndex={0}
                   />
 
                   {Simple_Inventory.treatment === "on" && (
@@ -641,12 +688,19 @@ export function BillEnterModalLinesComponent({
                 <Button
                   disabled={disabled}
                   onClick={() => {
+                    const newIndex = fields.length;
                     add(
                       InstanceRenderManager({
                         imex: { applicable_taxes: { federal: true } },
                         rome: { applicable_taxes: { federal: false } }
                       })
                     );
+                    setTimeout(() => {
+                      const firstField = firstFieldRefs.current[newIndex];
+                      if (firstField?.focus) {
+                        firstField.focus();
+                      }
+                    }, 100);
                   }}
                   style={{ width: "100%" }}
                 >

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

@@ -0,0 +1,87 @@
+import { Progress, Space, Tag, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+const parseConfidence = (confidenceStr) => {
+  if (!confidenceStr || typeof confidenceStr !== "string") return null;
+
+  const match = confidenceStr.match(/T([\d.]+)\s*-\s*O([\d.]+)\s*-\s*J([\d.]+)/);
+  if (!match) return null;
+
+  return {
+    total: parseFloat(match[1]),
+    ocr: parseFloat(match[2]),
+    jobMatch: parseFloat(match[3])
+  };
+};
+
+const getConfidenceColor = (value) => {
+  if (value >= 80) return "green";
+  if (value >= 60) return "orange";
+  if (value >= 40) return "gold";
+  return "red";
+};
+
+const ConfidenceDisplay = ({ rowValue: { confidence, actual_price, actual_cost } }) => {
+  const { t } = useTranslation();
+  const parsed = parseConfidence(confidence);
+  const parsed_actual_price = parseFloat(actual_price);
+  const parsed_actual_cost = parseFloat(actual_cost);
+  if (!parsed) {
+    return <span style={{ color: "#959595", fontSize: "0.85em" }}>N/A</span>;
+  }
+
+  const { total, ocr, jobMatch } = parsed;
+  const color = getConfidenceColor(total);
+
+  return (
+    <Tooltip
+      title={
+        <div style={{ padding: "4px 0" }}>
+          <div style={{ marginBottom: 8, fontWeight: 600 }}>{t("bills.labels.ai.confidence.breakdown")}</div>
+          <div style={{ marginBottom: 4 }}>
+            <strong>{t("bills.labels.ai.confidence.overall")}:</strong> {total.toFixed(1)}%
+            <Progress
+              percent={total}
+              size="small"
+              strokeColor={getConfidenceColor(total)}
+              showInfo={false}
+              style={{ marginTop: 2 }}
+            />
+          </div>
+          <div style={{ marginBottom: 4 }}>
+            <strong>{t("bills.labels.ai.confidence.ocr")}:</strong> {ocr.toFixed(1)}%
+            <Progress
+              percent={ocr}
+              size="small"
+              strokeColor={getConfidenceColor(ocr)}
+              showInfo={false}
+              style={{ marginTop: 2 }}
+            />
+          </div>
+          <div>
+            <strong>{t("bills.labels.ai.confidence.match")}:</strong> {jobMatch.toFixed(1)}%
+            <Progress
+              percent={jobMatch}
+              size="small"
+              strokeColor={getConfidenceColor(jobMatch)}
+              showInfo={false}
+              style={{ marginTop: 2 }}
+            />
+          </div>
+        </div>
+      }
+    >
+      <Space size="small">
+        {!parsed_actual_cost || !parsed_actual_price || parsed_actual_cost === 0 || parsed_actual_price === 0 ? (
+          <Tag color="red" style={{ margin: 0, cursor: "help", userSelect: "none" }}>
+            {t("bills.labels.ai.confidence.missing_data")}
+          </Tag>
+        ) : null}
+        <Tag color={color} style={{ margin: 0, cursor: "help", userSelect: "none" }}>
+          {total.toFixed(0)}%
+        </Tag>
+      </Space>
+    </Tooltip>
+  );
+};
+
+export default ConfidenceDisplay;

client/src/components/card-payment-modal/card-payment-modal.component.jsx

@@ -57,7 +57,6 @@ const CardPaymentModalComponent = ({
     QUERY_RO_AND_OWNER_BY_JOB_PKS,
     {
       fetchPolicy: "network-only",
-      notifyOnNetworkStatusChange: true
     }
   );
 

client/src/components/chat-popup/chat-popup.component.jsx

@@ -47,7 +47,6 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
   const [getConversations, { loading, data, refetch, called }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    notifyOnNetworkStatusChange: true,
     ...(pollInterval > 0 ? { pollInterval } : {})
   });
 

client/src/components/dashboard-components/total-production-hours/total-production-hours.component.jsx

@@ -36,7 +36,7 @@ export function DashboardTotalProductionHours({ bodyshop, data, ...cardProps })
         <Statistic
           title={t("dashboard.labels.prodhrs")}
           value={hours.total.toFixed(1)}
-          styles={{ value: { color: aboveTargetHours ? "green" : "red" } }}
+          styles={{ content: { color: aboveTargetHours ? "green" : "red" } }}
         />
       </Space>
     </Card>

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

@@ -23,13 +23,13 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector)
  * @constructor
  */
 export function DmsCustomerSelector(props) {
-  const { bodyshop, jobid, socket, rrOptions = {} } = props;
+  const { bodyshop, jobid, job, socket, rrOptions = {} } = props;
 
   // Centralized "mode" (provider + transport)
   const mode = props.mode;
 
   // Stable base props for children
-  const base = useMemo(() => ({ bodyshop, jobid, socket }), [bodyshop, jobid, socket]);
+  const base = useMemo(() => ({ bodyshop, jobid, job, socket }), [bodyshop, jobid, job, socket]);
 
   switch (mode) {
     case DMS_MAP.reynolds: {

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

@@ -1,4 +1,4 @@
-import { Alert, Button, Checkbox, Col, message, Space, Table } from "antd";
+import { Alert, Button, Checkbox, message, Modal, Space, Table } from "antd";
 import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
@@ -47,6 +47,7 @@ const rrAddressToString = (addr) => {
 export default function RRCustomerSelector({
   jobid,
   socket,
+  job,
   rrOpenRoLimit = false,
   onRrOpenRoFinished,
   rrValidationPending = false,
@@ -59,15 +60,26 @@ export default function RRCustomerSelector({
   const [refreshing, setRefreshing] = useState(false);
 
   // Show dialog automatically when validation is pending
+  // BUT: skip this for early RO flow (job already has dms_id)
   useEffect(() => {
-    if (rrValidationPending) setOpen(true);
-  }, [rrValidationPending]);
+    if (rrValidationPending && !job?.dms_id) {
+      setOpen(true);
+    }
+  }, [rrValidationPending, job?.dms_id]);
 
   // Listen for RR customer selection list
   useEffect(() => {
     if (!socket) return;
     const handleRrSelectCustomer = (list) => {
       const normalized = normalizeRrList(list);
+      
+      // If list is empty, it means early RO exists and customer selection should be skipped
+      // Don't open the modal in this case
+      if (normalized.length === 0) {
+        setRefreshing(false);
+        return;
+      }
+      
       setOpen(true);
       setCustomerList(normalized);
       const firstOwner = normalized.find((r) => r.vinOwner)?.custNo;
@@ -127,6 +139,10 @@ export default function RRCustomerSelector({
     });
   };
 
+  const handleClose = () => {
+    setOpen(false);
+  };
+
   const refreshRrSearch = () => {
     setRefreshing(true);
     const to = setTimeout(() => setRefreshing(false), 12000);
@@ -141,8 +157,6 @@ export default function RRCustomerSelector({
     socket.emit("rr-export-job", { jobId: jobid });
   };
 
-  if (!open) return null;
-
   const columns = [
     { title: t("jobs.fields.dms.id"), dataIndex: "custNo", key: "custNo" },
     {
@@ -169,8 +183,45 @@ export default function RRCustomerSelector({
     return !rrOwnerSet.has(String(record.custNo));
   };
 
+  // For early RO flow: show validation banner even when modal is closed
+  if (!open) {
+    if (rrValidationPending && job?.dms_id) {
+      return (
+        <div style={{ marginBottom: 16 }}>
+          <Alert
+            type="info"
+            showIcon
+            title="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>
+      );
+    }
+    return null;
+  }
+
   return (
-    <Col span={24}>
+    <Modal
+      open={open}
+      onCancel={handleClose}
+      footer={null}
+      width={800}
+      title={t("dms.selectCustomer")}
+    >
       <Table
         title={() => (
           <div style={{ display: "flex", flexDirection: "column", gap: 8 }}>
@@ -196,8 +247,8 @@ export default function RRCustomerSelector({
               />
             )}
 
-            {/* Validation step banner */}
-            {rrValidationPending && (
+            {/* Validation step banner - only show for NON-early RO flow (legacy) */}
+            {rrValidationPending && !job?.dms_id && (
               <Alert
                 type="info"
                 showIcon
@@ -262,6 +313,6 @@ export default function RRCustomerSelector({
           getCheckboxProps: (record) => ({ disabled: rrDisableRow(record) })
         }}
       />
-    </Col>
+    </Modal>
   );
 }

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

@@ -69,7 +69,7 @@ export function DmsLogEvents({
         return {
           key: idx,
           color: logLevelColor(level),
-          children: (
+          content: (
             <Space orientation="vertical" size={4} style={{ display: "flex" }}>
               {/* Row 1: summary + inline "Details" toggle */}
               <Space wrap align="start">
@@ -113,7 +113,7 @@ export function DmsLogEvents({
     [logs, openSet, colorizeJson, isDarkMode, showDetails]
   );
 
-  return <Timeline pending reverse items={items} />;
+  return <Timeline reverse items={items} />;
 }
 
 /**

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

@@ -404,7 +404,7 @@ export default function CdkLikePostForm({ bodyshop, socket, job, logsRef, mode,
                 <Typography.Title>=</Typography.Title>
                 <Statistic
                   title={t("jobs.labels.dms.notallocated")}
-                  styles={{ value: { color: discrep.getAmount() === 0 ? "green" : "red" } }}
+                  styles={{ content: { color: discrep.getAmount() === 0 ? "green" : "red" } }}
                   value={discrep.toFormat()}
                 />
                 <Button disabled={disablePost} htmlType="submit">

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

@@ -208,8 +208,18 @@ export default function RRPostForm({
     });
   };
 
+  // Check if early RO was created (job has all early RO fields)
+  const hasEarlyRO = !!(job?.dms_id && job?.dms_customer_id && job?.dms_advisor_id);
+
   return (
     <Card title={t("jobs.labels.dms.postingform")}>
+      {hasEarlyRO && (
+        <Typography.Paragraph type="success" strong style={{ marginBottom: 16 }}>
+          ✅ {t("jobs.labels.dms.earlyro.created")} {job.dms_id}
+          <br />
+          <Typography.Text type="secondary">{t("jobs.labels.dms.earlyro.willupdate")}</Typography.Text>
+        </Typography.Paragraph>
+      )}
       <Form
         form={form}
         layout="vertical"
@@ -218,96 +228,96 @@ export default function RRPostForm({
         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>
-
-          {/* RR OpCode (prefix / base / suffix) */}
-          <Col xs={24} sm={12} md={12} lg={8}>
-            <Form.Item
-              required
-              label={
-                <Space size="small" align="center">
-                  {t("jobs.fields.dms.rr_opcode", "RR OpCode")}
-                  {isCustomOpCode && (
+          {/* Advisor + inline Refresh - Only show if no early RO */}
+          {!hasEarlyRO && (
+            <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
-                      type="link"
-                      size="small"
-                      icon={<RollbackOutlined />}
-                      onClick={handleResetOpCode}
-                      style={{ padding: 0 }}
-                    >
-                      {t("jobs.fields.dms.rr_opcode_reset", "Reset")}
-                    </Button>
-                  )}
-                </Space>
-              }
-            >
-              <Space.Compact block>
-                <Form.Item name="opPrefix" noStyle>
-                  <Input
-                    allowClear
-                    maxLength={4}
-                    style={{ width: "30%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_prefix", "Prefix")}
-                  />
-                </Form.Item>
-                <Form.Item
-                  name="opBase"
-                  noStyle
-                  rules={[{ required: true, message: t("general.validation.required") }]}
-                >
-                  <Input
-                    allowClear
-                    maxLength={10}
-                    style={{ width: "40%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_base", "Base")}
-                  />
-                </Form.Item>
-                <Form.Item name="opSuffix" noStyle>
-                  <Input
-                    allowClear
-                    maxLength={4}
-                    style={{ width: "30%" }}
-                    placeholder={t("jobs.fields.dms.rr_opcode_suffix", "Suffix")}
-                  />
-                </Form.Item>
-              </Space.Compact>
-            </Form.Item>
-          </Col>
+                      aria-label={t("general.actions.refresh")}
+                      icon={<ReloadOutlined />}
+                      onClick={() => fetchRrAdvisors(true)}
+                      loading={advLoading}
+                    />
+                  </Tooltip>
+                </Space.Compact>
+              </Form.Item>
+            </Col>
+          )}
+
+          {/* RR OpCode (prefix / base / suffix) - Only show if no early RO */}
+          {!hasEarlyRO && (
+            <Col xs={24} sm={12} md={12} lg={8}>
+              <Form.Item
+                required
+                label={
+                  <Space size="small" align="center">
+                    {t("jobs.fields.dms.rr_opcode", "RR OpCode")}
+                    {isCustomOpCode && (
+                      <Button
+                        type="link"
+                        size="small"
+                        icon={<RollbackOutlined />}
+                        onClick={handleResetOpCode}
+                        style={{ padding: 0 }}
+                      >
+                        {t("jobs.fields.dms.rr_opcode_reset", "Reset")}
+                      </Button>
+                    )}
+                  </Space>
+                }
+              >
+                <Space.Compact block>
+                  <Form.Item name="opPrefix" noStyle>
+                    <Input
+                      allowClear
+                      maxLength={4}
+                      style={{ width: "30%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_prefix", "Prefix")}
+                    />
+                  </Form.Item>
+                  <Form.Item name="opBase" noStyle rules={[{ required: true }]}>
+                    <Input
+                      allowClear
+                      maxLength={10}
+                      style={{ width: "40%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_base", "Base")}
+                    />
+                  </Form.Item>
+                  <Form.Item name="opSuffix" noStyle>
+                    <Input
+                      allowClear
+                      maxLength={4}
+                      style={{ width: "30%" }}
+                      placeholder={t("jobs.fields.dms.rr_opcode_suffix", "Suffix")}
+                    />
+                  </Form.Item>
+                </Space.Compact>
+              </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 }]}>
@@ -355,13 +365,14 @@ export default function RRPostForm({
         {/* Validation  */}
         <Form.Item shouldUpdate>
           {() => {
-            const advisorOk = !!form.getFieldValue("advisorNo");
+            // When early RO exists, advisor is already set, so we don't need to validate it
+            const advisorOk = hasEarlyRO ? true : !!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 disabled={!advisorOk} htmlType="submit" type={hasEarlyRO ? "default" : "primary"}>
+                  {hasEarlyRO ? t("jobs.actions.dms.update_ro") : t("jobs.actions.dms.post")}
                 </Button>
               </Space>
             );

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

@@ -0,0 +1,367 @@
+import { ReloadOutlined } from "@ant-design/icons";
+import { Alert, Button, Form, Input, InputNumber, Modal, Radio, Select, Space, Table, Typography } from "antd";
+import { useEffect, useMemo, useState } from "react";
+
+// Simple customer selector table
+function CustomerSelectorTable({ customers, onSelect, isSubmitting }) {
+  const [selectedCustNo, setSelectedCustNo] = useState(null);
+
+  const columns = [
+    {
+      title: "Select",
+      key: "select",
+      width: 80,
+      render: (_, record) => (
+        <Radio checked={selectedCustNo === record.custNo} onChange={() => setSelectedCustNo(record.custNo)} />
+      )
+    },
+    { title: "Customer ID", dataIndex: "custNo", key: "custNo" },
+    { title: "Name", dataIndex: "name", key: "name" },
+    {
+      title: "VIN Owner",
+      key: "vinOwner",
+      render: (_, record) => (record.vinOwner || record.isVehicleOwner ? "Yes" : "No")
+    }
+  ];
+
+  return (
+    <div>
+      <Table columns={columns} dataSource={customers} rowKey="custNo" pagination={false} size="small" />
+      <div style={{ marginTop: 16, display: "flex", gap: 8 }}>
+        <Button
+          type="primary"
+          onClick={() => onSelect(selectedCustNo, false)}
+          disabled={!selectedCustNo || isSubmitting}
+          loading={isSubmitting}
+        >
+          Use Selected Customer
+        </Button>
+        <Button onClick={() => onSelect(null, true)} disabled={isSubmitting} loading={isSubmitting}>
+          Create New Customer
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+/**
+ * RR Early RO Creation Form
+ * Used from convert button or admin page to create minimal RO before full export
+ * @param bodyshop
+ * @param socket
+ * @param job
+ * @param onSuccess - callback when RO is created successfully
+ * @param onCancel - callback to close modal
+ * @param showCancelButton - whether to show cancel button
+ * @returns {JSX.Element}
+ * @constructor
+ */
+export default function RREarlyROForm({ bodyshop, socket, job, onSuccess, onCancel, showCancelButton = true }) {
+  const [form] = Form.useForm();
+
+  // Advisors
+  const [advisors, setAdvisors] = useState([]);
+  const [advLoading, setAdvLoading] = useState(false);
+
+  // Customer selection
+  const [customerCandidates, setCustomerCandidates] = useState([]);
+  const [showCustomerSelector, setShowCustomerSelector] = useState(false);
+
+  // Loading and success states
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id);
+  const [createdRoNumber, setCreatedRoNumber] = useState(job?.dms_id || null);
+
+  // Derive default OpCode parts from bodyshop config (matching dms.container.jsx logic)
+  const initialValues = useMemo(() => {
+    const cfg = bodyshop?.rr_configuration || {};
+    const defaults =
+      cfg.opCodeDefault ||
+      cfg.op_code_default ||
+      cfg.op_codes?.default ||
+      cfg.defaults?.opCode ||
+      cfg.defaults ||
+      cfg.default ||
+      {};
+
+    const prefix = defaults.prefix ?? defaults.opCodePrefix ?? "";
+    const base = defaults.base ?? defaults.opCodeBase ?? "";
+    const suffix = defaults.suffix ?? defaults.opCodeSuffix ?? "";
+
+    return {
+      kmin: job?.kmin || 0,
+      opPrefix: prefix,
+      opBase: base,
+      opSuffix: suffix
+    };
+  }, [bodyshop, job]);
+
+  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("Error fetching RR Advisors:", ack.error);
+      }
+      setAdvLoading(false);
+      socket.off("rr-get-advisors:result", onResult);
+    });
+  };
+
+  useEffect(() => {
+    fetchRrAdvisors(false);
+  }, [bodyshop?.id, socket]);
+
+  const handleStartEarlyRO = async (values) => {
+    if (!socket) {
+      console.error("Socket not available");
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    const txEnvelope = {
+      advisorNo: values.advisorNo,
+      story: values.story || "",
+      kmin: values.kmin || job?.kmin || 0,
+      opPrefix: values.opPrefix || "",
+      opBase: values.opBase || "",
+      opSuffix: values.opSuffix || ""
+    };
+
+    // Emit the early RO creation request
+    socket.emit("rr-create-early-ro", {
+      jobId: job.id,
+      txEnvelope
+    });
+
+    // Wait for customer selection
+    const customerListener = (candidates) => {
+      console.log("Received rr-select-customer event with candidates:", candidates);
+      setCustomerCandidates(candidates || []);
+      setShowCustomerSelector(true);
+      setIsSubmitting(false);
+      socket.off("rr-select-customer", customerListener);
+    };
+
+    socket.once("rr-select-customer", customerListener);
+
+    // Handle failures
+    const failureListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        console.error("Early RO creation failed:", payload.error);
+        alert(`Failed to create early RO: ${payload.error}`);
+        setIsSubmitting(false);
+        setShowCustomerSelector(false);
+        socket.off("export-failed", failureListener);
+        socket.off("rr-select-customer", customerListener);
+      }
+    };
+
+    socket.once("export-failed", failureListener);
+  };
+
+  const handleCustomerSelected = (custNo, createNew = false) => {
+    if (!socket) return;
+
+    console.log("handleCustomerSelected called:", { custNo, createNew, custNoType: typeof custNo });
+
+    setIsSubmitting(true);
+    setShowCustomerSelector(false);
+
+    const payload = {
+      jobId: job.id,
+      custNo: createNew ? null : custNo,
+      create: createNew
+    };
+
+    console.log("Emitting rr-early-customer-selected:", payload);
+
+    // Emit customer selection
+    socket.emit("rr-early-customer-selected", payload, (ack) => {
+      console.log("Received ack from rr-early-customer-selected:", ack);
+      setIsSubmitting(false);
+
+      if (ack?.ok) {
+        const roNumber = ack.dmsRoNo || ack.outsdRoNo;
+        setEarlyRoCreated(true);
+        setCreatedRoNumber(roNumber);
+        onSuccess?.({ roNumber, ...ack });
+      } else {
+        alert(`Failed to create early RO: ${ack?.error || "Unknown error"}`);
+      }
+    });
+
+    // Also listen for socket events
+    const successListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        const roNumber = payload.dmsRoNo || payload.outsdRoNo;
+        console.log("Early RO created:", roNumber);
+        socket.off("rr-early-ro-created", successListener);
+        socket.off("export-failed", failureListener);
+      }
+    };
+
+    const failureListener = (payload) => {
+      if (payload?.jobId === job.id) {
+        console.error("Early RO creation failed:", payload.error);
+        setIsSubmitting(false);
+        setEarlyRoCreated(false);
+        socket.off("rr-early-ro-created", successListener);
+        socket.off("export-failed", failureListener);
+      }
+    };
+
+    socket.once("rr-early-ro-created", successListener);
+    socket.once("export-failed", failureListener);
+  };
+
+  // If early RO already created, show success message
+  if (earlyRoCreated) {
+    return (
+      <Alert
+        title="Early Reynolds RO Created"
+        description={`RO Number: ${createdRoNumber || "N/A"} - You can now convert the job.`}
+        type="success"
+        showIcon
+        style={{ marginBottom: 16 }}
+      />
+    );
+  }
+
+  // If showing customer selector, render modal
+  if (showCustomerSelector) {
+    return (
+      <>
+        <Typography.Title level={5}>Create Early Reynolds RO</Typography.Title>
+        <Typography.Paragraph type="secondary">Waiting for customer selection...</Typography.Paragraph>
+
+        <Modal
+          title="Select Customer for Early RO"
+          open={true}
+          width={800}
+          footer={null}
+          onCancel={() => {
+            setShowCustomerSelector(false);
+            setIsSubmitting(false);
+          }}
+        >
+          <CustomerSelectorTable
+            customers={customerCandidates}
+            onSelect={handleCustomerSelected}
+            isSubmitting={isSubmitting}
+          />
+        </Modal>
+      </>
+    );
+  }
+
+  // Handle manual submit (since we can't nest forms)
+  const handleManualSubmit = async () => {
+    try {
+      const values = await form.validateFields();
+      handleStartEarlyRO(values);
+    } catch (error) {
+      console.error("Validation failed:", error);
+    }
+  };
+
+  // Show the form
+  return (
+    <div style={{ marginTop: 16 }}>
+      <Typography.Title level={5}>Create Early Reynolds RO</Typography.Title>
+      <Typography.Paragraph type="secondary" style={{ fontSize: "12px" }}>
+        Complete this section to create a minimal RO in Reynolds before converting the job.
+      </Typography.Paragraph>
+
+      <Form form={form} layout="vertical" component={false} initialValues={initialValues}>
+        <Form.Item name="advisorNo" label="Advisor" rules={[{ required: true, message: "Please select an advisor" }]}>
+          <Select
+            showSearch={{
+              optionFilterProp: "children",
+              filterOption: (input, option) => (option?.children?.toLowerCase() ?? "").includes(input.toLowerCase())
+            }}
+            loading={advLoading}
+            placeholder="Select advisor..."
+            popupRender={(menu) => (
+              <>
+                {menu}
+                <Button
+                  type="link"
+                  icon={<ReloadOutlined />}
+                  onClick={() => fetchRrAdvisors(true)}
+                  style={{ width: "100%", textAlign: "left" }}
+                >
+                  Refresh Advisors
+                </Button>
+              </>
+            )}
+          >
+            {advisors.map((adv) => (
+              <Select.Option key={getAdvisorNumber(adv)} value={getAdvisorNumber(adv)}>
+                {getAdvisorLabel(adv)}
+              </Select.Option>
+            ))}
+          </Select>
+        </Form.Item>
+
+        <Form.Item
+          name="kmin"
+          label="Mileage In"
+          rules={[
+            { required: true, message: "Please enter initial mileage" },
+            { type: "number", min: 1, message: "Mileage must be greater than 0" }
+          ]}
+        >
+          <InputNumber min={1} style={{ width: "100%" }} />
+        </Form.Item>
+
+        {/* RR OpCode (prefix / base / suffix) */}
+        <Form.Item required label="RR OpCode">
+          <Space.Compact block>
+            <Form.Item name="opPrefix" noStyle>
+              <Input allowClear maxLength={4} style={{ width: "30%" }} placeholder="Prefix" />
+            </Form.Item>
+            <Form.Item name="opBase" noStyle rules={[{ required: true, message: "Base Required" }]}>
+              <Input allowClear maxLength={10} style={{ width: "40%" }} placeholder="Base" />
+            </Form.Item>
+            <Form.Item name="opSuffix" noStyle>
+              <Input allowClear maxLength={4} style={{ width: "30%" }} placeholder="Suffix" />
+            </Form.Item>
+          </Space.Compact>
+        </Form.Item>
+
+        <Form.Item name="story" label="Comments / Story (Optional)">
+          <Input.TextArea rows={2} maxLength={240} showCount placeholder="Enter comments or story..." />
+        </Form.Item>
+
+        <div style={{ marginTop: 16 }}>
+          <Space>
+            <Button type="primary" onClick={handleManualSubmit} loading={isSubmitting} disabled={advLoading}>
+              Create Early RO
+            </Button>
+            {showCancelButton && <Button onClick={onCancel}>Cancel</Button>}
+          </Space>
+        </div>
+      </Form>
+    </div>
+  );
+}

client/src/components/dms-post-form/rr-early-ro-modal.jsx

@@ -0,0 +1,33 @@
+import { Modal } from "antd";
+import RREarlyROForm from "./rr-early-ro-form";
+
+/**
+ * Modal wrapper for RR Early RO Creation Form
+ * @param open - boolean to control modal visibility
+ * @param onClose - callback when modal is closed
+ * @param onSuccess - callback when RO is created successfully
+ * @param bodyshop - bodyshop object
+ * @param socket - socket.io connection
+ * @param job - job object
+ * @returns {JSX.Element}
+ * @constructor
+ */
+export default function RREarlyROModal({ open, onClose, onSuccess, bodyshop, socket, job }) {
+  const handleSuccess = (result) => {
+    onSuccess?.(result);
+    onClose?.();
+  };
+
+  return (
+    <Modal
+      open={open}
+      onCancel={onClose}
+      footer={null}
+      width={700}
+      destroyOnHidden
+      title="Create Reynolds Repair Order"
+    >
+      <RREarlyROForm bodyshop={bodyshop} socket={socket} job={job} onSuccess={handleSuccess} onCancel={onClose} />
+    </Modal>
+  );
+}

client/src/components/global-search/global-search.component.jsx

@@ -14,8 +14,11 @@ export default function GlobalSearch() {
   const [callSearch, { loading, error, data }] = useLazyQuery(GLOBAL_SEARCH_QUERY);
   const navigate = useNavigate();
 
-  const executeSearch = (v) => {
-    if (v && v.variables.search && v.variables.search !== "" && v.variables.search.length >= 3) callSearch(v);
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 3)
+      callSearch({
+        variables
+      });
   };
   const debouncedExecuteSearch = _.debounce(executeSearch, 750);
 
@@ -157,7 +160,9 @@ export default function GlobalSearch() {
   return (
     <AutoComplete
       options={options}
-      onSearch={handleSearch}
+      showSearch={{
+        onSearch: handleSearch
+      }}
       defaultActiveFirstOption
       onKeyDown={(e) => {
         if (e.key !== "Enter") return;

client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx

@@ -97,7 +97,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId, job, technician }) {
   return (
     <>
       <Button onClick={showModal}>{t("printcenter.jobs.3rdpartypayer")}</Button>
-      <Modal open={isModalVisible} onOk={handleOk} onCancel={handleCancel}>
+      <Modal open={isModalVisible} onOk={handleOk} onCancel={handleCancel} getContainer={() => document.body}>
         <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
           <Form.Item label={t("bills.fields.vendor")} name="vendorid">
             <VendorSearchSelect options={VendorAutoCompleteData?.vendors} onSelect={handleVendorSelect} />

client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx

@@ -1,29 +1,65 @@
 import { useMemo } from "react";
-import { Tag, Tooltip } from "antd";
+import { Tooltip } from "antd";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useTranslation } from "react-i18next";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = () => ({});
+
+const colorMap = {
+  gray: { bg: "#fafafa", border: "#d9d9d9", text: "#000000" },
+  gold: { bg: "#fffbe6", border: "#ffe58f", text: "#d48806" },
+  red: { bg: "#fff1f0", border: "#ffccc7", text: "#cf1322" },
+  blue: { bg: "#e6f7ff", border: "#91d5ff", text: "#0958d9" },
+  green: { bg: "#f6ffed", border: "#b7eb8f", text: "#389e0d" },
+  orange: { bg: "#fff7e6", border: "#ffd591", text: "#d46b08" }
+};
+
+function CompactTag({ color = "gray", children, tooltip = "" }) {
+  const colors = colorMap[color] || colorMap.gray;
+
+  return (
+    <span
+      style={{
+        display: "inline-flex",
+        alignItems: "center",
+        justifyContent: "center",
+        padding: "0 2px",
+        fontSize: "12px",
+        lineHeight: "20px",
+        backgroundColor: colors.bg,
+        border: `1px solid ${colors.border}`,
+        borderRadius: "2px",
+        color: colors.text,
+        minWidth: "24px",
+        textAlign: "center"
+      }}
+    >
+      <Tooltip title={tooltip}>{children}</Tooltip>
+    </span>
+  );
+}
 
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);
 
 export function JobPartsQueueCount({ bodyshop, parts }) {
-  const { t } = useTranslation();
   const partsStatus = useMemo(() => {
     if (!parts) return null;
+
     const statusKeys = ["default_bo", "default_ordered", "default_received", "default_returned"];
+
     return parts.reduce(
       (acc, val) => {
         if (val.part_type === "PAS" || val.part_type === "PASL") return acc;
-        acc.total = acc.total + val.count;
-        acc[val.status] = acc[val.status] + val.count;
+
+        acc.total += val.count;
+
+        // NOTE: if val.status is null, object key becomes "null"
+        acc[val.status] = (acc[val.status] ?? 0) + val.count;
+
         return acc;
       },
       {
@@ -34,45 +70,38 @@ export function JobPartsQueueCount({ bodyshop, parts }) {
     );
   }, [bodyshop, parts]);
 
-  if (!parts) return null;
+  if (!parts || !partsStatus) return null;
+
   return (
     <div
       style={{
-        display: "grid",
-        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
-        gap: "8px",
-        width: "100%",
-        justifyItems: "start"
+        display: "inline-flex", // ✅ shrink-wraps, fixes the “extra box” to the right
+        gap: 2,
+        alignItems: "center",
+        whiteSpace: "nowrap"
       }}
     >
-      <Tooltip title="Total">
-        <Tag style={{ minWidth: "40px", textAlign: "center" }}>{partsStatus.total}</Tag>
-      </Tooltip>
-      <Tooltip title={t("dashboard.errors.status_normal")}>
-        <Tag color="gold" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus["null"]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-        <Tag color="red" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_bo]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-        <Tag color="blue" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_ordered]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_received}>
-        <Tag color="green" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_received]}
-        </Tag>
-      </Tooltip>
-      <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-        <Tag color="orange" style={{ minWidth: "40px", textAlign: "center" }}>
-          {partsStatus[bodyshop.md_order_statuses.default_returned]}
-        </Tag>
-      </Tooltip>
+      <CompactTag tooltip="Total" color="gray">
+        {partsStatus.total}
+      </CompactTag>
+
+      <CompactTag tooltip="No Status" color="gold">
+        {partsStatus["null"]}
+      </CompactTag>
+
+      <CompactTag tooltip={bodyshop.md_order_statuses.default_bo} color="red">
+        {partsStatus[bodyshop.md_order_statuses.default_bo]}
+      </CompactTag>
+
+      <CompactTag tooltip={bodyshop.md_order_statuses.default_ordered} color="blue">
+        {partsStatus[bodyshop.md_order_statuses.default_ordered]}
+      </CompactTag>
+      <CompactTag tooltip={bodyshop.md_order_statuses.default_received} color="green">
+        {partsStatus[bodyshop.md_order_statuses.default_received]}
+      </CompactTag>
+      <CompactTag tooltip={bodyshop.md_order_statuses.default_returned} color="orange">
+        {partsStatus[bodyshop.md_order_statuses.default_returned]}
+      </CompactTag>
     </div>
   );
 }

client/src/components/job-parts-received/job-parts-received.component.jsx

@@ -18,10 +18,17 @@ const mapStateToProps = createStructuredSelector({
  * @param parts
  * @param displayMode
  * @param popoverPlacement
+ * @param countsOnly
  * @returns {JSX.Element}
  * @constructor
  */
-export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popoverPlacement = "top" }) {
+export function JobPartsReceived({
+  bodyshop,
+  parts,
+  displayMode = "full",
+  popoverPlacement = "top",
+  countsOnly = false
+}) {
   const [open, setOpen] = useState(false);
   const { t } = useTranslation();
 
@@ -61,6 +68,8 @@ export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popove
     [canOpen]
   );
 
+  if (countsOnly) return <JobPartsQueueCount parts={parts} />;
+
   const displayText =
     displayMode === "compact" ? summary.percentLabel : `${summary.percentLabel} (${summary.received}/${summary.total})`;
 
@@ -74,7 +83,7 @@ export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popove
       trigger={["click"]}
       placement={popoverPlacement}
       content={
-        <div onClick={stop} style={{ minWidth: 260 }}>
+        <div onClick={stop}>
           <JobPartsQueueCount parts={parts} />
         </div>
       }
@@ -99,7 +108,8 @@ JobPartsReceived.propTypes = {
   bodyshop: PropTypes.object,
   parts: PropTypes.array,
   displayMode: PropTypes.oneOf(["full", "compact"]),
-  popoverPlacement: PropTypes.string
+  popoverPlacement: PropTypes.string,
+  countsOnly: PropTypes.bool
 };
 
 export default connect(mapStateToProps)(JobPartsReceived);

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -42,11 +42,11 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
               <tbody>
                 {fields.map((field, index) => (
                   <tr key={field.key}>
-                    {/* Hidden field to preserve jobline ID */}
-                    <Form.Item hidden name={[field.name, "id"]}>
-                      <input />
-                    </Form.Item>
                     <td>
+                      {/* Hidden field to preserve jobline ID without injecting a div under <tr> */}
+                      <Form.Item noStyle name={[field.name, "id"]}>
+                        <input type="hidden" />
+                      </Form.Item>
                       <Form.Item
                         //   label={t("joblines.fields.line_desc")}
                         key={`${index}line_desc`}

client/src/components/jobs-convert-button/jobs-convert-button.component.jsx

@@ -1,18 +1,22 @@
 import { useMutation } from "@apollo/client/react";
-import { Button, Form, Input, Popover, Select, Space, Switch } from "antd";
+import { Button, Divider, Form, Input, Modal, Select, Space, Switch } from "antd";
 import axios from "axios";
 import { some } from "lodash";
 import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
+import RREarlyROForm from "../dms-post-form/rr-early-ro-form";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -33,11 +37,27 @@ const mapDispatchToProps = (dispatch) => ({
 export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTrail, parentFormIsFieldsTouched }) {
   const [open, setOpen] = useState(false);
   const [loading, setLoading] = useState(false);
+  const [earlyRoCreated, setEarlyRoCreated] = useState(!!job?.dms_id); // Track early RO creation state
+  const [earlyRoCreatedThisSession, setEarlyRoCreatedThisSession] = useState(false); // Track if created in THIS modal session
   const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
   const { t } = useTranslation();
   const [form] = Form.useForm();
   const notification = useNotification();
   const allFormValues = Form.useWatch([], form);
+  const { socket } = useSocket(); // Extract socket from context
+
+  // Get Fortellis treatment for proper DMS mode detection
+  const {
+    treatments: { Fortellis }
+  } = useTreatmentsWithConfig({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop?.imexshopid
+  });
+
+  // Check if bodyshop has Reynolds integration using the proper getDmsMode function
+  const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
 
   const handleConvert = async ({ employee_csr, category, ...values }) => {
     if (parentFormIsFieldsTouched()) {
@@ -82,177 +102,227 @@ export function JobsConvertButton({ bodyshop, job, refetch, jobRO, insertAuditTr
 
   const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
 
-  const popMenu = (
-    <div>
-      <Form
-        layout="vertical"
-        form={form}
-        onFinish={handleConvert}
-        initialValues={{
-          driveable: true,
-          towin: job.towin,
-          ca_gst_registrant: job.ca_gst_registrant,
-          employee_csr: job.employee_csr,
-          category: job.category,
-          referral_source: job.referral_source,
-          referral_source_extra: job.referral_source_extra ?? ""
+  const handleEarlyROSuccess = (result) => {
+    setEarlyRoCreated(true); // Mark early RO as created
+    setEarlyRoCreatedThisSession(true); // Mark as created in this session
+    notification.success({
+      title: t("jobs.successes.early_ro_created"),
+      description: `RO Number: ${result.roNumber || "N/A"}`
+    });
+    // Delay refetch to keep success message visible for 2 seconds
+    setTimeout(() => {
+      refetch?.();
+    }, 2000);
+  };
+
+  const handleModalClose = () => {
+    setOpen(false);
+  };
+
+  if (job.converted) return <></>;
+
+  return (
+    <>
+      <Button
+        key="convert"
+        type="primary"
+        danger
+        disabled={job.converted || jobRO}
+        loading={loading}
+        onClick={() => {
+          setEarlyRoCreated(!!job?.dms_id); // Initialize state based on current job
+          setEarlyRoCreatedThisSession(false); // Reset session state when opening modal
+          setOpen(true);
         }}
       >
-        <Form.Item
-          name={["ins_co_nm"]}
-          label={t("jobs.fields.ins_co_nm")}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
+        {t("jobs.actions.convert")}
+      </Button>
+
+      {/* Convert Job Modal */}
+      <Modal
+        open={open}
+        onCancel={handleModalClose}
+        closable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        maskClosable={!(earlyRoCreatedThisSession && !job.converted)} // Only restrict if created in THIS session
+        title={t("jobs.actions.convert")}
+        footer={null}
+        width={700}
+        destroyOnHidden
+      >
+        {/* Standard Convert Form */}
+        <Form
+          layout="vertical"
+          form={form}
+          onFinish={handleConvert}
+          initialValues={{
+            driveable: true,
+            towin: job.towin,
+            ca_gst_registrant: job.ca_gst_registrant,
+            employee_csr: job.employee_csr,
+            category: job.category,
+            referral_source: job.referral_source,
+            referral_source_extra: job.referral_source_extra ?? ""
+          }}
         >
-          <Select showSearch>
-            {bodyshop.md_ins_cos.map((s, i) => (
-              <Select.Option key={i} value={s.name}>
-                {s.name}
-              </Select.Option>
-            ))}
-          </Select>
-        </Form.Item>
-        {bodyshop.enforce_class && (
+          {/* Show Reynolds Early RO section at the top if applicable */}
+          {isReynoldsMode && !job.dms_id && !earlyRoCreated && (
+            <>
+              <RREarlyROForm
+                bodyshop={bodyshop}
+                socket={socket}
+                job={job}
+                onSuccess={handleEarlyROSuccess}
+                showCancelButton={false}
+              />
+              <Divider />
+            </>
+          )}
+
           <Form.Item
-            name={"class"}
-            label={t("jobs.fields.class")}
+            name={["ins_co_nm"]}
+            label={t("jobs.fields.ins_co_nm")}
             rules={[
               {
-                required: bodyshop.enforce_class
+                required: true
                 //message: t("general.validation.required"),
               }
             ]}
           >
-            <Select>
-              {bodyshop.md_classes.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
+            <Select showSearch>
+              {bodyshop.md_ins_cos.map((s, i) => (
+                <Select.Option key={i} value={s.name}>
+                  {s.name}
                 </Select.Option>
               ))}
             </Select>
           </Form.Item>
-        )}
-        {bodyshop.enforce_referral && (
-          <>
+          {bodyshop.enforce_class && (
             <Form.Item
-              name={"referral_source"}
-              label={t("jobs.fields.referralsource")}
+              name={"class"}
+              label={t("jobs.fields.class")}
               rules={[
                 {
-                  required: bodyshop.enforce_referral
+                  required: bodyshop.enforce_class
                   //message: t("general.validation.required"),
                 }
               ]}
             >
               <Select>
-                {bodyshop.md_referral_sources.map((s) => (
+                {bodyshop.md_classes.map((s) => (
                   <Select.Option key={s} value={s}>
                     {s}
                   </Select.Option>
                 ))}
               </Select>
             </Form.Item>
-            <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
-              <Input />
-            </Form.Item>
-          </>
-        )}
-        {bodyshop.enforce_conversion_csr && (
-          <Form.Item
-            name={"employee_csr"}
-            label={t(
-              InstanceRenderManager({
-                imex: "jobs.fields.employee_csr",
-                rome: "jobs.fields.employee_csr_writer"
-              })
-            )}
-            rules={[
-              {
-                required: bodyshop.enforce_conversion_csr
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Select
-              showSearch={{
-                optionFilterProp: "children",
-                filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }}
-              style={{ width: 200 }}
+          )}
+          {bodyshop.enforce_referral && (
+            <>
+              <Form.Item
+                name={"referral_source"}
+                label={t("jobs.fields.referralsource")}
+                rules={[
+                  {
+                    required: bodyshop.enforce_referral
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop.md_referral_sources.map((s) => (
+                    <Select.Option key={s} value={s}>
+                      {s}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
+                <Input />
+              </Form.Item>
+            </>
+          )}
+          {bodyshop.enforce_conversion_csr && (
+            <Form.Item
+              name={"employee_csr"}
+              label={t(
+                InstanceRenderManager({
+                  imex: "jobs.fields.employee_csr",
+                  rome: "jobs.fields.employee_csr_writer"
+                })
+              )}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_csr
+                  //message: t("general.validation.required"),
+                }
+              ]}
             >
-              {bodyshop.employees
-                .filter((emp) => emp.active)
-                .map((emp) => (
-                  <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
-                    {`${emp.first_name} ${emp.last_name}`}
+              <Select
+                showSearch={{
+                  optionFilterProp: "children",
+                  filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }}
+                style={{ width: 200 }}
+              >
+                {bodyshop.employees
+                  .filter((emp) => emp.active)
+                  .map((emp) => (
+                    <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                      {`${emp.first_name} ${emp.last_name}`}
+                    </Select.Option>
+                  ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop.enforce_conversion_category && (
+            <Form.Item
+              name={"category"}
+              label={t("jobs.fields.category")}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_category
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Select allowClear>
+                {bodyshop.md_categories.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
                   </Select.Option>
                 ))}
-            </Select>
-          </Form.Item>
-        )}
-        {bodyshop.enforce_conversion_category && (
-          <Form.Item
-            name={"category"}
-            label={t("jobs.fields.category")}
-            rules={[
-              {
-                required: bodyshop.enforce_conversion_category
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Select allowClear>
-              {bodyshop.md_categories.map((s) => (
-                <Select.Option key={s} value={s}>
-                  {s}
-                </Select.Option>
-              ))}
-            </Select>
-          </Form.Item>
-        )}
-        {bodyshop.region_config.toLowerCase().startsWith("ca") && (
-          <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop.region_config.toLowerCase().startsWith("ca") && (
+            <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          )}
+          <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
             <Switch />
           </Form.Item>
-        )}
-        <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
-          <Switch />
-        </Form.Item>
-        <Space wrap>
-          <Button disabled={submitDisabled()} type="primary" danger onClick={() => form.submit()} loading={loading}>
-            {t("jobs.actions.convert")}
-          </Button>
-          <Button onClick={() => setOpen(false)}>{t("general.actions.close")}</Button>
-        </Space>
-      </Form>
-    </div>
-  );
 
-  if (job.converted) return <></>;
-
-  return (
-    <Popover open={open} content={popMenu}>
-      <Button
-        key="convert"
-        type="primary"
-        danger
-        // style={{ display: job.converted ? "none" : "" }}
-        disabled={job.converted || jobRO}
-        loading={loading}
-        onClick={() => {
-          setOpen(true);
-        }}
-      >
-        {t("jobs.actions.convert")}
-      </Button>
-    </Popover>
+          <Space wrap style={{ marginTop: 16 }}>
+            <Button
+              disabled={submitDisabled() || (isReynoldsMode && !job.dms_id && !earlyRoCreated)}
+              type="primary"
+              danger
+              onClick={() => form.submit()}
+              loading={loading}
+            >
+              {t("jobs.actions.convert")}
+            </Button>
+            <Button onClick={handleModalClose} disabled={earlyRoCreatedThisSession && !job.converted}>
+              {t("general.actions.close")}
+            </Button>
+          </Space>
+        </Form>
+      </Modal>
+    </>
   );
 }
 

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

@@ -251,7 +251,6 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
             ))}
           </Select>
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.selling_dealer")} name="selling_dealer">
           <Input disabled={jobRO} />
         </Form.Item>
@@ -267,6 +266,21 @@ export function JobsDetailGeneral({ bodyshop, jobRO, job, form }) {
         <Form.Item label={t("jobs.fields.lost_sale_reason")} name="lost_sale_reason">
           <Input disabled={jobRO} allowClear />
         </Form.Item>
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.id")} name="dms_id">
+            <Input disabled />
+          </Form.Item>
+        )}
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.advisor")} name="dms_advisor_id">
+            <Input disabled />
+          </Form.Item>
+        )}
+        {bodyshop.rr_dealerid && (
+          <Form.Item label={t("jobs.fields.dms.customer")} name="dms_customer_id">
+            <Input disabled />
+          </Form.Item>
+        )}
       </FormRow>
     </Card>
   );

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

@@ -157,7 +157,6 @@ export function JobsDetailHeaderActions({
     variables: watcherVars,
     skip: !jobId,
     fetchPolicy: "cache-first",
-    notifyOnNetworkStatusChange: true
   });
 
   const jobWatchersCount = jobWatchersData?.job_watchers?.length ?? job?.job_watchers?.length ?? 0;

client/src/components/labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component.jsx

@@ -132,7 +132,13 @@ export function LaborAllocationsAdjustmentEdit({
   );
 
   return (
-    <Popover open={open} onOpenChange={(vis) => setOpen(vis)} content={overlay} trigger="click">
+    <Popover
+      getPopupContainer={(trigger) => trigger?.parentElement || document.body}
+      open={open}
+      onOpenChange={(vis) => setOpen(vis)}
+      content={overlay}
+      trigger="click"
+    >
       {children}
     </Popover>
   );

client/src/components/notification-center/notification-center.container.jsx

@@ -56,7 +56,6 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
       where: whereClause
     },
     fetchPolicy: "cache-and-network",
-    notifyOnNetworkStatusChange: true,
     errorPolicy: "all",
     pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
     skip: skipQuery

client/src/components/owner-name-display/owner-name-display.component.jsx

@@ -2,6 +2,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { store } from "../../redux/store";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { Tooltip } from "antd";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -11,15 +12,27 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(OwnerNameDisplay);
 
-export function OwnerNameDisplay({ bodyshop, ownerObject }) {
+export function OwnerNameDisplay({ bodyshop, ownerObject, withToolTip = false }) {
   const emptyTest = ownerObject?.ownr_fn + ownerObject?.ownr_ln + ownerObject?.ownr_co_nm;
 
   if (!emptyTest || emptyTest === "null" || emptyTest.trim() === "") return "N/A";
 
-  if (bodyshop.last_name_first)
-    return `${ownerObject?.ownr_ln || ""}, ${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_co_nm || ""}`.trim();
-
-  return `${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_ln || ""} ${ownerObject.ownr_co_nm || ""}`.trim();
+  let returnString;
+  if (bodyshop.last_name_first) {
+    returnString =
+      `${ownerObject?.ownr_ln || ""}, ${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_co_nm || ""}`.trim();
+  } else {
+    returnString = `${ownerObject?.ownr_fn || ""} ${ownerObject?.ownr_ln || ""} ${ownerObject.ownr_co_nm || ""}`.trim();
+  }
+  if (withToolTip) {
+    return (
+      <Tooltip title={returnString} mouseEnterDelay={0.5}>
+        {returnString}
+      </Tooltip>
+    );
+  } else {
+    return returnString;
+  }
 }
 
 export function OwnerNameDisplayFunction(ownerObject, forceFirstLast = false) {

client/src/components/owner-search-select/owner-search-select.component.jsx

@@ -16,9 +16,10 @@ const OwnerSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
     SEARCH_OWNERS_BY_ID_FOR_AUTOCOMPLETE
   );
 
-  const executeSearch = (v) => {
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2) callSearch({ variables: v.variables });
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 2) callSearch({ variables });
   };
+
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 
   const handleSearch = (value) => {

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

@@ -187,6 +187,7 @@ export function PartsOrderListTableDrawerComponent({
               actions: { refetch: refetch },
               context: {
                 job: job,
+                parts_order: { id: record.id },
                 bill: {
                   vendorid: record.vendor.id,
                   is_credit_memo: record.return,

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

@@ -162,6 +162,7 @@ export function PartsOrderListTableComponent({
               actions: { refetch: refetch },
               context: {
                 job: job,
+                parts_order: { id: record.id },
                 bill: {
                   vendorid: record.vendor.id,
                   is_credit_memo: record.return,

client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx

@@ -1,94 +1,121 @@
 import { DownOutlined } from "@ant-design/icons";
-import { Dropdown, InputNumber, Space } from "antd";
+import { Button, Divider, Dropdown, InputNumber, Space, theme } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 
+const DISCOUNT_PRESETS = [5, 10, 15, 20, 25, 40];
+
 export default function PartsOrderModalPriceChange({ form, field }) {
   const { t } = useTranslation();
-  const menu = {
-    items: [
-      {
-        key: "5",
-        label: t("parts_orders.labels.discount", { percent: "5%" })
-      },
-      {
-        key: "10",
-        label: t("parts_orders.labels.discount", { percent: "10%" })
-      },
-      {
-        key: "15",
-        label: t("parts_orders.labels.discount", { percent: "15%" })
-      },
-      {
-        key: "20",
-        label: t("parts_orders.labels.discount", { percent: "20%" })
-      },
-      {
-        key: "25",
-        label: t("parts_orders.labels.discount", { percent: "25%" })
-      },
-      {
-        key: "40",
-        label: t("parts_orders.labels.discount", { percent: "40%" })
-      },
-      {
-        key: "custom",
-        label: (
-          <Space.Compact>
-            <InputNumber
-              onClick={(e) => e.stopPropagation()}
-              onKeyUp={(e) => {
-                if (e.key === "Enter") {
-                  const values = form.getFieldsValue();
-                  const { parts_order_lines } = values;
+  const { token } = theme.useToken();
 
-                form.setFieldsValue({
-                  parts_order_lines: {
-                    data: parts_order_lines.data.map((p, idx) => {
-                      if (idx !== field.name) return p;
-                      console.log(p, e.target.value, (p.act_price || 0) * ((100 - (e.target.value || 0)) / 100));
-                      return {
-                        ...p,
-                        act_price: (p.act_price || 0) * ((100 - (e.target.value || 0)) / 100)
-                      };
-                    })
-                  }
-                });
-                e.target.value = 0;
-              }
-              }}
-              min={0}
-              max={100}
-            />
-            <span style={{ padding: "0 11px", backgroundColor: "#fafafa", border: "1px solid #d9d9d9", borderLeft: 0 }}>%</span>
-          </Space.Compact>
-        )
+  const [open, setOpen] = useState(false);
+  const [customPercent, setCustomPercent] = useState(0);
+
+  const applyDiscountPercent = (percent) => {
+    const pct = Number(percent) || 0;
+
+    const values = form.getFieldsValue();
+    const parts_order_lines = values?.parts_order_lines;
+    const data = Array.isArray(parts_order_lines?.data) ? parts_order_lines.data : [];
+    if (!data.length) return;
+
+    form.setFieldsValue({
+      parts_order_lines: {
+        data: data.map((p, idx) => {
+          if (idx !== field.name) return p;
+          return {
+            ...p,
+            act_price: (p.act_price || 0) * ((100 - pct) / 100)
+          };
+        })
       }
-    ],
+    });
+  };
+
+  const applyCustom = () => {
+    logImEXEvent("parts_order_manual_discount", {});
+    applyDiscountPercent(customPercent);
+    setCustomPercent(0);
+    setOpen(false);
+  };
+
+  const menu = {
+    // Kill the menu “card” styling so our wrapper becomes the single card.
+    style: {
+      background: "transparent",
+      boxShadow: "none"
+    },
+    items: DISCOUNT_PRESETS.map((pct) => ({
+      key: String(pct),
+      label: t("parts_orders.labels.discount", { percent: `${pct}%` })
+    })),
     onClick: ({ key }) => {
       logImEXEvent("parts_order_manual_discount", {});
-      if (key === "custom") return;
-      const values = form.getFieldsValue();
-      const { parts_order_lines } = values;
-      form.setFieldsValue({
-        parts_order_lines: {
-          data: parts_order_lines.data.map((p, idx) => {
-            if (idx !== field.name) return p;
-            return {
-              ...p,
-              act_price: (p.act_price || 0) * ((100 - key) / 100)
-            };
-          })
-        }
-      });
+      applyDiscountPercent(key);
+      setOpen(false);
     }
   };
 
   return (
-    <Dropdown menu={menu} trigger="click">
+    <Dropdown
+      menu={menu}
+      trigger={["click"]}
+      open={open}
+      onOpenChange={(nextOpen) => setOpen(nextOpen)}
+      getPopupContainer={(triggerNode) => triggerNode?.parentElement ?? document.body}
+      popupRender={(menus) => (
+        <div
+          // This makes the whole dropdown (menu + footer) look like one panel in both light/dark.
+          style={{
+            background: token.colorBgElevated,
+            borderRadius: token.borderRadiusLG,
+            boxShadow: token.boxShadowSecondary,
+            overflow: "hidden",
+            minWidth: 180
+          }}
+          onClick={(e) => e.stopPropagation()}
+          onKeyDown={(e) => e.stopPropagation()}
+        >
+          {menus}
+
+          <Divider style={{ margin: 0 }} />
+
+          <div style={{ padding: token.paddingXS }}>
+            <Space.Compact style={{ width: "100%" }}>
+              <InputNumber
+                value={customPercent}
+                min={0}
+                max={100}
+                precision={0}
+                controls={false}
+                style={{ width: "100%" }}
+                formatter={(v) => (v === null || v === undefined ? "" : `${v}%`)}
+                parser={(v) =>
+                  String(v ?? "")
+                    .replace("%", "")
+                    .trim()
+                }
+                onChange={(v) => setCustomPercent(v ?? 0)}
+                onKeyDown={(e) => {
+                  e.stopPropagation();
+                  if (e.key === "Enter") {
+                    e.preventDefault();
+                    applyCustom();
+                  }
+                }}
+              />
+              <Button type="primary" onClick={applyCustom}>
+                {t("general.labels.apply")}
+              </Button>
+            </Space.Compact>
+          </div>
+        </div>
+      )}
+    >
       <Space>
-        %
-        <DownOutlined />
+        % <DownOutlined />
       </Space>
     </Dropdown>
   );

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -17,7 +17,6 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import AlertComponent from "../alert/alert.component";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsOrderModalComponent from "./parts-order-modal.component";
 import axios from "axios";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
@@ -66,7 +65,7 @@ export function PartsOrderModalContainer({
   const sendTypeState = useState("e");
   const sendType = sendTypeState[0];
 
-  const { loading, error, data } = useQuery(QUERY_ALL_VENDORS_FOR_ORDER, {
+  const { error, data } = useQuery(QUERY_ALL_VENDORS_FOR_ORDER, {
     skip: !open,
     variables: { jobId: jobId },
     fetchPolicy: "network-only",
@@ -94,16 +93,6 @@ export function PartsOrderModalContainer({
       };
     });
 
-    const missingIdx = forcedLines.findIndex((l) => !l?.job_line_id);
-    if (missingIdx !== -1) {
-      notification.error({
-        title: t("parts_orders.errors.creating"),
-        description: `Missing job_line_id for parts line #${missingIdx + 1}`
-      });
-      setSaving(false);
-      return;
-    }
-
     let insertResult;
     try {
       insertResult = await insertPartOrder({
@@ -372,6 +361,7 @@ export function PartsOrderModalContainer({
     }
   }, [open, linesToOrder, form]);
 
+  //This used to have a loading component spinner for the vendor data. With Apollo 4, the NetworkState isn't emitting correctly, so loading just gets set to true the second time, and no longer works as expected.
   return (
     <Modal
       open={open}
@@ -390,18 +380,14 @@ export function PartsOrderModalContainer({
     >
       {error ? <AlertComponent title={error.message} type="error" /> : null}
       <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish} initialValues={initialValues}>
-        {loading ? (
-          <LoadingSpinner />
-        ) : (
-          <PartsOrderModalComponent
-            form={form}
-            vendorList={data?.vendors || []}
-            sendTypeState={sendTypeState}
-            isReturn={isReturn}
-            preferredMake={data && data.jobs[0] && data.jobs[0].v_make_desc}
-            job={job}
-          />
-        )}
+        <PartsOrderModalComponent
+          form={form}
+          vendorList={data?.vendors || []}
+          sendTypeState={sendTypeState}
+          isReturn={isReturn}
+          preferredMake={data && data.jobs[0] && data.jobs[0].v_make_desc}
+          job={job}
+        />
       </Form>
     </Modal>
   );

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -1,6 +1,6 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { useQuery } from "@apollo/client/react";
-import { Button, Card, Input, Space, Table } from "antd";
+import { Button, Card, Checkbox, Input, Space, Table } from "antd";
 import _ from "lodash";
 import queryString from "query-string";
 import { useState } from "react";
@@ -31,6 +31,8 @@ export function PartsQueueListComponent({ bodyshop }) {
   const { selected, sortcolumn, sortorder, statusFilters } = searchParams;
   const history = useNavigate();
   const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
+  const [viewTimeStamp, setViewTimeStamp] = useLocalStorage("parts_queue_timestamps", false);
+  const [countsOnly, setCountsOnly] = useLocalStorage("parts_queue_counts_only", false);
 
   const { loading, error, data, refetch } = useQuery(QUERY_PARTS_QUEUE, {
     fetchPolicy: "network-only",
@@ -92,6 +94,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
+      width: "110px",
       sorter: (a, b) => alphaSort(a.ro_number, b.ro_number),
       sortOrder: sortcolumn === "ro_number" && sortorder,
 
@@ -103,16 +106,20 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.owner"),
       dataIndex: "ownr_ln",
       key: "ownr_ln",
+      width: "8%",
+      ellipsis: {
+        showTitle: true
+      },
       sorter: (a, b) => alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.ownerid ? (
           <Link to={"/manage/owners/" + record.ownerid}>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record} withToolTip />
           </Link>
         ) : (
           <span>
-            <OwnerNameDisplay ownerObject={record} />
+            <OwnerNameDisplay ownerObject={record} withToolTip />
           </span>
         );
       }
@@ -187,7 +194,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       ellipsis: true,
       sorter: (a, b) => dateSort(a.scheduled_in, b.scheduled_in),
       sortOrder: sortcolumn === "scheduled_in" && sortorder,
-      render: (text, record) => <DateTimeFormatter>{record.scheduled_in}</DateTimeFormatter>
+      render: (text, record) => <DateTimeFormatter hideTime={!viewTimeStamp}>{record.scheduled_in}</DateTimeFormatter>
     },
     {
       title: t("jobs.fields.scheduled_completion"),
@@ -196,7 +203,9 @@ export function PartsQueueListComponent({ bodyshop }) {
       ellipsis: true,
       sorter: (a, b) => dateSort(a.scheduled_completion, b.scheduled_completion),
       sortOrder: sortcolumn === "scheduled_completion" && sortorder,
-      render: (text, record) => <DateTimeFormatter>{record.scheduled_completion}</DateTimeFormatter>
+      render: (text, record) => (
+        <DateTimeFormatter hideTime={!viewTimeStamp}>{record.scheduled_completion}</DateTimeFormatter>
+      )
     },
     // {
     //   title: t("vehicles.fields.plate_no"),
@@ -227,16 +236,23 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.updated_at"),
       dataIndex: "updated_at",
       key: "updated_at",
+      width: "110px",
       sorter: (a, b) => dateSort(a.updated_at, b.updated_at),
       sortOrder: sortcolumn === "updated_at" && sortorder,
-      render: (text, record) => <TimeAgoFormatter>{record.updated_at}</TimeAgoFormatter>
+      render: (text, record) => <TimeAgoFormatter removeAgoString>{record.updated_at}</TimeAgoFormatter>
     },
     {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
+      width: countsOnly ? "180px" : "110px",
       render: (text, record) => (
-        <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />
+        <JobPartsReceived
+          parts={record.joblines_status}
+          displayMode="full"
+          popoverPlacement="middle"
+          countsOnly={countsOnly}
+        />
       )
     },
     {
@@ -249,6 +265,7 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.queued_for_parts"),
       dataIndex: "queued_for_parts",
       key: "queued_for_parts",
+      width: "120px",
       sorter: (a, b) => a.queued_for_parts - b.queued_for_parts,
       sortOrder: sortcolumn === "queued_for_parts" && sortorder,
       filteredValue: filter?.queued_for_parts || null,
@@ -275,6 +292,12 @@ export function PartsQueueListComponent({ bodyshop }) {
           <Button onClick={() => refetch()}>
             <SyncOutlined />
           </Button>
+          <Checkbox checked={countsOnly} onChange={(e) => setCountsOnly(e.target.checked)}>
+            {t("parts.labels.view_counts_only")}
+          </Checkbox>
+          <Checkbox checked={viewTimeStamp} onChange={(e) => setViewTimeStamp(e.target.checked)}>
+            {t("parts.labels.view_timestamps")}
+          </Checkbox>
           <Input.Search
             className="imex-table-header__search"
             placeholder={t("general.labels.search")}
@@ -299,7 +322,7 @@ export function PartsQueueListComponent({ bodyshop }) {
         rowKey="id"
         dataSource={jobs}
         style={{ height: "100%" }}
-        scroll={{ x: true }}
+        //scroll={{ x: true }}
         onChange={handleTableChange}
         rowSelection={{
           onSelect: (record) => {

client/src/components/payment-form/payment-form.totalpayments.component.jsx

@@ -33,7 +33,7 @@ export default function PaymentFormTotalPayments({ jobid }) {
       {balance && (
         <Statistic
           title={t("payments.labels.balance")}
-          styles={{ value: { color: balance.getAmount() !== 0 ? "red" : "green" } }}
+          styles={{ content: { color: balance.getAmount() !== 0 ? "red" : "green" } }}
           value={(balance && balance.toFormat()) || ""}
         />
       )}

client/src/components/print-center-jobs-labels/print-center-jobs-labels.component.jsx

@@ -108,7 +108,7 @@ export function PrintCenterJobsLabels({ jobId }) {
     </Card>
   );
   return (
-    <Popover content={content} open={isModalVisible}>
+    <Popover content={content} open={isModalVisible} getPopupContainer={(trigger) => trigger.parentElement}>
       <Button onClick={() => setIsModalVisible(true)}>{t("printcenter.jobs.labels.labels")}</Button>
     </Popover>
   );

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

@@ -35,8 +35,6 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
 
     const result = await updateJob({
       variables: { jobId: record.id, job: { [empAssignment]: employeeid } }
-
-      //   awaitRefetchQueries: true,
     });
 
     insertAuditTrail({
@@ -55,6 +53,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
 
     await refetch();
 
+    setAssignment({ operation: null, employeeid: null });
     setLoading(false);
   };
   const handleRemove = async (operation) => {
@@ -84,6 +83,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
 
     await refetch();
 
+    setAssignment({ operation: null, employeeid: null });
     setLoading(false);
   };
 
@@ -94,29 +94,31 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
 
   const [visibility, setVisibility] = useState(false);
   const onChange = (e, option) => {
-    setAssignment({ ...assignment, employeeid: e, name: option.name });
+    setAssignment({ ...assignment, employeeid: e, name: option.label });
   };
 
+  const employeeOptions = bodyshop.employees
+    .filter((emp) => emp.active)
+    .map((emp) => ({
+      value: emp.id,
+      label: `${emp.first_name} ${emp.last_name}`,
+      name: `${emp.first_name} ${emp.last_name}`
+    }));
+
   const popContent = (
     <Row gutter={[16, 16]}>
       <Col span={24}>
         <Select
           id="employeeSelector"
           showSearch={{
-            optionFilterProp: "children",
-            filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+            optionFilterProp: "label",
+            filterOption: (input, option) => option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
           }}
           style={{ width: 200 }}
+          value={assignment.employeeid}
           onChange={onChange}
-        >
-          {bodyshop.employees
-            .filter((emp) => emp.active)
-            .map((emp) => (
-              <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
-                {`${emp.first_name} ${emp.last_name}`}
-              </Select.Option>
-            ))}
-        </Select>
+          options={employeeOptions}
+        />
       </Col>
       <Col span={24}>
         <Space wrap>
@@ -141,25 +143,25 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
   if (record[type]) theEmployee = bodyshop.employees.find((e) => e.id === record[type]);
 
   return (
-    <Popover destroyOnHidden content={popContent} open={visibility}>
-      <Spin spinning={loading}>
-        {record[type] ? (
-          <div style={{ cursor: "pointer" }}>
-            <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
-            <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
-          </div>
-        ) : (
+    <Spin spinning={loading}>
+      {record[type] ? (
+        <div style={{ cursor: "pointer" }}>
+          <span>{`${theEmployee?.first_name || ""} ${theEmployee?.last_name || ""}`}</span>
+          <DeleteFilled style={iconStyle} onClick={() => handleRemove(type)} />
+        </div>
+      ) : (
+        <Popover destroyOnHidden content={popContent} open={visibility} trigger="click">
           <PlusCircleFilled
             style={{ ...iconStyle, cursor: "pointer" }}
             className="muted-button"
             onClick={() => {
-              setAssignment({ operation: type });
+              setAssignment({ operation: type, employeeid: null });
               setVisibility(true);
             }}
           />
-        )}
-      </Spin>
-    </Popover>
+        </Popover>
+      )}
+    </Spin>
   );
 }
 

client/src/components/production-list-table/production-list-table.component.jsx

@@ -1,15 +1,19 @@
-import { SyncOutlined } from "@ant-design/icons";
+import { HolderOutlined, SyncOutlined } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Dropdown, Input, Space, Statistic, Table } from "antd";
 import _ from "lodash";
-import { useEffect, useMemo, useRef, useState } from "react";
-import ReactDragListView from "react-drag-listview";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { closestCenter, DndContext, DragOverlay, PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
+import { arrayMove, horizontalListSortingStrategy, SortableContext, useSortable } from "@dnd-kit/sortable";
+import { CSS } from "@dnd-kit/utilities";
+import { restrictToHorizontalAxis } from "@dnd-kit/modifiers";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectDarkMode } from "../../redux/application/application.selectors.js";
 import Prompt from "../../utils/prompt.js";
 import AlertComponent from "../alert/alert.component.jsx";
 import ProductionListColumnsAdd from "../production-list-columns/production-list-columns.add.component";
@@ -23,12 +27,81 @@ import { logImEXEvent } from "../../firebase/firebase.utils.js";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   technician: selectTechnician,
-  currentUser: selectCurrentUser
+  currentUser: selectCurrentUser,
+  isDarkMode: selectDarkMode
 });
 
-export function ProductionListTable({ loading, data, refetch, bodyshop, technician, currentUser }) {
+// Draggable header cell component - combines drag and resize
+function DraggableHeaderCell(props) {
+  const { children, columnKey, onResize, width, ...restProps } = props;
+  const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
+    id: columnKey,
+    disabled: !columnKey
+  });
+
+  const style = {
+    ...restProps.style,
+    transform: CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.3 : 1,
+    userSelect: "none",
+    textAlign: "left"
+  };
+
+  // If no columnKey, render as regular header
+  if (!columnKey) {
+    return <ResizeableTitle {...props} />;
+  }
+
+  // Only apply drag listeners to elements with data-drag-handle attribute
+  const filteredListeners = listeners
+    ? {
+        onPointerDown: (e) => {
+          // Only trigger drag if clicking on the drag handle
+          if (e.target.closest('[data-drag-handle="true"]')) {
+            listeners.onPointerDown?.(e);
+          }
+        }
+      }
+    : {};
+
+  // Combine drag functionality with resize
+  return (
+    <ResizeableTitle
+      {...restProps}
+      ref={setNodeRef}
+      style={style}
+      onResize={onResize}
+      width={width}
+      dragAttributes={attributes}
+      dragListeners={filteredListeners}
+    >
+      {children}
+    </ResizeableTitle>
+  );
+}
+
+export function ProductionListTable({ loading, data, refetch, bodyshop, technician, currentUser, isDarkMode }) {
   const [searchText, setSearchText] = useState("");
   const [hasUnsavedChanges, setHasUnsavedChanges] = useState(false);
+
+  // NEW: smoother resize
+  const [isResizing, setIsResizing] = useState(false);
+  const resizeRafRef = useRef(null);
+  const pendingResizeRef = useRef(null);
+
+  const [activeId, setActiveId] = useState(null);
+
+  const MIN_COL_WIDTH = 20;
+
+  const sensors = useSensors(
+    useSensor(PointerSensor, {
+      activationConstraint: {
+        distance: 1
+      }
+    })
+  );
+
   const {
     treatments: { Production_List_Status_Colors, Enhanced_Payroll }
   } = useTreatmentsWithConfig({
@@ -36,8 +109,10 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
     names: ["Production_List_Status_Colors", "Enhanced_Payroll"],
     splitKey: bodyshop.imexshopid
   });
+
   const assoc = bodyshop.associations.find((a) => a.useremail === currentUser.email);
   const defaultView = assoc?.default_prod_list_view;
+
   const initialStateRef = useRef(
     (bodyshop.production_config &&
       bodyshop.production_config.find((p) => p.name === defaultView)?.columns.tableState) ||
@@ -46,6 +121,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
         filteredInfo: { text: "" }
       }
   );
+
   const initialColumnsRef = useRef(
     (initialStateRef.current &&
       bodyshop?.production_config
@@ -66,14 +142,36 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
         })) ||
       []
   );
+
   const [state, setState] = useState(initialStateRef.current);
   const [columns, setColumns] = useState(initialColumnsRef.current);
+
+  const scrollX = useMemo(() => {
+    // keep scroll width aligned with the actual column widths so AntD doesn't clamp at a fixed floor
+    const sum = columns.reduce((acc, c) => acc + (c.width ?? 100), 0);
+    return Math.max(sum, 1);
+  }, [columns]);
+
   const { t } = useTranslation();
+
   const matchingColumnConfig = useMemo(() => {
     return bodyshop?.production_config?.find((p) => p.name === defaultView);
   }, [bodyshop.production_config, defaultView]);
 
+  // NEW: cleanup RAF on unmount
   useEffect(() => {
+    return () => {
+      if (resizeRafRef.current) cancelAnimationFrame(resizeRafRef.current);
+    };
+  }, []);
+
+  useEffect(() => {
+    // NEW: while resizing, don’t regenerate columns
+    if (isResizing) return;
+
+    // NEW: bail early BEFORE expensive ProductionListColumns(...) call
+    if (!_.isEqual(initialColumnsRef.current, columns)) return;
+
     const newColumns =
       matchingColumnConfig?.columns.columnKeys.map((k) => {
         return {
@@ -89,10 +187,8 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
           width: k.width ?? 100
         };
       }) || [];
-    // Only update columns if they haven't been manually changed by the user
-    if (_.isEqual(initialColumnsRef.current, columns)) {
-      setColumns(newColumns);
-    }
+
+    setColumns(newColumns);
   }, [
     matchingColumnConfig,
     bodyshop,
@@ -102,7 +198,8 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
     Production_List_Status_Colors,
     refetch,
     state,
-    columns
+    columns,
+    isResizing
   ]);
 
   const handleTableChange = (pagination, filters, sorter) => {
@@ -118,17 +215,30 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
     logImEXEvent("production_list_sort_filter", { pagination, filters, sorter });
   };
 
-  const onDragEnd = (fromIndex, toIndex) => {
-    if (fromIndex === toIndex) return;
-    const columnsCopy = [...columns];
-    const [movedItem] = columnsCopy.splice(fromIndex, 1);
-    columnsCopy.splice(toIndex, 0, movedItem);
-    if (!_.isEqual(columnsCopy, columns)) {
-      setColumns(columnsCopy);
-      setHasUnsavedChanges(true);
+  const onDragStart = ({ active }) => {
+    setActiveId(active.id);
+  };
+
+  const onDragEnd = ({ active, over }) => {
+    setActiveId(null);
+    if (!over || active.id === over.id) return;
+
+    const oldIndex = columns.findIndex((col) => col.key === active.id);
+    const newIndex = columns.findIndex((col) => col.key === over.id);
+
+    if (oldIndex !== -1 && newIndex !== -1) {
+      const newColumns = arrayMove(columns, oldIndex, newIndex);
+      if (!_.isEqual(newColumns, columns)) {
+        setColumns(newColumns);
+        setHasUnsavedChanges(true);
+      }
     }
   };
 
+  const onDragCancel = () => {
+    setActiveId(null);
+  };
+
   const removeColumn = (e) => {
     const { key } = e;
     const newColumns = columns.filter((i) => i.key !== key);
@@ -139,19 +249,55 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
     logImEXEvent("production_list_remove_column", { key });
   };
 
-  const handleResize =
-    (index) =>
-    (e, { size }) => {
-      const nextColumns = [...columns];
-      nextColumns[index] = {
-        ...nextColumns[index],
-        width: size.width
-      };
-      if (!_.isEqual(nextColumns, columns)) {
-        setColumns(nextColumns);
+  // NEW: commit widths via rAF (less jank)
+  const applyColumnWidth = useCallback((columnKey, width) => {
+    const nextWidth = Math.max(MIN_COL_WIDTH, Math.round(width));
+    setColumns((prev) => {
+      const idx = prev.findIndex((c) => c.key === columnKey);
+      if (idx === -1) return prev;
+
+      const currentWidth = prev[idx].width ?? 100;
+      if (currentWidth === nextWidth) return prev;
+
+      const next = prev.slice();
+      next[idx] = { ...next[idx], width: nextWidth };
+      return next;
+    });
+  }, []);
+
+  const handleResize = useCallback(
+    (columnKey) =>
+      (e, { size }) => {
+        pendingResizeRef.current = { columnKey, width: size.width };
+
+        if (resizeRafRef.current) return;
+        resizeRafRef.current = requestAnimationFrame(() => {
+          resizeRafRef.current = null;
+          const pending = pendingResizeRef.current;
+          if (!pending) return;
+          applyColumnWidth(pending.columnKey, pending.width);
+        });
+      },
+    [applyColumnWidth]
+  );
+
+  const handleResizeStart = useCallback(() => {
+    setIsResizing(true);
+  }, []);
+
+  const handleResizeStop = useCallback(
+    (columnKey) =>
+      (e, { size }) => {
+        setIsResizing(false);
+
+        // Ensure final width is committed
+        applyColumnWidth(columnKey, size.width);
+
         setHasUnsavedChanges(true);
-      }
-    };
+        logImEXEvent("production_list_resize_column", { key: columnKey, width: size.width });
+      },
+    [applyColumnWidth]
+  );
 
   const addColumn = (newColumn) => {
     const updatedColumns = [...columns, newColumn];
@@ -163,19 +309,53 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
   };
 
   const headerItem = (col) => {
-    const menu = {
-      onClick: removeColumn,
-      items: [
-        {
-          key: col.key,
-          label: t("production.actions.removecolumn")
-        }
-      ]
-    };
+    const menu = { onClick: removeColumn, items: [{ key: col.key, label: t("production.actions.removecolumn") }] };
+
     return (
-      <Dropdown className="prod-header-dropdown" menu={menu} trigger={["contextMenu"]}>
-        <span>{col.title}</span>
-      </Dropdown>
+      <div
+        style={{
+          display: "flex",
+          alignItems: "left",
+          width: "100%",
+          userSelect: "none",
+          minWidth: 0 // critical: allow the flex row to shrink
+        }}
+      >
+        <span
+          className="drag-handle-trigger"
+          data-drag-handle="true"
+          style={{
+            marginRight: 8,
+            color: "#999",
+            cursor: "grab",
+            padding: 4,
+            display: "inline-flex",
+            alignItems: "left",
+            userSelect: "none",
+            flex: "0 0 auto"
+          }}
+          title="Drag to reorder column"
+        >
+          <HolderOutlined />
+        </span>
+
+        <Dropdown className="prod-header-dropdown" menu={menu} trigger={["contextMenu"]}>
+          <span
+            style={{
+              flex: "1 1 auto",
+              minWidth: 0, // critical: allow text to shrink
+              overflow: "hidden", // clip
+              textOverflow: "ellipsis", // show …
+              whiteSpace: "nowrap", // keep single line
+              cursor: "default",
+              userSelect: "none",
+              display: "block"
+            }}
+          >
+            {col.title}
+          </span>
+        </Dropdown>
+      </div>
     );
   };
 
@@ -274,6 +454,9 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
               onSave={() => {
                 setHasUnsavedChanges(false);
                 initialStateRef.current = state;
+
+                // NEW: after saving, treat current columns as the baseline
+                initialColumnsRef.current = columns;
               }}
             />
             <Input
@@ -286,60 +469,104 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
         }
       />
       <ProductionListDetail jobs={dataSource} />
-      <ReactDragListView.DragColumn onDragEnd={onDragEnd} nodeSelector="th" handleSelector=".prod-header-dropdown">
-        <Table
-          sticky
-          pagination={false}
-          size="small"
-          {...(Production_List_Status_Colors.treatment === "on" && {
-            onRow: (record, index) => {
-              if (!bodyshop.md_ro_statuses.production_colors) return null;
-              const color = bodyshop.md_ro_statuses.production_colors.find((x) => x.status === record.status);
-              if (!color) {
-                if (index % 2 === 0)
+      <DndContext
+        sensors={sensors}
+        onDragStart={onDragStart}
+        onDragEnd={onDragEnd}
+        onDragCancel={onDragCancel}
+        collisionDetection={closestCenter}
+        modifiers={[restrictToHorizontalAxis]}
+      >
+        <SortableContext items={columns.map((col) => col.key)} strategy={horizontalListSortingStrategy}>
+          <Table
+            sticky
+            tableLayout="fixed"
+            className="prod-list-table"
+            pagination={false}
+            size="small"
+            {...(Production_List_Status_Colors.treatment === "on" &&
+              !isResizing && {
+                onRow: (record, index) => {
+                  if (!bodyshop.md_ro_statuses.production_colors) return null;
+                  const color = bodyshop.md_ro_statuses.production_colors.find((x) => x.status === record.status);
+                  if (!color) {
+                    if (index % 2 === 0)
+                      return {
+                        style: {
+                          backgroundColor: "var(--table-row-even-bg)"
+                        }
+                      };
+                    return null;
+                  }
                   return {
+                    className: "rowWithColor",
                     style: {
-                      backgroundColor: "var(--table-row-even-bg)"
+                      "--bgColor": color.color
+                        ? `rgba(${color.color.r},${color.color.g},${color.color.b},${color.color.a || 1})`
+                        : "var(--status-row-bg-fallback)"
                     }
                   };
-                return null;
-              }
-              return {
-                className: "rowWithColor",
-                style: {
-                  "--bgColor": color.color
-                    ? `rgba(${color.color.r},${color.color.g},${color.color.b},${color.color.a || 1})`
-                    : "var(--status-row-bg-fallback)"
                 }
+              })}
+            components={{
+              header: {
+                cell: DraggableHeaderCell
+              }
+            }}
+            columns={columns.map((c) => {
+              return {
+                ...c,
+                filteredValue: state.filteredInfo[c.key] || null,
+                sortOrder: state.sortedInfo.columnKey === c.key && state.sortedInfo.order,
+                title: headerItem(c),
+                ellipsis: true,
+                width: c.width ?? 100,
+                onHeaderCell: (column) => ({
+                  columnKey: column.key,
+                  width: column.width,
+                  onResize: handleResize(column.key),
+                  onResizeStart: handleResizeStart,
+                  onResizeStop: handleResizeStop(column.key)
+                })
               };
-            }
-          })}
-          components={{
-            header: {
-              cell: ResizeableTitle
-            }
-          }}
-          columns={columns.map((c, index) => {
-            return {
-              ...c,
-              filteredValue: state.filteredInfo[c.key] || null,
-              sortOrder: state.sortedInfo.columnKey === c.key && state.sortedInfo.order,
-              title: headerItem(c),
-              ellipsis: true,
-              width: c.width ?? 100,
-              onHeaderCell: (column) => ({
-                width: column.width,
-                onResize: handleResize(index)
-              })
-            };
-          })}
-          rowKey="id"
-          loading={loading}
-          dataSource={dataSource}
-          scroll={{ x: 1000 }}
-          onChange={handleTableChange}
-        />
-      </ReactDragListView.DragColumn>
+            })}
+            rowKey="id"
+            loading={loading}
+            dataSource={dataSource}
+            scroll={{ x: scrollX }}
+            onChange={handleTableChange}
+          />
+        </SortableContext>
+
+        <DragOverlay dropAnimation={null}>
+          {activeId ? (
+            <div
+              style={{
+                backgroundColor: isDarkMode ? "#141414" : "white",
+                color: isDarkMode ? "white" : "#000",
+                border: `2px solid ${isDarkMode ? "#177ddc" : "#1890ff"}`,
+                borderRadius: "4px",
+                padding: "12px 16px",
+                boxShadow: "0 4px 12px rgba(0, 0, 0, 0.25)",
+                cursor: "grabbing",
+                display: "flex",
+                alignItems: "center",
+                fontWeight: 500,
+                minWidth: "120px"
+              }}
+            >
+              <HolderOutlined style={{ marginRight: "8px", color: isDarkMode ? "white" : "#000", fontSize: "16px" }} />
+              <span>
+                {(() => {
+                  const col = columns.find((c) => c.key === activeId);
+                  const title = typeof col?.title === "string" ? col.title : col?.dataIndex || col?.key || "Column";
+                  return title;
+                })()}
+              </span>
+            </div>
+          ) : null}
+        </DragOverlay>
+      </DndContext>
     </div>
   );
 }

client/src/components/production-list-table/production-list-table.resizeable.component.jsx

@@ -1,28 +1,37 @@
+import { forwardRef } from "react";
 import { Resizable } from "react-resizable";
+import "react-resizable/css/styles.css";
 
-export default function ResizableComponent(props) {
-  const { onResize, width, ...restProps } = props;
+const ResizableComponent = forwardRef((props, ref) => {
+  const { onResize, onResizeStart, onResizeStop, width, dragAttributes, dragListeners, ...restProps } = props;
 
   if (!width) {
-    return <th {...restProps} />;
+    return <th ref={ref} {...restProps} {...(dragAttributes || {})} {...(dragListeners || {})} />;
   }
 
   return (
     <Resizable
-      width={width || 200}
+      width={width}
       height={0}
       onResize={onResize}
+      onResizeStart={onResizeStart}
+      onResizeStop={onResizeStop}
       draggableOpts={{ enableUserSelectHack: false }}
-      handle={
+      resizeHandles={["e"]}
+      axis="x"
+      handle={(axis, handleRef) => (
         <span
-          className="react-resizable-handle"
-          onClick={(e) => {
-            e.stopPropagation();
-          }}
+          ref={handleRef}
+          className={`react-resizable-handle react-resizable-handle-${axis}`}
+          onClick={(e) => e.stopPropagation()}
         />
-      }
+      )}
     >
-      <th {...restProps} />
+      <th ref={ref} {...restProps} {...(dragAttributes || {})} {...(dragListeners || {})} />
     </Resizable>
   );
-}
+});
+
+ResizableComponent.displayName = "ResizableComponent";
+
+export default ResizableComponent;

client/src/components/vehicle-search-select/vehicle-search-select.component.jsx

@@ -18,9 +18,10 @@ const VehicleSearchSelect = ({ value, onChange, onBlur, disabled, ref }) => {
     SEARCH_VEHICLES_BY_ID_FOR_AUTOCOMPLETE
   );
 
-  const executeSearch = (v) => {
-    if (v && v.variables?.search !== "" && v.variables.search.length >= 2) callSearch({ variables: v.variables });
+  const executeSearch = (variables) => {
+    if (variables?.search !== "" && variables?.search?.length >= 2) callSearch({ variables });
   };
+
   const debouncedExecuteSearch = _.debounce(executeSearch, 500);
 
   const handleSearch = (value) => {

client/src/components/vendor-search-select/vendor-search-select.component.jsx

@@ -10,11 +10,19 @@ const { Option } = Select;
 const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, preferredMake, showPhone, ref }) => {
   const [option, setOption] = useState(value);
 
+  // Sync internal state when value prop changes (e.g., from form.setFieldsValue)
   useEffect(() => {
-    if (value !== option && onChange) {
-      onChange(option);
+    if (value !== option) {
+      setOption(value);
     }
-  }, [value, option, onChange]);
+  }, [value, option]);
+
+  const handleChange = (newValue) => {
+    setOption(newValue);
+    if (onChange) {
+      onChange(newValue);
+    }
+  };
 
   const favorites =
     preferredMake && options
@@ -58,7 +66,7 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
         );
       }}
       popupMatchSelectWidth={false}
-      onChange={setOption}
+      onChange={handleChange}
       optionFilterProp="name"
       onSelect={onSelect}
       disabled={disabled || false}

client/src/graphql/jobs.queries.js

@@ -470,6 +470,9 @@ export const GET_JOB_BY_PK = gql`
       clm_total
       comment
       converted
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       csiinvites {
         completedon
         id
@@ -491,6 +494,9 @@ export const GET_JOB_BY_PK = gql`
       ded_status
       deliverchecklist
       depreciation_taxes
+      dms_id
+      dms_advisor_id
+      dms_customer_id
       driveable
       employee_body
       employee_body_rel {
@@ -1995,6 +2001,9 @@ export const QUERY_JOB_CLOSE_DETAILS = gql`
       qb_multiple_payers
       lbr_adjustments
       ownr_ea
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       payments {
         amount
         created_at
@@ -2216,6 +2225,9 @@ export const QUERY_JOB_EXPORT_DMS = gql`
       plate_no
       plate_st
       ownr_co_nm
+      dms_id
+      dms_customer_id
+      dms_advisor_id
     }
   }
 `;

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

@@ -426,6 +426,24 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
 
   if (data.jobs_by_pk?.date_exported) return <Result status="warning" title={t("dms.errors.alreadyexported")} />;
 
+  // Check if Reynolds mode requires early RO
+  const hasEarlyRO = !!(data.jobs_by_pk?.dms_id && data.jobs_by_pk?.dms_customer_id && data.jobs_by_pk?.dms_advisor_id);
+  
+  if (isRrMode && !hasEarlyRO) {
+    return (
+      <Result
+        status="warning"
+        title={t("dms.errors.earlyrorequired")}
+        subTitle={t("dms.errors.earlyrorequired.message")}
+        extra={
+          <Link to={`/manage/jobs/${jobId}/admin`}>
+            <Button type="primary">{t("general.actions.gotoadmin")}</Button>
+          </Link>
+        }
+      />
+    );
+  }
+
   return (
     <div>
       <AlertComponent style={{ marginBottom: 10 }} title={bannerMessage} type="warning" showIcon closable />
@@ -486,6 +504,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
 
         <DmsCustomerSelector
           jobid={jobId}
+          job={data?.jobs_by_pk}
           bodyshop={bodyshop}
           socket={activeSocket}
           mode={mode}

client/src/pages/jobs-admin/jobs-admin.page.jsx

@@ -1,9 +1,12 @@
-import { useQuery } from "@apollo/client/react";
-import { Card, Col, Result, Row, Space, Typography } from "antd";
-import { useEffect } from "react";
+import { useMutation, useQuery } from "@apollo/client/react";
+import { Button, Card, Col, Form, Input, Modal, Result, Row, Select, Space, Switch, Typography } from "antd";
+import { useEffect, useState, useCallback } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useParams } from "react-router-dom";
+import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
+import { some } from "lodash";
+import axios from "axios";
 import AlertComponent from "../../components/alert/alert.component";
 import JobCalculateTotals from "../../components/job-calculate-totals/job-calculate-totals.component";
 import ScoreboardAddButton from "../../components/job-scoreboard-add-button/job-scoreboard-add-button.component";
@@ -19,13 +22,26 @@ import JobsAdminRemoveAR from "../../components/jobs-admin-remove-ar/jobs-admin-
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import NotFound from "../../components/not-found/not-found.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import { GET_JOB_BY_PK } from "../../graphql/jobs.queries";
+import RREarlyROModal from "../../components/dms-post-form/rr-early-ro-modal";
+import { GET_JOB_BY_PK, CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket";
+import { useNotification } from "../../contexts/Notifications/notificationContext";
+import { DMS_MAP, getDmsMode } from "../../utils/dmsUtils";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
 const colSpan = {
@@ -39,14 +55,36 @@ const cardStyle = {
   height: "100%"
 };
 
-export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
+export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader, bodyshop, insertAuditTrail }) {
   const { jobId } = useParams();
-  const { loading, error, data } = useQuery(GET_JOB_BY_PK, {
+  const { loading, error, data, refetch } = useQuery(GET_JOB_BY_PK, {
     variables: { id: jobId },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
   const { t } = useTranslation();
+  const { socket } = useSocket(); // Extract socket from context
+  const notification = useNotification();
+  const [showEarlyROModal, setShowEarlyROModal] = useState(false);
+  const [showConvertModal, setShowConvertModal] = useState(false);
+  const [convertLoading, setConvertLoading] = useState(false);
+  const [form] = Form.useForm();
+  const [mutationConvertJob] = useMutation(CONVERT_JOB_TO_RO);
+  const allFormValues = Form.useWatch([], form);
+
+  // Get Fortellis treatment for proper DMS mode detection
+  const {
+    treatments: { Fortellis }
+  } = useTreatmentsWithConfig({
+    attributes: {},
+    names: ["Fortellis"],
+    splitKey: bodyshop?.imexshopid
+  });
+
+  // Check if bodyshop has Reynolds integration using the proper getDmsMode function
+  const dmsMode = getDmsMode(bodyshop, Fortellis.treatment);
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
+  const job = data?.jobs_by_pk;
   useEffect(() => {
     setSelectedHeader("activejobs");
     document.title = t("titles.jobs-admin", {
@@ -75,6 +113,55 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
     ]);
   }, [setBreadcrumbs, t, jobId, data, setSelectedHeader]);
 
+  const handleEarlyROSuccess = (result) => {
+    notification.success({
+      title: t("jobs.successes.early_ro_created"),
+      description: `RO Number: ${result.roNumber || "N/A"}`
+    });
+    setShowEarlyROModal(false);
+    refetch?.();
+  };
+
+  const handleConvert = async ({ employee_csr, category, ...values }) => {
+    if (!job?.id) return;
+    setConvertLoading(true);
+    const res = await mutationConvertJob({
+      variables: {
+        jobId: job.id,
+        job: {
+          converted: true,
+          ...(bodyshop?.enforce_conversion_csr ? { employee_csr } : {}),
+          ...(bodyshop?.enforce_conversion_category ? { category } : {}),
+          ...values
+        }
+      }
+    });
+
+    if (values.ca_gst_registrant) {
+      await axios.post("/job/totalsssu", {
+        id: job.id
+      });
+    }
+
+    if (!res.errors) {
+      refetch();
+      notification.success({
+        title: t("jobs.successes.converted")
+      });
+
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobconverted(res.data.update_jobs.returning[0].ro_number),
+        type: "jobconverted"
+      });
+
+      setShowConvertModal(false);
+    }
+    setConvertLoading(false);
+  };
+
+  const submitDisabled = useCallback(() => some(allFormValues, (v) => v === undefined), [allFormValues]);
+
   if (loading) return <LoadingSpinner />;
   if (error) return <AlertComponent title={error.message} type="error" />;
   if (!data.jobs_by_pk) return <NotFound />;
@@ -99,6 +186,16 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
               <JobsAdminUnvoid job={data ? data.jobs_by_pk : {}} />
               <JobsAdminStatus job={data ? data.jobs_by_pk : {}} />
               <JobsAdminRemoveAR job={data ? data.jobs_by_pk : {}} />
+              {isReynoldsMode && job?.converted && !job?.dms_id && !job?.dms_customer_id && !job?.dms_advisor_id && (
+                <Button className="ant-btn ant-btn-default" onClick={() => setShowEarlyROModal(true)}>
+                  {t("jobs.actions.dms.createearlyro", "Create RR RO")}
+                </Button>
+              )}
+              {isReynoldsMode && !job?.converted && !job?.dms_id && (
+                <Button type="primary" danger onClick={() => setShowConvertModal(true)}>
+                  {t("jobs.actions.convertwithoutearlyro", "Convert without Early RO")}
+                </Button>
+              )}
             </Space>
           </Card>
         </Col>
@@ -124,8 +221,173 @@ export function JobsCloseContainer({ setBreadcrumbs, setSelectedHeader }) {
           </Card>
         </Col>
       </Row>
+
+      {/* Early RO Modal */}
+      <RREarlyROModal
+        open={showEarlyROModal}
+        onClose={() => setShowEarlyROModal(false)}
+        onSuccess={handleEarlyROSuccess}
+        bodyshop={bodyshop}
+        socket={socket}
+        job={job}
+      />
+
+      {/* Convert without Early RO Modal */}
+      <Modal
+        open={showConvertModal}
+        onCancel={() => setShowConvertModal(false)}
+        title={t("jobs.actions.convertwithoutearlyro", "Convert without Early RO")}
+        footer={null}
+        width={700}
+        destroyOnHidden
+      >
+        <Form
+          layout="vertical"
+          form={form}
+          onFinish={handleConvert}
+          initialValues={{
+            driveable: true,
+            towin: job?.towin,
+            ca_gst_registrant: job?.ca_gst_registrant,
+            employee_csr: job?.employee_csr,
+            category: job?.category,
+            referral_source: job?.referral_source,
+            referral_source_extra: job?.referral_source_extra ?? ""
+          }}
+        >
+          <Form.Item
+            name={["ins_co_nm"]}
+            label={t("jobs.fields.ins_co_nm")}
+            rules={[
+              {
+                required: true
+              }
+            ]}
+          >
+            <Select showSearch>
+              {bodyshop?.md_ins_cos?.map((s, i) => (
+                <Select.Option key={i} value={s.name}>
+                  {s.name}
+                </Select.Option>
+              ))}
+            </Select>
+          </Form.Item>
+          {bodyshop?.enforce_class && (
+            <Form.Item
+              name={"class"}
+              label={t("jobs.fields.class")}
+              rules={[
+                {
+                  required: bodyshop.enforce_class
+                }
+              ]}
+            >
+              <Select>
+                {bodyshop?.md_classes?.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.enforce_referral && (
+            <>
+              <Form.Item
+                name={"referral_source"}
+                label={t("jobs.fields.referralsource")}
+                rules={[
+                  {
+                    required: bodyshop.enforce_referral
+                  }
+                ]}
+              >
+                <Select>
+                  {bodyshop?.md_referral_sources?.map((s) => (
+                    <Select.Option key={s} value={s}>
+                      {s}
+                    </Select.Option>
+                  ))}
+                </Select>
+              </Form.Item>
+              <Form.Item label={t("jobs.fields.referral_source_extra")} name="referral_source_extra">
+                <Input />
+              </Form.Item>
+            </>
+          )}
+          {bodyshop?.enforce_conversion_csr && (
+            <Form.Item
+              name={"employee_csr"}
+              label={t(
+                InstanceRenderManager({
+                  imex: "jobs.fields.employee_csr",
+                  rome: "jobs.fields.employee_csr_writer"
+                })
+              )}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_csr
+                }
+              ]}
+            >
+              <Select
+                showSearch={{
+                  optionFilterProp: "children",
+                  filterOption: (input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                }}
+                style={{ width: 200 }}
+              >
+                {bodyshop?.employees
+                  ?.filter((emp) => emp.active)
+                  ?.map((emp) => (
+                    <Select.Option value={emp.id} key={emp.id} name={`${emp.first_name} ${emp.last_name}`}>
+                      {`${emp.first_name} ${emp.last_name}`}
+                    </Select.Option>
+                  ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.enforce_conversion_category && (
+            <Form.Item
+              name={"category"}
+              label={t("jobs.fields.category")}
+              rules={[
+                {
+                  required: bodyshop.enforce_conversion_category
+                }
+              ]}
+            >
+              <Select allowClear>
+                {bodyshop?.md_categories?.map((s) => (
+                  <Select.Option key={s} value={s}>
+                    {s}
+                  </Select.Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
+          {bodyshop?.region_config?.toLowerCase().startsWith("ca") && (
+            <Form.Item label={t("jobs.fields.ca_gst_registrant")} name="ca_gst_registrant" valuePropName="checked">
+              <Switch />
+            </Form.Item>
+          )}
+          <Form.Item label={t("jobs.fields.driveable")} name="driveable" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.towin")} name="towin" valuePropName="checked">
+            <Switch />
+          </Form.Item>
+
+          <Space wrap style={{ marginTop: 16 }}>
+            <Button disabled={submitDisabled()} type="primary" danger onClick={() => form.submit()} loading={convertLoading}>
+              {t("jobs.actions.convert")}
+            </Button>
+            <Button onClick={() => setShowConvertModal(false)}>{t("general.actions.close")}</Button>
+          </Space>
+        </Form>
+      </Modal>
     </RbacWrapper>
   );
 }
 
-export default connect(null, mapDispatchToProps)(JobsCloseContainer);
+export default connect(mapStateToProps, mapDispatchToProps)(JobsCloseContainer);

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

@@ -9,6 +9,7 @@ import {
   Form,
   Input,
   InputNumber,
+  Modal,
   Popconfirm,
   Row,
   Select,
@@ -42,7 +43,7 @@ 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";
+import { bodyshopHasDmsKey, DMS_MAP, getDmsMode } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -71,6 +72,11 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
   const notification = useNotification();
 
   const hasDMSKey = bodyshopHasDmsKey(bodyshop);
+  const dmsMode = getDmsMode(bodyshop, "off");
+  const isReynoldsMode = dmsMode === DMS_MAP.reynolds;
+  const hasEarlyRO = !!(job?.dms_id && job?.dms_customer_id && job?.dms_advisor_id);
+  const canSendToDMS = !isReynoldsMode || hasEarlyRO;
+  const [showEarlyROModal, setShowEarlyROModal] = useState(false);
 
   const {
     treatments: { Qb_Multi_Ar, ClosingPeriod }
@@ -82,18 +88,18 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
 
   const handleFinish = async ({ removefromproduction, ...values }) => {
     setLoading(true);
-    
+
     // Validate that all joblines have valid IDs
-    const joblinesWithIds = values.joblines.filter(jl => jl && jl.id);
+    const joblinesWithIds = values.joblines.filter((jl) => jl && jl.id);
     if (joblinesWithIds.length !== values.joblines.length) {
       notification.error({
         title: t("jobs.errors.invalidjoblines"),
-        message: t("jobs.errors.missingjoblineids")
+        description: t("jobs.errors.missingjoblineids")
       });
       setLoading(false);
       return;
     }
-    
+
     const result = await client.mutate({
       mutation: generateJobLinesUpdatesForInvoicing(values.joblines)
     });
@@ -208,9 +214,17 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                 </Button>
               </Popconfirm>
               {bodyshopHasDmsKey(bodyshop) && (
-                <Link to={`/manage/dms?jobId=${job.id}`}>
-                  <Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
-                </Link>
+                <>
+                  {canSendToDMS ? (
+                    <Link to={`/manage/dms?jobId=${job.id}`}>
+                      <Button disabled={job.date_exported || !jobRO}>{t("jobs.actions.sendtodms")}</Button>
+                    </Link>
+                  ) : (
+                    <Button disabled={job.date_exported || !jobRO} onClick={() => setShowEarlyROModal(true)}>
+                      {t("jobs.actions.sendtodms")}
+                    </Button>
+                  )}
+                </>
               )}
               <Button
                 onClick={() => {
@@ -510,7 +524,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                         <Statistic
                           title={t("jobs.labels.pimraryamountpayable")}
                           styles={{
-                            value: {
+                            content: {
                               color: discrep.getAmount() >= 0 ? "green" : "red"
                             }
                           }}
@@ -527,6 +541,30 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
         <Divider />
         <JobsCloseLines job={job} />
       </Form>
+
+      {/* Early RO Required Modal */}
+      <Modal
+        open={showEarlyROModal}
+        onCancel={() => setShowEarlyROModal(false)}
+        footer={null}
+        title={
+          <Space>
+            <Typography.Text type="warning" style={{ fontSize: "1.2em" }}>
+              ⚠️
+            </Typography.Text>
+            <span>{t("dms.errors.earlyrorequired")}</span>
+          </Space>
+        }
+      >
+        <Space orientation="vertical" size="large" style={{ width: "100%" }}>
+          <Typography.Paragraph>{t("dms.errors.earlyrorequired.message")}</Typography.Paragraph>
+          <Link to={`/manage/jobs/${job.id}/admin`}>
+            <Button type="primary" block onClick={() => setShowEarlyROModal(false)}>
+              {t("general.actions.gotoadmin")}
+            </Button>
+          </Link>
+        </Space>
+      </Modal>
     </div>
   );
 }

client/src/pages/tech/tech.page.component.jsx

@@ -17,7 +17,10 @@ import "./tech.page.styles.scss";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component.jsx";
 import { lazyDev } from "../../utils/lazyWithPreload.jsx";
 
-const TimeTicketModalContainer = lazyDev(() => import("../../components/time-ticket-modal/time-ticket-modal.container"));
+const NoteUpsertModal = lazyDev(() => import("../../components/note-upsert-modal/note-upsert-modal.container.jsx"));
+const TimeTicketModalContainer = lazyDev(
+  () => import("../../components/time-ticket-modal/time-ticket-modal.container")
+);
 const EmailOverlayContainer = lazyDev(() => import("../../components/email-overlay/email-overlay.container.jsx"));
 const PrintCenterModalContainer = lazyDev(
   () => import("../../components/print-center-modal/print-center-modal.container")
@@ -34,7 +37,9 @@ const TimeTicketModalTask = lazyDev(
 const TechAssignedProdJobs = lazyDev(() => import("../tech-assigned-prod-jobs/tech-assigned-prod-jobs.component"));
 const TechDispatchedParts = lazyDev(() => import("../tech-dispatched-parts/tech-dispatched-parts.page"));
 
-const TaskUpsertModalContainer = lazyDev(() => import("../../components/task-upsert-modal/task-upsert-modal.container"));
+const TaskUpsertModalContainer = lazyDev(
+  () => import("../../components/task-upsert-modal/task-upsert-modal.container")
+);
 
 const { Content } = Layout;
 
@@ -70,6 +75,8 @@ export function TechPage({ technician }) {
         <TechHeader />
 
         <TaskUpsertModalContainer />
+        <NoteUpsertModal />
+
         <Content className="tech-content-container">
           <ErrorBoundary>
             <Suspense

client/src/translations/en_us/common.json

@@ -48,6 +48,7 @@
         "arrivedon": "Arrived on: ",
         "arrivingjobs": "Arriving Jobs",
         "blocked": "Blocked",
+        "bp": "B/P",
         "cancelledappointment": "Canceled appointment for: ",
         "completingjobs": "Completing Jobs",
         "dataconsistency": "<0>{{ro_number}}</0> has a data consistency issue. It may have been excluded for scheduling purposes. CODE: {{code}}.",
@@ -59,18 +60,17 @@
         "noarrivingjobs": "No Jobs are arriving.",
         "nocompletingjobs": "No Jobs scheduled for completion.",
         "nodateselected": "No date has been selected.",
+        "owner": "Owner",
         "priorappointments": "Previous Appointments",
         "reminder": "This is {{shopname}} reminding you about an appointment on {{date}} at {{time}}. Please let us know if you are not able to make the appointment. We look forward to seeing you soon. ",
+        "ro_number": "RO #",
+        "scheduled_completion": "Scheduled Completion",
         "scheduledfor": "Scheduled appointment for: ",
         "severalerrorsfound": "Several Jobs have issues which may prevent accurate smart scheduling. Click to expand.",
         "smartscheduling": "Smart Scheduling",
         "smspaymentreminder": "This is {{shopname}} reminding you about your remaining balance of {{amount}}. To pay for the said balance click the link {{payment_link}}.",
         "suggesteddates": "Suggested Dates",
-        "ro_number": "RO #",
-        "owner": "Owner",
-        "vehicle": "Vehicle",
-        "bp": "B/P",
-        "scheduled_completion": "Scheduled Completion"
+        "vehicle": "Vehicle"
       },
       "successes": {
         "canceled": "Appointment canceled successfully.",
@@ -90,6 +90,11 @@
         "actions": "Actions"
       }
     },
+    "audio": {
+      "manager": {
+        "description": "Click anywhere to enable the message ding."
+      }
+    },
     "audit": {
       "fields": {
         "cc": "CC",
@@ -149,11 +154,6 @@
         "tasks_updated": "Task '{{title}}' updated by {{updatedBy}}"
       }
     },
-    "audio": {
-      "manager": {
-        "description": "Click anywhere to enable the message ding."
-      }
-    },
     "billlines": {
       "actions": {
         "newline": "New Line"
@@ -161,6 +161,7 @@
       "fields": {
         "actual_cost": "Actual Cost",
         "actual_price": "Retail",
+        "confidence": "Confidence",
         "cost_center": "Cost Center",
         "federal_tax_applicable": "Fed. Tax?",
         "jobline": "Job Line",
@@ -191,6 +192,8 @@
         "return": "Return Items"
       },
       "errors": {
+        "calculating_totals": "Error Calculating Totals",
+        "calculating_totals_generic": "Please ensure all fields are properly completed. ",
         "creating": "Error adding bill.  {{error}}",
         "deleting": "Error deleting bill. {{error}}",
         "existinginventoryline": "This bill cannot be deleted as it is tied to items in inventory.",
@@ -217,6 +220,24 @@
       },
       "labels": {
         "actions": "Actions",
+        "ai": {
+          "accept_and_continue": "Accept and Continue",
+          "confidence": {
+            "breakdown": "Confidence Breakdown",
+            "match": "Jobline Match",
+            "missing_data": "Missing Data",
+            "ocr": "Optical Character Recognition",
+            "overall": "Overall"
+          },
+          "disclaimer_title": "AI Scan Beta Disclaimer",
+          "generic_failure": "Failed to process invoice.",
+          "multipage": "The is a multi-page document.  Processing will take a few moments.",
+          "processing": "Analyzing Bill",
+          "scan": "AI Bill Scanner",
+          "scancomplete": "AI Scan Complete",
+          "scanfailed": "AI Scan Failed",
+          "scanstarted": "AI Scan Started"
+        },
         "bill_lines": "Bill Lines",
         "bill_total": "Bill Total Amount",
         "billcmtotal": "Credit Memos",
@@ -281,9 +302,9 @@
       },
       "errors": {
         "creatingdefaultview": "Error creating default view.",
+        "duplicate_insurance_company": "Duplicate insurance company name. Each insurance company name must be unique",
         "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}",
-        "duplicate_insurance_company": "Duplicate insurance company name. Each insurance company name must be unique"
+        "saving": "Error encountered while saving. {{message}}"
       },
       "fields": {
         "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -564,21 +585,18 @@
         "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",
           "federal_tax": "Federal Tax",
           "federal_tax_itc": "Federal Tax Credit",
+          "gogcode": "GOG Code (BreakOut)",
           "gst_override": "GST Override Account #",
           "invoiceexemptcode": "QuickBooks US - Invoice Tax Exempt Code",
+          "item_type": "Item Type",
+          "item_type_freight": "Freight",
+          "item_type_gog": "GOG",
+          "item_type_paint": "Paint Materials",
           "itemexemptcode": "QuickBooks US - Line Item Tax Exempt Code",
           "la1": "LA1",
           "la2": "LA2",
@@ -597,6 +615,7 @@
           "local_tax": "Local Tax",
           "mapa": "Paint Materials",
           "mash": "Shop Materials",
+          "nontaxable": "Non-taxable",
           "paa": "Aftermarket",
           "pac": "Chrome",
           "pag": "Glass",
@@ -617,6 +636,8 @@
             "state": "State Tax Applies"
           },
           "state_tax": "State Tax",
+          "taxable": "Taxable",
+          "taxable_flag": "Taxable?",
           "tow": "Towing"
         },
         "schedule_end_time": "Schedule Ending Time",
@@ -678,8 +699,6 @@
         "zip_post": "Zip/Postal Code"
       },
       "labels": {
-        "parts_shop_management": "Shop Management",
-        "parts_vendor_management": "Vendor Management",
         "2tiername": "Name => RO",
         "2tiersetup": "2 Tier Setup",
         "2tiersource": "Source => RO",
@@ -702,11 +721,11 @@
             "payers": "Payers"
           },
           "cdk_dealerid": "CDK Dealer ID",
-          "rr_dealerid": "Reynolds Store Number",
           "costsmapping": "Costs Mapping",
           "dms_allocations": "DMS Allocations",
           "pbs_serialnumber": "PBS Serial Number",
           "profitsmapping": "Profits Mapping",
+          "rr_dealerid": "Reynolds Store Number",
           "title": "DMS"
         },
         "emaillater": "Email Later",
@@ -733,6 +752,8 @@
           "followers": "Notifications"
         },
         "orderstatuses": "Order Statuses",
+        "parts_shop_management": "Shop Management",
+        "parts_vendor_management": "Vendor Management",
         "partslocations": "Parts Locations",
         "partsscan": "Parts Scanning",
         "printlater": "Print Later",
@@ -1047,7 +1068,9 @@
     },
     "dms": {
       "errors": {
-        "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."
+        "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.",
+        "earlyrorequired": "Early RO Required",
+        "earlyrorequired.message": "This job requires an early Repair Order to be created before posting to Reynolds. Please use the admin panel to create the early RO first."
       },
       "labels": {
         "refreshallocations": "Refresh to see DMS Allocations."
@@ -1228,8 +1251,6 @@
     },
     "general": {
       "actions": {
-        "select": "Select",
-        "optional": "Optional",
         "add": "Add",
         "autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
         "calculate": "Calculate",
@@ -1246,9 +1267,11 @@
         "deselectall": "Deselect All",
         "download": "Download",
         "edit": "Edit",
+        "gotoadmin": "Go to Admin Panel",
         "login": "Login",
         "next": "Next",
         "ok": "Ok",
+        "optional": "Optional",
         "previous": "Previous",
         "print": "Print",
         "refresh": "Refresh",
@@ -1259,6 +1282,7 @@
         "save": "Save",
         "saveandnew": "Save and New",
         "saveas": "Save As",
+        "select": "Select",
         "selectall": "Select All",
         "send": "Send",
         "sendbysms": "Send by SMS",
@@ -1288,11 +1312,11 @@
         "vehicle": "Vehicle"
       },
       "labels": {
-        "selected": "Selected",
-        "settings": "Settings",
         "actions": "Actions",
+        "apply": "Apply",
         "areyousure": "Are you sure?",
         "barcode": "Barcode",
+        "beta": "BETA",
         "cancel": "Are you sure you want to cancel? Your changes will not be saved.",
         "changelog": "Change Log",
         "clear": "Clear",
@@ -1343,8 +1367,10 @@
         "search": "Search...",
         "searchresults": "Results for {{search}}",
         "selectdate": "Select date...",
+        "selected": "Selected",
         "sendagain": "Send Again",
         "sendby": "Send By",
+        "settings": "Settings",
         "signin": "Sign In",
         "sms": "SMS",
         "status": "Status",
@@ -1587,13 +1613,13 @@
       "labels": {
         "adjustmenttobeadded": "Adjustment to be added: {{adjustment}}",
         "billref": "Latest Bill",
+        "bulk_location_help": "This will set the same location on all selected lines.",
         "convertedtolabor": "This line has been converted to labor. Ensure you adjust the profit center for the amount accordingly.",
         "edit": "Edit Line",
         "ioucreated": "IOU",
         "new": "New Line",
         "nostatus": "No Status",
-        "presets": "Jobline Presets",
-        "bulk_location_help": "This will set the same location on all selected lines."
+        "presets": "Jobline Presets"
       },
       "successes": {
         "created": "Job line created successfully.",
@@ -1621,11 +1647,13 @@
         "changestatus": "Change Status",
         "changestimator": "Change Estimator",
         "convert": "Convert",
+        "convertwithoutearlyro": "Convert without Early RO",
         "createiou": "Create IOU",
         "deliver": "Deliver",
         "deliver_quick": "Quick Deliver",
         "dms": {
           "addpayer": "Add Payer",
+          "createearlyro": "Create RR RO",
           "createnewcustomer": "Create New Customer",
           "findmakemodelcode": "Find Make/Model Code",
           "getmakes": "Get Makes",
@@ -1634,6 +1662,7 @@
           },
           "post": "Post",
           "refetchmakesmodels": "Refetch Make and Model Codes",
+          "update_ro": "Update RO",
           "usegeneric": "Use Generic Customer",
           "useselected": "Use Selected Customer"
         },
@@ -1701,9 +1730,9 @@
         "actual_delivery": "Actual Delivery",
         "actual_in": "Actual In",
         "acv_amount": "ACV Amount",
-        "admin_clerk": "Admin Clerk",
         "adjustment_bottom_line": "Adjustments",
         "adjustmenthours": "Adjustment Hours",
+        "admin_clerk": "Admin Clerk",
         "alt_transport": "Alt. Trans.",
         "area_of_damage_impact": {
           "10": "Left Front Side",
@@ -1784,9 +1813,8 @@
         "ded_status": "Deductible Status",
         "depreciation_taxes": "Betterment/Depreciation/Taxes",
         "dms": {
-          "first_name": "First Name",
-          "last_name": "Last Name",
           "address": "Customer Address",
+          "advisor": "Advisor #",
           "amount": "Amount",
           "center": "Center",
           "control_type": {
@@ -1794,17 +1822,19 @@
           },
           "cost": "Cost",
           "cost_dms_acctnumber": "Cost DMS Acct #",
+          "customer": "Customer #",
           "dms_make": "DMS Make",
           "dms_model": "DMS Model",
           "dms_model_override": "Override DMS Make/Model",
           "dms_unsold": "New, Unsold Vehicle",
           "dms_wip_acctnumber": "Cost WIP DMS Acct #",
+          "first_name": "First Name",
           "id": "DMS ID",
           "inservicedate": "In Service Date",
           "journal": "Journal #",
-          "make_override": "Make Override",
-          "advisor": "Advisor #",
+          "last_name": "Last Name",
           "lines": "Posting Lines",
+          "make_override": "Make Override",
           "name1": "Customer Name",
           "payer": {
             "amount": "Amount",
@@ -1814,6 +1844,10 @@
             "name": "Payer Name",
             "payer_type": "Payer"
           },
+          "rr_opcode": "RR OpCode",
+          "rr_opcode_base": "Base",
+          "rr_opcode_prefix": "Prefix",
+          "rr_opcode_suffix": "Suffix",
           "sale": "Sale",
           "sale_dms_acctnumber": "Sale DMS Acct #",
           "story": "Story",
@@ -1945,7 +1979,7 @@
           "amount": "Amount",
           "name": "Name"
         },
-        "queued_for_parts": "Queued for Parts",
+        "queued_for_parts": "Queued",
         "rate_ats": "ATS Rate",
         "rate_ats_flat": "ATS Flat Rate",
         "rate_la1": "LA1",
@@ -2102,6 +2136,11 @@
           "damageto": "Damage to $t(jobs.fields.area_of_damage_impact.{{area_of_damage}}).",
           "defaultstory": "B/S RO: {{ro_number}}. Owner: {{ownr_nm}}. Insurance Co: {{ins_co_nm}}. Claim/PO #: {{clm_po}}",
           "disablebillwip": "Cost and WIP for bills has been ignored per shop configuration.",
+          "earlyro": {
+            "created": "Early RO Created:",
+            "fields": "Required fields:",
+            "willupdate": "This will update the existing RO with full job data."
+          },
           "invoicedatefuture": "Invoice date must be today or in the future for CDK posting.",
           "kmoutnotgreaterthankmin": "Mileage out must be greater than mileage in.",
           "logs": "Logs",
@@ -2259,6 +2298,7 @@
         "delete": "Job deleted successfully.",
         "deleted": "Job deleted successfully.",
         "duplicated": "Job duplicated successfully. ",
+        "early_ro_created": "Early RO Created",
         "exported": "Job(s) exported successfully. ",
         "invoiced": "Job closed and invoiced successfully.",
         "ioucreated": "IOU created successfully.  Click to see.",
@@ -2447,6 +2487,7 @@
       "labels": {
         "addlabel": "Add a label to this conversation.",
         "archive": "Archive",
+        "mark_unread": "Mark as unread",
         "maxtenimages": "You can only select up to a maximum of 10 images at a time.",
         "messaging": "Messaging",
         "no_consent": "Opted-out",
@@ -2459,8 +2500,7 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive",
-        "mark_unread": "Mark as unread"
+        "unarchive": "Unarchive"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -2614,20 +2654,20 @@
         "name": "Owner Details"
       },
       "labels": {
+        "cell": "Cell",
         "create_new": "Create a new owner record.",
         "deleteconfirm": "Are you sure you want to delete this owner? This cannot be undone.",
+        "email": "Email",
         "existing_owners": "Existing Owners",
         "fromclaim": "Current Claim",
         "fromowner": "Historical Owner Record",
-        "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner",
-        "work": "Work",
         "home": "Home",
-        "cell": "Cell",
         "other": "Other",
-        "email": "Email",
         "phone": "Phone",
-        "sms": "SMS"
+        "relatedjobs": "Related Jobs",
+        "sms": "SMS",
+        "updateowner": "Update Owner",
+        "work": "Work"
       },
       "successes": {
         "delete": "Owner deleted successfully.",
@@ -2638,6 +2678,10 @@
       "actions": {
         "order": "Order Parts",
         "orderinhouse": "Order as In House"
+      },
+      "labels": {
+        "view_counts_only": "View Parts Counts Only",
+        "view_timestamps": "Show timestamps"
       }
     },
     "parts_dispatch": {
@@ -2987,8 +3031,6 @@
         "settings": "Error saving board settings: {{error}}"
       },
       "labels": {
-        "click_for_statuses": "Click to view parts statuses",
-        "partsreceived": "Parts Received",
         "actual_in": "Actual In",
         "addnewprofile": "Add New Profile",
         "alert": "Alert",
@@ -3007,6 +3049,7 @@
         "card_size": "Card Size",
         "cardcolor": "Colored Cards",
         "cardsettings": "Card Settings",
+        "click_for_statuses": "Click to view parts statuses",
         "clm_no": "Claim Number",
         "comment": "Comment",
         "compact": "Compact Cards",
@@ -3027,6 +3070,7 @@
         "orientation": "Board Orientation",
         "ownr_nm": "Customer Name",
         "paintpriority": "P/P",
+        "partsreceived": "Parts Received",
         "partsstatus": "Parts Status",
         "production_note": "Production Note",
         "refinishhours": "R",
@@ -3573,17 +3617,12 @@
       }
     },
     "titles": {
-      "parts_settings": "Parts Management Settings | {{app}}",
-      "simplified-parts-jobs": "Parts Management | {{app}}",
       "accounting-payables": "Payables | {{app}}",
       "accounting-payments": "Payments | {{app}}",
       "accounting-receivables": "Receivables | {{app}}",
       "all_tasks": "All Tasks | {{app}}",
       "app": "",
       "bc": {
-        "simplified-parts-jobs": "Jobs",
-        "parts": "Parts",
-        "parts_settings": "Settings",
         "accounting-payables": "Payables",
         "accounting-payments": "Payments",
         "accounting-receivables": "Receivables",
@@ -3615,7 +3654,9 @@
         "my_tasks": "My Tasks",
         "owner-detail": "{{name}}",
         "owners": "Owners",
+        "parts": "Parts",
         "parts-queue": "Parts Queue",
+        "parts_settings": "Settings",
         "payments-all": "All Payments",
         "phonebook": "Phonebook",
         "productionboard": "Production Board - Visual",
@@ -3627,6 +3668,7 @@
         "shop-csi": "CSI Responses",
         "shop-templates": "Shop Templates",
         "shop-vendors": "Vendors",
+        "simplified-parts-jobs": "Jobs",
         "tasks": "Tasks",
         "temporarydocs": "Temporary Documents",
         "timetickets": "Time Tickets",
@@ -3662,7 +3704,9 @@
       "my_tasks": "My Tasks | {{app}}",
       "owners": "All Owners | {{app}}",
       "owners-detail": "{{name}} | {{app}}",
+      "parts": "",
       "parts-queue": "Parts Queue | {{app}}",
+      "parts_settings": "Parts Management Settings | {{app}}",
       "payments-all": "Payments | {{app}}",
       "phonebook": "Phonebook | {{app}}",
       "productionboard": "Production Board - Visual | {{app}}",
@@ -3678,6 +3722,7 @@
       "shop-csi": "CSI Responses | {{app}}",
       "shop-templates": "Shop Templates | {{app}}",
       "shop_vendors": "Vendors | {{app}}",
+      "simplified-parts-jobs": "Parts Management | {{app}}",
       "tasks": "Tasks",
       "techconsole": "Technician Console | {{app}}",
       "techjobclock": "Technician Job Clock | {{app}}",
@@ -3838,10 +3883,10 @@
     "user": {
       "actions": {
         "changepassword": "Change Password",
-        "signout": "Sign Out",
-        "updateprofile": "Update Profile",
+        "dark_theme": "Switch to Dark Theme",
         "light_theme": "Switch to Light Theme",
-        "dark_theme": "Switch to Dark Theme"
+        "signout": "Sign Out",
+        "updateprofile": "Update Profile"
       },
       "errors": {
         "updating": "Error updating user or association {{message}}"
@@ -3855,14 +3900,14 @@
       "labels": {
         "actions": "Actions",
         "changepassword": "Change Password",
-        "profileinfo": "Profile Info",
-        "user_settings": "User Settings",
-        "play_sound_for_new_messages": "Play a sound for new messages",
-        "notification_sound_on": "Sound is ON",
-        "notification_sound_off": "Sound is OFF",
-        "notification_sound_enabled": "Notification sound enabled",
         "notification_sound_disabled": "Notification sound disabled",
-        "notification_sound_help": "Toggle the ding for incoming chat messages."
+        "notification_sound_enabled": "Notification sound enabled",
+        "notification_sound_help": "Toggle the ding for incoming chat messages.",
+        "notification_sound_off": "Sound is OFF",
+        "notification_sound_on": "Sound is ON",
+        "play_sound_for_new_messages": "Play a sound for new messages",
+        "profileinfo": "Profile Info",
+        "user_settings": "User Settings"
       },
       "successess": {
         "passwordchanged": "Password changed successfully. "

client/src/translations/es/common.json

@@ -48,6 +48,7 @@
         "arrivedon": "Llegado el:",
         "arrivingjobs": "",
         "blocked": "",
+        "bp": "",
         "cancelledappointment": "Cita cancelada para:",
         "completingjobs": "",
         "dataconsistency": "",
@@ -59,18 +60,17 @@
         "noarrivingjobs": "",
         "nocompletingjobs": "",
         "nodateselected": "No se ha seleccionado ninguna fecha.",
+        "owner": "",
         "priorappointments": "Nombramientos previos",
         "reminder": "",
+        "ro_number": "",
+        "scheduled_completion": "",
         "scheduledfor": "Cita programada para:",
         "severalerrorsfound": "",
         "smartscheduling": "",
         "smspaymentreminder": "",
         "suggesteddates": "",
-        "ro_number": "",
-        "owner": "",
-        "vehicle": "",
-        "bp": "",
-        "scheduled_completion": ""
+        "vehicle": ""
       },
       "successes": {
         "canceled": "Cita cancelada con éxito.",
@@ -90,6 +90,11 @@
         "actions": "Comportamiento"
       }
     },
+    "audio": {
+      "manager": {
+        "description": ""
+      }
+    },
     "audit": {
       "fields": {
         "cc": "",
@@ -149,11 +154,6 @@
         "tasks_updated": ""
       }
     },
-    "audio": {
-      "manager": {
-        "description": ""
-      }
-    },
     "billlines": {
       "actions": {
         "newline": ""
@@ -161,6 +161,7 @@
       "fields": {
         "actual_cost": "",
         "actual_price": "",
+        "confidence": "",
         "cost_center": "",
         "federal_tax_applicable": "",
         "jobline": "",
@@ -191,6 +192,8 @@
         "return": ""
       },
       "errors": {
+        "calculating_totals": "",
+        "calculating_totals_generic": "",
         "creating": "",
         "deleting": "",
         "existinginventoryline": "",
@@ -217,6 +220,24 @@
       },
       "labels": {
         "actions": "",
+        "ai": {
+          "accept_and_continue": "",
+          "confidence": {
+            "breakdown": "",
+            "match": "",
+            "missing_data": "",
+            "ocr": "",
+            "overall": ""
+          },
+          "disclaimer_title": "",
+          "generic_failure": "",
+          "multipage": "",
+          "processing": "",
+          "scan": "",
+          "scancomplete": "",
+          "scanfailed": "",
+          "scanstarted": ""
+        },
         "bill_lines": "",
         "bill_total": "",
         "billcmtotal": "",
@@ -281,9 +302,9 @@
       },
       "errors": {
         "creatingdefaultview": "",
+        "duplicate_insurance_company": "",
         "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": "",
-        "duplicate_insurance_company": ""
+        "saving": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -564,21 +585,18 @@
         "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": "",
           "federal_tax": "",
           "federal_tax_itc": "",
+          "gogcode": "",
           "gst_override": "",
           "invoiceexemptcode": "",
+          "item_type": "Item Type",
+          "item_type_freight": "",
+          "item_type_gog": "",
+          "item_type_paint": "",
           "itemexemptcode": "",
           "la1": "",
           "la2": "",
@@ -597,6 +615,7 @@
           "local_tax": "",
           "mapa": "",
           "mash": "",
+          "nontaxable": "",
           "paa": "",
           "pac": "",
           "pag": "",
@@ -617,6 +636,8 @@
             "state": ""
           },
           "state_tax": "",
+          "taxable": "",
+          "taxable_flag": "",
           "tow": ""
         },
         "schedule_end_time": "",
@@ -678,8 +699,6 @@
         "zip_post": ""
       },
       "labels": {
-        "parts_shop_management": "",
-        "parts_vendor_management": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -702,11 +721,11 @@
             "payers": ""
           },
           "cdk_dealerid": "",
-          "rr_dealerid": "",
           "costsmapping": "",
           "dms_allocations": "",
           "pbs_serialnumber": "",
           "profitsmapping": "",
+          "rr_dealerid": "",
           "title": ""
         },
         "emaillater": "",
@@ -733,6 +752,8 @@
           "followers": ""
         },
         "orderstatuses": "",
+        "parts_shop_management": "",
+        "parts_vendor_management": "",
         "partslocations": "",
         "partsscan": "",
         "printlater": "",
@@ -1047,7 +1068,9 @@
     },
     "dms": {
       "errors": {
-        "alreadyexported": ""
+        "alreadyexported": "",
+        "earlyrorequired": "",
+        "earlyrorequired.message": ""
       },
       "labels": {
         "refreshallocations": ""
@@ -1244,9 +1267,11 @@
         "deselectall": "",
         "download": "",
         "edit": "Editar",
+        "gotoadmin": "",
         "login": "",
         "next": "",
         "ok": "",
+        "optional": "",
         "previous": "",
         "print": "",
         "refresh": "",
@@ -1257,6 +1282,7 @@
         "save": "Salvar",
         "saveandnew": "",
         "saveas": "",
+        "select": "",
         "selectall": "",
         "send": "",
         "sendbysms": "",
@@ -1286,11 +1312,11 @@
         "vehicle": ""
       },
       "labels": {
-        "selected": "",
         "actions": "Comportamiento",
-        "settings": "",
+        "apply": "",
         "areyousure": "",
         "barcode": "código de barras",
+        "beta": "",
         "cancel": "",
         "changelog": "",
         "clear": "",
@@ -1341,8 +1367,10 @@
         "search": "Buscar...",
         "searchresults": "",
         "selectdate": "",
+        "selected": "",
         "sendagain": "",
         "sendby": "",
+        "settings": "",
         "signin": "",
         "sms": "",
         "status": "",
@@ -1585,13 +1613,13 @@
       "labels": {
         "adjustmenttobeadded": "",
         "billref": "",
+        "bulk_location_help": "",
         "convertedtolabor": "",
         "edit": "Línea de edición",
         "ioucreated": "",
         "new": "Nueva línea",
         "nostatus": "",
-        "presets": "",
-        "bulk_location_help": ""
+        "presets": ""
       },
       "successes": {
         "created": "",
@@ -1619,11 +1647,13 @@
         "changestatus": "Cambiar Estado",
         "changestimator": "",
         "convert": "Convertir",
+        "convertwithoutearlyro": "",
         "createiou": "",
         "deliver": "",
         "deliver_quick": "",
         "dms": {
           "addpayer": "",
+          "createearlyro": "",
           "createnewcustomer": "",
           "findmakemodelcode": "",
           "getmakes": "",
@@ -1632,6 +1662,7 @@
           },
           "post": "",
           "refetchmakesmodels": "",
+          "update_ro": "",
           "usegeneric": "",
           "useselected": ""
         },
@@ -1700,8 +1731,8 @@
         "actual_in": "Real en",
         "acv_amount": "",
         "adjustment_bottom_line": "Ajustes",
-        "admin_clerk": "",
         "adjustmenthours": "",
+        "admin_clerk": "",
         "alt_transport": "",
         "area_of_damage_impact": {
           "10": "",
@@ -1782,9 +1813,8 @@
         "ded_status": "Estado deducible",
         "depreciation_taxes": "Depreciación / Impuestos",
         "dms": {
-          "first_name": "",
-          "last_name": "",
           "address": "",
+          "advisor": "",
           "amount": "",
           "center": "",
           "control_type": {
@@ -1792,25 +1822,32 @@
           },
           "cost": "",
           "cost_dms_acctnumber": "",
+          "customer": "",
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
-          "make_override": "",
-          "advisor": "",
           "dms_unsold": "",
           "dms_wip_acctnumber": "",
+          "first_name": "",
           "id": "",
           "inservicedate": "",
           "journal": "",
+          "last_name": "",
           "lines": "",
+          "make_override": "",
           "name1": "",
           "payer": {
             "amount": "",
             "control_type": "",
             "controlnumber": "",
             "dms_acctnumber": "",
-            "name": ""
+            "name": "",
+            "payer_type": ""
           },
+          "rr_opcode": "",
+          "rr_opcode_base": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
@@ -2099,6 +2136,11 @@
           "damageto": "",
           "defaultstory": "",
           "disablebillwip": "",
+          "earlyro": {
+            "created": "",
+            "fields": "",
+            "willupdate": ""
+          },
           "invoicedatefuture": "",
           "kmoutnotgreaterthankmin": "",
           "logs": "",
@@ -2256,6 +2298,7 @@
         "delete": "",
         "deleted": "Trabajo eliminado con éxito.",
         "duplicated": "",
+        "early_ro_created": "",
         "exported": "",
         "invoiced": "",
         "ioucreated": "",
@@ -2444,6 +2487,7 @@
       "labels": {
         "addlabel": "",
         "archive": "",
+        "mark_unread": "",
         "maxtenimages": "",
         "messaging": "Mensajería",
         "no_consent": "",
@@ -2456,8 +2500,7 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Enviar un mensaje...",
-        "unarchive": "",
-        "mark_unread": ""
+        "unarchive": ""
       },
       "render": {
         "conversation_list": ""
@@ -2611,20 +2654,20 @@
         "name": ""
       },
       "labels": {
+        "cell": "",
         "create_new": "Crea un nuevo registro de propietario.",
         "deleteconfirm": "",
+        "email": "",
         "existing_owners": "Propietarios existentes",
         "fromclaim": "",
         "fromowner": "",
-        "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
         "home": "",
-        "cell": "",
         "other": "",
-        "email": "",
         "phone": "",
-        "sms": ""
+        "relatedjobs": "",
+        "sms": "",
+        "updateowner": "",
+        "work": ""
       },
       "successes": {
         "delete": "",
@@ -2635,6 +2678,10 @@
       "actions": {
         "order": "Pedido de piezas",
         "orderinhouse": ""
+      },
+      "labels": {
+        "view_counts_only": "",
+        "view_timestamps": ""
       }
     },
     "parts_dispatch": {
@@ -2984,8 +3031,6 @@
         "settings": ""
       },
       "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",
@@ -3004,6 +3049,7 @@
         "card_size": "",
         "cardcolor": "",
         "cardsettings": "",
+        "click_for_statuses": "",
         "clm_no": "",
         "comment": "",
         "compact": "",
@@ -3024,6 +3070,7 @@
         "orientation": "",
         "ownr_nm": "",
         "paintpriority": "",
+        "partsreceived": "",
         "partsstatus": "",
         "production_note": "",
         "refinishhours": "",
@@ -3570,18 +3617,12 @@
       }
     },
     "titles": {
-      "simplified-parts-jobs": "",
-      "parts": "",
-      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",
       "all_tasks": "",
       "app": "",
       "bc": {
-        "simplified-parts-jobs": "",
-        "parts": "",
-        "parts_settings": "",
         "accounting-payables": "",
         "accounting-payments": "",
         "accounting-receivables": "",
@@ -3613,7 +3654,9 @@
         "my_tasks": "",
         "owner-detail": "",
         "owners": "",
+        "parts": "",
         "parts-queue": "",
+        "parts_settings": "",
         "payments-all": "",
         "phonebook": "",
         "productionboard": "",
@@ -3625,6 +3668,7 @@
         "shop-csi": "",
         "shop-templates": "",
         "shop-vendors": "",
+        "simplified-parts-jobs": "",
         "tasks": "",
         "temporarydocs": "",
         "timetickets": "",
@@ -3660,7 +3704,9 @@
       "my_tasks": "",
       "owners": "Todos los propietarios | {{app}}",
       "owners-detail": "",
+      "parts": "",
       "parts-queue": "",
+      "parts_settings": "",
       "payments-all": "",
       "phonebook": "",
       "productionboard": "",
@@ -3676,6 +3722,7 @@
       "shop-csi": "",
       "shop-templates": "",
       "shop_vendors": "Vendedores | {{app}}",
+      "simplified-parts-jobs": "",
       "tasks": "",
       "techconsole": "{{app}}",
       "techjobclock": "{{app}}",
@@ -3836,10 +3883,10 @@
     "user": {
       "actions": {
         "changepassword": "",
-        "signout": "desconectar",
-        "updateprofile": "Actualización del perfil",
+        "dark_theme": "",
         "light_theme": "",
-        "dark_theme": ""
+        "signout": "desconectar",
+        "updateprofile": "Actualización del perfil"
       },
       "errors": {
         "updating": ""
@@ -3853,14 +3900,14 @@
       "labels": {
         "actions": "",
         "changepassword": "",
-        "profileinfo": "",
-        "user_settings": "",
-        "play_sound_for_new_messages": "",
-        "notification_sound_on": "",
-        "notification_sound_off": "",
-        "notification_sound_enabled": "",
         "notification_sound_disabled": "",
-        "notification_sound_help": ""
+        "notification_sound_enabled": "",
+        "notification_sound_help": "",
+        "notification_sound_off": "",
+        "notification_sound_on": "",
+        "play_sound_for_new_messages": "",
+        "profileinfo": "",
+        "user_settings": ""
       },
       "successess": {
         "passwordchanged": ""

client/src/translations/fr/common.json

@@ -48,6 +48,7 @@
         "arrivedon": "Arrivé le:",
         "arrivingjobs": "",
         "blocked": "",
+        "bp": "",
         "cancelledappointment": "Rendez-vous annulé pour:",
         "completingjobs": "",
         "dataconsistency": "",
@@ -59,18 +60,17 @@
         "noarrivingjobs": "",
         "nocompletingjobs": "",
         "nodateselected": "Aucune date n'a été sélectionnée.",
+        "owner": "",
         "priorappointments": "Rendez-vous précédents",
         "reminder": "",
+        "ro_number": "",
+        "scheduled_completion": "",
         "scheduledfor": "Rendez-vous prévu pour:",
         "severalerrorsfound": "",
         "smartscheduling": "",
         "smspaymentreminder": "",
         "suggesteddates": "",
-        "ro_number": "",
-        "owner": "",
-        "vehicle": "",
-        "bp": "",
-        "scheduled_completion": ""
+        "vehicle": ""
       },
       "successes": {
         "canceled": "Rendez-vous annulé avec succès.",
@@ -90,6 +90,11 @@
         "actions": "actes"
       }
     },
+    "audio": {
+      "manager": {
+        "description": ""
+      }
+    },
     "audit": {
       "fields": {
         "cc": "",
@@ -149,11 +154,6 @@
         "tasks_updated": ""
       }
     },
-    "audio": {
-      "manager": {
-        "description": ""
-      }
-    },
     "billlines": {
       "actions": {
         "newline": ""
@@ -161,6 +161,7 @@
       "fields": {
         "actual_cost": "",
         "actual_price": "",
+        "confidence": "",
         "cost_center": "",
         "federal_tax_applicable": "",
         "jobline": "",
@@ -191,6 +192,8 @@
         "return": ""
       },
       "errors": {
+        "calculating_totals": "",
+        "calculating_totals_generic": "",
         "creating": "",
         "deleting": "",
         "existinginventoryline": "",
@@ -217,6 +220,24 @@
       },
       "labels": {
         "actions": "",
+        "ai": {
+          "accept_and_continue": "",
+          "confidence": {
+            "breakdown": "",
+            "match": "",
+            "missing_data": "",
+            "ocr": "",
+            "overall": ""
+          },
+          "disclaimer_title": "",
+          "generic_failure": "",
+          "multipage": "",
+          "processing": "",
+          "scan": "",
+          "scancomplete": "",
+          "scanfailed": "",
+          "scanstarted": ""
+        },
         "bill_lines": "",
         "bill_total": "",
         "billcmtotal": "",
@@ -281,9 +302,9 @@
       },
       "errors": {
         "creatingdefaultview": "",
+        "duplicate_insurance_company": "",
         "loading": "Impossible de charger les détails de la boutique. Veuillez appeler le support technique.",
-        "saving": "",
-        "duplicate_insurance_company": ""
+        "saving": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -564,21 +585,18 @@
         "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": "",
           "federal_tax": "",
           "federal_tax_itc": "",
+          "gogcode": "",
           "gst_override": "",
           "invoiceexemptcode": "",
+          "item_type": "Item Type",
+          "item_type_freight": "",
+          "item_type_gog": "",
+          "item_type_paint": "",
           "itemexemptcode": "",
           "la1": "",
           "la2": "",
@@ -597,6 +615,7 @@
           "local_tax": "",
           "mapa": "",
           "mash": "",
+          "nontaxable": "",
           "paa": "",
           "pac": "",
           "pag": "",
@@ -617,6 +636,8 @@
             "state": ""
           },
           "state_tax": "",
+          "taxable": "",
+          "taxable_flag": "",
           "tow": ""
         },
         "schedule_end_time": "",
@@ -678,8 +699,6 @@
         "zip_post": ""
       },
       "labels": {
-        "parts_shop_management": "",
-        "parts_vendor_management": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -702,11 +721,11 @@
             "payers": ""
           },
           "cdk_dealerid": "",
-          "rr_dealerid": "",
           "costsmapping": "",
           "dms_allocations": "",
           "pbs_serialnumber": "",
           "profitsmapping": "",
+          "rr_dealerid": "",
           "title": ""
         },
         "emaillater": "",
@@ -733,6 +752,8 @@
           "followers": ""
         },
         "orderstatuses": "",
+        "parts_shop_management": "",
+        "parts_vendor_management": "",
         "partslocations": "",
         "partsscan": "",
         "printlater": "",
@@ -1047,7 +1068,9 @@
     },
     "dms": {
       "errors": {
-        "alreadyexported": ""
+        "alreadyexported": "",
+        "earlyrorequired": "",
+        "earlyrorequired.message": ""
       },
       "labels": {
         "refreshallocations": ""
@@ -1244,9 +1267,11 @@
         "deselectall": "",
         "download": "",
         "edit": "modifier",
+        "gotoadmin": "",
         "login": "",
         "next": "",
         "ok": "",
+        "optional": "",
         "previous": "",
         "print": "",
         "refresh": "",
@@ -1257,6 +1282,7 @@
         "save": "sauvegarder",
         "saveandnew": "",
         "saveas": "",
+        "select": "",
         "selectall": "",
         "send": "",
         "sendbysms": "",
@@ -1286,11 +1312,11 @@
         "vehicle": ""
       },
       "labels": {
-        "selected": "",
-        "settings": "",
         "actions": "actes",
+        "apply": "",
         "areyousure": "",
         "barcode": "code à barre",
+        "beta": "",
         "cancel": "",
         "changelog": "",
         "clear": "",
@@ -1341,8 +1367,10 @@
         "search": "Chercher...",
         "searchresults": "",
         "selectdate": "",
+        "selected": "",
         "sendagain": "",
         "sendby": "",
+        "settings": "",
         "signin": "",
         "sms": "",
         "status": "",
@@ -1585,13 +1613,13 @@
       "labels": {
         "adjustmenttobeadded": "",
         "billref": "",
+        "bulk_location_help": "",
         "convertedtolabor": "",
         "edit": "Ligne d'édition",
         "ioucreated": "",
         "new": "Nouvelle ligne",
         "nostatus": "",
-        "presets": "",
-        "bulk_location_help": ""
+        "presets": ""
       },
       "successes": {
         "created": "",
@@ -1619,11 +1647,13 @@
         "changestatus": "Changer le statut",
         "changestimator": "",
         "convert": "Convertir",
+        "convertwithoutearlyro": "",
         "createiou": "",
         "deliver": "",
         "deliver_quick": "",
         "dms": {
           "addpayer": "",
+          "createearlyro": "",
           "createnewcustomer": "",
           "findmakemodelcode": "",
           "getmakes": "",
@@ -1632,6 +1662,7 @@
           },
           "post": "",
           "refetchmakesmodels": "",
+          "update_ro": "",
           "usegeneric": "",
           "useselected": ""
         },
@@ -1699,9 +1730,9 @@
         "actual_delivery": "Livraison réelle",
         "actual_in": "En réel",
         "acv_amount": "",
-        "admin_clerk": "",
         "adjustment_bottom_line": "Ajustements",
         "adjustmenthours": "",
+        "admin_clerk": "",
         "alt_transport": "",
         "area_of_damage_impact": {
           "10": "",
@@ -1782,9 +1813,8 @@
         "ded_status": "Statut de franchise",
         "depreciation_taxes": "Amortissement / taxes",
         "dms": {
-          "first_name": "",
-          "last_name": "",
           "address": "",
+          "advisor": "",
           "amount": "",
           "center": "",
           "control_type": {
@@ -1792,25 +1822,32 @@
           },
           "cost": "",
           "cost_dms_acctnumber": "",
+          "customer": "",
           "dms_make": "",
           "dms_model": "",
           "dms_model_override": "",
-          "make_override": "",
-          "advisor": "",
           "dms_unsold": "",
           "dms_wip_acctnumber": "",
+          "first_name": "",
           "id": "",
           "inservicedate": "",
           "journal": "",
+          "last_name": "",
           "lines": "",
+          "make_override": "",
           "name1": "",
           "payer": {
             "amount": "",
             "control_type": "",
             "controlnumber": "",
             "dms_acctnumber": "",
-            "name": ""
+            "name": "",
+            "payer_type": ""
           },
+          "rr_opcode": "",
+          "rr_opcode_base": "",
+          "rr_opcode_prefix": "",
+          "rr_opcode_suffix": "",
           "sale": "",
           "sale_dms_acctnumber": "",
           "story": "",
@@ -2099,6 +2136,11 @@
           "damageto": "",
           "defaultstory": "",
           "disablebillwip": "",
+          "earlyro": {
+            "created": "",
+            "fields": "",
+            "willupdate": ""
+          },
           "invoicedatefuture": "",
           "kmoutnotgreaterthankmin": "",
           "logs": "",
@@ -2256,6 +2298,7 @@
         "delete": "",
         "deleted": "Le travail a bien été supprimé.",
         "duplicated": "",
+        "early_ro_created": "",
         "exported": "",
         "invoiced": "",
         "ioucreated": "",
@@ -2433,7 +2476,6 @@
       "actions": {
         "link": "",
         "new": "",
-
         "openchat": ""
       },
       "errors": {
@@ -2445,6 +2487,7 @@
       "labels": {
         "addlabel": "",
         "archive": "",
+        "mark_unread": "",
         "maxtenimages": "",
         "messaging": "Messagerie",
         "no_consent": "",
@@ -2457,8 +2500,7 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Envoyer un message...",
-        "unarchive": "",
-        "mark_unread": ""
+        "unarchive": ""
       },
       "render": {
         "conversation_list": ""
@@ -2612,20 +2654,20 @@
         "name": ""
       },
       "labels": {
+        "cell": "",
         "create_new": "Créez un nouvel enregistrement de propriétaire.",
         "deleteconfirm": "",
+        "email": "",
         "existing_owners": "Propriétaires existants",
         "fromclaim": "",
         "fromowner": "",
-        "relatedjobs": "",
-        "updateowner": "",
-        "work": "",
         "home": "",
-        "cell": "",
         "other": "",
-        "email": "",
         "phone": "",
-        "sms": ""
+        "relatedjobs": "",
+        "sms": "",
+        "updateowner": "",
+        "work": ""
       },
       "successes": {
         "delete": "",
@@ -2636,6 +2678,10 @@
       "actions": {
         "order": "Commander des pièces",
         "orderinhouse": ""
+      },
+      "labels": {
+        "view_counts_only": "",
+        "view_timestamps": ""
       }
     },
     "parts_dispatch": {
@@ -2985,8 +3031,6 @@
         "settings": ""
       },
       "labels": {
-        "click_for_statuses": "",
-        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",
@@ -3005,6 +3049,7 @@
         "card_size": "",
         "cardcolor": "",
         "cardsettings": "",
+        "click_for_statuses": "",
         "clm_no": "",
         "comment": "",
         "compact": "",
@@ -3025,6 +3070,7 @@
         "orientation": "",
         "ownr_nm": "",
         "paintpriority": "",
+        "partsreceived": "",
         "partsstatus": "",
         "production_note": "",
         "refinishhours": "",
@@ -3571,18 +3617,12 @@
       }
     },
     "titles": {
-      "simplified-parts-jobs": "",
-      "parts": "",
-      "parts_settings": "",
       "accounting-payables": "",
       "accounting-payments": "",
       "accounting-receivables": "",
       "all_tasks": "",
       "app": "",
       "bc": {
-        "simplified-parts-jobs": "",
-        "parts": "",
-        "parts_settings": "",
         "accounting-payables": "",
         "accounting-payments": "",
         "accounting-receivables": "",
@@ -3614,7 +3654,9 @@
         "my_tasks": "",
         "owner-detail": "",
         "owners": "",
+        "parts": "",
         "parts-queue": "",
+        "parts_settings": "",
         "payments-all": "",
         "phonebook": "",
         "productionboard": "",
@@ -3626,6 +3668,7 @@
         "shop-csi": "",
         "shop-templates": "",
         "shop-vendors": "",
+        "simplified-parts-jobs": "",
         "tasks": "",
         "temporarydocs": "",
         "timetickets": "",
@@ -3661,7 +3704,9 @@
       "my_tasks": "",
       "owners": "Tous les propriétaires | {{app}}",
       "owners-detail": "",
+      "parts": "",
       "parts-queue": "",
+      "parts_settings": "",
       "payments-all": "",
       "phonebook": "",
       "productionboard": "",
@@ -3677,6 +3722,7 @@
       "shop-csi": "",
       "shop-templates": "",
       "shop_vendors": "Vendeurs | {{app}}",
+      "simplified-parts-jobs": "",
       "tasks": "",
       "techconsole": "{{app}}",
       "techjobclock": "{{app}}",
@@ -3837,10 +3883,10 @@
     "user": {
       "actions": {
         "changepassword": "",
-        "signout": "Déconnexion",
-        "updateprofile": "Mettre à jour le profil",
+        "dark_theme": "",
         "light_theme": "",
-        "dark_theme": ""
+        "signout": "Déconnexion",
+        "updateprofile": "Mettre à jour le profil"
       },
       "errors": {
         "updating": ""
@@ -3854,14 +3900,14 @@
       "labels": {
         "actions": "",
         "changepassword": "",
-        "profileinfo": "",
-        "user_settings": "",
-        "play_sound_for_new_messages": "",
-        "notification_sound_on": "",
-        "notification_sound_off": "",
-        "notification_sound_enabled": "",
         "notification_sound_disabled": "",
-        "notification_sound_help": ""
+        "notification_sound_enabled": "",
+        "notification_sound_help": "",
+        "notification_sound_off": "",
+        "notification_sound_on": "",
+        "play_sound_for_new_messages": "",
+        "profileinfo": "",
+        "user_settings": ""
       },
       "successess": {
         "passwordchanged": ""

client/src/utils/DateFormatter.jsx

@@ -5,8 +5,10 @@ export function DateFormatter(props) {
   return props.children ? dayjs(props.children).format(props.includeDay ? "ddd MM/DD/YYYY" : "MM/DD/YYYY") : null;
 }
 
-export function DateTimeFormatter(props) {
-  return props.children ? dayjs(props.children).format(props.format ? props.format : "MM/DD/YYYY hh:mm a") : null;
+export function DateTimeFormatter({ hideTime, ...props }) {
+  return props.children
+    ? dayjs(props.children).format(props.format ? props.format : `MM/DD/YYYY${hideTime ? "" : " hh:mm a"}`)
+    : null;
 }
 
 export function DateTimeFormatterFunction(date) {
@@ -17,11 +19,11 @@ export function TimeFormatter(props) {
   return props.children ? dayjs(props.children).format(props.format ? props.format : "hh:mm a") : null;
 }
 
-export function TimeAgoFormatter(props) {
+export function TimeAgoFormatter({ removeAgoString = false, ...props }) {
   const m = dayjs(props.children);
   return props.children ? (
-    <Tooltip placement="top" title={m.format("MM/DD/YYY hh:mm A")}>
-      {m.fromNow()}
+    <Tooltip placement="top" title={m.format("MM/DD/YYYY hh:mm A")}>
+      {m.fromNow(removeAgoString)}
     </Tooltip>
   ) : null;
 }

client/src/utils/GraphQLClient.js

@@ -248,7 +248,8 @@ const client = new ApolloClient({
     watchQuery: {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
-      errorPolicy: "ignore"
+      errorPolicy: "ignore",
+      notifyOnNetworkStatusChange: false
     },
     query: {
       fetchPolicy: "network-only",

client/src/utils/graphQLmodifier.js

@@ -146,7 +146,8 @@ export async function generateTemplate(
   if (templateQueryToExecute) {
     const { data } = await client.query({
       query: gql(finalQuery),
-      variables: { ...templateObject.variables }
+      variables: { ...templateObject.variables },
+      fetchPolicy: "no-cache"
     });
     contextData = data;
   }

docker-compose-cluster.yml

@@ -38,8 +38,6 @@ services:
         condition: service_healthy
       localstack:
         condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
     ports:
       - "4001:4000"  # Different external port for local access
     volumes:
@@ -65,8 +63,6 @@ services:
         condition: service_healthy
       localstack:
         condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
     ports:
       - "4002:4000"  # Different external port for local access
     volumes:
@@ -92,8 +88,6 @@ services:
         condition: service_healthy
       localstack:
         condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
     ports:
       - "4003:4000"  # Different external port for local access
     volumes:
@@ -156,23 +150,18 @@ services:
 
   # LocalStack
   localstack:
-    image: localstack/localstack
+    image: localstack/localstack:4.13.1
     container_name: localstack
     hostname: localstack
     networks:
       - redis-cluster-net
     restart: unless-stopped
     volumes:
+      - ./certs:/tmp/certs:ro   # only if your script reads /tmp/certs/...
+      - ./localstack/init:/etc/localstack/init/ready.d:ro
       - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - SERVICES=s3,ses,secretsmanager,cloudwatch,logs
-      - DEBUG=0
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-      - EXTRA_CORS_ALLOWED_HEADERS=Authorization,Content-Type
-      - EXTRA_CORS_ALLOWED_ORIGINS=*
-      - EXTRA_CORS_EXPOSE_HEADERS=Authorization,Content-Type
+    env_file:
+      - .env.localstack.docker
     ports:
       - "4566:4566"
     healthcheck:
@@ -182,36 +171,6 @@ services:
       retries: 5
       start_period: 20s
 
-  # AWS-CLI
-  aws-cli:
-    image: amazon/aws-cli
-    container_name: aws-cli
-    hostname: aws-cli
-    networks:
-      - redis-cluster-net
-    depends_on:
-      localstack:
-        condition: service_healthy
-    volumes:
-      - './localstack:/tmp/localstack'
-      - './certs:/tmp/certs'
-    environment:
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-    entrypoint: /bin/sh -c
-    command: >
-      "
-        aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
-        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-      "
-
 networks:
   redis-cluster-net:
     driver: bridge

docker-compose.yml

@@ -68,23 +68,18 @@ services:
   # LocalStack: Used to emulate AWS services locally, currently setup for SES
   # Notes: Set the ENV Debug to 1 for additional logging
   localstack:
-    image: localstack/localstack
+    image: localstack/localstack:4.13.1
     container_name: localstack
     hostname: localstack
     networks:
       - redis-cluster-net
     restart: unless-stopped
     volumes:
+      - ./certs:/tmp/certs:ro   # only if your script reads /tmp/certs/...
+      - ./localstack/init:/etc/localstack/init/ready.d:ro
       - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - SERVICES=s3,ses,secretsmanager,cloudwatch,logs
-      - DEBUG=0
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-      - EXTRA_CORS_ALLOWED_HEADERS=Authorization,Content-Type
-      - EXTRA_CORS_ALLOWED_ORIGINS=*
-      - EXTRA_CORS_EXPOSE_HEADERS=Authorization,Content-Type
+    env_file:
+      - .env.localstack.docker
     ports:
       - "4566:4566"
     healthcheck:
@@ -94,38 +89,6 @@ services:
       retries: 5
       start_period: 20s
 
-  # AWS-CLI - Used in conjunction with LocalStack to set required permission to send emails
-  aws-cli:
-    image: amazon/aws-cli
-    container_name: aws-cli
-    hostname: aws-cli
-    networks:
-      - redis-cluster-net
-    depends_on:
-      localstack:
-        condition: service_healthy
-    volumes:
-      - './localstack:/tmp/localstack'
-      - './certs:/tmp/certs'
-
-    environment:
-      - AWS_ACCESS_KEY_ID=test
-      - AWS_SECRET_ACCESS_KEY=test
-      - AWS_DEFAULT_REGION=ca-central-1
-    entrypoint: /bin/sh -c
-    command: >
-      "
-        aws --endpoint-url=http://localstack:4566 ses verify-domain-identity --domain imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 ses verify-email-identity --email-address noreply@imex.online --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 secretsmanager create-secret --name CHATTER_PRIVATE_KEY --secret-string file:///tmp/certs/io-ftp-test.key
-        aws --endpoint-url=http://localstack:4566 logs create-log-group --log-group-name development --region ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-large-log --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-job-totals --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket parts-estimates --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket imex-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rome-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-        aws --endpoint-url=http://localstack:4566 s3api create-bucket --bucket rps-carfax-uploads --create-bucket-configuration LocationConstraint=ca-central-1
-      "
   # Node App: The Main IMEX API
   node-app:
     build:
@@ -145,8 +108,7 @@ services:
         condition: service_healthy
       localstack:
         condition: service_healthy
-      aws-cli:
-        condition: service_completed_successfully
+
     ports:
       - "4000:4000"
       - "9229:9229"

hasura/metadata/tables.yaml

@@ -947,6 +947,7 @@
           - carfax_exclude
           - cdk_configuration
           - cdk_dealerid
+          - chatter_company_id
           - chatterid
           - city
           - claimscorpid
@@ -1063,6 +1064,7 @@
           - bill_allow_post_to_closed
           - bill_tax_rates
           - cdk_configuration
+          - chatter_company_id
           - city
           - country
           - created_at
@@ -3702,7 +3704,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body
@@ -3983,7 +3987,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body
@@ -4276,7 +4282,9 @@
           - ded_status
           - deliverchecklist
           - depreciation_taxes
+          - dms_advisor_id
           - dms_allocation
+          - dms_customer_id
           - dms_id
           - driveable
           - employee_body

hasura/migrations/1770737662785_alter_table_public_bodyshops_add_column_chatter_company_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"."bodyshops" add column "chatter_company_id" text
+--  null;

hasura/migrations/1770737662785_alter_table_public_bodyshops_add_column_chatter_company_id/up.sql

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

hasura/migrations/1770837989352_alter_table_public_jobs_add_column_dms_customer_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_customer_id" text
+--  null;

hasura/migrations/1770837989352_alter_table_public_jobs_add_column_dms_customer_id/up.sql

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

hasura/migrations/1770838205706_alter_table_public_jobs_add_column_dms_advisor_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_advisor_id" text
+--  null;

hasura/migrations/1770838205706_alter_table_public_jobs_add_column_dms_advisor_id/up.sql

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

localstack/init/10-bootstrap.sh

@@ -0,0 +1,65 @@
+#!/usr/bin/env bash
+echo "Running LocalStack bootstrap script: 10-bootstrap.sh"
+
+set -euo pipefail
+
+REGION="${AWS_DEFAULT_REGION:-ca-central-1}"
+
+# awslocal is the LocalStack wrapper so you don't need --endpoint-url
+# (it targets the LocalStack gateway automatically)
+# Docs: https://docs.localstack.cloud/.../aws-cli/
+ensure_bucket() {
+  local b="$1"
+  if ! awslocal s3api head-bucket --bucket "$b" >/dev/null 2>&1; then
+    awslocal s3api create-bucket \
+      --bucket "$b" \
+      --create-bucket-configuration LocationConstraint="$REGION" \
+      --region "$REGION" >/dev/null
+  fi
+}
+
+ensure_log_group() {
+  local lg="$1"
+  awslocal logs create-log-group --log-group-name "$lg" --region "$REGION" >/dev/null 2>&1 || true
+}
+
+ensure_secret_string() {
+  local name="$1"
+  local value="$2"
+
+  if awslocal secretsmanager describe-secret --secret-id "$name" >/dev/null 2>&1; then
+    awslocal secretsmanager update-secret --secret-id "$name" --secret-string "$value" >/dev/null
+  else
+    awslocal secretsmanager create-secret --name "$name" --secret-string "$value" >/dev/null
+  fi
+}
+
+ensure_secret_file() {
+  local name="$1"
+  local filepath="$2"
+
+  if awslocal secretsmanager describe-secret --secret-id "$name" >/dev/null 2>&1; then
+    awslocal secretsmanager update-secret --secret-id "$name" --secret-string "file://$filepath" >/dev/null
+  else
+    awslocal secretsmanager create-secret --name "$name" --secret-string "file://$filepath" >/dev/null
+  fi
+}
+
+# SES identities (idempotent-ish; ignoring if it already exists)
+awslocal ses verify-domain-identity --domain imex.online --region "$REGION" >/dev/null || true
+awslocal ses verify-email-identity --email-address noreply@imex.online --region "$REGION" >/dev/null || true
+
+# Secrets
+ensure_secret_file "CHATTER_PRIVATE_KEY" "/tmp/certs/io-ftp-test.key"
+ensure_secret_string "CHATTER_COMPANY_KEY_6713" "${CHATTER_COMPANY_KEY_6713:-REPLACE_ME}"
+
+# Logs
+ensure_log_group "development"
+
+# Buckets
+ensure_bucket "imex-job-totals"
+ensure_bucket "parts-estimate"
+ensure_bucket "imex-large-log"
+ensure_bucket "imex-carfax-uploads"
+ensure_bucket "rome-carfax-uploads"
+ensure_bucket "rps-carfax-uploads"

package-lock.json

@@ -14,6 +14,8 @@
         "@aws-sdk/client-s3": "^3.978.0",
         "@aws-sdk/client-secrets-manager": "^3.978.0",
         "@aws-sdk/client-ses": "^3.978.0",
+        "@aws-sdk/client-sqs": "^3.975.0",
+        "@aws-sdk/client-textract": "^3.975.0",
         "@aws-sdk/credential-provider-node": "^3.972.3",
         "@aws-sdk/lib-storage": "^3.978.0",
         "@aws-sdk/s3-request-presigner": "^3.978.0",
@@ -37,6 +39,7 @@
         "express": "^4.21.1",
         "fast-xml-parser": "^5.3.4",
         "firebase-admin": "^13.6.0",
+        "fuse.js": "^7.1.0",
         "graphql": "^16.12.0",
         "graphql-request": "^6.1.0",
         "intuit-oauth": "^4.2.2",
@@ -51,6 +54,7 @@
         "mustache": "^4.2.0",
         "node-persist": "^4.0.4",
         "nodemailer": "^6.10.0",
+        "pdf-lib": "^1.17.1",
         "phone": "^3.1.70",
         "query-string": "7.1.3",
         "recursive-diff": "^1.0.9",
@@ -481,6 +485,7 @@
         "@smithy/fetch-http-handler": "^5.3.9",
         "@smithy/hash-node": "^4.2.8",
         "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/md5-js": "^4.2.8",
         "@smithy/middleware-content-length": "^4.2.8",
         "@smithy/middleware-endpoint": "^4.4.12",
         "@smithy/middleware-retry": "^4.4.29",
@@ -551,52 +556,54 @@
         "@smithy/util-middleware": "^4.2.8",
         "@smithy/util-retry": "^4.2.8",
         "@smithy/util-utf8": "^4.2.0",
-        "@smithy/util-waiter": "^4.2.8",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/client-sso": {
-      "version": "3.975.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.975.0.tgz",
-      "integrity": "sha512-HpgJuleH7P6uILxzJKQOmlHdwaCY+xYC6VgRDzlwVEqU/HXjo4m2gOAyjUbpXlBOCWfGgMUzfBlNJ9z3MboqEQ==",
+    "node_modules/@aws-sdk/client-sqs": {
+      "version": "3.992.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sqs/-/client-sqs-3.992.0.tgz",
+      "integrity": "sha512-qRSzhtXtMFkxpjntKc286qKD4QfZL5uAzzsQqvzmdQmCdWTCpSzE5ECA5M3Ts2V4dJFFvjeR/FLIMQbEe2pqyA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.1",
-        "@aws-sdk/middleware-host-header": "^3.972.1",
-        "@aws-sdk/middleware-logger": "^3.972.1",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.1",
-        "@aws-sdk/middleware-user-agent": "^3.972.2",
-        "@aws-sdk/region-config-resolver": "^3.972.1",
-        "@aws-sdk/types": "^3.973.0",
-        "@aws-sdk/util-endpoints": "3.972.0",
-        "@aws-sdk/util-user-agent-browser": "^3.972.1",
-        "@aws-sdk/util-user-agent-node": "^3.972.1",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/credential-provider-node": "^3.972.9",
+        "@aws-sdk/middleware-host-header": "^3.972.3",
+        "@aws-sdk/middleware-logger": "^3.972.3",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+        "@aws-sdk/middleware-sdk-sqs": "^3.972.7",
+        "@aws-sdk/middleware-user-agent": "^3.972.10",
+        "@aws-sdk/region-config-resolver": "^3.972.3",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.992.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.3",
+        "@aws-sdk/util-user-agent-node": "^3.972.8",
         "@smithy/config-resolver": "^4.4.6",
-        "@smithy/core": "^3.21.1",
+        "@smithy/core": "^3.23.0",
         "@smithy/fetch-http-handler": "^5.3.9",
         "@smithy/hash-node": "^4.2.8",
         "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/md5-js": "^4.2.8",
         "@smithy/middleware-content-length": "^4.2.8",
-        "@smithy/middleware-endpoint": "^4.4.11",
-        "@smithy/middleware-retry": "^4.4.27",
+        "@smithy/middleware-endpoint": "^4.4.14",
+        "@smithy/middleware-retry": "^4.4.31",
         "@smithy/middleware-serde": "^4.2.9",
         "@smithy/middleware-stack": "^4.2.8",
         "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/node-http-handler": "^4.4.10",
         "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.10.12",
+        "@smithy/smithy-client": "^4.11.3",
         "@smithy/types": "^4.12.0",
         "@smithy/url-parser": "^4.2.8",
         "@smithy/util-base64": "^4.3.0",
         "@smithy/util-body-length-browser": "^4.2.0",
         "@smithy/util-body-length-node": "^4.2.1",
-        "@smithy/util-defaults-mode-browser": "^4.3.26",
-        "@smithy/util-defaults-mode-node": "^4.2.29",
+        "@smithy/util-defaults-mode-browser": "^4.3.30",
+        "@smithy/util-defaults-mode-node": "^4.2.33",
         "@smithy/util-endpoints": "^3.2.8",
         "@smithy/util-middleware": "^4.2.8",
         "@smithy/util-retry": "^4.2.8",
@@ -607,20 +614,167 @@
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/core": {
-      "version": "3.973.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.4.tgz",
-      "integrity": "sha512-8Rk+kPP74YiR47x54bxYlKZswsaSh0a4XvvRUMLvyS/koNawhsGu/+qSZxREqUeTO+GkKpFvSQIsAZR+deUP+g==",
+    "node_modules/@aws-sdk/client-sqs/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.992.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.992.0.tgz",
+      "integrity": "sha512-FHgdMVbTZ2Lu7hEIoGYfkd5UazNSsAgPcupEnh15vsWKFKhuw6w/6tM1k/yNaa7l1wx0Wt1UuK0m+gQ0BJpuvg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/xml-builder": "^3.972.2",
-        "@smithy/core": "^3.22.0",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso": {
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.990.0.tgz",
+      "integrity": "sha512-xTEaPjZwOqVjGbLOP7qzwbdOWJOo1ne2mUhTZwEBBkPvNk4aXB/vcYwWwrjoSWUqtit4+GDbO75ePc/S6TUJYQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/middleware-host-header": "^3.972.3",
+        "@aws-sdk/middleware-logger": "^3.972.3",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+        "@aws-sdk/middleware-user-agent": "^3.972.10",
+        "@aws-sdk/region-config-resolver": "^3.972.3",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.990.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.3",
+        "@aws-sdk/util-user-agent-node": "^3.972.8",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.23.0",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.14",
+        "@smithy/middleware-retry": "^4.4.31",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.10",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.3",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.30",
+        "@smithy/util-defaults-mode-node": "^4.2.33",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-sso/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.990.0.tgz",
+      "integrity": "sha512-kVwtDc9LNI3tQZHEMNbkLIOpeDK8sRSTuT8eMnzGY+O+JImPisfSTjdh+jw9OTznu+MYZjQsv0258sazVKunYg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-textract": {
+      "version": "3.992.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/client-textract/-/client-textract-3.992.0.tgz",
+      "integrity": "sha512-AXufuNr9I8nTSjGvdkqJRpAZ9J2omQpvkWZFYTAWLX3XXgpV8ILgUaw5NRKn30qytbTMY2mapx2kwgBEj/70ZQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-crypto/sha256-browser": "5.2.0",
+        "@aws-crypto/sha256-js": "5.2.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/credential-provider-node": "^3.972.9",
+        "@aws-sdk/middleware-host-header": "^3.972.3",
+        "@aws-sdk/middleware-logger": "^3.972.3",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+        "@aws-sdk/middleware-user-agent": "^3.972.10",
+        "@aws-sdk/region-config-resolver": "^3.972.3",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.992.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.3",
+        "@aws-sdk/util-user-agent-node": "^3.972.8",
+        "@smithy/config-resolver": "^4.4.6",
+        "@smithy/core": "^3.23.0",
+        "@smithy/fetch-http-handler": "^5.3.9",
+        "@smithy/hash-node": "^4.2.8",
+        "@smithy/invalid-dependency": "^4.2.8",
+        "@smithy/middleware-content-length": "^4.2.8",
+        "@smithy/middleware-endpoint": "^4.4.14",
+        "@smithy/middleware-retry": "^4.4.31",
+        "@smithy/middleware-serde": "^4.2.9",
+        "@smithy/middleware-stack": "^4.2.8",
+        "@smithy/node-config-provider": "^4.3.8",
+        "@smithy/node-http-handler": "^4.4.10",
+        "@smithy/protocol-http": "^5.3.8",
+        "@smithy/smithy-client": "^4.11.3",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-base64": "^4.3.0",
+        "@smithy/util-body-length-browser": "^4.2.0",
+        "@smithy/util-body-length-node": "^4.2.1",
+        "@smithy/util-defaults-mode-browser": "^4.3.30",
+        "@smithy/util-defaults-mode-node": "^4.2.33",
+        "@smithy/util-endpoints": "^3.2.8",
+        "@smithy/util-middleware": "^4.2.8",
+        "@smithy/util-retry": "^4.2.8",
+        "@smithy/util-utf8": "^4.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/client-textract/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.992.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.992.0.tgz",
+      "integrity": "sha512-FHgdMVbTZ2Lu7hEIoGYfkd5UazNSsAgPcupEnh15vsWKFKhuw6w/6tM1k/yNaa7l1wx0Wt1UuK0m+gQ0BJpuvg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
+    "node_modules/@aws-sdk/core": {
+      "version": "3.973.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.973.10.tgz",
+      "integrity": "sha512-4u/FbyyT3JqzfsESI70iFg6e2yp87MB5kS2qcxIA66m52VSTN1fvuvbCY1h/LKq1LvuxIrlJ1ItcyjvcKoaPLg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/xml-builder": "^3.972.4",
+        "@smithy/core": "^3.23.0",
         "@smithy/node-config-provider": "^4.3.8",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/protocol-http": "^5.3.8",
         "@smithy/signature-v4": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/smithy-client": "^4.11.3",
         "@smithy/types": "^4.12.0",
         "@smithy/util-base64": "^4.3.0",
         "@smithy/util-middleware": "^4.2.8",
@@ -645,12 +799,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-env": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.2.tgz",
-      "integrity": "sha512-wzH1EdrZsytG1xN9UHaK12J9+kfrnd2+c8y0LVoS4O4laEjPoie1qVK3k8/rZe7KOtvULzyMnO3FT4Krr9Z0Dg==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.8.tgz",
+      "integrity": "sha512-r91OOPAcHnLCSxaeu/lzZAVRCZ/CtTNuwmJkUwpwSDshUrP7bkX1OmFn2nUMWd9kN53Q4cEo8b7226G4olt2Mg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/core": "^3.973.10",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/types": "^4.12.0",
@@ -661,20 +815,20 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-http": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.4.tgz",
-      "integrity": "sha512-OC7F3ipXV12QfDEWybQGHLzoeHBlAdx/nLzPfHP0Wsabu3JBffu5nlzSaJNf7to9HGtOW8Bpu8NX0ugmDrCbtw==",
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.10.tgz",
+      "integrity": "sha512-DTtuyXSWB+KetzLcWaSahLJCtTUe/3SXtlGp4ik9PCe9xD6swHEkG8n8/BNsQ9dsihb9nhFvuUB4DpdBGDcvVg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/core": "^3.973.10",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/node-http-handler": "^4.4.10",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/smithy-client": "^4.11.3",
         "@smithy/types": "^4.12.0",
-        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-stream": "^4.5.12",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -682,19 +836,19 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-ini": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.2.tgz",
-      "integrity": "sha512-Jrb8sLm6k8+L7520irBrvCtdLxNtrG7arIxe9TCeMJt/HxqMGJdbIjw8wILzkEHLMIi4MecF2FbXCln7OT1Tag==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.8.tgz",
+      "integrity": "sha512-n2dMn21gvbBIEh00E8Nb+j01U/9rSqFIamWRdGm/mE5e+vHQ9g0cBNdrYFlM6AAiryKVHZmShWT9D1JAWJ3ISw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.2",
-        "@aws-sdk/credential-provider-env": "^3.972.2",
-        "@aws-sdk/credential-provider-http": "^3.972.3",
-        "@aws-sdk/credential-provider-login": "^3.972.2",
-        "@aws-sdk/credential-provider-process": "^3.972.2",
-        "@aws-sdk/credential-provider-sso": "^3.972.2",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.2",
-        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/credential-provider-env": "^3.972.8",
+        "@aws-sdk/credential-provider-http": "^3.972.10",
+        "@aws-sdk/credential-provider-login": "^3.972.8",
+        "@aws-sdk/credential-provider-process": "^3.972.8",
+        "@aws-sdk/credential-provider-sso": "^3.972.8",
+        "@aws-sdk/credential-provider-web-identity": "^3.972.8",
+        "@aws-sdk/nested-clients": "3.990.0",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/credential-provider-imds": "^4.2.8",
         "@smithy/property-provider": "^4.2.8",
@@ -707,13 +861,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-login": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.2.tgz",
-      "integrity": "sha512-mlaw2aiI3DrimW85ZMn3g7qrtHueidS58IGytZ+mbFpsYLK5wMjCAKZQtt7VatLMtSBG/dn/EY4njbnYXIDKeQ==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.8.tgz",
+      "integrity": "sha512-rMFuVids8ICge/X9DF5pRdGMIvkVhDV9IQFQ8aTYk6iF0rl9jOUa1C3kjepxiXUlpgJQT++sLZkT9n0TMLHhQw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.2",
-        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/nested-clients": "3.990.0",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/protocol-http": "^5.3.8",
@@ -726,17 +880,17 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-node": {
-      "version": "3.972.3",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.3.tgz",
-      "integrity": "sha512-iu+JwWHM7tHowKqE+8wNmI3sM6mPEiI9Egscz2BEV7adyKmV95oR9tBO4VIOl72FGDi7X9mXg19VtqIpSkEEsA==",
+      "version": "3.972.9",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.9.tgz",
+      "integrity": "sha512-LfJfO0ClRAq2WsSnA9JuUsNyIicD2eyputxSlSL0EiMrtxOxELLRG6ZVYDf/a1HCepaYPXeakH4y8D5OLCauag==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/credential-provider-env": "^3.972.2",
-        "@aws-sdk/credential-provider-http": "^3.972.4",
-        "@aws-sdk/credential-provider-ini": "^3.972.2",
-        "@aws-sdk/credential-provider-process": "^3.972.2",
-        "@aws-sdk/credential-provider-sso": "^3.972.2",
-        "@aws-sdk/credential-provider-web-identity": "^3.972.2",
+        "@aws-sdk/credential-provider-env": "^3.972.8",
+        "@aws-sdk/credential-provider-http": "^3.972.10",
+        "@aws-sdk/credential-provider-ini": "^3.972.8",
+        "@aws-sdk/credential-provider-process": "^3.972.8",
+        "@aws-sdk/credential-provider-sso": "^3.972.8",
+        "@aws-sdk/credential-provider-web-identity": "^3.972.8",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/credential-provider-imds": "^4.2.8",
         "@smithy/property-provider": "^4.2.8",
@@ -749,12 +903,12 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-process": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.2.tgz",
-      "integrity": "sha512-NLKLTT7jnUe9GpQAVkPTJO+cs2FjlQDt5fArIYS7h/Iw/CvamzgGYGFRVD2SE05nOHCMwafUSi42If8esGFV+g==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.8.tgz",
+      "integrity": "sha512-6cg26ffFltxM51OOS8NH7oE41EccaYiNlbd5VgUYwhiGCySLfHoGuGrLm2rMB4zhy+IO5nWIIG0HiodX8zdvHA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.2",
+        "@aws-sdk/core": "^3.973.10",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/shared-ini-file-loader": "^4.4.3",
@@ -766,14 +920,14 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-sso": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.2.tgz",
-      "integrity": "sha512-YpwDn8g3gCGUl61cCV0sRxP2pFIwg+ZsMfWQ/GalSyjXtRkctCMFA+u0yPb/Q4uTfNEiya1Y4nm0C5rIHyPW5Q==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.8.tgz",
+      "integrity": "sha512-35kqmFOVU1n26SNv+U37sM8b2TzG8LyqAcd6iM9gprqxyHEh/8IM3gzN4Jzufs3qM6IrH8e43ryZWYdvfVzzKQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/client-sso": "3.975.0",
-        "@aws-sdk/core": "^3.973.2",
-        "@aws-sdk/token-providers": "3.975.0",
+        "@aws-sdk/client-sso": "3.990.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/token-providers": "3.990.0",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/shared-ini-file-loader": "^4.4.3",
@@ -785,13 +939,13 @@
       }
     },
     "node_modules/@aws-sdk/credential-provider-web-identity": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.2.tgz",
-      "integrity": "sha512-x9DAiN9Qz+NjJ99ltDiVQ8d511M/tuF/9MFbe2jUgo7HZhD6+x4S3iT1YcP07ndwDUjmzKGmeOEgE24k4qvfdg==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.8.tgz",
+      "integrity": "sha512-CZhN1bOc1J3ubQPqbmr5b4KaMJBgdDvYsmEIZuX++wFlzmZsKj1bwkaiTEb5U2V7kXuzLlpF5HJSOM9eY/6nGA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.2",
-        "@aws-sdk/nested-clients": "3.975.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/nested-clients": "3.990.0",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/shared-ini-file-loader": "^4.4.3",
@@ -882,9 +1036,9 @@
       }
     },
     "node_modules/@aws-sdk/middleware-host-header": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.2.tgz",
-      "integrity": "sha512-42hZ8jEXT2uR6YybCzNq9OomqHPw43YIfRfz17biZjMQA4jKSQUaHIl6VvqO2Ddl5904pXg2Yd/ku78S0Ikgog==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.3.tgz",
+      "integrity": "sha512-aknPTb2M+G3s+0qLCx4Li/qGZH8IIYjugHMv15JTYMe6mgZO8VBpYgeGYsNMGCqCZOcWzuf900jFBG5bopfzmA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
@@ -911,9 +1065,9 @@
       }
     },
     "node_modules/@aws-sdk/middleware-logger": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.2.tgz",
-      "integrity": "sha512-iUzdXKOgi4JVDDEG/VvoNw50FryRCEm0qAudw12DcZoiNJWl0rN6SYVLcL1xwugMfQncCXieK5UBlG6mhH7iYA==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.3.tgz",
+      "integrity": "sha512-Ftg09xNNRqaz9QNzlfdQWfpqMCJbsQdnZVJP55jfhbKi1+FTWxGuvfPoBhDHIovqWKjqbuiew3HuhxbJ0+OjgA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
@@ -925,9 +1079,9 @@
       }
     },
     "node_modules/@aws-sdk/middleware-recursion-detection": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.2.tgz",
-      "integrity": "sha512-/mzlyzJDtngNFd/rAYvqx29a2d0VuiYKN84Y/Mu9mGw7cfMOCyRK+896tb9wV6MoPRHUX7IXuKCIL8nzz2Pz5A==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.3.tgz",
+      "integrity": "sha512-PY57QhzNuXHnwbJgbWYTrqIDHYSeOlhfYERTAuc16LKZpTZRJUjzBFokp9hF7u1fuGeE3D70ERXzdbMBOqQz7Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
@@ -965,6 +1119,23 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@aws-sdk/middleware-sdk-sqs": {
+      "version": "3.972.7",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sqs/-/middleware-sdk-sqs-3.972.7.tgz",
+      "integrity": "sha512-DcJLYE4sRjgUyb2SupQGaRgBYc+j89N9nXeMT0PwwVvaBGmKqcxa7PFvz0kBnQrBckPWlfrPyyyMwOeT5BEp6Q==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/smithy-client": "^4.11.3",
+        "@smithy/types": "^4.12.0",
+        "@smithy/util-hex-encoding": "^4.2.0",
+        "@smithy/util-utf8": "^4.2.0",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@aws-sdk/middleware-ssec": {
       "version": "3.972.2",
       "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.972.2.tgz",
@@ -980,15 +1151,15 @@
       }
     },
     "node_modules/@aws-sdk/middleware-user-agent": {
-      "version": "3.972.4",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.4.tgz",
-      "integrity": "sha512-6sU8jrSJvY/lqSnU6IYsa8SrCKwOZ4Enl6O4xVJo8RCq9Bdr5Giuw2eUaJAk9GPcpr4OFcmSFv3JOLhpKGeRZA==",
+      "version": "3.972.10",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.10.tgz",
+      "integrity": "sha512-bBEL8CAqPQkI91ZM5a9xnFAzedpzH6NYCOtNyLarRAzTUTFN2DKqaC60ugBa7pnU1jSi4mA7WAXBsrod7nJltg==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.4",
+        "@aws-sdk/core": "^3.973.10",
         "@aws-sdk/types": "^3.973.1",
-        "@aws-sdk/util-endpoints": "3.972.0",
-        "@smithy/core": "^3.22.0",
+        "@aws-sdk/util-endpoints": "3.990.0",
+        "@smithy/core": "^3.23.0",
         "@smithy/protocol-http": "^5.3.8",
         "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
@@ -997,45 +1168,61 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@aws-sdk/middleware-user-agent/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.990.0.tgz",
+      "integrity": "sha512-kVwtDc9LNI3tQZHEMNbkLIOpeDK8sRSTuT8eMnzGY+O+JImPisfSTjdh+jw9OTznu+MYZjQsv0258sazVKunYg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@aws-sdk/nested-clients": {
-      "version": "3.975.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.975.0.tgz",
-      "integrity": "sha512-OkeFHPlQj2c/Y5bQGkX14pxhDWUGUFt3LRHhjcDKsSCw6lrxKcxN3WFZN0qbJwKNydP+knL5nxvfgKiCLpTLRA==",
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.990.0.tgz",
+      "integrity": "sha512-3NA0s66vsy8g7hPh36ZsUgO4SiMyrhwcYvuuNK1PezO52vX3hXDW4pQrC6OQLGKGJV0o6tbEyQtXb/mPs8zg8w==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-crypto/sha256-browser": "5.2.0",
         "@aws-crypto/sha256-js": "5.2.0",
-        "@aws-sdk/core": "^3.973.1",
-        "@aws-sdk/middleware-host-header": "^3.972.1",
-        "@aws-sdk/middleware-logger": "^3.972.1",
-        "@aws-sdk/middleware-recursion-detection": "^3.972.1",
-        "@aws-sdk/middleware-user-agent": "^3.972.2",
-        "@aws-sdk/region-config-resolver": "^3.972.1",
-        "@aws-sdk/types": "^3.973.0",
-        "@aws-sdk/util-endpoints": "3.972.0",
-        "@aws-sdk/util-user-agent-browser": "^3.972.1",
-        "@aws-sdk/util-user-agent-node": "^3.972.1",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/middleware-host-header": "^3.972.3",
+        "@aws-sdk/middleware-logger": "^3.972.3",
+        "@aws-sdk/middleware-recursion-detection": "^3.972.3",
+        "@aws-sdk/middleware-user-agent": "^3.972.10",
+        "@aws-sdk/region-config-resolver": "^3.972.3",
+        "@aws-sdk/types": "^3.973.1",
+        "@aws-sdk/util-endpoints": "3.990.0",
+        "@aws-sdk/util-user-agent-browser": "^3.972.3",
+        "@aws-sdk/util-user-agent-node": "^3.972.8",
         "@smithy/config-resolver": "^4.4.6",
-        "@smithy/core": "^3.21.1",
+        "@smithy/core": "^3.23.0",
         "@smithy/fetch-http-handler": "^5.3.9",
         "@smithy/hash-node": "^4.2.8",
         "@smithy/invalid-dependency": "^4.2.8",
         "@smithy/middleware-content-length": "^4.2.8",
-        "@smithy/middleware-endpoint": "^4.4.11",
-        "@smithy/middleware-retry": "^4.4.27",
+        "@smithy/middleware-endpoint": "^4.4.14",
+        "@smithy/middleware-retry": "^4.4.31",
         "@smithy/middleware-serde": "^4.2.9",
         "@smithy/middleware-stack": "^4.2.8",
         "@smithy/node-config-provider": "^4.3.8",
-        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/node-http-handler": "^4.4.10",
         "@smithy/protocol-http": "^5.3.8",
-        "@smithy/smithy-client": "^4.10.12",
+        "@smithy/smithy-client": "^4.11.3",
         "@smithy/types": "^4.12.0",
         "@smithy/url-parser": "^4.2.8",
         "@smithy/util-base64": "^4.3.0",
         "@smithy/util-body-length-browser": "^4.2.0",
         "@smithy/util-body-length-node": "^4.2.1",
-        "@smithy/util-defaults-mode-browser": "^4.3.26",
-        "@smithy/util-defaults-mode-node": "^4.2.29",
+        "@smithy/util-defaults-mode-browser": "^4.3.30",
+        "@smithy/util-defaults-mode-node": "^4.2.33",
         "@smithy/util-endpoints": "^3.2.8",
         "@smithy/util-middleware": "^4.2.8",
         "@smithy/util-retry": "^4.2.8",
@@ -1046,10 +1233,26 @@
         "node": ">=20.0.0"
       }
     },
+    "node_modules/@aws-sdk/nested-clients/node_modules/@aws-sdk/util-endpoints": {
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.990.0.tgz",
+      "integrity": "sha512-kVwtDc9LNI3tQZHEMNbkLIOpeDK8sRSTuT8eMnzGY+O+JImPisfSTjdh+jw9OTznu+MYZjQsv0258sazVKunYg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@aws-sdk/types": "^3.973.1",
+        "@smithy/types": "^4.12.0",
+        "@smithy/url-parser": "^4.2.8",
+        "@smithy/util-endpoints": "^3.2.8",
+        "tslib": "^2.6.2"
+      },
+      "engines": {
+        "node": ">=20.0.0"
+      }
+    },
     "node_modules/@aws-sdk/region-config-resolver": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.2.tgz",
-      "integrity": "sha512-/7vRBsfmiOlg2X67EdKrzzQGw5/SbkXb7ALHQmlQLkZh8qNgvS2G2dDC6NtF3hzFlpP3j2k+KIEtql/6VrI6JA==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.3.tgz",
+      "integrity": "sha512-v4J8qYAWfOMcZ4MJUyatntOicTzEMaU7j3OpkRCGGFSL2NgXQ5VbxauIyORA+pxdKZ0qQG2tCQjQjZDlXEC3Ow==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
@@ -1205,14 +1408,14 @@
       }
     },
     "node_modules/@aws-sdk/token-providers": {
-      "version": "3.975.0",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.975.0.tgz",
-      "integrity": "sha512-AWQt64hkVbDQ+CmM09wnvSk2mVyH4iRROkmYkr3/lmUtFNbE2L/fnw26sckZnUcFCsHPqbkQrcsZAnTcBLbH4w==",
+      "version": "3.990.0",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.990.0.tgz",
+      "integrity": "sha512-L3BtUb2v9XmYgQdfGBzbBtKMXaP5fV973y3Qdxeevs6oUTVXFmi/mV1+LnScA/1wVPJC9/hlK+1o5vbt7cG7EQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/core": "^3.973.1",
-        "@aws-sdk/nested-clients": "3.975.0",
-        "@aws-sdk/types": "^3.973.0",
+        "@aws-sdk/core": "^3.973.10",
+        "@aws-sdk/nested-clients": "3.990.0",
+        "@aws-sdk/types": "^3.973.1",
         "@smithy/property-provider": "^4.2.8",
         "@smithy/shared-ini-file-loader": "^4.4.3",
         "@smithy/types": "^4.12.0",
@@ -1304,9 +1507,9 @@
       }
     },
     "node_modules/@aws-sdk/util-user-agent-browser": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.2.tgz",
-      "integrity": "sha512-gz76bUyebPZRxIsBHJUd/v+yiyFzm9adHbr8NykP2nm+z/rFyvQneOHajrUejtmnc5tTBeaDPL4X25TnagRk4A==",
+      "version": "3.972.3",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.3.tgz",
+      "integrity": "sha512-JurOwkRUcXD/5MTDBcqdyQ9eVedtAsZgw5rBwktsPTN7QtPiS2Ld1jkJepNgYoCufz1Wcut9iup7GJDoIHp8Fw==",
       "license": "Apache-2.0",
       "dependencies": {
         "@aws-sdk/types": "^3.973.1",
@@ -1316,12 +1519,12 @@
       }
     },
     "node_modules/@aws-sdk/util-user-agent-node": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.2.tgz",
-      "integrity": "sha512-vnxOc4C6AR7hVbwyFo1YuH0GB6dgJlWt8nIOOJpnzJAWJPkUMPJ9Zv2lnKsSU7TTZbhP2hEO8OZ4PYH59XFv8Q==",
+      "version": "3.972.8",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.972.8.tgz",
+      "integrity": "sha512-XJZuT0LWsFCW1C8dEpPAXSa7h6Pb3krr2y//1X0Zidpcl0vmgY5nL/X0JuBZlntpBzaN3+U4hvKjuijyiiR8zw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@aws-sdk/middleware-user-agent": "^3.972.3",
+        "@aws-sdk/middleware-user-agent": "^3.972.10",
         "@aws-sdk/types": "^3.973.1",
         "@smithy/node-config-provider": "^4.3.8",
         "@smithy/types": "^4.12.0",
@@ -1340,37 +1543,19 @@
       }
     },
     "node_modules/@aws-sdk/xml-builder": {
-      "version": "3.972.2",
-      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.2.tgz",
-      "integrity": "sha512-jGOOV/bV1DhkkUhHiZ3/1GZ67cZyOXaDb7d1rYD6ZiXf5V9tBNOcgqXwRRPvrCbYaFRa1pPMFb3ZjqjWpR3YfA==",
+      "version": "3.972.4",
+      "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.4.tgz",
+      "integrity": "sha512-0zJ05ANfYqI6+rGqj8samZBFod0dPPousBjLEqg8WdxSgbMAkRgLyn81lP215Do0rFJ/17LIXwr7q0yK24mP6Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/types": "^4.12.0",
-        "fast-xml-parser": "5.2.5",
+        "fast-xml-parser": "5.3.4",
         "tslib": "^2.6.2"
       },
       "engines": {
         "node": ">=20.0.0"
       }
     },
-    "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": {
-      "version": "5.2.5",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz",
-      "integrity": "sha512-pfX9uG9Ki0yekDHx2SiuRIyFdyAr1kMIMitPvb0YBo8SUfKvia7w7FIyd/l6av85pFYRhZscS75MwMnbvY+hcQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/NaturalIntelligence"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "strnum": "^2.1.0"
-      },
-      "bin": {
-        "fxparser": "src/cli/cli.js"
-      }
-    },
     "node_modules/@aws/lambda-invoke-store": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.3.tgz",
@@ -2577,6 +2762,24 @@
         "@noble/hashes": "^1.1.5"
       }
     },
+    "node_modules/@pdf-lib/standard-fonts": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@pdf-lib/standard-fonts/-/standard-fonts-1.0.0.tgz",
+      "integrity": "sha512-hU30BK9IUN/su0Mn9VdlVKsWBS6GyhVfqjwl1FjZN4TxP6cCw0jP2w7V3Hf5uX7M0AZJ16vey9yE0ny7Sa59ZA==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "^1.0.6"
+      }
+    },
+    "node_modules/@pdf-lib/upng": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@pdf-lib/upng/-/upng-1.0.1.tgz",
+      "integrity": "sha512-dQK2FUMQtowVP00mtIksrlZhdFXQZPC+taih1q4CvPZ5vqdxR/LKBaFg0oAfzd1GlHZXXSPdQfzQnt+ViGvEIQ==",
+      "license": "MIT",
+      "dependencies": {
+        "pako": "^1.0.10"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -3067,9 +3270,9 @@
       }
     },
     "node_modules/@smithy/core": {
-      "version": "3.22.0",
-      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.22.0.tgz",
-      "integrity": "sha512-6vjCHD6vaY8KubeNw2Fg3EK0KLGQYdldG4fYgQmA0xSW0dJ8G2xFhSOdrlUakWVoP5JuWHtFODg3PNd/DN3FDA==",
+      "version": "3.23.2",
+      "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.2.tgz",
+      "integrity": "sha512-HaaH4VbGie4t0+9nY3tNBRSxVTr96wzIqexUa6C2qx3MPePAuz7lIxPxYtt1Wc//SPfJLNoZJzfdt0B6ksj2jA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/middleware-serde": "^4.2.9",
@@ -3078,7 +3281,7 @@
         "@smithy/util-base64": "^4.3.0",
         "@smithy/util-body-length-browser": "^4.2.0",
         "@smithy/util-middleware": "^4.2.8",
-        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-stream": "^4.5.12",
         "@smithy/util-utf8": "^4.2.0",
         "@smithy/uuid": "^1.1.0",
         "tslib": "^2.6.2"
@@ -3287,12 +3490,12 @@
       }
     },
     "node_modules/@smithy/middleware-endpoint": {
-      "version": "4.4.12",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.12.tgz",
-      "integrity": "sha512-9JMKHVJtW9RysTNjcBZQHDwB0p3iTP6B1IfQV4m+uCevkVd/VuLgwfqk5cnI4RHcp4cPwoIvxQqN4B1sxeHo8Q==",
+      "version": "4.4.16",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.16.tgz",
+      "integrity": "sha512-L5GICFCSsNhbJ5JSKeWFGFy16Q2OhoBizb3X2DrxaJwXSEujVvjG9Jt386dpQn2t7jINglQl0b4K/Su69BdbMA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.22.0",
+        "@smithy/core": "^3.23.2",
         "@smithy/middleware-serde": "^4.2.9",
         "@smithy/node-config-provider": "^4.3.8",
         "@smithy/shared-ini-file-loader": "^4.4.3",
@@ -3306,15 +3509,15 @@
       }
     },
     "node_modules/@smithy/middleware-retry": {
-      "version": "4.4.29",
-      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.29.tgz",
-      "integrity": "sha512-bmTn75a4tmKRkC5w61yYQLb3DmxNzB8qSVu9SbTYqW6GAL0WXO2bDZuMAn/GJSbOdHEdjZvWxe+9Kk015bw6Cg==",
+      "version": "4.4.33",
+      "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.4.33.tgz",
+      "integrity": "sha512-jLqZOdJhtIL4lnA9hXnAG6GgnJlo1sD3FqsTxm9wSfjviqgWesY/TMBVnT84yr4O0Vfe0jWoXlfFbzsBVph3WA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/node-config-provider": "^4.3.8",
         "@smithy/protocol-http": "^5.3.8",
         "@smithy/service-error-classification": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/smithy-client": "^4.11.5",
         "@smithy/types": "^4.12.0",
         "@smithy/util-middleware": "^4.2.8",
         "@smithy/util-retry": "^4.2.8",
@@ -3368,9 +3571,9 @@
       }
     },
     "node_modules/@smithy/node-http-handler": {
-      "version": "4.4.8",
-      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.8.tgz",
-      "integrity": "sha512-q9u+MSbJVIJ1QmJ4+1u+cERXkrhuILCBDsJUBAW1MPE6sFonbCNaegFuwW9ll8kh5UdyY3jOkoOGlc7BesoLpg==",
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.4.10.tgz",
+      "integrity": "sha512-u4YeUwOWRZaHbWaebvrs3UhwQwj+2VNmcVCwXcYTvPIuVyM7Ex1ftAj+fdbG/P4AkBwLq/+SKn+ydOI4ZJE9PA==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/abort-controller": "^4.2.8",
@@ -3481,17 +3684,17 @@
       }
     },
     "node_modules/@smithy/smithy-client": {
-      "version": "4.11.1",
-      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.11.1.tgz",
-      "integrity": "sha512-SERgNg5Z1U+jfR6/2xPYjSEHY1t3pyTHC/Ma3YQl6qWtmiL42bvNId3W/oMUWIwu7ekL2FMPdqAmwbQegM7HeQ==",
+      "version": "4.11.5",
+      "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.11.5.tgz",
+      "integrity": "sha512-xixwBRqoeP2IUgcAl3U9dvJXc+qJum4lzo3maaJxifsZxKUYLfVfCXvhT4/jD01sRrHg5zjd1cw2Zmjr4/SuKQ==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@smithy/core": "^3.22.0",
-        "@smithy/middleware-endpoint": "^4.4.12",
+        "@smithy/core": "^3.23.2",
+        "@smithy/middleware-endpoint": "^4.4.16",
         "@smithy/middleware-stack": "^4.2.8",
         "@smithy/protocol-http": "^5.3.8",
         "@smithy/types": "^4.12.0",
-        "@smithy/util-stream": "^4.5.10",
+        "@smithy/util-stream": "^4.5.12",
         "tslib": "^2.6.2"
       },
       "engines": {
@@ -3588,13 +3791,13 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-browser": {
-      "version": "4.3.28",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.28.tgz",
-      "integrity": "sha512-/9zcatsCao9h6g18p/9vH9NIi5PSqhCkxQ/tb7pMgRFnqYp9XUOyOlGPDMHzr8n5ih6yYgwJEY2MLEobUgi47w==",
+      "version": "4.3.32",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.32.tgz",
+      "integrity": "sha512-092sjYfFMQ/iaPH798LY/OJFBcYu0sSK34Oy9vdixhsU36zlZu8OcYjF3TD4e2ARupyK7xaxPXl+T0VIJTEkkg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/property-provider": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/smithy-client": "^4.11.5",
         "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
@@ -3603,16 +3806,16 @@
       }
     },
     "node_modules/@smithy/util-defaults-mode-node": {
-      "version": "4.2.31",
-      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.31.tgz",
-      "integrity": "sha512-JTvoApUXA5kbpceI2vuqQzRjeTbLpx1eoa5R/YEZbTgtxvIB7AQZxFJ0SEyfCpgPCyVV9IT7we+ytSeIB3CyWA==",
+      "version": "4.2.35",
+      "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.35.tgz",
+      "integrity": "sha512-miz/ggz87M8VuM29y7jJZMYkn7+IErM5p5UgKIf8OtqVs/h2bXr1Bt3uTsREsI/4nK8a0PQERbAPsVPVNIsG7Q==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/config-resolver": "^4.4.6",
         "@smithy/credential-provider-imds": "^4.2.8",
         "@smithy/node-config-provider": "^4.3.8",
         "@smithy/property-provider": "^4.2.8",
-        "@smithy/smithy-client": "^4.11.1",
+        "@smithy/smithy-client": "^4.11.5",
         "@smithy/types": "^4.12.0",
         "tslib": "^2.6.2"
       },
@@ -3674,13 +3877,13 @@
       }
     },
     "node_modules/@smithy/util-stream": {
-      "version": "4.5.10",
-      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.10.tgz",
-      "integrity": "sha512-jbqemy51UFSZSp2y0ZmRfckmrzuKww95zT9BYMmuJ8v3altGcqjwoV1tzpOwuHaKrwQrCjIzOib499ymr2f98g==",
+      "version": "4.5.12",
+      "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.12.tgz",
+      "integrity": "sha512-D8tgkrmhAX/UNeCZbqbEO3uqyghUnEmmoO9YEvRuwxjlkKKUE7FOgCJnqpTlQPe9MApdWPky58mNQQHbnCzoNg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@smithy/fetch-http-handler": "^5.3.9",
-        "@smithy/node-http-handler": "^4.4.8",
+        "@smithy/node-http-handler": "^4.4.10",
         "@smithy/types": "^4.12.0",
         "@smithy/util-base64": "^4.3.0",
         "@smithy/util-buffer-from": "^4.2.0",
@@ -6963,6 +7166,15 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/fuse.js": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-7.1.0.tgz",
+      "integrity": "sha512-trLf4SzuuUxfusZADLINj+dE8clK1frKdmqiJNb1Es75fmI5oY6X2mxLVUciLLjxqw/xr72Dhy+lER6dGd02FQ==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/gaxios": {
       "version": "6.7.1",
       "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
@@ -9191,6 +9403,12 @@
       "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
       "license": "BlueOak-1.0.0"
     },
+    "node_modules/pako": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
+      "license": "(MIT AND Zlib)"
+    },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -9329,6 +9547,24 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/pdf-lib": {
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/pdf-lib/-/pdf-lib-1.17.1.tgz",
+      "integrity": "sha512-V/mpyJAoTsN4cnP31vc0wfNA1+p20evqqnap0KLoRUN0Yk/p3wN52DOEsL4oBFcLdb76hlpKPtzJIgo67j/XLw==",
+      "license": "MIT",
+      "dependencies": {
+        "@pdf-lib/standard-fonts": "^1.0.0",
+        "@pdf-lib/upng": "^1.0.1",
+        "pako": "^1.0.11",
+        "tslib": "^1.11.1"
+      }
+    },
+    "node_modules/pdf-lib/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
+    },
     "node_modules/phone": {
       "version": "3.1.70",
       "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.70.tgz",

package.json

@@ -23,6 +23,8 @@
     "@aws-sdk/client-s3": "^3.978.0",
     "@aws-sdk/client-secrets-manager": "^3.978.0",
     "@aws-sdk/client-ses": "^3.978.0",
+    "@aws-sdk/client-sqs": "^3.975.0",
+    "@aws-sdk/client-textract": "^3.975.0",
     "@aws-sdk/credential-provider-node": "^3.972.3",
     "@aws-sdk/lib-storage": "^3.978.0",
     "@aws-sdk/s3-request-presigner": "^3.978.0",
@@ -46,6 +48,7 @@
     "express": "^4.21.1",
     "fast-xml-parser": "^5.3.4",
     "firebase-admin": "^13.6.0",
+    "fuse.js": "^7.1.0",
     "graphql": "^16.12.0",
     "graphql-request": "^6.1.0",
     "intuit-oauth": "^4.2.2",
@@ -60,6 +63,7 @@
     "mustache": "^4.2.0",
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
+    "pdf-lib": "^1.17.1",
     "phone": "^3.1.70",
     "query-string": "7.1.3",
     "recursive-diff": "^1.0.9",

server.js

@@ -40,6 +40,8 @@ const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
 const { loadAppQueue } = require("./server/notifications/queues/appQueue");
 const { SetLegacyWebsocketHandlers } = require("./server/web-sockets/web-socket");
 const { loadFcmQueue } = require("./server/notifications/queues/fcmQueue");
+const { loadChatterApiQueue } = require("./server/data/queues/chatterApiQueue");
+const { processChatterApiJob } = require("./server/data/chatter-api");
 
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
@@ -125,6 +127,9 @@ const applyRoutes = ({ app }) => {
   app.use("/payroll", require("./server/routes/payrollRoutes"));
   app.use("/sso", require("./server/routes/ssoRoutes"));
   app.use("/integrations", require("./server/routes/intergrationRoutes"));
+  app.use("/ai", require("./server/routes/aiRoutes"));
+
+  app.use("/chatter", require("./server/routes/chatterRoutes"));
 
   // Default route for forbidden access
   app.get("/", (req, res) => {
@@ -390,6 +395,15 @@ const applySocketIO = async ({ server, app }) => {
 const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   const queueSettings = { pubClient, logger, redisHelpers, ioRedis };
 
+  // Load chatterApi queue with processJob function and redis helpers
+  const chatterApiQueue = await loadChatterApiQueue({
+    pubClient,
+    logger,
+    processJob: processChatterApiJob,
+    getChatterToken: redisHelpers.getChatterToken,
+    setChatterToken: redisHelpers.setChatterToken
+  });
+
   // Assuming loadEmailQueue and loadAppQueue return Promises
   const [notificationsEmailsQueue, notificationsAppQueue, notificationsFcmQueue] = await Promise.all([
     loadEmailQueue(queueSettings),
@@ -409,6 +423,16 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   notificationsFcmQueue.on("error", (error) => {
     logger.log(`Error in notificationsFCMQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
   });
+
+  chatterApiQueue.on("error", (error) => {
+    logger.log(`Error in chatterApiQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
+  });
+
+  // Initialize bill-ocr with Redis client
+  const { initializeBillOcr, startSQSPolling } = require("./server/ai/bill-ocr/bill-ocr");
+  initializeBillOcr(pubClient);
+  // Start SQS polling for Textract notifications
+  startSQSPolling();
 };
 
 /**
@@ -438,6 +462,7 @@ const main = async () => {
   try {
     await server.listen(port);
     logger.log(`Server started on port ${port}`, "INFO", "api");
+
   } catch (error) {
     logger.log(`Server failed to start on port ${port}`, "ERROR", "api", null, { error: error.message });
   }

server/ai/bill-ocr/bill-ocr-generator.js

@@ -0,0 +1,792 @@
+
+
+const Fuse = require('fuse.js');
+
+const { standardizedFieldsnames } = require('./bill-ocr-normalize');
+const InstanceManager = require("../../utils/instanceMgr").default;
+
+const PRICE_PERCENT_MARGIN_TOLERANCE = 0.5; //Used to make sure prices and costs are likely. 
+const PRICE_QUANTITY_MARGIN_TOLERANCE = 0.03; //Used to make sure that if there is a quantity, the price is likely a unit price.
+// Helper function to normalize fields
+const normalizePartNumber = (str) => {
+    return str.replace(/[^a-zA-Z0-9]/g, '').toUpperCase();
+};
+
+const normalizeText = (str) => {
+    return str.replace(/[^a-zA-Z0-9\s]/g, '').replace(/\s+/g, ' ').trim().toUpperCase();
+};
+const normalizePrice = (str) => {
+    if (typeof str !== 'string') return str;
+
+    let value = str.trim();
+
+    // Handle European-style decimal comma like "292,37".
+    // Only treat the *last* comma as a decimal separator when:
+    // - there's no '.' anywhere (so we don't fight normal US formatting like "1,234.56")
+    // - and the suffix after the last comma is 1-2 digits (so "1,234" stays 1234)
+    if (!value.includes('.') && value.includes(',')) {
+        const lastCommaIndex = value.lastIndexOf(',');
+        const decimalSuffix = value.slice(lastCommaIndex + 1).trim();
+
+        if (/^\d{1,2}$/.test(decimalSuffix)) {
+            const before = value.slice(0, lastCommaIndex).replace(/,/g, '');
+            value = `${before}.${decimalSuffix}`;
+        } else {
+            // Treat commas as thousands separators (or noise) and drop them.
+            value = value.replace(/,/g, '');
+        }
+    }
+
+    return value.replace(/[^0-9.-]+/g, "");
+};
+
+const roundToIncrement = (value, increment) => {
+    if (typeof value !== 'number' || !isFinite(value) || typeof increment !== 'number' || !isFinite(increment) || increment <= 0) {
+        return value;
+    }
+
+    const rounded = Math.round((value + Number.EPSILON) / increment) * increment;
+    // Prevent float artifacts (e.g. 0.20500000000000002)
+    const decimals = Math.max(0, Math.ceil(-Math.log10(increment)));
+    return parseFloat(rounded.toFixed(decimals));
+};
+
+//More complex function. Not necessary at the moment, keeping for reference. 
+// const normalizePriceFinal = (str) => {
+//     if (typeof str !== 'string') {
+//         // If it's already a number, format to 2 decimals
+//         const num = parseFloat(str);
+//         return isNaN(num) ? 0 : num;
+//     }
+
+//     // First, try to extract valid decimal number patterns (e.g., "123.45")
+//     const decimalPattern = /\d+\.\d{1,2}/g;
+//     const decimalMatches = str.match(decimalPattern);
+
+//     if (decimalMatches && decimalMatches.length > 0) {
+//         // Found valid decimal number(s)
+//         const numbers = decimalMatches.map(m => parseFloat(m)).filter(n => !isNaN(n) && n > 0);
+
+//         if (numbers.length === 1) {
+//             return numbers[0];
+//         }
+
+//         if (numbers.length > 1) {
+//             // Check if all numbers are the same (e.g., "47.57.47.57" -> [47.57, 47.57])
+//             const uniqueNumbers = [...new Set(numbers)];
+//             if (uniqueNumbers.length === 1) {
+//                 return uniqueNumbers[0];
+//             }
+
+//             // Check if numbers are very close (within 1% tolerance)
+//             const avg = numbers.reduce((a, b) => a + b, 0) / numbers.length;
+//             const allClose = numbers.every(num => Math.abs(num - avg) / avg < 0.01);
+
+//             if (allClose) {
+//                 return avg;
+//             }
+
+//             // Return the first number (most likely correct)
+//             return numbers[0];
+//         }
+//     }
+
+//     // Fallback: Split on common delimiters and extract all potential numbers
+//     const parts = str.split(/[\/|\\,;]/).map(part => part.trim()).filter(part => part.length > 0);
+
+//     if (parts.length > 1) {
+//         // Multiple values detected - extract and parse all valid numbers
+//         const numbers = parts
+//             .map(part => {
+//                 const cleaned = part.replace(/[^0-9.-]+/g, "");
+//                 const parsed = parseFloat(cleaned);
+//                 return isNaN(parsed) ? null : parsed;
+//             })
+//             .filter(num => num !== null && num > 0);
+
+//         if (numbers.length === 0) {
+//             // No valid numbers found, try fallback to basic cleaning
+//             const cleaned = str.replace(/[^0-9.-]+/g, "");
+//             const parsed = parseFloat(cleaned);
+//             return isNaN(parsed) ? 0 : parsed;
+//         }
+
+//         if (numbers.length === 1) {
+//             return numbers[0];
+//         }
+
+//         // Multiple valid numbers
+//         const uniqueNumbers = [...new Set(numbers)];
+
+//         if (uniqueNumbers.length === 1) {
+//             return uniqueNumbers[0];
+//         }
+
+//         // Check if numbers are very close (within 1% tolerance)
+//         const avg = numbers.reduce((a, b) => a + b, 0) / numbers.length;
+//         const allClose = numbers.every(num => Math.abs(num - avg) / avg < 0.01);
+
+//         if (allClose) {
+//             return avg;
+//         }
+
+//         // Return the first valid number
+//         return numbers[0];
+//     }
+
+//     // Single value or no delimiters, clean normally
+//     const cleaned = str.replace(/[^0-9.-]+/g, "");
+//     const parsed = parseFloat(cleaned);
+//     return isNaN(parsed) ? 0 : parsed;
+// };
+
+
+
+// Helper function to calculate Textract OCR confidence (0-100%)
+const calculateTextractConfidence = (textractLineItem) => {
+    if (!textractLineItem || Object.keys(textractLineItem).length === 0) {
+        return 0;
+    }
+
+    const confidenceValues = [];
+
+    // Collect confidence from all fields in the line item
+    Object.values(textractLineItem).forEach(field => {
+        if (field.confidence && typeof field.confidence === 'number') {
+            confidenceValues.push(field.confidence);
+        }
+    });
+
+    if (confidenceValues.length === 0) {
+        return 0;
+    }
+
+    // Check if critical normalized labels are present
+    const hasActualCost = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.actual_cost);
+    const hasActualPrice = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.actual_price);
+    const hasLineDesc = Object.values(textractLineItem).some(field => field.normalizedLabel === standardizedFieldsnames.line_desc);
+    const hasQuantity = textractLineItem?.QUANTITY?.value; //We don't normalize quantity, we just use what textract gives us.
+
+    // Calculate weighted average, giving more weight to important fields
+    // If we can identify key fields (ITEM, PRODUCT_CODE, PRICE), weight them higher
+    let totalWeight = 0;
+    let weightedSum = 0;
+
+    Object.entries(textractLineItem).forEach(([key, field]) => {
+        if (field.confidence && typeof field.confidence === 'number') {
+            // Weight important fields higher
+            let weight = 1;
+            if (field.normalizedLabel === standardizedFieldsnames.actual_cost || field.normalizedLabel === standardizedFieldsnames.actual_price) {
+                weight = 4;
+            }
+            else if (field.normalizedLabel === standardizedFieldsnames.part_no || field.normalizedLabel === standardizedFieldsnames.line_desc) {
+                weight = 3.5;
+            }
+            else if (field.normalizedLabel === standardizedFieldsnames.quantity) {
+                weight = 3.5;
+            }
+            // We generally ignore the key from textract. Keeping for future reference. 
+            // else if (key === 'ITEM' || key === 'PRODUCT_CODE') {
+            //     weight = 3; // Description and part number are most important
+            // } else if (key === 'PRICE' || key === 'UNIT_PRICE' || key === 'QUANTITY') {
+            //     weight = 2; // Price and quantity moderately important
+            // }
+
+            weightedSum += field.confidence * weight;
+            totalWeight += weight;
+        }
+    });
+
+    let avgConfidence = totalWeight > 0 ? weightedSum / totalWeight : 0;
+
+    // Apply penalty if critical normalized labels are missing
+    let missingFieldsPenalty = 1.0;
+    let missingCount = 0;
+    if (!hasActualCost) missingCount++;
+    if (!hasActualPrice) missingCount++;
+    if (!hasLineDesc) missingCount++;
+    if (!hasQuantity) missingCount++;
+
+    // Each missing field reduces confidence by 20%
+    if (missingCount > 0) {
+        missingFieldsPenalty = 1.0 - (missingCount * 0.20);
+    }
+
+    avgConfidence = avgConfidence * missingFieldsPenalty;
+
+    return Math.round(avgConfidence * 100) / 100; // Round to 2 decimal places
+};
+
+const calculateMatchConfidence = (matches, bestMatch) => {
+    if (!matches || matches.length === 0 || !bestMatch) {
+        return 0; // No match = 0% confidence
+    }
+
+    // Base confidence from the match score
+    // finalScore is already weighted and higher is better
+    // Normalize it to a 0-100 scale
+    const baseScore = Math.min(bestMatch.finalScore * 10, 100); // Scale factor of 10, cap at 100
+
+    // Bonus for multiple field matches (up to +15%)
+    const fieldMatchBonus = Math.min(bestMatch.fieldMatches.length * 5, 15);
+
+    // Bonus for having price data (+10%)
+    const priceDataBonus = bestMatch.hasPriceData ? 10 : 0;
+
+    // Bonus for clear winner (gap between 1st and 2nd match)
+    let confidenceMarginBonus = 0;
+    if (matches.length > 1) {
+        const scoreDiff = bestMatch.finalScore - matches[1].finalScore;
+        // If the best match is significantly better than the second best, add bonus
+        confidenceMarginBonus = Math.min(scoreDiff * 5, 10); // Up to +10%
+    } else {
+        // Only one match found, add small bonus
+        confidenceMarginBonus = 5;
+    }
+
+    // Calculate total match confidence
+    let matchConfidence = baseScore + fieldMatchBonus + priceDataBonus + confidenceMarginBonus;
+
+    // Cap at 100% and round to 2 decimal places
+    matchConfidence = Math.min(Math.round(matchConfidence * 100) / 100, 100);
+
+    // Ensure minimum of 1% if there's any match at all
+    return Math.max(matchConfidence, 1);
+};
+
+const calculateOverallConfidence = (ocrConfidence, matchConfidence) => {
+    // If there's no match, OCR confidence doesn't matter much
+    if (matchConfidence === 0) {
+        return 0;
+    }
+
+    // Overall confidence is affected by both how well Textract read the data
+    // and how well we matched it to existing joblines
+    // Use a weighted average: 60% OCR confidence, 40% match confidence
+    // OCR confidence is more important because even perfect match is useless without good OCR
+    const overall = (ocrConfidence * 0.6) + (matchConfidence * 0.4);
+
+    return Math.round(overall * 100) / 100;
+};
+
+// Helper function to merge and deduplicate results with weighted scoring
+const mergeResults = (resultsArray, weights = []) => {
+    const scoreMap = new Map();
+
+    resultsArray.forEach((results, index) => {
+        const weight = weights[index] || 1;
+        results.forEach(result => {
+            const id = result.item.id;
+            const weightedScore = result.score * weight;
+
+            if (!scoreMap.has(id)) {
+                scoreMap.set(id, { item: result.item, score: weightedScore, count: 1 });
+            } else {
+                const existing = scoreMap.get(id);
+                // Lower score is better in Fuse.js, so take the minimum
+                existing.score = Math.min(existing.score, weightedScore);
+                existing.count++;
+            }
+        });
+    });
+
+    // Convert back to array and sort by score (lower is better)
+    return Array.from(scoreMap.values())
+        .sort((a, b) => {
+            // Prioritize items found in multiple searches
+            if (a.count !== b.count) return b.count - a.count;
+            return a.score - b.score;
+        })
+        .slice(0, 5); // Return top 5 results
+};
+
+async function generateBillFormData({ processedData, jobid: jobidFromProps, bodyshopid, partsorderid, req }) {
+    const client = req.userGraphQLClient;
+
+    let jobid = jobidFromProps;
+    //If no jobid, fetch it, and funnel it back. 
+    if (!jobid || jobid === null || jobid === undefined || jobid === "" || jobid === "null" || jobid === "undefined") {
+        const ro_number = processedData.summary?.PO_NUMBER?.value || Object.values(processedData.summary).find(value => value.normalizedLabel === 'ro_number')?.value;
+        if (!ro_number) {
+            throw new Error("Could not find RO number in the extracted data to associate with the bill. Select an RO and try again.");
+        }
+
+        const { jobs } = await client.request(`
+            query QUERY_BILL_OCR_JOB_BY_RO($ro_number: String!) {
+                    jobs(where: {ro_number: {_eq: $ro_number}}) {
+                        id
+                    }
+                }`, { ro_number });
+
+        if (jobs.length === 0) {
+            throw new Error("No job found for the detected RO/PO number.");
+        }
+        jobid = jobs[0].id;
+    }
+
+    const jobData = await client.request(`
+   query QUERY_BILL_OCR_DATA($jobid: uuid!) {
+  vendors {
+    id
+    name
+  }
+  jobs_by_pk(id: $jobid) {
+    id
+    bodyshop {
+      id
+      md_responsibility_centers
+      cdk_dealerid
+      pbs_serialnumber
+      rr_dealerid
+    }
+    joblines {
+      id
+      line_desc
+      removed
+      act_price
+      db_price
+      oem_partno
+      alt_partno
+      part_type
+    }
+  }
+
+}
+   `, {
+        jobid,  // TODO: Parts order IDs are currently ignore. If receving a parts order, it could be used to more precisely match to joblines.
+    });
+
+    //Create fuses of line descriptions for matching.
+    const jobLineDescFuse = new Fuse(
+        jobData.jobs_by_pk.joblines.map(jl => ({ ...jl, line_desc_normalized: normalizeText(jl.line_desc || ""), oem_partno_normalized: normalizePartNumber(jl.oem_partno || ""), alt_partno_normalized: normalizePartNumber(jl.alt_partno || "") })),
+        {
+            keys: [{
+                name: 'line_desc',
+                weight: 6
+            }, {
+                name: 'oem_partno',
+                weight: 8
+            }, {
+                name: 'alt_partno',
+                weight: 5
+            },
+            {
+                name: 'act_price',
+                weight: 1
+            },
+            {
+                name: 'line_desc_normalized',
+                weight: 4
+            },
+            {
+                name: 'oem_partno_normalized',
+                weight: 6
+            },
+            {
+                name: 'alt_partno_normalized',
+                weight: 3
+            }],
+            threshold: 0.4, //Adjust as needed for matching sensitivity,
+            includeScore: true,
+
+        }
+    );
+    const joblineMatches = joblineFuzzySearch({ fuseToSearch: jobLineDescFuse, processedData });
+
+    const vendorFuse = new Fuse(
+        jobData.vendors.map(v => ({ ...v, name_normalized: normalizeText(v.name) })),
+        {
+            keys: [{ name: "name", weight: 3 }, { name: 'name_normalized', weight: 2 }],
+            threshold: 0.4,
+            includeScore: true,
+        },
+
+    );
+
+    const vendorMatches = vendorFuse.search(normalizeText(processedData.summary?.VENDOR_NAME?.value || processedData.summary?.NAME?.value));
+
+    let vendorid;
+    if (vendorMatches.length > 0) {
+        vendorid = vendorMatches[0].item.id;
+    }
+    const { jobs_by_pk: job } = jobData;
+    if (!job) {
+        throw new Error('Job not found for bill form data generation.');
+    }
+
+
+    //Is there a subtotal level discount? If there is, we need to figure out what the percentage is, and apply that to the actual cost as a reduction
+    const subtotalDiscountValueRaw = processedData.summary?.DISCOUNT?.value || processedData.summary?.SUBTOTAL_DISCOUNT?.value || 0;
+    let discountPercentageDecimal = 0;
+    if (subtotalDiscountValueRaw) {
+        const subtotal = parseFloat(normalizePrice(processedData.summary?.SUBTOTAL?.value || 0)) || 0;
+        const subtotalDiscountValue = parseFloat(normalizePrice(subtotalDiscountValueRaw)) || 0;
+        if (subtotal > 0 && subtotalDiscountValue) {
+            // Store discount percentage as a decimal (e.g. 20.5% => 0.205),
+            // but only allow half-percent increments (0.005 steps).
+            discountPercentageDecimal = Math.abs(subtotalDiscountValue / subtotal);
+            discountPercentageDecimal = roundToIncrement(discountPercentageDecimal, 0.005);
+        }
+    }
+
+    //TODO: How do we handle freight lines and core charges? 
+    //Create the form data structure for the bill posting screen. 
+    const billFormData = {
+        "jobid": jobid,
+        "vendorid": vendorid,
+        "invoice_number": processedData.summary?.INVOICE_RECEIPT_ID?.value,
+        "date": processedData.summary?.INVOICE_RECEIPT_DATE?.value,
+        "is_credit_memo": false,
+        "total": normalizePrice(processedData.summary?.INVOICE_TOTAL?.value || processedData.summary?.TOTAL?.value),
+        "billlines": joblineMatches.map(jlMatchLine => {
+            const { matches, textractLineItem, } = jlMatchLine
+            //Matches should be pre-sorted, take the first one.
+            const matchToUse = matches.length > 0 ? matches[0] : null;
+
+            // Calculate confidence scores
+            const ocrConfidence = calculateTextractConfidence(textractLineItem);
+            const matchConfidence = calculateMatchConfidence(matches, matchToUse);
+            const overallConfidence = calculateOverallConfidence(ocrConfidence, matchConfidence);
+            //TODO: Should be using the textract if there is an exact match on the normalized label.
+            //if there isn't then we can do the below. 
+
+            let actualPrice, actualCost;
+            //TODO: What is several match on the normalized name? We need to pick the most likely one. 
+            const hasNormalizedActualPrice = Object.keys(textractLineItem).find(key => textractLineItem[key].normalizedLabel === 'actual_price');
+            const hasNormalizedActualCost = Object.keys(textractLineItem).find(key => textractLineItem[key].normalizedLabel === 'actual_cost');
+
+            if (hasNormalizedActualPrice) {
+                actualPrice = textractLineItem[hasNormalizedActualPrice].value;
+            }
+            if (hasNormalizedActualCost) {
+                actualCost = textractLineItem[hasNormalizedActualCost].value;
+            }
+
+            if (!hasNormalizedActualPrice || !hasNormalizedActualCost) {
+                //This is if there was no match found for normalized labels. 
+                //Check all prices, and generally the higher one will be the actual price and the lower one will be the cost. 
+                //Need to make sure that other random items are excluded. This should be within a reasonable range of the matched jobline at matchToUse.item.act_price
+                //Iterate over all of the text values, and check out which of them are currencies. 
+                //They'll be in the format starting with a $ sign usually.
+                const currencyTextractLineItems = [] // {key, value}
+                Object.keys(textractLineItem).forEach(key => {
+                    const currencyValue = textractLineItem[key].value?.startsWith('$') ? textractLineItem[key].value : null;
+                    if (currencyValue) {
+                        //Clean it and parse it
+                        const cleanValue = parseFloat(currencyValue.replace(/[^0-9.-]/g, '')) || 0;
+                        currencyTextractLineItems.push({ key, value: cleanValue })
+                    }
+                })
+
+                //Sort them descending
+                currencyTextractLineItems.sort((a, b) => b.value - a.value);
+                //Most expensive should be the actual price, second most expensive should be the cost.
+                if (!actualPrice) actualPrice = currencyTextractLineItems.length > 0 ? currencyTextractLineItems[0].value : 0;
+                if (!actualCost) actualCost = currencyTextractLineItems.length > 1 ? currencyTextractLineItems[1].value : 0;
+
+                if (matchToUse) {
+                    //Double check that they're within 50% of the matched jobline price if there is one.
+                    const joblinePrice = parseFloat(matchToUse.item.act_price) || 0;
+                    if (!hasNormalizedActualPrice && actualPrice > 0 && (actualPrice < joblinePrice * (1 - PRICE_PERCENT_MARGIN_TOLERANCE) || actualPrice > joblinePrice * (1 + PRICE_PERCENT_MARGIN_TOLERANCE))) {
+                        actualPrice = joblinePrice; //Set to the jobline as a fallback.
+                    }
+                    if (!hasNormalizedActualCost && actualCost > 0 && (actualCost < joblinePrice * (1 - PRICE_PERCENT_MARGIN_TOLERANCE) || actualCost > joblinePrice * (1 + PRICE_PERCENT_MARGIN_TOLERANCE))) {
+                        actualCost = null //Blank it out if it's not likely.
+                    }
+                }
+            }
+
+            //If there's nothing, just fall back to seeing if there's a price object from textract. 
+
+            if (!actualPrice && textractLineItem.PRICE) {
+                actualPrice = textractLineItem.PRICE.value;
+            }
+            if (!actualCost && textractLineItem.PRICE) {
+                actualCost = textractLineItem.PRICE.value;
+            }
+
+            //If quantity greater than 1, check if the actual cost is a multiple of the actual price, if so, divide it out to get the unit price.
+            const quantity = parseInt(textractLineItem?.QUANTITY?.value);
+            if (quantity && quantity > 1) {
+                if (actualPrice && quantity && Math.abs((actualPrice / quantity) - (parseFloat(matchToUse?.item?.act_price) || 0)) / ((parseFloat(matchToUse?.item?.act_price) || 1)) < PRICE_QUANTITY_MARGIN_TOLERANCE) {
+                    actualPrice = actualPrice / quantity;
+                }
+                if (actualCost && quantity && Math.abs((actualCost / quantity) - (parseFloat(matchToUse?.item?.act_price) || 0)) / ((parseFloat(matchToUse?.item?.act_price) || 1)) < PRICE_QUANTITY_MARGIN_TOLERANCE) {
+                    actualCost = actualCost / quantity;
+                }
+            }
+
+
+            if (discountPercentageDecimal > 0) {
+                actualCost = actualCost * (1 - discountPercentageDecimal);
+            }
+
+            const responsibilityCenters = job.bodyshop.md_responsibility_centers
+            //TODO: Do we need to verify the lines to see if it is a unit price or total price (i.e. quantity * price)
+            const lineObject = {
+                "line_desc": matchToUse?.item?.line_desc || textractLineItem.ITEM?.value || "NO DESCRIPTION",
+                "quantity": textractLineItem.QUANTITY?.value,
+                "actual_price": normalizePrice(actualPrice),
+                "actual_cost": normalizePrice(actualCost),
+                "cost_center": matchToUse?.item?.part_type
+                    ? bodyshopHasDmsKey(job.bodyshop)
+                        ? matchToUse?.item?.part_type !== "PAE"
+                            ? matchToUse?.item?.part_type
+                            : null
+                        : responsibilityCenters.defaults &&
+                        (responsibilityCenters.defaults.costs[matchToUse?.item?.part_type] || null)
+                    : null,
+                "applicable_taxes": {
+                    "federal": InstanceManager({ imex: true, rome: false }),
+                    "state": false,
+                    "local": false
+                },
+                "joblineid": matchToUse?.item?.id || "noline",
+                "confidence": `T${overallConfidence} - O${ocrConfidence} - J${matchConfidence}`
+            }
+            return lineObject
+        })
+    }
+
+    return billFormData
+
+}
+
+function joblineFuzzySearch({ fuseToSearch, processedData }) {
+    const matches = []
+    const searchStats = []; // Track search statistics
+
+    processedData.lineItems.forEach((lineItem, lineIndex) => {
+        const lineStats = {
+            lineNumber: lineIndex + 1,
+            searches: []
+        };
+
+        // Refined ITEM search (multi-word description)
+        const refinedItemResults = (() => {
+            if (!lineItem.ITEM?.value) return [];
+
+            const itemValue = lineItem.ITEM.value;
+            const normalized = normalizeText(itemValue);
+
+            //  1: Full string search
+            const fullSearch = fuseToSearch.search(normalized);
+            lineStats.searches.push({ type: 'ITEM - Full String', term: normalized, results: fullSearch.length });
+
+            //  2: Search individual significant words (3+ chars)
+            const words = normalized.split(' ').filter(w => w.length >= 3);
+            const wordSearches = words.map(word => {
+                const results = fuseToSearch.search(word);
+                lineStats.searches.push({ type: 'ITEM - Individual Word', term: word, results: results.length });
+                return results;
+            });
+
+            //  3: Search without spaces entirely
+            const noSpaceSearch = fuseToSearch.search(normalized.replace(/\s+/g, ''));
+            lineStats.searches.push({ type: 'ITEM - No Spaces', term: normalized.replace(/\s+/g, ''), results: noSpaceSearch.length });
+
+            // Merge results with weights (full search weighted higher)
+            return mergeResults(
+                [fullSearch, ...wordSearches, noSpaceSearch],
+                [1.0, ...words.map(() => 1.5), 1.2] // Full search best, individual words penalized slightly
+            );
+        })();
+
+        // Refined PRODUCT_CODE search (part numbers)
+        const refinedProductCodeResults = (() => {
+            if (!lineItem.PRODUCT_CODE?.value) return [];
+
+            const productCode = lineItem.PRODUCT_CODE.value;
+            const normalized = normalizePartNumber(productCode);
+
+            //  1: Normalized search (no spaces/special chars)
+            const normalizedSearch = fuseToSearch.search(normalized);
+            lineStats.searches.push({ type: 'PRODUCT_CODE - Normalized', term: normalized, results: normalizedSearch.length });
+
+            //  2: Original with minimal cleaning
+            const minimalClean = productCode.replace(/\s+/g, '').toUpperCase();
+            const minimalSearch = fuseToSearch.search(minimalClean);
+            lineStats.searches.push({ type: 'PRODUCT_CODE - Minimal Clean', term: minimalClean, results: minimalSearch.length });
+
+            //  3: Search with dashes (common in part numbers)
+            const withDashes = productCode.replace(/[^a-zA-Z0-9-]/g, '').toUpperCase();
+            const dashSearch = fuseToSearch.search(withDashes);
+            lineStats.searches.push({ type: 'PRODUCT_CODE - With Dashes', term: withDashes, results: dashSearch.length });
+
+            //  4: Special chars to spaces (preserve word boundaries)
+            const specialCharsToSpaces = productCode.replace(/[^a-zA-Z0-9\s]/g, ' ').replace(/\s+/g, ' ').trim().toUpperCase();
+            const specialCharsSearch = fuseToSearch.search(specialCharsToSpaces);
+            lineStats.searches.push({ type: 'PRODUCT_CODE - Special Chars to Spaces', term: specialCharsToSpaces, results: specialCharsSearch.length });
+
+            return mergeResults(
+                [normalizedSearch, minimalSearch, dashSearch, specialCharsSearch],
+                [1.0, 1.1, 1.2, 1.15] // Prefer fully normalized, special chars to spaces slightly weighted
+            );
+        })();
+
+        // Refined PRICE search
+        const refinedPriceResults = (() => {
+            if (!lineItem.PRICE?.value) return [];
+
+            const price = normalizePrice(lineItem.PRICE.value);
+
+            //  1: Exact price match
+            const exactSearch = fuseToSearch.search(price);
+            lineStats.searches.push({ type: 'PRICE - Exact', term: price, results: exactSearch.length });
+
+            //  2: Price with 2 decimal places
+            const priceFloat = parseFloat(price);
+            if (!isNaN(priceFloat)) {
+                const formattedPrice = priceFloat.toFixed(2);
+                const formattedSearch = fuseToSearch.search(formattedPrice);
+                lineStats.searches.push({ type: 'PRICE - Formatted (2 decimals)', term: formattedPrice, results: formattedSearch.length });
+
+                return mergeResults([exactSearch, formattedSearch], [1.0, 1.1]);
+            }
+
+            return exactSearch;
+        })();
+
+        // Refined UNIT_PRICE search
+        const refinedUnitPriceResults = (() => {
+            if (!lineItem.UNIT_PRICE?.value) return [];
+
+            const unitPrice = normalizePrice(lineItem.UNIT_PRICE.value);
+
+            //  1: Exact price match
+            const exactSearch = fuseToSearch.search(unitPrice);
+            lineStats.searches.push({ type: 'UNIT_PRICE - Exact', term: unitPrice, results: exactSearch.length });
+
+            //  2: Price with 2 decimal places
+            const priceFloat = parseFloat(unitPrice);
+            if (!isNaN(priceFloat)) {
+                const formattedPrice = priceFloat.toFixed(2);
+                const formattedSearch = fuseToSearch.search(formattedPrice);
+                lineStats.searches.push({ type: 'UNIT_PRICE - Formatted (2 decimals)', term: formattedPrice, results: formattedSearch.length });
+
+                return mergeResults([exactSearch, formattedSearch], [1.0, 1.1]);
+            }
+
+            return exactSearch;
+        })();
+
+        //Merge them all together and sort by the highest scores.
+        const combinedScoreMap = new Map();
+
+        // Weight different field types differently
+        const fieldWeights = {
+            productCode: 5.0,  // Most important - part numbers should match
+            item: 3.0,         // Second most important - description
+            price: 1.0,        // Less important - prices can vary
+            unitPrice: 0.8     // Least important - similar to price
+        };
+
+        [
+            { results: refinedProductCodeResults, weight: fieldWeights.productCode, field: 'productCode' },
+            { results: refinedItemResults, weight: fieldWeights.item, field: 'item' },
+            { results: refinedPriceResults, weight: fieldWeights.price, field: 'price' },
+            { results: refinedUnitPriceResults, weight: fieldWeights.unitPrice, field: 'unitPrice' }
+        ].forEach(({ results, weight, field }) => {
+            results.forEach((result, index) => {
+                const id = result.item.id;
+
+                // Position bonus (first result is better than fifth)
+                const positionBonus = (5 - index) / 5;
+
+                // Lower score is better in Fuse.js, so invert it and apply weights
+                const normalizedScore = (1 - result.score) * weight * positionBonus;
+
+                if (!combinedScoreMap.has(id)) {
+                    combinedScoreMap.set(id, {
+                        item: result.item,
+                        score: normalizedScore,
+                        fieldMatches: [field],
+                        matchCount: result.count || 1
+                    });
+                } else {
+                    const existing = combinedScoreMap.get(id);
+                    existing.score += normalizedScore;
+                    existing.fieldMatches.push(field);
+                    existing.matchCount += (result.count || 1);
+                }
+            });
+        });
+
+        // Convert to array and sort by best combined score
+        const finalMatches = Array.from(combinedScoreMap.values())
+            .map(entry => {
+                // Apply penalty if item has no act_price or it's 0
+                const hasPriceData = entry.item.act_price && parseFloat(entry.item.act_price) > 0;
+                const priceDataPenalty = hasPriceData ? 1.0 : 0.5; // 50% penalty if no price
+
+                return {
+                    ...entry,
+                    // Boost score for items that matched in multiple fields, penalize for missing price
+                    finalScore: entry.score * (1 + (entry.fieldMatches.length * 0.2)) * priceDataPenalty,
+                    hasPriceData
+                };
+            })
+            .sort((a, b) => b.finalScore - a.finalScore)
+            .slice(0, 5);
+
+        // Always push the textract line item, even if no matches found
+        // This ensures all invoice lines are processed
+        matches.push({
+            matches: finalMatches,
+            textractLineItem: lineItem,
+            hasMatch: finalMatches.length > 0
+        });
+
+        searchStats.push(lineStats);
+
+    })
+
+    // // Output search statistics table
+    // console.log('\n═══════════════════════════════════════════════════════════════════════');
+    // console.log('                    FUSE.JS SEARCH STATISTICS');
+    // console.log('═══════════════════════════════════════════════════════════════════════\n');
+
+    // searchStats.forEach(lineStat => {
+    //     console.log(`📄 Line Item #${lineStat.lineNumber}:`);
+    //     console.log('─'.repeat(75));
+
+    //     if (lineStat.searches.length > 0) {
+    //         const tableData = lineStat.searches.map(search => ({
+    //             'Search Type': search.type,
+    //             'Search Term': search.term.substring(0, 40) + (search.term.length > 40 ? '...' : ''),
+    //             'Results': search.results
+    //         }));
+    //         console.table(tableData);
+    //     } else {
+    //         console.log('  No searches performed for this line item.\n');
+    //     }
+    // });
+
+    // // Summary statistics
+    // const totalSearches = searchStats.reduce((sum, stat) => sum + stat.searches.length, 0);
+    // const totalResults = searchStats.reduce((sum, stat) =>
+    //     sum + stat.searches.reduce((s, search) => s + search.results, 0), 0);
+    // const avgResultsPerSearch = totalSearches > 0 ? (totalResults / totalSearches).toFixed(2) : 0;
+
+    // console.log('═══════════════════════════════════════════════════════════════════════');
+    // console.log('                         SUMMARY');
+    // console.log('═══════════════════════════════════════════════════════════════════════');
+    // console.table({
+    //     'Total Line Items': processedData.lineItems.length,
+    //     'Total Searches Performed': totalSearches,
+    //     'Total Results Found': totalResults,
+    //     'Average Results per Search': avgResultsPerSearch
+    // });
+    // console.log('═══════════════════════════════════════════════════════════════════════\n');
+
+    return matches
+}
+
+const bodyshopHasDmsKey = (bodyshop) =>
+    bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || bodyshop.rr_dealerid;
+
+
+module.exports = {
+    generateBillFormData,
+    normalizePrice
+}

server/ai/bill-ocr/bill-ocr-helpers.js

@@ -0,0 +1,159 @@
+const PDFDocument = require('pdf-lib').PDFDocument;
+const logger = require("../../utils/logger");
+const TEXTRACT_REDIS_PREFIX = `textract:${process.env?.NODE_ENV}`
+const TEXTRACT_JOB_TTL = 10 * 60;
+
+
+/**
+ * Generate Redis key for Textract job using textract job ID
+ * @param {string} textractJobId 
+ * @returns {string}
+ */
+function getTextractJobKey(textractJobId) {
+    return `${TEXTRACT_REDIS_PREFIX}:${textractJobId}`;
+}
+
+
+/**
+ * Store Textract job data in Redis
+ * @param {string} textractJobId 
+ * @param {Object} redisPubClient
+ * @param {Object} jobData 
+ */
+async function setTextractJob({ redisPubClient, textractJobId, jobData }) {
+    if (!redisPubClient) {
+        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
+    }
+    const key = getTextractJobKey(textractJobId);
+    await redisPubClient.set(key, JSON.stringify(jobData));
+    await redisPubClient.expire(key, TEXTRACT_JOB_TTL);
+}
+
+/**
+ * Retrieve Textract job data from Redis
+ * @param {string} textractJobId 
+ * @param {Object} redisPubClient
+ * @returns {Promise<Object|null>}
+ */
+async function getTextractJob({ redisPubClient, textractJobId }) {
+    if (!redisPubClient) {
+        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
+    }
+    const key = getTextractJobKey(textractJobId);
+    const data = await redisPubClient.get(key);
+    return data ? JSON.parse(data) : null;
+}
+
+/**
+ * Detect file type based on MIME type and file signature
+ * @param {Object} file - Multer file object
+ * @returns {string} 'pdf', 'image', or 'unknown'
+ */
+function getFileType(file) {
+    // Check MIME type first
+    const mimeType = file.mimetype?.toLowerCase();
+
+    if (mimeType === 'application/pdf') {
+        return 'pdf';
+    }
+
+    if (mimeType && mimeType.startsWith('image/')) {
+        return 'image';
+    }
+
+    // Fallback: Check file signature (magic bytes)
+    const buffer = file.buffer;
+    if (buffer && buffer.length > 4) {
+        // PDF signature: %PDF
+        if (buffer[0] === 0x25 && buffer[1] === 0x50 && buffer[2] === 0x44 && buffer[3] === 0x46) {
+            return 'pdf';
+        }
+
+        // JPEG signature: FF D8 FF
+        if (buffer[0] === 0xFF && buffer[1] === 0xD8 && buffer[2] === 0xFF) {
+            return 'image';
+        }
+
+        // PNG signature: 89 50 4E 47
+        if (buffer[0] === 0x89 && buffer[1] === 0x50 && buffer[2] === 0x4E && buffer[3] === 0x47) {
+            return 'image';
+        }
+
+        // HEIC/HEIF: Check for ftyp followed by heic/heix/hevc/hevx
+        if (buffer.length > 12) {
+            const ftypIndex = buffer.indexOf(Buffer.from('ftyp'));
+            if (ftypIndex > 0 && ftypIndex < 12) {
+                const brand = buffer.slice(ftypIndex + 4, ftypIndex + 8).toString('ascii');
+                if (brand.startsWith('heic') || brand.startsWith('heix') ||
+                    brand.startsWith('hevc') || brand.startsWith('hevx') ||
+                    brand.startsWith('mif1')) {
+                    return 'image';
+                }
+            }
+        }
+    }
+
+    return 'unknown';
+}
+
+/**
+ * Get the number of pages in a PDF buffer
+ * @param {Buffer} pdfBuffer 
+ * @returns {Promise<number>}
+ */
+async function getPdfPageCount(pdfBuffer) {
+    try {
+        const pdfDoc = await PDFDocument.load(pdfBuffer);
+        return pdfDoc.getPageCount();
+    } catch (error) {
+        console.error('Error reading PDF page count:', error);
+        throw new Error('Failed to read PDF: ' + error.message);
+    }
+}
+
+/**
+ * Check if there are any jobs in IN_PROGRESS status
+ * @returns {Promise<boolean>}
+ */
+async function hasActiveJobs({ redisPubClient }) {
+    if (!redisPubClient) {
+        throw new Error('Redis client not initialized.');
+    }
+
+    try {
+        // Get all textract job keys
+        const pattern = `${TEXTRACT_REDIS_PREFIX}:*`;
+        const keys = await redisPubClient.keys(pattern);
+
+        if (!keys || keys.length === 0) {
+            return false;
+        }
+        //TODO: Is there a better way to do this that supports clusters? 
+        // Check if any job has IN_PROGRESS status
+        for (const key of keys) {
+            const data = await redisPubClient.get(key);
+            if (data) {
+                const jobData = JSON.parse(data);
+                if (jobData.status === 'IN_PROGRESS') {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    } catch (error) {
+        logger.log("bill-ocr-job-check-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+        return false;
+    }
+}
+
+module.exports = {
+    getTextractJobKey,
+    setTextractJob,
+    getTextractJob,
+    getFileType,
+    getPdfPageCount,
+    hasActiveJobs,
+    TEXTRACT_REDIS_PREFIX
+}
+

server/ai/bill-ocr/bill-ocr-normalize.js

@@ -0,0 +1,202 @@
+
+const MIN_CONFIDENCE_VALUE = 50
+
+function normalizeFieldName(fieldType) {
+    //Placeholder normalization for now. 
+    return fieldType;
+}
+
+const standardizedFieldsnames = {
+    actual_cost: "actual_cost",
+    actual_price: "actual_price",
+    line_desc: "line_desc",
+    quantity: "quantity",
+    part_no: "part_no",
+    ro_number: "ro_number",
+}
+
+function normalizeLabelName(labelText) {
+    if (!labelText) return '';
+
+    // Convert to lowercase and trim whitespace
+    let normalized = labelText.toLowerCase().trim();
+
+    // Remove special characters and replace spaces with underscores
+    normalized = normalized.replace(/[^a-z0-9\s]/g, '').replace(/\s+/g, '_');
+
+
+    // Common label normalizations
+    const labelMap = {
+        'qty': standardizedFieldsnames.quantity,
+        'qnty': standardizedFieldsnames.quantity,
+        'sale_qty': standardizedFieldsnames.quantity,
+        'invoiced_qty': standardizedFieldsnames.quantity,
+        'qty_shipped': standardizedFieldsnames.quantity,
+        'quantity': standardizedFieldsnames.quantity,
+        'filled': standardizedFieldsnames.quantity,
+        'count': standardizedFieldsnames.quantity,
+        'quant': standardizedFieldsnames.quantity,
+        'desc': standardizedFieldsnames.line_desc,
+        'description': standardizedFieldsnames.line_desc,
+        'item': standardizedFieldsnames.line_desc,
+        'part': standardizedFieldsnames.part_no,
+        'part_no': standardizedFieldsnames.part_no,
+        'part_num': standardizedFieldsnames.part_no,
+        'part_number': standardizedFieldsnames.part_no,
+        'item_no': standardizedFieldsnames.part_no,
+        'price': standardizedFieldsnames.actual_price,
+        //'amount': standardizedFieldsnames.actual_price,
+        'list_price': standardizedFieldsnames.actual_price,
+        'unit_price': standardizedFieldsnames.actual_price,
+        'list': standardizedFieldsnames.actual_price,
+        'retail_price': standardizedFieldsnames.actual_price,
+        'retail': standardizedFieldsnames.actual_price,
+        'net': standardizedFieldsnames.actual_cost,
+        'selling_price': standardizedFieldsnames.actual_cost,
+        'net_price': standardizedFieldsnames.actual_cost,
+        'net_cost': standardizedFieldsnames.actual_cost,
+        'total': standardizedFieldsnames.actual_cost,
+        'po_no': standardizedFieldsnames.ro_number,
+        'customer_po_no': standardizedFieldsnames.ro_number,
+        'customer_po_no_': standardizedFieldsnames.ro_number
+
+    };
+
+    return labelMap[normalized] || `NOT_MAPPED => ${normalized}`; // TODO: Should we monitor unmapped labels?
+}
+
+function processScanData(invoiceData) {
+    // Process and clean the extracted data
+    const processed = {
+        summary: {},
+        lineItems: []
+    };
+
+    // Clean summary fields
+    for (const [key, value] of Object.entries(invoiceData.summary)) {
+        if (value.confidence > MIN_CONFIDENCE_VALUE) { // Only include fields with > 50% confidence
+            processed.summary[key] = {
+                value: value.value,
+                label: value.label,
+                normalizedLabel: value.normalizedLabel,
+                confidence: value.confidence
+            };
+        }
+    }
+
+    // Process line items
+    processed.lineItems = invoiceData.lineItems
+        .map(item => {
+            const processedItem = {};
+
+            for (const [key, value] of Object.entries(item)) {
+                if (value.confidence > MIN_CONFIDENCE_VALUE) { // Only include fields with > 50% confidence
+                    let cleanValue = value.value;
+
+                    // Parse numbers for quantity and price fields
+                    if (key === 'quantity') {
+                        cleanValue = parseFloat(cleanValue) || 0;
+                    } else if (key === 'retail_price' || key === 'actual_price') {
+                        // Remove currency symbols and parse
+                        cleanValue = parseFloat(cleanValue.replace(/[^0-9.-]/g, '')) || 0;
+                    }
+
+                    processedItem[key] = {
+                        value: cleanValue,
+                        label: value.label,
+                        normalizedLabel: value.normalizedLabel,
+                        confidence: value.confidence
+                    };
+                }
+            }
+
+            return processedItem;
+        })
+
+    return processed;
+}
+
+function extractInvoiceData(textractResponse) {
+    const invoiceData = {
+        summary: {},
+        lineItems: []
+    };
+
+    if (!textractResponse.ExpenseDocuments || textractResponse.ExpenseDocuments.length === 0) {
+        return invoiceData;
+    }
+
+    // Process each page of the invoice
+    textractResponse.ExpenseDocuments.forEach(expenseDoc => {
+        // Extract summary fields (vendor, invoice number, date, total, etc.)
+        if (expenseDoc.SummaryFields) {
+            expenseDoc.SummaryFields.forEach(field => {
+                const fieldType = field.Type?.Text || '';
+                const fieldValue = field.ValueDetection?.Text || '';
+                const fieldLabel = field.LabelDetection?.Text || '';
+                const confidence = field.ValueDetection?.Confidence || 0;
+
+                // Map common invoice fields
+                if (fieldType && fieldValue) {
+                    invoiceData.summary[fieldType] = {
+                        value: fieldValue,
+                        label: fieldLabel,
+                        normalizedLabel: normalizeLabelName(fieldLabel),
+                        confidence: confidence
+                    };
+                }
+            });
+        }
+
+        // Extract line items
+        if (expenseDoc.LineItemGroups) {
+            expenseDoc.LineItemGroups.forEach(lineItemGroup => {
+                if (lineItemGroup.LineItems) {
+                    lineItemGroup.LineItems.forEach(lineItem => {
+                        const item = {};
+                        const fieldNameCounts = {}; // Track field name occurrences
+
+                        if (lineItem.LineItemExpenseFields) {
+                            lineItem.LineItemExpenseFields.forEach(field => {
+                                const fieldType = field.Type?.Text || '';
+                                const fieldValue = field.ValueDetection?.Text || '';
+                                const fieldLabel = field.LabelDetection?.Text || '';
+                                const confidence = field.ValueDetection?.Confidence || 0;
+
+                                if (fieldType && fieldValue) {
+                                    // Normalize field names
+                                    let normalizedField = normalizeFieldName(fieldType);
+
+                                    // Ensure uniqueness by appending a counter if the field already exists
+                                    if (Object.prototype.hasOwnProperty.call(item, normalizedField)) {
+                                        fieldNameCounts[normalizedField] = (fieldNameCounts[normalizedField] || 1) + 1;
+                                        normalizedField = `${normalizedField}_${fieldNameCounts[normalizedField]}`;
+                                    }
+
+                                    item[normalizedField] = {
+                                        value: fieldValue,
+                                        label: fieldLabel,
+                                        normalizedLabel: normalizeLabelName(fieldLabel),
+                                        confidence: confidence
+                                    };
+                                }
+                            });
+                        }
+
+                        if (Object.keys(item).length > 0) {
+                            invoiceData.lineItems.push(item);
+                        }
+                    });
+                }
+            });
+        }
+    });
+
+    return invoiceData;
+}
+
+module.exports = {
+    extractInvoiceData,
+    processScanData,
+    standardizedFieldsnames
+}

server/ai/bill-ocr/bill-ocr-readme.md

@@ -0,0 +1,8 @@
+Required Infrastructure setup
+1. Create an AI user that has access to the required S3 buckets and textract permissions.
+2. Had to create a queue and SNS topic. had to also create the role that had `sns:Publish`. Had to add `sqs:ReceiveMessage` and `sqs:DeleteMessage` to the profile.
+3. Created 2 roles for SNS. The textract role is the right one, the other was created manually based on incorrect instructions. 
+
+TODO:
+* Create a rome bucket for uploads, or move to the regular spot.
+* Add environment variables.

server/ai/bill-ocr/bill-ocr.js

@@ -0,0 +1,465 @@
+const { TextractClient, StartExpenseAnalysisCommand, GetExpenseAnalysisCommand, AnalyzeExpenseCommand } = require("@aws-sdk/client-textract");
+const { S3Client, PutObjectCommand } = require("@aws-sdk/client-s3");
+const { SQSClient, ReceiveMessageCommand, DeleteMessageCommand } = require("@aws-sdk/client-sqs");
+const { v4: uuidv4 } = require('uuid');
+const { getTextractJobKey, setTextractJob, getTextractJob, getFileType, getPdfPageCount, hasActiveJobs } = require("./bill-ocr-helpers");
+const { extractInvoiceData, processScanData } = require("./bill-ocr-normalize");
+const { generateBillFormData } = require("./bill-ocr-generator");
+const logger = require("../../utils/logger");
+const _ = require("lodash");
+
+// Initialize AWS clients
+const awsConfig = {
+    region: process.env.AWS_AI_REGION || "ca-central-1",
+    credentials: {
+        accessKeyId: process.env.AWS_AI_ACCESS_KEY_ID,
+        secretAccessKey: process.env.AWS_AI_SECRET_ACCESS_KEY,
+    }
+};
+
+const textractClient = new TextractClient(awsConfig);
+const s3Client = new S3Client(awsConfig);
+const sqsClient = new SQSClient(awsConfig);
+
+let redisPubClient = null;
+
+
+/**
+ * Initialize the bill-ocr module with Redis client
+ * @param {Object} pubClient - Redis cluster client
+ */
+function initializeBillOcr(pubClient) {
+    redisPubClient = pubClient;
+}
+
+/**
+ * Check if job exists by Textract job ID
+ * @param {string} textractJobId 
+ * @returns {Promise<boolean>}
+ */
+async function jobExists(textractJobId) {
+    if (!redisPubClient) {
+        throw new Error('Redis client not initialized. Call initializeBillOcr first.');
+    }
+    const key = getTextractJobKey(textractJobId);
+    const exists = await redisPubClient.exists(key);
+
+    if (exists) {
+        return true;
+    }
+    return false;
+}
+
+async function handleBillOcr(req, res) {
+    // Check if file was uploaded
+    if (!req.file) {
+        return res.status(400).send({ error: 'No file uploaded.' });
+    }
+
+    // The uploaded file is available in request file
+    const uploadedFile = req.file;
+    const { jobid, bodyshopid, partsorderid } = req.body;
+    logger.log("bill-ocr-start", "DEBUG", req.user.email, jobid, null);
+
+    try {
+        const fileType = getFileType(uploadedFile);
+        // Images are always processed synchronously (single page)
+        if (fileType === 'image') {
+            const processedData = await processSinglePageDocument(uploadedFile.buffer);
+            const billForm = await generateBillFormData({ processedData: processedData, jobid, bodyshopid, partsorderid, req: req });
+            logger.log("bill-ocr-single-complete", "DEBUG", req.user.email, jobid, { ..._.omit(processedData, "originalTextractResponse"), billForm });
+
+            return res.status(200).json({
+                success: true,
+                status: 'COMPLETED',
+                data: { ...processedData, billForm },
+                message: 'Invoice processing completed'
+            });
+        } else if (fileType === 'pdf') {
+            // Check the number of pages in the PDF
+            const pageCount = await getPdfPageCount(uploadedFile.buffer);
+
+            if (pageCount === 1) {
+                // Process synchronously for single-page documents
+                const processedData = await processSinglePageDocument(uploadedFile.buffer);
+                const billForm = await generateBillFormData({ processedData: processedData, jobid, bodyshopid, partsorderid, req: req });
+                logger.log("bill-ocr-single-complete", "DEBUG", req.user.email, jobid, { ..._.omit(processedData, "originalTextractResponse"), billForm });
+                return res.status(200).json({
+                    success: true,
+                    status: 'COMPLETED',
+                    data: { ...processedData, billForm },
+                    message: 'Invoice processing completed'
+                });
+            }
+            // Start the Textract job (non-blocking) for multi-page documents
+            const jobInfo = await startTextractJob(uploadedFile.buffer, { jobid, bodyshopid, partsorderid });
+            logger.log("bill-ocr-multipage-start", "DEBUG", req.user.email, jobid, jobInfo);
+
+            return res.status(202).json({
+                success: true,
+                textractJobId: jobInfo.jobId,
+                message: 'Invoice processing started',
+                statusUrl: `/ai/bill-ocr/status/${jobInfo.jobId}`
+            });
+
+        } else {
+            logger.log("bill-ocr-unsupported-filetype", "WARN", req.user.email, jobid, { fileType });
+
+            return res.status(400).json({
+                error: 'Unsupported file type',
+                message: 'Please upload a PDF or supported image file (JPEG, PNG, TIFF)'
+            });
+        }
+    } catch (error) {
+        logger.log("bill-ocr-error", "ERROR", req.user.email, jobid, { error: error.message, stack: error.stack });
+        return res.status(500).json({
+            error: 'Failed to start invoice processing',
+            message: error.message
+        });
+    }
+}
+
+async function handleBillOcrStatus(req, res) {
+    const { textractJobId } = req.params;
+
+    if (!textractJobId) {
+        logger.log("bill-ocr-status-error", "WARN", req.user.email, null, { error: 'No textractJobId found in params' });
+        return res.status(400).json({ error: 'Job ID is required' });
+
+    }
+    const jobStatus = await getTextractJob({ redisPubClient, textractJobId });
+
+    if (!jobStatus) {
+        return res.status(404).json({ error: 'Job not found' });
+    }
+
+    if (jobStatus.status === 'COMPLETED') {
+        // Generate billForm on-demand if not already generated
+        let billForm = jobStatus.data?.billForm;
+
+        if (!billForm && jobStatus.context) {
+            try {
+                billForm = await generateBillFormData({
+                    processedData: jobStatus.data,
+                    jobid: jobStatus.context.jobid,
+                    bodyshopid: jobStatus.context.bodyshopid,
+                    partsorderid: jobStatus.context.partsorderid,
+                    req: req // Now we have request context!
+                });
+                logger.log("bill-ocr-multipage-complete", "DEBUG", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, billForm });
+
+                // Cache the billForm back to Redis for future requests
+                await setTextractJob({
+                    redisPubClient,
+                    textractJobId,
+                    jobData: {
+                        ...jobStatus,
+                        data: {
+                            ...jobStatus.data,
+                            billForm
+                        }
+                    }
+                });
+            } catch (error) {
+                logger.log("bill-ocr-multipage-error", "ERROR", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, error: error.message, stack: error.stack });
+
+                return res.status(500).send({
+                    status: 'COMPLETED',
+                    error: 'Data processed but failed to generate bill form',
+                    message: error.message,
+                    data: jobStatus.data // Still return the raw processed data
+                });
+
+            }
+        }
+
+        return res.status(200).send({
+            status: 'COMPLETED',
+            data: {
+                ...jobStatus.data,
+                billForm
+            }
+        });
+    } else if (jobStatus.status === 'FAILED') {
+        logger.log("bill-ocr-multipage-failed", "ERROR", req.user.email, jobStatus.context.jobid, { ...jobStatus.data, error: jobStatus.error, });
+
+        return res.status(500).json({
+            status: 'FAILED',
+            error: jobStatus.error
+        });
+    } else {
+        return res.status(200).json({
+            status: jobStatus.status
+        });
+    }
+}
+
+/**
+ * Process a single-page document synchronously using AnalyzeExpenseCommand
+ * @param {Buffer} pdfBuffer 
+ * @returns {Promise<Object>}
+ */
+async function processSinglePageDocument(pdfBuffer) {
+    const analyzeCommand = new AnalyzeExpenseCommand({
+        Document: {
+            Bytes: pdfBuffer
+        }
+    });
+
+    const result = await textractClient.send(analyzeCommand);
+    const invoiceData = extractInvoiceData(result);
+    const processedData = processScanData(invoiceData);
+
+    return {
+        ...processedData,
+        originalTextractResponse: result
+    };
+}
+
+async function startTextractJob(pdfBuffer, context = {}) {
+    // Upload PDF to S3 temporarily for Textract async processing
+    const { bodyshopid, jobid } = context;
+    const s3Bucket = process.env.AWS_AI_BUCKET;
+    const snsTopicArn = process.env.AWS_TEXTRACT_SNS_TOPIC_ARN;
+    const snsRoleArn = process.env.AWS_TEXTRACT_SNS_ROLE_ARN;
+
+    if (!s3Bucket) {
+        throw new Error('AWS_AI_BUCKET environment variable is required');
+    }
+    if (!snsTopicArn) {
+        throw new Error('AWS_TEXTRACT_SNS_TOPIC_ARN environment variable is required');
+    }
+    if (!snsRoleArn) {
+        throw new Error('AWS_TEXTRACT_SNS_ROLE_ARN environment variable is required');
+    }
+
+    const uploadId = uuidv4();
+    const s3Key = `textract-temp/${bodyshopid}/${jobid}/${uploadId}.pdf`; //TODO Update Keys structure to something better. 
+
+    // Upload to S3
+    const uploadCommand = new PutObjectCommand({
+        Bucket: s3Bucket,
+        Key: s3Key,
+        Body: pdfBuffer,
+        ContentType: 'application/pdf' //Hard coded - we only support PDFs for multi-page
+    });
+    await s3Client.send(uploadCommand);
+
+    // Start async Textract expense analysis with SNS notification
+    const startCommand = new StartExpenseAnalysisCommand({
+        DocumentLocation: {
+            S3Object: {
+                Bucket: s3Bucket,
+                Name: s3Key
+            }
+        },
+        NotificationChannel: {
+            SNSTopicArn: snsTopicArn,
+            RoleArn: snsRoleArn
+        },
+        ClientRequestToken: uploadId
+    });
+
+    const startResult = await textractClient.send(startCommand);
+    const textractJobId = startResult.JobId;
+
+    // Store job info in Redis using textractJobId as the key
+    await setTextractJob(
+        {
+            redisPubClient,
+            textractJobId,
+            jobData: {
+                status: 'IN_PROGRESS',
+                s3Key: s3Key,
+                uploadId: uploadId,
+                startedAt: new Date().toISOString(),
+                context: context // Store the context for later use
+            }
+        }
+    );
+
+    return {
+        jobId: textractJobId
+    };
+}
+
+// Process SQS messages from Textract completion notifications
+async function processSQSMessages() {
+    const queueUrl = process.env.AWS_TEXTRACT_SQS_QUEUE_URL;
+
+    if (!queueUrl) {
+        logger.log("bill-ocr-error", "ERROR", "api", null, { message: "AWS_TEXTRACT_SQS_QUEUE_URL not configured" });
+        return;
+    }
+
+    // Only poll if there are active mutli page jobs in progress
+    const hasActive = await hasActiveJobs({ redisPubClient });
+    if (!hasActive) {
+        return;
+    }
+
+    try {
+        const receiveCommand = new ReceiveMessageCommand({
+            QueueUrl: queueUrl,
+            MaxNumberOfMessages: 10,
+            WaitTimeSeconds: 20,
+            MessageAttributeNames: ['All']
+        });
+
+        const result = await sqsClient.send(receiveCommand);
+
+        if (result.Messages && result.Messages.length > 0) {
+            logger.log("bill-ocr-sqs-processing", "DEBUG", "api", null, { message: `Processing ${result.Messages.length} messages from SQS` });
+            for (const message of result.Messages) {
+                try {
+                    // Environment-level filtering: check if this message belongs to this environment
+                    const shouldProcess = await shouldProcessMessage(message);
+
+                    if (shouldProcess) {
+                        await handleTextractNotification(message);
+                        // Delete message after successful processing
+                        const deleteCommand = new DeleteMessageCommand({
+                            QueueUrl: queueUrl,
+                            ReceiptHandle: message.ReceiptHandle
+                        });
+                        await sqsClient.send(deleteCommand);
+                    }
+                } catch (error) {
+
+                    logger.log("bill-ocr-sqs-processing-error", "ERROR", "api", null, { message, error: error.message, stack: error.stack });
+
+                }
+            }
+        }
+    } catch (error) {
+        logger.log("bill-ocr-sqs-receiving-error", "ERROR", "api", null, { error: error.message, stack: error.stack });
+    }
+}
+
+/**
+ * Check if a message should be processed by this environment
+ * @param {Object} message - SQS message
+ * @returns {Promise<boolean>}
+ */
+async function shouldProcessMessage(message) {
+    try {
+        const body = JSON.parse(message.Body);
+        const snsMessage = JSON.parse(body.Message);
+        const textractJobId = snsMessage.JobId;
+
+        // Check if job exists in Redis for this environment (using environment-specific prefix)
+        const exists = await jobExists(textractJobId);
+        return exists;
+    } catch (error) {
+        logger.log("bill-ocr-message-check-error", "DEBUG", "api", null, { message: "Error checking if message should be processed", error: error.message, stack: error.stack });
+        // If we can't parse the message, don't process it
+        return false;
+    }
+}
+
+async function handleTextractNotification(message) {
+    const body = JSON.parse(message.Body);
+    let snsMessage
+    try {
+        snsMessage = JSON.parse(body.Message);
+    } catch (error) {
+        logger.log("bill-ocr-handle-textract-error", "DEBUG", "api", null, { message: "Error parsing SNS message - invalid message format.", error: error.message, stack: error.stack, body });
+        return;
+    }
+
+    const textractJobId = snsMessage.JobId;
+    const status = snsMessage.Status;
+
+    // Get job info from Redis
+    const jobInfo = await getTextractJob({ redisPubClient, textractJobId });
+
+    if (!jobInfo) {
+        logger.log("bill-ocr-job-not-found", "DEBUG", "api", null, { message: `Job info not found in Redis for Textract job ID: ${textractJobId}`, textractJobId, snsMessage });
+        return;
+    }
+
+    if (status === 'SUCCEEDED') {
+        // Retrieve the results
+        const { processedData, originalResponse } = await retrieveTextractResults(textractJobId);
+
+        // Store the processed data - billForm will be generated on-demand in the status endpoint
+        await setTextractJob(
+            {
+                redisPubClient,
+                textractJobId,
+                jobData: {
+                    ...jobInfo,
+                    status: 'COMPLETED',
+                    data: {
+                        ...processedData,
+                        originalTextractResponse: originalResponse
+                    },
+                    completedAt: new Date().toISOString()
+                }
+            }
+        );
+    } else if (status === 'FAILED') {
+        await setTextractJob(
+            {
+                redisPubClient,
+                textractJobId,
+                jobData: {
+                    ...jobInfo,
+                    status: 'FAILED',
+                    error: snsMessage.StatusMessage || 'Textract job failed',
+                    completedAt: new Date().toISOString()
+                }
+            }
+        );
+    }
+}
+
+async function retrieveTextractResults(textractJobId) {
+    // Handle pagination if there are multiple pages of results
+    let allExpenseDocuments = [];
+    let nextToken = null;
+
+    do {
+        const getCommand = new GetExpenseAnalysisCommand({
+            JobId: textractJobId,
+            NextToken: nextToken
+        });
+
+        const result = await textractClient.send(getCommand);
+
+        if (result.ExpenseDocuments) {
+            allExpenseDocuments = allExpenseDocuments.concat(result.ExpenseDocuments);
+        }
+
+        nextToken = result.NextToken;
+    } while (nextToken);
+
+    // Store the complete original response
+    const fullTextractResponse = { ExpenseDocuments: allExpenseDocuments };
+
+    // Extract invoice data from Textract response
+    const invoiceData = extractInvoiceData(fullTextractResponse);
+
+    return {
+        processedData: processScanData(invoiceData),
+        originalResponse: fullTextractResponse
+    };
+}
+
+// Start SQS polling (call this when server starts)
+function startSQSPolling() {
+    const pollInterval = setInterval(() => {
+        processSQSMessages().catch(error => {
+            logger.log("bill-ocr-sqs-poll-error", "ERROR", "api", null, { message: error.message, stack: error.stack });
+        });
+    }, 10000); // Poll every 10 seconds
+    return pollInterval;
+}
+
+
+module.exports = {
+    initializeBillOcr,
+    handleBillOcr,
+    handleBillOcrStatus,
+    startSQSPolling
+};  

server/chatter/chatter-client.js

@@ -0,0 +1,139 @@
+const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
+const { defaultProvider } = require("@aws-sdk/credential-provider-node");
+const { isString, isEmpty } = require("lodash");
+
+const CHATTER_BASE_URL = process.env.CHATTER_API_BASE_URL || "https://api.chatterresearch.com";
+const AWS_REGION = process.env.AWS_REGION || "ca-central-1";
+
+// Configure SecretsManager client with localstack support
+const secretsClientOptions = {
+  region: AWS_REGION,
+  credentials: defaultProvider()
+};
+
+const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
+
+if (isLocal) {
+  secretsClientOptions.endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:4566`;
+}
+
+const secretsClient = new SecretsManagerClient(secretsClientOptions);
+
+/**
+ * Chatter API Client for making requests to the Chatter API
+ */
+class ChatterApiClient {
+  constructor({ baseUrl, apiToken }) {
+    if (!apiToken) throw new Error("ChatterApiClient requires apiToken");
+    this.baseUrl = String(baseUrl || "").replace(/\/+$/, "");
+    this.apiToken = apiToken;
+  }
+
+  async createLocation(companyId, payload) {
+    return this.request(`/api/v1/companies/${companyId}/locations`, {
+      method: "POST",
+      body: payload
+    });
+  }
+
+  async postInteraction(companyId, payload) {
+    return this.request(`/api/v1/companies/${companyId}/solicitation/interaction`, {
+      method: "POST",
+      body: payload
+    });
+  }
+
+  async request(path, { method = "GET", body } = {}) {
+    const res = await fetch(this.baseUrl + path, {
+      method,
+      headers: {
+        "Api-Token": this.apiToken,
+        Accept: "application/json",
+        ...(body ? { "Content-Type": "application/json" } : {})
+      },
+      body: body ? JSON.stringify(body) : undefined
+    });
+
+    const text = await res.text();
+    const data = text ? safeJson(text) : null;
+
+    if (!res.ok) {
+      const err = new Error(`Chatter API error ${res.status} | ${data?.message}`);
+      err.status = res.status;
+      err.data = data;
+      const retryAfterMs = parseRetryAfterMs(res.headers.get("retry-after"));
+      if (retryAfterMs != null) err.retryAfterMs = retryAfterMs;
+      throw err;
+    }
+    return data;
+  }
+}
+
+/**
+ * Safely parse JSON, returning original text if parsing fails
+ */
+function safeJson(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return text;
+  }
+}
+
+function parseRetryAfterMs(value) {
+  if (!value) return null;
+
+  const sec = Number(value);
+  if (Number.isFinite(sec) && sec >= 0) return Math.ceil(sec * 1000);
+
+  const dateMs = Date.parse(value);
+  if (!Number.isFinite(dateMs)) return null;
+  return Math.max(0, dateMs - Date.now());
+}
+
+/**
+ * Fetches Chatter API token from AWS Secrets Manager
+ * SecretId format: CHATTER_COMPANY_KEY_<companyId>
+ *
+ * @param {string|number} companyId - The company ID
+ * @returns {Promise<string>} The API token
+ */
+async function getChatterApiToken(companyId) {
+  const key = String(companyId ?? "").trim();
+  if (!key) throw new Error("getChatterApiToken: companyId is required");
+
+  // Optional override for development/testing
+  if (process.env.CHATTER_API_TOKEN) return process.env.CHATTER_API_TOKEN;
+
+  const secretId = `CHATTER_COMPANY_KEY_${key}`;
+  const command = new GetSecretValueCommand({ SecretId: secretId });
+  const { SecretString, SecretBinary } = await secretsClient.send(command);
+
+  const token =
+    (SecretString && SecretString.trim()) ||
+    (SecretBinary && Buffer.from(SecretBinary, "base64").toString("ascii").trim()) ||
+    "";
+
+  if (!token) throw new Error(`Chatter API token secret is empty: ${secretId}`);
+  return token;
+}
+
+/**
+ * Creates a Chatter API client instance
+ *
+ * @param {string|number} companyId - The company ID
+ * @param {string} [baseUrl] - Optional base URL override
+ * @returns {Promise<ChatterApiClient>} Configured API client
+ */
+async function createChatterClient(companyId, baseUrl = CHATTER_BASE_URL) {
+  const apiToken = await getChatterApiToken(companyId);
+  return new ChatterApiClient({ baseUrl, apiToken });
+}
+
+module.exports = {
+  ChatterApiClient,
+  getChatterApiToken,
+  createChatterClient,
+  safeJson,
+  CHATTER_BASE_URL
+};

server/chatter/createLocation.js

@@ -0,0 +1,123 @@
+const DEFAULT_COMPANY_ID = process.env.CHATTER_DEFAULT_COMPANY_ID;
+const client = require("../graphql-client/graphql-client").client;
+const { createChatterClient } = require("./chatter-client");
+const InstanceManager = require("../utils/instanceMgr").default;
+
+const GET_BODYSHOP_FOR_CHATTER = `
+  query GET_BODYSHOP_FOR_CHATTER($id: uuid!) {
+    bodyshops_by_pk(id: $id) {
+      id
+      shopname
+      address1
+      city
+      state
+      zip_post
+      imexshopid
+      chatterid
+      chatter_company_id
+    }
+  }
+`;
+
+const UPDATE_BODYSHOP_CHATTER_FIELDS = `
+  mutation UPDATE_BODYSHOP_CHATTER_FIELDS($id: uuid!, $chatter_company_id: String!, $chatterid: String!) {
+    update_bodyshops_by_pk(pk_columns: {id: $id}, _set: {chatter_company_id: $chatter_company_id, chatterid: $chatterid}) {
+      id
+      chatter_company_id
+      chatterid
+    }
+  }
+`;
+
+const createLocation = async (req, res) => {
+  const { logger } = req;
+  const { bodyshopID, googlePlaceID } = req.body;
+
+  console.dir({ body: req.body });
+
+  if (!DEFAULT_COMPANY_ID) {
+    logger.log("chatter-create-location-no-default-company", "warn", null, null, { bodyshopID });
+    return res.json({ success: false, message: "No default company set" });
+  }
+
+  if (!googlePlaceID) {
+    logger.log("chatter-create-location-no-google-place-id", "warn", null, null, { bodyshopID });
+    return res.json({ success: false, message: "No google place id provided" });
+  }
+
+  if (!bodyshopID) {
+    logger.log("chatter-create-location-invalid-bodyshop", "warn", null, null, { bodyshopID });
+    return res.json({ success: false, message: "No bodyshop id" });
+  }
+
+  try {
+    const { bodyshops_by_pk: bodyshop } = await client.request(GET_BODYSHOP_FOR_CHATTER, { id: bodyshopID });
+
+    if (!bodyshop) {
+      logger.log("chatter-create-location-bodyshop-not-found", "warn", null, null, { bodyshopID });
+      return res.json({ success: false, message: "Bodyshop not found" });
+    }
+
+    if (bodyshop.chatter_company_id && bodyshop.chatterid) {
+      logger.log("chatter-create-location-already-exists", "warn", null, null, {
+        bodyshopID
+      });
+      return res.json({ success: false, message: "This Bodyshop already has a location associated with it" });
+    }
+
+    const chatterApi = await createChatterClient(DEFAULT_COMPANY_ID);
+
+    const locationIdentifier = `${DEFAULT_COMPANY_ID}-${bodyshop.id}`;
+
+    const locationPayload = {
+      name: bodyshop.shopname,
+      locationIdentifier: locationIdentifier,
+      address: bodyshop.address1,
+      postalCode: bodyshop.zip_post,
+      state: bodyshop.state,
+      city: bodyshop.city,
+      country: InstanceManager({ imex: "Canada", rome: "US" }),
+      googlePlaceId: googlePlaceID,
+      status: "active"
+    };
+
+    logger.log("chatter-create-location-calling-api", "info", null, null, { bodyshopID, locationIdentifier });
+
+    const response = await chatterApi.createLocation(DEFAULT_COMPANY_ID, locationPayload);
+
+    if (!response.location?.id) {
+      logger.log("chatter-create-location-no-location-id", "error", null, null, { bodyshopID, response });
+      return res.json({ success: false, message: "No location ID in response", data: response });
+    }
+
+    await client.request(UPDATE_BODYSHOP_CHATTER_FIELDS, {
+      id: bodyshopID,
+      chatter_company_id: DEFAULT_COMPANY_ID,
+      chatterid: String(response.location.id)
+    });
+
+    logger.log("chatter-create-location-success", "info", null, null, {
+      bodyshopID,
+      chatter_company_id: DEFAULT_COMPANY_ID,
+      chatterid: response.location.id,
+      locationIdentifier
+    });
+
+    return res.json({ success: true, data: response });
+  } catch (error) {
+    logger.log("chatter-create-location-error", "error", null, null, {
+      bodyshopID,
+      error: error.message,
+      status: error.status,
+      data: error.data
+    });
+
+    return res.json({
+      success: false,
+      message: error.message || "Failed to create location",
+      error: error.data
+    });
+  }
+};
+
+module.exports = createLocation;

server/data/autohouse.js

@@ -221,6 +221,8 @@ const CreateRepairOrderTag = (job, errorCallback) => {
 
   const repairCosts = CreateCosts(job);
 
+  const LaborDetailLines = generateLaborLines(job.timetickets);
+
   //Calculate detail only lines.
   const detailAdjustments = job.joblines
     .filter((jl) => jl.ah_detail_line && jl.mod_lbr_ty)
@@ -606,12 +608,14 @@ const CreateRepairOrderTag = (job, errorCallback) => {
         // CSIID: null,
         InsGroupCode: null
       },
-
       DetailLines: {
         DetailLine:
           job.joblines.length > 0
             ? job.joblines.map((jl) => GenerateDetailLines(job, jl, job.bodyshop.md_order_statuses))
             : [generateNullDetailLine()]
+      },
+      LaborDetailLines: {
+        LaborDetailLine: LaborDetailLines
       }
     };
     return ret;
@@ -787,6 +791,76 @@ const CreateCosts = (job) => {
   };
 };
 
+const generateLaborLines = (timetickets) => {
+  if (!timetickets || timetickets.length === 0) return [];
+
+  const codeToProps = {
+    LAB: { actual: "LaborBodyActualHours", flag: "LaborBodyFlagHours", cost: "LaborBodyCost" },
+    LAM: { actual: "LaborMechanicalActualHours", flag: "LaborMechanicalFlagHours", cost: "LaborMechanicalCost" },
+    LAG: { actual: "LaborGlassActualHours", flag: "LaborGlassFlagHours", cost: "LaborGlassCost" },
+    LAS: { actual: "LaborStructuralActualHours", flag: "LaborStructuralFlagHours", cost: "LaborStructuralCost" },
+    LAE: { actual: "LaborElectricalActualHours", flag: "LaborElectricalFlagHours", cost: "LaborElectricalCost" },
+    LAA: { actual: "LaborAluminumActualHours", flag: "LaborAluminumFlagHours", cost: "LaborAluminumCost" },
+    LAR: { actual: "LaborRefinishActualHours", flag: "LaborRefinishFlagHours", cost: "LaborRefinishCost" },
+    LAU: { actual: "LaborDetailActualHours", flag: "LaborDetailFlagHours", cost: "LaborDetailCost" },
+    LA1: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA2: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA3: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" },
+    LA4: { actual: "LaborOtherActualHours", flag: "LaborOtherFlagHours", cost: "LaborOtherCost" }
+  };
+
+  return timetickets.map((ticket, idx) => {
+    const { ciecacode, employee, actualhrs = 0, productivehrs = 0, rate = 0 } = ticket;
+    const isFlatRate = employee?.flat_rate;
+    const hours = isFlatRate ? productivehrs : actualhrs;
+    const cost = rate * hours;
+
+    const laborDetail = {
+      LaborDetailLineNumber: idx + 1,
+      TechnicianNameFirst: employee?.first_name || "",
+      TechnicianNameLast: employee?.last_name || "",
+      LaborBodyActualHours: 0,
+      LaborMechanicalActualHours: 0,
+      LaborGlassActualHours: 0,
+      LaborStructuralActualHours: 0,
+      LaborElectricalActualHours: 0,
+      LaborAluminumActualHours: 0,
+      LaborRefinishActualHours: 0,
+      LaborDetailActualHours: 0,
+      LaborOtherActualHours: 0,
+      LaborBodyFlagHours: 0,
+      LaborMechanicalFlagHours: 0,
+      LaborGlassFlagHours: 0,
+      LaborStructuralFlagHours: 0,
+      LaborElectricalFlagHours: 0,
+      LaborAluminumFlagHours: 0,
+      LaborRefinishFlagHours: 0,
+      LaborDetailFlagHours: 0,
+      LaborOtherFlagHours: 0,
+      LaborBodyCost: 0,
+      LaborMechanicalCost: 0,
+      LaborGlassCost: 0,
+      LaborStructuralCost: 0,
+      LaborElectricalCost: 0,
+      LaborAluminumCost: 0,
+      LaborRefinishCost: 0,
+      LaborDetailCost: 0,
+      LaborOtherCost: 0
+    };
+
+    const effectiveCiecacode = ciecacode || "LA4";
+
+    if (codeToProps[effectiveCiecacode]) {
+      const { actual, flag, cost: costProp } = codeToProps[effectiveCiecacode];
+      laborDetail[actual] = actualhrs;
+      laborDetail[flag] = productivehrs;
+      laborDetail[costProp] = cost;
+    }
+
+    return laborDetail;
+  });
+};
+
 const StatusMapping = (status, md_ro_statuses) => {
   //Possible return statuses EST, SCH, ARR, IPR, RDY, DEL, CLO, CAN, UNDEFINED.
   const {

server/data/chatter-api.js

@@ -0,0 +1,554 @@
+/**
+ * Environment variables used by this file
+ * Chatter integration
+ * - CHATTER_API_CONCURRENCY
+ *   - Maximum number of jobs/interactions posted concurrently *per shop* (within a single shop's batch).
+ *   - Default: 5
+ *   - Used by: createConcurrencyLimit(MAX_CONCURRENCY)
+ *
+ * - CHATTER_API_REQUESTS_PER_SECOND
+ *   - Per-company outbound request rate (token bucket refill rate).
+ *   - Default: 3
+ *   - Must be a positive number; otherwise falls back to default.
+ *   - Used by: createTokenBucketRateLimiter({ refillPerSecond })
+ *
+ * - CHATTER_API_BURST_CAPACITY
+ *   - Per-company token bucket capacity (maximum burst size).
+ *   - Default: equals CHATTER_API_REQUESTS_PER_SECOND (i.e., 3 unless overridden)
+ *   - Must be a positive number; otherwise falls back to default.
+ *   - Used by: createTokenBucketRateLimiter({ capacity })
+ *
+ * - CHATTER_API_MAX_RETRIES
+ *   - Maximum number of attempts for posting an interaction before giving up.
+ *   - Default: 6
+ *   - Must be a positive integer; otherwise falls back to default.
+ *   - Used by: postInteractionWithPolicy()
+ *
+ * - CHATTER_API_TOKEN
+ *   - Optional override token for emergency/dev scenarios.
+ *   - If set, bypasses Secrets Manager/Redis token retrieval and uses this value for all companies.
+ *   - Used by: getChatterApiTokenCached()
+ *
+ * Notes
+ * - Per-company API tokens are otherwise fetched via getChatterApiToken(companyId) (Secrets Manager)
+ *   and may be cached via `sessionUtils.getChatterToken/setChatterToken` (Redis-backed).
+ */
+
+const queries = require("../graphql-client/queries");
+const moment = require("moment-timezone");
+const logger = require("../utils/logger");
+const { ChatterApiClient, getChatterApiToken, CHATTER_BASE_URL } = require("../chatter/chatter-client");
+
+const client = require("../graphql-client/graphql-client").client;
+
+const CHATTER_EVENT = process.env.NODE_ENV === "production" ? "delivery" : "TEST_INTEGRATION";
+const MAX_CONCURRENCY = Number(process.env.CHATTER_API_CONCURRENCY || 5);
+const CHATTER_REQUESTS_PER_SECOND = getPositiveNumber(process.env.CHATTER_API_REQUESTS_PER_SECOND, 3);
+const CHATTER_BURST_CAPACITY = getPositiveNumber(process.env.CHATTER_API_BURST_CAPACITY, CHATTER_REQUESTS_PER_SECOND);
+const CHATTER_MAX_RETRIES = getPositiveInteger(process.env.CHATTER_API_MAX_RETRIES, 6);
+
+// Client caching (in-memory) - tokens are now cached in Redis
+const clientCache = new Map(); // companyId -> ChatterApiClient
+const tokenInFlight = new Map(); // companyId -> Promise<string> (for in-flight deduplication)
+const companyRateLimiters = new Map(); // companyId -> rate limiter
+
+/**
+ * Core processing function for Chatter API jobs.
+ * This can be called by the HTTP handler or the BullMQ worker.
+ *
+ * @param {Object} options - Processing options
+ * @param {string} options.start - Start date for the delivery window
+ * @param {string} options.end - End date for the delivery window
+ * @param {Array<string>} options.bodyshopIds - Optional specific shops to process
+ * @param {boolean} options.skipUpload - Dry-run flag
+ * @param {Object} options.sessionUtils - Optional session utils for token caching
+ * @returns {Promise<Object>} Result with totals, allShopSummaries, and allErrors
+ */
+async function processChatterApiJob({ start, end, bodyshopIds, skipUpload, sessionUtils }) {
+  logger.log("chatter-api-start", "DEBUG", "api", null, null);
+
+  const allErrors = [];
+  const allShopSummaries = [];
+
+  // Shops that DO have chatter_company_id
+  const { bodyshops } = await client.request(queries.GET_CHATTER_SHOPS_WITH_COMPANY);
+
+  const shopsToProcess =
+    bodyshopIds?.length > 0 ? bodyshops.filter((shop) => bodyshopIds.includes(shop.id)) : bodyshops;
+
+  logger.log("chatter-api-shopsToProcess-generated", "DEBUG", "api", null, { count: shopsToProcess.length });
+
+  if (shopsToProcess.length === 0) {
+    logger.log("chatter-api-shopsToProcess-empty", "DEBUG", "api", null, null);
+    return {
+      totals: { shops: 0, jobs: 0, sent: 0, duplicates: 0, failed: 0 },
+      allShopSummaries: [],
+      allErrors: []
+    };
+  }
+
+  await processBatchApi({
+    shopsToProcess,
+    start,
+    end,
+    skipUpload,
+    allShopSummaries,
+    allErrors,
+    sessionUtils
+  });
+
+  const totals = allShopSummaries.reduce(
+    (acc, s) => {
+      acc.shops += 1;
+      acc.jobs += s.jobs || 0;
+      acc.sent += s.sent || 0;
+      acc.duplicates += s.duplicates || 0;
+      acc.failed += s.failed || 0;
+      return acc;
+    },
+    { shops: 0, jobs: 0, sent: 0, duplicates: 0, failed: 0 }
+  );
+
+  logger.log("chatter-api-end", "DEBUG", "api", null, totals);
+
+  return { totals, allShopSummaries, allErrors };
+}
+
+exports.default = async (req, res) => {
+  if (process.env.NODE_ENV !== "production") return res.sendStatus(403);
+  if (req.headers["x-imex-auth"] !== process.env.AUTOHOUSE_AUTH_TOKEN) return res.sendStatus(401);
+
+  res.status(202).json({
+    success: true,
+    message: "Chatter API job queued for processing",
+    timestamp: new Date().toISOString()
+  });
+
+  try {
+    const { dispatchChatterApiJob } = require("./queues/chatterApiQueue");
+    const { start, end, bodyshopIds, skipUpload } = req.body;
+
+    await dispatchChatterApiJob({
+      start,
+      end,
+      bodyshopIds,
+      skipUpload
+    });
+  } catch (error) {
+    logger.log("chatter-api-queue-dispatch-error", "ERROR", "api", null, {
+      error: error.message,
+      stack: error.stack
+    });
+  }
+};
+
+exports.processChatterApiJob = processChatterApiJob;
+
+async function processBatchApi({ shopsToProcess, start, end, skipUpload, allShopSummaries, allErrors, sessionUtils }) {
+  for (const bodyshop of shopsToProcess) {
+    const summary = {
+      bodyshopid: bodyshop.id,
+      imexshopid: bodyshop.imexshopid,
+      shopname: bodyshop.shopname,
+      chatter_company_id: bodyshop.chatter_company_id,
+      chatterid: bodyshop.chatterid,
+      jobs: 0,
+      sent: 0,
+      duplicates: 0,
+      failed: 0,
+      ok: true
+    };
+
+    try {
+      logger.log("chatter-api-start-shop", "DEBUG", "api", bodyshop.id, { shopname: bodyshop.shopname });
+
+      const companyId = parseCompanyId(bodyshop.chatter_company_id);
+      if (!companyId) {
+        summary.ok = false;
+        summary.failed = 0;
+        allErrors.push({
+          ...pickShop(bodyshop),
+          fatal: true,
+          errors: [`Invalid chatter_company_id: "${bodyshop.chatter_company_id}"`]
+        });
+        allShopSummaries.push(summary);
+        continue;
+      }
+
+      const chatterApi = await getChatterApiClient(companyId, sessionUtils);
+
+      const { jobs } = await client.request(queries.CHATTER_QUERY, {
+        bodyshopid: bodyshop.id,
+        start: start ? moment(start).startOf("day") : moment().subtract(1, "days").startOf("day"),
+        ...(end && { end: moment(end).endOf("day") })
+      });
+
+      summary.jobs = jobs.length;
+
+      // concurrency-limited posting
+      const limit = createConcurrencyLimit(MAX_CONCURRENCY);
+      const results = await Promise.all(
+        jobs.map((j) =>
+          limit(async () => {
+            const payload = buildInteractionPayload(bodyshop, j);
+
+            // keep legacy flag name: skipUpload == dry-run
+            if (skipUpload) return { ok: true, dryRun: true };
+
+            const r = await postInteractionWithPolicy(chatterApi, companyId, payload);
+            return r;
+          })
+        )
+      );
+
+      for (const r of results) {
+        if (r?.dryRun) continue;
+        if (r?.ok && r?.duplicate) summary.duplicates += 1;
+        else if (r?.ok) summary.sent += 1;
+        else summary.failed += 1;
+      }
+
+      // record failures with some detail (cap to avoid huge emails)
+      const failures = results
+        .filter((r) => r && r.ok === false)
+        .slice(0, 25)
+        .map((r) => ({
+          status: r.status,
+          error: r.error,
+          context: r.context
+        }));
+
+      if (failures.length) {
+        summary.ok = false;
+        allErrors.push({
+          ...pickShop(bodyshop),
+          fatal: false,
+          errors: failures
+        });
+      }
+
+      logger.log("chatter-api-end-shop", "DEBUG", "api", bodyshop.id, summary);
+    } catch (error) {
+      summary.ok = false;
+
+      logger.log("chatter-api-error-shop", "ERROR", "api", bodyshop.id, {
+        error: error.message,
+        stack: error.stack
+      });
+
+      allErrors.push({
+        ...pickShop(bodyshop),
+        fatal: true,
+        errors: [error.toString()]
+      });
+    } finally {
+      allShopSummaries.push(summary);
+    }
+  }
+}
+
+function buildInteractionPayload(bodyshop, j) {
+  const isCompany = Boolean(j.ownr_co_nm);
+
+  const locationIdentifier = `${bodyshop.chatter_company_id}-${bodyshop.id}`;
+  const timestamp = formatChatterTimestamp(j.actual_delivery, bodyshop.timezone);
+
+  if (j.actual_delivery && !timestamp) {
+    logger.log("chatter-api-invalid-delivery-timestamp", "WARN", "api", bodyshop.id, {
+      bodyshopId: bodyshop.id,
+      jobId: j.id,
+      timezone: bodyshop.timezone,
+      actualDelivery: j.actual_delivery
+    });
+  }
+
+  return {
+    locationIdentifier: locationIdentifier,
+    event: CHATTER_EVENT,
+    consent: "true",
+    transactionId: j.ro_number != null ? String(j.ro_number) : undefined,
+    timestamp,
+    firstName: isCompany ? null : j.ownr_fn || null,
+    lastName: isCompany ? j.ownr_co_nm : j.ownr_ln || null,
+    emailAddress: j.ownr_ea || undefined,
+    phoneNumber: j.ownr_ph1 || undefined,
+    metadata: {
+      imexShopId: bodyshop.imexshopid,
+      bodyshopId: bodyshop.id,
+      jobId: j.id
+    }
+  };
+}
+
+async function postInteractionWithPolicy(chatterApi, companyId, payload) {
+  const limiter = getCompanyRateLimiter(companyId);
+  const requestContext = {
+    companyId,
+    locationIdentifier: payload?.locationIdentifier,
+    transactionId: payload?.transactionId,
+    timestamp: payload?.timestamp ?? null,
+    bodyshopId: payload?.metadata?.bodyshopId ?? null,
+    jobId: payload?.metadata?.jobId ?? null
+  };
+
+  for (let attempt = 0; attempt < CHATTER_MAX_RETRIES; attempt++) {
+    await limiter.acquire();
+
+    try {
+      await chatterApi.postInteraction(companyId, payload);
+      return { ok: true };
+    } catch (e) {
+      // duplicate -> treat as successful idempotency outcome
+      if (e.status === 409) return { ok: true, duplicate: true, error: e.data };
+
+      // rate limited -> backoff + retry
+      if (e.status === 429) {
+        const retryDelayMs = retryDelayMsForError(e, attempt);
+        limiter.pause(retryDelayMs);
+        logger.log("chatter-api-request-rate-limited", "WARN", "api", requestContext.bodyshopId, {
+          ...requestContext,
+          attempt: attempt + 1,
+          maxAttempts: CHATTER_MAX_RETRIES,
+          status: e.status,
+          retryAfterMs: e.retryAfterMs,
+          retryDelayMs,
+          error: e.data ?? e.message
+        });
+        await sleep(retryDelayMs);
+        continue;
+      }
+
+      logger.log("chatter-api-request-failed", "ERROR", "api", requestContext.bodyshopId, {
+        ...requestContext,
+        attempt: attempt + 1,
+        maxAttempts: CHATTER_MAX_RETRIES,
+        status: e.status,
+        error: e.data ?? e.message
+      });
+      return { ok: false, status: e.status, error: e.data ?? e.message, context: requestContext };
+    }
+  }
+
+  logger.log("chatter-api-request-failed", "ERROR", "api", requestContext.bodyshopId, {
+    ...requestContext,
+    maxAttempts: CHATTER_MAX_RETRIES,
+    status: 429,
+    error: "rate limit retry exhausted"
+  });
+
+  return { ok: false, status: 429, error: "rate limit retry exhausted", context: requestContext };
+}
+
+function parseCompanyId(val) {
+  const s = String(val ?? "").trim();
+  if (!s) return null;
+  const n = Number(s);
+  if (!Number.isFinite(n) || !Number.isInteger(n) || n <= 0) return null;
+  return n;
+}
+
+function pickShop(bodyshop) {
+  return {
+    bodyshopid: bodyshop.id,
+    imexshopid: bodyshop.imexshopid,
+    shopname: bodyshop.shopname,
+    chatter_company_id: bodyshop.chatter_company_id,
+    chatterid: bodyshop.chatterid
+  };
+}
+
+function sleep(ms) {
+  return new Promise((r) => setTimeout(r, ms));
+}
+
+function backoffMs(attempt) {
+  const base = Math.min(30_000, 500 * 2 ** attempt);
+  const jitter = Math.floor(Math.random() * 250);
+  return base + jitter;
+}
+
+function retryDelayMsForError(error, attempt) {
+  const retryAfterMs = Number(error?.retryAfterMs);
+  if (Number.isFinite(retryAfterMs) && retryAfterMs > 0) {
+    const jitter = Math.floor(Math.random() * 250);
+    return Math.min(60_000, retryAfterMs + jitter);
+  }
+  return backoffMs(attempt);
+}
+
+function formatChatterTimestamp(value, timezone) {
+  if (!value) return undefined;
+
+  const hasValidTimezone = Boolean(timezone && moment.tz.zone(timezone));
+  const parsed = hasValidTimezone ? moment(value).tz(timezone) : moment(value);
+  if (!parsed.isValid()) return undefined;
+
+  // Keep a strict, Chatter-friendly timestamp without fractional seconds.
+  return parsed.utc().format("YYYY-MM-DD HH:mm:ss[Z]");
+}
+
+function createConcurrencyLimit(max) {
+  let active = 0;
+  const queue = [];
+
+  const next = () => {
+    if (active >= max) return;
+    const fn = queue.shift();
+    if (!fn) return;
+    active++;
+    fn()
+      .catch(() => {})
+      .finally(() => {
+        active--;
+        next();
+      });
+  };
+
+  return (fn) =>
+    new Promise((resolve, reject) => {
+      queue.push(async () => {
+        try {
+          resolve(await fn());
+        } catch (e) {
+          reject(e);
+        }
+      });
+      next();
+    });
+}
+
+function getCompanyRateLimiter(companyId) {
+  const key = String(companyId);
+  const existing = companyRateLimiters.get(key);
+  if (existing) return existing;
+
+  const limiter = createTokenBucketRateLimiter({
+    refillPerSecond: CHATTER_REQUESTS_PER_SECOND,
+    capacity: CHATTER_BURST_CAPACITY
+  });
+
+  companyRateLimiters.set(key, limiter);
+  return limiter;
+}
+
+function createTokenBucketRateLimiter({ refillPerSecond, capacity }) {
+  let tokens = capacity;
+  let lastRefillAt = Date.now();
+  let pauseUntil = 0;
+  let chain = Promise.resolve();
+
+  const refill = () => {
+    const now = Date.now();
+    const elapsedSec = (now - lastRefillAt) / 1000;
+    if (elapsedSec <= 0) return;
+    tokens = Math.min(capacity, tokens + elapsedSec * refillPerSecond);
+    lastRefillAt = now;
+  };
+
+  const waitForPermit = async () => {
+    for (;;) {
+      const now = Date.now();
+      if (pauseUntil > now) {
+        await sleep(pauseUntil - now);
+        continue;
+      }
+
+      refill();
+      if (tokens >= 1) {
+        tokens -= 1;
+        return;
+      }
+
+      const missing = 1 - tokens;
+      const waitMs = Math.max(25, Math.ceil((missing / refillPerSecond) * 1000));
+      await sleep(waitMs);
+    }
+  };
+
+  return {
+    acquire() {
+      chain = chain.then(waitForPermit, waitForPermit);
+      return chain;
+    },
+    pause(ms) {
+      const n = Number(ms);
+      if (!Number.isFinite(n) || n <= 0) return;
+      pauseUntil = Math.max(pauseUntil, Date.now() + n);
+    }
+  };
+}
+
+function getPositiveNumber(value, fallback) {
+  const n = Number(value);
+  return Number.isFinite(n) && n > 0 ? n : fallback;
+}
+
+function getPositiveInteger(value, fallback) {
+  const n = Number(value);
+  return Number.isInteger(n) && n > 0 ? n : fallback;
+}
+
+/**
+ * Returns a per-company Chatter API client, caching both the token and the client.
+ */
+async function getChatterApiClient(companyId, sessionUtils) {
+  const key = String(companyId);
+
+  const existing = clientCache.get(key);
+  if (existing) return existing;
+
+  const apiToken = await getChatterApiTokenCached(companyId, sessionUtils);
+  const chatterApi = new ChatterApiClient({ baseUrl: CHATTER_BASE_URL, apiToken });
+
+  clientCache.set(key, chatterApi);
+  return chatterApi;
+}
+
+/**
+ * Fetches the per-company token from AWS Secrets Manager with Redis caching
+ * SecretId: CHATTER_COMPANY_KEY_<companyId>
+ *
+ * Uses Redis caching + in-flight dedupe to avoid hammering Secrets Manager.
+ */
+async function getChatterApiTokenCached(companyId, sessionUtils) {
+  const key = String(companyId ?? "").trim();
+  if (!key) throw new Error("getChatterApiToken: companyId is required");
+
+  // Optional override for emergency/dev
+  if (process.env.CHATTER_API_TOKEN) return process.env.CHATTER_API_TOKEN;
+
+  // Check Redis cache if sessionUtils is available
+  if (sessionUtils?.getChatterToken) {
+    const cachedToken = await sessionUtils.getChatterToken(key);
+    if (cachedToken) {
+      logger.log("chatter-api-get-token-cache-hit", "DEBUG", "api", null, { companyId: key });
+      return cachedToken;
+    }
+  }
+
+  // Check for in-flight requests
+  const inflight = tokenInFlight.get(key);
+  if (inflight) return inflight;
+
+  const p = (async () => {
+    logger.log("chatter-api-get-token-cache-miss", "DEBUG", "api", null, { companyId: key });
+
+    // Fetch token from Secrets Manager using shared function
+    const token = await getChatterApiToken(companyId);
+
+    // Store in Redis cache if sessionUtils is available
+    if (sessionUtils?.setChatterToken) {
+      await sessionUtils.setChatterToken(key, token);
+    }
+
+    return token;
+  })();
+
+  tokenInFlight.set(key, p);
+
+  try {
+    return await p;
+  } finally {
+    tokenInFlight.delete(key);
+  }
+}

server/data/chatter.js

@@ -4,6 +4,8 @@ const converter = require("json-2-csv");
 const logger = require("../utils/logger");
 const fs = require("fs");
 const { SecretsManagerClient, GetSecretValueCommand } = require("@aws-sdk/client-secrets-manager");
+const { defaultProvider } = require("@aws-sdk/credential-provider-node");
+const { isString, isEmpty } = require("lodash");
 let Client = require("ssh2-sftp-client");
 
 const client = require("../graphql-client/graphql-client").client;
@@ -144,7 +146,18 @@ async function processBatch(shopsToProcess, start, end, allChatterObjects, allEr
 
 async function getPrivateKey() {
   // Connect to AWS Secrets Manager
-  const client = new SecretsManagerClient({ region: "ca-central-1" });
+  const secretsClientOptions = {
+    region: "ca-central-1",
+    credentials: defaultProvider()
+  };
+
+  const isLocal = isString(process.env?.LOCALSTACK_HOSTNAME) && !isEmpty(process.env?.LOCALSTACK_HOSTNAME);
+
+  if (isLocal) {
+    secretsClientOptions.endpoint = `http://${process.env.LOCALSTACK_HOSTNAME}:4566`;
+  }
+
+  const client = new SecretsManagerClient(secretsClientOptions);
   const command = new GetSecretValueCommand({ SecretId: "CHATTER_PRIVATE_KEY" });
 
   logger.log("chatter-get-private-key", "DEBUG", "api", null, null);

server/data/data.js

@@ -8,5 +8,5 @@ exports.podium = require("./podium").default;
 exports.emsUpload = require("./emsUpload").default;
 exports.carfax = require("./carfax").default;
 exports.carfaxRps = require("./carfax-rps").default;
-exports.vehicletype = require("./vehicletype/vehicletype").default;
-exports.documentAnalytics = require("./analytics/documents").default;
+exports.documentAnalytics = require("./analytics/documents").default;
+exports.chatterApi = require("./chatter-api").default;

server/data/queues/chatterApiQueue.js

@@ -0,0 +1,178 @@
+const { Queue, Worker } = require("bullmq");
+const { registerCleanupTask } = require("../../utils/cleanupManager");
+const getBullMQPrefix = require("../../utils/getBullMQPrefix");
+const devDebugLogger = require("../../utils/devDebugLogger");
+const moment = require("moment-timezone");
+const { sendServerEmail } = require("../../email/sendemail");
+
+let chatterApiQueue;
+let chatterApiWorker;
+
+/**
+ * Initializes the Chatter API queue and worker.
+ *
+ * @param {Object} options - Configuration options for queue initialization.
+ * @param {Object} options.pubClient - Redis client instance for queue communication.
+ * @param {Object} options.logger - Logger instance for logging events and debugging.
+ * @param {Function} options.processJob - Function to process the Chatter API job.
+ * @param {Function} options.getChatterToken - Function to get Chatter token from Redis.
+ * @param {Function} options.setChatterToken - Function to set Chatter token in Redis.
+ * @returns {Queue} The initialized `chatterApiQueue` instance.
+ */
+const loadChatterApiQueue = async ({ pubClient, logger, processJob, getChatterToken, setChatterToken }) => {
+  if (!chatterApiQueue) {
+    const prefix = getBullMQPrefix();
+
+    devDebugLogger(`Initializing Chatter API Queue with prefix: ${prefix}`);
+
+    chatterApiQueue = new Queue("chatterApi", {
+      prefix,
+      connection: pubClient,
+      defaultJobOptions: {
+        removeOnComplete: true,
+        removeOnFail: false,
+        attempts: 3,
+        backoff: {
+          type: "exponential",
+          delay: 60000 // 1 minute base delay
+        }
+      }
+    });
+
+    chatterApiWorker = new Worker(
+      "chatterApi",
+      async (job) => {
+        const { start, end, bodyshopIds, skipUpload } = job.data;
+
+        logger.log("chatter-api-queue-job-start", "INFO", "api", null, {
+          jobId: job.id,
+          start,
+          end,
+          bodyshopIds,
+          skipUpload
+        });
+
+        try {
+          // Provide sessionUtils-like object with token caching functions
+          const sessionUtils = {
+            getChatterToken,
+            setChatterToken
+          };
+
+          const result = await processJob({
+            start,
+            end,
+            bodyshopIds,
+            skipUpload,
+            sessionUtils
+          });
+
+          logger.log("chatter-api-queue-job-complete", "INFO", "api", null, {
+            jobId: job.id,
+            totals: result.totals
+          });
+
+          // Send email summary
+          await sendServerEmail({
+            subject: `Chatter API Report ${moment().format("MM-DD-YY")}`,
+            text:
+              `Totals:\n${JSON.stringify(result.totals, null, 2)}\n\n` +
+              `Shop summaries:\n${JSON.stringify(result.allShopSummaries, null, 2)}\n\n` +
+              `Errors:\n${JSON.stringify(result.allErrors, null, 2)}\n`
+          });
+
+          return result;
+        } catch (error) {
+          logger.log("chatter-api-queue-job-error", "ERROR", "api", null, {
+            jobId: job.id,
+            error: error.message,
+            stack: error.stack
+          });
+
+          // Send error email
+          await sendServerEmail({
+            subject: `Chatter API Error ${moment().format("MM-DD-YY")}`,
+            text: `Job failed:\n${error.message}\n\n${error.stack}`
+          });
+
+          throw error;
+        }
+      },
+      {
+        prefix,
+        connection: pubClient,
+        concurrency: 1, // Process one job at a time
+        lockDuration: 14400000 // 4 hours - allow long-running jobs
+      }
+    );
+
+    // Event handlers
+    chatterApiWorker.on("completed", (job) => {
+      devDebugLogger(`Chatter API job ${job.id} completed`);
+    });
+
+    chatterApiWorker.on("failed", (job, err) => {
+      logger.log("chatter-api-queue-job-failed", "ERROR", "api", null, {
+        jobId: job?.id,
+        message: err?.message,
+        stack: err?.stack
+      });
+    });
+
+    chatterApiWorker.on("progress", (job, progress) => {
+      devDebugLogger(`Chatter API job ${job.id} progress: ${progress}%`);
+    });
+
+    // Register cleanup task
+    const shutdown = async () => {
+      devDebugLogger("Closing Chatter API queue worker...");
+      await chatterApiWorker.close();
+      devDebugLogger("Chatter API queue worker closed");
+    };
+    registerCleanupTask(shutdown);
+  }
+
+  return chatterApiQueue;
+};
+
+/**
+ * Retrieves the initialized `chatterApiQueue` instance.
+ *
+ * @returns {Queue} The `chatterApiQueue` instance.
+ * @throws {Error} If `chatterApiQueue` is not initialized.
+ */
+const getQueue = () => {
+  if (!chatterApiQueue) {
+    throw new Error("Chatter API queue not initialized. Ensure loadChatterApiQueue is called during bootstrap.");
+  }
+  return chatterApiQueue;
+};
+
+/**
+ * Dispatches a Chatter API job to the queue.
+ *
+ * @param {Object} options - Options for the job.
+ * @param {string} options.start - Start date for the delivery window.
+ * @param {string} options.end - End date for the delivery window.
+ * @param {Array<string>} options.bodyshopIds - Optional specific shops to process.
+ * @param {boolean} options.skipUpload - Dry-run flag.
+ * @returns {Promise<void>} Resolves when the job is added to the queue.
+ */
+const dispatchChatterApiJob = async ({ start, end, bodyshopIds, skipUpload }) => {
+  const queue = getQueue();
+
+  const jobData = {
+    start: start || moment().subtract(1, "days").startOf("day").toISOString(),
+    end: end || moment().endOf("day").toISOString(),
+    bodyshopIds: bodyshopIds || [],
+    skipUpload: skipUpload || false
+  };
+
+  await queue.add("process-chatter-api", jobData, {
+    jobId: `chatter-api-${moment().format("YYYY-MM-DD-HHmmss")}`
+  });
+
+  devDebugLogger(`Added Chatter API job to queue: ${JSON.stringify(jobData)}`);
+};
+
+module.exports = { loadChatterApiQueue, getQueue, dispatchChatterApiJob };

server/data/vehicletype/cargovans.json

@@ -1,126 +0,0 @@
-[
-  "PROMASTER 1500",
-  "PROMASTER 2500",
-  "PROMASTER CITY",
-  "NV 1500",
-  "NV 200",
-  "NV 2500",
-  "NV 3500",
-  "NV1500",
-  "NV200",
-  "NV2500",
-  "NV3500",
-  "SPRINTER",
-  "E150 ECONOLINE CARGO VAN",
-  "E150 ECONOLINE XL",
-  "E250 ECONOLINE CARGO",
-  "E250 ECONOLINE CARGO (AMALGAM)",
-  "E250 ECONOLINE CARGO (INSPECT)",
-  "E250 ECONOLINE CARGO VAN EXT",
-  "E250 ECONOLINE SUPER CARGO VAN",
-  "E350 CUTAWAY VAN",
-  "E350 ECONO SD CARGO VAN EXT",
-  "E350 ECONOLINE CARGO VAN",
-  "E350 ECONOLINE CUTAWAY",
-  "E350 ECONOLINE SD CARGO VAN",
-  "E350 ECONOLINE SD XL",
-  "E350 ECONOLINE SD XL EXT",
-  "E350 ECONOLINE SD XLT",
-  "E350 ECONOLINE SD XLT EXT",
-  "E350 SD CUTAWAY",
-  "E450",
-  "E450 ECONOLINE",
-  "E450 ECONOLINE SD",
-  "E450 ECONOLINE SD CUTAWAY",
-  "TRANSIT 150 WB 130 CARGO VAN",
-  "TRANSIT 150 WB 130 XLT",
-  "TRANSIT 150 WB 148 CARGO VAN",
-  "TRANSIT 250 WB 130 CARGO VAN",
-  "TRANSIT 250 WB 148 CARGO VAN",
-  "TRANSIT 250 WB 148 EL CARGO",
-  "TRANSIT 350 WB 148 CARGO VAN",
-  "TRANSIT 350 WB 148 EL CARGO",
-  "TRANSIT CONNECT XL CARGO VAN",
-  "TRANSIT CONNECT XLT CARGO VAN",
-  "250 TRANSIT",
-  "CITY EXPRESS LS CARGO VAN",
-  "CITY EXPRESS LT CARGO VAN",
-  "EXPRESS 1500",
-  "EXPRESS 1500 CARGO VAN",
-  "EXPRESS 1500 LS",
-  "EXPRESS 1500 LT",
-  "EXPRESS 2500 CARGO VAN",
-  "EXPRESS 2500 CARGO VAN EXT",
-  "EXPRESS 2500 LS",
-  "EXPRESS 2500 LT",
-  "EXPRESS 3500",
-  "EXPRESS 3500 CARGO VAN",
-  "EXPRESS 3500 CARGO VAN EXT",
-  "EXPRESS 3500 EXT",
-  "EXPRESS 3500 LS",
-  "EXPRESS 3500 LS EXT",
-  "EXPRESS 3500 LT",
-  "EXPRESS 3500 LT EXT",
-  "G3500 EXPRESS CUTAWAY",
-  "SAVANA 1500 CARGO VAN",
-  "SAVANA 1500 SL",
-  "SAVANA 1500 SLE",
-  "SAVANA 2500",
-  "2500 SAVANA",
-  "SAVANA 2500 CARGO VAN",
-  "SAVANA 2500 CARGO VAN EXT",
-  "SAVANA 2500 LT",
-  "SAVANA 2500 SLE",
-  "SAVANA 3500",
-  "SAVANA 3500 CARGO VAN",
-  "SAVANA 3500 CARGO VAN EXT",
-  "SAVANA 3500 EXT",
-  "SAVANA 3500 LT EXT",
-  "SAVANA 3500 SLE EXT",
-  "SAVANA G3500 CUTAWAY",
-  "SAVANA G4500 CUTAWAY",
-  "EXPRESS 1500 LS CARGO VAN",
-  "G20 SPORTVAN",
-  "NV 3500 S V8 CARGO VAN",
-  "E-150",
-  "E-250",
-  "E-350",
-  "E-450",
-  "E150",
-  "E250",
-  "E350",
-  "TRANSIT",
-  "CITY",
-  "CITY EXPRESS",
-  "EXPRESS",
-  "EXPRESS 2500",
-  "G3500",
-  "SAVANA",
-  "SAVANA 1500",
-  "CHEVY EXPRESS G2500",
-  "CLUBWAGON E350",
-  "TRANSIT CONNECT",
-  "SPRINTER 2500",
-  "TRANSIT 150",
-  "ECONOLINE E250",
-  "TRANSIT 250",
-  "ECONOLINE E350",
-  "NV3500 HD",
-  "TRANSIT 350HD",
-  "ECONOLINE E150",
-  "E250 ECONOLINE",
-  "C/V",
-  "E350 CHSCAB",
-  "G1500 CHEVY EXPRESS",
-  "2500 SPRINTER",
-  "E150 ECONOLINE",
-  "350 TRANSIT",
-  "E450 CUTAWAY",
-  "PROMASTER 3500",
-  "CHEVY EXPRESS G3500",
-  "SAVANA G3500",
-  "1500 PROMASTER",
-  "2500 EXPRESS",
-  "3500 EXPRESS",
-  "3500 SPRINTER"
-]

server/data/vehicletype/passengervans.json

@@ -1,33 +0,0 @@
-[
-  "GRAND CARAVAN",
-  "GRANDCARAVAN",
-  "GRAND CARAVAN CREW",
-  "GRAND CARAVAN CV",
-  "GRAND CARAVAN CVP",
-  "GRAND CARAVAN SE",
-  "GRAND CARAVAN SXT",
-  "CARAVAN CV",
-  "SIENNA CE V6",
-  "SIENNA LE V6",
-  "SIENNA XLE V6",
-  "SIENNA",
-  "ODYSSEY",
-  "SEDONA",
-  "PACIFICA (NEW)",
-  "QUEST",
-  "CARAVAN",
-  "MONTANA SV6",
-  "FREESTAR",
-  "UPLANDER",
-  "MONTANA",
-  "VOYAGER",
-  "ENTOURAGE",
-  "PACIFICA",
-  "CARNIVAL",
-  "VENTURE",
-  "SAFARI",
-  "VANAGON",
-  "WINDSTAR",
-  "TOWN&COUNTRY",
-  "ROUTAN"
-]

server/data/vehicletype/suvs.json

@@ -1,485 +0,0 @@
-[
-  "EDGE SEL",
-  "ESCAPE",
-  "ESCAPE SE",
-  "ESCAPE SEL",
-  "ESCAPE XLT V6",
-  "EXPEDITION",
-  "EXPEDITION LIMITED",
-  "EXPEDITION MAX",
-  "EXPEDITION MAX LIMITED",
-  "EXPLORER",
-  "EXCURSION",
-  "EXPLORER LIMITED",
-  "EXPLORER PLATINUM ECOBOOST",
-  "EXPLORER XLT",
-  "FLEX",
-  "FLEX SE",
-  "ECOSPORT",
-  "ESCAPE HYBRID",
-  "MUSTANG MACH-E",
-  "BRONCO",
-  "BRONCO SPORT",
-  "TRAILBLAZER",
-  "BLAZER LT",
-  "CHEROKEE",
-  "CHEROKEE CLASSIC",
-  "CHEROKEE COUNTRY",
-  "CHEROKEE LIMITED",
-  "CHEROKEE NORTH",
-  "CHEROKEE OVERLAND",
-  "CHEROKEE SPORT",
-  "CHEROKEE TRAILHAWK",
-  "CJ",
-  "CJ7",
-  "CJ7 RENEGADE",
-  "COMMANDER",
-  "COMMANDER LIMITED",
-  "COMMANDER SPORT",
-  "COMPASS",
-  "COMPASS HIGH ALTITUDE",
-  "COMPASS LATITUDE",
-  "COMPASS LIMITED",
-  "COMPASS NORTH",
-  "COMPASS SPORT",
-  "COMPASS TRAILHAWK",
-  "GLADIATOR OVERLAND",
-  "GLADIATOR RUBICON",
-  "GRAND CHEROKEE LAREDO",
-  "GRAND CHEROKEE LIMITED",
-  "GRAND CHEROKEE OVERLAND",
-  "GRAND CHEROKEE SE",
-  "GRAND CHEROKEE SRT",
-  "GRAND CHEROKEE SRT8",
-  "GRAND CHEROKEE SUMMIT",
-  "GRAND CHEROKEE TRACKHAWK",
-  "GRAND CHEROKEE TRAILHAWK",
-  "GRAND CHEROKEE",
-  "GRANDCHEROKEE",
-  "LIBERTY LIMITED",
-  "LIBERTY RENEGADE",
-  "LIBERTY SPORT",
-  "LIBERTY",
-  "PATRIOT",
-  "PATRIOT HIGH ALTITUDE",
-  "PATRIOT LATITUDE",
-  "PATRIOT LIMITED",
-  "PATRIOT NORTH",
-  "PATRIOT SPORT",
-  "RENEGADE LIMITED",
-  "RENEGADE NORTH",
-  "RENEGADE SPORT",
-  "RENEGADE TRAILHAWK",
-  "TJ",
-  "TJ RUBICON",
-  "TJ SAHARA",
-  "TJ SPORT",
-  "TJ UNLIMITED",
-  "WRANGLER",
-  "WRANGLER RUBICON",
-  "WRANGLER SAHARA",
-  "WRANGLER SPORT",
-  "WRANGLER UNLIMITED",
-  "WRANGLER UNLIMITED 70TH ANNIV",
-  "WRANGLER UNLIMITED RUBICON",
-  "WRANGLER UNLIMITED SAHARA",
-  "WRANGLER UNLIMITED SPORT",
-  "WRANGLER UNLIMITED X",
-  "WRANGLER X",
-  "YJ WRANGLER",
-  "AVIATOR",
-  "AVIATOR RESERVE",
-  "MKC",
-  "MKC RESERVE",
-  "MKC SELECT",
-  "MKT",
-  "MKT ECOBOOST",
-  "MKX",
-  "MKX RESERVE",
-  "NAUTILUS RESERVE",
-  "NAUTILUS RESERVE V6",
-  "NAVIGATOR",
-  "NAVIGATOR L",
-  "NAVIGATOR L RESERVE",
-  "NAVIGATOR L SELECT",
-  "NAVIGATOR RESERVE",
-  "PILOT",
-  "PILOT BLACK EDITION",
-  "PILOT ELITE",
-  "PILOT EX",
-  "PILOT EX-L",
-  "PILOT GRANITE",
-  "PILOT LX",
-  "PILOT SE",
-  "PILOT SE-L",
-  "PILOT TOURING",
-  "DURANGO R/T",
-  "DURANGO SLT PLUS",
-  "DURANGO SRT",
-  "DURANGO",
-  "JOURNEY",
-  "JOURNEY CROSSROAD",
-  "JOURNEY CVP",
-  "JOURNEY LIMITED",
-  "JOURNEY R/T",
-  "JOURNEY SXT",
-  "NITRO SE",
-  "NITRO",
-  "K1500 SUBURBAN",
-  "SUBURBAN 1500 LT",
-  "SUBURBAN 1500 LTZ",
-  "SUBURBAN 1500 PREMIER",
-  "SUBURBAN 2500 LS",
-  "TAHOE LT",
-  "TRAVERSE LS",
-  "TRAVERSE LT",
-  "TRAVERSE PREMIER",
-  "TRAX LT",
-  "TRAX PREMIER",
-  "UPLANDER LT EXT",
-  "SUBURBAN",
-  "TAHOE",
-  "TRAVERSE",
-  "TRAX",
-  "UPLANDER",
-  "YUKON",
-  "YUKON DENALI",
-  "YUKON XL",
-  "YUKON XL DENALI",
-  "EQUINOX LS",
-  "EQUINOX LT",
-  "EQUINOX PREMIER",
-  "EQUINOX",
-  "RAV4 LE",
-  "RAV4 XLE",
-  "HIGHLANDER SPORT V6",
-  "4RUNNER SR5 V6",
-  "RAV4",
-  "RAV4 HYBRID",
-  "RAV4 XLE HYBRID",
-  "HIGHLANDER",
-  "4RUNNER",
-  "SEQUOIA",
-  "PATHFINDER SE",
-  "PATHFINDER SL",
-  "PATHFINDER",
-  "MURANO PLATINUM",
-  "MURANO SV",
-  "MURANO",
-  "TUCSON",
-  "TERRAIN",
-  "SORENTO",
-  "EDGE",
-  "KICKS",
-  "QASHQAI",
-  "SANTA FE",
-  "ARMADA",
-  "TELLURIDE",
-  "PALISADE",
-  "SELTOS",
-  "TORRENT",
-  "C-HR",
-  "SPORTAGE",
-  "VENZA",
-  "ACADIA",
-  "CR-V",
-  "HR-V",
-  "CX-5",
-  "CX-50",
-  "CX-7",
-  "CX-9",
-  "CX-3",
-  "Q3",
-  "Q5",
-  "Q7",
-  "Q8",
-  "JUKE SV",
-  "JUKE",
-  "ROGUE",
-  "ROGUE SV",
-  "XTERRA",
-  "COROLLA CROSS",
-  "ACADIA DENALI",
-  "TAURUS X",
-  "MACAN",
-  "FJ CRUISER",
-  "BRONCO SPORT BADLANDS",
-  "ESCALADE",
-  "RX 350",
-  "KONA",
-  "MDX",
-  "RDX",
-  "COOPER COUNTRYMAN",
-  "V70",
-  "OUTLANDER",
-  "RIO5",
-  "GLC300 COUPE",
-  "ENCORE",
-  "SRX",
-  "SANTA FE SPORT",
-  "NX 300",
-  "WRANGLER UNLIMITE",
-  "WRANGLER JK UNLIM",
-  "RANGEROVER EVOQUE",
-  "CROSSTREK",
-  "FORESTER",
-  "TIGUAN",
-  "XV CROSSTREK",
-  "ENDEAVOR",
-  "RX 330",
-  "ATLAS",
-  "XC90",
-  "TOUAREG",
-  "STELVIO",
-  "RANGE ROVER SPORT",
-  "GLE350D",
-  "EX35",
-  "RVR",
-  "MONTERO",
-  "X-TRAIL",
-  "GRAND VITARA",
-  "TRIBUTE",
-  "X3",
-  "XC60",
-  "GLK250 BLUETEC",
-  "ENVOY",
-  "ML350 BLUETEC",
-  "ENVISION",
-  "FX35",
-  "X1",
-  "VENUE",
-  "TAOS",
-  "KONA ELECTRIC",
-  "OUTLANDER PHEV",
-  "PASSPORT",
-  "H3",
-  "EXPLORERSPORTTRAC",
-  "F-PACE",
-  "ML320 BLUETEC",
-  "REGAL SPORTBACK",
-  "DISCOVERY SPORT",
-  "RENDEZVOUS",
-  "XC70",
-  "COMPASS (NEW)",
-  "CUBE",
-  "V60 CROSS COUNTRY",
-  "QX70",
-  "X6",
-  "ELEMENT",
-  "RX 400H",
-  "VUE",
-  "RANGE ROVER VELAR",
-  "E-PACE",
-  "RAV4 PRIME",
-  "LX 570",
-  "GX 470",
-  "EX37",
-  "GLE43",
-  "NAUTILUS",
-  "XT6",
-  "RX 450H",
-  "ESCALADE ESV",
-  "OUTLOOK",
-  "CAYENNE",
-  "XC90 PLUG-IN",
-  "MODEL X",
-  "MODEL Y",
-  "GLC300",
-  "SANTA FE HYBRID",
-  "G63",
-  "XV CROSSTREK HYBR",
-  "JX35",
-  "JIMMY",
-  "TUCSON HYBRID",
-  "XC40 ELECTRIC",
-  "RX 300",
-  "ML320",
-  "WRANGLER JK UNLIMITED",
-  "POLICE INTERCEPTOR UTILITY",
-  "WRANGLER JK",
-  "TRIBECA",
-  "E-TRON SPORTBACK",
-  "500X",
-  "RX 350H",
-  "GL350 BLUETEC",
-  "WRANGLER UNLIMITED 4XE",
-  "GV80",
-  "GL550",
-  "Q5 E",
-  "H2 SUV",
-  "Q5 HYBRID",
-  "IONIQ 5",
-  "SQ5 SPORTBACK",
-  "LEVANTE",
-  "TONALE",
-  "GLE43 COUPE",
-  "GRAND CHEROKEE WK",
-  "DEFENDER",
-  "NX 450H+",
-  "ML400",
-  "LX 600",
-  "RX 450HL",
-  "SORENTO HYBRID",
-  "NX 350",
-  "TRACKER",
-  "GLE450",
-  "Q5 SPORTBACK",
-  "CR-V HYBRID",
-  "LX 470",
-  "EQS580 SUV",
-  "H2",
-  "EV9",
-  "SORENTO PLUG-IN",
-  "LYRIQ",
-  "GLE550",
-  "RX 500H",
-  "X1 SAV",
-  "E-TRON S SPORTBACK",
-  "ML500",
-  "GRAND HIGHLANDER HYBRID",
-  "RS Q8",
-  "GLS550",
-  "GLS580",
-  "IX",
-  "CAYENNE COUPE",
-  "SOLTERRA",
-  "PATHFINDER HYBRID",
-  "Q8 E-TRON",
-  "TX 350",
-  "TX 500H",
-  "EQUINOX EV",
-  "NAUTILUS HYBRID",
-  "TRAVERSE LIMITED",
-  "CX-70",
-  "SANTA FE XL",
-  "RENEGADE",
-  "QX50",
-  "ECLIPSE CROSS",
-  "QX80",
-  "X5",
-  "X3",
-  "X1",
-  "X4",
-  "ENCLAVE",
-  "ENCORE GX",
-  "CAYENNE HYBRID",
-  "SOUL",
-  "GX 460",
-  "UX 250H",
-  "XT5",
-  "GLE53",
-  "XT4",
-  "SQ7",
-  "NX 350H",
-  "GLK350",
-  "GLE350",
-  "NX 300H",
-  "NX 200T",
-  "RANGE ROVER EVOQUE",
-  "GLS450",
-  "TERRAIN DENALI",
-  "GRAND CHEROKEE L",
-  "GLE400",
-  "TUCSON PLUG-IN",
-  "BLAZER",
-  "ASCENT",
-  "HIGHLANDER HYBRID",
-  "ATLAS CROSS SPORT",
-  "XC40",
-  "VENZA HYBRID",
-  "GLA45",
-  "GLB250",
-  "GRAND HIGHLANDER",
-  "GV70",
-  "NIRO",
-  "NIRO EV",
-  "GLA250",
-  "ESCAPE PLUG-IN",
-  "WAGONEER",
-  "CX-30",
-  "QX60",
-  "GRAND CHEROKEE 4XE",
-  "SPORTAGE HYBRID",
-  "EV6",
-  "TONALE PLUG-IN",
-  "GLC43 COUPE",
-  "X2",
-  "RX 350L",
-  "HORNET",
-  "ENVISTA",
-  "LEVANTE S",
-  "SPORTAGE PLUG-IN",
-  "ORLANDO",
-  "X5 M",
-  "EXPLORER HYBRID",
-  "FREESTYLE",
-  "CORSAIR",
-  "K1500 YUKON XL",
-  "RANGE ROVER",
-  "SUV W/O LABOR",
-  "ID.4",
-  "CX-90",
-  "X7",
-  "CORSAIR PLUG-IN",
-  "ESCALADE EXT",
-  "QX55",
-  "DISCOVERY",
-  "BOLT EUV",
-  "C40 ELECTRIC",
-  "LR4",
-  "GRAND WAGONEER",
-  "XC60 PLUG-IN",
-  "LR2",
-  "EQE350 SUV",
-  "COROLLA CROSS HYBRID",
-  "SOUL EV",
-  "GRECALE",
-  "SUV W/O LABOR",
-  "QX30",
-  "SQ5",
-  "NIRO PLUG-IN",
-  "BORREGO",
-  "CX-90 PLUG-IN",
-  "XL-7",
-  "SUV W/O LABOR",
-  "SUV W/O LABOR",
-  "I-PACE",
-  "HORNET PLUG-IN",
-  "UX 300H",
-  "ML320 CDI",
-  "VERACRUZ",
-  "SQ8",
-  "GLE53 COUPE",
-  "ZDX",
-  "9-7X",
-  "ARIYA",
-  "ASPEN",
-  "AVIATOR PLUG-IN",
-  "B9 TRIBECA",
-  "BRAVADA",
-  "ENVOY XL",
-  "EQB350",
-  "EQB350 SUV",
-  "ESCALADE-V",
-  "E-TRON",
-  "FX37",
-  "GL320 CDI",
-  "GLADIATOR",
-  "GLC43",
-  "GLE450 COUPE",
-  "GLE63",
-  "GV60",
-  "MKT TOWN CAR",
-  "ML350",
-  "ML550",
-  "ML63",
-  "NX 250",
-  "Q4 E-TRON",
-  "Q8 E-TRON SPORTBACK",
-  "QX4",
-  "QX56",
-  "SANTA FE PLUG-IN",
-  "UX 200",
-  "WAGONEER L",
-  "XB"
-]

server/data/vehicletype/trucks.json

@@ -1,567 +0,0 @@
-[
-  "MARK LT",
-  
-  "F-150",
-  "F-250",
-  "F-350",
-  "F-450",
-  "F-550",
-  "F-650",
-  "F100 PICKUP",
-  "F150 FX2 SUPERCAB",
-  "F150 FX4 PICKUP",
-  "F150 FX4 SUPERCAB",
-  "F150 FX4 SUPERCREW",
-  "F150 HARLEY DAVIDSON SUPERCAB",
-  "F150 HARLEY DAVIDSON SUPERCREW",
-  "F150 KING RANCH SUPERCREW",
-  "F150 LARIAT FX4 SUPERCREW",
-  "F150 LARIAT HARLEY DAVIDSON SC",
-  "F150 LARIAT KING RANCH SUPCREW",
-  "F150 LARIAT LIMITED SUPERCREW",
-  "F150 LARIAT PICKUP",
-  "F150 LARIAT SUPERCAB",
-  "F150 LARIAT SUPERCAB (AMALGAM)",
-  "F150 LARIAT SUPERCREW",
-  "F150 LARIAT SUPERCREW (AMALGA)",
-  "F150 LIMITED SUPERCREW",
-  "F150 PICKUP",
-  "F150 PLATINUM SUPERCREW",
-  "F150 RAPTOR SUPERCAB",
-  "F150 RAPTOR SUPERCREW",
-  "F150 STX PICKUP",
-  "F150 STX SUPERCAB",
-  "F150 SUPERCAB",
-  "F150 SUPERCREW",
-  "F150 SUPERCREW (AMALGAMATED)",
-  "F150 SVT RAPTOR SUPERCAB",
-  "F150 XL PICKUP",
-  "F150 XL SUPERCAB",
-  "F150 XL SUPERCREW",
-  "F150 XLT LARIAT SUPERCAB",
-  "F150 XLT PICKUP",
-  "F150 XLT SUPERCAB",
-  "F150 XLT SUPERCREW",
-  "F150 XLT SUPERCREW (AMALGAMAT)",
-  "F150 XTR SUPERCAB",
-  "F250 PICKUP",
-  "F250 SD CREW CAB",
-  "F250 SD FX4 CREW CAB",
-  "F250 SD FX4 SUPERCAB",
-  "F250 SD KING RANCH CREW CAB",
-  "F250 SD LARIAT CREW CAB",
-  "F250 SD LARIAT CREW CAB (AMAL)",
-  "F250 SD LARIAT PICKUP",
-  "F250 SD LARIAT SUPERCAB",
-  "F250 SD LIMITED CREW CAB",
-  "F250 SD PLATINUM CREW CAB",
-  "F250 SD SUPERCAB",
-  "F250 SD XL CREW CAB",
-  "F250 SD XL PICKUP",
-  "F250 SD XL SUPERCAB",
-  "F250 SD XLT CREW CAB",
-  "F250 SD XLT PICKUP",
-  "F250 SD XLT SUPERCAB",
-  "F250 SUPERCAB",
-  "F250 XL CREW CAB",
-  "F350 CREW CAB",
-  "F350 PICKUP",
-  "F350 PICKUP 2WD",
-  "F350 SD CABELAS CREW CAB",
-  "F350 SD CREW CAB",
-  "F350 SD FX4 CREW CAB",
-  "F350 SD FX4 SUPERCAB",
-  "F350 SD HARLEY DAVIDSON",
-  "F350 SD KING RANCH CREW CAB",
-  "F350 SD LARIAT CREW CAB",
-  "F350 SD LARIAT CREW CAB (AMAL)",
-  "F350 SD LARIAT KING RANCH",
-  "F350 SD LARIAT SUPERCAB",
-  "F350 SD LIMITED CREW CAB",
-  "F350 SD PICKUP",
-  "F350 SD PLATINUM CREW CAB",
-  "F350 SD SUPERCAB",
-  "F350 SD XL CREW CAB",
-  "F350 SD XL PICKUP",
-  "F350 SD XL SUPERCAB",
-  "F350 SD XLT CREW CAB",
-  "F350 SD XLT SUPERCAB",
-  "F350 SUPER DUTY",
-  "F350 SUPER DUTY XL",
-  "F350 XL PICKUP",
-  "F450",
-  "F450 Pickup",
-  "F450 SD KING RANCH CREW CAB",
-  "F450 SD LARIAT CREW CAB",
-  "F450 SD PICKUP",
-  "F450 SD PLATINUM CREW CAB",
-  "F450 SD XL",
-  "F450 SD XL CREW CAB",
-  "F450 SD XL PICKUP",
-  "F450 SD XLT CREW CAB",
-  "F450 SUPER DUTY XLT",
-  "F550",
-  "F550 SD",
-  "F550 SD XL",
-  "F550 SD XL PICKUP",
-  "F550 SD XLT CREW CAB",
-  "F550 SD XLT SUPERCAB",
-  "F550 SUPER DUTY",
-  "F550 SUPER DUTY XL",
-  "F550 SUPER DUTY XLT",
-  "F550 SUPER DUTY XLT CREW CAB",
-  "F550 XL",
-  "F650 SD XLT SUPERCAB",
-  "F68",
-  "F750 XL",
-
-  "RANGER",
-  "RANGER EDGE SUPERCAB",
-  "RANGER FX4 SUPERCAB",
-  "RANGER LARIAT SUPERCREW",
-  "RANGER SPORT SUPERCAB",
-  "RANGER STX SUPERCAB",
-  "RANGER SUPERCAB",
-  "RANGER XL",
-  "RANGER XL SUPERCAB",
-  "RANGER XLT",
-  "RANGER XLT SUPERCAB",
-  "RANGER XLT SUPERCREW",
-
-  "FRONTIER LE CREW CAB V6",
-  "FRONTIER NISMO CREW CAB V6",
-  "FRONTIER NISMO KING CAB V6",
-  "FRONTIER PRO-4X CREW CAB V6",
-  "FRONTIER PRO-4X KING CAB V6",
-  "FRONTIER S KING CAB",
-  "FRONTIER SC CREW CAB V6",
-  "FRONTIER SC V6",
-  "FRONTIER SE CREW CAB V6",
-  "FRONTIER SE KING CAB V6",
-  "FRONTIER SL CREW CAB V6",
-  "FRONTIER SV CREW CAB V6",
-  "FRONTIER SV KING CAB V6",
-  "FRONTIER XE KING CAB",
-  "FRONTIER XE KING CAB V6",
-  "KING CAB",
-
-  "TITAN 5.6 LE CREW CAB",
-  "TITAN 5.6 LE KING CAB",
-  "TITAN 5.6 MIDNIGHT CREW CAB",
-  "TITAN 5.6 PLATINUM RESERVE CC",
-  "TITAN 5.6 PRO-4X CREW CAB",
-  "TITAN 5.6 PRO-4X KING CAB",
-  "TITAN 5.6 S CREW CAB",
-  "TITAN 5.6 SE CREW CAB",
-  "TITAN 5.6 SE KING CAB",
-  "TITAN 5.6 SL CREW CAB",
-  "TITAN 5.6 SV CREW CAB",
-  "TITAN 5.6 SV KING CAB",
-  "TITAN 5.6 XE CREW CAB",
-  "TITAN 5.6 XE KING CAB",
-  "TITAN XD PLATINUM CREW CAB",
-  "TITAN XD PRO-4X CREW CAB",
-  "TITAN XD S CREW CAB",
-  "TITAN XD SL CREW CAB",
-  "TITAN XD SV CREW CAB",
-
-  "PICKUP SR5",
-
-  "TACOMA",
-  "TACOMA ACCESS CAB",
-  "TACOMA DOUBLE CAB V6",
-  "TACOMA LIMITED DOUBLE CAB V6",
-  "TACOMA PRERUNNER DOUBLE CAB V6",
-  "TACOMA PRERUNNER V6 ACCESS CAB",
-  "TACOMA PRERUNNER XTRACAB",
-  "TACOMA PRERUNNER XTRACAB V6",
-  "TACOMA SR5 DOUBLE CAB V6",
-  "TACOMA SR5 V6 ACCESS CAB",
-  "TACOMA SR5 V6 XTRACAB",
-  "TACOMA V6 ACCESS CAB",
-  "TACOMA XTRACAB",
-  "TACOMA XTRACAB V6",
-  "TUNDRA ACCESS CAB V8",
-  "TUNDRA DOUBLE CAB V8",
-  "TUNDRA LIMITED ACCESS CAB V8",
-  "TUNDRA LIMITED SR5 DBLCAB V8",
-  "TUNDRA LIMITED V8",
-  "TUNDRA LIMITED V8 CREWMAX",
-  "TUNDRA LIMITED V8 DOUBLE CAB",
-  "TUNDRA PLATINUM V8 CREWMAX",
-  "TUNDRA SR DOUBLE CAB V8",
-  "TUNDRA SR V8",
-  "TUNDRA SR5 DOUBLE CAB V8",
-  "TUNDRA SR5 TRD DOUBLE CAB V8",
-  "TUNDRA SR5 V8 CREWMAX",
-  "TUNDRA V8",
-  "TUNDRA V8 CREWMAX",
-  "XTRACAB LONG BOX",
-
-  "AVALANCHE 1500",
-  "AVALANCHE 1500 LS",
-  "AVALANCHE 1500 LS Z71",
-  "AVALANCHE 1500 LT",
-  "AVALANCHE 1500 LT Z71",
-  "AVALANCHE 1500 LTZ",
-  "C/R 10/1500 4+CAB",
-  "C/R 10/1500 PICKUP",
-  "C/R 20/2500 4+CAB",
-  "C/R 20/2500 PICKUP",
-  "C3500",
-
-  "COLORADO",
-  "COLORADO EXT CAB",
-  "COLORADO LS",
-  "COLORADO LS CREW CAB",
-  "COLORADO LS EXT CAB",
-  "COLORADO LT",
-  "COLORADO LT CREW CAB",
-  "COLORADO LT EXT CAB",
-  "COLORADO WT CREW CAB",
-  "COLORADO WT EXT CAB",
-  "COLORADO Z71 CREW CAB",
-  "COLORADO Z71 EXT CAB",
-  "COLORADO ZR2 CREW CAB",
-  "COLORADO ZR2 EXT CAB",
-
-  "HHR LS PANEL",
-  "K/V 10/1500 4+CAB",
-  "K/V 10/1500 PICKUP",
-  "K/V 20/2500 4+CAB",
-  "K/V 20/2500 PICKUP",
-  "K/V 30/3500 4+CAB",
-  "Pickup K3500",
-  "Pickup Silverado C2500 HD",
-  "S10 4+CAB",
-  "S10 LS 4+CAB",
-  "SILVERADO 1500",
-  "SILVERADO 1500 CHEYENNE CREW",
-  "SILVERADO 1500 CREW CAB",
-  "SILVERADO 1500 CREW CAB (AMAL)",
-  "SILVERADO 1500 CUST TRAIL DC",
-  "SILVERADO 1500 CUSTOM CREW CAB",
-  "SILVERADO 1500 CUSTOM DC",
-  "SILVERADO 1500 CUSTOM TRAIL CC",
-  "SILVERADO 1500 DOUBLE (AMALGA)",
-  "SILVERADO 1500 EXT CAB",
-  "SILVERADO 1500 HD LS CREW CAB",
-  "SILVERADO 1500 HD LT CREW CAB",
-  "SILVERADO 1500 HIGH COUNTRY CC",
-  "SILVERADO 1500 HYBRID CREW CAB",
-  "SILVERADO 1500 LS",
-  "SILVERADO 1500 LS CREW CAB",
-  "SILVERADO 1500 LS DOUBLE CAB",
-  "SILVERADO 1500 LS EXT CAB",
-  "SILVERADO 1500 LT",
-  "SILVERADO 1500 LT CC (AMALGAM)",
-  "SILVERADO 1500 LT CREW CAB",
-  "SILVERADO 1500 LT DOUBLE CAB",
-  "SILVERADO 1500 LT EXT CAB",
-  "SILVERADO 1500 LT TRAIL CC",
-  "SILVERADO 1500 LT TRAIL DC",
-  "SILVERADO 1500 LTZ CREW CAB",
-  "SILVERADO 1500 LTZ DOUBLE CAB",
-  "SILVERADO 1500 LTZ EXT CAB",
-  "SILVERADO 1500 RST CREW CAB",
-  "SILVERADO 1500 RST DOUBLE CAB",
-  "SILVERADO 1500 SS EXT CAB",
-  "SILVERADO 1500 WT",
-  "SILVERADO 1500 WT CREW CAB",
-  "SILVERADO 1500 WT DOUBLE CAB",
-  "SILVERADO 1500 WT EXT CAB",
-  "SILVERADO 2500 EXT CAB",
-  "SILVERADO 2500 HD",
-  "SILVERADO 2500 HD CREW CAB",
-  "SILVERADO 2500 HD EXT CAB",
-  "SILVERADO 2500 HD HC CREW CAB",
-  "SILVERADO 2500 HD LS CREW CAB",
-  "SILVERADO 2500 HD LS EXT CAB",
-  "SILVERADO 2500 HD LT",
-  "SILVERADO 2500 HD LT CREW CAB",
-  "SILVERADO 2500 HD LT DBL CAB",
-  "SILVERADO 2500 HD LT EXT CAB",
-  "SILVERADO 2500 HD LTZ CREW CAB",
-  "SILVERADO 2500 HD LTZ DBL CAB",
-  "SILVERADO 2500 HD LTZ EXT CAB",
-  "SILVERADO 2500 HD WT",
-  "SILVERADO 2500 HD WT CREW CAB",
-  "SILVERADO 2500 HD WT DBL CAB",
-  "SILVERADO 2500 HD WT EXT CAB",
-  "SILVERADO 3500",
-  "SILVERADO 3500 CREW CAB",
-  "SILVERADO 3500 CREW CAB (AMAL)",
-  "SILVERADO 3500 EXT CAB",
-  "SILVERADO 3500 HC CREW CAB",
-  "SILVERADO 3500 HD (AMALGAMATE)",
-  "SILVERADO 3500 LS",
-  "SILVERADO 3500 LS CREW CAB",
-  "SILVERADO 3500 LS EXT CAB",
-  "SILVERADO 3500 LT CREW CAB",
-  "SILVERADO 3500 LT DOUBLE CAB",
-  "SILVERADO 3500 LT EXT CAB",
-  "SILVERADO 3500 LTZ CREW CAB",
-  "SILVERADO 3500 LTZ EXT CAB",
-  "SILVERADO 3500 WT CREW CAB",
-  "Silverado 3500HD",
-
-  "B250 SPORTSMAN",
-
-  "DAKOTA CLUB CAB",
-  "DAKOTA LARAMIE V8 CLUB CAB",
-  "DAKOTA LARAMIE V8 QUAD CAB",
-  "DAKOTA QUAD CAB",
-  "DAKOTA SLT CREW CAB",
-  "DAKOTA SLT EXT CAB",
-  "DAKOTA SLT PLUS QUAD CAB",
-  "DAKOTA SLT PLUS V8 CLUB CAB",
-  "DAKOTA SLT PLUS V8 QUAD CAB",
-  "DAKOTA SLT QUAD CAB",
-  "DAKOTA SLT V8 CLUB CAB",
-  "DAKOTA SLT V8 CREW CAB",
-  "DAKOTA SLT V8 EXT CAB",
-  "DAKOTA SLT V8 QUAD CAB",
-  "DAKOTA SPORT V8",
-  "DAKOTA SPORT V8 CLUB CAB",
-  "DAKOTA SPORT V8 QUAD CAB",
-  "DAKOTA ST CLUB CAB",
-  "DAKOTA ST QUAD CAB",
-  "DAKOTA ST V8 QUAD CAB",
-  "DAKOTA SXT CREW CAB",
-  "DAKOTA SXT EXT CAB",
-  "DAKOTA SXT V8 CREW CAB",
-  "DAKOTA SXT V8 EXT CAB",
-  "DAKOTA V8 CLUB CAB",
-  "DAKOTA V8 QUAD CAB",
-
-  "RAM 1500",
-  "RAM 1500 BIG HORN CREW CAB",
-  "RAM 1500 BIG HORN QUAD CAB",
-  "RAM 1500 CLUB CAB",
-  "RAM 1500 CREW CAB (AMALGAMATE)",
-  "RAM 1500 EXPRESS",
-  "RAM 1500 LARAMIE CREW (AMALGA)",
-  "RAM 1500 LARAMIE CREW CAB",
-  "RAM 1500 LARAMIE LONGHORN CREW",
-  "RAM 1500 LARAMIE MEGA CAB",
-  "RAM 1500 LARAMIE QUAD CAB",
-  "RAM 1500 LARAMIE SLT QUAD CAB",
-  "RAM 1500 LIMITED CREW CAB",
-  "RAM 1500 LONGHORN CREW CAB",
-  "RAM 1500 OUTDOORSMAN CREW CAB",
-  "RAM 1500 OUTDOORSMAN QC (AMAL)",
-  "RAM 1500 OUTDOORSMAN QUAD CAB",
-  "RAM 1500 QUAD CAB",
-  "RAM 1500 R/T",
-  "RAM 1500 REBEL CREW CAB",
-  "RAM 1500 REBEL QUAD CAB",
-  "RAM 1500 SLT",
-  "RAM 1500 SLT CREW (AMALGAMATE)",
-  "RAM 1500 SLT CREW CAB",
-  "RAM 1500 SLT MEGA CAB",
-  "RAM 1500 SLT QUAD (AMALGAMATE)",
-  "RAM 1500 SLT QUAD CAB",
-  "RAM 1500 SPORT",
-  "RAM 1500 SPORT CLUB CAB",
-  "RAM 1500 SPORT CREW CAB",
-  "RAM 1500 SPORT CREW CAB (AMAL)",
-  "RAM 1500 SPORT QUAD CAB",
-  "RAM 1500 ST",
-  "RAM 1500 ST CREW CAB",
-  "RAM 1500 ST QUAD CAB",
-  "RAM 1500 SXT CREW CAB",
-  "RAM 1500 SXT QUAD CAB",
-  "RAM 1500 TRADESMAN CREW CAB",
-  "RAM 1500 TRADESMAN QUAD CAB",
-  "RAM 1500 TRX QUAD CAB",
-  "RAM 2500",
-  "RAM 2500 BIG HORN CREW CAB",
-  "RAM 2500 BIG HORN MEGA CAB",
-  "RAM 2500 CLUB CAB",
-  "RAM 2500 LARAMIE CREW CAB",
-  "RAM 2500 LARAMIE LONGHORN CREW",
-  "RAM 2500 LARAMIE LONGHORN MEGA",
-  "RAM 2500 LARAMIE MEGA CAB",
-  "RAM 2500 LARAMIE QUAD CAB",
-  "RAM 2500 LARAMIE SLT",
-  "RAM 2500 LARAMIE SLT QUAD CAB",
-  "RAM 2500 LIMITED CREW CAB",
-  "RAM 2500 OUTDOORSMAN CREW CAB",
-  "RAM 2500 POWER WAGON CREW CAB",
-  "RAM 2500 QUAD CAB",
-  "RAM 2500 SLT",
-  "RAM 2500 SLT CREW CAB",
-  "RAM 2500 SLT MEGA CAB",
-  "RAM 2500 SLT QUAD CAB",
-  "RAM 2500 SLT QUAD CAB (AMALGA)",
-  "RAM 2500 SPORT QUAD CAB",
-  "RAM 2500 ST",
-  "RAM 2500 ST CREW CAB",
-  "RAM 2500 ST QUAD CAB",
-  "RAM 2500 SXT QUAD CAB",
-  "RAM 2500 TRADESMAN",
-  "RAM 2500 TRADESMAN CREW CAB",
-  "RAM 2500 TRX CREW CAB",
-  "RAM 2500 TRX QUAD CAB",
-  "RAM 3500",
-  "RAM 3500 4WD",
-  "RAM 3500 BIG HORN CREW CAB",
-  "RAM 3500 CREW CAB",
-  "RAM 3500 CREW CAB (AMALGAMATE)",
-  "RAM 3500 LARAMIE CREW CAB",
-  "RAM 3500 LARAMIE LONGHORN CREW",
-  "RAM 3500 LARAMIE LONGHORN MEGA",
-  "RAM 3500 LARAMIE MEGA CAB",
-  "RAM 3500 LARAMIE QUAD CAB",
-  "RAM 3500 LARAMIE SLT",
-  "RAM 3500 LARAMIE SLT QUAD CAB",
-  "RAM 3500 LIMITED MEGA CAB",
-  "RAM 3500 LONGHORN CREW CAB",
-  "RAM 3500 QUAD CAB",
-  "RAM 3500 SLT",
-  "RAM 3500 SLT CREW CAB",
-  "RAM 3500 SLT MEGA CAB",
-  "RAM 3500 SLT QUAD CAB",
-  "RAM 3500 SPORT QUAD CAB",
-  "RAM 3500 ST",
-  "RAM 3500 ST CREW CAB",
-  "RAM 3500 ST QUAD CAB",
-  "RAM 3500 TRX QUAD CAB",
-  "RAM 4500",
-  "RAM 4500 CREW CAB",
-  "RAM 5500",
-  "RAM 5500 CREW CAB",
-  "W250 TURBO DIESEL",
-
-  "C Series 5500",
-  "C/R 1500 4+CAB",
-  "C/R 1500 PICKUP",
-  "C/R 1500 SIERRA SL EXT CAB",
-  "C/R 3500",
-  "C/R 3500 PICKUP",
-  "CANYON ALL TERRAIN CREW CAB",
-  "CANYON CREW CAB",
-  "CANYON DENALI CREW CAB",
-  "CANYON EXT CAB",
-  "CANYON SL",
-  "CANYON SL EXT CAB",
-  "CANYON SLE",
-  "CANYON SLE CREW CAB",
-  "CANYON SLE EXT CAB",
-  "CANYON SLT CREW CAB",
-  "CANYON SLT CREW CAB (AMALGAMA)",
-  "K/V 1500 4+CAB",
-  "K/V 1500 PICKUP",
-  "K/V 2500 4+CAB",
-  "K/V 2500 PICKUP",
-  "K/V 3500 SIERRA SL CREW CAB",
-  "K/V 3500 SIERRA SLE CREW CAB",
-  "SIERRA 1500 AT4 CREW CAB",
-  "SIERRA 1500 AT4 DOUBLE CAB",
-  "SIERRA 1500 CREW CAB",
-  "SIERRA 1500 CREW CAB (AMALGAM)",
-  "SIERRA 1500 DENALI CREW CAB",
-  "SIERRA 1500 DENALI EXT CAB",
-  "SIERRA 1500 DOUBLE CAB",
-  "SIERRA 1500 ELEVATION CREW CAB",
-  "SIERRA 1500 ELEVATION DC",
-  "SIERRA 1500 EXT CAB",
-  "SIERRA 1500 HD CREW CAB",
-  "SIERRA 1500 HD SLE CREW CAB",
-  "SIERRA 1500 HD SLT CREW CAB",
-  "SIERRA 1500 NEVADA EDITION",
-  "SIERRA 1500 PICKUP",
-  "SIERRA 1500 SL CREW CAB",
-  "SIERRA 1500 SL EXT CAB",
-  "SIERRA 1500 SL PICKUP",
-  "SIERRA 1500 SLE CREW CAB",
-  "SIERRA 1500 SLE DC (AMALGAMAT)",
-  "SIERRA 1500 SLE DOUBLE CAB",
-  "SIERRA 1500 SLE EXT CAB",
-  "SIERRA 1500 SLE EXT CAB (AMAL)",
-  "SIERRA 1500 SLE PICKUP",
-  "SIERRA 1500 SLT CREW (AMALGAM)",
-  "SIERRA 1500 SLT CREW CAB",
-  "SIERRA 1500 SLT DOUBLE CAB",
-  "SIERRA 1500 SLT EXT CAB",
-  "SIERRA 1500 WT CREW CAB",
-  "SIERRA 1500 WT EXT CAB",
-  "SIERRA 1500 WT PICKUP",
-  "SIERRA 2500 EXT CAB",
-  "SIERRA 2500 HD AT4 CREW CAB",
-  "SIERRA 2500 HD CREW CAB",
-  "SIERRA 2500 HD DENALI CREW CAB",
-  "SIERRA 2500 HD DOUBLE CAB",
-  "SIERRA 2500 HD EXT CAB",
-  "SIERRA 2500 HD PICKUP",
-  "SIERRA 2500 HD SL EXT CAB",
-  "SIERRA 2500 HD SL PICKUP",
-  "SIERRA 2500 HD SLE CREW CAB",
-  "SIERRA 2500 HD SLE DOUBLE CAB",
-  "SIERRA 2500 HD SLE EXT CAB",
-  "SIERRA 2500 HD SLE PICKUP",
-  "SIERRA 2500 HD SLT CREW CAB",
-  "SIERRA 2500 HD SLT DOUBLE CAB",
-  "SIERRA 2500 HD SLT EXT CAB",
-  "SIERRA 2500 HD WT CREW CAB",
-  "SIERRA 2500 HD WT DOUBLE CAB",
-  "SIERRA 2500 HD WT EXT CAB",
-  "SIERRA 2500 HD WT PICKUP",
-  "SIERRA 2500 SLE EXT CAB",
-  "SIERRA 3500 AT4 CREW CAB",
-  "SIERRA 3500 CREW CAB",
-  "SIERRA 3500 DENALI CREW CAB",
-  "SIERRA 3500 EXT CAB",
-  "SIERRA 3500 PICKUP",
-  "SIERRA 3500 SL CREW CAB",
-  "SIERRA 3500 SLE",
-  "SIERRA 3500 SLE CREW CAB",
-  "SIERRA 3500 SLE EXT CAB",
-  "SIERRA 3500 SLT CREW CAB",
-  "SIERRA 3500 WT CREW CAB",
-  "SONOMA",
-  "SONOMA CREW CAB",
-  "SONOMA EXT CAB",
-
-  "1500",
-  "1500 Classic",
-  "Pickup 1500",
-  "Pickup 3500",
-  "ProMaster 1500",
-
-  "RIDGELINE",
-  "RIDGELINE BLACK EDITION",
-  "RIDGELINE DX",
-  "RIDGELINE EX-L",
-  "RIDGELINE LX",
-  "RIDGELINE RT",
-  "RIDGELINE RTL",
-  "RIDGELINE RTS",
-  "RIDGELINE RTX",
-  "RIDGELINE SE",
-  "RIDGELINE SPORT",
-  "RIDGELINE TOURING",
-  "RIDGELINE VP",
-
-  "TITAN",
-  "TACOMA",
-  "TUNDRA",
-  "AVALANCE",
-  "COLORADO",
-  "SILVERADO",
-  "SILVERADO 1500",
-  "SILVERADO 2500",
-  "SILVERADO 3500",
-  "DAKOTA",
-  "RAM 1500",
-  "RAM 2500",
-  "RAM 3500",
-  "RAM 4500",
-  "RAM 5500",
-  "CANYON",
-  "SIERRA 1500",
-  "SIERRA 2500",
-  "SIERRA 3500",
-  "SONOMA",
-  "1500"
-]

server/data/vehicletype/vehicletype.js

@@ -1,39 +0,0 @@
-const logger = require("../../utils/logger");
-const TrucksList = require("./trucks.json");
-const CargoVanList = require("./cargovans.json");
-const PassengerVanList = require("./passengervans.json");
-const SuvList = require("./suvs.json");
-
-
-const vehicletype = async (req, res) => {
-    try {
-        const { model } = req.body;
-        if (!model || model.trim() === "") {
-            res.status(400).json({ success: false, error: "Please provide a model" });
-        } else {
-            vehicle
-            const type = getVehicleType(model.trim())
-            res.status(200).json({ success: true, ...type });
-        }
-    } catch (error) {
-        logger.log("vehicletype-error", "ERROR", req?.user?.email, null, {
-            error: error.message,
-            stack: error.stack
-        });
-        res.status(500).json({ error: error.message, stack: error.stack });
-    }
-};
-
-function getVehicleType(model) {
-    const inTrucks = TrucksList.includes(model.toUpperCase());
-    const inPV = PassengerVanList.includes(model.toUpperCase());
-    const inSuv = SuvList.includes(model.toUpperCase());
-    const inCv = CargoVanList.includes(model.toUpperCase());
-
-    if (inTrucks) return { type: "TK", match: true };
-    else if (inPV) return { type: "PC", match: true };
-    else if (inSuv) return { type: "SUV", match: true };
-    else if (inCv) return { type: "VN", match: true };
-    else return { type: "PC", match: false };
-}
-exports.default = vehicletype;

server/fortellis/fortellis.js

@@ -432,8 +432,8 @@ async function QueryDmsCustomerByName({ socket, redisHelpers, JobData }) {
       //? [["firstName", JobData.ownr_co_nm.replace(replaceSpecialRegex, "").toUpperCase()]] // Commented out until we receive direction. 
       ? [["phone", JobData.ownr_ph1?.replace(replaceSpecialRegex, "")]]
       : [
-        ["firstName", JobData.ownr_fn?.replace(replaceSpecialRegex, "").toUpperCase()],
-        ["lastName", JobData.ownr_ln?.replace(replaceSpecialRegex, "").toUpperCase()]
+        ["firstName", JobData.ownr_fn?.replace(/[^a-zA-Z-]/g, "").toUpperCase()],
+        ["lastName", JobData.ownr_ln?.replace(/[^a-zA-Z-]/g, "").toUpperCase()]
       ];
   try {
     const result = await MakeFortellisCall({
@@ -474,9 +474,9 @@ async function InsertDmsCustomer({ socket, redisHelpers, JobData }) {
         } : {
           customerName: {
             //"suffix": "Mr.",
-            firstName: JobData.ownr_fn && JobData.ownr_fn.replace(replaceSpecialRegex, "").toUpperCase(),
+            firstName: JobData.ownr_fn && JobData.ownr_fn.replace(/[^a-zA-Z-]/g, "").toUpperCase(),
             //"middleName": "",
-            lastName: JobData.ownr_ln && JobData.ownr_ln.replace(replaceSpecialRegex, "").toUpperCase()
+            lastName: JobData.ownr_ln && JobData.ownr_ln.replace(/[^a-zA-Z-]/g, "").toUpperCase()
             //"title": "",
             //"nickName": ""
           }

server/graphql-client/queries.js

@@ -827,13 +827,21 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
         quantity
       }
     }
-    timetickets {
+    timetickets(where: {cost_center: {_neq: "timetickets.labels.shift"}}) {
       id
       rate
+      ciecacode
       cost_center
       actualhrs
       productivehrs
       flat_rate
+      employeeid
+      employee {
+        employee_number
+        flat_rate
+        first_name
+        last_name
+      }
     }
     area_of_damage
     employee_prep_rel {
@@ -1612,6 +1620,9 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       rate_ats
       flat_rate_ats
       rate_ats_flat
+      dms_id
+      dms_customer_id
+      dms_advisor_id
       joblines(where: { removed: { _eq: false } }){
         id
         line_no
@@ -1911,10 +1922,35 @@ exports.GET_AUTOHOUSE_SHOPS = `query GET_AUTOHOUSE_SHOPS {
 }`;
 
 exports.GET_CHATTER_SHOPS = `query GET_CHATTER_SHOPS {
-  bodyshops(where: {chatterid: {_is_null: false}, _or: {chatterid: {_neq: ""}}}){
+  bodyshops(
+    where: {
+      chatterid: { _is_null: false, _neq: "" }
+      _or: [
+        { chatter_company_id: { _is_null: true } }
+        { chatter_company_id: { _eq: "" } }
+      ]
+    }
+  ) {
     id
     shopname
     chatterid
+    chatter_company_id
+    imexshopid
+    timezone
+  }
+}`;
+
+exports.GET_CHATTER_SHOPS_WITH_COMPANY = `query GET_CHATTER_SHOPS_WITH_COMPANY {
+  bodyshops(
+    where: {
+      chatterid: { _is_null: false, _neq: "" }
+      chatter_company_id: { _is_null: false, _neq: "" }
+    }
+  ) {
+    id
+    shopname
+    chatterid
+    chatter_company_id
     imexshopid
     timezone
   }
@@ -3203,9 +3239,12 @@ exports.UPDATE_USER_FCM_TOKENS_BY_EMAIL = /* GraphQL */ `
   }
 `;
 
-exports.SET_JOB_DMS_ID = `mutation SetJobDmsId($id: uuid!, $dms_id: String!) {
-    update_jobs_by_pk(pk_columns: { id: $id }, _set: { dms_id: $dms_id }) {
+exports.SET_JOB_DMS_ID = `mutation SetJobDmsId($id: uuid!, $dms_id: String!, $dms_customer_id: String, $dms_advisor_id: String, $kmin: Int) {
+    update_jobs_by_pk(pk_columns: { id: $id }, _set: { dms_id: $dms_id, dms_customer_id: $dms_customer_id, dms_advisor_id: $dms_advisor_id, kmin: $kmin }) {
       id
       dms_id
+      dms_customer_id
+      dms_advisor_id
+      kmin
     }
   }`;

server/job/job-costing.js

@@ -13,6 +13,9 @@ const { DiscountNotAlreadyCounted } = InstanceManager({
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
 
+const isImEX = InstanceManager({ imex: true, rome: false });
+const isRome = InstanceManager({ imex: false, rome: true });
+
 async function JobCosting(req, res) {
   const { jobid } = req.body;
 
@@ -266,9 +269,7 @@ function GenerateCostingData(job) {
   );
 
   const materialsHours = { mapaHrs: 0, mashHrs: 0 };
-  let mashOpCodes = InstanceManager({
-    rome: ParseCalopCode(job.materials["MASH"]?.cal_opcode)
-  });
+  let mashOpCodes = isRome && ParseCalopCode(job.materials["MASH"]?.cal_opcode);
   let hasMapaLine = false;
   let hasMashLine = false;
 
@@ -355,7 +356,7 @@ function GenerateCostingData(job) {
           if (val.mod_lbr_ty === "LAR") {
             materialsHours.mapaHrs += val.mod_lb_hrs || 0;
           }
-          if (InstanceManager({ imex: true, rome: false })) {
+          if (isImEX) {
             if (val.mod_lbr_ty !== "LAR") {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
@@ -363,7 +364,7 @@ function GenerateCostingData(job) {
             if (val.mod_lbr_ty !== "LAR" && mashOpCodes.includes(val.lbr_op)) {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
-            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR" ) {
+            if (val.manual_line === true && !mashOpCodes.includes(val.lbr_op) && val.mod_lbr_ty !== "LAR") {
               materialsHours.mashHrs += val.mod_lb_hrs || 0;
             }
           }
@@ -525,14 +526,15 @@ function GenerateCostingData(job) {
       }
     }
 
-    if (InstanceManager({ rome: true })) {
+    if (isRome) {
       if (convertedKey) {
         const correspondingCiecaStlTotalLine = job.cieca_stl?.data.find(
           (c) => c.ttl_typecd === convertedKey.toUpperCase()
         );
         if (
           correspondingCiecaStlTotalLine &&
-          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) > 1
+          Math.abs(jobLineTotalsByProfitCenter.parts[key].getAmount() - correspondingCiecaStlTotalLine.ttl_amt * 100) >
+            1
         ) {
           jobLineTotalsByProfitCenter.parts[key] = jobLineTotalsByProfitCenter.parts[key].add(disc).add(markup);
         }
@@ -545,7 +547,7 @@ function GenerateCostingData(job) {
     if (
       job.materials["MAPA"] &&
       job.materials["MAPA"].cal_maxdlr !== undefined &&
-      job.materials["MAPA"].cal_maxdlr >= 0
+      (isRome ? job.materials["MAPA"].cal_maxdlr >= 0 : job.materials["MAPA"].cal_maxdlr > 0)
     ) {
       //It has an upper threshhold.
       threshold = Dinero({
@@ -595,7 +597,7 @@ function GenerateCostingData(job) {
     if (
       job.materials["MASH"] &&
       job.materials["MASH"].cal_maxdlr !== undefined &&
-      job.materials["MASH"].cal_maxdlr >= 0
+      (isRome ? job.materials["MASH"].cal_maxdlr >= 0 : job.materials["MASH"].cal_maxdlr > 0)
     ) {
       //It has an upper threshhold.
       threshold = Dinero({
@@ -641,7 +643,7 @@ function GenerateCostingData(job) {
     }
   }
 
-  if (InstanceManager({ imex: false, rome: true })) {
+  if (isRome) {
     const stlTowing = job.cieca_stl?.data.find((c) => c.ttl_type === "OTTW");
     const stlStorage = job.cieca_stl?.data.find((c) => c.ttl_type === "OTST");
 

server/routes/aiRoutes.js

@@ -0,0 +1,17 @@
+const express = require("express");
+const router = express.Router();
+const multer = require("multer");
+const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
+const withUserGraphQLClientMiddleware = require("../middleware/withUserGraphQLClientMiddleware");
+const { handleBillOcr, handleBillOcrStatus } = require("../ai/bill-ocr/bill-ocr");
+
+// Configure multer for form data parsing
+const upload = multer();
+
+router.use(validateFirebaseIdTokenMiddleware);
+router.use(withUserGraphQLClientMiddleware);
+
+router.post("/bill-ocr", upload.single('billScan'), handleBillOcr);
+router.get("/bill-ocr/status/:textractJobId", handleBillOcrStatus);
+
+module.exports = router;

server/routes/chatterRoutes.js

@@ -0,0 +1,12 @@
+const express = require("express");
+const createLocation = require("../chatter/createLocation");
+const router = express.Router();
+const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
+const validateAdminMiddleware = require("../middleware/validateAdminMiddleware");
+
+router.use(validateFirebaseIdTokenMiddleware);
+router.use(validateAdminMiddleware);
+
+router.post("/create-location", createLocation);
+
+module.exports = router;

server/routes/dataRoutes.js

@@ -1,10 +1,21 @@
 const express = require("express");
 const router = express.Router();
-const { autohouse, claimscorp, chatter, kaizen, usageReport, podium, carfax, carfaxRps } = require("../data/data");
+const {
+  autohouse,
+  claimscorp,
+  chatter,
+  kaizen,
+  usageReport,
+  podium,
+  carfax,
+  carfaxRps,
+  chatterApi
+} = require("../data/data");
 
 router.post("/ah", autohouse);
 router.post("/cc", claimscorp);
 router.post("/chatter", chatter);
+router.post("/chatter-api", chatterApi);
 router.post("/kaizen", kaizen);
 router.post("/usagereport", usageReport);
 router.post("/podium", podium);

server/routes/miscellaneousRoutes.js

@@ -144,20 +144,5 @@ router.post("/emsupload", validateFirebaseIdTokenMiddleware, data.emsUpload);
 // Redis Cache Routes
 router.post("/bodyshop-cache", eventAuthorizationMiddleware, updateBodyshopCache);
 
-// Estimate Scrubber Vehicle Type
-router.post("/es/vehicletype", data.vehicletype);
-router.post("/analytics/documents", data.documentAnalytics);
-// Health Check for docker-compose-cluster load balancer, only available in development
-if (process.env.NODE_ENV === "development") {
-  router.get("/health", (req, res) => {
-    const healthStatus = {
-      status: "healthy",
-      timestamp: new Date().toISOString(),
-      environment: process.env.NODE_ENV || "unknown",
-      uptime: process.uptime()
-    };
-    res.status(200).json(healthStatus);
-  });
-}
 
 module.exports = router;

server/rr/rr-export-logs.js

@@ -86,8 +86,9 @@ const buildMessageJSONString = ({ error, classification, result, fallback }) =>
 /**
  * Success: mark job exported + (optionally) insert a success log.
  * Uses queries.MARK_JOB_EXPORTED (same shape as Fortellis/PBS).
+ * @param {boolean} isEarlyRo - If true, only logs success but does NOT change job status (for early RO creation)
  */
-const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaExtra = {} }) => {
+const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaExtra = {}, isEarlyRo = false }) => {
   const endpoint = process.env.GRAPHQL_ENDPOINT;
   if (!endpoint) throw new Error("GRAPHQL_ENDPOINT not configured");
   const token = getAuthToken(socket);
@@ -96,11 +97,40 @@ const markRRExportSuccess = async ({ socket, jobId, job, bodyshop, result, metaE
   const client = new GraphQLClient(endpoint, {});
   client.setHeaders({ Authorization: `Bearer ${token}` });
 
+  const meta = buildRRExportMeta({ result, extra: metaExtra });
+
+  // For early RO, we only insert a log but do NOT change job status or mark as exported
+  if (isEarlyRo) {
+    try {
+      await client.request(queries.INSERT_EXPORT_LOG, {
+        logs: [
+          {
+            bodyshopid: bodyshop?.id || job?.bodyshop?.id,
+            jobid: jobId,
+            successful: true,
+            useremail: socket?.user?.email || null,
+            metadata: meta,
+            message: buildMessageJSONString({ result, fallback: "RR early RO created" })
+          }
+        ]
+      });
+
+      CreateRRLogEvent(socket, "INFO", "RR early RO: success log inserted (job status unchanged)", {
+        jobId
+      });
+    } catch (e) {
+      CreateRRLogEvent(socket, "ERROR", "RR early RO: failed to insert success log", {
+        jobId,
+        error: e?.message
+      });
+    }
+    return;
+  }
+
+  // Full export: mark job as exported and insert success log
   const exportedStatus =
     job?.bodyshop?.md_ro_statuses?.default_exported || bodyshop?.md_ro_statuses?.default_exported || "Exported*";
 
-  const meta = buildRRExportMeta({ result, extra: metaExtra });
-
   try {
     await client.request(queries.MARK_JOB_EXPORTED, {
       jobId,

server/rr/rr-job-export.js

@@ -56,7 +56,324 @@ const deriveRRStatus = (rrRes = {}) => {
 };
 
 /**
- * Step 1: Export a job to RR as a new Repair Order.
+ * Early RO Creation: Create a minimal RR Repair Order with basic info (customer, advisor, mileage, story).
+ * Used when creating RO from convert button or admin page before full job export.
+ * @param args
+ * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
+ */
+const createMinimalRRRepairOrder = async (args) => {
+  const { bodyshop, job, advisorNo, selectedCustomer, txEnvelope, socket, svId } = args || {};
+
+  if (!bodyshop) throw new Error("createMinimalRRRepairOrder: bodyshop is required");
+  if (!job) throw new Error("createMinimalRRRepairOrder: job is required");
+  if (advisorNo == null || String(advisorNo).trim() === "") {
+    throw new Error("createMinimalRRRepairOrder: advisorNo is required for RR");
+  }
+
+  // Resolve customer number (accept multiple shapes)
+  const selected = selectedCustomer?.customerNo || selectedCustomer?.custNo;
+  if (!selected) throw new Error("createMinimalRRRepairOrder: selectedCustomer.custNo/customerNo is required");
+
+  const { client, opts } = buildClientAndOpts(bodyshop);
+
+  // For early RO creation we always "Insert" (create minimal RO)
+  const finalOpts = {
+    ...opts,
+    envelope: {
+      ...(opts?.envelope || {}),
+      sender: {
+        ...(opts?.envelope?.sender || {}),
+        task: "BSMRO",
+        referenceId: "Insert"
+      }
+    }
+  };
+
+  const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
+  const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
+
+  // Build minimal RO payload - just header, no allocations/parts/labor
+  const cleanVin =
+    (job?.v_vin || "")
+      .toString()
+      .replace(/[^A-Za-z0-9]/g, "")
+      .toUpperCase()
+      .slice(0, 17) || undefined;
+
+  // Resolve mileage - must be a positive number
+  let mileageIn = txEnvelope?.kmin ?? job?.kmin ?? null;
+  if (mileageIn != null) {
+    mileageIn = parseInt(mileageIn, 10);
+    if (isNaN(mileageIn) || mileageIn < 0) {
+      mileageIn = null;
+    }
+  }
+
+  CreateRRLogEvent(socket, "DEBUG", "Resolved mileage for early RO", {
+    txEnvelopeKmin: txEnvelope?.kmin,
+    jobKmin: job?.kmin,
+    resolvedMileageIn: mileageIn
+  });
+
+  const payload = {
+    customerNo: String(selected),
+    advisorNo: String(advisorNo),
+    vin: cleanVin,
+    departmentType: "B",
+    outsdRoNo: job?.ro_number || job?.id || undefined,
+    estimate: {
+      parts: "0",
+      labor: "0",
+      total: "0.00"
+    }
+  };
+
+  // Only add mileageIn if we have a valid value
+  if (mileageIn != null && mileageIn >= 0) {
+    payload.mileageIn = mileageIn;
+  }
+
+  // Add optional fields if present
+  if (story) {
+    payload.roComment = story;
+  }
+  if (makeOverride) {
+    payload.makeOverride = makeOverride;
+  }
+
+  CreateRRLogEvent(socket, "INFO", "Creating minimal RR Repair Order (early creation)", {
+    payload
+  });
+
+  const response = await client.createRepairOrder(payload, finalOpts);
+
+  CreateRRLogEvent(socket, "INFO", "RR minimal Repair Order created", {
+    payload,
+    response
+  });
+
+  const data = response?.data || null;
+  const statusBlocks = response?.statusBlocks || {};
+  const roStatus = deriveRRStatus(response);
+
+  const statusUpper = roStatus?.status ? String(roStatus.status).toUpperCase() : null;
+
+  let success = false;
+
+  if (statusUpper) {
+    // Treat explicit FAILURE / ERROR as hard failures
+    success = !["FAILURE", "ERROR"].includes(statusUpper);
+  } else if (typeof response?.success === "boolean") {
+    // Fallback to library boolean if no explicit status
+    success = response.success;
+  } else if (roStatus?.status) {
+    success = String(roStatus.status).toUpperCase() === "SUCCESS";
+  }
+
+  // Extract canonical roNo for later updates
+  const roNo = data?.dmsRoNo ?? data?.outsdRoNo ?? roStatus?.dmsRoNo ?? null;
+
+  return {
+    success,
+    data,
+    roStatus,
+    statusBlocks,
+    customerNo: String(selected),
+    svId,
+    roNo,
+    xml: response?.xml // expose XML for logging/diagnostics
+  };
+};
+
+/**
+ * Full Data Update: Update an existing RR Repair Order with complete job data (allocations, parts, labor).
+ * Used during DMS post form when an early RO was already created.
+ * @param args
+ * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
+ */
+const updateRRRepairOrderWithFullData = async (args) => {
+  const { bodyshop, job, advisorNo, selectedCustomer, txEnvelope, socket, svId, roNo } = args || {};
+
+  if (!bodyshop) throw new Error("updateRRRepairOrderWithFullData: bodyshop is required");
+  if (!job) throw new Error("updateRRRepairOrderWithFullData: job is required");
+  if (advisorNo == null || String(advisorNo).trim() === "") {
+    throw new Error("updateRRRepairOrderWithFullData: advisorNo is required for RR");
+  }
+  if (!roNo) throw new Error("updateRRRepairOrderWithFullData: roNo is required for update");
+
+  // Resolve customer number (accept multiple shapes)
+  const selected = selectedCustomer?.customerNo || selectedCustomer?.custNo;
+  if (!selected) throw new Error("updateRRRepairOrderWithFullData: selectedCustomer.custNo/customerNo is required");
+
+  const { client, opts } = buildClientAndOpts(bodyshop);
+
+  // For full data update after early RO, we still use "Insert" referenceId
+  // because we're inserting the job operations for the first time
+  const finalOpts = {
+    ...opts,
+    envelope: {
+      ...(opts?.envelope || {}),
+      sender: {
+        ...(opts?.envelope?.sender || {}),
+        task: "BSMRO",
+        referenceId: "Insert"
+      }
+    }
+  };
+
+  const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
+  const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
+
+  // Optional RR OpCode segments coming from the FE (RRPostForm)
+  const opPrefix = txEnvelope?.opPrefix ?? txEnvelope?.op_prefix ?? null;
+  const opBase = txEnvelope?.opBase ?? txEnvelope?.op_base ?? null;
+  const opSuffix = txEnvelope?.opSuffix ?? txEnvelope?.op_suffix ?? null;
+
+  // RR-only extras
+  let rrCentersConfig = null;
+  let allocations = null;
+  let opCode = null;
+
+  // 1) Responsibility center config (for visibility / debugging)
+  try {
+    rrCentersConfig = extractRrResponsibilityCenters(bodyshop);
+
+    CreateRRLogEvent(socket, "SILLY", "RR responsibility centers resolved", {
+      hasCenters: !!bodyshop.md_responsibility_centers,
+      profitCenters: Object.keys(rrCentersConfig?.profitsByName || {}),
+      costCenters: Object.keys(rrCentersConfig?.costsByName || {}),
+      dmsCostDefaults: rrCentersConfig?.dmsCostDefaults || {},
+      dmsProfitDefaults: rrCentersConfig?.dmsProfitDefaults || {}
+    });
+  } catch (e) {
+    CreateRRLogEvent(socket, "ERROR", "Failed to resolve RR responsibility centers", {
+      message: e?.message,
+      stack: e?.stack
+    });
+  }
+
+  // 2) Allocations (sales + cost by center, with rr_* metadata already attached)
+  try {
+    const allocResult = await CdkCalculateAllocations(socket, job.id);
+
+    // We only need the per-center job allocations for RO.GOG / ROLABOR.
+    allocations = Array.isArray(allocResult?.jobAllocations) ? allocResult.jobAllocations : [];
+
+    CreateRRLogEvent(socket, "INFO", "RR allocations resolved for update", {
+      hasAllocations: allocations.length > 0,
+      count: allocations.length,
+      allocationsPreview: allocations.slice(0, 2).map(a => ({
+        type: a?.type,
+        code: a?.code,
+        laborSale: a?.laborSale,
+        laborCost: a?.laborCost,
+        partsSale: a?.partsSale,
+        partsCost: a?.partsCost
+      })),
+      taxAllocCount: Array.isArray(allocResult?.taxAllocArray) ? allocResult.taxAllocArray.length : 0,
+      ttlAdjCount: Array.isArray(allocResult?.ttlAdjArray) ? allocResult.ttlAdjArray.length : 0,
+      ttlTaxAdjCount: Array.isArray(allocResult?.ttlTaxAdjArray) ? allocResult.ttlTaxAdjArray.length : 0
+    });
+  } catch (e) {
+    CreateRRLogEvent(socket, "ERROR", "Failed to calculate RR allocations", {
+      message: e?.message,
+      stack: e?.stack
+    });
+    // Proceed with a header-only update if allocations fail.
+    allocations = [];
+  }
+
+  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
+
+  let opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
+
+  // If the FE only sends segments, combine them here.
+  if (!opCodeOverride && (opPrefix || opBase || opSuffix)) {
+    const combined = `${opPrefix || ""}${opBase || ""}${opSuffix || ""}`.trim();
+    if (combined) {
+      opCodeOverride = combined;
+    }
+  }
+
+  if (opCodeOverride || resolvedBaseOpCode) {
+    opCode = String(opCodeOverride || resolvedBaseOpCode).trim() || null;
+  }
+
+  CreateRRLogEvent(socket, "SILLY", "RR OP config resolved", {
+    opCode,
+    baseFromConfig: resolvedBaseOpCode,
+    opPrefix,
+    opBase,
+    opSuffix
+  });
+
+  // Build full RO payload for update with allocations
+  const payload = buildRRRepairOrderPayload({
+    bodyshop,
+    job,
+    selectedCustomer: { customerNo: String(selected), custNo: String(selected) },
+    advisorNo: String(advisorNo),
+    story,
+    makeOverride,
+    allocations,
+    opCode
+  });
+
+  // Add roNo for linking to existing RO
+  payload.roNo = String(roNo);
+  payload.outsdRoNo = job?.ro_number || job?.id || undefined;
+  
+  // Keep rolabor - it's needed to register the job/OpCode accounts in Reynolds
+  // Without this, Reynolds won't recognize the OpCode when we send rogg operations
+  // The rolabor section tells Reynolds "these jobs exist" even with minimal data
+  
+  CreateRRLogEvent(socket, "INFO", "Sending full data for early RO (using create with roNo)", {
+    roNo: String(roNo),
+    hasRolabor: !!payload.rolabor,
+    hasRogg: !!payload.rogg,
+    payload
+  });
+
+  // Use createRepairOrder (not update) with the roNo to link to the existing early RO
+  // Reynolds will merge this with the existing RO header
+  const response = await client.createRepairOrder(payload, finalOpts);
+
+  CreateRRLogEvent(socket, "INFO", "RR Repair Order full data sent", {
+    payload,
+    response
+  });
+
+  const data = response?.data || null;
+  const statusBlocks = response?.statusBlocks || {};
+  const roStatus = deriveRRStatus(response);
+
+  const statusUpper = roStatus?.status ? String(roStatus.status).toUpperCase() : null;
+
+  let success = false;
+
+  if (statusUpper) {
+    success = !["FAILURE", "ERROR"].includes(statusUpper);
+  } else if (typeof response?.success === "boolean") {
+    success = response.success;
+  } else if (roStatus?.status) {
+    success = String(roStatus.status).toUpperCase() === "SUCCESS";
+  }
+
+  return {
+    success,
+    data,
+    roStatus,
+    statusBlocks,
+    customerNo: String(selected),
+    svId,
+    roNo: String(roNo),
+    xml: response?.xml
+  };
+};
+
+/**
+ * LEGACY: Step 1: Export a job to RR as a new Repair Order with full data.
+ * This is the original function - kept for backward compatibility if shops don't use early RO creation.
  * @param args
  * @returns {Promise<{success: boolean, data: *, roStatus: {status: *, statusCode: *|undefined, message}, statusBlocks: *|{}, customerNo: string, svId: *, roNo: *, xml: *}>}
  */
@@ -315,4 +632,10 @@ const finalizeRRRepairOrder = async (args) => {
   };
 };
 
-module.exports = { exportJobToRR, finalizeRRRepairOrder, deriveRRStatus };
+module.exports = {
+  exportJobToRR,
+  createMinimalRRRepairOrder,
+  updateRRRepairOrderWithFullData,
+  finalizeRRRepairOrder,
+  deriveRRStatus
+};

server/rr/rr-register-socket-events.js

@@ -1,7 +1,12 @@
 const CreateRRLogEvent = require("./rr-logger-event");
 const { rrCombinedSearch, rrGetAdvisors, buildClientAndOpts } = require("./rr-lookup");
 const { QueryJobData, buildRogogFromAllocations, buildRolaborFromRogog } = require("./rr-job-helpers");
-const { exportJobToRR, finalizeRRRepairOrder } = require("./rr-job-export");
+const {
+  exportJobToRR,
+  createMinimalRRRepairOrder,
+  updateRRRepairOrderWithFullData,
+  finalizeRRRepairOrder
+} = require("./rr-job-export");
 const RRCalculateAllocations = require("./rr-calculate-allocations").default;
 const { createRRCustomer } = require("./rr-customers");
 const { ensureRRServiceVehicle } = require("./rr-service-vehicles");
@@ -124,13 +129,15 @@ const getBodyshopForSocket = async ({ bodyshopId, socket }) => {
 };
 
 /**
- * GraphQL mutation to set job.dms_id
+ * GraphQL mutation to set job.dms_id, dms_customer_id, and dms_advisor_id
  * @param socket
  * @param jobId
  * @param dmsId
+ * @param dmsCustomerId
+ * @param dmsAdvisorId
  * @returns {Promise<void>}
  */
-const setJobDmsIdForSocket = async ({ socket, jobId, dmsId }) => {
+const setJobDmsIdForSocket = async ({ socket, jobId, dmsId, dmsCustomerId, dmsAdvisorId, mileageIn }) => {
   if (!jobId || !dmsId) {
     CreateRRLogEvent(socket, "WARN", "setJobDmsIdForSocket called without jobId or dmsId", {
       jobId,
@@ -149,16 +156,28 @@ const setJobDmsIdForSocket = async ({ socket, jobId, dmsId }) => {
     const client = new GraphQLClient(endpoint, {});
     await client
       .setHeaders({ Authorization: `Bearer ${token}` })
-      .request(queries.SET_JOB_DMS_ID, { id: jobId, dms_id: String(dmsId) });
+      .request(queries.SET_JOB_DMS_ID, { 
+        id: jobId, 
+        dms_id: String(dmsId),
+        dms_customer_id: dmsCustomerId ? String(dmsCustomerId) : null,
+        dms_advisor_id: dmsAdvisorId ? String(dmsAdvisorId) : null,
+        kmin: mileageIn != null && mileageIn > 0 ? parseInt(mileageIn, 10) : null
+      });
 
     CreateRRLogEvent(socket, "INFO", "Linked job.dms_id to RR RO", {
       jobId,
-      dmsId: String(dmsId)
+      dmsId: String(dmsId),
+      dmsCustomerId,
+      dmsAdvisorId,
+      mileageIn
     });
   } catch (err) {
     CreateRRLogEvent(socket, "ERROR", "Failed to set job.dms_id after RR create/update", {
       jobId,
       dmsId,
+      dmsCustomerId,
+      dmsAdvisorId,
+      mileageIn,
       message: err?.message || String(err),
       stack: err?.stack
     });
@@ -373,7 +392,504 @@ const registerRREvents = ({ socket, redisHelpers }) => {
     }
   });
 
-  socket.on("rr-export-job", async ({ jobid, jobId, txEnvelope } = {}) => {
+  /**
+   * NEW: Early RO Creation Event
+   * Creates a minimal RO from convert button or admin page with customer selection,
+   * advisor, mileage, and optional story/overrides.
+   */
+  socket.on("rr-create-early-ro", async ({ jobid, jobId, txEnvelope } = {}) => {
+    const rid = resolveJobId(jobid || jobId, { jobId, jobid }, null);
+
+    try {
+      if (!rid) throw new Error("RR early create: jobid required");
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1} Received RR early RO creation request`, { jobid: rid });
+
+      // Cache txEnvelope (contains advisor, mileage, story, overrides)
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        getTransactionType(rid),
+        RRCacheEnums.txEnvelope,
+        txEnvelope || {},
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.1} Cached txEnvelope`, { hasTxEnvelope: !!txEnvelope });
+
+      const job = await QueryJobData({ redisHelpers }, rid);
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        getTransactionType(rid),
+        RRCacheEnums.JobData,
+        job,
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.2} Cached JobData`, { vin: job?.v_vin, ro: job?.ro_number });
+
+      const adv = readAdvisorNo(
+        { txEnvelope },
+        await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo)
+      );
+
+      if (adv) {
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.AdvisorNo,
+          String(adv),
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-1.3} Cached advisorNo`, { advisorNo: String(adv) });
+      }
+
+      const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+      const bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-2} Running multi-search (Full Name + VIN)`);
+
+      const candidates = await rrMultiCustomerSearch({ bodyshop, job, socket, redisHelpers });
+      const decorated = candidates.map((c) => (c.vinOwner != null ? c : { ...c, vinOwner: !!c.isVehicleOwner }));
+
+      socket.emit("rr-select-customer", decorated);
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-2.1} Emitted rr-select-customer for early RO`, {
+        count: decorated.length,
+        anyOwner: decorated.some((c) => c.vinOwner || c.isVehicleOwner)
+      });
+    } catch (error) {
+      CreateRRLogEvent(socket, "ERROR", `Error during RR early RO creation (prepare)`, {
+        error: error.message,
+        stack: error.stack,
+        jobid: rid
+      });
+
+      try {
+        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: error.message });
+      } catch {
+        //
+      }
+    }
+  });
+
+  /**
+   * NEW: Early RO Customer Selected Event
+   * Handles customer selection for early RO creation and creates minimal RO.
+   */
+  socket.on("rr-early-customer-selected", async ({ jobid, jobId, selectedCustomerId, custNo, create } = {}, ack) => {
+    const rid = resolveJobId(jobid || jobId, { jobid, jobId }, null);
+    let bodyshop = null;
+    let job = null;
+    let createdCustomer = false;
+
+    try {
+      if (!rid) throw new Error("jobid required");
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3} rr-early-customer-selected`, {
+        jobid: rid,
+        custNo,
+        selectedCustomerId,
+        create: !!create
+      });
+
+      const ns = getTransactionType(rid);
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0a} Raw parameters received`, {
+        custNo: custNo,
+        custNoType: typeof custNo,
+        selectedCustomerId: selectedCustomerId,
+        create: create
+      });
+
+      let selectedCustNo =
+        (custNo && String(custNo)) ||
+        (selectedCustomerId && String(selectedCustomerId)) ||
+        (await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.SelectedCustomer));
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0b} After initial resolution`, {
+        selectedCustNo,
+        selectedCustNoType: typeof selectedCustNo
+      });
+
+      // Filter out invalid values
+      if (selectedCustNo === "undefined" || selectedCustNo === "null" || (selectedCustNo && selectedCustNo.trim() === "")) {
+        selectedCustNo = null;
+      }
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.0} Resolved customer selection`, {
+        selectedCustNo,
+        willCreateNew: create === true || !selectedCustNo
+      });
+
+      job = await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.JobData);
+
+      const txEnvelope = (await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.txEnvelope)) || {};
+
+      if (!job) throw new Error("Staged JobData not found (run rr-create-early-ro first).");
+
+      const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+
+      bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
+
+      // Create customer (if requested or none chosen)
+      if (create === true || !selectedCustNo) {
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.1} Creating RR customer`);
+
+        const created = await createRRCustomer({ bodyshop, job, socket });
+        selectedCustNo = String(created?.customerNo || "");
+
+        CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.2} Created customer`, {
+          custNo: selectedCustNo,
+          createdCustomerNo: created?.customerNo
+        });
+
+        if (!selectedCustNo || selectedCustNo === "undefined" || selectedCustNo.trim() === "") {
+          throw new Error("RR create customer returned no valid custNo");
+        }
+
+        createdCustomer = true;
+      }
+
+      // VIN owner pre-check
+      try {
+        const vehQ = makeVehicleSearchPayloadFromJob(job);
+        if (vehQ && vehQ.kind === "vin" && job?.v_vin) {
+          const vinResponse = await rrCombinedSearch(bodyshop, vehQ);
+
+          CreateRRLogEvent(socket, "SILLY", `VIN owner pre-check response (early RO)`, { response: vinResponse });
+
+          const vinBlocks = Array.isArray(vinResponse?.data) ? vinResponse.data : [];
+
+          try {
+            await redisHelpers.setSessionTransactionData(
+              socket.id,
+              ns,
+              RRCacheEnums.VINCandidates,
+              vinBlocks,
+              defaultRRTTL
+            );
+          } catch {
+            //
+          }
+
+          const ownersSet = ownersFromVinBlocks(vinBlocks, job.v_vin);
+
+          if (ownersSet?.size) {
+            const sel = String(selectedCustNo);
+
+            if (!ownersSet.has(sel)) {
+              const [existingOwner] = Array.from(ownersSet).map(String);
+              CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.2a} VIN exists; switching to VIN owner`, {
+                vin: job.v_vin,
+                selected: sel,
+                existingOwner
+              });
+              selectedCustNo = existingOwner;
+            }
+          }
+        }
+      } catch (e) {
+        CreateRRLogEvent(socket, "WARN", `VIN owner pre-check failed; continuing with selected customer (early RO)`, {
+          error: e?.message
+        });
+      }
+
+      // Cache final/effective customer selection
+      const effectiveCustNo = String(selectedCustNo);
+
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.SelectedCustomer,
+        effectiveCustNo,
+        defaultRRTTL
+      );
+
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-3.3} Cached selected customer`, { custNo: effectiveCustNo });
+
+      // Build client & routing
+      const { client, opts } = await buildClientAndOpts(bodyshop);
+      const routing = opts?.routing || client?.opts?.routing || null;
+      if (!routing?.dealerNumber) throw new Error("ensureRRServiceVehicle: routing.dealerNumber required");
+
+      // Reconstruct a lightweight tx object
+      const tx = {
+        jobData: {
+          ...job,
+          vin: job?.v_vin
+        },
+        txEnvelope
+      };
+
+      const vin = resolveVin({ tx, job });
+
+      if (!vin) {
+        CreateRRLogEvent(socket, "ERROR", "{EARLY-3.x} No VIN found for ensureRRServiceVehicle", { jobid: rid });
+        throw new Error("ensureRRServiceVehicle: vin required");
+      }
+
+      CreateRRLogEvent(socket, "DEBUG", "{EARLY-3.4} ensureRRServiceVehicle: starting", {
+        jobid: rid,
+        selectedCustomerNo: effectiveCustNo,
+        vin,
+        dealerNumber: routing.dealerNumber,
+        storeNumber: routing.storeNumber,
+        areaNumber: routing.areaNumber
+      });
+
+      const ensured = await ensureRRServiceVehicle({
+        client,
+        routing,
+        bodyshop,
+        selectedCustomerNo: effectiveCustNo,
+        custNo: effectiveCustNo,
+        customerNo: effectiveCustNo,
+        vin,
+        job,
+        socket,
+        redisHelpers
+      });
+
+      CreateRRLogEvent(socket, "DEBUG", "{EARLY-3.5} ensureRRServiceVehicle: done", ensured);
+
+      const cachedAdvisor = await redisHelpers.getSessionTransactionData(socket.id, ns, RRCacheEnums.AdvisorNo);
+      const advisorNo = readAdvisorNo({ txEnvelope }, cachedAdvisor);
+
+      if (!advisorNo) {
+        CreateRRLogEvent(socket, "ERROR", `Advisor is required (advisorNo) for early RO`);
+        await insertRRFailedExportLog({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          error: new Error("Advisor is required (advisorNo)."),
+          classification: { errorCode: "RR_MISSING_ADVISOR", friendlyMessage: "Advisor is required." }
+        });
+        socket.emit("export-failed", { vendor: "rr", jobId: rid, error: "Advisor is required (advisorNo)." });
+        return ack?.({ ok: false, error: "Advisor is required (advisorNo)." });
+      }
+
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.AdvisorNo,
+        String(advisorNo),
+        defaultRRTTL
+      );
+
+      // CREATE MINIMAL RO (early creation)
+      CreateRRLogEvent(socket, "DEBUG", `{EARLY-4} Creating minimal RR RO`);
+      const result = await createMinimalRRRepairOrder({
+        bodyshop,
+        job,
+        selectedCustomer: { customerNo: effectiveCustNo, custNo: effectiveCustNo },
+        advisorNo: String(advisorNo),
+        txEnvelope,
+        socket,
+        svId: ensured?.svId || null
+      });
+
+      // Cache raw export result + pending RO number
+      await redisHelpers.setSessionTransactionData(
+        socket.id,
+        ns,
+        RRCacheEnums.ExportResult,
+        result || {},
+        defaultRRTTL
+      );
+
+      if (result?.success) {
+        const data = result?.data || {};
+
+        // Prefer explicit return from export function; then fall back to fields
+        const dmsRoNo = result?.roNo ?? data?.dmsRoNo ?? null;
+
+        const outsdRoNo = data?.outsdRoNo ?? job?.ro_number ?? job?.id ?? null;
+
+        CreateRRLogEvent(socket, "DEBUG", "Early RO created - checking dmsRoNo", {
+          dmsRoNo,
+          resultRoNo: result?.roNo,
+          dataRoNo: data?.dmsRoNo,
+          jobId: rid
+        });
+
+        // ✅ Persist DMS RO number, customer ID, advisor ID, and mileage on the job
+        if (dmsRoNo) {
+          const mileageIn = txEnvelope?.kmin ?? null;
+          CreateRRLogEvent(socket, "DEBUG", "Calling setJobDmsIdForSocket", { 
+            jobId: rid, 
+            dmsId: dmsRoNo,
+            customerId: effectiveCustNo,
+            advisorId: String(advisorNo),
+            mileageIn
+          });
+          await setJobDmsIdForSocket({ 
+            socket, 
+            jobId: rid, 
+            dmsId: dmsRoNo,
+            dmsCustomerId: effectiveCustNo,
+            dmsAdvisorId: String(advisorNo),
+            mileageIn
+          });
+        } else {
+          CreateRRLogEvent(socket, "WARN", "RR early RO creation succeeded but no DMS RO number was returned", {
+            jobId: rid,
+            resultPreview: {
+              roNo: result?.roNo,
+              data: {
+                dmsRoNo: data?.dmsRoNo,
+                outsdRoNo: data?.outsdRoNo
+              }
+            }
+          });
+        }
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          ns,
+          RRCacheEnums.PendingRO,
+          {
+            outsdRoNo,
+            dmsRoNo,
+            customerNo: String(effectiveCustNo),
+            advisorNo: String(advisorNo),
+            vin: job?.v_vin || null,
+            earlyRoCreated: true // Flag to indicate this was an early RO
+          },
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "INFO", `{EARLY-5} Minimal RO created successfully`, {
+          dmsRoNo: dmsRoNo || null,
+          outsdRoNo: outsdRoNo || null
+        });
+
+        // Mark success in export logs
+        await markRRExportSuccess({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          result,
+          isEarlyRo: true
+        });
+
+        // Tell FE that early RO was created
+        socket.emit("rr-early-ro-created", { jobId: rid, dmsRoNo, outsdRoNo });
+
+        // Emit result
+        socket.emit("rr-create-early-ro:result", { jobId: rid, bodyshopId: bodyshop?.id, result });
+
+        // ACK with RO details
+        ack?.({
+          ok: true,
+          dmsRoNo,
+          outsdRoNo,
+          result,
+          custNo: String(effectiveCustNo),
+          createdCustomer,
+          earlyRoCreated: true
+        });
+      } else {
+        // classify & fail
+        const tx = result?.statusBlocks?.transaction;
+
+        const vendorStatusCode = Number(
+          result?.roStatus?.statusCode ?? result?.roStatus?.StatusCode ?? tx?.statusCode ?? tx?.StatusCode
+        );
+
+        const vendorMessage =
+          result?.roStatus?.message ??
+          result?.roStatus?.Message ??
+          tx?.message ??
+          tx?.Message ??
+          result?.error ??
+          "RR early RO creation failed";
+
+        const cls = classifyRRVendorError({
+          code: vendorStatusCode,
+          message: vendorMessage
+        });
+
+        CreateRRLogEvent(socket, "ERROR", `Early RO creation failed`, {
+          roStatus: result?.roStatus,
+          statusBlocks: result?.statusBlocks,
+          classification: cls
+        });
+
+        await insertRRFailedExportLog({
+          socket,
+          jobId: rid,
+          job,
+          bodyshop,
+          error: new Error(cls.friendlyMessage || result?.error || "RR early RO creation failed"),
+          classification: cls,
+          result
+        });
+
+        socket.emit("export-failed", {
+          vendor: "rr",
+          jobId: rid,
+          error: cls?.friendlyMessage || result?.error || "RR early RO creation failed",
+          ...cls
+        });
+
+        ack?.({
+          ok: false,
+          error: cls.friendlyMessage || result?.error || "RR early RO creation failed",
+          result,
+          classification: cls
+        });
+      }
+    } catch (error) {
+      const cls = classifyRRVendorError(error);
+
+      CreateRRLogEvent(socket, "ERROR", `Error during RR early RO creation (customer-selected)`, {
+        error: error.message,
+        vendorStatusCode: cls.vendorStatusCode,
+        code: cls.errorCode,
+        friendly: cls.friendlyMessage,
+        stack: error.stack,
+        jobid: rid
+      });
+
+      try {
+        if (!bodyshop || !job) {
+          const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
+          bodyshop = bodyshop || (await getBodyshopForSocket({ bodyshopId, socket }));
+          job =
+            job ||
+            (await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.JobData));
+        }
+      } catch {
+        //
+      }
+
+      await insertRRFailedExportLog({
+        socket,
+        jobId: rid,
+        job,
+        bodyshop,
+        error,
+        classification: cls
+      });
+
+      try {
+        socket.emit("export-failed", {
+          vendor: "rr",
+          jobId: rid,
+          error: error.message,
+          ...cls
+        });
+        socket.emit("rr-user-notice", { jobId: rid, ...cls });
+      } catch {
+        //
+      }
+
+      ack?.({ ok: false, error: cls.friendlyMessage || error.message, classification: cls });
+    }
+  });
+
+  socket.on("rr-export-job", async ({ jobid, jobId, txEnvelope } = {}, ack) => {
     const rid = resolveJobId(jobid || jobId, { jobId, jobid }, null);
 
     try {
@@ -422,6 +938,139 @@ const registerRREvents = ({ socket, redisHelpers }) => {
       const { bodyshopId } = await getSessionOrSocket(redisHelpers, socket);
       const bodyshop = await getBodyshopForSocket({ bodyshopId, socket });
 
+      // Check if this job already has an early RO - if so, use stored IDs and skip customer search
+      const hasEarlyRO = !!job?.dms_id;
+      
+      if (hasEarlyRO) {
+        CreateRRLogEvent(socket, "DEBUG", `{2} Early RO exists - using stored customer/advisor`, {
+          dms_id: job.dms_id,
+          dms_customer_id: job.dms_customer_id,
+          dms_advisor_id: job.dms_advisor_id
+        });
+        
+        // Cache the stored customer/advisor IDs for the next step
+        if (job.dms_customer_id) {
+          await redisHelpers.setSessionTransactionData(
+            socket.id,
+            getTransactionType(rid),
+            RRCacheEnums.SelectedCustomer,
+            String(job.dms_customer_id),
+            defaultRRTTL
+          );
+        }
+        if (job.dms_advisor_id) {
+          await redisHelpers.setSessionTransactionData(
+            socket.id,
+            getTransactionType(rid),
+            RRCacheEnums.AdvisorNo,
+            String(job.dms_advisor_id),
+            defaultRRTTL
+          );
+        }
+        
+        // Emit empty customer list to frontend (won't show modal)
+        socket.emit("rr-select-customer", []);
+        
+        // Continue directly with the export by calling the selected customer handler logic inline
+        // This is essentially the same as if user selected the stored customer
+        const selectedCustNo = job.dms_customer_id;
+        
+        if (!selectedCustNo) {
+          throw new Error("Early RO exists but no customer ID stored");
+        }
+        
+        // Continue with ensureRRServiceVehicle and export (same as rr-selected-customer handler)
+        const { client, opts } = await buildClientAndOpts(bodyshop);
+        const routing = opts?.routing || client?.opts?.routing || null;
+        if (!routing?.dealerNumber) throw new Error("ensureRRServiceVehicle: routing.dealerNumber required");
+
+        const tx = {
+          jobData: {
+            ...job,
+            vin: job?.v_vin
+          },
+          txEnvelope
+        };
+
+        const vin = resolveVin({ tx, job });
+        if (!vin) {
+          CreateRRLogEvent(socket, "ERROR", "{3.x} No VIN found for ensureRRServiceVehicle", { jobid: rid });
+          throw new Error("ensureRRServiceVehicle: vin required");
+        }
+
+        const ensured = await ensureRRServiceVehicle({
+          client,
+          routing,
+          bodyshop,
+          selectedCustomerNo: String(selectedCustNo),
+          custNo: String(selectedCustNo),
+          customerNo: String(selectedCustNo),
+          vin,
+          job,
+          socket,
+          redisHelpers
+        });
+
+        const advisorNo = job.dms_advisor_id || readAdvisorNo({ txEnvelope }, await redisHelpers.getSessionTransactionData(socket.id, getTransactionType(rid), RRCacheEnums.AdvisorNo));
+
+        if (!advisorNo) {
+          throw new Error("Advisor is required (advisorNo).");
+        }
+
+        // UPDATE existing RO with full data
+        CreateRRLogEvent(socket, "DEBUG", `{4} Updating existing RR RO with full data`, { dmsRoNo: job.dms_id });
+        const result = await updateRRRepairOrderWithFullData({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: String(selectedCustNo), custNo: String(selectedCustNo) },
+          advisorNo: String(advisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null,
+          roNo: job.dms_id
+        });
+
+        if (!result?.success) {
+          throw new Error(result?.roStatus?.message || "Failed to update RR Repair Order");
+        }
+
+        const dmsRoNo = result?.roNo ?? result?.data?.dmsRoNo ?? job.dms_id;
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.ExportResult,
+          result || {},
+          defaultRRTTL
+        );
+
+        await redisHelpers.setSessionTransactionData(
+          socket.id,
+          getTransactionType(rid),
+          RRCacheEnums.PendingRO,
+          {
+            outsdRoNo: result?.data?.outsdRoNo ?? job?.ro_number ?? job?.id ?? null,
+            dmsRoNo,
+            customerNo: String(selectedCustNo),
+            advisorNo: String(advisorNo),
+            vin: job?.v_vin || null,
+            isUpdate: true
+          },
+          defaultRRTTL
+        );
+
+        CreateRRLogEvent(socket, "INFO", `RR Repair Order updated successfully`, {
+          dmsRoNo,
+          jobId: rid
+        });
+
+        // For early RO flow, only emit validation-required (not export-job:result)
+        // since the export is not complete yet - we're just waiting for validation
+        socket.emit("rr-validation-required", { dmsRoNo, jobId: rid });
+        
+        return ack?.({ ok: true, skipCustomerSelection: true, dmsRoNo });
+      }
+
       CreateRRLogEvent(socket, "DEBUG", `{2} Running multi-search (Full Name + VIN)`);
 
       const candidates = await rrMultiCustomerSearch({ bodyshop, job, socket, redisHelpers });
@@ -620,17 +1269,59 @@ const registerRREvents = ({ socket, redisHelpers }) => {
         defaultRRTTL
       );
 
-      // CREATE/UPDATE (first step only)
-      CreateRRLogEvent(socket, "DEBUG", `{4} Performing RR create/update (step 1)`);
-      const result = await exportJobToRR({
-        bodyshop,
-        job,
-        selectedCustomer: { customerNo: effectiveCustNo, custNo: effectiveCustNo },
-        advisorNo: String(advisorNo),
-        txEnvelope,
-        socket,
-        svId: ensured?.svId || null
-      });
+      // Check if this job already has an early RO created (check job.dms_id)
+      // If so, we'll use stored customer/advisor IDs and do a full data UPDATE instead of CREATE
+      const existingDmsId = job?.dms_id || null;
+      const shouldUpdate = !!existingDmsId;
+
+      // When updating an early RO, use stored customer/advisor IDs
+      let finalEffectiveCustNo = effectiveCustNo;
+      let finalAdvisorNo = advisorNo;
+      
+      if (shouldUpdate && job?.dms_customer_id) {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored customer ID from early RO`, { 
+          storedCustomerId: job.dms_customer_id,
+          originalCustomerId: effectiveCustNo  
+        });
+        finalEffectiveCustNo = String(job.dms_customer_id);
+      }
+      
+      if (shouldUpdate && job?.dms_advisor_id) {
+        CreateRRLogEvent(socket, "DEBUG", `Using stored advisor ID from early RO`, { 
+          storedAdvisorId: job.dms_advisor_id,
+          originalAdvisorId: advisorNo  
+        });
+        finalAdvisorNo = String(job.dms_advisor_id);
+      }
+
+      let result;
+      
+      if (shouldUpdate) {
+        // UPDATE existing RO with full data
+        CreateRRLogEvent(socket, "DEBUG", `{4} Updating existing RR RO with full data`, { dmsRoNo: existingDmsId });
+        result = await updateRRRepairOrderWithFullData({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: finalEffectiveCustNo, custNo: finalEffectiveCustNo },
+          advisorNo: String(finalAdvisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null,
+          roNo: existingDmsId
+        });
+      } else {
+        // CREATE new RO (legacy flow - full data on first create)
+        CreateRRLogEvent(socket, "DEBUG", `{4} Performing RR create (step 1 - full data)`);
+        result = await exportJobToRR({
+          bodyshop,
+          job,
+          selectedCustomer: { customerNo: finalEffectiveCustNo, custNo: finalEffectiveCustNo },
+          advisorNo: String(finalAdvisorNo),
+          txEnvelope,
+          socket,
+          svId: ensured?.svId || null
+        });
+      }
 
       // Cache raw export result + pending RO number for finalize
       await redisHelpers.setSessionTransactionData(