IO-3365 Bills Filtering Server Side

Signed-off-by: Allan Carr <allan@imexsystems.ca>
Merged in feature/IO-3356-pbs-ro-posting (pull request #2577 )
2025-10-02 23:43:25 -07:00 · 2025-10-02 20:27:48 +00:00 · 2025-10-02 13:26:12 -07:00 · 2025-10-02 13:20:15 -07:00 · 2025-10-02 16:56:37 +00:00 · 2025-10-02 12:55:50 -04:00
94 changed files with 1597 additions and 505 deletions
--- a/_reference/localEmailViewer/index.js
+++ b/_reference/localEmailViewer/index.js
@@ -1,116 +1,96 @@
 // index.js

-import express from 'express';
-import fetch from 'node-fetch';
-import {simpleParser} from 'mailparser';
+import express from "express";
+import fetch from "node-fetch";
+import { simpleParser } from "mailparser";

 const app = express();
 const PORT = 3334;

-app.get('/', async (req, res) => {
-    try {
-        const response = await fetch('http://localhost:4566/_aws/ses');
-        if (!response.ok) {
-            throw new Error('Network response was not ok');
-        }
-        const data = await response.json();
-        const messagesHtml = await parseMessages(data.messages);
-        res.send(renderHtml(messagesHtml));
-    } catch (error) {
-        console.error('Error fetching messages:', error);
-        res.status(500).send('Error fetching messages');
+app.get("/", async (req, res) => {
+  try {
+    const response = await fetch("http://localhost:4566/_aws/ses");
+    if (!response.ok) {
+      throw new Error("Network response was not ok");
    }
+    const data = await response.json();
+    const messagesHtml = await parseMessages(data.messages);
+    res.send(renderHtml(messagesHtml));
+  } catch (error) {
+    console.error("Error fetching messages:", error);
+    res.status(500).send("Error fetching messages");
+  }
 });

 async function parseMessages(messages) {
-    const parsedMessages = await Promise.all(
-        messages.map(async (message, index) => {
-            try {
-                const parsed = await simpleParser(message.RawData);
-                return `
-                    <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
-                     <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                     </div>
-                        <div class="prose">
-                            ${parsed.html || parsed.textAsHtml || 'No HTML content available'}
-                        </div>
-                    </div>
-                `;
-            } catch (error) {
-                console.error('Error parsing email:', error);
-                return `
-                    <div class="bg-white shadow-md rounded-lg p-4 mb-6">
-                        <div class="mb-2">
-                            <span class="font-bold text-lg">Message ${index + 1}</span>
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">From:</span> ${message.Source}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Region:</span> ${message.Region}
-                        </div>
-                        <div class="mb-2">
-                            <span class="font-semibold">Timestamp:</span> ${message.Timestamp}
-                        </div>
-                        <div class="text-red-500">
-                            Error parsing email content
-                        </div>
-                    </div>
-                `;
-            }
-        })
-    );
-    return parsedMessages.join('');
+  const parsedMessages = await Promise.all(
+    messages.map(async (message, index) => {
+      try {
+        const parsed = await simpleParser(message.RawData);
+        return `
+          <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: lightgray">
+            <div class="shadow-md rounded-lg p-4 mb-6" style="background-color: white">
+              <div class="mb-2"><span class="font-bold text-lg">Message ${index + 1}</span></div>
+              <div class="mb-2"><span class="font-semibold">From:</span> ${message.Source}</div>
+              <div class="mb-2"><span class="font-semibold">To:</span> ${parsed.to.text || "No To Address"}</div>
+              <div class="mb-2"><span class="font-semibold">Subject:</span> ${parsed.subject || "No Subject"}</div>
+              <div class="mb-2"><span class="font-semibold">Region:</span> ${message.Region}</div>
+              <div class="mb-2"><span class="font-semibold">Timestamp:</span> ${message.Timestamp}</div>
+            </div>
+            <div class="prose">${parsed.html || parsed.textAsHtml || "No HTML content available"}</div>
+          </div>
+        `;
+      } catch (error) {
+        console.error("Error parsing email:", error);
+        return `
+          <div class="bg-white shadow-md rounded-lg p-4 mb-6">
+            <div class="mb-2"><span class="font-bold text-lg">Message ${index + 1}</span></div>
+            <div class="mb-2"><span class="font-semibold">From:</span> ${message.Source}</div>
+            <div class="mb-2"><span class="font-semibold">Region:</span> ${message.Region}</div>
+            <div class="mb-2"><span class="font-semibold">Timestamp:</span> ${message.Timestamp}</div>
+            <div class="text-red-500">Error parsing email content</div>
+          </div>
+        `;
+      }
+    })
+  );
+  return parsedMessages.join("");
 }

 function renderHtml(messagesHtml) {
-    return `
-        <!DOCTYPE html>
-        <html lang="en">
-        <head>
-            <meta charset="UTF-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1.0">
-            <title>Email Messages Viewer</title>
-            <script src="https://cdn.tailwindcss.com"></script>
-            <style>
-                body {
-                    background-color: #f3f4f6;
-                    font-family: Arial, sans-serif;
-                }
-                .container {
-                    max-width: 800px;
-                    margin: 50px auto;
-                    padding: 20px;
-                }
-                .prose {
-                    line-height: 1.6;
-                }
-            </style>
-        </head>
-        <body>
-            <div class="container bg-white shadow-lg rounded-lg p-6">
-                <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
-                <div id="messages-container">
-                    ${messagesHtml}
-                </div>
-            </div>
-        </body>
-        </html>
-    `;
+  return `
+    <!DOCTYPE html>
+    <html lang="en">
+      <head>
+        <meta charset="UTF-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title>Email Messages Viewer</title>
+        <script src="https://cdn.tailwindcss.com"></script>
+        <style>
+          body {
+            background-color: #f3f4f6;
+            font-family: Arial, sans-serif;
+          }
+          .container {
+            max-width: 800px;
+            margin: 50px auto;
+            padding: 20px;
+          }
+          .prose {
+            line-height: 1.6;
+          }
+        </style>
+      </head>
+      <body>
+        <div class="container bg-white shadow-lg rounded-lg p-6">
+          <h1 class="text-2xl font-bold text-center mb-6">Email Messages Viewer</h1>
+          <div id="messages-container">${messagesHtml}</div>
+        </div>
+      </body>
+    </html>
+  `;
 }

 app.listen(PORT, () => {
-    console.log(`Server is running on http://localhost:${PORT}`);
-});
+  console.log(`Server is running on http://localhost:${PORT}`);
+});
--- a/_reference/localEmailViewer/package-lock.json
+++ b/_reference/localEmailViewer/package-lock.json
@@ -10,7 +10,7 @@
      "license": "ISC",
      "dependencies": {
        "express": "^5.1.0",
-        "mailparser": "^3.7.2",
+        "mailparser": "^3.7.4",
        "node-fetch": "^3.3.2"
      }
    },
@@ -634,9 +634,9 @@
      "license": "MIT"
    },
    "node_modules/libmime": {
-      "version": "5.3.6",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.6.tgz",
-      "integrity": "sha512-j9mBC7eiqi6fgBPAGvKCXJKJSIASanYF4EeA4iBzSG0HxQxmXnR3KbyWqTn4CwsKSebqCv2f5XZfAO6sKzgvwA==",
+      "version": "5.3.7",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.7.tgz",
+      "integrity": "sha512-FlDb3Wtha8P01kTL3P9M+ZDNDWPKPmKHWaU/cG/lg5pfuAwdflVpZE+wm9m7pKmC5ww6s+zTxBKS1p6yl3KpSw==",
      "license": "MIT",
      "dependencies": {
        "encoding-japanese": "2.2.0",
@@ -661,31 +661,31 @@
      }
    },
    "node_modules/mailparser": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.2.tgz",
-      "integrity": "sha512-iI0p2TCcIodR1qGiRoDBBwboSSff50vQAWytM5JRggLfABa4hHYCf3YVujtuzV454xrOP352VsAPIzviqMTo4Q==",
+      "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.4.tgz",
+      "integrity": "sha512-Beh4yyR4jLq3CZZ32asajByrXnW8dLyKCAQD3WvtTiBnMtFWhxO+wa93F6sJNjDmfjxXs4NRNjw3XAGLqZR3Vg==",
      "license": "MIT",
      "dependencies": {
        "encoding-japanese": "2.2.0",
        "he": "1.2.0",
        "html-to-text": "9.0.5",
        "iconv-lite": "0.6.3",
-        "libmime": "5.3.6",
+        "libmime": "5.3.7",
        "linkify-it": "5.0.0",
-        "mailsplit": "5.4.2",
-        "nodemailer": "6.9.16",
+        "mailsplit": "5.4.5",
+        "nodemailer": "7.0.4",
        "punycode.js": "2.3.1",
-        "tlds": "1.255.0"
+        "tlds": "1.259.0"
      }
    },
    "node_modules/mailsplit": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.2.tgz",
-      "integrity": "sha512-4cczG/3Iu3pyl8JgQ76dKkisurZTmxMrA4dj/e8d2jKYcFTZ7MxOzg1gTioTDMPuFXwTrVuN/gxhkrO7wLg7qA==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.5.tgz",
+      "integrity": "sha512-oMfhmvclR689IIaQmIcR5nODnZRRVwAKtqFT407TIvmhX2OLUBnshUTcxzQBt3+96sZVDud9NfSe1NxAkUNXEQ==",
      "license": "(MIT OR EUPL-1.1+)",
      "dependencies": {
        "libbase64": "1.3.0",
-        "libmime": "5.3.6",
+        "libmime": "5.3.7",
        "libqp": "2.1.1"
      }
    },
