Adjust logging statements.

Remove additional RO posting.
Final changes for pbs.
2025-10-02 13:26:12 -07:00 · 2025-10-02 13:20:15 -07:00 · 2025-10-01 13:59:11 -07:00 · 2025-09-26 08:19:57 -07:00 · 2025-09-18 14:26:23 -07:00 · 2025-09-18 14:23:51 -07:00
91 changed files with 703 additions and 1219 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,5 @@
 root = true

-# NOTE: Keep only EditorConfig properties that Prettier actually respects.
-# Style choices (quotes, bracket spacing, print width, etc.) live in `.prettierrc.js`.
-# Removing pseudo/unsupported keys (quote_type, bracketSpacing, max_line_length) that
-# previously caused editor vs CLI confusion.
 [*]
 charset = utf-8
 indent_style = space
@@ -11,11 +7,14 @@ indent_size = 2
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = false
+quote_type = single
+max_line_length = 100
+bracketSpacing = false

 [*.md]
 trim_trailing_whitespace = false

-[*\.yml]
+[*.yml]
 indent_size = 2

 [*.json]
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,11 +0,0 @@
-# Folders & files to skip during formatting
-node_modules
-build
-dist
-dev-dist
-coverage
-logs
-*.log
-# Generated / compiled assets
-client/dev-dist
-client/dist
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -39,13 +39,5 @@
    "timetickets",
    "touchtime"
  ],
-  "eslint.workingDirectories": ["./", "./client"],
-  // Formatting alignment: ensure VS Code uses project Prettier config
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "editor.formatOnSave": true,
-  "[javascript]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  // Disable eslint's fixAll on save if it causes style churn; turn back on once stylistic rules removed or using eslint-config-prettier
-  "prettier.useEditorConfig": true
+  "eslint.workingDirectories": ["./", "./client"]
 }
--- a/_reference/localEmailViewer/index.js
+++ b/_reference/localEmailViewer/index.js
@@ -1,96 +1,116 @@
 // 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");
+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');
    }
-    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">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("");
+    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('');
 }

 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.4",
+        "mailparser": "^3.7.2",
        "node-fetch": "^3.3.2"
      }
    },
@@ -634,9 +634,9 @@
      "license": "MIT"
    },
    "node_modules/libmime": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.7.tgz",
-      "integrity": "sha512-FlDb3Wtha8P01kTL3P9M+ZDNDWPKPmKHWaU/cG/lg5pfuAwdflVpZE+wm9m7pKmC5ww6s+zTxBKS1p6yl3KpSw==",
+      "version": "5.3.6",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-5.3.6.tgz",
+      "integrity": "sha512-j9mBC7eiqi6fgBPAGvKCXJKJSIASanYF4EeA4iBzSG0HxQxmXnR3KbyWqTn4CwsKSebqCv2f5XZfAO6sKzgvwA==",
      "license": "MIT",
      "dependencies": {
        "encoding-japanese": "2.2.0",
@@ -661,31 +661,31 @@
      }
    },
    "node_modules/mailparser": {
-      "version": "3.7.4",
-      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.4.tgz",
-      "integrity": "sha512-Beh4yyR4jLq3CZZ32asajByrXnW8dLyKCAQD3WvtTiBnMtFWhxO+wa93F6sJNjDmfjxXs4NRNjw3XAGLqZR3Vg==",
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/mailparser/-/mailparser-3.7.2.tgz",
+      "integrity": "sha512-iI0p2TCcIodR1qGiRoDBBwboSSff50vQAWytM5JRggLfABa4hHYCf3YVujtuzV454xrOP352VsAPIzviqMTo4Q==",
      "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.7",
+        "libmime": "5.3.6",
        "linkify-it": "5.0.0",
-        "mailsplit": "5.4.5",
-        "nodemailer": "7.0.4",
+        "mailsplit": "5.4.2",
+        "nodemailer": "6.9.16",
        "punycode.js": "2.3.1",
-        "tlds": "1.259.0"
+        "tlds": "1.255.0"
      }
    },
    "node_modules/mailsplit": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.5.tgz",
-      "integrity": "sha512-oMfhmvclR689IIaQmIcR5nODnZRRVwAKtqFT407TIvmhX2OLUBnshUTcxzQBt3+96sZVDud9NfSe1NxAkUNXEQ==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/mailsplit/-/mailsplit-5.4.2.tgz",
+      "integrity": "sha512-4cczG/3Iu3pyl8JgQ76dKkisurZTmxMrA4dj/e8d2jKYcFTZ7MxOzg1gTioTDMPuFXwTrVuN/gxhkrO7wLg7qA==",
      "license": "(MIT OR EUPL-1.1+)",
      "dependencies": {
        "libbase64": "1.3.0",
-        "libmime": "5.3.7",
+        "libmime": "5.3.6",
        "libqp": "2.1.1"
      }
    },