@@ -793,9 +793,9 @@
      }
    },
    "node_modules/nodemailer": {
-      "version": "6.9.16",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz",
-      "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.4.tgz",
+      "integrity": "sha512-9O00Vh89/Ld2EcVCqJ/etd7u20UhME0f/NToPfArwPEe1Don1zy4mAIz6ariRr7mJ2RDxtaDzN0WJVdVXPtZaw==",
      "license": "MIT-0",
      "engines": {
        "node": ">=6.0.0"
@@ -1114,9 +1114,9 @@
      }
    },
    "node_modules/tlds": {
-      "version": "1.255.0",
-      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.255.0.tgz",
-      "integrity": "sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==",
+      "version": "1.259.0",
+      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.259.0.tgz",
+      "integrity": "sha512-AldGGlDP0PNgwppe2quAvuBl18UcjuNtOnDuUkqhd6ipPqrYYBt3aTxK1QTsBVknk97lS2JcafWMghjGWFtunw==",
      "license": "MIT",
      "bin": {
        "tlds": "bin.js"
--- a/_reference/localEmailViewer/package.json
+++ b/_reference/localEmailViewer/package.json
@@ -12,7 +12,7 @@
  "description": "",
  "dependencies": {
    "express": "^5.1.0",
-    "mailparser": "^3.7.2",
+    "mailparser": "^3.7.4",
    "node-fetch": "^3.3.2"
  }
 }
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -5305,6 +5305,27 @@
                                                    </translation>
                                                </translations>
                                            </concept_node>
+                                            <concept_node>
+                                                <name>ro_posting</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                            <concept_node>
                                                <name>sendmaterialscosting</name>
                                                <definition_loaded>false</definition_loaded>
--- a/client/.env.development.imex
+++ b/client/.env.development.imex
@@ -16,4 +16,5 @@ TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -18,4 +18,5 @@ TEST_USERNAME="test@imex.dev"
 TEST_PASSWORD="test123"
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
--- a/client/.env.production.imex
+++ b/client/.env.production.imex
@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
--- a/client/.env.production.rome
+++ b/client/.env.production.rome
@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=et9pjkik6bn67he5evpmpr1agoo7gactphgk
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
--- a/client/.env.test.imex
+++ b/client/.env.test.imex
@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=6228a598e57cd66875cfd41604f1f891
--- a/client/.env.test.rome
+++ b/client/.env.test.rome
@@ -15,4 +15,5 @@ VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=ROME
 VITE_PUBLIC_POSTHOG_KEY=phc_xtLmBIu0rjWwExY73Oj5DTH1bGbwq1G1Y8jnlTceien
 VITE_PUBLIC_POSTHOG_HOST=https://us.i.posthog.com
-VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
+VITE_APP_AMP_KEY=46b1193a867d4e3131ae4c3a64a3fc78
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -24,6 +24,7 @@ import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
 import { NotificationProvider } from "../contexts/Notifications/notificationContext.jsx";
 import SocketProvider from "../contexts/SocketIO/socketProvider.jsx";
+import SoundWrapper from "./SoundWrapper.jsx";

 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -72,9 +73,6 @@ export function App({
    setIsPartsEntry(isParts);
  }, [setIsPartsEntry]);

-  //const b = Grid.useBreakpoint();
-  // console.log("Breakpoints:", b);
-
  // Associate event listeners, memoize to prevent multiple listeners being added
  useEffect(() => {
    const offlineListener = () => {
@@ -164,85 +162,87 @@ export function App({
      />

      <NotificationProvider>
-        <Routes>
-          <Route
-            path="*"
-            element={
-              <ErrorBoundary>
-                <LandingPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/signin"
-            element={
-              <ErrorBoundary>
-                <SignInPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/resetpassword"
-            element={
-              <ErrorBoundary>
-                <ResetPassword />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/csi/:surveyId"
-            element={
-              <ErrorBoundary>
-                <CsiPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/disclaimer"
-            element={
-              <ErrorBoundary>
-                <DisclaimerPage />
-              </ErrorBoundary>
-            }
-          />
-          <Route
-            path="/manage/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+        <SoundWrapper bodyshop={bodyshop}>
+          <Routes>
+            <Route
+              path="*"
+              element={
+                <ErrorBoundary>
+                  <LandingPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/signin"
+              element={
+                <ErrorBoundary>
+                  <SignInPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/resetpassword"
+              element={
+                <ErrorBoundary>
+                  <ResetPassword />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/csi/:surveyId"
+              element={
+                <ErrorBoundary>
+                  <CsiPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/disclaimer"
+              element={
+                <ErrorBoundary>
+                  <DisclaimerPage />
+                </ErrorBoundary>
+              }
+            />
+            <Route
+              path="/manage/*"
+              element={
+                <ErrorBoundary>
+                  <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                    <PrivateRoute isAuthorized={currentUser.authorized} />
+                  </SocketProvider>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<ManagePage />} />
+            </Route>
+            <Route
+              path="/tech/*"
+              element={
+                <ErrorBoundary>
+                  <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
+                    <PrivateRoute isAuthorized={currentUser.authorized} />
+                  </SocketProvider>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<TechPageContainer />} />
+            </Route>
+            <Route
+              path="/parts/*"
+              element={
+                <ErrorBoundary>
                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<ManagePage />} />
-          </Route>
-          <Route
-            path="/tech/*"
-            element={
-              <ErrorBoundary>
-                <SocketProvider bodyshop={bodyshop} navigate={navigate} currentUser={currentUser}>
-                  <PrivateRoute isAuthorized={currentUser.authorized} />
-                </SocketProvider>
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<TechPageContainer />} />
-          </Route>
-          <Route
-            path="/parts/*"
-            element={
-              <ErrorBoundary>
-                <PrivateRoute isAuthorized={currentUser.authorized} />
-              </ErrorBoundary>
-            }
-          >
-            <Route path="*" element={<SimplifiedPartsPageContainer />} />
-          </Route>
-          <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
-            <Route path="*" element={<DocumentEditorContainer />} />
-          </Route>
-        </Routes>
+                </ErrorBoundary>
+              }
+            >
+              <Route path="*" element={<SimplifiedPartsPageContainer />} />
+            </Route>
+            <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
+              <Route path="*" element={<DocumentEditorContainer />} />
+            </Route>
+          </Routes>
+        </SoundWrapper>
      </NotificationProvider>
    </Suspense>
  );
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -272,23 +272,23 @@
 }

 // Scrollbar styles (uncomment if needed, updated for dark mode)
-::-webkit-scrollbar-track {
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  border-radius: 0.2rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar-track {
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   border-radius: 0.2rem;
+//   background-color: var(--table-stripe-bg);
+// }

-::-webkit-scrollbar {
-  width: 0.25rem;
-  max-height: 0.25rem;
-  background-color: var(--table-stripe-bg);
-}
+// ::-webkit-scrollbar {
+//   width: 0.25rem;
+//   max-height: 0.25rem;
+//   background-color: var(--table-stripe-bg);
+// }

-::-webkit-scrollbar-thumb {
-  border-radius: 0.2rem;
-  -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  background-color: var(--alert-color);
-}
+// ::-webkit-scrollbar-thumb {
+//   border-radius: 0.2rem;
+//   -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+//   background-color: var(--alert-color);
+// }

 .ant-input-number-input,
 .ant-input-number,
--- a/client/src/App/SoundWrapper.jsx
+++ b/client/src/App/SoundWrapper.jsx
@@ -0,0 +1,43 @@
+import { useEffect } from "react";
+import { useTranslation } from "react-i18next";
+import { useNotification } from "../contexts/Notifications/notificationContext.jsx";
+import { initNewMessageSound, unlockAudio } from "./../utils/soundManager";
+import { initSingleTabAudioLeader } from "../utils/singleTabAudioLeader";
+
+export default function SoundWrapper({ children, bodyshop }) {
+  const { t } = useTranslation();
+  const notification = useNotification();
+
+  useEffect(() => {
+    if (!bodyshop?.id) return;
+
+    // 1) Init single-tab leader election (only one tab should play sounds), scoped by bodyshopId
+    const cleanupLeader = initSingleTabAudioLeader(bodyshop.id);
+
+    // 2) Initialize base audio
+    initNewMessageSound("https://images.imex.online/app/messageTone.wav", 0.7);
+
+    // 3) Show a one-time prompt when autoplay blocks first play
+    const onNeedsUnlock = () => {
+      notification.info({
+        description: t("audio.manager.description"),
+        duration: 3
+      });
+    };
+    window.addEventListener("sound-needs-unlock", onNeedsUnlock);
+
+    // 4) Proactively unlock on first gesture (once per session)
+    const gesture = () => unlockAudio(bodyshop.id);
+    window.addEventListener("click", gesture, { once: true, passive: true });
+    window.addEventListener("touchstart", gesture, { once: true, passive: true });
+    window.addEventListener("keydown", gesture, { once: true });
+
+    return () => {
+      cleanupLeader();
+      window.removeEventListener("sound-needs-unlock", onNeedsUnlock);
+      // gesture listeners were added with {once:true}
+    };
+  }, [notification, t, bodyshop?.id]); // include bodyshop.id so this runs when org changes
+
+  return <>{children}</>;
+}
--- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
+++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx
@@ -142,7 +142,16 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
            refetch={refetch}
          />
          <Link to={`/manage/jobs/${record.id}/close`}>
-            <Button>{t("jobs.labels.viewallocations")}</Button>
+            <Button
+              style={{
+                overflow: "hidden",
+                textOverflow: "ellipsis",
+                whiteSpace: "nowrap",
+                verticalAlign: "middle"
+              }}
+            >
+              {t("jobs.labels.viewallocations")}
+            </Button>
          </Link>
        </Space>
      )
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -75,6 +76,7 @@ export function BillsListTableComponent({
      <Button
        title={t("tasks.buttons.create")}
        onClick={() => {
+          logImEXEvent("bills_create_task", {});
          setTaskUpsertContext({
            context: {
              jobid: job.id,
@@ -167,6 +169,7 @@ export function BillsListTableComponent({

  const handleTableChange = (pagination, filters, sorter) => {
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
  };

  const filteredBills = bills
@@ -208,6 +211,7 @@ export function BillsListTableComponent({
              <Button
                disabled={!hasBillsAccess}
                onClick={() => {
+                  logImEXEvent("bills_reconcile", {});
                  setReconciliationContext({
                    actions: { refetch: billsQuery.refetch },
                    context: {
--- a/client/src/components/card-payment-modal/card-payment-modal.component.jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component.jsx
@@ -14,7 +14,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import { getCurrentUser } from "../../firebase/firebase.utils";
+import { getCurrentUser, logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
@@ -124,6 +124,7 @@ const CardPaymentModalComponent = ({
    const { payments } = form.getFieldsValue();

    try {
+      logImEXEvent("payment_cc_lightbox");
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
@@ -171,6 +172,7 @@ const CardPaymentModalComponent = ({

    try {
      const { payments } = form.getFieldsValue();
+      logImEXEvent("payment_cc_shortlink");
      const response = await axios.post("/intellipay/generate_payment_url", {
        bodyshop,
        amount: payments.reduce((acc, val) => acc + (val?.amount || 0), 0),
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -9,13 +9,13 @@ import "./chat-affix.styles.scss";
 import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";

-export function ChatAffixContainer({ bodyshop, chatVisible }) {
+export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
  const { t } = useTranslation();
  const client = useApolloClient();
  const { socket } = useSocket();

  useEffect(() => {
-    if (!bodyshop || !bodyshop.messagingservicesid) return;
+    if (!bodyshop?.messagingservicesid) return;

    async function SubscribeToTopicForFCMNotification() {
      try {
@@ -35,8 +35,8 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
    SubscribeToTopicForFCMNotification();

    // Register WebSocket handlers
-    if (socket && socket.connected) {
-      registerMessagingHandlers({ socket, client });
+    if (socket?.connected) {
+      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });

      return () => {
        unregisterMessagingHandlers({ socket });
@@ -44,11 +44,11 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
    }
  }, [bodyshop, socket, t, client]);

-  if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
+  if (!bodyshop?.messagingservicesid) return <></>;

  return (
    <div className={`chat-affix ${chatVisible ? "chat-affix-open" : ""}`}>
-      {bodyshop && bodyshop.messagingservicesid ? <ChatPopupComponent /> : null}
+      {bodyshop?.messagingservicesid ? <ChatPopupComponent /> : null}
    </div>
  );
 }
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -1,6 +1,11 @@
-import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
 import { gql } from "@apollo/client";

+import { playNewMessageSound } from "../../utils/soundManager.js";
+import { isLeaderTab } from "../../utils/singleTabAudioLeader";
+
+import { CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND } from "../../graphql/user.queries";
+
 const logLocal = (message, ...args) => {
  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
    console.log(`==================== ${message} ====================`);
@@ -26,16 +31,48 @@ const enrichConversation = (conversation, isOutbound) => ({
  __typename: "conversations"
 });

-export const registerMessagingHandlers = ({ socket, client }) => {
+// Can be uncommonted to test the playback of the notification sound
+// window.testTone = () => {
+//   const notificationSound = new Audio(newMessageSound);
+//   notificationSound.play().catch((error) => {
+//     console.error("Error playing notification sound:", error);
+//   });
+// };
+
+export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
  if (!(socket && client)) return;

  const handleNewMessageSummary = async (message) => {
    const { conversationId, newConversation, existingConversation, isoutbound } = message;

+    // True only when DB value is strictly true; falls back to true on cache miss
+    const isNewMessageSoundEnabled = (client) => {
+      try {
+        const email = currentUser?.email;
+        if (!email) return true; // default allow if we can't resolve user
+        const res = client.readQuery({
+          query: QUERY_ACTIVE_ASSOCIATION_SOUND,
+          variables: { email }
+        });
+        const flag = res?.associations?.[0]?.new_message_sound;
+        return flag === true; // strictly true => enabled
+      } catch {
+        // If the query hasn't been seeded in cache yet, default ON
+        return true;
+      }
+    };
+
    logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });

    const queryVariables = { offset: 0 };

+    if (!isoutbound) {
+      // Play notification sound for new inbound message (scoped to bodyshop)
+      if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
+        playNewMessageSound(bodyshop.id);
+      }
+    }
+
    if (!existingConversation && conversationId) {
      // Attempt to read from the cache to determine if this is actually a new conversation
      try {
@@ -291,8 +328,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {

        case "conversation-unarchived":
        case "conversation-archived":
-          // Would like to someday figure out how to get this working without refetch queries,
-          // But I have but a solid 4 hours into it, and there are just too many weird occurrences
          try {
            const listQueryVariables = { offset: 0 };
            const detailsQueryVariables = { conversationId };
@@ -328,7 +363,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          }
          break;

-        case "tag-added": { // Ensure `job_conversations` is properly formatted
+        case "tag-added": {
+          // Ensure `job_conversations` is properly formatted
          const formattedJobConversations = job_conversations.map((jc) => ({
            __typename: "job_conversations",
            jobid: jc.jobid || jc.job?.id,
--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -34,7 +34,6 @@ export function ContractsFindModalContainer({ contractFinderModal, toggleModalVi
    logImEXEvent("contract_finder_search");

    //Execute contract find
-
    callSearch({
      variables: {
        plate: (values.plate && values.plate !== "" && values.plate) || undefined,
--- a/client/src/components/dashboard-grid/createDashboardQuery.js
+++ b/client/src/components/dashboard-grid/createDashboardQuery.js
@@ -2,11 +2,13 @@ import { gql } from "@apollo/client";
 import dayjs from "../../utils/day.js";
 import componentList from "./componentList.js";

-const createDashboardQuery = (state) => {
+const createDashboardQuery = (items) => {
  const componentBasedAdditions =
-    state &&
-    Array.isArray(state.layout) &&
-    state.layout.map((item) => componentList[item.i].gqlFragment || "").join("");
+    Array.isArray(items) &&
+    items
+      .map((item) => (componentList[item.i] && componentList[item.i].gqlFragment) || "")
+      .filter(Boolean)
+      .join("");
  return gql`
    query QUERY_DASHBOARD_DETAILS { ${componentBasedAdditions || ""}
      monthly_sales: jobs(where: {_and: [
--- a/client/src/components/dashboard-grid/dashboard-grid.component.jsx
+++ b/client/src/components/dashboard-grid/dashboard-grid.component.jsx
@@ -1,5 +1,5 @@
 import Icon, { SyncOutlined } from "@ant-design/icons";
-import { cloneDeep, isEmpty } from "lodash";
+import { cloneDeep } from "lodash";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
@@ -34,14 +34,25 @@ const mapDispatchToProps = () => ({

 export function DashboardGridComponent({ currentUser, bodyshop }) {
  const { t } = useTranslation();
-  const [state, setState] = useState({
-    ...(bodyshop.associations[0].user.dashboardlayout
-      ? bodyshop.associations[0].user.dashboardlayout
-      : { items: [], layout: {}, layouts: [] })
+  const [state, setState] = useState(() => {
+    const persisted = bodyshop.associations[0].user.dashboardlayout;
+    // Normalize persisted structure to avoid malformed shapes that can cause recursive layout recalculations
+    if (persisted) {
+      return {
+        items: Array.isArray(persisted.items) ? persisted.items : [],
+        layout: Array.isArray(persisted.layout) ? persisted.layout : [],
+        layouts: typeof persisted.layouts === "object" && !Array.isArray(persisted.layouts) ? persisted.layouts : {},
+        cols: persisted.cols
+      };
+    }
+    return { items: [], layout: [], layouts: {}, cols: 12 };
  });
  const notification = useNotification();

-  const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
+  // Memoize the query document so Apollo doesn't treat each render as a brand-new query causing continuous re-fetches
+  const dashboardQueryDoc = useMemo(() => createDashboardQuery(state.items), [state.items]);
+
+  const { loading, error, data, refetch } = useQuery(dashboardQueryDoc, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
@@ -49,21 +60,32 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);

  const handleLayoutChange = async (layout, layouts) => {
-    logImEXEvent("dashboard_change_layout");
+    try {
+      logImEXEvent("dashboard_change_layout");

-    setState({ ...state, layout, layouts });
+      setState((prev) => ({ ...prev, layout, layouts }));

-    const result = await updateLayout({
-      variables: {
-        email: currentUser.email,
-        layout: { ...state, layout, layouts }
+      const result = await updateLayout({
+        variables: {
+          email: currentUser.email,
+          layout: { ...state, layout, layouts }
+        }
+      });
+
+      if (result?.errors && result.errors.length) {
+        const errorMessages = result.errors.map((e) => e?.message || String(e));
+        notification.error({
+          message: t("dashboard.errors.updatinglayout", {
+            message: errorMessages.join("; ")
+          })
+        });
      }
-    });
-
-    if (!isEmpty(result?.errors)) {
+    } catch (err) {
+      // Catch any unexpected errors (including potential cyclic JSON issues) so the promise never rejects unhandled
+      console.error("Dashboard layout update failed", err);
      notification.error({
        message: t("dashboard.errors.updatinglayout", {
-          message: JSON.stringify(result.errors)
+          message: err?.message || String(err)
        })
      });
    }
@@ -80,19 +102,26 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
  };

  const handleAddComponent = (e) => {
-    logImEXEvent("dashboard_add_component", { name: e.key });
-    setState({
-      ...state,
-      items: [
-        ...state.items,
+    // Avoid passing the full AntD menu click event (contains circular refs) to analytics
+    logImEXEvent("dashboard_add_component", { key: e.key });
+    const compSpec = componentList[e.key] || {};
+    const minW = compSpec.minW || 1;
+    const minH = compSpec.minH || 1;
+    const baseW = compSpec.w || 2;
+    const baseH = compSpec.h || 2;
+    setState((prev) => {
+      const nextItems = [
+        ...prev.items,
        {
          i: e.key,
-          x: (state.items.length * 2) % (state.cols || 12),
-          y: 99, // puts it at the bottom
-          w: componentList[e.key].w || 2,
-          h: componentList[e.key].h || 2
+          // Position near bottom: use a large y so RGL places it last without triggering cascading relayout loops
+          x: (prev.items.length * 2) % (prev.cols || 12),
+          y: 1000,
+          w: Math.max(baseW, minW),
+          h: Math.max(baseH, minH)
        }
-      ]
+      ];
+      return { ...prev, items: nextItems };
    });
  };

@@ -130,25 +159,33 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
        className="layout"
        breakpoints={{ lg: 1200, md: 996, sm: 768, xs: 480, xxs: 0 }}
        cols={{ lg: 12, md: 10, sm: 6, xs: 4, xxs: 2 }}
-        width="100%"
        layouts={state.layouts}
        onLayoutChange={handleLayoutChange}
      >
        {state.items.map((item) => {
-          const TheComponent = componentList[item.i].component;
+          const spec = componentList[item.i] || {};
+          const TheComponent = spec.component;
+          const minW = spec.minW || 1;
+          const minH = spec.minH || 1;
+          // Ensure current width/height respect minimums to avoid react-grid-layout prop warnings
+          const safeItem = {
+            ...item,
+            w: Math.max(item.w || spec.w || minW, minW),
+            h: Math.max(item.h || spec.h || minH, minH)
+          };
          return (
            <div
-              key={item.i}
+              key={safeItem.i}
              data-grid={{
-                ...item,
-                minH: componentList[item.i].minH || 1,
-                minW: componentList[item.i].minW || 1
+                ...safeItem,
+                minH,
+                minW
              }}
            >
              <LoadingSkeleton loading={loading}>
                <Icon
                  component={MdClose}
-                  key={item.i}
+                  key={safeItem.i}
                  style={{
                    position: "absolute",
                    zIndex: "2",
@@ -156,9 +193,9 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
                    top: ".25rem",
                    cursor: "pointer"
                  }}
-                  onClick={() => handleRemoveComponent(item.i)}
+                  onClick={() => handleRemoveComponent(safeItem.i)}
                />
-                <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />
+                {TheComponent && <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />}
              </LoadingSkeleton>
            </div>
          );
--- a/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
+++ b/client/src/components/dms-allocations-summary/dms-allocations-summary.component.jsx
@@ -92,6 +92,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
        rowKey="center"
        dataSource={allocationsSummary}
        locale={{ emptyText: t("dms.labels.refreshallocations") }}
+        scroll={{ x: true }}
        summary={() => {
          const totals =
            allocationsSummary &&
--- a/client/src/components/global-search/global-search-os.component.jsx
+++ b/client/src/components/global-search/global-search-os.component.jsx
@@ -7,6 +7,7 @@ import { Link, useNavigate } from "react-router-dom";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function GlobalSearchOs() {
  const { t } = useTranslation();
@@ -19,6 +20,8 @@ export default function GlobalSearchOs() {
    if (v && v && v !== "" && v.length >= 3) {
      try {
        setLoading(true);
+        logImEXEvent("global_search", { search: v });
+
        const searchData = await axios.post("/search", {
          search: v
        });
--- a/client/src/components/job-audit-trail/job-audit-trail.component.jsx
+++ b/client/src/components/job-audit-trail/job-audit-trail.component.jsx
@@ -4,6 +4,7 @@ import { Button, Card, Col, Row, Table, Tag } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { QUERY_AUDIT_TRAIL } from "../../graphql/audit_trail.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
@@ -125,6 +126,7 @@ export function JobAuditTrail({ bodyshop, jobId }) {
      render: (text, record) => (
        <Button
          onClick={() => {
+            logImEXEvent("jobs_audit_view_email", {});
            var win = window.open(
              "",
              "Title",
--- a/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.parts.component.jsx
@@ -90,7 +90,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })) ||
@@ -103,7 +103,7 @@ export function JobDetailCardsPartsComponent({ loading, data, jobRO }) {
    <div>
      <CardTemplate loading={loading} title={t("jobs.labels.cards.parts")}>
        <PartsStatusPie joblines_status={joblines_status} />
-        <Table key="id" columns={columns} dataSource={filteredJobLines ? filteredJobLines : []} />
+        <Table key="id" columns={columns} dataSource={filteredJobLines || []} />
      </CardTemplate>
    </div>
  );
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -46,6 +46,7 @@ import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.con
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -317,7 +318,7 @@ export function JobLinesComponent({
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })) ||
@@ -397,6 +398,7 @@ export function JobLinesComponent({
      filteredInfo: filters,
      sortedInfo: sorter
    }));
+    logImEXEvent("joblines_table_change", { pagination, filters, sorter });
  };

  const handleMark = (e) => {
@@ -413,6 +415,7 @@ export function JobLinesComponent({
        ])
      );
    }
+    logImEXEvent("joblines_mark_lines", {});
  };

  const markMenu = {
@@ -616,12 +619,18 @@ export function JobLinesComponent({
            expanded ? (
              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
            ) : (
-              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
+              <PlusCircleTwoTone
+                onClick={(e) => {
+                  onExpand(record, e);
+                  logImEXEvent("joblines_expander", {});
+                }}
+              />
            )
        }}
        onRow={(record) => {
          return {
            onDoubleClick: () => {
+              logImEXEvent("joblines_double_click_select", {});
              const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
              notMatchingLines.length !== selectedLines.length
                ? setSelectedLines(notMatchingLines)
--- a/client/src/components/job-lifecycle/job-lifecycle.component.jsx
+++ b/client/src/components/job-lifecycle/job-lifecycle.component.jsx
@@ -1,18 +1,19 @@
-import { useCallback, useEffect, useState } from "react";
-import dayjs from "../../utils/day";
-import axios from "axios";
-import { Badge, Card, Space, Table, Tag } from "antd";
 import { gql, useQuery } from "@apollo/client";
-import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import { Badge, Card, Space, Table, Tag } from "antd";
+import axios from "axios";
 import { isEmpty } from "lodash";
+import { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import "./job-lifecycle.styles.scss";
-import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
-import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
+import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
+import "./job-lifecycle.styles.scss";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function JobLifecycleComponent({ bodyshop, job, statuses }) {
          jobids: job.id,
          statuses: statuses.statuses
        });
+        logImEXEvent("jobs_lifecycle_data", {});
        const data = response.data.transition[job.id];
        setLifecycleData(data);
      } catch (err) {
--- a/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
+++ b/client/src/components/job-line-bulk-assign/job-line-bulk-assign.component.jsx
@@ -10,6 +10,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { insertAuditTrail } from "../../redux/application/application.actions";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -32,6 +33,7 @@ export function JoblineBulkAssign({ setSelectedLines, selectedLines, insertAudit
  const handleConvert = async (values) => {
    try {
      setLoading(true);
+      logImEXEvent("joblines_bulk_assign", {});
      const result = await assignLines({
        variables: {
          jobline: {
--- a/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
+++ b/client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx
@@ -12,6 +12,7 @@ import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selecto
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -46,6 +47,7 @@ export function JobLineDispatchButton({
    try {
      setLoading(true);
      //THIS HAS NOT YET BEEN TESTED. START BY FINISHING THIS FUNCTION.
+      logImEXEvent("joblines_dispatch", {});
      const result = await dispatchLines({
        variables: {
          partsDispatch: {
--- a/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
+++ b/client/src/components/job-parts-queue-count/job-parts-queue-count.component.jsx
@@ -1,8 +1,9 @@
 import { useMemo } from "react";
-import { Col, Row, Tag, Tooltip } from "antd";
+import { Tag, 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
@@ -11,65 +12,67 @@ const mapDispatchToProps = () => ({
  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });

-export const DEFAULT_COL_LAYOUT = { xs: 24, sm: 24, md: 8, lg: 4, xl: 4, xxl: 4 };
-
 export default connect(mapStateToProps, mapDispatchToProps)(JobPartsQueueCount);

-export function JobPartsQueueCount({ bodyshop, parts, defaultColLayout = DEFAULT_COL_LAYOUT }) {
+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;
-
        return acc;
      },
      {
        total: 0,
        null: 0,
-        [bodyshop.md_order_statuses.default_bo]: 0,
-        [bodyshop.md_order_statuses.default_ordered]: 0,
-        [bodyshop.md_order_statuses.default_received]: 0,
-        [bodyshop.md_order_statuses.default_returned]: 0
+        ...Object.fromEntries(statusKeys.map((key) => [bodyshop.md_order_statuses[key], 0]))
      }
    );
  }, [bodyshop, parts]);

  if (!parts) return null;
  return (
-    <Row>
-      <Col {...defaultColLayout}>
-        <Tooltip title="Total">
-          <Tag>{partsStatus.total}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title="No Status">
-          <Tag color="gold">{partsStatus["null"]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_ordered}>
-          <Tag color="blue">{partsStatus[bodyshop.md_order_statuses.default_ordered]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_received}>
-          <Tag color="green">{partsStatus[bodyshop.md_order_statuses.default_received]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_returned}>
-          <Tag color="orange">{partsStatus[bodyshop.md_order_statuses.default_returned]}</Tag>
-        </Tooltip>
-      </Col>
-      <Col {...defaultColLayout}>
-        <Tooltip title={bodyshop.md_order_statuses.default_bo}>
-          <Tag color="red">{partsStatus[bodyshop.md_order_statuses.default_bo]}</Tag>
-        </Tooltip>
-      </Col>
-    </Row>
+    <div
+      style={{
+        display: "grid",
+        gridTemplateColumns: "repeat(auto-fit, minmax(40px, 1fr))",
+        gap: "8px",
+        width: "100%",
+        justifyItems: "start"
+      }}
+    >
+      <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>
+    </div>
  );
 }
--- a/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
+++ b/client/src/components/job-remove-from-parst-queue/job-remove-from-parts-queue.component.jsx
@@ -4,6 +4,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 export default function JobRemoveFromPartsQueue({ checked, jobId }) {
  const [updateJob] = useMutation(UPDATE_JOB);
@@ -13,6 +14,8 @@ export default function JobRemoveFromPartsQueue({ checked, jobId }) {

  const handleChange = async (e) => {
    setLoading(true);
+    logImEXEvent("parts_queue_toggle", { estimators: e });
+
    const result = await updateJob({
      variables: { jobId: jobId, job: { queued_for_parts: e.target.checked } }
    });
--- a/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
+++ b/client/src/components/jobs-available-scan/jobs-available-scan.component.jsx
@@ -8,6 +8,7 @@ import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { selectPartnerVersion } from "../../redux/application/application.selectors";
 import { alphaSort } from "../../utils/sorters";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -30,11 +31,15 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
  const notification = useNotification();

  const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("available_jobs_scan_sort_filter", { pagination, filters, sorter });
+
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
  };

  const handleImport = async (filepath) => {
    setLoading(true);
+    logImEXEvent("available_jobs_scan", {});
+
    const response = await axios.post("http://localhost:1337/import/", {
      filepath
    });
--- a/client/src/components/jobs-available-table/jobs-available-table.component.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.component.jsx
@@ -12,6 +12,7 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import { alphaSort } from "../../utils/sorters";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -34,6 +35,7 @@ export function JobsAvailableComponent({ bodyshop, loading, data, refetch, addJo

  const handleTableChange = (pagination, filters, sorter) => {
    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    logImEXEvent("available_jobs_sort_filter", { pagination, filters, sorter });
  };

  const columns = [
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
@@ -14,6 +14,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser,
@@ -108,6 +109,9 @@ export function JobsDetailHeaderActionsToggleProduction({
                DateTimeFormatterFunction(values.actual_completion)
              )
      });
+
+      logImEXEvent(scenario === "pre" ? "job_intake_quick" : "job-deliver-quick", {});
+
      setPopOverVisible(false);
      closeParentMenu();
      refetch();
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -15,6 +15,7 @@ import { alphaSort, statusSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import StartChatButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  //currentUser: selectCurrentUser
@@ -177,6 +178,7 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
    }
    setFilter(filters);
    history({ search: queryString.stringify(search) });
+    logImEXEvent("jobs_all_list_sort_filter", { pagination, filters, sorter });
  };

  useEffect(() => {
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -17,6 +17,7 @@ import AlertComponent from "../alert/alert.component";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import { OwnerNameDisplayFunction } from "./../owner-name-display/owner-name-display.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -67,6 +68,7 @@ export function JobsList({ bodyshop }) {
    : [];

  const handleTableChange = (pagination, filters, sorter) => {
+    logImEXEvent("jobs_list_sort_filter", { pagination, filters, sorter });
    setState({ ...state, sortedInfo: sorter });
    setFilter(filters);
  };
@@ -164,7 +166,7 @@ export function JobsList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })
--- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
+++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx
@@ -165,7 +165,7 @@ export function JobsReadyList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/client/src/components/notification-center/notification-center.container.jsx
@@ -39,11 +39,15 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
    return showUnreadOnly ? { ...baseWhereClause, read: { _is_null: true } } : baseWhereClause;
  }, [baseWhereClause, showUnreadOnly]);

+  // before you call useQuery, compute skip once so you can reuse it
+  const skipQuery = !userAssociationId || !isEmployee;
+
  const {
    data,
    fetchMore,
    loading: queryLoading,
-    refetch
+    refetch,
+    error
  } = useQuery(GET_NOTIFICATIONS, {
    variables: {
      limit: INITIAL_NOTIFICATIONS,
@@ -52,14 +56,26 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount,
    },
    fetchPolicy: "cache-and-network",
    notifyOnNetworkStatusChange: true,
+    errorPolicy: "all",
    pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId || !isEmployee,
-    onError: (err) => {
-      console.error(`Error polling Notifications: ${err?.message || ""}`);
-      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
-    }
+    skip: skipQuery
  });

+  // Replace onError with a side-effect that reacts to the hook’s `error`
+  useEffect(() => {
+    if (!error || skipQuery) return;
+
+    console.error(`Error polling Notifications: ${error?.message || ""}`);
+
+    const t = setTimeout(() => {
+      // Guard: if component unmounted or query now skipped, do nothing
+      if (!skipQuery) {
+        refetch().catch((e) => console.error("Refetch failed:", e?.message || e));
+      }
+    }, day.duration(2, "seconds").asMilliseconds());
+
+    return () => clearTimeout(t);
+  }, [error, refetch, skipQuery]);
  useEffect(() => {
    const handleClickOutside = (event) => {
      // Prevent open + close behavior from the header
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -1,17 +1,18 @@
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
 import { useApolloClient, useMutation } from "@apollo/client";
+import { Button, Form, Popconfirm } from "antd";
+import { phone } from "phone"; // Import phone utility for formatting
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
 import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors"; // Adjust path
 import { phoneNumberOptOutService } from "../../utils/phoneOptOutService.js"; // Adjust path
 import OwnerDetailFormComponent from "./owner-detail-form.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { phone } from "phone"; // Import phone utility for formatting

 // Connect to Redux to access bodyshop
 const mapStateToProps = createStructuredSelector({
@@ -55,6 +56,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {

  const handleDelete = async () => {
    setLoading(true);
+    logImEXEvent("owner_delete", {});
    try {
      const result = await deleteOwner({
        variables: { id: owner.id }
@@ -84,6 +86,7 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("owner_update", {});
    try {
      const result = await updateOwner({
        variables: { ownerId: owner.id, owner: values }
--- a/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal-price-change.component.jsx
@@ -1,7 +1,7 @@
 import { DownOutlined } from "@ant-design/icons";
 import { Dropdown, InputNumber, Space } from "antd";
 import { useTranslation } from "react-i18next";
-
+import { logImEXEvent } from "../../firebase/firebase.utils";
 export default function PartsOrderModalPriceChange({ form, field }) {
  const { t } = useTranslation();
  const menu = {
@@ -63,6 +63,7 @@ export default function PartsOrderModalPriceChange({ form, field }) {
      }
    ],
    onClick: ({ key }) => {
+      logImEXEvent("parts_order_manual_discount", {});
      if (key === "custom") return;
      const values = form.getFieldsValue();
      const { parts_order_lines } = values;
--- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
@@ -8,6 +8,7 @@ import AlertComponent from "../alert/alert.component";
 import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function PartsQueueDetailCard() {
  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
@@ -37,6 +38,8 @@ export default function PartsQueueDetailCard() {
  const { t } = useTranslation();
  const handleDrawerClose = () => {
    delete searchParams.selected;
+    logImEXEvent("parts_queue_drawer", {});
+
    history({
      search: queryString.stringify({
        ...searchParams
--- a/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx
@@ -145,7 +145,7 @@ export function PartsQueueJobLinesComponent({ loading, jobLines }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })) ||
--- a/client/src/components/parts-queue-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -20,6 +20,7 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -73,6 +74,7 @@ export function PartsQueueListComponent({ bodyshop }) {
    }
    setFilter(filters);
    history({ search: queryString.stringify(searchParams) });
+    logImEXEvent("parts_queue_sort_filter", { pagination, filters, sorter });
  };

  const handleOnRowClick = (record) => {
@@ -169,7 +171,7 @@ export function PartsQueueListComponent({ bodyshop }) {
      filters:
        bodyshop.md_ro_statuses.active_statuses.map((s) => {
          return {
-            text: s || "No Status*",
+            text: s || t("dashboard.errors.status"),
            value: [s]
          };
        }) || [],
--- a/client/src/components/production-board-filters/production-board-filters.component.jsx
+++ b/client/src/components/production-board-filters/production-board-filters.component.jsx
@@ -10,6 +10,7 @@ import {
 } from "@ant-design/icons";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import EmployeeSearchSelectComponent from "../employee-search-select/employee-search-select.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -26,10 +27,12 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })

  const toggleAlertFilter = () => {
    setFilter({ ...filter, alert: !filter.alert });
+    logImEXEvent("visual_board_filter_alert", {});
  };

  const toggleUnassignedFilter = () => {
    setFilter({ ...filter, unassigned: !filter.unassigned });
+    logImEXEvent("visual_board_filter_unassigned", {});
  };

  return (
@@ -40,6 +43,7 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
        placeholder={t("general.labels.search")}
        onChange={(e) => {
          setFilter({ ...filter, search: e.target.value });
+          logImEXEvent("visual_board_filter_search", { search: e.target.value });
        }}
      />
      <EmployeeSearchSelectComponent
@@ -47,7 +51,10 @@ export function ProductionBoardFilters({ bodyshop, filter, setFilter, loading })
        options={bodyshop.employees.filter((e) => e.active)}
        value={filter.employeeId}
        placeholder={t("production.labels.employeesearch")}
-        onChange={(emp) => setFilter({ ...filter, employeeId: emp })}
+        onChange={(emp) => {
+          setFilter({ ...filter, employeeId: emp });
+          logImEXEvent("visual_board_filter_alert", { employeeId: emp });
+        }}
        allowClear
      />
      <Button
--- a/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.comment.component.jsx
@@ -5,6 +5,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function ProductionListColumnComment({ record }) {
  const { t } = useTranslation();
@@ -28,6 +29,7 @@ export default function ProductionListColumnComment({ record }) {
    }).then(() => {
      if (record.refetch) record.refetch();
    });
+    logImEXEvent("job_add_comment", { estimators: e });
  };

  const handleChange = (e) => {
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -34,8 +34,9 @@ const getEmployeeName = (employeeId, employees) => {
  return employee ? `${employee.first_name} ${employee.last_name}` : "";
 };

-const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
+const productionListColumnsData = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatments }) => {
  const { Enhanced_Payroll } = treatments;
+
  return [
    {
      title: i18n.t("jobs.actions.viewdetail"),
@@ -313,7 +314,7 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
        activeStatuses
          ?.map((s) => {
            return {
-              text: s || "No Status*",
+              text: s || i18n.t("dashboard.errors.status"),
              value: [s]
            };
          })
@@ -584,4 +585,4 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
    }
  ];
 };
-export default r;
+export default productionListColumnsData;
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -18,6 +18,7 @@ import ProductionListDetail from "../production-list-detail/production-list-deta
 import { ProductionListConfigManager } from "./production-list-config-manager.component.jsx";
 import ProductionListPrint from "./production-list-print.component";
 import ResizeableTitle from "./production-list-table.resizeable.component";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -114,6 +115,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setState(newState);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_sort_filter", { pagination, filters, sorter });
  };

  const onDragEnd = (fromIndex, toIndex) => {
@@ -134,6 +136,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setColumns(newColumns);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_remove_column", { key });
  };

  const handleResize =
@@ -156,6 +159,7 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setColumns(updatedColumns);
      setHasUnsavedChanges(true);
    }
+    logImEXEvent("production_list_add_column", { key: newColumn.key });
  };

  const headerItem = (col) => {
--- a/client/src/components/profile-my/profile-my.component.jsx
+++ b/client/src/components/profile-my/profile-my.component.jsx
@@ -1,5 +1,5 @@
-import { Button, Card, Col, Form, Input } from "antd";
-import { LockOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Form, Input, Space, Switch, Tooltip, Typography } from "antd";
+import { AudioMutedOutlined, LockOutlined, SoundOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,6 +10,8 @@ import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import NotificationSettingsForm from "../notification-settings/notification-settings-form.component.jsx";
+import { useMutation, useQuery } from "@apollo/client";
+import { QUERY_ACTIVE_ASSOCIATION_SOUND, UPDATE_NEW_MESSAGE_SOUND } from "../../graphql/user.queries.js";

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser
@@ -48,6 +50,28 @@ export default connect(
    }
  };

+  // ---- Notification sound (associations.new_message_sound) ----
+  const email = currentUser?.email;
+  const { data: assocData, loading: assocLoading } = useQuery(QUERY_ACTIVE_ASSOCIATION_SOUND, {
+    variables: { email },
+    skip: !email,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "cache-first"
+  });
+  const association = assocData?.associations?.[0];
+  // Treat null/undefined as ON for backward-compat
+  const soundEnabled = association?.new_message_sound === true;
+
+  const [updateNewMessageSound, { loading: updatingSound }] = useMutation(UPDATE_NEW_MESSAGE_SOUND, {
+    update(cache, { data }) {
+      const updated = data?.update_associations_by_pk;
+      if (!updated) return;
+      cache.modify({
+        id: cache.identify({ __typename: "associations", id: updated.id }),
+        fields: { new_message_sound: () => updated.new_message_sound }
+      });
+    }
+  });
  return (
    <>
      <Col span={24}>
@@ -80,6 +104,7 @@ export default connect(
          </Card>
        </Form>
      </Col>
+
      <Col span={24}>
        <Form onFinish={handleChangePassword} autoComplete={"no"} initialValues={currentUser} layout="vertical">
          <Card
@@ -119,6 +144,52 @@ export default connect(
          </Card>
        </Form>
      </Col>
+
+      {association && (
+        <Col span={24}>
+          <Card title={t("user.labels.user_settings")}>
+            <Space align="center" size="large">
+              <Typography.Text>{t("user.labels.play_sound_for_new_messages")}</Typography.Text>
+              <Tooltip
+                title={soundEnabled ? t("user.labels.notification_sound_on") : t("user.labels.notification_sound_off")}
+              >
+                <Switch
+                  checkedChildren={<SoundOutlined />}
+                  unCheckedChildren={<AudioMutedOutlined />}
+                  checked={!!soundEnabled}
+                  loading={assocLoading || updatingSound}
+                  onChange={(checked) => {
+                    updateNewMessageSound({
+                      variables: { id: association.id, value: checked },
+                      optimisticResponse: {
+                        update_associations_by_pk: {
+                          __typename: "associations",
+                          id: association.id,
+                          new_message_sound: checked
+                        }
+                      }
+                    })
+                      .then(() => {
+                        notification.success({
+                          message: checked
+                            ? t("user.labels.notification_sound_enabled")
+                            : t("user.labels.notification_sound_disabled")
+                        });
+                      })
+                      .catch((e) => {
+                        notification.error({ message: e.message || "Failed to update setting" });
+                      });
+                  }}
+                />
+              </Tooltip>
+            </Space>
+            <Typography.Paragraph type="secondary" style={{ marginTop: 8 }}>
+              {t("user.labels.notification_sound_help")}
+            </Typography.Paragraph>
+          </Card>
+        </Col>
+      )}
+
      {scenarioNotificationsOn && (
        <Col span={24}>
          <NotificationSettingsForm />
--- a/client/src/components/qbo-authorize/qbo-authorize.component.jsx
+++ b/client/src/components/qbo-authorize/qbo-authorize.component.jsx
@@ -5,6 +5,7 @@ import { useEffect } from "react";
 import { useCookies } from "react-cookie";
 import { useLocation, useNavigate } from "react-router-dom";
 import QboSignIn from "../../assets/qbo/C2QB_green_btn_med_default.svg";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 export default function QboAuthorizeComponent() {
  const location = useLocation();
@@ -12,6 +13,7 @@ export default function QboAuthorizeComponent() {
  const [setCookie] = useCookies(["access_token", "refresh_token"]);

  const handleQbSignIn = async () => {
+    logImEXEvent("qbo_sign_in_clicked");
    const result = await Axios.post("/qbo/authorize");
    window.location.href = result.data;
  };
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header-graph.component.jsx
@@ -9,6 +9,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { upsellEnum, UpsellMaskWrapper } from "../upsell/upsell.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -79,7 +80,12 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
  );

  return (
-    <Popover trigger="hover" placement="bottom" content={popContent}>
+    <Popover
+      trigger="hover"
+      placement="bottom"
+      onOpenChange={(open) => open && logImEXEvent("schedule_spider_graph", {})}
+      content={popContent}
+    >
      <RadarChartOutlined />
    </Popover>
  );
--- a/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/schedule-calendar-header.component.jsx
@@ -19,6 +19,7 @@ import OwnerNameDisplay from "../owner-name-display/owner-name-display.component
 import ScheduleBlockDay from "../schedule-block-day/schedule-block-day.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import ScheduleCalendarHeaderGraph from "./schedule-calendar-header-graph.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -142,6 +143,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
          content={jobsInPopup}
          trigger="hover"
          title={t("appointments.labels.arrivingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_arriving_jobs", {})}
        >
          <Space size="small">
            <Icon component={MdFileDownload} style={{ color: "green" }} />
@@ -159,6 +161,7 @@ export function ScheduleCalendarHeaderComponent({ bodyshop, label, refetch, date
          content={jobsOutPopup}
          trigger="hover"
          title={t("appointments.labels.completingjobs")}
+          onOpenChange={(open) => open && logImEXEvent("schedule_popover_departing_jobs", {})}
        >
          <Space size="small">
            <Icon component={MdFileUpload} style={{ color: "red" }} />
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -13,6 +13,7 @@ import Event from "../job-at-change/schedule-event.container";
 import JobDetailCards from "../job-detail-cards/job-detail-cards.component";
 import local from "./localizer";
 import HeaderComponent from "./schedule-calendar-header.component";
+import { logImEXEvent } from "../../firebase/firebase.utils";
 import "./schedule-calendar.styles.scss";

 const mapStateToProps = createStructuredSelector({
@@ -139,6 +140,8 @@ export function ScheduleCalendarWrapperComponent({
        }}
        onView={(view) => {
          search.view = view;
+          logImEXEvent("schedule_change_view", { view });
+
          history({ search: queryString.stringify(search) });
        }}
        step={15}
--- a/client/src/components/schedule-calendar/schedule-calendar.component.jsx
+++ b/client/src/components/schedule-calendar/schedule-calendar.component.jsx
@@ -14,6 +14,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import _ from "lodash";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -80,6 +81,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                value={[...estimatorsFilter]}
                onChange={(e) => {
                  setEstimatiorsFilter(e);
+                  logImEXEvent("schedule_filter_by_estimator", { estimators: e });
                }}
                options={estimators.map((e) => ({
                  label: e,
@@ -95,6 +97,7 @@ export function ScheduleCalendarComponent({ data, refetch, bodyshop }) {
                value={filter?.ins_co_nm ? filter.ins_co_nm : []}
                onChange={(e) => {
                  setFilter({ ...filter, ins_co_nm: e });
+                  logImEXEvent("schedule_filter_by_ins_co_nm", { ins_co_nm: e });
                }}
                options={bodyshop.md_ins_cos.map((i) => ({
                  label: i.name,
--- a/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
+++ b/client/src/components/scoreboard-entry-edit/scoreboard-entry-edit.component.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { UPDATE_SCOREBOARD_ENTRY } from "../../graphql/scoreboard.queries";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 export default function ScoreboardEntryEdit({ entry }) {
  const [open, setOpen] = useState(false);
@@ -16,6 +17,7 @@ export default function ScoreboardEntryEdit({ entry }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("scoreboard_edit_job", {});
    values.date = dayjs(values.date).format("YYYY-MM-DD");
    const result = await updateScoreboardentry({
      variables: { sbId: entry.id, sbInput: values }
--- a/client/src/components/share-to-teams/share-to-teams.component.jsx
+++ b/client/src/components/share-to-teams/share-to-teams.component.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -52,6 +53,7 @@ const ShareToTeamsComponent = ({
  const teamsShareUrl = `https://teams.microsoft.com/share?href=${currentUrl}&preText=${messageText}&title=${pageTitle}`;
  // Function to open the centered share link in a new window/tab
  const handleShare = () => {
+    logImEXEvent("share_to_teams", {});
    const screenWidth = window.screen.width;
    const screenHeight = window.screen.height;
    const windowWidth = 600;
--- a/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
+++ b/client/src/components/shop-info/shop-info.responsibilitycenters.component.jsx
@@ -138,6 +138,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                  <Switch />
                </Form.Item>
              )}
+              {bodyshop.pbs_serialnumber && (
+                <Form.Item
+                  label={t("bodyshop.fields.dms.ro_posting")}
+                  valuePropName="checked"
+                  name={["pbs_configuration", "ro_posting"]}
+                >
+                  <Switch />
+                </Form.Item>
+              )}
              {bodyshop.pbs_serialnumber && (
                <Form.Item
                  label={t("bodyshop.fields.dms.appostingaccount")}
--- a/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
+++ b/client/src/components/simplified-parts-jobs-list/simplified-parts-jobs-list.component.jsx
@@ -96,14 +96,14 @@ export function SimplifiedPartsJobsListComponent({

      ellipsis: true,
      sorter: search?.search
-        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses.parts_active_statuses)
+        ? (a, b) => statusSort(a.status, b.status, bodyshop.md_ro_statuses?.parts_active_statuses)
        : true,
      sortOrder: sortcolumn === "status" && sortorder,
      render: (text, record) => {
        return record.status || t("general.labels.na");
      },
      filteredValue: filter?.status || null,
-      filters: bodyshop.md_ro_statuses.parts_statuses.map((s) => {
+      filters: bodyshop?.md_ro_statuses?.parts_statuses?.map((s) => {
        return { text: s, value: [s] };
      }),
      onFilter: (value, record) => value.includes(record.status)
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -19,6 +19,7 @@ import { DateFormatter, DateTimeFormatter } from "../../utils/DateFormatter.jsx"
 import dayjs from "../../utils/day";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import PriorityLabel from "../../utils/tasksPriorityLabel.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 /**
 * Task List Component
@@ -289,6 +290,7 @@ function TaskListComponent({
      } else {
        delete search[param];
      }
+      logImEXEvent("tasks_filter", { key: param });
      history({ search: queryString.stringify(search) });
    },
    [history, search]
--- a/client/src/components/task-list/task-list.container.jsx
+++ b/client/src/components/task-list/task-list.container.jsx
@@ -13,6 +13,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import dayjs from "../../utils/day";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -107,6 +108,7 @@ export function TaskListContainer({
          })
        );
      }
+      logImEXEvent("task_completed", {});

      notification["success"]({
        message: t("tasks.successes.completed")
@@ -160,6 +162,7 @@ export function TaskListContainer({
        );
      }

+      logImEXEvent("task_deleted", {});
      notification["success"]({
        message: t("tasks.successes.deleted")
      });
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -17,6 +17,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import { isEqual } from "lodash";
 import refetchRouteMappings from "./task-upsert-modal.route.mappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser,
@@ -180,7 +181,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
    notification["success"]({
      message: t("tasks.successes.updated")
    });
-
+    logImEXEvent("task_update", {});
    toggleModalVisible();
  };

@@ -217,7 +218,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to

    form.resetFields();
    toggleModalVisible();
-
+    logImEXEvent("task_insert", {});
    notification["success"]({
      message: t("tasks.successes.created")
    });
--- a/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
+++ b/client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
@@ -111,7 +111,7 @@ export function TechLookupJobsList({ bodyshop }) {
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })) ||
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -1,13 +1,14 @@
-import { useState } from "react";
-import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation } from "@apollo/client";
-import VehicleDetailFormComponent from "./vehicle-detail-form.component";
+import { Button, Form, Popconfirm } from "antd";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
-import dayjs from "../../utils/day";
-import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
 import { useNavigate } from "react-router-dom";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";
+import { DELETE_VEHICLE, UPDATE_VEHICLE } from "../../graphql/vehicles.queries";
+import dayjs from "../../utils/day";
+import VehicleDetailFormComponent from "./vehicle-detail-form.component";

 function VehicleDetailFormContainer({ vehicle, refetch }) {
  const { t } = useTranslation();
@@ -20,6 +21,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {

  const handleDelete = async () => {
    setLoading(true);
+    logImEXEvent("vehicle_delete", {});
    const result = await deleteVehicle({
      variables: { id: vehicle.id }
    });
@@ -42,6 +44,7 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {

  const handleFinish = async (values) => {
    setLoading(true);
+    logImEXEvent("vehicle_update", {});
    const result = await updateVehicle({
      variables: { vehId: vehicle.id, vehicle: values }
    });
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -76,9 +76,11 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
  try {

    const state = stateProp || store.getState();
+
    const eventParams = {
      shop: (state.user && state.user.bodyshop && state.user.bodyshop.shopname) || null,
      user: (state.user && state.user.currentUser && state.user.currentUser.email) || null,
+      partsManagementOnly: state?.user?.partsManagementOnly,
      ...additionalParams
    };
    // axios.post("/ioevent", {
@@ -89,12 +91,12 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    //   dbevent: false,
    //   env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
    // });
-    // console.log(
-    //   "%c[Analytics]",
-    //   "background-color: green ;font-weight:bold;",
-    //   eventName,
-    //   eventParams
-    // );
+    console.log(
+      "%c[Analytics]",
+      "background-color: green ;font-weight:bold;",
+      eventName,
+      eventParams
+    );
    logEvent(analytics, eventName, eventParams);
    amplitude.track(eventName, eventParams);
    posthog.capture(eventName, eventParams);
--- a/client/src/graphql/bills.queries.js
+++ b/client/src/graphql/bills.queries.js
@@ -20,8 +20,8 @@ export const DELETE_BILL = gql`
 `;

 export const QUERY_ALL_BILLS_PAGINATED = gql`
-  query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!) {
-    bills(offset: $offset, limit: $limit, order_by: $order) {
+  query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!, $where: bills_bool_exp) {
+    bills(offset: $offset, limit: $limit, order_by: $order, where: $where) {
      id
      vendorid
      vendor {
@@ -42,7 +42,7 @@ export const QUERY_ALL_BILLS_PAGINATED = gql`
        ro_number
      }
    }
-    bills_aggregate {
+    bills_aggregate(where: $where) {
      aggregate {
        count(distinct: true)
      }
--- a/client/src/graphql/user.queries.js
+++ b/client/src/graphql/user.queries.js
@@ -5,6 +5,7 @@ export const QUERY_SHOP_ASSOCIATIONS = gql`
    associations(where: { shopid: { _eq: $shopid } }) {
      id
      authlevel
+      new_message_sound
      shopid
      user {
        email
@@ -28,6 +29,26 @@ export const UPDATE_ASSOCIATION = gql`
  }
 `;

+// Query to load the active association for a given user and get the new_message_sound flag
+export const QUERY_ACTIVE_ASSOCIATION_SOUND = gql`
+  query QUERY_ACTIVE_ASSOCIATION_SOUND($email: String!) {
+    associations(where: { _and: { useremail: { _eq: $email }, active: { _eq: true } } }) {
+      id
+      new_message_sound
+    }
+  }
+`;
+
+// Mutation to update just the new_message_sound field
+export const UPDATE_NEW_MESSAGE_SOUND = gql`
+  mutation UPDATE_NEW_MESSAGE_SOUND($id: uuid!, $value: Boolean) {
+    update_associations_by_pk(pk_columns: { id: $id }, _set: { new_message_sound: $value }) {
+      id
+      new_message_sound
+    }
+  }
+`;
+
 export const INSERT_EULA_ACCEPTANCE = gql`
  mutation INSERT_EULA_ACCEPTANCE($eulaAcceptance: eula_acceptances_insert_input!) {
    insert_eula_acceptances_one(object: $eulaAcceptance) {
@@ -77,6 +98,7 @@ export const QUERY_KANBAN_SETTINGS = gql`
    }
  }
 `;
+
 export const UPDATE_KANBAN_SETTINGS = gql`
  mutation UPDATE_KANBAN_SETTINGS($id: uuid!, $ks: jsonb) {
    update_associations_by_pk(pk_columns: { id: $id }, _set: { kanban_settings: $ks }) {
--- a/client/src/index.jsx
+++ b/client/src/index.jsx
@@ -26,7 +26,7 @@ registerSW({ immediate: true });
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";

-amplitude.init("6228a598e57cd66875cfd41604f1f891", {
+amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
  defaultTracking: true,
  serverUrl: import.meta.env.VITE_APP_AMP_URL
  //  {
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -16,23 +16,19 @@ import { DateFormatter } from "../../utils/DateFormatter";
 import { TemplateList } from "../../utils/TemplateConstants";
 import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
-import useLocalStorage from "../../utils/useLocalStorage";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";

 const mapDispatchToProps = (dispatch) => ({
  setBillEnterContext: (context) => dispatch(setModalContext({ context: context, modal: "billEnter" }))
 });

-export function BillsListPage({ loading, data, refetch, total, setBillEnterContext }) {
+export function BillsListPage({ loading, data, refetch, total, setBillEnterContext, handleTableChange, sortedInfo }) {
  const search = queryString.parse(useLocation().search);
  const [openSearchResults, setOpenSearchResults] = useState([]);
  const [searchLoading, setSearchLoading] = useState(false);
  const { page } = search;
  const history = useNavigate();
-  const [state, setState] = useLocalStorage("bills_list_sort", {
-    sortedInfo: {},
-    filteredInfo: { text: "" }
-  });
  const Templates = TemplateList("bill");
  const { t } = useTranslation();

@@ -48,9 +44,8 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
        vendor: { name: order === "descend" ? "desc" : "asc" }
      }),
      filters: (vendorsData?.vendors || []).map((v) => ({ text: v.name, value: v.id })),
-      filteredValue: state.filteredInfo.vendorname || null,
-      onFilter: (value, record) => record.vendorid === value,
-      sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
+      filteredValue: search.vendorIds ? search.vendorIds.split(",") : null,
+      sortOrder: sortedInfo.columnKey === "vendorname" && sortedInfo.order,
      render: (text, record) => <span>{record.vendor.name}</span>
    },
    {
@@ -58,7 +53,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "invoice_number",
      key: "invoice_number",
      sorter: (a, b) => alphaSort(a.invoice_number, b.invoice_number),
-      sortOrder: state.sortedInfo.columnKey === "invoice_number" && state.sortedInfo.order
+      sortOrder: sortedInfo.columnKey === "invoice_number" && sortedInfo.order
    },
    {
      title: t("jobs.fields.ro_number"),
@@ -68,7 +63,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      sortObject: (order) => ({
        job: { ro_number: order === "descend" ? "desc" : "asc" }
      }),
-      sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "ro_number" && sortedInfo.order,
      render: (text, record) => record.job && <Link to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number}</Link>
    },
    {
@@ -76,7 +71,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "date",
      key: "date",
      sorter: (a, b) => dateSort(a.date, b.date),
-      sortOrder: state.sortedInfo.columnKey === "date" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "date" && sortedInfo.order,
      render: (text, record) => <DateFormatter>{record.date}</DateFormatter>
    },
    {
@@ -84,7 +79,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "total",
      key: "total",
      sorter: (a, b) => a.total - b.total,
-      sortOrder: state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "total" && sortedInfo.order,
      render: (text, record) => <CurrencyFormatter>{record.total}</CurrencyFormatter>
    },
    {
@@ -92,7 +87,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "is_credit_memo",
      key: "is_credit_memo",
      sorter: (a, b) => a.is_credit_memo - b.is_credit_memo,
-      sortOrder: state.sortedInfo.columnKey === "is_credit_memo" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "is_credit_memo" && sortedInfo.order,
      render: (text, record) => <Checkbox checked={record.is_credit_memo} />
    },
    {
@@ -100,7 +95,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
      dataIndex: "exported",
      key: "exported",
      sorter: (a, b) => a.exported - b.exported,
-      sortOrder: state.sortedInfo.columnKey === "exported" && state.sortedInfo.order,
+      sortOrder: sortedInfo.columnKey === "exported" && sortedInfo.order,
      render: (text, record) => <Checkbox checked={record.exported} />
    },
    {
@@ -164,20 +159,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
    }
  ];

-  const handleTableChange = (pagination, filters, sorter) => {
-    // Persist filters (including vendorname) and sorting
-    setState({ ...state, filteredInfo: { ...state.filteredInfo, ...filters }, sortedInfo: sorter });
-    search.page = pagination.current;
-    if (sorter && sorter.column && sorter.column.sortObject) {
-      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
-    } else {
-      delete search.searchObj;
-      search.sortcolumn = sorter.order ? sorter.columnKey : null;
-      search.sortorder = sorter.order;
-    }
-    search.sort = JSON.stringify({ [sorter.columnKey]: sorter.order });
-    history({ search: queryString.stringify(search) });
-  };
+  // (State & URL handling moved to container - Option C)

  useEffect(() => {
    if (search.search && search.search.trim() !== "") {
@@ -192,6 +174,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
        search: value || search.search,
        index: "bills"
      });
+      logImEXEvent("bills_search", { search: value || search.search, results: searchData?.data?.hits?.hits?.length });
      setOpenSearchResults(searchData.data.hits.hits.map((s) => s._source));
    } catch (error) {
      console.log("Error while fetching search results", error);
--- a/client/src/pages/bills/bills.page.container.jsx
+++ b/client/src/pages/bills/bills.page.container.jsx
@@ -3,13 +3,14 @@ import queryString from "query-string";
 import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useLocation, useNavigate } from "react-router-dom";
 import AlertComponent from "../../components/alert/alert.component";
 import BillDetailEditContainer from "../../components/bill-detail-edit/bill-detail-edit.container";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_BILLS_PAGINATED } from "../../graphql/bills.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import BillsPageComponent from "./bills.page.component";
+import useLocalStorage from "../../utils/useLocalStorage";
 import { pageLimit } from "../../utils/config";
 import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
@@ -23,7 +24,9 @@ const mapDispatchToProps = (dispatch) => ({

 export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
-  const searchParams = queryString.parse(useLocation().search);
+  const location = useLocation();
+  const history = useNavigate();
+  const searchParams = queryString.parse(location.search);
  const { page, sortcolumn, sortorder, searchObj } = searchParams;

  useEffect(() => {
@@ -37,6 +40,12 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
    setBreadcrumbs([{ link: "/manage/bills", label: t("titles.bc.bills-list") }]);
  }, [t, setBreadcrumbs, setSelectedHeader]);

+  // Persisted table state (sorting & filtering)
+  const [persistState, setPersistState] = useLocalStorage("bills_list_sort", {
+    sortedInfo: {},
+    filteredInfo: { vendorname: [] }
+  });
+
  const { loading, error, data, refetch } = useQuery(QUERY_ALL_BILLS_PAGINATED, {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
@@ -49,10 +58,95 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
          : {
              [sortcolumn || "date"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"
            }
-      ]
+      ],
+      where: searchParams.vendorIds ? { vendorid: { _in: searchParams.vendorIds.split(",") } } : undefined
    }
  });

+  const handleTableChange = (pagination, filters, sorter) => {
+    const search = queryString.parse(location.search);
+
+    const vendorArr = filters?.vendorname ?? [];
+    const newVendorIds = vendorArr.length ? vendorArr.join(",") : undefined;
+    const vendorFilterChanged = search.vendorIds !== newVendorIds;
+
+    search.page = vendorFilterChanged || !search.page ? 1 : pagination.current;
+    newVendorIds ? (search.vendorIds = newVendorIds) : delete search.vendorIds;
+
+    const { columnKey, order, column } = sorter || {};
+    if (column?.sortObject) {
+      search.searchObj = JSON.stringify(column.sortObject(order));
+      delete search.sortcolumn;
+      delete search.sortorder;
+    } else {
+      delete search.searchObj;
+      search.sortcolumn = order ? columnKey : null;
+      search.sortorder = order ?? null; // keep explicit null to mirror prior behavior
+    }
+
+    setPersistState({
+      sortedInfo: sorter || {},
+      filteredInfo: { vendorname: vendorArr }
+    });
+
+    history({ search: queryString.stringify(search) });
+  };
+
+  useEffect(() => {
+    const search = queryString.parse(location.search);
+    let changed = false;
+
+    const vendorPersisted = persistState.filteredInfo.vendorname || [];
+    if (!search.vendorIds && vendorPersisted.length) {
+      search.vendorIds = vendorPersisted.join(",");
+      search.page = 1; // reset page when injecting filter
+      changed = true;
+    }
+
+    const { sortedInfo } = persistState;
+    if (!search.searchObj && !search.sortcolumn && sortedInfo?.order) {
+      const { columnKey, order } = sortedInfo;
+      if (columnKey) {
+        const dir = order === "descend" ? "desc" : "asc";
+        if (columnKey === "vendorname") {
+          search.searchObj = JSON.stringify({ vendor: { name: dir } });
+        } else if (columnKey === "ro_number") {
+          search.searchObj = JSON.stringify({ job: { ro_number: dir } });
+        } else {
+          search.sortcolumn = columnKey;
+          search.sortorder = order;
+        }
+        changed = true;
+      }
+    }
+
+    if (changed) {
+      history({ search: queryString.stringify(search) });
+      return;
+    }
+
+    const hasPersistSort = !!sortedInfo?.order;
+    const hasUrlSort = !!(search.searchObj || (search.sortcolumn && search.sortorder));
+    if (!hasPersistSort && hasUrlSort) {
+      let derived = {};
+      if (search.searchObj) {
+        try {
+          const o = JSON.parse(search.searchObj);
+          if (o.vendor?.name) {
+            derived = { columnKey: "vendorname", order: o.vendor.name === "desc" ? "descend" : "ascend" };
+          } else if (o.job?.ro_number) {
+            derived = { columnKey: "ro_number", order: o.job.ro_number === "desc" ? "descend" : "ascend" };
+          }
+        } catch {
+          /* ignore parse errors */
+        }
+      } else {
+        derived = { columnKey: search.sortcolumn, order: search.sortorder };
+      }
+      if (derived.order) setPersistState((prev) => ({ ...prev, sortedInfo: derived }));
+    }
+  }, [location.search]);
+
  if (error) return <AlertComponent message={error.message} type="error" />;
  return (
    <FeatureWrapperComponent
@@ -70,6 +164,8 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
            loading={loading}
            refetch={refetch}
            total={data ? data.bills_aggregate.aggregate.count : 0}
+            handleTableChange={handleTableChange}
+            sortedInfo={persistState.sortedInfo || {}}
          />

          <BillDetailEditContainer />
--- a/client/src/pages/contract-create/contract-create.page.container.jsx
+++ b/client/src/pages/contract-create/contract-create.page.container.jsx
@@ -15,6 +15,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import ContractCreatePageComponent from "./contract-create.page.component";
 import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { logImEXEvent } from "../../firebase/firebase.utils.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -57,6 +58,7 @@ export function ContractCreatePageContainer({ bodyshop, setBreadcrumbs, setSelec

      if (!result.errors) {
        //Update the courtesy car to have the damage.
+        logImEXEvent("courtesy_car_contract_created", {});
        notification["success"]({
          message: t("contracts.successes.saved")
        });
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -48,7 +48,7 @@ export const socket = SocketIO(

 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
  const { t } = useTranslation();
-  const [logLevel, setLogLevel] = useState("DEBUG");
+  const [logLevel, setLogLevel] = useState(determineDmsType(bodyshop) === "pbs" ? "INFO" : "DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
  const search = queryString.parse(useLocation().search);
--- a/client/src/pages/jobs-create/jobs-create.container.jsx
+++ b/client/src/pages/jobs-create/jobs-create.container.jsx
@@ -14,7 +14,7 @@ import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-
+import { logImEXEvent } from "../../firebase/firebase.utils";
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
@@ -70,6 +70,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
        label: t("titles.bc.jobs-new")
      }
    ]);
+    logImEXEvent("manual_job_create_start", {});
  }, [t, setBreadcrumbs, setSelectedHeader]);

  const runInsertJob = (job) => {
@@ -81,6 +82,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
          error: null,
          newJobId: resp.data.insert_jobs.returning[0].id
        });
+        logImEXEvent("manual_job_create_completed", {});
      })
      .catch((error) => {
        notification["error"]({
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -20,7 +20,12 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
 import UpdateAlert from "../../components/update-alert/update-alert.component";
-import { selectBodyshop, selectInstanceConflict, selectPartsManagementOnly } from "../../redux/user/user.selectors";
+import {
+  selectBodyshop,
+  selectCurrentUser,
+  selectInstanceConflict,
+  selectPartsManagementOnly
+} from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import useAlertsNotifications from "../../hooks/useAlertsNotifications.jsx";
 import { selectDarkMode } from "../../redux/application/application.selectors.js";
@@ -109,10 +114,11 @@ const mapStateToProps = createStructuredSelector({
  conflict: selectInstanceConflict,
  bodyshop: selectBodyshop,
  partsManagementOnly: selectPartsManagementOnly,
-  isDarkMode: selectDarkMode
+  isDarkMode: selectDarkMode,
+  currentUser: selectCurrentUser
 });

-export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode }) {
+export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode, currentUser }) {
  const { t } = useTranslation();
  const [chatVisible] = useState(false);
  const didMount = useRef(false);
@@ -588,7 +594,7 @@ export function Manage({ conflict, bodyshop, partsManagementOnly, isDarkMode })

  return (
    <>
-      <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
+      <ChatAffixContainer bodyshop={bodyshop} currentUser={currentUser} chatVisible={chatVisible} />
      <Layout style={{ minHeight: "100vh" }} className="layout-container">
        <UpdateAlert />
        <HeaderContainer />
--- a/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
+++ b/client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx
@@ -97,7 +97,7 @@ export function TechAssignedProdJobs({ setTimeTicketTaskContext, technician, bod
            .filter(onlyUnique)
            .map((s) => {
              return {
-                text: s || "No Status*",
+                text: s || t("dashboard.errors.status"),
                value: [s]
              };
            })) ||
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -144,6 +144,11 @@
        "tasks_updated": "Task '{{title}}' updated by {{updatedBy}}"
      }
    },
+    "audio": {
+      "manager": {
+        "description": "Click anywhere to enable the message ding."
+      }
+    },
    "billlines": {
      "actions": {
        "newline": "New Line"
@@ -316,6 +321,7 @@
          "itc_local": "Local Tax is ITC?",
          "itc_state": "State Tax is ITC?",
          "mappingname": "DMS Mapping Name",
+          "ro_posting": "Create $0 RO?",
          "sendmaterialscosting": "Materials Cost as % of Sale",
          "srcco": "Source Company #/Dealer #"
        },
@@ -991,6 +997,7 @@
        "insco": "No Ins. Co.*",
        "refreshrequired": "You must refresh the dashboard data to see this component.",
        "status": "No Status*",
+        "status_normal": "No Status",
        "updatinglayout": "Error saving updated layout {{message}}"
      },
      "labels": {
@@ -3806,7 +3813,14 @@
      "labels": {
        "actions": "Actions",
        "changepassword": "Change Password",
-        "profileinfo": "Profile Info"
+        "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."
      },
      "successess": {
        "passwordchanged": "Password changed successfully. "
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -144,6 +144,11 @@
        "tasks_updated": ""
      }
    },
+    "audio": {
+      "manager": {
+        "description": ""
+      }
+    },
    "billlines": {
      "actions": {
        "newline": ""
@@ -316,6 +321,7 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
+          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -991,6 +997,7 @@
        "insco": "",
        "refreshrequired": "",
        "status": "",
+        "status_normal": "",
        "updatinglayout": ""
      },
      "labels": {
@@ -3807,7 +3814,14 @@
      "labels": {
        "actions": "",
        "changepassword": "",
-        "profileinfo": ""
+        "profileinfo": "",
+        "user_settings": "",
+        "play_sound_for_new_messages": "",
+        "notification_sound_on": "",
+        "notification_sound_off": "",
+        "notification_sound_enabled": "",
+        "notification_sound_disabled": "",
+        "notification_sound_help": ""
      },
      "successess": {
        "passwordchanged": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -144,6 +144,11 @@
        "tasks_updated": ""
      }
    },
+    "audio": {
+      "manager": {
+        "description": ""
+      }
+    },
    "billlines": {
      "actions": {
        "newline": ""
@@ -316,6 +321,7 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
+          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -991,6 +997,7 @@
        "insco": "",
        "refreshrequired": "",
        "status": "",
+        "status_normal": "",
        "updatinglayout": ""
      },
      "labels": {
@@ -3807,7 +3814,14 @@
      "labels": {
        "actions": "",
        "changepassword": "",
-        "profileinfo": ""
+        "profileinfo": "",
+        "user_settings": "",
+        "play_sound_for_new_messages": "",
+        "notification_sound_on": "",
+        "notification_sound_off": "",
+        "notification_sound_enabled": "",
+        "notification_sound_disabled": "",
+        "notification_sound_help": ""
      },
      "successess": {
        "passwordchanged": ""
--- a/client/src/utils/singleTabAudioLeader.js
+++ b/client/src/utils/singleTabAudioLeader.js
@@ -0,0 +1,164 @@
+// src/utils/singleTabAudioLeader.js
+// Ensures only one tab ("leader") plays sounds per bodyshop.
+//
+// Storage key:  localStorage["imex:sound:leader:<bodyshopId>"] = { id, ts }
+// Channel:      new BroadcastChannel("imex:sound:<bodyshopId>")
+
+const STORAGE_PREFIX = "imex:sound:leader:";
+const CHANNEL_PREFIX = "imex:sound:";
+
+const TTL_MS = 60_000; // leader expires after 60s without heartbeat
+const HEARTBEAT_MS = 20_000; // leader refresh interval
+const WATCHDOG_MS = 10_000; // how often non-leaders check for stale leader
+
+const TAB_ID =
+  typeof crypto !== "undefined" && crypto.randomUUID ? crypto.randomUUID() : Math.random().toString(36).slice(2);
+
+function channelSupported() {
+  try {
+    return "BroadcastChannel" in window;
+  } catch {
+    return false;
+  }
+}
+
+function getChannel(bodyshopId) {
+  if (!channelSupported() || !bodyshopId) return null;
+  try {
+    return new BroadcastChannel(CHANNEL_PREFIX + String(bodyshopId));
+  } catch {
+    return null;
+  }
+}
+
+function lsKey(bodyshopId) {
+  return STORAGE_PREFIX + String(bodyshopId);
+}
+
+function readLeader(bodyshopId) {
+  if (!bodyshopId) return null;
+  try {
+    const raw = localStorage.getItem(lsKey(bodyshopId));
+    if (!raw) return null;
+    return JSON.parse(raw);
+  } catch {
+    return null;
+  }
+}
+
+function writeLeader(record, bodyshopId) {
+  if (!bodyshopId) return;
+  try {
+    localStorage.setItem(lsKey(bodyshopId), JSON.stringify(record));
+    const bc = getChannel(bodyshopId);
+    if (bc) {
+      bc.postMessage({ type: "leader-update", payload: { ...record, bodyshopId } });
+      bc.close();
+    }
+  } catch {
+    // ignore
+  }
+}
+
+function removeLeader(bodyshopId) {
+  if (!bodyshopId) return;
+  try {
+    const cur = readLeader(bodyshopId);
+    if (cur?.id === TAB_ID) {
+      localStorage.removeItem(lsKey(bodyshopId));
+      const bc = getChannel(bodyshopId);
+      if (bc) {
+        bc.postMessage({ type: "leader-removed", payload: { id: TAB_ID, bodyshopId } });
+        bc.close();
+      }
+    }
+  } catch {
+    // ignore
+  }
+}
+
+function now() {
+  return Date.now();
+}
+
+function isStale(rec) {
+  return !rec || now() - rec.ts > TTL_MS;
+}
+
+function claimLeadership(bodyshopId) {
+  const rec = { id: TAB_ID, ts: now() };
+  writeLeader(rec, bodyshopId);
+  return rec;
+}
+
+/** Is THIS tab currently the leader (and not stale)? */
+export function isLeaderTab(bodyshopId) {
+  const rec = readLeader(bodyshopId);
+  return !!rec && rec.id === TAB_ID && !isStale(rec);
+}
+
+/** Force this tab to become the leader right now. */
+export function claimLeadershipNow(bodyshopId) {
+  return claimLeadership(bodyshopId);
+}
+
+/**
+ * Initialize leader election/heartbeat for this tab (scoped by bodyshopId).
+ * Call once (e.g., in SoundWrapper). Returns a cleanup function.
+ */
+export function initSingleTabAudioLeader(bodyshopId) {
+  if (!bodyshopId)
+    return () => {
+      //
+    };
+
+  // If no leader or stale, try to claim after a tiny delay (reduce startup contention)
+  if (isStale(readLeader(bodyshopId))) {
+    setTimeout(() => claimLeadership(bodyshopId), 100);
+  }
+
+  // If this tab becomes focused/visible, it can claim leadership
+  const onFocus = () => claimLeadership(bodyshopId);
+  const onVis = () => {
+    if (document.visibilityState === "visible") claimLeadership(bodyshopId);
+  };
+  window.addEventListener("focus", onFocus);
+  document.addEventListener("visibilitychange", onVis);
+
+  // Heartbeat from the leader to keep record fresh
+  const heartbeat = setInterval(() => {
+    if (!isLeaderTab(bodyshopId)) return;
+    writeLeader({ id: TAB_ID, ts: now() }, bodyshopId);
+  }, HEARTBEAT_MS);
+
+  // Watchdog: if leader is stale, try to claim (even if we're not focused)
+  const watchdog = setInterval(() => {
+    const cur = readLeader(bodyshopId);
+    if (isStale(cur)) claimLeadership(bodyshopId);
+  }, WATCHDOG_MS);
+
+  // If this tab was the leader, clean up on unload
+  const onUnload = () => removeLeader(bodyshopId);
+  window.addEventListener("beforeunload", onUnload);
+
+  // Per-bodyshop BroadcastChannel listener (optional/no-op)
+  const bc = getChannel(bodyshopId);
+  const onBC = bc
+    ? () => {
+        // No state kept here; localStorage read is the source of truth.
+      }
+    : null;
+  if (bc && onBC) bc.addEventListener("message", onBC);
+
+  return () => {
+    window.removeEventListener("focus", onFocus);
+    document.removeEventListener("visibilitychange", onVis);
+    window.removeEventListener("beforeunload", onUnload);
+    clearInterval(heartbeat);
+    clearInterval(watchdog);
+    if (bc && onBC) {
+      bc.removeEventListener("message", onBC);
+      bc.close();
+    }
+  };
+}
--- a/client/src/utils/soundManager.js
+++ b/client/src/utils/soundManager.js
@@ -0,0 +1,97 @@
+// src/utils/soundManager.js
+// Handles audio init, autoplay unlock, and queued plays.
+// When a tab successfully unlocks audio, it CLAIMS LEADERSHIP immediately for that bodyshop.
+
+import { claimLeadershipNow } from "./singleTabAudioLeader";
+
+let baseAudio = null;
+let unlocked = false;
+let queuedPlays = 0;
+let installingUnlockHandlers = false;
+
+/**
+ * Initialize the new-message sound.
+ * @param {string} url
+ * @param {number} volume
+ */
+export function initNewMessageSound(url, volume = 0.7) {
+  baseAudio = new Audio(url);
+  baseAudio.preload = "auto";
+  baseAudio.volume = volume;
+}
+
+/** Has this tab unlocked audio? (optional helper) */
+export function isAudioUnlocked() {
+  return unlocked;
+}
+
+/**
+ * Unlocks audio if not already unlocked.
+ * On success, this tab immediately becomes the sound LEADER for the given bodyshop.
+ */
+export async function unlockAudio(bodyshopId) {
+  if (unlocked) return;
+  try {
+    // Chrome/Safari: playing any media (even muted) after a gesture unlocks audio.
+    const a = new Audio();
+    a.muted = true;
+    await a.play().catch(() => {
+      // ignore
+    });
+    unlocked = true;
+
+    // Immediately become the leader because THIS tab can actually play sound.
+    claimLeadershipNow(bodyshopId);
+
+    // Flush exactly one queued ding (avoid spamming if many queued while locked)
+    if (queuedPlays > 0 && baseAudio) {
+      queuedPlays = 0;
+      const b = baseAudio.cloneNode(true);
+      b.play().catch(() => {
+        // ignore
+      });
+    }
+  } finally {
+    removeUnlockListeners();
+  }
+}
+
+/** Installs listeners to unlock audio on first gesture. */
+function addUnlockListeners(bodyshopId) {
+  if (installingUnlockHandlers) return;
+  installingUnlockHandlers = true;
+  const handler = () => unlockAudio(bodyshopId);
+  window.addEventListener("click", handler, { once: true, passive: true });
+  window.addEventListener("touchstart", handler, { once: true, passive: true });
+  window.addEventListener("keydown", handler, { once: true });
+}
+
+/** Removes listeners to unlock audio on first gesture. */
+function removeUnlockListeners() {
+  // With {once:true} they self-remove; we only reset the flag.
+  installingUnlockHandlers = false;
+}
+
+/**
+ * Plays the new-message ding. If blocked, queue one and wait for first gesture.
+ */
+export async function playNewMessageSound(bodyshopId) {
+  if (!baseAudio) return;
+  try {
+    const a = baseAudio.cloneNode(true);
+    await a.play();
+  } catch (err) {
+    // Most common: NotAllowedError due to missing prior gesture
+    if (err?.name === "NotAllowedError") {
+      queuedPlays = Math.min(queuedPlays + 1, 1); // cap at 1
+      addUnlockListeners(bodyshopId);
+
+      // Let the app know we need user interaction (optional UI prompt)
+      window.dispatchEvent(new CustomEvent("sound-needs-unlock"));
+      return;
+    }
+    // Other errors can be logged
+     
+    console.error("Audio play error:", err);
+  }
+}
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -220,7 +220,7 @@ export default defineConfig({

  // Strip console/debugger in prod to shrink bundles
  esbuild: {
-    drop: ["console", "debugger"]
+    //drop: ["console", "debugger"]
  },

  optimizeDeps: {
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -119,6 +119,7 @@ services:
        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
      "
  # Node App: The Main IMEX API
  node-app:
--- a/hasura/metadata/cron_triggers.yaml
+++ b/hasura/metadata/cron_triggers.yaml
@@ -6,6 +6,15 @@
  headers:
    - name: x-imex-auth
      value_from_env: DATAPUMP_AUTH
+- name: CARFAX Data Pump
+  webhook: '{{HASURA_API_URL}}/data/carfax'
+  schedule: 0 7 * * 0
+  include_in_metadata: true
+  payload: {}
+  headers:
+    - name: x-imex-auth
+      value_from_env: DATAPUMP_AUTH
+  comment: Project Mexico
 - name: Chatter Data Pump
  webhook: '{{HASURA_API_URL}}/data/chatter'
  schedule: 45 5 * * *
@@ -42,12 +51,13 @@
  comment: ""
 - name: Rome Usage Report
  webhook: '{{HASURA_API_URL}}/data/usagereport'
-  schedule: 0 12 * * 5
+  schedule: 0 12 * * 3,5
  include_in_metadata: true
  payload: {}
  headers:
    - name: x-imex-auth
      value_from_env: DATAPUMP_AUTH
+  comment: ""
 - name: Task Reminders
  webhook: '{{HASURA_API_URL}}/tasks-remind-handler'
  schedule: '*/15 * * * *'
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -215,6 +215,7 @@
          - default_prod_list_view
          - id
          - kanban_settings
+          - new_message_sound
          - notification_settings
          - notifications_autoadd
          - qbo_realmId
@@ -232,6 +233,7 @@
          - authlevel
          - default_prod_list_view
          - kanban_settings
+          - new_message_sound
          - notification_settings
          - notifications_autoadd
          - qbo_realmId
@@ -942,6 +944,7 @@
          - autohouseid
          - bill_allow_post_to_closed
          - bill_tax_rates
+          - carfax_exclude
          - cdk_configuration
          - cdk_dealerid
          - chatterid
--- a/hasura/migrations/1758722733666_alter_table_public_associations_add_column_new_message_sound/down.sql
+++ b/hasura/migrations/1758722733666_alter_table_public_associations_add_column_new_message_sound/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"."associations" add column "new_message_sound" boolean
+--  null;
--- a/hasura/migrations/1758722733666_alter_table_public_associations_add_column_new_message_sound/up.sql
+++ b/hasura/migrations/1758722733666_alter_table_public_associations_add_column_new_message_sound/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."associations" add column "new_message_sound" boolean
+ null;
--- a/hasura/migrations/1758723347874_alter_table_public_associations_alter_column_new_message_sound/down.sql
+++ b/hasura/migrations/1758723347874_alter_table_public_associations_alter_column_new_message_sound/down.sql
@@ -0,0 +1 @@
+ALTER TABLE "public"."associations" ALTER COLUMN "new_message_sound" drop default;
--- a/hasura/migrations/1758723347874_alter_table_public_associations_alter_column_new_message_sound/up.sql
+++ b/hasura/migrations/1758723347874_alter_table_public_associations_alter_column_new_message_sound/up.sql
@@ -0,0 +1 @@
+alter table "public"."associations" alter column "new_message_sound" set default 'true';
--- a/hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/down.sql
+++ b/hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/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 "carfax_exclude" boolean
+--  not null default 'false';
--- a/hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/up.sql
+++ b/hasura/migrations/1758833517953_alter_table_public_bodyshops_add_column_carfax_exclude/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "carfax_exclude" boolean
+ not null default 'false';
--- a/server/accounting/pbs/pbs-constants.js
+++ b/server/accounting/pbs/pbs-constants.js
@@ -6,10 +6,6 @@ const PBS_CREDENTIALS = {
 };

 exports.PBS_CREDENTIALS = PBS_CREDENTIALS;
-// const cdkDomain =
-//   process.env.NODE_ENV === "production"
-//     ? "https://3pa.dmotorworks.com"
-//     : "https://uat-3pa.dmotorworks.com";

 const pbsDomain = `https://partnerhub.pbsdealers.com/json/reply`;
 exports.PBS_ENDPOINTS = {
@@ -18,5 +14,9 @@ exports.PBS_ENDPOINTS = {
  VehicleGet: `${pbsDomain}/VehicleGet`,
  AccountingPostingChange: `${pbsDomain}/AccountingPostingChange`,
  ContactChange: `${pbsDomain}/ContactChange`,
-  VehicleChange: `${pbsDomain}/VehicleChange`
+  VehicleChange: `${pbsDomain}/VehicleChange`,
+  RepairOrderChange: `${pbsDomain}/RepairOrderChange`, //TODO: Verify that this is correct. Docs have /reply/ in path. 
+  RepairOrderGet: `${pbsDomain}/RepairOrderGet`,
+  RepairOrderContactVehicleGet: `${pbsDomain}/RepairOrderContactVehicleGet`,
+  RepairOrderContactVehicleChange: `${pbsDomain}/RepairOrderContactVehicleChange`,
 };
--- a/server/accounting/pbs/pbs-job-export.js
+++ b/server/accounting/pbs/pbs-job-export.js
@@ -19,12 +19,11 @@ axios.interceptors.request.use((x) => {
    ...x.headers[x.method],
    ...x.headers
  };
-  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${
-    x.url
-  } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
-  //console.log(printable);
+  const printable = `${new Date()} | Request: ${x.method.toUpperCase()} | ${x.url
+    } | ${JSON.stringify(x.data)} | ${JSON.stringify(headers)}`;
+  //logRequestToFile(printable);

-  CdkBase.createJsonEvent(socket, "SILLY", `Raw Request: ${printable}`, x.data);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Request: ${printable}`, x.data);

  return x;
 });
@@ -32,23 +31,39 @@ axios.interceptors.request.use((x) => {
 axios.interceptors.response.use((x) => {
  const socket = x.config.socket;

-  const printable = `${new Date()} | Response: ${x.status} | ${JSON.stringify(x.data)}`;
-  //console.log(printable);
-  CdkBase.createJsonEvent(socket, "SILLY", `Raw Response: ${printable}`, x.data);
+  const printable = `${new Date()} | Response: ${x.status} ${x.statusText} |${JSON.stringify(x.data)}`;
+  //logRequestToFile(printable);
+  CdkBase.createJsonEvent(socket, "DEBUG", `Raw Response: ${printable}`, x.data);

  return x;
 });

+const fs = require('fs');
+const path = require("path");
+function logRequestToFile(printable) {
+  try {
+    const logDir = path.join(process.cwd(), "logs");
+    if (!fs.existsSync(logDir)) {
+      fs.mkdirSync(logDir, { recursive: true });
+    }
+    const logFile = path.join(logDir, "pbs-http.log");
+    fs.appendFileSync(logFile, `${printable}\n`);
+  } catch (err) {
+    console.error("Unexpected error in logRequestToFile:", err);
+  }
+}
+
+
 exports.default = async function (socket, { txEnvelope, jobid }) {
  socket.logEvents = [];
  socket.recordid = jobid;
  socket.txEnvelope = txEnvelope;
  try {
-    CdkBase.createLogEvent(socket, "DEBUG", `Received Job export request for id ${jobid}`);
+    CdkBase.createLogEvent(socket, "INFO", `Received Job export request for id ${jobid}`);

    const JobData = await QueryJobData(socket, jobid);
    socket.JobData = JobData;
-    CdkBase.createLogEvent(socket, "DEBUG", `Querying the DMS for the Vehicle Record.`);
+    CdkBase.createLogEvent(socket, "INFO", `Querying the DMS for the Vehicle Record.`);
    //Query for the Vehicle record to get the associated customer.
    socket.DmsVeh = await QueryVehicleFromDms(socket);
    //Todo: Need to validate the lines and methods below.
@@ -69,42 +84,52 @@ exports.default = async function (socket, { txEnvelope, jobid }) {

 exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selectedCustomerId) {
  try {
-    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle === false) {
-      CdkBase.createLogEvent(socket, "DEBUG", `User selected customer ${selectedCustomerId || "NEW"}`);
+    socket.selectedCustomerId = selectedCustomerId;
+    if (socket.JobData.bodyshop.pbs_configuration.disablecontactvehicle !== true) {
+      CdkBase.createLogEvent(socket, "INFO", `User selected customer ${selectedCustomerId || "NEW"}`);

      //Upsert the contact information as per Wafaa's Email.
      CdkBase.createLogEvent(
        socket,
-        "DEBUG",
-        `Upserting contact information to DMS for ${
-          socket.JobData.ownr_fn || ""
+        "INFO",
+        `Upserting contact information to DMS for ${socket.JobData.ownr_fn || ""
        } ${socket.JobData.ownr_ln || ""} ${socket.JobData.ownr_co_nm || ""}`
      );
      const ownerRef = await UpsertContactData(socket, selectedCustomerId);
-
-      CdkBase.createLogEvent(socket, "DEBUG", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
-      await UpsertVehicleData(socket, ownerRef.ReferenceId);
+      socket.ownerRef = ownerRef;
+      CdkBase.createLogEvent(socket, "INFO", `Upserting vehicle information to DMS for ${socket.JobData.v_vin}`);
+      const vehicleRef = await UpsertVehicleData(socket, ownerRef.ReferenceId);
+      socket.vehicleRef = vehicleRef;
    } else {
      CdkBase.createLogEvent(
        socket,
-        "DEBUG",
-        `Contact and Vehicle updates disabled. Skipping to accounting data insert.`
+        "INFO",
+        `Contact and Vehicle updates disabled. Querying data and skipping to accounting data insert.`
      );
+      //Must query for records to insert $0 RO. 
+      if (!socket.ownerRef) {
+        const ownerRef = (await QueryCustomerBycodeFromDms(socket, selectedCustomerId))?.[0];
+        socket.ownerRef = ownerRef;
+      }
+      const vehicleRef = await GetVehicleData(socket, socket.ownerRef?.ReferenceId || socket.selectedCustomerId);
+      socket.vehicleRef = vehicleRef;
    }
-    CdkBase.createLogEvent(socket, "DEBUG", `Inserting account data.`);
-    CdkBase.createLogEvent(socket, "DEBUG", `Inserting accounting posting data..`);
+    CdkBase.createLogEvent(socket, "INFO", `Inserting accounting posting data..`);
    const insertResponse = await InsertAccountPostingData(socket);

    if (insertResponse.WasSuccessful) {
-      CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported.`);
-      await MarkJobExported(socket, socket.JobData.id);
+      if (socket.JobData.bodyshop.pbs_configuration.ro_posting) {

+        await CreateRepairOrderInPBS(socket, socket.ownerRef, socket.vehicleRef)
+      }
+      CdkBase.createLogEvent(socket, "INFO", `Marking job as exported.`);
+      await MarkJobExported(socket, socket.JobData.id);
      socket.emit("export-success", socket.JobData.id);
    } else {
      CdkBase.createLogEvent(socket, "ERROR", `Export was not successful.`);
    }
  } catch (error) {
-    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in CdkSelectedCustomer. ${error}`);
+    CdkBase.createLogEvent(socket, "ERROR", `Error encountered in PbsSelectedCustomer. ${error}`);
    await InsertFailedExportLog(socket, error);
  }
 };
@@ -112,22 +137,22 @@ exports.PbsSelectedCustomer = async function PbsSelectedCustomer(socket, selecte
 // Was Successful
 async function CheckForErrors(socket, response) {
  if (response.WasSuccessful === undefined || response.WasSuccessful === true) {
-    CdkBase.createLogEvent(socket, "DEBUG", `Successful response from DMS. ${response.Message || ""}`);
+    CdkBase.createLogEvent(socket, "INFO", `Successful response from DMS. ${response.Message || ""}`);
  } else {
    CdkBase.createLogEvent(socket, "ERROR", `Error received from DMS: ${response.Message}`);
-    CdkBase.createLogEvent(socket, "SILLY", `Error received from DMS: ${JSON.stringify(response)}`);
+    CdkBase.createLogEvent(socket, "DEBUG", `Error received from DMS: ${JSON.stringify(response)}`);
  }
 }

 exports.CheckForErrors = CheckForErrors;

 async function QueryJobData(socket, jobid) {
-  CdkBase.createLogEvent(socket, "DEBUG", `Querying job data for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Querying job data for id ${jobid}`);
  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
  const result = await client
    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
    .request(queries.QUERY_JOBS_FOR_PBS_EXPORT, { id: jobid });
-  CdkBase.createLogEvent(socket, "SILLY", `Job data query result ${JSON.stringify(result, null, 2)}`);
+  CdkBase.createLogEvent(socket, "DEBUG", `Job data query result ${JSON.stringify(result, null, 2)}`);
  return result.jobs_by_pk;
 }

@@ -247,15 +272,15 @@ async function UpsertContactData(socket, selectedCustomerId) {
          Code: socket.JobData.owner.accountingid,
          ...(socket.JobData.ownr_co_nm
            ? {
-                //LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_co_nm,
-                IsBusiness: true
-              }
+              //LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_co_nm,
+              IsBusiness: true
+            }
            : {
-                LastName: socket.JobData.ownr_ln,
-                FirstName: socket.JobData.ownr_fn,
-                IsBusiness: false
-              }),
+              LastName: socket.JobData.ownr_ln,
+              FirstName: socket.JobData.ownr_fn,
+              IsBusiness: false
+            }),

          //Salutation: "String",
          //MiddleName: "String",
@@ -332,7 +357,7 @@ async function UpsertVehicleData(socket, ownerRef) {
          //FleetNumber: "String",
          //Status: "String",
          OwnerRef: ownerRef, // "00000000000000000000000000000000",
-          ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
+          // ModelNumber: socket.JobData.vehicle && socket.JobData.vehicle.v_makecode,
          Make: socket.JobData.v_make_desc,
          Model: socket.JobData.v_model_desc,
          Trim: socket.JobData.vehicle && socket.JobData.vehicle.v_trimcode,
@@ -340,7 +365,7 @@ async function UpsertVehicleData(socket, ownerRef) {
          Year: socket.JobData.v_model_yr,
          Odometer: socket.JobData.kmout,
          ExteriorColor: {
-            Code: socket.JobData.v_color,
+            // Code: socket.JobData.v_color,
            Description: socket.JobData.v_color
          }
          // InteriorColor: { Code: "String", Description: "String" },
@@ -470,6 +495,57 @@ async function UpsertVehicleData(socket, ownerRef) {
  }
 }

+async function GetVehicleData(socket, ownerRef) {
+  try {
+    const { data: { Vehicles } } = await axios.post(
+      PBS_ENDPOINTS.VehicleGet,
+      {
+        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+        // "VehicleId": "00000000000000000000000000000000",
+        // "Year": "String",
+        // "YearFrom": "String",
+        // "YearTo": "String",
+        // "Make": "String",
+        // "Model": "String",
+        // "Trim": "String",
+        // "ModelNumber": "String",
+        // "StockNumber": "String",
+        VIN: socket.JobData.v_vin,
+        // "LicenseNumber": "String",
+        // "Lot": "String",
+        // "Status": "String",
+        // "StatusList": ["String"],
+        // "OwnerRef": "00000000000000000000000000000000",
+        // "ModifiedSince": "0001-01-01T00:00:00.0000000Z",
+        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
+        // "LastSaleSince": "0001-01-01T00:00:00.0000000Z",
+        // "VehicleIDList": ["00000000000000000000000000000000"],
+        // "IncludeInactive": false,
+        // "IncludeBuildVehicles": false,
+        // "IncludeBlankLot": false,
+        // "ShortVIN": "String",
+        // "ResultLimit": 0,
+        // "LotAccessDivisions": [0],
+        // "OdometerTo": 0,
+        // "OdometerFrom": 0
+      }
+      ,
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, Vehicles);
+    if (Vehicles.length === 1) {
+      return Vehicles[0];
+
+    } else {
+      CdkBase.createLogEvent(socket, "ERROR", `Error in Getting Vehicle Data - ${Vehicles.length} vehicle(s) found`);
+    }
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in UpsertVehicleData - ${error}`);
+    throw new Error(error);
+  }
+}
+
+
 async function InsertAccountPostingData(socket) {
  try {
    const allocations = await CalculateAllocations(socket, socket.JobData.id);
@@ -572,7 +648,7 @@ async function InsertAccountPostingData(socket) {
 }

 async function MarkJobExported(socket, jobid) {
-  CdkBase.createLogEvent(socket, "DEBUG", `Marking job as exported for id ${jobid}`);
+  CdkBase.createLogEvent(socket, "INFO", `Marking job as exported for id ${jobid}`);
  const client = new GraphQLClient(process.env.GRAPHQL_ENDPOINT, {});
  const result = await client
    .setHeaders({ Authorization: `Bearer ${socket.handshake.auth.token}` })
@@ -618,3 +694,158 @@ async function InsertFailedExportLog(socket, error) {
    CdkBase.createLogEvent(socket, "ERROR", `Error in InsertFailedExportLog - ${error} - ${JSON.stringify(error2)}`);
  }
 }
+
+
+async function CreateRepairOrderInPBS(socket) {
+  try {
+    const { RepairOrders } = await RepairOrderGet(socket);
+    if (RepairOrders.length === 0) {
+      const InsertedRepairOrder = await RepairOrderChange(socket)
+      socket.InsertedRepairOrder = InsertedRepairOrder;
+      CdkBase.createLogEvent(socket, "INFO", `No repair orders found for vehicle. Inserting record.`);
+
+    } else if (RepairOrders.length > 0) {
+      //Find out if it's a matching RO. 
+      //This logic is used because the integration will simply add another line to an open RO if it exists. 
+      const matchingRo = RepairOrders.find(ro => ro.Memo?.toLowerCase()?.includes(socket.JobData.ro_number.toLowerCase()))
+      if (!matchingRo) {
+        CdkBase.createLogEvent(socket, "INFO", `ROs found for vehicle, but none match. Inserting record.`);
+        const InsertedRepairOrder = await RepairOrderChange(socket)
+        socket.InsertedRepairOrder = InsertedRepairOrder;
+      } else {
+        CdkBase.createLogEvent(socket, "WARN", `Repair order appears to already exist in PBS. ${matchingRo.RepairOrderNumber}`);
+      }
+    }
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in CreateRepairOrderInPBS - ${error} - ${JSON.stringify(error)}`);
+  }
+}
+
+async function RepairOrderGet(socket) {
+  try {
+    const { data: RepairOrderGet } = await axios.post(
+      PBS_ENDPOINTS.RepairOrderGet,
+      {
+        SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+        //"RepairOrderId": "374728766",
+        //"RepairOrderNumber": "4" || socket.JobData.ro_number,
+        //"RawRepairOrderNumber": socket.JobData.ro_number,
+        // "Tag": "String",
+        //"ContactRef": socket.contactRef,
+        // "ContactRefList": ["00000000000000000000000000000000"],
+        "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
+        // "VehicleRefList": ["00000000000000000000000000000000"],
+        // "Status": "String",
+        // "CashieredSince": "0001-01-01T00:00:00.0000000Z",
+        // "CashieredUntil": "0001-01-01T00:00:00.0000000Z",
+        // "OpenDateSince": "0001-01-01T00:00:00.0000000Z",
+        // "OpenDateUntil": "0001-01-01T00:00:00.0000000Z",
+        //"ModifiedSince": "2025-01-01T00:00:00.0000000Z",
+        // "ModifiedUntil": "0001-01-01T00:00:00.0000000Z",
+        // "Shop": "String"
+      },
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, RepairOrderGet);
+    return RepairOrderGet;
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    throw new Error(error);
+  }
+}
+
+async function RepairOrderChange(socket) {
+  try {
+    const { data: RepairOrderChangeResponse } = await axios.post(
+      PBS_ENDPOINTS.RepairOrderChange,
+      { //Additional details at https://partnerhub.pbsdealers.com/json/metadata?op=RepairOrderChange
+        "RepairOrderInfo": {
+          //"Id": "string/00000000-0000-0000-0000-000000000000",
+          //"RepairOrderId": "00000000000000000000000000000000",
+          SerialNumber: socket.JobData.bodyshop.pbs_serialnumber,
+          "RepairOrderNumber": "00000000000000000000000000000000", //This helps force a new RO. 
+          "RawRepairOrderNumber": "00000000000000000000000000000000",
+          // "RepairOrderNumber": socket.JobData.ro_number, //These 2 values are ignored as confirmed by PBS.
+          // "RawRepairOrderNumber": socket.JobData.ro_number,
+          "DateOpened": moment(),
+          // "DateOpenedUTC": "0001-01-01T00:00:00.0000000Z",
+          // "DateCashiered": "0001-01-01T00:00:00.0000000Z",
+          // "DateCashieredUTC": "0001-01-01T00:00:00.0000000Z",
+          "DatePromised": socket.JobData.scheduled_completion,
+          // "DatePromisedUTC": "0001-01-01T00:00:00.0000000Z",
+          "DateVehicleCompleted": socket.JobData.actual_completion,
+          // "DateCustomerNotified": "0001-01-01T00:00:00.0000000Z",
+          // "CSR": "String",
+          // "CSRRef": "00000000000000000000000000000000",
+          // "BookingUser": "String",
+          // "BookingUserRef": "00000000000000000000000000000000",
+          "ContactRef": socket.ownerRef?.ReferenceId || socket.ownerRef?.ContactId,
+          "VehicleRef": socket.vehicleRef?.ReferenceId || socket.vehicleRef?.VehicleId,
+          "MileageIn": socket.JobData.km_in,
+          "Tag": "BODYSHOP",
+          //"Status": "CLOSED", //Values here do not impact the status. Confirmed by PBS support.
+          Requests: [
+            {
+              // "RepairOrderRequestRef": "b1842ecad62c4279bbc2fef4f6bf6cde",
+              // "RepairOrderRequestId": 1,
+              // "CSR": "PBS",
+              // "CSRRef": "1ce12ac692564e94bda955d529ee911a",
+              // "Skill": "GEN",
+              "RequestCode": "MISC",
+              "RequestDescription": `VEHICLE REPAIRED AT BODYSHOP. PLEASE REFERENCE IMEX SHOP MANAGEMENT SYSTEM. ${socket.txEnvelope.story}`,
+              "Status": "Completed",
+              // "TechRef": "00000000000000000000000000000000",
+              "AllowedHours": 0,
+              "EstimateLabour": 0,
+              "EstimateParts": 0,
+              "ComeBack": false,
+              "AddedOperation": true,
+              "PartLines": [],
+              "PartRequestLines": [],
+              "LabourLines": [],
+              "SubletLines": [],
+              "TimePunches": [],
+              "Summary": {
+                "Labour": 0,
+                "Parts": 0,
+                "OilGas": 0,
+                "SubletTow": 0,
+                "Misc": 0,
+                "Environment": 0,
+                "ShopSupplies": 0,
+                "Freight": 0,
+                "WarrantyDeductible": 0,
+                "Discount": 0,
+                "SubTotal": 0,
+                "Tax1": 0,
+                "Tax2": 0,
+                "InvoiceTotal": 0,
+                "CustomerDeductible": 0,
+                "GrandTotal": 0,
+                "LabourDiscount": 0,
+                "PartDiscount": 0,
+                "ServiceFeeTotal": 0,
+                "OEMDiscount": 0
+              },
+              "LineType": "RequestLine",
+            },
+          ],
+
+          "Memo": socket.txEnvelope.story,
+
+        },
+        "IsAsynchronous": false,
+        // "UserRequest": "String",
+        // "UserRef": "00000000000000000000000000000000"
+      }
+
+      ,
+      { auth: PBS_CREDENTIALS, socket }
+    );
+    CheckForErrors(socket, RepairOrderChangeResponse);
+    return RepairOrderChangeResponse;
+  } catch (error) {
+    CdkBase.createLogEvent(socket, "ERROR", `Error in RepairOrderChange - ${error}`);
+    throw new Error(error);
+  }
+}
--- a/server/data/carfax.js
+++ b/server/data/carfax.js
@@ -6,7 +6,7 @@ const InstanceManager = require("../utils/instanceMgr").default;
 const { isString, isEmpty } = require("lodash");
 const fs = require("fs");
 const client = require("../graphql-client/graphql-client").client;
-const { sendServerEmail } = require("../email/sendemail");
+const { sendServerEmail, sendMexicoBillingEmail } = require("../email/sendemail");
 const { uploadFileToS3 } = require("../utils/s3");
 const crypto = require("crypto");

@@ -99,7 +99,7 @@ exports.default = async (req, res) => {
    await processShopData(shopsToProcess, start, end, skipUpload, ignoreDateFilter, allXMLResults, allErrors);

    await sendServerEmail({
-      subject: `CARFAX Report ${moment().format("MM-DD-YY")}`,
+      subject: `Project Mexico Report ${moment().format("MM-DD-YY")}`,
      text: `Errors:\n${JSON.stringify(allErrors, null, 2)}\n\nUploaded:\n${JSON.stringify(
        allXMLResults.map((x) => ({
          imexshopid: x.imexshopid,
@@ -164,8 +164,35 @@ async function processShopData(shopsToProcess, start, end, skipUpload, ignoreDat

      if (skipUpload) {
        fs.writeFileSync(`./logs/${jsonObj.filename}`, jsonObj.json);
+        uploadToS3(jsonObj);
      } else {
        await uploadViaSFTP(jsonObj);
+
+        await sendMexicoBillingEmail({
+          subject: `${shopid.replace(/_/g, "").toUpperCase()}_Mexico${InstanceManager({
+            imex: "IO",
+            rome: "RO"
+          })}_${moment().format("MMDDYYYY")} ROs ${jsonObj.count} Error ${errorCode(jsonObj)}`,
+          text: `Errors:\n${JSON.stringify(
+            erroredJobs.map((ej) => ({
+              ro_number: ej.job?.ro_number,
+              jobid: ej.job?.id,
+              error: ej.error
+            })),
+            null,
+            2
+          )}\n\nUploaded:\n${JSON.stringify(
+            {
+              bodyshopid: bodyshop.id,
+              imexshopid: shopid,
+              count: jsonObj.count,
+              filename: jsonObj.filename,
+              result: jsonObj.result
+            },
+            null,
+            2
+          )}`
+        });
      }

      allXMLResults.push({
@@ -266,17 +293,22 @@ const CreateRepairOrderTag = (job, errorCallback) => {
      v_make: job.v_make_desc || "",
      v_model: job.v_model_desc || "",

-      date_estimated:
-        (job.date_estimated && moment(job.date_estimated).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        (job.created_at && moment(job.created_at).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        "",
-      data_opened:
-        (job.date_open && moment(job.date_open).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        (job.created_at && moment(job.created_at).tz(job.bodyshop.timezone).format(AHDateFormat)) ||
-        "",
-      date_invoiced:
-        (job.date_invoiced && moment(job.date_invoiced).tz(job.bodyshop.timezone).format(AHDateFormat)) || "",
-      loss_date: (job.loss_date && moment(job.loss_date).format(AHDateFormat)) || "",
+      date_estimated: [job.date_estimated, job.created_at].find((date) => date)
+        ? moment([job.date_open, job.created_at].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      data_opened: [job.date_open, job.created_at].find((date) => date)
+        ? moment([job.date_open, job.created_at].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      date_invoiced: [job.date_invoiced, job.actual_delivery, job.actual_completion].find((date) => date)
+        ? moment([job.date_invoiced, job.actual_delivery, job.actual_completion].find((date) => date))
+            .tz(job.bodyshop.timezone)
+            .format(AHDateFormat)
+        : "",
+      loss_date: job.loss_date ? moment(job.loss_date).format(AHDateFormat) : "",

      ins_co_nm: job.ins_co_nm || "",
      loss_desc: job.loss_desc || "",
@@ -303,7 +335,9 @@ const GenerateDetailLines = (line) => {
    line_desc: line.line_desc ? line.line_desc.replace(NON_ASCII_REGEX, "") : null,
    oem_partno: line.oem_partno ? line.oem_partno.replace(NON_ASCII_REGEX, "") : null,
    alt_partno: line.alt_partno ? line.alt_partno.replace(NON_ASCII_REGEX, "") : null,
+    op_code_desc: line.op_code_desc ? line.op_code_desc.replace(NON_ASCII_REGEX, "") : null,
    lbr_ty: generateLaborType(line.mod_lbr_ty),
+    lbr_hrs: line.mod_lb_hrs || 0,
    part_qty: line.part_qty || 0,
    part_type: generatePartType(line.part_type),
    act_price: line.act_price || 0
@@ -402,3 +436,14 @@ const generatePartType = (type) => {

  return partTypeMap[type?.toLowerCase()] || null;
 };
+
+const errorCode = ({ count, filename, results }) => {
+  if (count === 0) return 1;
+  if (!filename) return 3;
+  const sftpErrorCode = results?.sftpError?.code;
+  if (sftpErrorCode && ["ECONNREFUSED", "ENOTFOUND", "ETIMEDOUT", "ECONNRESET"].includes(sftpErrorCode)) {
+    return 4;
+  }
+  if (sftpErrorCode) return 7;
+  return 0;
+};
--- a/server/email/sendemail.js
+++ b/server/email/sendemail.js
@@ -79,6 +79,41 @@ const sendServerEmail = async ({ subject, text }) => {
  }
 };

+const sendMexicoBillingEmail = async ({ subject, text }) => {
+  if (process.env.NODE_ENV === undefined) return;
+  try {
+    mailer.sendMail(
+      {
+        from: InstanceManager({
+          imex: `ImEX Online API - ${process.env.NODE_ENV} <noreply@imex.online>`,
+          rome: `Rome Online API - ${process.env.NODE_ENV} <noreply@romeonline.io>`
+        }),
+        to: ["mexico@rometech.zohodesk.com"],
+        subject: subject,
+        text: text,
+        ses: {
+          // optional extra arguments for SendRawEmail
+          Tags: [
+            {
+              Name: "tag_name",
+              Value: "tag_value"
+            }
+          ]
+        }
+      },
+      // eslint-disable-next-line no-unused-vars
+      (err, info) => {
+        logger.log("server-email-failure", err ? "error" : "debug", null, null, {
+          message: err?.message,
+          stack: err?.stack
+        });
+      }
+    );
+  } catch (error) {
+    logger.log("server-email-failure", "error", null, null, { message: error?.message, stack: error?.stack });
+  }
+};
+
 const sendWelcomeEmail = async ({ to, resetLink, dateLine, features, bcc }) => {
  try {
    await mailer.sendMail({
@@ -420,6 +455,7 @@ ${body.bounce?.bouncedRecipients.map(
 module.exports = {
  sendEmail,
  sendServerEmail,
+  sendMexicoBillingEmail,
  sendTaskEmail,
  emailBounce,
  sendWelcomeEmail
--- a/server/graphql-client/queries.js
+++ b/server/graphql-client/queries.js
@@ -420,6 +420,8 @@ query QUERY_JOBS_FOR_PBS_EXPORT($id: uuid!) {
    v_make_desc
    v_color
    ca_customer_gst
+    scheduled_completion
+    actual_completion
    vehicle {
      v_trimcode
      v_makecode
@@ -879,39 +881,43 @@ exports.CHATTER_QUERY = `query CHATTER_EXPORT($start: timestamptz, $bodyshopid:
 }`;

 exports.CARFAX_QUERY = `query CARFAX_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
-  bodyshops_by_pk(id: $bodyshopid){
+  bodyshops_by_pk(id: $bodyshopid) {
    id
    shopname
    imexshopid
    timezone
  }
-  jobs(where: {_and: [{converted: {_eq: true}}, {v_vin: {_is_null: false}}, {date_invoiced: {_gt: $start}}, {date_invoiced: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
-    id
+  jobs(where: {_and: [{_or: [{date_invoiced: {_gt: $start, _lte: $end}}, {actual_delivery: {_gt: $start, _lte: $end}, date_invoiced: {_is_null: true}}, {actual_completion: {_gt: $start, _lte: $end}, actual_delivery: {_is_null: true}, date_invoiced: {_is_null: true}}]}, {_not: {_and: [{date_invoiced: {_is_null: true}}, {actual_delivery: {_is_null: true}}, {actual_completion: {_is_null: true}}]}}, {shopid: {_eq: $bodyshopid}}, {voided: {_neq: true}}, {v_vin: {_is_null: false}}, {ro_number: {_is_null: false}}]}) {
+    actual_completion  
+    actual_delivery
+    area_of_damage
    created_at
-    ro_number
-    v_model_yr
-    v_model_desc
-    v_make_desc
-    v_vin
    date_estimated
-    date_open
    date_invoiced
-    loss_date
+    date_open
+    id
    ins_co_nm
+    job_totals
+    joblines(where: {removed: {_eq: false}}) {
+      act_price
+      alt_partno
+      line_desc
+      mod_lb_hrs
+      mod_lbr_ty
+      oem_partno
+      op_code_desc
+      part_type
+      part_qty
+    }
+    loss_date
    loss_desc
+    ro_number
    theft_ind
    tlos_ind
-    job_totals
-    area_of_damage
-    joblines(where: {removed: {_eq: false}}) {
-      line_desc
-      oem_partno
-      alt_partno
-      mod_lbr_ty
-      part_qty
-      part_type
-      act_price
-    }
+    v_make_desc
+    v_model_desc
+    v_model_yr
+    v_vin
  }
 }`;

@@ -1854,7 +1860,7 @@ exports.GET_CHATTER_SHOPS = `query GET_CHATTER_SHOPS {
 }`;

 exports.GET_CARFAX_SHOPS = `query GET_CARFAX_SHOPS {
-  bodyshops(where: {external_shop_id: {_is_null: true}}){
+  bodyshops(where: {external_shop_id: {_is_null: true}, carfax_exclude: {_neq: "true"}}){
      id
      shopname
      imexshopid
@@ -2155,18 +2161,16 @@ exports.UPDATE_OLD_TRANSITION = `mutation UPDATE_OLD_TRANSITION($jobid: uuid!, $

 exports.INSERT_NEW_TRANSITION = (
  includeOldTransition
-) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${
-  includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
-}) {
+) => `mutation INSERT_NEW_TRANSITION($newTransition: transitions_insert_input!, ${includeOldTransition ? `$oldTransitionId: uuid!, $duration: numeric` : ""
+  }) {
  insert_transitions_one(object: $newTransition) {
    id
  }
-  ${
-    includeOldTransition
-      ? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
+  ${includeOldTransition
+    ? `update_transitions(where: {id: {_eq: $oldTransitionId}}, _set: {duration: $duration}) {
    affected_rows
  }`
-      : ""
+    : ""
  }
 }`;

--- a/server/job/job-totals-USA.js
+++ b/server/job/job-totals-USA.js
@@ -384,6 +384,8 @@ async function CalculateRatesTotals({ job, client }) {
      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
        //Scenario where SGI may pay out hours using a part price.
        if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
+          ret[item.mod_lbr_ty.toLowerCase()].base = Dinero();
+          ret[item.mod_lbr_ty.toLowerCase()].adjustment = Dinero();
          ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();
        }
        ret[item.mod_lbr_ty.toLowerCase()].total = ret[item.mod_lbr_ty.toLowerCase()].total.add(
Author	SHA1	Message	Date
Allan Carr	31529fad80	IO-3365 Bills Filtering Server Side Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-10-02 23:43:25 -07:00
Patrick Fic	46be1fa889	Merged in feature/IO-3356-pbs-ro-posting (pull request #2577 ) Feature/IO-3356 pbs ro posting Approved-by: Dave Richer	2025-10-02 20:27:48 +00:00
Patrick Fic	40a8036472	Adjust logging statements.	2025-10-02 13:26:12 -07:00
Patrick Fic	22970ac149	Remove additional RO posting.	2025-10-02 13:20:15 -07:00
Dave Richer	63eeab888f	Merged in feature/IO-3388-parts-queue-fix (pull request #2603 ) feature/IO-3388 - Parts Queue Fix	2025-10-02 16:56:37 +00:00
Dave	367ced88d8	feature/IO-3388 - Parts Queue Fix	2025-10-02 12:55:50 -04:00
Allan Carr	01664c52ec	Merged in hotfix/2025-10-01 (pull request #2602 ) IO-3384 Mitchell OP14 Import USA	2025-10-02 01:03:15 +00:00
Allan Carr	7f67b01c87	Merged in feature/IO-3387-Mitchell-OP14-Import-USA (pull request #2599 ) IO-3384 Mitchell OP14 Import USA Approved-by: Dave Richer	2025-10-01 23:33:56 +00:00
Allan Carr	e66d52784f	Merged in feature/IO-3387-Mitchell-OP14-Import-USA (pull request #2600 ) IO-3384 Mitchell OP14 Import USA Approved-by: Dave Richer	2025-10-01 23:33:36 +00:00
Allan Carr	a75969097e	IO-3384 Mitchell OP14 Import USA Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-10-01 16:30:54 -07:00
Patrick Fic	93e137c84e	Final changes for pbs.	2025-10-01 13:59:11 -07:00
Allan Carr	36d4a02be0	Merged in feature/IO-3330-CARFAX-Adjustments (pull request #2598 ) IO-3330 CARFAX Adjustment Approved-by: Dave Richer	2025-10-01 18:23:01 +00:00
Allan Carr	31367f278e	IO-3330 CARFAX Adjustment Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-29 10:08:11 -07:00
Allan Carr	a384fd5072	Merged in release/2025-09-26 (pull request #2597 ) IO-3330 CARFAX Adjustment	2025-09-27 06:17:33 +00:00
Allan Carr	490c66a9cb	Merged in feature/IO-3330-CARFAX-Adjustments (pull request #2595 ) IO-3330 CARFAX Adjustment	2025-09-27 06:13:25 +00:00
Allan Carr	d38dab0738	IO-3330 CARFAX Adjustment Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-26 23:14:10 -07:00
Dave Richer	37624d385f	Merged in release/2025-09-26 (pull request #2592 ) Release/2025 09 26 into master-AIO - IO-3365 - IO-3373 - IO-3325 - IO-3377 - IO-3330 - IO-3076	2025-09-27 01:35:06 +00:00
Allan Carr	d565934288	IO-3330 Carfax Adjustment Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-26 14:06:35 -07:00
Allan Carr	5d03574d65	Merged in feature/IO-3330-CARFAX-Adjustments (pull request #2593 ) IO-3330 Carfax Adjustment	2025-09-26 21:05:19 +00:00
Patrick Fic	34f7c115b4	Merged in feature/IO-3076-update-usage-report-cron (pull request #2590 ) IO-3076 auto trigger report on wed	2025-09-26 15:27:36 +00:00
Patrick Fic	3ac74df504	IO-3076 auto trigger report on wed	2025-09-26 08:26:09 -07:00
Patrick Fic	9ff3311579	Add vehicle query.	2025-09-26 08:19:57 -07:00
Allan Carr	d5f13f750f	Merged in feature/IO-3330-CARFAX-Adjustments (pull request #2588 ) IO-3330 CARFAX Adjustments Approved-by: Dave Richer	2025-09-26 00:14:47 +00:00
Allan Carr	b9ddac36a9	IO-3330 CARFAX Adjustments remove voided jobs Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-25 16:30:02 -07:00
Allan Carr	c982dde1f5	IO-3330 CARFAX Adjustments Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-25 16:20:28 -07:00
Dave Richer	7f61f652f7	Merged in feature/IO-3377-Add-Notification-Tone-For-Messaging (pull request #2586 ) Feature/IO-3377 Add Notification Tone For Messaging	2025-09-24 18:39:52 +00:00
Dave	c1e1d5e82c	feature/IO-3377-Add-Notification-Tone-For-Messaging - Finalize	2025-09-24 14:38:58 -04:00
Dave	5ae2e33596	feature/IO-3377-Add-Notification-Tone-For-Messaging - Finalize	2025-09-24 14:32:45 -04:00
Dave	e11260e8fc	feautre/IO-3377-Add-Notification-Tone-For-Messaging - remove wav, adjust	2025-09-24 13:52:55 -04:00
Dave Richer	282a22ff51	Merged in feature/IO-3377-Add-Notification-Tone-For-Messaging (pull request #2584 ) feautre/IO-3377-Add-Notification-Tone-For-Messaging - Complete	2025-09-24 16:03:52 +00:00
Dave	dfd88308e0	feautre/IO-3377-Add-Notification-Tone-For-Messaging - Complete	2025-09-24 12:02:20 -04:00
Dave	33579c3e6a	Merge remote-tracking branch 'origin/release/2025-09-26' into feature/IO-3377-Add-Notification-Tone-For-Messaging	2025-09-24 11:51:27 -04:00
Allan Carr	0b9b3c027f	Merged in hotfix/2025-09-23 (pull request #2583 ) Hotfix/2025 09 23 Approved-by: Dave Richer	2025-09-24 01:05:35 +00:00
Allan Carr	154f9cdfe6	Merged in feature/IO-3330-CARFAX-Datapump-Adjustments (pull request #2582 ) Feature/IO-3330 CARFAX Datapump Adjustments	2025-09-23 20:38:23 +00:00
Allan Carr	5b8c7d922c	Merged in feature/IO-3330-CARFAX-Datapump-Adjustments (pull request #2580 ) IO-3330 CARFAX Datapump Adjustments Approved-by: Dave Richer	2025-09-23 19:50:50 +00:00
Allan Carr	d20347d5dc	IO-3330 CARFAX Datapump Adjustments Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-23 12:42:09 -07:00
Allan Carr	68c4a1efd7	Merged in feature/IO-3373-Dashboard-Component-Errors (pull request #2567 ) IO-3373 Dashboard Errors on Large Datasets Approved-by: Dave Richer	2025-09-23 15:02:42 +00:00
Allan Carr	3e6d6fdbd1	Merged in feature/IO-3330-CARFAX-Datapump-Adjustments (pull request #2572 ) Feature/IO-3330 CARFAX Datapump Adjustments Approved-by: Dave Richer	2025-09-23 15:01:58 +00:00
Allan Carr	302fd58a56	Merge branch 'feature/IO-3373-Dashboard-Component-Infinite-Recursion' into feature/IO-3373-Dashboard-Component-Errors Signed-off-by: Allan Carr <allan@imexsystems.ca> # Conflicts: # client/src/components/dashboard-grid/dashboard-grid.component.jsx	2025-09-22 09:54:48 -07:00
Patrick Fic	31cfdf9ea3	Merge branch 'feature/IO-3325-additional-log-events' into release/2025-09-26	2025-09-19 09:56:04 -07:00
Patrick Fic	f93800ded4	IO-3325 Additional ImEX log Events.	2025-09-19 09:51:38 -07:00
Patrick Fic	05385fca6d	Reoslve DMS allocation scroll.	2025-09-18 14:26:23 -07:00
Patrick Fic	1355d79fa4	Comments and cleanup.	2025-09-18 14:23:51 -07:00
Patrick Fic	8805538706	Merge branch 'master-AIO' into feature/IO-3356-pbs-ro-posting	2025-09-18 14:06:24 -07:00
Patrick Fic	9e35b0f123	Add and remove logging.	2025-09-18 14:05:14 -07:00
Allan Carr	252758747b	Merged in hotfix/2025-09-17 (pull request #2576 ) IO-3376 Scrollbar Theming	2025-09-17 23:17:00 +00:00
Allan Carr	8b39b7c7be	Merged in hotfix/2025-09-17 (pull request #2574 ) IO-3376 Scrollbar Theming	2025-09-17 23:07:29 +00:00
Allan Carr	ada07bad62	Merged in feature/IO-3376-Scrollbar-Theming (pull request #2573 ) IO-3376 Scrollbar Theming	2025-09-17 23:06:30 +00:00
Allan Carr	166a33af4e	IO-3376 Scrollbar Theming Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-17 16:07:15 -07:00
Allan Carr	038aa82087	IO-3330 CARFAX Datapump Adjustment Cron trigger and billing email Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-17 14:43:07 -07:00
Allan Carr	99f425eac4	Merged in hotfix/2025-09-17 (pull request #2571 ) IO-3373 Dashboard Component Infinite Recursion	2025-09-17 21:09:03 +00:00
Allan Carr	b2c504c69d	Merged in feature/IO-3373-Dashboard-Component-Infinite-Recursion (pull request #2570 ) IO-3373 Dashboard Component Infinite Recursion	2025-09-17 21:01:11 +00:00
Allan Carr	521955089f	Merged in feature/IO-3373-Dashboard-Component-Infinite-Recursion (pull request #2568 ) IO-3373 Dashboard Component Infinite Recursion	2025-09-17 20:58:29 +00:00
Allan Carr	4afff893c0	IO-3330 localEmailViewer Update Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-17 09:29:35 -07:00
Allan Carr	cc934fe333	IO-3373 Dashboard Errors on Large Datasets Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-16 17:20:23 -07:00
Patrick Fic	8ded028197	Merged in feature/IO-3325-amplitude-reverse-proxy (pull request #2565 ) IO-3325 Add reverse proxy URL for amplitude.	2025-09-15 21:16:58 +00:00
Patrick Fic	fd229d5d09	Debug level changes, vehicle upsert correction, and logic updates.	2025-09-12 13:14:38 -07:00
Allan Carr	c42a0139fc	Merged in feature/IO-3365-Bills-Filters-and-Sorters (pull request #2563 ) IO-3365 Push Filters to Query Approved-by: Dave Richer	2025-09-12 15:33:12 +00:00
Allan Carr	02974e6e4b	IO-3365 Push Filters to Query Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-09-11 21:32:18 -07:00
Patrick Fic	1bb66a5378	Merge branch 'master-AIO' into feature/IO-3356-pbs-ro-posting	2025-09-11 14:40:08 -07:00
Patrick Fic	01fc0cbc08	IO-3356 PBS posting initial working commit.	2025-09-05 10:45:59 -07:00
Patrick Fic	9ab3d8c81a	Merge branch 'master-AIO' into feature/IO-XXXX-pbs-ro-posting	2025-09-02 15:24:15 -07:00
Patrick Fic	83c0696a3e	Reformat translations.	2025-09-02 15:24:01 -07:00
Patrick Fic	5552c73721	WIP PBS RO	2025-08-22 08:21:29 -07:00
				`@@ -0,0 +1 @@`
				`ALTER TABLE "public"."associations" ALTER COLUMN "new_message_sound" drop default;`