@@ -793,9 +793,9 @@
      }
    },
    "node_modules/nodemailer": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-7.0.4.tgz",
-      "integrity": "sha512-9O00Vh89/Ld2EcVCqJ/etd7u20UhME0f/NToPfArwPEe1Don1zy4mAIz6ariRr7mJ2RDxtaDzN0WJVdVXPtZaw==",
+      "version": "6.9.16",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.16.tgz",
+      "integrity": "sha512-psAuZdTIRN08HKVd/E8ObdV6NO7NTBY3KsC30F7M4H1OnmLCUNaS56FpYxyb26zWLSyYF9Ozch9KYHhHegsiOQ==",
      "license": "MIT-0",
      "engines": {
        "node": ">=6.0.0"
@@ -1114,9 +1114,9 @@
      }
    },
    "node_modules/tlds": {
-      "version": "1.259.0",
-      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.259.0.tgz",
-      "integrity": "sha512-AldGGlDP0PNgwppe2quAvuBl18UcjuNtOnDuUkqhd6ipPqrYYBt3aTxK1QTsBVknk97lS2JcafWMghjGWFtunw==",
+      "version": "1.255.0",
+      "resolved": "https://registry.npmjs.org/tlds/-/tlds-1.255.0.tgz",
+      "integrity": "sha512-tcwMRIioTcF/FcxLev8MJWxCp+GUALRhFEqbDoZrnowmKSGqPrl5pqS+Sut2m8BgJ6S4FExCSSpGffZ0Tks6Aw==",
      "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.4",
+    "mailparser": "^3.7.2",
    "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,5 +16,4 @@ 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_KEY=6228a598e57cd66875cfd41604f1f891
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -18,5 +18,4 @@ 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_KEY=46b1193a867d4e3131ae4c3a64a3fc78
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/.env.production.imex
+++ b/client/.env.production.imex
@@ -15,5 +15,4 @@ 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_KEY=6228a598e57cd66875cfd41604f1f891
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/.env.production.rome
+++ b/client/.env.production.rome
@@ -15,5 +15,4 @@ 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_KEY=46b1193a867d4e3131ae4c3a64a3fc78
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/.env.test.imex
+++ b/client/.env.test.imex
@@ -15,5 +15,4 @@ 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_KEY=6228a598e57cd66875cfd41604f1f891
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/.env.test.rome
+++ b/client/.env.test.rome
@@ -15,5 +15,4 @@ 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_KEY=46b1193a867d4e3131ae4c3a64a3fc78
+VITE_APP_AMP_URL=https://vp8k908qy2.execute-api.ca-central-1.amazonaws.com
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -24,7 +24,6 @@ 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"));
@@ -73,6 +72,9 @@ 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 = () => {
@@ -162,87 +164,85 @@ export function App({
      />

      <NotificationProvider>
-        <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>
+        <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} />
-                </ErrorBoundary>
-              }
-            >
-              <Route path="*" element={<SimplifiedPartsPageContainer />} />
-            </Route>
-            <Route path="/edit/*" element={<PrivateRoute isAuthorized={currentUser.authorized} />}>
-              <Route path="*" element={<DocumentEditorContainer />} />
-            </Route>
-          </Routes>
-        </SoundWrapper>
+                </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>
      </NotificationProvider>
    </Suspense>
  );
--- a/client/src/App/SoundWrapper.jsx
+++ b/client/src/App/SoundWrapper.jsx
@@ -1,43 +0,0 @@
-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,16 +142,7 @@ export function AccountingReceivablesTableComponent({ bodyshop, loading, jobs, r
            refetch={refetch}
          />
          <Link to={`/manage/jobs/${record.id}/close`}>
-            <Button
-              style={{
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-                whiteSpace: "nowrap",
-                verticalAlign: "middle"
-              }}
-            >
-              {t("jobs.labels.viewallocations")}
-            </Button>
+            <Button>{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,7 +5,6 @@ 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";
@@ -76,7 +75,6 @@ export function BillsListTableComponent({
      <Button
        title={t("tasks.buttons.create")}
        onClick={() => {
-          logImEXEvent("bills_create_task", {});
          setTaskUpsertContext({
            context: {
              jobid: job.id,
@@ -169,7 +167,6 @@ 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
@@ -211,7 +208,6 @@ 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, logImEXEvent } from "../../firebase/firebase.utils";
+import { getCurrentUser } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

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

    try {
-      logImEXEvent("payment_cc_lightbox");
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
@@ -172,7 +171,6 @@ 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, currentUser }) {
+export function ChatAffixContainer({ bodyshop, chatVisible }) {
  const { t } = useTranslation();
  const client = useApolloClient();
  const { socket } = useSocket();

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

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

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

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

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

  return (
    <div className={`chat-affix ${chatVisible ? "chat-affix-open" : ""}`}>
-      {bodyshop?.messagingservicesid ? <ChatPopupComponent /> : null}
+      {bodyshop && bodyshop.messagingservicesid ? <ChatPopupComponent /> : null}
    </div>
  );
 }
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -1,10 +1,5 @@
-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";
+import { gql } from "@apollo/client";

 const logLocal = (message, ...args) => {
  if (import.meta.env.VITE_APP_IS_TEST || !import.meta.env.PROD) {
@@ -31,48 +26,16 @@ const enrichConversation = (conversation, isOutbound) => ({
  __typename: "conversations"
 });

-// 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 }) => {
+export const registerMessagingHandlers = ({ socket, client }) => {
  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 {
@@ -328,6 +291,8 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho

        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 };
@@ -363,8 +328,7 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
          }
          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,6 +34,7 @@ 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,13 +2,11 @@ import { gql } from "@apollo/client";
 import dayjs from "../../utils/day.js";
 import componentList from "./componentList.js";

-const createDashboardQuery = (items) => {
+const createDashboardQuery = (state) => {
  const componentBasedAdditions =
-    Array.isArray(items) &&
-    items
-      .map((item) => (componentList[item.i] && componentList[item.i].gqlFragment) || "")
-      .filter(Boolean)
-      .join("");
+    state &&
+    Array.isArray(state.layout) &&
+    state.layout.map((item) => componentList[item.i].gqlFragment || "").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 } from "lodash";
+import { cloneDeep, isEmpty } from "lodash";
 import { useMutation, useQuery } from "@apollo/client";
 import { Button, Dropdown, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
@@ -34,25 +34,14 @@ const mapDispatchToProps = () => ({

 export function DashboardGridComponent({ currentUser, bodyshop }) {
  const { t } = useTranslation();
-  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 [state, setState] = useState({
+    ...(bodyshop.associations[0].user.dashboardlayout
+      ? bodyshop.associations[0].user.dashboardlayout
+      : { items: [], layout: {}, layouts: [] })
  });
  const notification = useNotification();

-  // 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, {
+  const { loading, error, data, refetch } = useQuery(createDashboardQuery(state), {
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
@@ -60,32 +49,21 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
  const [updateLayout] = useMutation(UPDATE_DASHBOARD_LAYOUT);

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

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

  const handleAddComponent = (e) => {
-    // 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,
+    logImEXEvent("dashboard_add_component", { name: e.key });
+    setState({
+      ...state,
+      items: [
+        ...state.items,
        {
          i: e.key,
-          // 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)
+          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
        }
-      ];
-      return { ...prev, items: nextItems };
+      ]
    });
  };

@@ -159,33 +130,25 @@ 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 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)
-          };
+          const TheComponent = componentList[item.i].component;
          return (
            <div
-              key={safeItem.i}
+              key={item.i}
              data-grid={{
-                ...safeItem,
-                minH,
-                minW
+                ...item,
+                minH: componentList[item.i].minH || 1,
+                minW: componentList[item.i].minW || 1
              }}
            >
              <LoadingSkeleton loading={loading}>
                <Icon
                  component={MdClose}
-                  key={safeItem.i}
+                  key={item.i}
                  style={{
                    position: "absolute",
                    zIndex: "2",
@@ -193,9 +156,9 @@ export function DashboardGridComponent({ currentUser, bodyshop }) {
                    top: ".25rem",
                    cursor: "pointer"
                  }}
-                  onClick={() => handleRemoveComponent(safeItem.i)}
+                  onClick={() => handleRemoveComponent(item.i)}
                />
-                {TheComponent && <TheComponent className="dashboard-card" bodyshop={bodyshop} data={dashboardData} />}
+                <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,7 +7,6 @@ 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();
@@ -20,8 +19,6 @@ 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,7 +4,6 @@ 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";
@@ -126,7 +125,6 @@ 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-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -46,7 +46,6 @@ 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,
@@ -398,7 +397,6 @@ export function JobLinesComponent({
      filteredInfo: filters,
      sortedInfo: sorter
    }));
-    logImEXEvent("joblines_table_change", { pagination, filters, sorter });
  };

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

  const markMenu = {
@@ -619,18 +616,12 @@ export function JobLinesComponent({
            expanded ? (
              <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
            ) : (
-              <PlusCircleTwoTone
-                onClick={(e) => {
-                  onExpand(record, e);
-                  logImEXEvent("joblines_expander", {});
-                }}
-              />
+              <PlusCircleTwoTone onClick={(e) => onExpand(record, e)} />
            )
        }}
        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,19 +1,18 @@
-import { gql, useQuery } from "@apollo/client";
-import { Badge, Card, Space, Table, Tag } from "antd";
-import axios from "axios";
-import { isEmpty } from "lodash";
 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 { isEmpty } from "lodash";
 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
@@ -58,7 +57,6 @@ 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,7 +10,6 @@ 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,
@@ -33,7 +32,6 @@ 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,7 +12,6 @@ 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,
@@ -47,7 +46,6 @@ 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-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,7 +4,6 @@ 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);
@@ -14,8 +13,6 @@ 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,7 +8,6 @@ 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
@@ -31,15 +30,11 @@ 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,7 +12,6 @@ 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
@@ -35,7 +34,6 @@ 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,7 +14,6 @@ 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,
@@ -109,9 +108,6 @@ 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,7 +15,6 @@ 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
@@ -178,7 +177,6 @@ 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,7 +17,6 @@ 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
@@ -68,7 +67,6 @@ export function JobsList({ bodyshop }) {
    : [];

  const handleTableChange = (pagination, filters, sorter) => {
-    logImEXEvent("jobs_list_sort_filter", { pagination, filters, sorter });
    setState({ ...state, sortedInfo: sorter });
    setFilter(filters);
  };
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/client/src/components/notification-center/notification-center.container.jsx
@@ -39,15 +39,11 @@ 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,
-    error
+    refetch
  } = useQuery(GET_NOTIFICATIONS, {
    variables: {
      limit: INITIAL_NOTIFICATIONS,
@@ -56,26 +52,14 @@ 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: skipQuery
+    skip: !userAssociationId || !isEmployee,
+    onError: (err) => {
+      console.error(`Error polling Notifications: ${err?.message || ""}`);
+      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
+    }
  });

-  // 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,18 +1,17 @@
-import { PageHeader } from "@ant-design/pro-layout";
-import { useApolloClient, useMutation } from "@apollo/client";
 import { Button, Form, Popconfirm } from "antd";
-import { phone } from "phone"; // Import phone utility for formatting
+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 { 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({
@@ -56,7 +55,6 @@ function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {

  const handleDelete = async () => {
    setLoading(true);
-    logImEXEvent("owner_delete", {});
    try {
      const result = await deleteOwner({
        variables: { id: owner.id }
@@ -86,7 +84,6 @@ 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,7 +63,6 @@ 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,7 +8,6 @@ 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())
@@ -38,8 +37,6 @@ 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-list/parts-queue.list.component.jsx
+++ b/client/src/components/parts-queue-list/parts-queue.list.component.jsx
@@ -20,7 +20,6 @@ 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
@@ -74,7 +73,6 @@ export function PartsQueueListComponent({ bodyshop }) {
    }
    setFilter(filters);
    history({ search: queryString.stringify(searchParams) });
-    logImEXEvent("parts_queue_sort_filter", { pagination, filters, sorter });
  };

  const handleOnRowClick = (record) => {
--- 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,7 +10,6 @@ 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
@@ -27,12 +26,10 @@ 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 (
@@ -43,7 +40,6 @@ 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
@@ -51,10 +47,7 @@ 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 });
-          logImEXEvent("visual_board_filter_alert", { employeeId: emp });
-        }}
+        onChange={(emp) => setFilter({ ...filter, 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,7 +5,6 @@ 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();
@@ -29,7 +28,6 @@ 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-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -18,7 +18,6 @@ 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,
@@ -115,7 +114,6 @@ export function ProductionListTable({ loading, data, refetch, bodyshop, technici
      setState(newState);
      setHasUnsavedChanges(true);
    }
-    logImEXEvent("production_list_sort_filter", { pagination, filters, sorter });
  };

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

  const handleResize =
@@ -159,7 +156,6 @@ 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, Space, Switch, Tooltip, Typography } from "antd";
-import { AudioMutedOutlined, LockOutlined, SoundOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Form, Input } from "antd";
+import { LockOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,8 +10,6 @@ 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
@@ -50,28 +48,6 @@ 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}>
@@ -104,7 +80,6 @@ export default connect(
          </Card>
        </Form>
      </Col>
-
      <Col span={24}>
        <Form onFinish={handleChangePassword} autoComplete={"no"} initialValues={currentUser} layout="vertical">
          <Card
@@ -144,52 +119,6 @@ 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,7 +5,6 @@ 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();
@@ -13,7 +12,6 @@ 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,7 +9,6 @@ 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
@@ -80,12 +79,7 @@ export function ScheduleCalendarHeaderGraph({ bodyshop, loadData }) {
  );

  return (
-    <Popover
-      trigger="hover"
-      placement="bottom"
-      onOpenChange={(open) => open && logImEXEvent("schedule_spider_graph", {})}
-      content={popContent}
-    >
+    <Popover trigger="hover" placement="bottom" 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,7 +19,6 @@ 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,
@@ -143,7 +142,6 @@ 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" }} />
@@ -161,7 +159,6 @@ 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,7 +13,6 @@ 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({
@@ -140,8 +139,6 @@ 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,7 +14,6 @@ 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
@@ -81,7 +80,6 @@ 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,
@@ -97,7 +95,6 @@ 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,7 +6,6 @@ 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);
@@ -17,7 +16,6 @@ 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,7 +6,6 @@ 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
@@ -53,7 +52,6 @@ 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,7 +19,6 @@ 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
@@ -290,7 +289,6 @@ 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,7 +13,6 @@ 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,
@@ -108,7 +107,6 @@ export function TaskListContainer({
          })
        );
      }
-      logImEXEvent("task_completed", {});

      notification["success"]({
        message: t("tasks.successes.completed")
@@ -162,7 +160,6 @@ 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,7 +17,6 @@ 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,
@@ -181,7 +180,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
    notification["success"]({
      message: t("tasks.successes.updated")
    });
-    logImEXEvent("task_update", {});
+
    toggleModalVisible();
  };

@@ -218,7 +217,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/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -1,14 +1,13 @@
+import { useState } from "react";
+import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation } from "@apollo/client";
-import { Button, Form, Popconfirm } from "antd";
-import { useState } from "react";
+import VehicleDetailFormComponent from "./vehicle-detail-form.component";
 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();
@@ -21,7 +20,6 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {

  const handleDelete = async () => {
    setLoading(true);
-    logImEXEvent("vehicle_delete", {});
    const result = await deleteVehicle({
      variables: { id: vehicle.id }
    });
@@ -44,7 +42,6 @@ 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
@@ -4,7 +4,7 @@ import { getAuth, updatePassword, updateProfile } from "@firebase/auth";
 import { getFirestore } from "@firebase/firestore";
 import { getMessaging, getToken, onMessage } from "@firebase/messaging";
 import { store } from "../redux/store";
-//import * as amplitude from '@amplitude/analytics-browser';
+import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js'

 const config = JSON.parse(import.meta.env.VITE_APP_FIREBASE_CONFIG);
@@ -76,11 +76,9 @@ 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", {
@@ -98,7 +96,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    //   eventParams
    // );
    logEvent(analytics, eventName, eventParams);
-    //amplitude.track(eventName, eventParams);
+    amplitude.track(eventName, eventParams);
    posthog.capture(eventName, eventParams);

  } finally {
--- 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!]!, $where: bills_bool_exp) {
-    bills(offset: $offset, limit: $limit, order_by: $order, where: $where) {
+  query QUERY_ALL_BILLS_PAGINATED($offset: Int, $limit: Int, $order: [bills_order_by!]!) {
+    bills(offset: $offset, limit: $limit, order_by: $order) {
      id
      vendorid
      vendor {
--- a/client/src/graphql/user.queries.js
+++ b/client/src/graphql/user.queries.js
@@ -5,7 +5,6 @@ export const QUERY_SHOP_ASSOCIATIONS = gql`
    associations(where: { shopid: { _eq: $shopid } }) {
      id
      authlevel
-      new_message_sound
      shopid
      user {
        email
@@ -29,26 +28,6 @@ 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) {
@@ -98,7 +77,6 @@ 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
@@ -14,7 +14,7 @@ import { persistor, store } from "./redux/store";
 import reportWebVitals from "./reportWebVitals";
 import "./translations/i18n";
 import "./utils/CleanAxios";
-//import * as amplitude from "@amplitude/analytics-browser";
+import * as amplitude from "@amplitude/analytics-browser";
 import { PostHogProvider } from "posthog-js/react";
 import posthog from "posthog-js";

@@ -26,23 +26,23 @@ registerSW({ immediate: true });
 // Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";

-// amplitude.init(import.meta.env.VITE_APP_AMP_KEY, {
-//   defaultTracking: true,
-//   serverUrl: import.meta.env.VITE_APP_AMP_URL
-//   //  {
-//   //     attribution: {
-//   //       excludeReferrers: true,
-//   //       initialEmptyValue: true,
-//   //       resetSessionOnNewCampaign: true,
-//   //     },
-//   //     fileDownloads: true,
-//   //     formInteractions: true,
-//   //     pageViews: {
-//   //       trackHistoryChanges: 'all'
-//   //     },
-//   //     sessions: true
-//   //   }
-// });
+amplitude.init("6228a598e57cd66875cfd41604f1f891", {
+  defaultTracking: true,
+  serverUrl: import.meta.env.VITE_APP_AMP_URL
+  //  {
+  //     attribution: {
+  //       excludeReferrers: true,
+  //       initialEmptyValue: true,
+  //       resetSessionOnNewCampaign: true,
+  //     },
+  //     fileDownloads: true,
+  //     formInteractions: true,
+  //     pageViews: {
+  //       trackHistoryChanges: 'all'
+  //     },
+  //     sessions: true
+  //   }
+});

 posthog.init(import.meta.env.VITE_PUBLIC_POSTHOG_KEY, {
  autocapture: false,
--- a/client/src/pages/bills/bills.page.component.jsx
+++ b/client/src/pages/bills/bills.page.component.jsx
@@ -18,7 +18,6 @@ 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" }))
@@ -32,7 +31,7 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
  const history = useNavigate();
  const [state, setState] = useLocalStorage("bills_list_sort", {
    sortedInfo: {},
-    filteredInfo: { vendorname: [] }
+    filteredInfo: { text: "" }
  });
  const Templates = TemplateList("bill");
  const { t } = useTranslation();
@@ -49,7 +48,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: search.vendorIds ? search.vendorIds.split(",") : null,
+      filteredValue: state.filteredInfo.vendorname || null,
+      onFilter: (value, record) => record.vendorid === value,
      sortOrder: state.sortedInfo.columnKey === "vendorname" && state.sortedInfo.order,
      render: (text, record) => <span>{record.vendor.name}</span>
    },
@@ -165,37 +165,20 @@ export function BillsListPage({ loading, data, refetch, total, setBillEnterConte
  ];

  const handleTableChange = (pagination, filters, sorter) => {
-    setState({
-      sortedInfo: sorter,
-      filteredInfo: { ...state.filteredInfo, vendorname: filters.vendorname || [] }
-    });
-
+    // Persist filters (including vendorname) and sorting
+    setState({ ...state, filteredInfo: { ...state.filteredInfo, ...filters }, sortedInfo: sorter });
    search.page = pagination.current;
-    if (filters.vendorname && filters.vendorname.length) {
-      search.vendorIds = filters.vendorname.join(",");
-    } else {
-      delete search.vendorIds;
-    }
    if (sorter && sorter.column && sorter.column.sortObject) {
      search.searchObj = JSON.stringify(sorter.column.sortObject(sorter.order));
-      delete search.sortcolumn;
-      delete search.sortorder;
    } 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) });
-    logImEXEvent("bills_list_sort_filter", { pagination, filters, sorter });
  };

-  useEffect(() => {
-    if (!search.vendorIds && state.filteredInfo.vendorname && state.filteredInfo.vendorname.length) {
-      search.vendorIds = state.filteredInfo.vendorname.join(",");
-      history({ search: queryString.stringify(search) });
-    }
-  }, []);
-
  useEffect(() => {
    if (search.search && search.search.trim() !== "") {
      searchBills();
@@ -209,7 +192,6 @@ 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
@@ -49,8 +49,7 @@ export function BillsPageContainer({ setBreadcrumbs, setSelectedHeader }) {
          : {
              [sortcolumn || "date"]: sortorder ? (sortorder === "descend" ? "desc" : "asc") : "desc"
            }
-      ],
-      where: searchParams.vendorIds ? { vendorid: { _in: searchParams.vendorIds.split(",") } } : undefined
+      ]
    }
  });

--- a/client/src/pages/contract-create/contract-create.page.container.jsx
+++ b/client/src/pages/contract-create/contract-create.page.container.jsx
@@ -15,7 +15,6 @@ 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
@@ -58,7 +57,6 @@ 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,7 +70,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
        label: t("titles.bc.jobs-new")
      }
    ]);
-    logImEXEvent("manual_job_create_start", {});
  }, [t, setBreadcrumbs, setSelectedHeader]);

  const runInsertJob = (job) => {
@@ -82,7 +81,6 @@ 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,12 +20,7 @@ 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,
-  selectCurrentUser,
-  selectInstanceConflict,
-  selectPartsManagementOnly
-} from "../../redux/user/user.selectors";
+import { selectBodyshop, 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";
@@ -114,11 +109,10 @@ const mapStateToProps = createStructuredSelector({
  conflict: selectInstanceConflict,
  bodyshop: selectBodyshop,
  partsManagementOnly: selectPartsManagementOnly,
-  isDarkMode: selectDarkMode,
-  currentUser: selectCurrentUser
+  isDarkMode: selectDarkMode
 });

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

  return (
    <>
-      <ChatAffixContainer bodyshop={bodyshop} currentUser={currentUser} chatVisible={chatVisible} />
+      <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />
      <Layout style={{ minHeight: "100vh" }} className="layout-container">
        <UpdateAlert />
        <HeaderContainer />
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -49,7 +49,7 @@ import {
  validatePasswordResetSuccess
 } from "./user.actions";
 import UserActionTypes from "./user.types";
-//import * as amplitude from '@amplitude/analytics-browser';
+import * as amplitude from '@amplitude/analytics-browser';
 import posthog from 'posthog-js';

 const fpPromise = FingerprintJS.load();
@@ -92,7 +92,7 @@ export function* isUserAuthenticated() {
    }

    LogRocket.identify(user.email);
-    //amplitude.setUserId(user.email);
+    amplitude.setUserId(user.email);
    posthog.identify(user.email);

    const eulaQuery = yield client.query({
@@ -139,7 +139,7 @@ export function* signOutStart() {
        imexshopid: state.user.bodyshop.imexshopid,
        type: "messaging"
      });
-      //amplitude.reset();
+      amplitude.reset();
    } catch {
      console.log("No FCM token. Skipping unsubscribe.");
    }
@@ -365,7 +365,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
    }

    try {
-      //amplitude.setGroup('Shop', payload.shopname);
+      amplitude.setGroup('Shop', payload.shopname);
      window.$crisp.push(["set", "user:company", [payload.shopname]]);
      if (authRecord[0] && authRecord[0].user.validemail) {
        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -144,11 +144,6 @@
        "tasks_updated": "Task '{{title}}' updated by {{updatedBy}}"
      }
    },
-    "audio": {
-      "manager": {
-        "description": "Click anywhere to enable the message ding."
-      }
-    },
    "billlines": {
      "actions": {
        "newline": "New Line"
@@ -321,6 +316,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 #"
        },
@@ -3811,14 +3807,7 @@
      "labels": {
        "actions": "Actions",
        "changepassword": "Change Password",
-        "profileinfo": "Profile Info",
-        "user_settings": "User Settings",
-        "play_sound_for_new_messages": "Play a sound for new messages",
-        "notification_sound_on": "Sound is ON",
-        "notification_sound_off": "Sound is OFF",
-        "notification_sound_enabled": "Notification sound enabled",
-        "notification_sound_disabled": "Notification sound disabled",
-        "notification_sound_help": "Toggle the ding for incoming chat messages."
+        "profileinfo": "Profile Info"
      },
      "successess": {
        "passwordchanged": "Password changed successfully. "
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -144,11 +144,6 @@
        "tasks_updated": ""
      }
    },
-    "audio": {
-      "manager": {
-        "description": ""
-      }
-    },
    "billlines": {
      "actions": {
        "newline": ""
@@ -321,6 +316,7 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
+          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -3812,14 +3808,7 @@
      "labels": {
        "actions": "",
        "changepassword": "",
-        "profileinfo": "",
-        "user_settings": "",
-        "play_sound_for_new_messages": "",
-        "notification_sound_on": "",
-        "notification_sound_off": "",
-        "notification_sound_enabled": "",
-        "notification_sound_disabled": "",
-        "notification_sound_help": ""
+        "profileinfo": ""
      },
      "successess": {
        "passwordchanged": ""
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -144,11 +144,6 @@
        "tasks_updated": ""
      }
    },
-    "audio": {
-      "manager": {
-        "description": ""
-      }
-    },
    "billlines": {
      "actions": {
        "newline": ""
@@ -321,6 +316,7 @@
          "itc_local": "",
          "itc_state": "",
          "mappingname": "",
+          "ro_posting": "",
          "sendmaterialscosting": "",
          "srcco": ""
        },
@@ -3812,14 +3808,7 @@
      "labels": {
        "actions": "",
        "changepassword": "",
-        "profileinfo": "",
-        "user_settings": "",
-        "play_sound_for_new_messages": "",
-        "notification_sound_on": "",
-        "notification_sound_off": "",
-        "notification_sound_enabled": "",
-        "notification_sound_disabled": "",
-        "notification_sound_help": ""
+        "profileinfo": ""
      },
      "successess": {
        "passwordchanged": ""
--- a/client/src/utils/singleTabAudioLeader.js
+++ b/client/src/utils/singleTabAudioLeader.js
@@ -1,164 +0,0 @@
-// 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
@@ -1,97 +0,0 @@
-// 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,7 +119,6 @@ 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,15 +6,6 @@
  headers:
    - name: x-imex-auth
      value_from_env: DATAPUMP_AUTH
- name: CARFAX Data Pump
-  webhook: '{{HASURA_API_URL}}/data/carfax'
-  schedule: 0 7 * * 6
-  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 * * *
@@ -51,13 +42,12 @@
  comment: ""
 - name: Rome Usage Report
  webhook: '{{HASURA_API_URL}}/data/usagereport'
-  schedule: 0 12 * * 3,5
+  schedule: 0 12 * * 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,7 +215,6 @@
          - default_prod_list_view
          - id
          - kanban_settings
-          - new_message_sound
          - notification_settings
          - notifications_autoadd
          - qbo_realmId
@@ -233,7 +232,6 @@
          - authlevel
          - default_prod_list_view
          - kanban_settings
-          - new_message_sound
          - notification_settings
          - notifications_autoadd
          - qbo_realmId
@@ -944,7 +942,6 @@
          - 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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1 +0,0 @@
-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
@@ -1,4 +0,0 @@
-- 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
@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" add column "carfax_exclude" boolean
- not null default 'false';
--- a/package.json
+++ b/package.json
@@ -10,8 +10,7 @@
    "setup": "rm -rf node_modules && npm i && cd client && rm -rf node_modules && npm i",
    "setup:win": "rimraf node_modules && npm i && cd client && rimraf node_modules && npm i",
    "start": "node server.js",
-    "makeitpretty": "npm run format",
-    "format": "prettier --config .prettierrc.js --ignore-path .prettierignore --write .",
+    "makeitpretty": "prettier --write \"**/*.{css,js,json,jsx,scss}\"",
    "lint": "eslint .",
    "lint:fix": "eslint . --fix",
    "test:unit": "vitest run",
--- 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, sendMexicoBillingEmail } = require("../email/sendemail");
+const { sendServerEmail } = 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: `Project Mexico Report ${moment().format("MM-DD-YY")}`,
+      subject: `CARFAX 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,35 +164,8 @@ 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({
@@ -293,22 +266,17 @@ const CreateRepairOrderTag = (job, errorCallback) => {
      v_make: job.v_make_desc || "",
      v_model: job.v_model_desc || "",

-      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) : "",
+      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)) || "",

      ins_co_nm: job.ins_co_nm || "",
      loss_desc: job.loss_desc || "",
@@ -335,9 +303,7 @@ 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
@@ -436,14 +402,3 @@ 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,41 +79,6 @@ 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({
@@ -455,7 +420,6 @@ ${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,43 +881,39 @@ 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: [{_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
-    date_estimated
-    date_invoiced
-    date_open
+  jobs(where: {_and: [{converted: {_eq: true}}, {v_vin: {_is_null: false}}, {date_invoiced: {_gt: $start}}, {date_invoiced: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
    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
+    created_at
    ro_number
+    v_model_yr
+    v_model_desc
+    v_make_desc
+    v_vin
+    date_estimated
+    date_open
+    date_invoiced
+    loss_date
+    ins_co_nm
+    loss_desc
    theft_ind
    tlos_ind
-    v_make_desc
-    v_model_desc
-    v_model_yr
-    v_vin
+    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
+    }
  }
 }`;

@@ -1858,7 +1856,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}, carfax_exclude: {_neq: "true"}}){
+  bodyshops(where: {external_shop_id: {_is_null: true}}){
      id
      shopname
      imexshopid
@@ -2159,18 +2157,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,8 +384,6 @@ 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
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
Patrick Fic	93e137c84e	Final changes for pbs.	2025-10-01 13:59:11 -07:00
Patrick Fic	9ff3311579	Add vehicle query.	2025-09-26 08:19:57 -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
Patrick Fic	fd229d5d09	Debug level changes, vehicle upsert correction, and logic updates.	2025-09-12 13:14:38 -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
				`@@ -1 +0,0 @@`
				`ALTER TABLE "public"."associations" ALTER COLUMN "new_message_sound" drop default;`