feature/IO-2924-Refactor-Production-Board-For-Sockets - Clear Stage

Signed-off-by: Dave Richer <dave@imexsystems.ca>
feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint
2024-09-12 23:25:21 -04:00 · 2024-09-12 17:50:00 -04:00 · 2024-09-12 17:45:20 -04:00 · 2024-09-12 17:29:48 -04:00 · 2024-09-12 15:32:29 -04:00 · 2024-09-12 11:53:29 -04:00
139 changed files with 8320 additions and 10906 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,9 +226,7 @@ jobs:
          command: |
            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
            hasura migrate apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
-            sleep 5
            hasura metadata apply --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
-            sleep 10
            hasura metadata reload --endpoint https://db.test.romeonline.io/ --admin-secret << parameters.secret >>
      - jira/notify:
          environment: Test (Rome) - Hasura
@@ -315,9 +313,7 @@ jobs:
          command: |
            curl -L https://github.com/hasura/graphql-engine/raw/stable/cli/get.sh | bash
            hasura migrate apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
-            sleep 15
            hasura metadata apply --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
-            sleep 30
            hasura metadata reload --endpoint https://db.test.bodyshop.app/ --admin-secret << parameters.secret >>
      - jira/notify:
          environment: Test (ImEX) - Hasura
@@ -427,7 +423,7 @@ workflows:
          secret: ${HASURA_PROD_SECRET}
          filters:
            branches:
-              only: master-AIO
+              only: master
      - rome-api-deploy:
          filters:
            branches:
@@ -437,7 +433,7 @@ workflows:
            branches:
              only: master-AIO
      - rome-hasura-migrate:
-          secret: ${HASURA_ROME_PROD_SECRET}
+          secret: ${HASURA_PROD_SECRET}
          filters:
            branches:
              only: master-AIO
--- a/_reference/prHelper.html
+++ b/_reference/prHelper.html
@@ -1,59 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>IMEX IO Extractor</title>
-  <style>
-    body {
-      font-family: Arial, sans-serif;
-      padding: 20px;
-    }
-    textarea {
-      width: 100%;
-      height: 200px;
-    }
-    .output-box {
-      margin-top: 20px;
-      padding: 10px;
-      border: 1px solid #ccc;
-      background-color: #f9f9f9;
-      min-height: 40px;
-    }
-    .copy-button {
-      margin-top: 10px;
-    }
-  </style>
-</head>
-<body>
-<h1>IMEX IO Extractor</h1>
-<textarea id="inputText" placeholder="Paste your text here..."></textarea>
-<br>
-<button onclick="extractIO()">Extract</button>
-
-<div class="output-box" id="outputBox" contenteditable="true"></div>
-<button class="copy-button" onclick="copyToClipboard()">Copy to Clipboard</button>
-
-<script>
-  function extractIO() {
-    const inputText = document.getElementById('inputText').value;
-    const ioNumbers = [...new Set(inputText.match(/IO-\d{4}/g))] // Extract unique IO-#### matches
-      .map(io => ({ io, num: parseInt(io.split('-')[1]) }))    // Extract number part for sorting
-      .sort((a, b) => a.num - b.num)                           // Sort by the number
-      .map(item => item.io);                                   // Extract sorted IO-####
-
-    document.getElementById('outputBox').innerText = ioNumbers.join(', '); // Display horizontally
-  }
-
-  function copyToClipboard() {
-    const outputBox = document.getElementById('outputBox');
-    const range = document.createRange();
-    range.selectNodeContents(outputBox);
-    const selection = window.getSelection();
-    selection.removeAllRanges();
-    selection.addRange(range);
-    document.execCommand('copy');
-  }
-</script>
-</body>
-</html>
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
--- a/certs/cert.pem
+++ b/certs/cert.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDWzCCAkOgAwIBAgIUD/QBSAXy/AlJ/cS4DaPWJLpChxgwDQYJKoZIhvcNAQEL
+BQAwPTELMAkGA1UEBhMCQ0ExCzAJBgNVBAgMAk9OMSEwHwYDVQQKDBhJbnRlcm5l
+dCBXaWRnaXRzIFB0eSBMdGQwHhcNMjQwOTA5MTU0MjA1WhcNMjUwOTA5MTU0MjA1
+WjA9MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xITAfBgNVBAoMGEludGVybmV0
+IFdpZGdpdHMgUHR5IEx0ZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKSd0l7NJCNBwvtPU+dVPQkteg0AfC3sGqRnZMQteCRVa2oIgC4NoF3A9BK/yHbF
+ZF25OnXTck5vzc8yb3v73ndfTD9ASKNoiaZE84/GFBsxqlKR8cs0qVwzuAsdijMv
+vlMPNlMRyE1Rb7nR6HXGkPXNyxgMko03NXPkvIje9zRudm0Lf8L4q/hPyPkS7Mrm
+/uQfAAJe+xFcupkEX2XY7r0x1C+z6E8lA1UcuhK3SHdW7CWYqp1vU5/dnnUiXwCa
+GiC6Y1bCJB0pDAVISzy3JUDdINZdiqGR+y8ho3pstChf2mp/76s3N9eG9KA/qaFK
+BrGk2PvCoZ8/Aj1aMsRYFHECAwEAAaNTMFEwHQYDVR0OBBYEFDLJ2fbWP4VUJgOp
+PSs+NGHcVgRmMB8GA1UdIwQYMBaAFDLJ2fbWP4VUJgOpPSs+NGHcVgRmMA8GA1Ud
+EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBABfv5ut/y03atq0NMB0jeDY4
+AvW4ukk0k1svyqxFZCw9o7m2lHb/IjmVrZG1Sj4JWrrSv0s02ccb26/t6vazNa5L
+Powe3eyfHgfjTZJmgs8hyeMwKS0wWk/SPuu9JDhIJakiquqD+UVBGkHpP+XYvhDv
+vhS2XRlW+aEjpUmr1oCyyrc6WbzrYRNadqEsn/AxwcMyUbht3Ugjkg+OpidcTIQp
+5lv63waKo6I1vQofzBQ3L7JYsKo8kC0vAP7wkLxvzBii335uZJzzpFYFVOyVNezi
+dJdazPbRYbXz4LjltdEn/SNfRuKX8ZRiN2OSo7OfSrZaMTS87SfCSFJGgQM8Yrk=
+-----END CERTIFICATE-----
--- a/certs/key.pem
+++ b/certs/key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCkndJezSQjQcL7
+T1PnVT0JLXoNAHwt7BqkZ2TELXgkVWtqCIAuDaBdwPQSv8h2xWRduTp103JOb83P
+Mm97+953X0w/QEijaImmRPOPxhQbMapSkfHLNKlcM7gLHYozL75TDzZTEchNUW+5
+0eh1xpD1zcsYDJKNNzVz5LyI3vc0bnZtC3/C+Kv4T8j5EuzK5v7kHwACXvsRXLqZ
+BF9l2O69MdQvs+hPJQNVHLoSt0h3VuwlmKqdb1Of3Z51Il8AmhogumNWwiQdKQwF
+SEs8tyVA3SDWXYqhkfsvIaN6bLQoX9pqf++rNzfXhvSgP6mhSgaxpNj7wqGfPwI9
+WjLEWBRxAgMBAAECggEAUNpHYlLFxh9dokujPUMreF+Cy/IKDBAkQc2au5RNpyLh
+YDIOqw/8TTAhcTgLQPLQygvZP9f8E7RsVLFD+pSJ/v2qmIJ9au1Edor1Sg+S/oxV
+SLrwFMunx2aLpcH7iAqSI3+cQg7A3+D4zD7iOz6tIl3Su9wo+v073tFhHKTOrEwv
+Qgr9Jf3viIiKV1ym+uQEVQndocfsj46FnFpXTQ2qs7kAF6FgAOLDGfQQwzkiqEBD
+NsqsDmbYIx6foZL+DEz1ZVO2M5B+xxpbNK82KwuQilVpimW8ui4LZHCe+RIFzt9+
+BK6KGlLpSEwTFliivI3nahy18JzskZsfyah0CPZlQQKBgQDVv+A0qIPGvOP3Sx+9
+HyeQCV23SkvvSvw8p8pMB0gvwv63YdJ7N/rJzBGS6YUHFWWZZgEeTgkJ6VJvoe0r
+8JL1el9uSUa7f0eayjmFBOGuzpktNVdIn2Tg7A9MWA4JqPNNC69RMOh86ewGD4J3
+a8Hz2a1bHxAmy/AZt2ukypY6eQKBgQDFJ7kqeOPkRBz9WbALRgVIXo8YWf5di0sQ
+r0HC03GAISHQ725A2IFBPHJWeqj0jaMiIZD0y+Obgp7KAskrJaLfsd7Ug775kFfw
+oUI9UAl6kRuPKvm3BaVAm46SQm+56VsgxTi73YN0NUp75THHZgAJjepF9zSpVJxq
+VY9DjEGruQKBgQCQCpGIatcCol/tUg69X7VFd0pULhkl1J5OMbQ9r9qRdRI5eg5h
+QsQaIQ7mtb8TmvOwf/DY/zVQHI+U8sXlCmW+TwzoQTENQSR7xzMj1LpRFqBaustr
+AR72A537kItFLzll/i3SxOam5uxK2UDOQSuerF4KPdCglGXkrpo3nt3F4QKBgQCa
+RArPAOjQo7tLQfJN3+wiRFsTYtd1uphx5bA/EdOtvj8HjVFnzADXWsTchf3N3UXY
+XwtdgGwIMpys1KEz8a8P+c2x26SDAj7NOmDqOMYx8Xju/WGHpBM6Cn30U6e4gK+d
+ZLSPyzQgqdIuP5hDvbwpvbGiLVw3Ys1BJtGCuSxpgQJ/eHnRiuSi5Zq5jGg+GpA+
+FEEc9NCy772rR+4uzEOqyIwqewffqzSuVWuIsY/8MP3fh+NDxl/mU6cB5QVeD54Z
+JZUKwmpM26muiM6WvVnM4ExPdSGA2+l4pZjby/KKd6F/w0tgZ1jb9Pb2/0vN3qVA
+Y4U4XNTMt2fxUACqiL4SHA==
+-----END PRIVATE KEY-----
--- a/client/.env.development.imex
+++ b/client/.env.development.imex
@@ -8,7 +8,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=IMEX
--- a/client/.env.development.promanager
+++ b/client/.env.development.promanager
@@ -8,7 +8,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BG3tzU7L2BXlGZ_3VLK4PNaRceoEXEnmHfxcVbRMF5o5g05ejslhVPki9kBM9cBBT-08Ad9kN3HSpS6JmrWD6h4'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_INSTANCE=PROMANAGER
--- a/client/.env.development.rome
+++ b/client/.env.development.rome
@@ -9,7 +9,7 @@ VITE_APP_CLOUDINARY_API_KEY=957865933348715
 VITE_APP_CLOUDINARY_THUMB_TRANSFORMATIONS=c_fill,h_250,w_250
 VITE_APP_FIREBASE_PUBLIC_VAPID_KEY='BP1B7ZTYpn-KMt6nOxlld6aS8Skt3Q7ZLEqP0hAvGHxG4UojPYiXZ6kPlzZkUC5jH-EcWXomTLtmadAIxurfcHo'
 VITE_APP_STRIPE_PUBLIC_KEY=pk_test_51GqB4TJl3nQjrZ0wCQWAxAhlNF8jKe0tipIa6ExBaxwJGitwvFsIZUEua4dUzaMIAuXp4qwYHXx7lgjyQSwP0Pe900vzm38C7g
-VITE_APP_AXIOS_BASE_API_URL=http://localhost:4000
+VITE_APP_AXIOS_BASE_API_URL=/api/
 VITE_APP_REPORTS_SERVER_URL=https://reports3.test.imex.online
 VITE_APP_SPLIT_API=ts615lqgnmk84thn72uk18uu5pgce6e0l4rc
 VITE_APP_COUNTRY=USA
--- a/client/.gitignore
+++ b/client/.gitignore
@@ -1,3 +1,4 @@

 # Sentry Config File
 .sentryclirc
+/dev-dist
--- a/client/cypress.config.js
+++ b/client/cypress.config.js
@@ -12,6 +12,6 @@ module.exports = defineConfig({
    setupNodeEvents(on, config) {
      return require("./cypress/plugins/index.js")(on, config);
    },
-    baseUrl: "http://localhost:3000"
+    baseUrl: "https://localhost:3000"
  }
 });
--- a/client/index.html
+++ b/client/index.html
@@ -2,9 +2,6 @@
 <html lang="en">
 <head>
  <meta charset="utf-8"/>
-  <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate">
-  <meta http-equiv="Pragma" content="no-cache">
-  <meta http-equiv="Expires" content="0">
  <% if (env.VITE_APP_INSTANCE === 'IMEX') { %>
  <link rel="icon" href="/favicon.png"/>
  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
@@ -49,23 +46,77 @@
  <% } %> <% if (env.VITE_APP_INSTANCE === 'ROME') { %>
  <meta name="description" content="Rome Online"/>
  <title>Rome Online</title>
-  <script type="text/javascript" id="zsiqchat">
-    var $zoho = $zoho || {};
-    $zoho.salesiq = $zoho.salesiq || {
-      widgetcode: "siq01bb8ac617280bdacddfeb528f07734dadc64ef3f05efef9f769c1ec171af666",
-      values: {},
-      ready: function () {
-      }
-    };
-    var d = document;
-    s = d.createElement("script");
-    s.type = "text/javascript";
-    s.id = "zsiqscript";
-    s.defer = true;
-    s.src = "https://salesiq.zohopublic.com/widget";
-    t = d.getElementsByTagName("script")[0];
-    t.parentNode.insertBefore(s, t);
-  </script>
+
+  <!--Use the below code snippet to provide real time updates to the live chat plugin without the need of copying and paste each time to your website when changes are made via PBX-->
+
+  <call-us-selector phonesystem-url=https://rometech.east.3cx.us:5001
+                    party="LiveChat528346"></call-us-selector>
+
+  <!--Incase you don't want real time updates to the live chat plugin when options are changed, use the below code snippet. Please note that each time you change the settings you will need to copy and paste the snippet code to your website-->
+
+  <!--<call-us
+  
+  phonesystem-url=https://rometech.east.3cx.us:5001
+  
+  style="position:fixed;font-size:16px;line-height:17px;z-index: 99999;right: 20px; bottom: 20px;"
+  
+  id="wp-live-chat-by-3CX"
+  
+  minimized="true"
+  
+  animation-style="noanimation"
+  
+  party="LiveChat528346"
+  
+  minimized-style="bubbleright"
+  
+  allow-call="true"
+  
+  allow-video="false"
+  
+  allow-soundnotifications="true"
+  
+  enable-mute="true"
+  
+  enable-onmobile="true"
+  
+  offline-enabled="true"
+  
+  enable="true"
+  
+  ignore-queueownership="false"
+  
+  authentication="both"
+  
+  show-operator-actual-name="true"
+  
+  aknowledge-received="true"
+  
+  gdpr-enabled="false"
+  
+  message-userinfo-format="name"
+  
+  message-dateformat="both"
+  
+  lang="browser"
+  
+  button-icon-type="default"
+  
+  greeting-visibility="none"
+  
+  greeting-offline-visibility="none"
+  
+  chat-delay="2000"
+  
+  enable-direct-call="true"
+  
+  enable-ga="false"
+  
+  ></call-us>-->
+
+  <script defer src=https://downloads-global.3cx.com/downloads/livechatandtalk/v1/callus.js
+          id="tcx-callus-js" charset="utf-8"></script>
+

  <% } %> <% if (env.VITE_APP_INSTANCE === 'PROMANAGER') { %>
  <title>ProManager</title>
--- a/client/package-lock.json
+++ b/client/package-lock.json
--- a/client/package.json
+++ b/client/package.json
@@ -8,22 +8,22 @@
  "private": true,
  "proxy": "http://localhost:4000",
  "dependencies": {
-    "@ant-design/pro-layout": "^7.19.12",
-    "@apollo/client": "^3.11.4",
+    "@ant-design/pro-layout": "^7.20.0",
+    "@apollo/client": "^3.11.8",
    "@emotion/is-prop-valid": "^1.3.0",
-    "@fingerprintjs/fingerprintjs": "^4.4.3",
+    "@fingerprintjs/fingerprintjs": "^4.5.0",
    "@jsreport/browser-client": "^3.1.0",
    "@reduxjs/toolkit": "^2.2.7",
-    "@sentry/cli": "^2.33.1",
+    "@sentry/cli": "^2.36.1",
    "@sentry/react": "^7.114.0",
-    "@splitsoftware/splitio-react": "^1.12.1",
+    "@splitsoftware/splitio-react": "^1.13.0",
    "@tanem/react-nprogress": "^5.0.51",
    "@vitejs/plugin-react": "^4.3.1",
-    "antd": "^5.20.1",
+    "antd": "^5.20.6",
    "apollo-link-logger": "^2.0.1",
    "apollo-link-sentry": "^3.3.0",
    "autosize": "^6.0.1",
-    "axios": "^1.7.4",
+    "axios": "^1.7.7",
    "classnames": "^2.5.1",
    "css-box-model": "^1.2.1",
    "dayjs": "^1.11.12",
@@ -32,12 +32,12 @@
    "dotenv": "^16.4.5",
    "env-cmd": "^10.1.0",
    "exifr": "^7.1.3",
-    "firebase": "^10.12.5",
+    "firebase": "^10.13.1",
    "graphql": "^16.9.0",
-    "i18next": "^23.12.3",
+    "i18next": "^23.15.1",
    "i18next-browser-languagedetector": "^8.0.0",
    "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.11.5",
+    "libphonenumber-js": "^1.11.8",
    "logrocket": "^8.1.2",
    "markerjs2": "^2.32.1",
    "memoize-one": "^6.0.0",
@@ -47,7 +47,7 @@
    "query-string": "^9.1.0",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
-    "react-big-calendar": "^1.13.2",
+    "react-big-calendar": "^1.13.4",
    "react-color": "^2.19.3",
    "react-cookie": "^7.2.0",
    "react-dom": "^18.3.1",
@@ -58,15 +58,15 @@
    "react-icons": "^5.3.0",
    "react-image-lightbox": "^5.1.4",
    "react-markdown": "^9.0.1",
-    "react-number-format": "^5.4.0",
+    "react-number-format": "^5.4.2",
    "react-popopo": "^2.1.9",
-    "react-product-fruits": "^2.2.6",
+    "react-product-fruits": "^2.2.61",
    "react-redux": "^9.1.2",
    "react-resizable": "^3.0.5",
-    "react-router-dom": "^6.26.0",
+    "react-router-dom": "^6.26.2",
    "react-sticky": "^6.0.3",
    "react-virtualized": "^9.22.5",
-    "react-virtuoso": "^4.10.1",
+    "react-virtuoso": "^4.10.3",
    "recharts": "^2.12.7",
    "redux": "^5.0.1",
    "redux-actions": "^3.0.3",
@@ -74,9 +74,9 @@
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
-    "sass": "^1.77.8",
+    "sass": "^1.78.0",
    "socket.io-client": "^4.7.5",
-    "styled-components": "^6.1.12",
+    "styled-components": "^6.1.13",
    "subscriptions-transport-ws": "^0.11.0",
    "use-memo-one": "^1.1.3",
    "userpilot": "^1.3.5",
@@ -84,13 +84,15 @@
    "web-vitals": "^3.5.2"
  },
  "scripts": {
-    "postinstall": "echo 'when updating react-big-calendar, remember to check to localizer in the calendar wrapper'",
    "analyze": "source-map-explorer 'build/static/js/*.js'",
    "start": "vite",
    "build": "dotenvx run --env-file=.env.development.imex -- vite build",
    "start:imex": "dotenvx run --env-file=.env.development.imex -- vite",
    "start:rome": "dotenvx run --env-file=.env.development.rome -- vite",
    "start:promanager": "dotenvx run --env-file=.env.development.promanager -- vite",
+    "preview:imex": "dotenvx run --env-file=.env.development.imex -- vite preview",
+    "preview:rome": "dotenvx run --env-file=.env.development.rome -- vite preview",
+    "preview:promanager": "dotenvx run --env-file=.env.development.promanager -- vite preview",
    "build:test:imex": "env-cmd -f .env.test.imex npm run build",
    "build:test:rome": "env-cmd -f .env.test.rome npm run build",
    "build:test:promanager": "env-cmd -f .env.test.promanager npm run build",
@@ -131,15 +133,16 @@
  "devDependencies": {
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.24.7",
-    "@dotenvx/dotenvx": "^1.7.0",
+    "@dotenvx/dotenvx": "^1.14.0",
    "@emotion/babel-plugin": "^11.12.0",
-    "@emotion/react": "^11.13.0",
-    "@sentry/webpack-plugin": "^2.22.2",
+    "@emotion/react": "^11.13.3",
+    "@sentry/webpack-plugin": "^2.22.4",
    "@testing-library/cypress": "^10.0.2",
    "browserslist": "^4.23.3",
    "browserslist-to-esbuild": "^2.1.1",
+    "chalk": "^5.3.0",
    "cross-env": "^7.0.3",
-    "cypress": "^13.13.3",
+    "cypress": "^13.14.2",
    "eslint": "^8.57.0",
    "eslint-config-react-app": "^7.0.1",
    "eslint-plugin-cypress": "^2.15.1",
@@ -148,10 +151,9 @@
    "react-error-overlay": "6.0.11",
    "redux-logger": "^3.0.6",
    "source-map-explorer": "^2.5.3",
-    "vite": "^5.4.0",
+    "vite": "^5.4.3",
    "vite-plugin-babel": "^1.2.0",
    "vite-plugin-eslint": "^1.8.1",
-    "vite-plugin-legacy": "^2.1.0",
    "vite-plugin-node-polyfills": "^0.22.0",
    "vite-plugin-pwa": "^0.20.1",
    "vite-plugin-style-import": "^2.0.0",
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -21,6 +21,7 @@ import "./App.styles.scss";
 import Eula from "../components/eula/eula.component";
 import InstanceRenderMgr from "../utils/instanceRenderMgr";
 import ProductFruitsWrapper from "./ProductFruitsWrapper.jsx";
+import { SocketProvider } from "../contexts/SocketIO/socketContext.jsx";

 const ResetPassword = lazy(() => import("../pages/reset-password/reset-password.component"));
 const ManagePage = lazy(() => import("../pages/manage/manage.page.container"));
@@ -201,7 +202,9 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
          path="/manage/*"
          element={
            <ErrorBoundary>
-              <PrivateRoute isAuthorized={currentUser.authorized} />
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
            </ErrorBoundary>
          }
        >
@@ -211,7 +214,9 @@ export function App({ bodyshop, checkUserSession, currentUser, online, setOnline
          path="/tech/*"
          element={
            <ErrorBoundary>
-              <PrivateRoute isAuthorized={currentUser.authorized} />
+              <SocketProvider bodyshop={bodyshop}>
+                <PrivateRoute isAuthorized={currentUser.authorized} />
+              </SocketProvider>
            </ErrorBoundary>
          }
        >
--- a/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-component.jsx
@@ -98,7 +98,7 @@ export function BillDetailEditcontainer({ setPartsOrderContext, insertAuditTrail
    });

    billlines.forEach((billline) => {
-      const { deductedfromlbr, inventories, jobline, original_actual_price, create_ppc, ...il } = billline;
+      const { deductedfromlbr, inventories, jobline, ...il } = billline;
      delete il.__typename;

      if (il.id) {
--- a/client/src/components/card-payment-modal/card-payment-modal.component..jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.component..jsx
@@ -1,6 +1,6 @@
-import { DeleteFilled, CopyFilled } from "@ant-design/icons";
+import { DeleteFilled } from "@ant-design/icons";
 import { useLazyQuery, useMutation } from "@apollo/client";
-import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, message, notification } from "antd";
+import { Button, Card, Col, Form, Input, Row, Space, Spin, Statistic, notification } from "antd";
 import axios from "axios";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -14,12 +14,10 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
-import { getCurrentUser } from "../../firebase/firebase.utils";

 const mapStateToProps = createStructuredSelector({
  cardPaymentModal: selectCardPayment,
-  bodyshop: selectBodyshop,
-  currentUser: getCurrentUser
+  bodyshop: selectBodyshop
 });

 const mapDispatchToProps = (dispatch) => ({
@@ -27,17 +25,11 @@ const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("cardPayment"))
 });

-const CardPaymentModalComponent = ({
-  bodyshop,
-  currentUser,
-  cardPaymentModal,
-  toggleModalVisible,
-  insertAuditTrail
-}) => {
+const CardPaymentModalComponent = ({ bodyshop, cardPaymentModal, toggleModalVisible, insertAuditTrail }) => {
  const { context, actions } = cardPaymentModal;

  const [form] = Form.useForm();
-  const [paymentLink, setPaymentLink] = useState();
+
  const [loading, setLoading] = useState(false);
  // const [insertPayment] = useMutation(INSERT_NEW_PAYMENT);
  const [insertPaymentResponse] = useMutation(INSERT_PAYMENT_RESPONSE);
@@ -45,7 +37,7 @@ const CardPaymentModalComponent = ({

  const [, { data, refetch, queryLoading }] = useLazyQuery(QUERY_RO_AND_OWNER_BY_JOB_PKS, {
    variables: { jobids: [context.jobid] },
-    skip: !context?.jobid
+    skip: true
  });

  //Initialize the intellipay window.
@@ -59,7 +51,8 @@ const CardPaymentModalComponent = ({
      //2024-04-25: Nothing is going to happen here anymore. We'll completely rely on the callback.
      //Add a slight delay to allow the refetch to properly get the data.
      setTimeout(() => {
-        if (actions && actions.refetch && typeof actions.refetch === "function") actions.refetch();
+        if (actions && actions.refetch && typeof actions.refetch === "function")
+          actions.refetch();
        setLoading(false);
        toggleModalVisible();
      }, 750);
@@ -93,6 +86,7 @@ const CardPaymentModalComponent = ({
    });
  };

+
  const handleIntelliPayCharge = async () => {
    setLoading(true);
    //Validate
@@ -107,7 +101,7 @@ const CardPaymentModalComponent = ({
      const response = await axios.post("/intellipay/lightbox_credentials", {
        bodyshop,
        refresh: !!window.intellipay,
-        paymentSplitMeta: form.getFieldsValue()
+        paymentSplitMeta: form.getFieldsValue(),
      });

      if (window.intellipay) {
@@ -132,42 +126,6 @@ const CardPaymentModalComponent = ({
    }
  };

-  const handleIntelliPayChargeShortLink = async () => {
-    setLoading(true);
-    //Validate
-    try {
-      await form.validateFields();
-    } catch (error) {
-      setLoading(false);
-      return;
-    }
-
-    try {
-      const { payments } = form.getFieldsValue();
-      const response = await axios.post("/intellipay/generate_payment_url", {
-        bodyshop,
-        amount: payments?.reduce((acc, val) => {
-          return acc + (val?.amount || 0);
-        }, 0),
-        account: payments && data && data.jobs.length > 0 ? data.jobs.map((j) => j.ro_number).join(", ") : null,
-        comment: btoa(JSON.stringify({ payments, userEmail: currentUser.email })),
-        paymentSplitMeta: form.getFieldsValue()
-      });
-      if (response.data) {
-        setPaymentLink(response.data?.shorUrl);
-        navigator.clipboard.writeText(response.data?.shorUrl);
-        message.success(t("general.actions.copied"));
-      }
-      setLoading(false);
-    } catch (error) {
-      notification.open({
-        type: "error",
-        message: t("job_payments.notifications.error.openingip")
-      });
-      setLoading(false);
-    }
-  };
-
  return (
    <Card title="Card Payment">
      <Spin spinning={loading}>
@@ -244,14 +202,16 @@ const CardPaymentModalComponent = ({

          <Form.Item
            shouldUpdate={(prevValues, curValues) =>
-              prevValues.payments?.map((p) => p?.jobid + p?.amount).join() !==
-              curValues.payments?.map((p) => p?.jobid + p?.amount).join()
+              prevValues.payments?.map((p) => p?.jobid).join() !== curValues.payments?.map((p) => p?.jobid).join()
            }
          >
            {() => {
              //If all of the job ids have been fileld in, then query and update the IP field.
              const { payments } = form.getFieldsValue();
-              if (payments?.length > 0 && payments?.filter((p) => p?.jobid).length === payments?.length) {
+              if (
+                payments?.length > 0 &&
+                payments?.filter((p) => p?.jobid).length === payments?.length
+              ) {
                refetch({ jobids: payments.map((p) => p.jobid) });
              }
              return (
@@ -286,6 +246,7 @@ const CardPaymentModalComponent = ({
              const totalAmountToCharge = payments?.reduce((acc, val) => {
                return acc + (val?.amount || 0);
              }, 0);
+
              return (
                <Space style={{ float: "right" }}>
                  <Statistic title="Amount To Charge" value={totalAmountToCharge} precision={2} />
@@ -312,36 +273,11 @@ const CardPaymentModalComponent = ({
                  >
                    {t("job_payments.buttons.proceedtopayment")}
                  </Button>
-                  <Space direction="vertical" align="center">
-                    <Button
-                      type="primary"
-                      //  data-ipayname="submit"
-                      className="ipayfield"
-                      loading={queryLoading || loading}
-                      disabled={!(totalAmountToCharge > 0)}
-                      onClick={handleIntelliPayChargeShortLink}
-                    >
-                      {t("job_payments.buttons.create_short_link")}
-                    </Button>
-                  </Space>
                </Space>
              );
            }}
          </Form.Item>
        </Form>
-        {paymentLink && (
-          <Space
-            style={{ cursor: "pointer", float: "right" }}
-            align="end"
-            onClick={() => {
-              navigator.clipboard.writeText(paymentLink);
-              message.success(t("general.actions.copied"));
-            }}
-          >
-            <div>{paymentLink}</div>
-            <CopyFilled />
-          </Space>
-        )}
      </Spin>
    </Card>
  );
--- a/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
+++ b/client/src/components/dms-allocations-summary-ap/dms-allocations-summary-ap.component.jsx
@@ -1,62 +1,77 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Form, Input, Table } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState, useContext } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx"; // Import SocketContext

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
  bodyshop: selectBodyshop
 });

-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+export default connect(mapStateToProps)(DmsAllocationsSummaryAp);

-export default connect(mapStateToProps, mapDispatchToProps)(DmsAllocationsSummaryAp);
-
-export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
+export function DmsAllocationsSummaryAp({ bodyshop, billids, title }) {
  const { t } = useTranslation();
  const [allocationsSummary, setAllocationsSummary] = useState([]);
+  const { socket } = useContext(SocketContext);

  useEffect(() => {
-    socket.on("ap-export-success", (billid) => {
+    if (!socket) return;
+
+    const handleSuccess = async (billid) => {
      setAllocationsSummary((allocationsSummary) =>
        allocationsSummary.map((a) => {
          if (a.billid !== billid) return a;
          return { ...a, status: "Successful" };
        })
      );
-    });
-    socket.on("ap-export-failure", ({ billid, error }) => {
-      allocationsSummary.map((a) => {
-        if (a.billid !== billid) return a;
-        return { ...a, status: error };
-      });
-    });

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeListener("ap-export-success");
-      socket.removeListener("ap-export-failure");
-      //socket.disconnect();
+      try {
+        await new Promise((resolve, reject) => {
+          socket.emit("clear-dms-session", (response) => {
+            if (response && response.status === "ok") {
+              resolve();
+            } else {
+              reject(new Error("Failed to clear DMS session"));
+            }
+          });
+        });
+      } catch (error) {
+        console.error("Failed to clear DMS session", error);
+      }
    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+
+    const handleFailure = ({ billid, error }) => {
+      setAllocationsSummary((allocationsSummary) =>
+        allocationsSummary.map((a) => {
+          if (a.billid !== billid) return a;
+          return { ...a, status: error };
+        })
+      );
+    };
+
+    socket.on("ap-export-success", handleSuccess);
+    socket.on("ap-export-failure", handleFailure);
+
+    return () => {
+      socket.off("ap-export-success", handleSuccess);
+      socket.off("ap-export-failure", handleFailure);
+    };
+  }, [socket]);

  useEffect(() => {
-    if (socket.connected) {
+    if (socket && socket.connected) {
      socket.emit("pbs-calculate-allocations-ap", billids, (ack) => {
        setAllocationsSummary(ack);
-
        socket.allocationsSummary = ack;
      });
    }
  }, [socket, socket.connected, billids]);
-  console.log(allocationsSummary);
+
  const columns = [
    {
      title: t("general.labels.status"),
@@ -68,35 +83,40 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
      dataIndex: ["Posting", "Reference"],
      key: "reference"
    },
-
    {
      title: t("jobs.fields.dms.lines"),
      dataIndex: "Lines",
      key: "Lines",
      render: (text, record) => (
        <table style={{ tableLayout: "auto", width: "100%" }}>
-          <tr>
-            <th>{t("bills.fields.invoice_number")}</th>
-            <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
-            <th>{t("jobs.fields.dms.amount")}</th>
-          </tr>
-          {record.Posting.Lines.map((l, idx) => (
-            <tr key={idx}>
-              <td>{l.InvoiceNumber}</td>
-              <td>{l.Account}</td>
-              <td>{l.Amount}</td>
+          <thead>
+            <tr>
+              <th>{t("bills.fields.invoice_number")}</th>
+              <th>{t("bodyshop.fields.dms.dms_acctnumber")}</th>
+              <th>{t("jobs.fields.dms.amount")}</th>
            </tr>
-          ))}
+          </thead>
+          <tbody>
+            {record.Posting.Lines.map((l, idx) => (
+              <tr key={idx}>
+                <td>{l.InvoiceNumber}</td>
+                <td>{l.Account}</td>
+                <td>{l.Amount}</td>
+              </tr>
+            ))}
+          </tbody>
        </table>
      )
    }
  ];

  const handleFinish = async (values) => {
-    socket.emit(`pbs-export-ap`, {
-      billids,
-      txEnvelope: values
-    });
+    if (socket) {
+      socket.emit("pbs-export-ap", {
+        billids,
+        txEnvelope: values
+      });
+    }
  };

  return (
@@ -105,7 +125,9 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
      extra={
        <Button
          onClick={() => {
-            socket.emit("pbs-calculate-allocations-ap", billids, (ack) => setAllocationsSummary(ack));
+            if (socket) {
+              socket.emit("pbs-calculate-allocations-ap", billids, (ack) => setAllocationsSummary(ack));
+            }
          }}
        >
          <SyncOutlined />
@@ -124,12 +146,7 @@ export function DmsAllocationsSummaryAp({ socket, bodyshop, billids, title }) {
          name="journal"
          label={t("jobs.fields.dms.journal")}
          initialValue={bodyshop.cdk_configuration && bodyshop.cdk_configuration.default_journal}
-          rules={[
-            {
-              required: true
-              //message: t("general.validation.required"),
-            }
-          ]}
+          rules={[{ required: true }]}
        >
          <Input />
        </Form.Item>
--- a/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
+++ b/client/src/components/dms-customer-selector/dms-customer-selector.component.jsx
@@ -1,37 +1,51 @@
 import { Button, Checkbox, Col, Table } from "antd";
-import React, { useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { socket } from "../../pages/dms/dms.container";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { alphaSort } from "../../utils/sorters";
+import SocketContext from "../../contexts/SocketIO/socketContext"; // Import Socket Context

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = (dispatch) => ({});
+
 export default connect(mapStateToProps, mapDispatchToProps)(DmsCustomerSelector);

 export function DmsCustomerSelector({ bodyshop }) {
  const { t } = useTranslation();
-  const [customerList, setcustomerList] = useState([]);
+  const { socket } = useContext(SocketContext); // Use Socket Context
+  const [customerList, setCustomerList] = useState([]);
  const [open, setOpen] = useState(false);
  const [selectedCustomer, setSelectedCustomer] = useState(null);
  const [dmsType, setDmsType] = useState("cdk");

-  socket.on("cdk-select-customer", (customerList, callback) => {
-    setOpen(true);
-    setDmsType("cdk");
-    setcustomerList(customerList);
-  });
-  socket.on("pbs-select-customer", (customerList, callback) => {
-    setOpen(true);
-    setDmsType("pbs");
-    setcustomerList(customerList);
-  });
+  useEffect(() => {
+    if (socket) {
+      const handleCdkSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("cdk");
+        setCustomerList(customerList);
+      };
+
+      const handlePbsSelectCustomer = (customerList) => {
+        setOpen(true);
+        setDmsType("pbs");
+        setCustomerList(customerList);
+      };
+
+      socket.on("cdk-select-customer", handleCdkSelectCustomer);
+      socket.on("pbs-select-customer", handlePbsSelectCustomer);
+
+      // Clean up listeners on unmount
+      return () => {
+        socket.off("cdk-select-customer", handleCdkSelectCustomer);
+        socket.off("pbs-select-customer", handlePbsSelectCustomer);
+      };
+    }
+  }, [socket]);

  const onUseSelected = () => {
    setOpen(false);
@@ -69,17 +83,11 @@ export function DmsCustomerSelector({ bodyshop }) {
      key: "name1",
      sorter: (a, b) => alphaSort(a.name1 && a.name1.fullName, b.name1 && b.name1.fullName)
    },
-
    {
      title: t("jobs.fields.dms.address"),
-      //dataIndex: ["name2", "fullName"],
      key: "address",
-      render: (record, value) =>
-        `${
-          record.address && record.address.addressLine && record.address.addressLine[0]
-        }, ${record.address && record.address.city} ${
-          record.address && record.address.stateOrProvince
-        } ${record.address && record.address.postalCode}`
+      render: (record) =>
+        `${record.address?.addressLine?.[0]}, ${record.address?.city} ${record.address?.stateOrProvince} ${record.address?.postalCode}`
    }
  ];

@@ -95,15 +103,15 @@ export function DmsCustomerSelector({ bodyshop }) {
      sorter: (a, b) => alphaSort(a.LastName, b.LastName),
      render: (text, record) => `${record.FirstName || ""} ${record.LastName || ""}`
    },
-
    {
      title: t("jobs.fields.dms.address"),
      key: "address",
-      render: (record, value) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
+      render: (record) => `${record.Address}, ${record.City} ${record.State} ${record.ZipCode}`
    }
  ];

  if (!open) return null;
+
  return (
    <Col span={24}>
      <Table
@@ -125,7 +133,6 @@ export function DmsCustomerSelector({ bodyshop }) {
        columns={dmsType === "cdk" ? cdkColumns : pbsColumns}
        rowKey={(record) => (dmsType === "cdk" ? record.id.value : record.ContactId)}
        dataSource={customerList}
-        //onChange={handleTableChange}
        rowSelection={{
          onSelect: (record) => {
            setSelectedCustomer(dmsType === "cdk" ? record.id.value : record.ContactId);
--- a/client/src/components/dms-log-events/dms-log-events.component.jsx
+++ b/client/src/components/dms-log-events/dms-log-events.component.jsx
@@ -4,11 +4,8 @@ import React from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});

 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -17,7 +14,7 @@ const mapDispatchToProps = (dispatch) => ({

 export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);

-export function DmsLogEvents({ socket, logs, bodyshop }) {
+export function DmsLogEvents({ logs }) {
  return (
    <Timeline
      pending
--- a/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
+++ b/client/src/components/job-totals-table/job-totals.table.totals.component.jsx
@@ -141,14 +141,10 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
        key: t("jobs.fields.ded_amt"),
        total: job.job_totals.totals.custPayable.deductible
      },
-      ...(InstanceRenderManager({
-        imex: [{
-          key: t("jobs.fields.federal_tax_payable"),
-          total: job.job_totals.totals.custPayable.federal_tax
-        }],
-        rome: [],
-        promanager: "USE_ROME"
-      })),
+      // {
+      //   key: t("jobs.fields.federal_tax_payable"),
+      //   total: job.job_totals.totals.custPayable.federal_tax,
+      // },
      {
        key: t("jobs.fields.other_amount_payable"),
        total: job.job_totals.totals.custPayable.other_customer_amount
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -250,8 +250,8 @@ export function JobsList({ bodyshop }) {
    },
    {
      title: t("jobs.labels.estimator"),
-      dataIndex: "estimator",
-      key: "estimator",
+      dataIndex: "jobs.labels.estimator",
+      key: "jobs.labels.estimator",
      ellipsis: true,
      responsive: ["xl"],
      sorter: (a, b) =>
--- 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
@@ -27,10 +27,6 @@ export default function PartsOrderModalPriceChange({ form, field }) {
        key: "25",
        label: t("parts_orders.labels.discount", { percent: "25%" })
      },
-      {
-        key: "40",
-        label: t("parts_orders.labels.discount", { percent: "40%" })
-      },
      {
        key: "custom",
        label: (
--- a/client/src/components/payments-generate-link/payments-generate-link.component.jsx
+++ b/client/src/components/payments-generate-link/payments-generate-link.component.jsx
@@ -8,12 +8,11 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { openChatByPhone, setMessage } from "../../redux/messaging/messaging.actions";
-import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import CurrencyFormItemComponent from "../form-items-formatted/currency-form-item.component";

 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop,
-  currentUser: selectCurrentUser
+  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
  openChatByPhone: (phone) => dispatch(openChatByPhone(phone)),
@@ -21,7 +20,7 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(PaymentsGenerateLink);

-export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, openChatByPhone, setMessage }) {
+export function PaymentsGenerateLink({ bodyshop, callback, job, openChatByPhone, setMessage }) {
  const { t } = useTranslation();
  const [form] = Form.useForm();

@@ -31,35 +30,29 @@ export function PaymentsGenerateLink({ bodyshop, currentUser, callback, job, ope

  const handleFinish = async ({ amount }) => {
    setLoading(true);
-    let p;
-    try {
-      p = parsePhoneNumber(job.ownr_ph1 || "", "CA");
-    } catch (error) {
-      console.log("Unable to parse phone number");
-    }
+
+    const p = parsePhoneNumber(job.ownr_ph1, "CA");
    setLoading(true);
    const response = await axios.post("/intellipay/generate_payment_url", {
      bodyshop,
      amount: amount,
      account: job.ro_number,
-      comment: btoa(JSON.stringify({ payments: [{ jobid: job.id, amount }], userEmail: currentUser.email }))
+      invoice: job.id
    });
    setLoading(false);
    setPaymentLink(response.data.shorUrl);

-    if (p) {
-      openChatByPhone({
-        phone_num: p.formatInternational(),
-        jobid: job.id
-      });
-      setMessage(
-        t("payments.labels.smspaymentreminder", {
-          shopname: bodyshop.shopname,
-          amount: amount,
-          payment_link: response.data.shorUrl
-        })
-      );
-    }
+    openChatByPhone({
+      phone_num: p.formatInternational(),
+      jobid: job.id
+    });
+    setMessage(
+      t("payments.labels.smspaymentreminder", {
+        shopname: bodyshop.shopname,
+        amount: amount,
+        payment_link: response.data.shorUrl
+      })
+    );

    //Add in confirmation & errors.
    if (callback) callback();
--- a/client/src/components/production-board-kanban/production-board-kanban.component.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.component.jsx
@@ -1,9 +1,10 @@
+import dayjs from "../../utils/day";
 import { SyncOutlined } from "@ant-design/icons";
 import { useApolloClient } from "@apollo/client";
 import Board from "./trello-board/index";
 import { Button, notification, Skeleton, Space } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-import React, { useCallback, useEffect, useMemo, useState } from "react";
+import React, { useCallback, useContext, useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -23,6 +24,7 @@ import cloneDeep from "lodash/cloneDeep";
 import isEqual from "lodash/isEqual";
 import { defaultFilters, mergeWithDefaults } from "./settings/defaultKanbanSettings.js";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -45,10 +47,136 @@ function ProductionBoardKanbanComponent({ data, bodyshop, refetch, insertAuditTr
  const [loading, setLoading] = useState(true);
  const [isMoving, setIsMoving] = useState(false);
  const [orientation, setOrientation] = useState("vertical");
+  const { socket } = useContext(SocketContext); // Access socket from the context

  const { t } = useTranslation();
  const client = useApolloClient();

+  const handleJobUpdated = useCallback(
+    (updatedJob) => {
+      setBoardLanes((prevBoardLanes) => {
+        const updatedLanes = cloneDeep(prevBoardLanes.lanes);
+
+        // Find the lane containing the card with the updated job ID
+        let sourceLane = updatedLanes.find((lane) => lane.cards.some((card) => card.id === updatedJob.id));
+
+        if (!sourceLane) {
+          console.log("Card not found in any lane. Checking for valid status to add it.");
+
+          // Find the target lane based on the new status if the card does not exist
+          const targetLane = updatedLanes.find((lane) => lane.id === updatedJob.status);
+
+          if (targetLane && updatedJob.isInProduction) {
+            // Check if job is in production and status is valid
+            console.log(`Adding card to lane ${targetLane.title}`);
+
+            // Add the new card to the target lane
+            const newCard = {
+              id: updatedJob.id,
+              metadata: { ...updatedJob }
+            };
+            targetLane.cards.push(newCard);
+
+            // Update the lane title with the new card count
+            targetLane.title = `${targetLane.title.split(" ")[0]} (${targetLane.cards.length})`;
+
+            return { lanes: updatedLanes }; // Return early since the card is added
+          } else {
+            console.error("No valid lane or status to add the job to.");
+            return prevBoardLanes; // Return the previous state if no valid status or lane
+          }
+        }
+
+        // If the card exists, find it in the source lane
+        const cardIndex = sourceLane.cards.findIndex((card) => card.id === updatedJob.id);
+        const currentCard = sourceLane.cards[cardIndex];
+
+        // If we somehow can't find the card, return
+        if (!currentCard) {
+          console.error("Card not found for the updated job.");
+          return prevBoardLanes; // Return the previous state if the card is not found
+        }
+
+        // Iterate through the properties of updatedJob and update the corresponding values in currentCard.metadata
+        Object.keys(updatedJob).forEach((key) => {
+          // Normalize date fields by comparing their ISO strings or timestamps
+          if (key === "updated_at") {
+            const currentCardDate = dayjs(currentCard.metadata[key]).toISOString();
+            const updatedJobDate = dayjs(updatedJob[key]).toISOString();
+
+            if (currentCardDate !== updatedJobDate) {
+              console.log(`Updating ${key} from ${currentCardDate} to ${updatedJobDate}`);
+              currentCard.metadata[key] = updatedJob[key]; // Assign the new value if different
+            }
+          } else if (key in currentCard.metadata && currentCard.metadata[key] !== updatedJob[key]) {
+            console.log(`Updating ${key} from ${currentCard.metadata[key]} to ${updatedJob[key]}`);
+            currentCard.metadata[key] = updatedJob[key];
+          }
+        });
+
+        // Mark that data has been changed if any field was updated
+        const isDataChanged = !isEqual(currentCard.metadata, updatedJob);
+
+        // Check if the lane (status) has changed
+        const isLaneChanged = updatedJob.status !== sourceLane.id;
+
+        // Case 1: Both data and lane have changed
+        if (isDataChanged && isLaneChanged) {
+          console.log("Case 1: Data and Lane Changed");
+
+          // Remove the card from the source lane
+          const [cardToMove] = sourceLane.cards.splice(cardIndex, 1);
+
+          // Find the target lane based on the new status
+          const targetLane = updatedLanes.find((lane) => lane.id === updatedJob.status);
+          if (targetLane) {
+            targetLane.cards.push({ ...cardToMove, metadata: { ...currentCard.metadata } });
+            sourceLane.title = `${sourceLane.title.split(" ")[0]} (${sourceLane.cards.length})`;
+            targetLane.title = `${targetLane.title.split(" ")[0]} (${targetLane.cards.length})`;
+          } else {
+            console.error("Target lane not found for the updated job.");
+          }
+        }
+        // Case 2: Only data has changed
+        else if (isDataChanged && !isLaneChanged) {
+          console.log("Case 2: Only Data Changed");
+          sourceLane.cards[cardIndex] = { ...currentCard, metadata: { ...currentCard.metadata } };
+        }
+        // Case 3: Only the lane has changed
+        else if (!isDataChanged && isLaneChanged) {
+          console.log("Case 3: Only Lane Changed");
+
+          // Remove the card from the source lane
+          const [cardToMove] = sourceLane.cards.splice(cardIndex, 1);
+
+          // Find the target lane based on the new status
+          const targetLane = updatedLanes.find((lane) => lane.id === updatedJob.status);
+          if (targetLane) {
+            targetLane.cards.push(cardToMove);
+            sourceLane.title = `${sourceLane.title.split(" ")[0]} (${sourceLane.cards.length})`;
+            targetLane.title = `${targetLane.title.split(" ")[0]} (${targetLane.cards.length})`;
+          } else {
+            console.error("Target lane not found for the updated job.");
+          }
+        }
+
+        return { lanes: updatedLanes };
+      });
+    },
+    [setBoardLanes]
+  );
+
+  useEffect(() => {
+    // Listen for the job-updated event from the socket
+    if (socket) {
+      socket.on("job-updated", handleJobUpdated);
+
+      return () => {
+        socket.off("job-updated", handleJobUpdated);
+      };
+    }
+  }, [socket, handleJobUpdated]);
+
  useEffect(() => {
    if (associationSettings) {
      setLoading(true);
--- a/client/src/components/production-board-kanban/production-board-kanban.container.jsx
+++ b/client/src/components/production-board-kanban/production-board-kanban.container.jsx
@@ -1,12 +1,8 @@
-import React, { useEffect, useMemo, useRef } from "react";
+import React, { useEffect, useMemo } from "react";
 import { useQuery, useSubscription } from "@apollo/client";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
-} from "../../graphql/jobs.queries";
+import { QUERY_JOBS_IN_PRODUCTION, SUBSCRIPTION_JOBS_IN_PRODUCTION } from "../../graphql/jobs.queries";
 import { QUERY_KANBAN_SETTINGS } from "../../graphql/user.queries";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import ProductionBoardKanbanComponent from "./production-board-kanban.component";
@@ -16,9 +12,7 @@ const mapStateToProps = createStructuredSelector({
  currentUser: selectCurrentUser
 });

-function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionType = "direct" }) {
-  const fired = useRef(false); // useRef to keep track of whether the subscription fired
-
+function ProductionBoardKanbanContainer({ bodyshop, currentUser }) {
  const combinedStatuses = useMemo(
    () => [
      ...bodyshop.md_ro_statuses.production_statuses,
@@ -34,30 +28,23 @@ function ProductionBoardKanbanContainer({ bodyshop, currentUser, subscriptionTyp
    onError: (error) => console.error(`Error fetching jobs in production: ${error.message}`)
  });

-  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION,
-    {
-      onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
-    }
-  );
+  // const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION, {
+  //   onError: (error) => console.error(`Error subscribing to jobs in production: ${error.message}`)
+  // });

  const { loading: associationSettingsLoading, data: associationSettings } = useQuery(QUERY_KANBAN_SETTINGS, {
    variables: { email: currentUser.email },
    onError: (error) => console.error(`Error fetching Kanban settings: ${error.message}`)
  });

+  // This provides us the current version of the Lanes from the Redux store
  // const currentReducerData = useSelector((state) => (state.trello.lanes ? state.trello : {}));

-  useEffect(() => {
-    if (!updatedJobs) {
-      return;
-    }
-    if (!fired.current) {
-      fired.current = true;
-      return;
-    }
-    refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
-  }, [updatedJobs, refetch]);
+  // useEffect(() => {
+  //   if (updatedJobs && data) {
+  //     refetch().catch((err) => console.error(`Error re-fetching jobs in production: ${err.message}`));
+  //   }
+  // }, [updatedJobs, data, refetch]);

  const filteredAssociationSettings = useMemo(() => {
    return associationSettings?.associations[0] || null;
--- a/client/src/components/production-list-columns/production-list-columns.data.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.data.jsx
@@ -298,16 +298,6 @@ const r = ({ technician, state, activeStatuses, data, bodyshop, refetch, treatme
      ellipsis: true,
      sorter: (a, b) => statusSort(a.status, b.status, activeStatuses),
      sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
-      filters:
-        activeStatuses
-          ?.map((s) => {
-            return {
-              text: s || "No Status*",
-              value: [s]
-            };
-          })
-          .sort((a, b) => statusSort(a.text, b.text, activeStatuses)) || [],
-      onFilter: (value, record) => value.includes(record.status),
      render: (text, record) => <ProductionListColumnStatus record={record} />
    },
    {
--- a/client/src/components/production-list-table/production-list-table.container.jsx
+++ b/client/src/components/production-list-table/production-list-table.container.jsx
@@ -4,13 +4,12 @@ import {
  QUERY_EXACT_JOB_IN_PRODUCTION,
  QUERY_EXACT_JOBS_IN_PRODUCTION,
  QUERY_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION,
-  SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW
+  SUBSCRIPTION_JOBS_IN_PRODUCTION
 } from "../../graphql/jobs.queries";
 import ProductionListTable from "./production-list-table.component";
 import _ from "lodash";

-export default function ProductionListTableContainer({ subscriptionType = "direct" }) {
+export default function ProductionListTableContainer() {
  const { refetch, loading, data } = useQuery(QUERY_JOBS_IN_PRODUCTION, {
    pollInterval: 3600000,
    fetchPolicy: "network-only",
@@ -18,9 +17,7 @@ export default function ProductionListTableContainer({ subscriptionType = "direc
  });
  const client = useApolloClient();
  const [joblist, setJoblist] = useState([]);
-  const { data: updatedJobs } = useSubscription(
-    subscriptionType === "view" ? SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW : SUBSCRIPTION_JOBS_IN_PRODUCTION
-  );
+  const { data: updatedJobs } = useSubscription(SUBSCRIPTION_JOBS_IN_PRODUCTION);

  useEffect(() => {
    if (!(data && data.jobs)) return;
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -34,34 +34,28 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
  const [form] = Form.useForm();
  const [search, setSearch] = useState("");
  const {
-    treatments: { Enhanced_Payroll, ADPPayroll }
+    treatments: { Enhanced_Payroll }
  } = useSplitTreatments({
    attributes: {},
-    names: ["Enhanced_Payroll", "ADPPayroll"],
+    names: ["Enhanced_Payroll"],
    splitKey: bodyshop.imexshopid
  });

  const [loading, setLoading] = useState(false);
  const { t } = useTranslation();
  const Templates = TemplateList("report_center");
-  const ReportsList = Object.keys(Templates)
-    .map((key) => Templates[key])
-    .filter((temp) => {
-      const enhancedPayrollOn = Enhanced_Payroll.treatment === "on";
-      const adpPayrollOn = ADPPayroll.treatment === "on";
-
-      if (enhancedPayrollOn && adpPayrollOn) {
-        return temp.enhanced_payroll !== false || temp.adp_payroll !== false;
-      }
-      if (enhancedPayrollOn) {
-        return temp.enhanced_payroll !== false && temp.adp_payroll !== true;
-      }
-      if (adpPayrollOn) {
-        return temp.adp_payroll !== false && temp.enhanced_payroll !== true;
-      }
-
-      return temp.enhanced_payroll !== true && temp.adp_payroll !== true;
-    });
+  const ReportsList =
+    Enhanced_Payroll.treatment === "on"
+      ? Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === true)
+      : Object.keys(Templates)
+          .map((key) => {
+            return Templates[key];
+          })
+          .filter((temp) => temp.enhanced_payroll === undefined || temp.enhanced_payroll === false);

  const { open } = reportCenterModal;

@@ -110,7 +104,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
        to: values.to,
        subject: Templates[values.key]?.subject
      },
-      values.sendbytext === "text" ? values.sendbytext : values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
+      values.sendbyexcel === "excel" ? "x" : values.sendby === "email" ? "e" : "p",
      id
    );
    setLoading(false);
@@ -297,15 +291,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
                  </Radio.Group>
                </Form.Item>
              );
-            if (reporttype === "text")
-              return (
-                <Form.Item label={t("general.labels.sendby")} name="sendbytext" initialValue="text">
-                  <Radio.Group>
-                    <Radio value="text">{t("general.labels.text")}</Radio>
-                  </Radio.Group>
-                </Form.Item>
-              );
-            if (reporttype !== "excel" || reporttype !== "text")
+            if (reporttype !== "excel")
              return (
                <Form.Item label={t("general.labels.sendby")} name="sendby" initialValue="print">
                  <Radio.Group>
--- a/client/src/components/schedule-calendar-wrapper/localizer.js
+++ b/client/src/components/schedule-calendar-wrapper/localizer.js
@@ -1,505 +0,0 @@
-import isBetween from "dayjs/plugin/isBetween";
-import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
-import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
-import localeData from "dayjs/plugin/localeData";
-import localizedFormat from "dayjs/plugin/localizedFormat";
-import minMax from "dayjs/plugin/minMax";
-import utc from "dayjs/plugin/utc";
-import { DateLocalizer } from "react-big-calendar";
-
-function arrayWithHoles(arr) {
-  if (Array.isArray(arr)) return arr;
-}
-
-function iterableToArrayLimit(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
-  var _arr = [];
-  var _n = true;
-  var _d = false;
-  var _e = undefined;
-  try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-      _arr.push(_s.value);
-      if (i && _arr.length === i) break;
-    }
-  } catch (err) {
-    _d = true;
-    _e = err;
-  } finally {
-    try {
-      if (!_n && _i["return"] != null) _i["return"]();
-    } finally {
-      if (_d) throw _e;
-    }
-  }
-  return _arr;
-}
-
-function unsupportedIterableToArray(o, minLen) {
-  if (!o) return;
-  if (typeof o === "string") return arrayLikeToArray(o, minLen);
-  var n = Object.prototype.toString.call(o).slice(8, -1);
-  if (n === "Object" && o.constructor) n = o.constructor.name;
-  if (n === "Map" || n === "Set") return Array.from(o);
-  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return arrayLikeToArray(o, minLen);
-}
-
-function arrayLikeToArray(arr, len) {
-  if (len == null || len > arr.length) len = arr.length;
-  for (var i = 0, arr2 = new Array(len); i < len; i++) {
-    arr2[i] = arr[i];
-  }
-  return arr2;
-}
-
-function nonIterableRest() {
-  throw new TypeError(
-    "Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."
-  );
-}
-
-function _slicedToArray(arr, i) {
-  return arrayWithHoles(arr) || iterableToArrayLimit(arr, i) || unsupportedIterableToArray(arr, i) || nonIterableRest();
-}
-
-function fixUnit(unit) {
-  var datePart = unit ? unit.toLowerCase() : unit;
-  if (datePart === "FullYear") {
-    datePart = "year";
-  } else if (!datePart) {
-    datePart = undefined;
-  }
-  return datePart;
-}
-
-var timeRangeFormat = function timeRangeFormat(_ref3, culture, local) {
-  var start = _ref3.start,
-    end = _ref3.end;
-  return local.format(start, "LT", culture) + " – " + local.format(end, "LT", culture);
-};
-var timeRangeStartFormat = function timeRangeStartFormat(_ref4, culture, local) {
-  var start = _ref4.start;
-  return local.format(start, "LT", culture) + " – ";
-};
-var timeRangeEndFormat = function timeRangeEndFormat(_ref5, culture, local) {
-  var end = _ref5.end;
-  return " – " + local.format(end, "LT", culture);
-};
-var weekRangeFormat = function weekRangeFormat(_ref, culture, local) {
-  var start = _ref.start,
-    end = _ref.end;
-  return (
-    local.format(start, "MMMM DD", culture) +
-    " – " +
-    // updated to use this localizer 'eq()' method
-    local.format(end, local.eq(start, end, "month") ? "DD" : "MMMM DD", culture)
-  );
-};
-var dateRangeFormat = function dateRangeFormat(_ref2, culture, local) {
-  var start = _ref2.start,
-    end = _ref2.end;
-  return local.format(start, "L", culture) + " – " + local.format(end, "L", culture);
-};
-
-var formats = {
-  dateFormat: "DD",
-  dayFormat: "DD ddd",
-  weekdayFormat: "ddd",
-  selectRangeFormat: timeRangeFormat,
-  eventTimeRangeFormat: timeRangeFormat,
-  eventTimeRangeStartFormat: timeRangeStartFormat,
-  eventTimeRangeEndFormat: timeRangeEndFormat,
-  timeGutterFormat: "LT",
-  monthHeaderFormat: "MMMM YYYY",
-  dayHeaderFormat: "dddd MMM DD",
-  dayRangeHeaderFormat: weekRangeFormat,
-  agendaHeaderFormat: dateRangeFormat,
-  agendaDateFormat: "ddd MMM DD",
-  agendaTimeFormat: "LT",
-  agendaTimeRangeFormat: timeRangeFormat
-};
-
-const localizer = (dayjsLib) => {
-  // load dayjs plugins
-  dayjsLib.extend(isBetween);
-  dayjsLib.extend(isSameOrAfter);
-  dayjsLib.extend(isSameOrBefore);
-  dayjsLib.extend(localeData);
-  dayjsLib.extend(localizedFormat);
-  dayjsLib.extend(minMax);
-  dayjsLib.extend(utc);
-  var locale = function locale(dj, c) {
-    return c ? dj.locale(c) : dj;
-  };
-
-  // if the timezone plugin is loaded,
-  // then use the timezone aware version
-
-  //TODO This was the issue entirely...
-  //  var dayjs = dayjsLib.tz ? dayjsLib.tz : dayjsLib;
-  var dayjs = dayjsLib;
-
-  function getTimezoneOffset(date) {
-    // ensures this gets cast to timezone
-    return dayjs(date).toDate().getTimezoneOffset();
-  }
-
-  function getDstOffset(start, end) {
-    var _st$tz$$x$$timezone;
-    // convert to dayjs, in case
-    var st = dayjs(start);
-    var ed = dayjs(end);
-    // if not using the dayjs timezone plugin
-    if (!dayjs.tz) {
-      return st.toDate().getTimezoneOffset() - ed.toDate().getTimezoneOffset();
-    }
-    /**
-     * If a default timezone has been applied, then
-     * use this to get the proper timezone offset, otherwise default
-     * the timezone to the browser local
-     */
-    var tzName =
-      (_st$tz$$x$$timezone = st.tz().$x.$timezone) !== null && _st$tz$$x$$timezone !== void 0
-        ? _st$tz$$x$$timezone
-        : dayjsLib.tz.guess();
-    // invert offsets to be inline with moment.js
-    var startOffset = -dayjs.tz(+st, tzName).utcOffset();
-    var endOffset = -dayjs.tz(+ed, tzName).utcOffset();
-    return startOffset - endOffset;
-  }
-
-  function getDayStartDstOffset(start) {
-    var dayStart = dayjs(start).startOf("day");
-    return getDstOffset(dayStart, start);
-  }
-
-  /*** BEGIN localized date arithmetic methods with dayjs ***/
-  function defineComparators(a, b, unit) {
-    var datePart = fixUnit(unit);
-    var dtA = datePart ? dayjs(a).startOf(datePart) : dayjs(a);
-    var dtB = datePart ? dayjs(b).startOf(datePart) : dayjs(b);
-    return [dtA, dtB, datePart];
-  }
-
-  function startOf() {
-    var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    var unit = arguments.length > 1 ? arguments[1] : undefined;
-    var datePart = fixUnit(unit);
-    if (datePart) {
-      return dayjs(date).startOf(datePart).toDate();
-    }
-    return dayjs(date).toDate();
-  }
-
-  function endOf() {
-    var date = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
-    var unit = arguments.length > 1 ? arguments[1] : undefined;
-    var datePart = fixUnit(unit);
-    if (datePart) {
-      return dayjs(date).endOf(datePart).toDate();
-    }
-    return dayjs(date).toDate();
-  }
-
-  // dayjs comparison operations *always* convert both sides to dayjs objects
-  // prior to running the comparisons
-  function eq(a, b, unit) {
-    var _defineComparators = defineComparators(a, b, unit),
-      _defineComparators2 = _slicedToArray(_defineComparators, 3),
-      dtA = _defineComparators2[0],
-      dtB = _defineComparators2[1],
-      datePart = _defineComparators2[2];
-    return dtA.isSame(dtB, datePart);
-  }
-
-  function neq(a, b, unit) {
-    return !eq(a, b, unit);
-  }
-
-  function gt(a, b, unit) {
-    var _defineComparators3 = defineComparators(a, b, unit),
-      _defineComparators4 = _slicedToArray(_defineComparators3, 3),
-      dtA = _defineComparators4[0],
-      dtB = _defineComparators4[1],
-      datePart = _defineComparators4[2];
-    return dtA.isAfter(dtB, datePart);
-  }
-
-  function lt(a, b, unit) {
-    var _defineComparators5 = defineComparators(a, b, unit),
-      _defineComparators6 = _slicedToArray(_defineComparators5, 3),
-      dtA = _defineComparators6[0],
-      dtB = _defineComparators6[1],
-      datePart = _defineComparators6[2];
-    return dtA.isBefore(dtB, datePart);
-  }
-
-  function gte(a, b, unit) {
-    var _defineComparators7 = defineComparators(a, b, unit),
-      _defineComparators8 = _slicedToArray(_defineComparators7, 3),
-      dtA = _defineComparators8[0],
-      dtB = _defineComparators8[1],
-      datePart = _defineComparators8[2];
-    return dtA.isSameOrBefore(dtB, datePart);
-  }
-
-  function lte(a, b, unit) {
-    var _defineComparators9 = defineComparators(a, b, unit),
-      _defineComparators10 = _slicedToArray(_defineComparators9, 3),
-      dtA = _defineComparators10[0],
-      dtB = _defineComparators10[1],
-      datePart = _defineComparators10[2];
-    return dtA.isSameOrBefore(dtB, datePart);
-  }
-
-  function inRange(day, min, max) {
-    var unit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : "day";
-    var datePart = fixUnit(unit);
-    var djDay = dayjs(day);
-    var djMin = dayjs(min);
-    var djMax = dayjs(max);
-    return djDay.isBetween(djMin, djMax, datePart, "[]");
-  }
-
-  function min(dateA, dateB) {
-    var dtA = dayjs(dateA);
-    var dtB = dayjs(dateB);
-    var minDt = dayjsLib.min(dtA, dtB);
-    return minDt.toDate();
-  }
-
-  function max(dateA, dateB) {
-    var dtA = dayjs(dateA);
-    var dtB = dayjs(dateB);
-    var maxDt = dayjsLib.max(dtA, dtB);
-    return maxDt.toDate();
-  }
-
-  function merge(date, time) {
-    if (!date && !time) return null;
-    var tm = dayjs(time).format("HH:mm:ss");
-    var dt = dayjs(date).startOf("day").format("MM/DD/YYYY");
-    // We do it this way to avoid issues when timezone switching
-    return dayjsLib("".concat(dt, " ").concat(tm), "MM/DD/YYYY HH:mm:ss").toDate();
-  }
-
-  function add(date, adder, unit) {
-    var datePart = fixUnit(unit);
-    return dayjs(date).add(adder, datePart).toDate();
-  }
-
-  function range(start, end) {
-    var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "day";
-    var datePart = fixUnit(unit);
-    // because the add method will put these in tz, we have to start that way
-    var current = dayjs(start).toDate();
-    var days = [];
-    while (lte(current, end)) {
-      days.push(current);
-      current = add(current, 1, datePart);
-    }
-    return days;
-  }
-
-  function ceil(date, unit) {
-    var datePart = fixUnit(unit);
-    var floor = startOf(date, datePart);
-    return eq(floor, date) ? floor : add(floor, 1, datePart);
-  }
-
-  function diff(a, b) {
-    var unit = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "day";
-    var datePart = fixUnit(unit);
-    // don't use 'defineComparators' here, as we don't want to mutate the values
-    var dtA = dayjs(a);
-    var dtB = dayjs(b);
-    return dtB.diff(dtA, datePart);
-  }
-
-  function minutes(date) {
-    var dt = dayjs(date);
-    return dt.minutes();
-  }
-
-  function firstOfWeek(culture) {
-    var data = culture ? dayjsLib.localeData(culture) : dayjsLib.localeData();
-    return data ? data.firstDayOfWeek() : 0;
-  }
-
-  function firstVisibleDay(date) {
-    return dayjs(date).startOf("month").startOf("week").toDate();
-  }
-
-  function lastVisibleDay(date) {
-    return dayjs(date).endOf("month").endOf("week").toDate();
-  }
-
-  function visibleDays(date) {
-    var current = firstVisibleDay(date);
-    var last = lastVisibleDay(date);
-    var days = [];
-    while (lte(current, last)) {
-      days.push(current);
-      current = add(current, 1, "d");
-    }
-    return days;
-  }
-
-  /*** END localized date arithmetic methods with dayjs ***/
-
-  /**
-   * Moved from TimeSlots.js, this method overrides the method of the same name
-   * in the localizer.js, using dayjs to construct the js Date
-   * @param {Date} dt - date to start with
-   * @param {Number} minutesFromMidnight
-   * @param {Number} offset
-   * @returns {Date}
-   */
-  function getSlotDate(dt, minutesFromMidnight, offset) {
-    return dayjs(dt)
-      .startOf("day")
-      .minute(minutesFromMidnight + offset)
-      .toDate();
-  }
-
-  // dayjs will automatically handle DST differences in it's calculations
-  function getTotalMin(start, end) {
-    return diff(start, end, "minutes");
-  }
-
-  function getMinutesFromMidnight(start) {
-    var dayStart = dayjs(start).startOf("day");
-    var day = dayjs(start);
-    return day.diff(dayStart, "minutes") + getDayStartDstOffset(start);
-  }
-
-  // These two are used by DateSlotMetrics
-  function continuesPrior(start, first) {
-    var djStart = dayjs(start);
-    var djFirst = dayjs(first);
-    return djStart.isBefore(djFirst, "day");
-  }
-
-  function continuesAfter(start, end, last) {
-    var djEnd = dayjs(end);
-    var djLast = dayjs(last);
-    return djEnd.isSameOrAfter(djLast, "minutes");
-  }
-
-  function daySpan(start, end) {
-    var startDay = dayjs(start);
-    var endDay = dayjs(end);
-    return endDay.diff(startDay, "day");
-  }
-
-  // These two are used by eventLevels
-  function sortEvents(_ref6) {
-    var _ref6$evtA = _ref6.evtA,
-      aStart = _ref6$evtA.start,
-      aEnd = _ref6$evtA.end,
-      aAllDay = _ref6$evtA.allDay,
-      _ref6$evtB = _ref6.evtB,
-      bStart = _ref6$evtB.start,
-      bEnd = _ref6$evtB.end,
-      bAllDay = _ref6$evtB.allDay;
-    var startSort = +startOf(aStart, "day") - +startOf(bStart, "day");
-    var durA = daySpan(aStart, aEnd);
-    var durB = daySpan(bStart, bEnd);
-    return (
-      startSort ||
-      // sort by start Day first
-      durB - durA ||
-      // events spanning multiple days go first
-      !!bAllDay - !!aAllDay ||
-      // then allDay single day events
-      +aStart - +bStart ||
-      // then sort by start time *don't need dayjs conversion here
-      +aEnd - +bEnd // then sort by end time *don't need dayjs conversion here either
-    );
-  }
-
-  function inEventRange(_ref7) {
-    var _ref7$event = _ref7.event,
-      start = _ref7$event.start,
-      end = _ref7$event.end,
-      _ref7$range = _ref7.range,
-      rangeStart = _ref7$range.start,
-      rangeEnd = _ref7$range.end;
-    var startOfDay = dayjs(start).startOf("day");
-    var eEnd = dayjs(end);
-    var rStart = dayjs(rangeStart);
-    var rEnd = dayjs(rangeEnd);
-    var startsBeforeEnd = startOfDay.isSameOrBefore(rEnd, "day");
-    // when the event is zero duration we need to handle a bit differently
-    var sameMin = !startOfDay.isSame(eEnd, "minutes");
-    var endsAfterStart = sameMin ? eEnd.isAfter(rStart, "minutes") : eEnd.isSameOrAfter(rStart, "minutes");
-    return startsBeforeEnd && endsAfterStart;
-  }
-
-  function isSameDate(date1, date2) {
-    var dt = dayjs(date1);
-    var dt2 = dayjs(date2);
-    return dt.isSame(dt2, "day");
-  }
-
-  /**
-   * This method, called once in the localizer constructor, is used by eventLevels
-   * 'eventSegments()' to assist in determining the 'span' of the event in the display,
-   * specifically when using a timezone that is greater than the browser native timezone.
-   * @returns number
-   */
-  function browserTZOffset() {
-    /**
-     * Date.prototype.getTimezoneOffset horrifically flips the positive/negative from
-     * what you see in it's string, so we have to jump through some hoops to get a value
-     * we can actually compare.
-     */
-    var dt = new Date();
-    var neg = /-/.test(dt.toString()) ? "-" : "";
-    var dtOffset = dt.getTimezoneOffset();
-    var comparator = Number("".concat(neg).concat(Math.abs(dtOffset)));
-    // dayjs correctly provides positive/negative offset, as expected
-    var mtOffset = dayjs().utcOffset();
-    return mtOffset > comparator ? 1 : 0;
-  }
-
-  return new DateLocalizer({
-    formats: formats,
-    firstOfWeek: firstOfWeek,
-    firstVisibleDay: firstVisibleDay,
-    lastVisibleDay: lastVisibleDay,
-    visibleDays: visibleDays,
-    format: function format(value, _format, culture) {
-      return locale(dayjs(value), culture).format(_format);
-    },
-    lt: lt,
-    lte: lte,
-    gt: gt,
-    gte: gte,
-    eq: eq,
-    neq: neq,
-    merge: merge,
-    inRange: inRange,
-    startOf: startOf,
-    endOf: endOf,
-    range: range,
-    add: add,
-    diff: diff,
-    ceil: ceil,
-    min: min,
-    max: max,
-    minutes: minutes,
-    getSlotDate: getSlotDate,
-    getTimezoneOffset: getTimezoneOffset,
-    getDstOffset: getDstOffset,
-    getTotalMin: getTotalMin,
-    getMinutesFromMidnight: getMinutesFromMidnight,
-    continuesPrior: continuesPrior,
-    continuesAfter: continuesAfter,
-    sortEvents: sortEvents,
-    inEventRange: inEventRange,
-    isSameDate: isSameDate,
-    browserTZOffset: browserTZOffset
-  });
-};
-export default localizer;
--- a/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
+++ b/client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
@@ -1,7 +1,7 @@
 import dayjs from "../../utils/day";
 import queryString from "query-string";
 import React from "react";
-import { Calendar } from "react-big-calendar";
+import { Calendar, dayjsLocalizer } from "react-big-calendar";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
@@ -14,13 +14,12 @@ import { selectProblemJobs } from "../../redux/application/application.selectors
 import { Alert, Collapse, Space } from "antd";
 import { Trans, useTranslation } from "react-i18next";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import local from "./localizer";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  problemJobs: selectProblemJobs
 });
-const localizer = local(dayjs);
+const localizer = dayjsLocalizer(dayjs);

 export function ScheduleCalendarWrapperComponent({
  bodyshop,
--- a/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js
+++ b/client/src/components/scoreboard-targets-table/scoreboard-targets-table.util.js
@@ -4,7 +4,7 @@ export const CalculateWorkingDaysThisMonth = () => dayjs().endOf("month").busine

 export const CalculateWorkingDaysInPeriod = (start, end) => dayjs(end).businessDiff(dayjs(start));

-export const CalculateWorkingDaysAsOfToday = () => dayjs().endOf("day").businessDiff(dayjs().startOf("month"));
+export const CalculateWorkingDaysAsOfToday = () => dayjs().businessDaysInMonth().length;

 export const CalculateWorkingDaysLastMonth = () =>
  dayjs().subtract(1, "month").endOf("month").businessDaysInMonth().length;
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -20,7 +20,6 @@ import ShopInfoTaskPresets from "./shop-info.task-presets.component";
 import queryString from "query-string";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import ShopInfoRoGuard from "./shop-info.roguard.component";
-import ShopInfoIntellipay from "./shop-intellipay-config.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -136,17 +135,6 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
      ],
      rome: "USE_IMEX",
      promanager: []
-    }),
-    ...InstanceRenderManager({
-      imex: [],
-      rome: [
-        {
-          key: "intellipay",
-          label: t("bodyshop.labels.intellipay"),
-          children: <ShopInfoIntellipay form={form} />
-        }
-      ],
-      promanager: []
    })
  ];
  return (
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -7,13 +7,13 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DatePickerRanges from "../../utils/DatePickerRanges";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 // TODO: Client Update, this might break
 const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
@@ -28,10 +28,10 @@ export function ShopInfoGeneral({ form, bodyshop }) {
  const { t } = useTranslation();

  const {
-    treatments: { ClosingPeriod, ADPPayroll }
+    treatments: { ClosingPeriod }
  } = useSplitTreatments({
    attributes: {},
-    names: ["ClosingPeriod", "ADPPayroll"],
+    names: ["ClosingPeriod"],
    splitKey: bodyshop && bodyshop.imexshopid
  });

@@ -98,6 +98,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
        <Form.Item label={t("bodyshop.fields.email")} name="email">
          <Input />
        </Form.Item>
+
        <Form.Item
          label={t("bodyshop.fields.phone")}
          name="phone"
@@ -355,22 +356,14 @@ export function ShopInfoGeneral({ form, bodyshop }) {
            <Select mode="tags" />
          </Form.Item>
          {ClosingPeriod.treatment === "on" && (
-            <Form.Item
-              name={["accountingconfig", "ClosingPeriod"]}
-              label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-            >
-              <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-            </Form.Item>
-          )}
-          {ADPPayroll.treatment === "on" && (
-            <Form.Item name={["accountingconfig", "companyCode"]} label={t("bodyshop.fields.companycode")}>
-              <Input />
-            </Form.Item>
-          )}
-          {ADPPayroll.treatment === "on" && (
-            <Form.Item name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
-              <Input />
-            </Form.Item>
+            <>
+              <Form.Item
+                name={["accountingconfig", "ClosingPeriod"]}
+                label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+              >
+                <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+              </Form.Item>
+            </>
          )}
        </LayoutFormRow>
      </FeatureWrapper>
--- a/client/src/components/shop-info/shop-intellipay-config.component.jsx
+++ b/client/src/components/shop-info/shop-intellipay-config.component.jsx
@@ -1,54 +0,0 @@
-import { Alert, Form, InputNumber, Switch } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoIntellipay);
-
-export function ShopInfoIntellipay({ bodyshop, form }) {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <Form.Item dependencies={[["intellipay_config", "enable_cash_discount"]]}>
-        {() => {
-          const { intellipay_config } = form.getFieldsValue();
-
-          if (intellipay_config?.enable_cash_discount)
-            return <Alert message={t("bodyshop.labels.intellipay_cash_discount")} />;
-        }}
-      </Form.Item>
-
-      <LayoutFormRow noDivider>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.enable_cash_discount")}
-          valuePropName="checked"
-          name={["intellipay_config", "enable_cash_discount"]}
-        >
-          <Switch />
-        </Form.Item>
-        <Form.Item
-          label={t("bodyshop.fields.intellipay_config.cash_discount_percentage")}
-          valuePropName="checked"
-          dependencies={[["intellipay_config", "enable_cash_discount"]]}
-          name={["intellipay_config", "cash_discount_percentage"]}
-          rules={[
-            ({ getFieldsValue }) => ({ required: form.getFieldValue(["intellipay_config", "enable_cash_discount"]) })
-          ]}
-        >
-          <InputNumber min={0} max={100} precision={1} suffix='%'/>
-        </Form.Item>
-      </LayoutFormRow>
-    </>
-  );
-}
--- a/client/src/components/update-alert/update-alert.component.jsx
+++ b/client/src/components/update-alert/update-alert.component.jsx
@@ -1,14 +1,13 @@
 import { AlertOutlined } from "@ant-design/icons";
-import { Alert, Button, Col, notification, Row, Space } from "antd";
+import { Alert, Button, Col, Row, Space } from "antd";
 import i18n from "i18next";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectUpdateAvailable } from "../../redux/application/application.selectors";
 import { useRegisterSW } from "virtual:pwa-register/react";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import useCountDown from "../../utils/countdownHook";

 const mapStateToProps = createStructuredSelector({
  updateAvailable: selectUpdateAvailable
@@ -20,15 +19,6 @@ const mapDispatchToProps = (dispatch) => ({

 export function UpdateAlert({ updateAvailable }) {
  const { t } = useTranslation();
-  const [timerStarted, setTimerStarted] = useState(false);
-  const [loading, setLoading] = useState(false);
-  const [
-    timeLeft,
-    {
-      start //pause, resume, reset
-    }
-  ] = useCountDown(180000, 1000);
-
  const {
    offlineReady: [offlineReady],
    needRefresh: [needRefresh],
@@ -50,43 +40,11 @@ export function UpdateAlert({ updateAvailable }) {
    }
  });

-  const ReloadNewVersion = useCallback(() => {
-    setLoading(true);
-    updateServiceWorker(true);
-    setTimeout(() => {
-      window.location.reload(true);
-    }, 5000);
-  }, [updateServiceWorker]);
-
  useEffect(() => {
-    if (needRefresh) {
-      start();
-      setTimerStarted(true);
+    if (import.meta.env.DEV) {
+      console.log(`SW Status => Refresh? ${needRefresh} - offlineReady? ${offlineReady}`);
    }
-  }, [start, needRefresh, offlineReady]);
-
-  useEffect(() => {
-    if (needRefresh && timerStarted && timeLeft < 60000) {
-      notification.open({
-        type: "warning",
-        closable: false,
-        duration: 65000,
-        key: "autoupdate",
-        message: t("general.actions.autoupdate", {
-          time: (timeLeft / 1000).toFixed(0),
-          app: InstanceRenderManager({
-            imex: "$t(titles.imexonline)",
-            rome: "$t(titles.romeonline)",
-            promanager: "$t(titles.promanager)"
-          })
-        }),
-        placement: "bottomRight"
-      });
-    }
-    if (needRefresh && timerStarted && timeLeft <= 0) {
-      ReloadNewVersion();
-    }
-  }, [timeLeft, t, needRefresh, ReloadNewVersion, timerStarted]);
+  }, [needRefresh, offlineReady]);

  if (!needRefresh) return null;

@@ -117,10 +75,9 @@ export function UpdateAlert({ updateAvailable }) {
              <Button onClick={() => window.open("https://imex-online.noticeable.news/", "_blank")}>
                {i18n.t("general.actions.viewreleasenotes")}
              </Button>
-              <Button loading={loading} type="primary" onClick={() => ReloadNewVersion()}>
-                {i18n.t("general.actions.refresh")} {`(${(timeLeft / 1000).toFixed(0)} s)`}
+              <Button type="primary" onClick={() => updateServiceWorker(true)}>
+                {i18n.t("general.actions.refresh")}
              </Button>
-              <Button onClick={() => start(300000)}>{i18n.t("general.actions.delay")}</Button>
            </Space>
          </Col>
        </Row>
--- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx
+++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx
@@ -5,7 +5,7 @@ import PhoneNumberFormatter from "../../utils/PhoneFormatter";

 const { Option } = Select;

-// To be used as a form element only.
+//To be used as a form element only.

 const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, preferredMake, showPhone }, ref) => {
  const [option, setOption] = useState(value);
@@ -33,25 +33,9 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
        if (!value || !options) return label;
        const discount = options?.find((o) => o.id === value)?.discount;
        return (
-          <div
-            style={{
-              display: "flex",
-              alignItems: "center",
-              flexWrap: "nowrap",
-              width: "100%"
-            }}
-          >
-            <div
-              style={{
-                flex: 1,
-                minWidth: 0,
-                overflow: "hidden",
-                textOverflow: "ellipsis",
-                whiteSpace: "nowrap"
-              }}
-            >
-              {label}
-            </div>
+          <div className="imex-flex-row" style={{ width: "100%" }}>
+            <div style={{ flex: 1 }}>{label}</div>
+
            {discount && discount !== 0 ? <Tag color="green">{`${discount * 100}%`}</Tag> : null}
          </div>
        );
@@ -61,67 +45,36 @@ const VendorSearchSelect = ({ value, onChange, options, onSelect, disabled, pref
      optionFilterProp="name"
      onSelect={onSelect}
      disabled={disabled || false}
-      optionLabelProp="name"
+      optionLabelProp={"name"}
    >
-      {favorites &&
-        favorites.map((o) => (
-          <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
-            <div
-              style={{
-                display: "flex",
-                alignItems: "center",
-                flexWrap: "nowrap",
-                width: "100%"
-              }}
-            >
-              <div
-                style={{
-                  flex: 1,
-                  minWidth: 0,
-                  overflow: "hidden",
-                  textOverflow: "ellipsis",
-                  whiteSpace: "nowrap"
-                }}
-              >
-                {o.name}
+      {favorites
+        ? favorites.map((o) => (
+            <Option key={`favorite-${o.id}`} value={o.id} name={o.name} discount={o.discount}>
+              <div className="imex-flex-row">
+                <div style={{ flex: 1 }}>{o.name}</div>
+                <Space style={{ marginLeft: "1rem" }}>
+                  <HeartOutlined style={{ color: "red" }} />
+                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+                </Space>
              </div>
-              <Space style={{ marginLeft: "1rem" }}>
-                <HeartOutlined style={{ color: "red" }} />
-                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-              </Space>
-            </div>
-          </Option>
-        ))}
-      {options &&
-        options.map((o) => (
-          <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
-            <div
-              style={{
-                display: "flex",
-                alignItems: "center",
-                flexWrap: "nowrap",
-                width: "100%"
-              }}
-            >
-              <div
-                style={{
-                  flex: 1,
-                  minWidth: 0,
-                  overflow: "hidden",
-                  textOverflow: "ellipsis",
-                  whiteSpace: "nowrap"
-                }}
-              >
-                {o.name}
+            </Option>
+          ))
+        : null}
+      {options
+        ? options.map((o) => (
+            <Option key={o.id} value={o.id} name={o.name} discount={o.discount}>
+              <div className="imex-flex-row" style={{ width: "100%" }}>
+                <div style={{ flex: 1 }}>{o.name}</div>
+
+                <Space style={{ marginLeft: "1rem" }}>
+                  {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
+                  {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
+                </Space>
              </div>
-              <Space style={{ marginLeft: "1rem" }}>
-                {o.phone && showPhone && <PhoneNumberFormatter>{o.phone}</PhoneNumberFormatter>}
-                {o.discount && o.discount !== 0 ? <Tag color="green">{`${o.discount * 100}%`}</Tag> : null}
-              </Space>
-            </div>
-          </Option>
-        ))}
+            </Option>
+          ))
+        : null}
    </Select>
  );
 };
--- a/client/src/contexts/SocketIO/socketContext.jsx
+++ b/client/src/contexts/SocketIO/socketContext.jsx
@@ -0,0 +1,13 @@
+import React, { createContext } from "react";
+import useSocket from "./useSocket"; // Import the custom hook
+
+// Create the SocketContext
+const SocketContext = createContext(null);
+
+export const SocketProvider = ({ children, bodyshop }) => {
+  const { socket, clientId } = useSocket(bodyshop);
+
+  return <SocketContext.Provider value={{ socket, clientId }}> {children}</SocketContext.Provider>;
+};
+
+export default SocketContext;
--- a/client/src/contexts/SocketIO/useSocket.js
+++ b/client/src/contexts/SocketIO/useSocket.js
@@ -0,0 +1,75 @@
+import { useEffect, useState } from "react";
+import SocketIO from "socket.io-client";
+import { auth } from "../../firebase/firebase.utils";
+
+const useSocket = (bodyshop) => {
+  const [socket, setSocket] = useState(null);
+  const [clientId, setClientId] = useState(null); // State to store unique identifier
+
+  useEffect(() => {
+    const handleBodyshopMessage = (message) => {
+      console.log(`Received message for bodyshop ${bodyshop.id}:`, message);
+    };
+
+    if (bodyshop && bodyshop.id) {
+      const endpoint = import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "https://localhost:3000";
+
+      const socketInstance = SocketIO(endpoint, {
+        path: "/ws", // Ensure this matches the Vite proxy and backend path
+        withCredentials: true,
+        auth: async (callback) => {
+          const token = auth.currentUser && (await auth.currentUser.getIdToken());
+          callback({ token });
+        },
+        reconnectionAttempts: Infinity, // Try reconnecting forever
+        reconnectionDelay: 2000, // How long to wait between reconnection attempts
+        reconnectionDelayMax: 10000 // Maximum delay between attempts
+      });
+
+      setSocket(socketInstance);
+
+      // When the socket connects or reconnects, join the bodyshop room
+      const joinRoomOnConnect = () => {
+        console.log("Socket connected:", socketInstance.id);
+        setClientId(socketInstance.id);
+
+        if (bodyshop.id) {
+          socketInstance.emit("join-bodyshop-room", bodyshop.id);
+          console.log(`Joined bodyshop room: ${bodyshop.id}`);
+        }
+      };
+
+      // Set up the necessary socket event handlers
+      socketInstance.on("connect", joinRoomOnConnect);
+
+      socketInstance.on("reconnect", (attempt) => {
+        console.log(`Socket reconnected after ${attempt} attempts`);
+      });
+
+      socketInstance.on("bodyshop-message", handleBodyshopMessage);
+
+      socketInstance.on("connect_error", (err) => {
+        console.error("Socket connection error:", err);
+      });
+
+      socketInstance.on("disconnect", () => {
+        console.log("Socket disconnected");
+      });
+
+      // Clean up on component unmount or when bodyshop changes
+      return () => {
+        if (bodyshop?.id) {
+          socketInstance.emit("leave-bodyshop-room", bodyshop.id);
+        }
+        socketInstance.off("connect", joinRoomOnConnect);
+        socketInstance.off("bodyshop-message", handleBodyshopMessage);
+        socketInstance.disconnect();
+      };
+    }
+  }, [bodyshop]);
+
+  // Return both socket and clientId
+  return { socket, clientId };
+};
+
+export default useSocket;
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -87,7 +87,7 @@ export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
    operationName: eventName,
    variables: additionalParams,
    dbevent: false,
-    env: `master-AIO|${import.meta.env.VITE_APP_GIT_SHA_DATE}`
+    env: "master"
  });
  // console.log(
  //   "%c[Analytics]",
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -138,8 +138,7 @@ export const QUERY_BODYSHOP = gql`
      tt_enforce_hours_for_tech_console
      md_tasks_presets
      use_paint_scale_data
-      intellipay_config
-      md_ro_guard
+            md_ro_guard
      employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
        id
        name
@@ -267,8 +266,7 @@ export const UPDATE_SHOP = gql`
        enforce_conversion_category
        tt_enforce_hours_for_tech_console
        md_tasks_presets
-        intellipay_config
-        md_ro_guard
+                md_ro_guard
        employee_teams(order_by: { name: asc }, where: { active: { _eq: true } }) {
          id
          name
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -2461,14 +2461,6 @@ export const SUBSCRIPTION_JOBS_IN_PRODUCTION = gql`
    }
  }
 `;
-export const SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW = gql`
-  subscription SUBSCRIPTION_JOBS_IN_PRODUCTION_VIEW {
-    jobs: jobs_inproduction {
-      id
-      updated_at
-    }
-  }
-`;

 export const QUERY_JOBS_IN_PRODUCTION = gql`
  query QUERY_JOBS_IN_PRODUCTION {
--- a/client/src/pages/dms-payables/dms-payables.container.jsx
+++ b/client/src/pages/dms-payables/dms-payables.container.jsx
@@ -1,20 +1,16 @@
 import { Button, Card, Col, notification, Row, Select, Space } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import SocketIO from "socket.io-client";
 import DmsAllocationsSummaryApComponent from "../../components/dms-allocations-summary-ap/dms-allocations-summary-ap.component";
 import DmsLogEvents from "../../components/dms-log-events/dms-log-events.component";
-import { auth } from "../../firebase/firebase.utils";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import SocketContext from "../../contexts/SocketIO/socketContext";

-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
+const mapStateToProps = createStructuredSelector({});

 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -23,20 +19,9 @@ const mapDispatchToProps = (dispatch) => ({

 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);

-export const socket = SocketIO(
-  import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : window.location.origin,
-  {
-    path: "/ws",
-    withCredentials: true,
-    auth: async (callback) => {
-      const token = auth.currentUser && (await auth.currentUser.getIdToken());
-      callback({ token });
-    }
-  }
-);
-
-export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+export function DmsContainer({ setBreadcrumbs, setSelectedHeader }) {
  const { t } = useTranslation();
+  const { socket } = useContext(SocketContext);
  const [logLevel, setLogLevel] = useState("DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
@@ -67,40 +52,43 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
  }, [t, setBreadcrumbs, setSelectedHeader]);

  useEffect(() => {
-    socket.on("connect", () => socket.emit("set-log-level", logLevel));
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
+    if (socket) {
+      const handleConnect = () => socket.emit("set-log-level", logLevel);
+      const handleReconnect = () => {
+        setLogs((logs) => [
          ...logs,
          {
            timestamp: new Date(),
            level: "WARNING",
            message: "Reconnected to CDK Export Service"
          }
-        ];
-      });
-    });
+        ]);
+      };
+      const handleLogEvent = (payload) => {
+        setLogs((logs) => [...logs, payload]);
+      };
+      const handleExportComplete = () => {
+        notification.open({
+          type: "success",
+          message: t("jobs.labels.dms.apexported")
+        });
+      };

-    socket.on("log-event", (payload) => {
-      setLogs((logs) => {
-        return [...logs, payload];
-      });
-    });
+      socket.on("connect", handleConnect);
+      socket.on("reconnect", handleReconnect);
+      socket.on("log-event", handleLogEvent);
+      socket.on("ap-export-complete", handleExportComplete);

-    socket.on("ap-export-complete", (payload) => {
-      notification.open({
-        type: "success",
-        message: t("jobs.labels.dms.apexported")
-      });
-    });
+      if (socket.disconnected) socket.connect();

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeAllListeners();
-      socket.disconnect();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+      return () => {
+        socket.off("connect", handleConnect);
+        socket.off("reconnect", handleReconnect);
+        socket.off("log-event", handleLogEvent);
+        socket.off("ap-export-complete", handleExportComplete);
+      };
+    }
+  }, [socket, logLevel, t]);

  if (!state?.billids) {
    history(`/manage/accounting/payables`);
@@ -136,27 +124,20 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
                <Button
                  onClick={() => {
                    setLogs([]);
-
-                    socket.disconnect();
-                    socket.connect();
+                    if (socket) {
+                      socket.emit("clear-dms-session");
+                    }
                  }}
                >
-                  Reconnect
+                  Clear Session
                </Button>
              </Space>
            }
          >
-            <DmsLogEvents socket={socket} logs={logs} />
+            <DmsLogEvents logs={logs} />
          </Card>
        </div>
      </Col>
    </Row>
  );
 }
-
-export const determineDmsType = (bodyshop) => {
-  if (bodyshop.cdk_dealerid) return "cdk";
-  else {
-    return "pbs";
-  }
-};
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -1,12 +1,11 @@
 import { useQuery } from "@apollo/client";
 import { Button, Card, Col, notification, Result, Row, Select, Space } from "antd";
 import queryString from "query-string";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import SocketIO from "socket.io-client";
 import AlertComponent from "../../components/alert/alert.component";
 import DmsAllocationsSummary from "../../components/dms-allocations-summary/dms-allocations-summary.component";
 import DmsCustomerSelector from "../../components/dms-customer-selector/dms-customer-selector.component";
@@ -14,12 +13,12 @@ import DmsLogEvents from "../../components/dms-log-events/dms-log-events.compone
 import DmsPostForm from "../../components/dms-post-form/dms-post-form.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
 import { OwnerNameDisplayFunction } from "../../components/owner-name-display/owner-name-display.component";
-import { auth } from "../../firebase/firebase.utils";
 import { QUERY_JOB_EXPORT_DMS } from "../../graphql/jobs.queries";
 import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import SocketContext from "../../contexts/SocketIO/socketContext";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
@@ -28,25 +27,21 @@ const mapStateToProps = createStructuredSelector({
 const mapDispatchToProps = (dispatch) => ({
  setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });

 export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);

-export const socket = SocketIO(
-  import.meta.env.PROD ? import.meta.env.VITE_APP_AXIOS_BASE_API_URL : "http://localhost:4000", // for dev testing,
-  {
-    path: "/ws",
-    withCredentials: true,
-    auth: async (callback) => {
-      const token = auth.currentUser && (await auth.currentUser.getIdToken());
-      callback({ token });
-    }
-  }
-);
-
 export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, insertAuditTrail }) {
  const { t } = useTranslation();
+  const { socket } = useContext(SocketContext);
  const [logLevel, setLogLevel] = useState("DEBUG");
  const history = useNavigate();
  const [logs, setLogs] = useState([]);
@@ -59,6 +54,7 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only"
  });
+
  const logsRef = useRef(null);

  useEffect(() => {
@@ -83,47 +79,73 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
  }, [t, setBreadcrumbs, setSelectedHeader]);

  useEffect(() => {
-    socket.on("connect", () => socket.emit("set-log-level", logLevel));
-    socket.on("reconnect", () => {
-      setLogs((logs) => {
-        return [
+    if (socket) {
+      const handleConnect = () => {
+        socket.emit("set-log-level", logLevel);
+      };
+
+      const handleReconnect = () => {
+        setLogs((logs) => [
          ...logs,
          {
            timestamp: new Date(),
            level: "WARNING",
            message: "Reconnected to CDK Export Service"
          }
-        ];
-      });
-    });
-    socket.on("connect_error", (err) => {
-      console.log(`connect_error due to ${err}`, err);
-      notification.error({ message: err.message });
-    });
-    socket.on("log-event", (payload) => {
-      setLogs((logs) => {
-        return [...logs, payload];
-      });
-    });
-    socket.on("export-success", (payload) => {
-      notification.success({
-        message: t("jobs.successes.exported")
-      });
-      insertAuditTrail({
-        jobid: payload,
-        operation: AuditTrailMapping.jobexported(),
-        type: "jobexported"
-      });
-      history("/manage/accounting/receivables");
-    });
+        ]);
+      };

-    if (socket.disconnected) socket.connect();
-    return () => {
-      socket.removeAllListeners();
-      socket.disconnect();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+      const handleConnectError = (err) => {
+        console.log(`connect_error due to ${err}`, err);
+        notification.error({ message: err.message });
+      };
+
+      const handleLogEvent = (payload) => {
+        setLogs((logs) => [...logs, payload]);
+      };
+
+      const handleExportSuccess = async (payload) => {
+        notification.success({
+          message: t("jobs.successes.exported")
+        });
+        insertAuditTrail({
+          jobid: payload,
+          operation: AuditTrailMapping.jobexported(),
+          type: "jobexported"
+        });
+
+        try {
+          await new Promise((resolve, reject) => {
+            socket.emit("clear-dms-session", (response) => {
+              if (response && response.status === "ok") {
+                resolve();
+              } else {
+                reject(new Error("Failed to clear DMS session"));
+              }
+            });
+          });
+        } catch (error) {
+          console.error("Failed to clear DMS session", error);
+        }
+
+        history("/manage/accounting/receivables");
+      };
+
+      socket.on("connect", handleConnect);
+      socket.on("reconnect", handleReconnect);
+      socket.on("connect_error", handleConnectError);
+      socket.on("log-event", handleLogEvent);
+      socket.on("export-success", handleExportSuccess);
+
+      return () => {
+        socket.off("connect", handleConnect);
+        socket.off("reconnect", handleReconnect);
+        socket.off("connect_error", handleConnectError);
+        socket.off("log-event", handleLogEvent);
+        socket.off("export-success", handleExportSuccess);
+      };
+    }
+  }, [socket, logLevel, t, insertAuditTrail, history]);

  if (loading) return <LoadingSpinner />;
  if (error) return <AlertComponent message={error.message} type="error" />;
@@ -179,20 +201,21 @@ export function DmsContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, inse
                    <Select.Option key="WARNING">WARNING</Select.Option>
                    <Select.Option key="ERROR">ERROR</Select.Option>
                  </Select>
-                  <Button onClick={() => setLogs([])}>Clear Logs</Button>
+                  4<Button onClick={() => setLogs([])}>Clear Logs</Button>
                  <Button
                    onClick={() => {
                      setLogs([]);
-                      socket.disconnect();
-                      socket.connect();
+                      if (socket) {
+                        socket.emit("clear-dms-session");
+                      }
                    }}
                  >
-                    Reconnect
+                    Clear Session
                  </Button>
                </Space>
              }
            >
-              <DmsLogEvents socket={socket} logs={logs} />
+              <DmsLogEvents logs={logs} />
            </Card>
          </div>
        </Col>
--- a/client/src/pages/manage/manage.page.component.jsx
+++ b/client/src/pages/manage/manage.page.component.jsx
@@ -1,6 +1,6 @@
 import { FloatButton, Layout, Spin } from "antd";
 // import preval from "preval.macro";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import React, { lazy, Suspense, useContext, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, Route, Routes } from "react-router-dom";
@@ -18,12 +18,12 @@ import LoadingSpinner from "../../components/loading-spinner/loading-spinner.com
 import PartnerPingComponent from "../../components/partner-ping/partner-ping.component";
 import PrintCenterModalContainer from "../../components/print-center-modal/print-center-modal.container";
 import ShopSubStatusComponent from "../../components/shop-sub-status/shop-sub-status.component";
-import { requestForToken } from "../../firebase/firebase.utils";
 import { selectBodyshop, selectInstanceConflict } from "../../redux/user/user.selectors";

 import UpdateAlert from "../../components/update-alert/update-alert.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr.js";
 import "./manage.page.styles.scss";
+import SocketContext from "../../contexts/SocketIO/socketContext.jsx";

 const JobsPage = lazy(() => import("../jobs/jobs.page"));

@@ -110,17 +110,7 @@ const mapDispatchToProps = (dispatch) => ({});
 export function Manage({ conflict, bodyshop }) {
  const { t } = useTranslation();
  const [chatVisible] = useState(false);
-
-  useEffect(() => {
-    const widgetId = InstanceRenderManager({
-      imex: "IABVNO4scRKY11XBQkNr",
-      rome: "mQdqARMzkZRUVugJ6TdS"
-    });
-    window.noticeable.render("widget", widgetId);
-    requestForToken().catch((error) => {
-      console.error(`Unable to request for token.`, error);
-    });
-  }, []);
+  const { socket, clientId } = useContext(SocketContext);

  useEffect(() => {
    document.title = InstanceRenderManager({
@@ -129,6 +119,7 @@ export function Manage({ conflict, bodyshop }) {
      promanager: t("titles.promanager")
    });
  }, [t]);
+
  const AppRouteTable = (
    <Suspense
      fallback={
@@ -569,6 +560,13 @@ export function Manage({ conflict, bodyshop }) {
  else if (bodyshop && bodyshop.sub_status !== "active") PageContent = <ShopSubStatusComponent />;
  else PageContent = AppRouteTable;

+  const broadcastMessage = () => {
+    if (socket && bodyshop && bodyshop.id) {
+      console.log(`Broadcasting message to bodyshop ${bodyshop.id}:`);
+      socket.emit("broadcast-to-bodyshop", bodyshop.id, `Hello from ${clientId}`);
+    }
+  };
+
  return (
    <>
      {import.meta.env.PROD && <ChatAffixContainer bodyshop={bodyshop} chatVisible={chatVisible} />}
@@ -603,6 +601,8 @@ export function Manage({ conflict, bodyshop }) {
              </div>
              <div id="noticeable-widget" style={{ marginLeft: "1rem" }} />
            </div>
+            <button onClick={broadcastMessage}>Broadcast Message</button>
+
            <Link to="/disclaimer" target="_blank" style={{ color: "#ccc" }}>
              Disclaimer & Notices
            </Link>
--- a/client/src/pages/production-board/production-board.component.jsx
+++ b/client/src/pages/production-board/production-board.component.jsx
@@ -1,26 +1,6 @@
 import React from "react";
 import ProductionBoardKanbanContainer from "../../components/production-board-kanban/production-board-kanban.container";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ProductionBoardComponent);

-export function ProductionBoardComponent({ bodyshop }) {
-  const {
-    treatments: { Production_Use_View }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Production_Use_View"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
-  return <ProductionBoardKanbanContainer subscriptionType={Production_Use_View.treatment} />;
+export default function ProductionBoardComponent() {
+  return <ProductionBoardKanbanContainer />;
 }
--- a/client/src/pages/production-list/production-list.component.jsx
+++ b/client/src/pages/production-list/production-list.component.jsx
@@ -2,31 +2,11 @@ import React from "react";
 import NoteUpsertModal from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ProductionListTable from "../../components/production-list-table/production-list-table.container";

-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = (dispatch) => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ProductionListComponent);
-
-export function ProductionListComponent({ bodyshop }) {
-  const {
-    treatments: { Production_Use_View }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["Production_Use_View"],
-    splitKey: bodyshop && bodyshop.imexshopid
-  });
-
+export default function ProductionListComponent() {
  return (
    <>
      <NoteUpsertModal />
-      <ProductionListTable subscriptionType={Production_Use_View.treatment} />
+      <ProductionListTable />
    </>
  );
 }
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -1,21 +1,21 @@
 import { Tabs } from "antd";
-import queryString from "query-string";
 import React, { useEffect } from "react";
-import { useTranslation } from "react-i18next";
-import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
-import { createStructuredSelector } from "reselect";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
-import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
+import queryString from "query-string";
+import { useTranslation } from "react-i18next";
 import ShopEmployeesContainer from "../../components/shop-employees/shop-employees.container";
 import ShopInfoContainer from "../../components/shop-info/shop-info.container";
-import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
+import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";

-import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
+import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
--- a/client/src/redux/messaging/messaging.sagas.js
+++ b/client/src/redux/messaging/messaging.sagas.js
@@ -36,8 +36,7 @@ export function* openChatByPhone({ payload }) {
      data: { conversations }
    } = yield client.query({
      query: CONVERSATION_ID_BY_PHONE,
-      variables: { phone: p.number },
-      fetchPolicy: 'no-cache'
+      variables: { phone: p.number }
    });

    if (conversations.length === 0) {
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -230,7 +230,7 @@
        "markexported": "Mark Exported",
        "markforreexport": "Mark for Re-export",
        "new": "New Bill",
-        "nobilllines": "",
+        "nobilllines": "This part has not yet been recieved.",
        "noneselected": "No bill selected.",
        "onlycmforinvoiced": "Only credit memos can be entered for any Job that has been invoiced, exported, or voided.",
        "printlabels": "Print Labels",
@@ -270,9 +270,9 @@
        "testrender": "Test Render"
      },
      "errors": {
-        "creatingdefaultview": "Error creating default view.",
        "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}"
+        "saving": "Error encountered while saving. {{message}}",
+        "creatingdefaultview": "Error creating default view."
      },
      "fields": {
        "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -285,21 +285,19 @@
        },
        "appt_length": "Default Appointment Length",
        "attach_pdf_to_email": "Attach PDF copy to sent emails?",
-        "batchid": "ADP Batch ID",
        "bill_allow_post_to_closed": "Allow Bills to be posted to Closed Jobs",
        "bill_federal_tax_rate": "Bills - Federal Tax Rate %",
        "bill_local_tax_rate": "Bill - Local Tax Rate %",
        "bill_state_tax_rate": "Bill - Provincial/State Tax Rate %",
        "city": "City",
        "closingperiod": "Closing Period",
-        "companycode": "ADP Company Code",
        "country": "Country",
        "dailybodytarget": "Scoreboard - Daily Body Target",
        "dailypainttarget": "Scoreboard - Daily Paint Target",
        "default_adjustment_rate": "Default Labor Deduction Adjustment Rate",
        "deliver": {
-          "require_actual_delivery_date": "Require Actual Delivery",
-          "templates": "Delivery Templates"
+          "templates": "Delivery Templates",
+          "require_actual_delivery_date": "Require Actual Delivery"
        },
        "dms": {
          "apcontrol": "AP Control Number",
@@ -332,10 +330,6 @@
          "next_contact_hours": "Automatic Next Contact Date - Hours from Intake",
          "templates": "Intake Templates"
        },
-        "intellipay_config": {
-          "cash_discount_percentage": "Cash Discount %",
-          "enable_cash_discount": "Enable Cash Discounting"
-        },
        "invoice_federal_tax_rate": "Invoices - Federal Tax Rate",
        "invoice_local_tax_rate": "Invoices - Local Tax Rate",
        "invoice_state_tax_rate": "Invoices - State Tax Rate",
@@ -667,8 +661,6 @@
        "filehandlers": "Adjusters",
        "insurancecos": "Insurance Companies",
        "intakechecklist": "Intake Checklist",
-        "intellipay": "IntelliPay",
-        "intellipay_cash_discount": "Please ensure that cash discounting has been enabled on your merchant account. Reach out to IntelliPay Support if you need assistance. ",
        "jobstatuses": "Job Statuses",
        "laborrates": "Labor Rates",
        "licensing": "Licensing",
@@ -708,10 +700,10 @@
        "workingdays": "Working Days"
      },
      "successes": {
-        "areyousure": "Are you sure you want to continue?",
-        "defaultviewcreated": "Default view created successfully.",
        "save": "Shop configuration saved successfully. ",
-        "unsavedchanges": "Unsaved changes will be lost. Are you sure you want to continue?"
+        "unsavedchanges": "Unsaved changes will be lost. Are you sure you want to continue?",
+        "areyousure": "Are you sure you want to continue?",
+        "defaultviewcreated": "Default view created successfully."
      },
      "validation": {
        "centermustexist": "The chosen responsibility center does not exist.",
@@ -1141,8 +1133,8 @@
    },
    "general": {
      "actions": {
+        "defaults": "Defaults",
        "add": "Add",
-        "autoupdate": "{{app}} will automatically update in {{time}} seconds. Please save all changes.",
        "calculate": "Calculate",
        "cancel": "Cancel",
        "clear": "Clear",
@@ -1150,8 +1142,6 @@
        "copied": "Copied!",
        "copylink": "Copy Link",
        "create": "Create",
-        "defaults": "Defaults",
-        "delay": "Delay Update (5 mins)",
        "delete": "Delete",
        "deleteall": "Delete All",
        "deselectall": "Deselect All",
@@ -1163,12 +1153,10 @@
        "print": "Print",
        "refresh": "Refresh",
        "remove": "Remove",
-        "remove_alert": "Are you sure you want to dismiss the alert?",
        "reset": "Reset your changes.",
        "resetpassword": "Reset Password",
        "save": "Save",
        "saveandnew": "Save and New",
-        "saveas": "Save As",
        "selectall": "Select All",
        "send": "Send",
        "sendbysms": "Send by SMS",
@@ -1176,7 +1164,9 @@
        "submit": "Submit",
        "tryagain": "Try Again",
        "view": "View",
-        "viewreleasenotes": "See What's Changed"
+        "viewreleasenotes": "See What's Changed",
+        "remove_alert": "Are you sure you want to dismiss the alert?",
+        "saveas": "Save As"
      },
      "errors": {
        "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
@@ -1191,6 +1181,7 @@
        "vehicle": "Vehicle"
      },
      "labels": {
+        "unsavedchanges": "Unsaved changes.",
        "actions": "Actions",
        "areyousure": "Are you sure?",
        "barcode": "Barcode",
@@ -1259,7 +1250,6 @@
        "tuesday": "Tuesday",
        "tvmode": "TV Mode",
        "unknown": "Unknown",
-        "unsavedchanges": "Unsaved changes.",
        "username": "Username",
        "view": "View",
        "wednesday": "Wednesday",
@@ -1373,7 +1363,6 @@
    },
    "job_payments": {
      "buttons": {
-        "create_short_link": "Generate Short Link",
        "goback": "Go Back",
        "proceedtopayment": "Proceed to Payment",
        "refundpayment": "Refund Payment"
@@ -2750,6 +2739,41 @@
      }
    },
    "production": {
+      "constants": {
+        "main_profile": "Default"
+      },
+      "options": {
+        "small": "Small",
+        "medium": "Medium",
+        "large": "Large",
+        "vertical": "Vertical",
+        "horizontal": "Horizontal"
+      },
+      "settings": {
+        "layout": "Layout",
+        "information": "Information",
+        "statistics_title": "Statistics",
+        "board_settings": "Board Settings",
+        "filters_title": "Filters",
+        "filters": {
+          "md_ins_cos": "Insurance Companies",
+          "md_estimators": "Estimators"
+        },
+        "statistics": {
+          "total_hours_in_production": "Hours in Production",
+          "total_lab_in_production": "Body Hours in Production",
+          "total_lar_in_production": "Refinish Hours in Production",
+          "total_amount_in_production": "Dollars in Production",
+          "jobs_in_production": "Jobs in Production",
+          "total_hours_on_board": "Hours on Board",
+          "total_lab_on_board": "Body Hours on Board",
+          "total_lar_on_board": "Refinish Hours on Board",
+          "total_amount_on_board": "Dollars on Board",
+          "total_jobs_on_board": "Jobs on Board",
+          "tasks_in_production": "Tasks in Production",
+          "tasks_on_board": "Tasks on Board"
+        }
+      },
      "actions": {
        "addcolumns": "Add Columns",
        "bodypriority-clear": "Clear Body Priority",
@@ -2764,23 +2788,29 @@
        "suspend": "Suspend",
        "unsuspend": "Unsuspend"
      },
-      "constants": {
-        "main_profile": "Default"
-      },
      "errors": {
        "boardupdate": "Error encountered updating Job. {{message}}",
-        "name_exists": "A Profile with this name already exists. Please choose a different name.",
-        "name_required": "Profile name is required.",
        "removing": "Error removing from production board. {{error}}",
-        "settings": "Error saving board settings: {{error}}"
+        "settings": "Error saving board settings: {{error}}",
+        "name_exists": "A Profile with this name already exists. Please choose a different name.",
+        "name_required": "Profile name is required."
      },
      "labels": {
+        "kiosk_mode": "Kiosk Mode",
+        "on": "On",
+        "off": "Off",
+        "wide": "Wide",
+        "tall": "Tall",
+        "vertical": "Vertical",
+        "horizontal": "Horizontal",
+        "orientation": "Board Orientation",
+        "card_size": "Card Size",
+        "model_info": "Vehicle Info",
        "actual_in": "Actual In",
-        "addnewprofile": "Add New Profile",
        "alert": "Alert",
+        "tasks": "Tasks",
        "alertoff": "Remove alert from Job",
        "alerton": "Add alert to Job",
-        "alerts": "Alerts",
        "ats": "Alternative Transportation",
        "bodyhours": "B",
        "bodypriority": "B/P",
@@ -2790,7 +2820,6 @@
            "qbo_usa": "QBO USA"
          }
        },
-        "card_size": "Card Size",
        "cardcolor": "Colored Cards",
        "cardsettings": "Card Settings",
        "clm_no": "Claim Number",
@@ -2799,88 +2828,48 @@
        "detailpriority": "D/P",
        "employeeassignments": "Employee Assignments",
        "employeesearch": "Employee Search",
-        "estimator": "Estimator",
-        "horizontal": "Horizontal",
        "ins_co_nm": "Insurance Company Name",
        "jobdetail": "Job Details",
-        "kiosk_mode": "Kiosk Mode",
        "laborhrs": "Labor Hours",
        "legend": "Legend:",
-        "model_info": "Vehicle Info",
        "note": "Production Note",
-        "off": "Off",
-        "on": "On",
-        "orientation": "Board Orientation",
        "ownr_nm": "Customer Name",
        "paintpriority": "P/P",
        "partsstatus": "Parts Status",
+        "estimator": "Estimator",
+        "subtotal": "Subtotal",
        "production_note": "Production Note",
        "refinishhours": "R",
        "scheduled_completion": "Scheduled Completion",
        "selectview": "Select a View",
        "stickyheader": "Sticky Header (BETA)",
        "sublets": "Sublets",
-        "subtotal": "Subtotal",
-        "tall": "Tall",
-        "tasks": "Tasks",
        "totalhours": "Total Hrs ",
        "touchtime": "T/T",
-        "vertical": "Vertical",
        "viewname": "View Name",
-        "wide": "Wide"
-      },
-      "options": {
-        "horizontal": "Horizontal",
-        "large": "Large",
-        "medium": "Medium",
-        "small": "Small",
-        "vertical": "Vertical"
-      },
-      "settings": {
-        "board_settings": "Board Settings",
-        "filters": {
-          "md_estimators": "Estimators",
-          "md_ins_cos": "Insurance Companies"
-        },
-        "filters_title": "Filters",
-        "information": "Information",
-        "layout": "Layout",
-        "statistics": {
-          "jobs_in_production": "Jobs in Production",
-          "tasks_in_production": "Tasks in Production",
-          "tasks_on_board": "Tasks on Board",
-          "total_amount_in_production": "Dollars in Production",
-          "total_amount_on_board": "Dollars on Board",
-          "total_hours_in_production": "Hours in Production",
-          "total_hours_on_board": "Hours on Board",
-          "total_jobs_on_board": "Jobs on Board",
-          "total_lab_in_production": "Body Hours in Production",
-          "total_lab_on_board": "Body Hours on Board",
-          "total_lar_in_production": "Refinish Hours in Production",
-          "total_lar_on_board": "Refinish Hours on Board"
-        },
-        "statistics_title": "Statistics"
-      },
-      "statistics": {
-        "currency_symbol": "$",
-        "hours": "Hours",
-        "jobs": "Jobs",
-        "jobs_in_production": "Jobs in Production",
-        "tasks": "Tasks",
-        "tasks_in_production": "Tasks in Production",
-        "tasks_on_board": "Tasks on Board",
-        "total_amount_in_production": "Dollars in Production",
-        "total_amount_on_board": "Dollars on Board",
-        "total_hours_in_production": "Hours in Production",
-        "total_hours_on_board": "Hours on Board",
-        "total_jobs_on_board": "Jobs on Board",
-        "total_lab_in_production": "Body Hours in Production",
-        "total_lab_on_board": "Body Hours on Board",
-        "total_lar_in_production": "Refinish Hours in Production",
-        "total_lar_on_board": "Refinish Hours on Board"
+        "alerts": "Alerts",
+        "addnewprofile": "Add New Profile"
      },
      "successes": {
        "removed": "Job removed from production."
+      },
+      "statistics": {
+        "total_hours_in_production": "Hours in Production",
+        "total_lab_in_production": "Body Hours in Production",
+        "total_lar_in_production": "Refinish Hours in Production",
+        "total_amount_in_production": "Dollars in Production",
+        "jobs_in_production": "Jobs in Production",
+        "total_hours_on_board": "Hours on Board",
+        "total_lab_on_board": "Body Hours on Board",
+        "total_lar_on_board": "Refinish Hours on Board",
+        "total_amount_on_board": "Dollars on Board",
+        "total_jobs_on_board": "Jobs on Board",
+        "tasks_in_production": "Tasks in Production",
+        "tasks_on_board": "Tasks on Board",
+        "tasks": "Tasks",
+        "hours": "Hours",
+        "currency_symbol": "$",
+        "jobs": "Jobs"
      }
    },
    "profile": {
@@ -2938,8 +2927,6 @@
        "vendor": "Vendor"
      },
      "templates": {
-        "adp_payroll_flat": "ADP Payroll - Flat Rate",
-        "adp_payroll_straight": "ADP Payroll - Straight Time",
        "anticipated_revenue": "Anticipated Revenue",
        "ar_aging": "AR Aging",
        "attendance_detail": "Attendance (All Employees)",
@@ -3431,18 +3418,6 @@
      "vehicledetail": "Vehicle Details {{vehicle}} | {{app}}",
      "vehicles": "All Vehicles | {{app}}"
    },
-    "trello": {
-      "labels": {
-        "add_card": "Add Card",
-        "add_lane": "Add Lane",
-        "cancel": "Cancel",
-        "delete_lane": "Delete Lane",
-        "description": "Description",
-        "label": "Label",
-        "lane_actions": "Lane Actions",
-        "title": "Title"
-      }
-    },
    "tt_approvals": {
      "actions": {
        "approveselected": "Approve Selected"
@@ -3581,6 +3556,18 @@
      "validation": {
        "unique_vendor_name": "You must enter a unique vendor name."
      }
+    },
+    "trello": {
+      "labels": {
+        "add_card": "Add Card",
+        "add_lane": "Add Lane",
+        "delete_lane": "Delete Lane",
+        "lane_actions": "Lane Actions",
+        "title": "Title",
+        "description": "Description",
+        "label": "Label",
+        "cancel": "Cancel"
+      }
    }
  }
 }
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -270,9 +270,9 @@
        "testrender": ""
      },
      "errors": {
-        "creatingdefaultview": "",
        "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": ""
+        "saving": "",
+        "creatingdefaultview": ""
      },
      "fields": {
        "ReceivableCustomField": "",
@@ -285,21 +285,19 @@
        },
        "appt_length": "",
        "attach_pdf_to_email": "",
-        "batchid": "",
        "bill_allow_post_to_closed": "",
        "bill_federal_tax_rate": "",
        "bill_local_tax_rate": "",
        "bill_state_tax_rate": "",
        "city": "",
        "closingperiod": "",
-        "companycode": "",
        "country": "",
        "dailybodytarget": "",
        "dailypainttarget": "",
        "default_adjustment_rate": "",
        "deliver": {
-          "require_actual_delivery_date": "",
-          "templates": ""
+          "templates": "",
+          "require_actual_delivery_date": ""
        },
        "dms": {
          "apcontrol": "",
@@ -332,10 +330,6 @@
          "next_contact_hours": "",
          "templates": ""
        },
-        "intellipay_config": {
-          "cash_discount_percentage": "",
-          "enable_cash_discount": ""
-        },
        "invoice_federal_tax_rate": "",
        "invoice_local_tax_rate": "",
        "invoice_state_tax_rate": "",
@@ -667,8 +661,6 @@
        "filehandlers": "",
        "insurancecos": "",
        "intakechecklist": "",
-        "intellipay": "",
-        "intellipay_cash_discount": "",
        "jobstatuses": "",
        "laborrates": "",
        "licensing": "",
@@ -708,10 +700,10 @@
        "workingdays": ""
      },
      "successes": {
-        "areyousure": "",
-        "defaultviewcreated": "",
        "save": "",
-        "unsavedchanges": ""
+        "unsavedchanges": "",
+        "areyousure": "",
+        "defaultviewcreated": ""
      },
      "validation": {
        "centermustexist": "",
@@ -1141,8 +1133,8 @@
    },
    "general": {
      "actions": {
+        "defaults": "defaults",
        "add": "",
-        "autoupdate": "",
        "calculate": "",
        "cancel": "",
        "clear": "",
@@ -1150,8 +1142,6 @@
        "copied": "",
        "copylink": "",
        "create": "",
-        "defaults": "defaults",
-        "delay": "",
        "delete": "Borrar",
        "deleteall": "",
        "deselectall": "",
@@ -1163,12 +1153,10 @@
        "print": "",
        "refresh": "",
        "remove": "",
-        "remove_alert": "",
        "reset": " Restablecer a original.",
        "resetpassword": "",
        "save": "Salvar",
        "saveandnew": "",
-        "saveas": "",
        "selectall": "",
        "send": "",
        "sendbysms": "",
@@ -1176,7 +1164,9 @@
        "submit": "",
        "tryagain": "",
        "view": "",
-        "viewreleasenotes": ""
+        "viewreleasenotes": "",
+        "remove_alert": "",
+        "saveas": ""
      },
      "errors": {
        "fcm": "",
@@ -1191,6 +1181,7 @@
        "vehicle": ""
      },
      "labels": {
+        "unsavedchanges": "",
        "actions": "Comportamiento",
        "areyousure": "",
        "barcode": "código de barras",
@@ -1259,7 +1250,6 @@
        "tuesday": "",
        "tvmode": "",
        "unknown": "Desconocido",
-        "unsavedchanges": "",
        "username": "",
        "view": "",
        "wednesday": "",
@@ -1373,7 +1363,6 @@
    },
    "job_payments": {
      "buttons": {
-        "create_short_link": "",
        "goback": "",
        "proceedtopayment": "",
        "refundpayment": ""
@@ -2750,6 +2739,41 @@
      }
    },
    "production": {
+      "constants": {
+        "main_profile": ""
+      },
+      "options": {
+        "small": "",
+        "medium": "",
+        "large": "",
+        "vertical": "",
+        "horizontal": ""
+      },
+      "settings": {
+        "layout": "",
+        "information": "",
+        "statistics_title": "",
+        "board_settings": "",
+        "filters_title": "",
+        "filters": {
+          "md_ins_cos": "",
+          "md_estimators": ""
+        },
+        "statistics": {
+          "total_hours_in_production": "",
+          "total_lab_in_production": "",
+          "total_lar_in_production": "",
+          "total_amount_in_production": "",
+          "jobs_in_production": "",
+          "total_hours_on_board": "",
+          "total_lab_on_board": "",
+          "total_lar_on_board": "",
+          "total_amount_on_board": "",
+          "total_jobs_on_board": "",
+          "tasks_in_production": "",
+          "tasks_on_board": ""
+        }
+      },
      "actions": {
        "addcolumns": "",
        "bodypriority-clear": "",
@@ -2764,23 +2788,29 @@
        "suspend": "",
        "unsuspend": ""
      },
-      "constants": {
-        "main_profile": ""
-      },
      "errors": {
        "boardupdate": "",
-        "name_exists": "",
-        "name_required": "",
        "removing": "",
-        "settings": ""
+        "settings": "",
+        "name_exists": "",
+        "name_required": ""
      },
      "labels": {
+        "kiosk_mode": "",
+        "on": "",
+        "off": "",
+        "wide": "",
+        "tall": "",
+        "vertical": "",
+        "horizontal": "",
+        "orientation": "",
+        "card_size": "",
+        "model_info": "",
        "actual_in": "",
-        "addnewprofile": "",
        "alert": "",
+        "tasks": "",
        "alertoff": "",
        "alerton": "",
-        "alerts": "",
        "ats": "",
        "bodyhours": "",
        "bodypriority": "",
@@ -2790,7 +2820,6 @@
            "qbo_usa": ""
          }
        },
-        "card_size": "",
        "cardcolor": "",
        "cardsettings": "",
        "clm_no": "",
@@ -2799,88 +2828,48 @@
        "detailpriority": "",
        "employeeassignments": "",
        "employeesearch": "",
-        "estimator": "",
-        "horizontal": "",
        "ins_co_nm": "",
        "jobdetail": "",
-        "kiosk_mode": "",
        "laborhrs": "",
        "legend": "",
-        "model_info": "",
        "note": "",
-        "off": "",
-        "on": "",
-        "orientation": "",
        "ownr_nm": "",
        "paintpriority": "",
        "partsstatus": "",
+        "estimator": "",
+        "subtotal": "",
        "production_note": "",
        "refinishhours": "",
        "scheduled_completion": "",
        "selectview": "",
        "stickyheader": "",
        "sublets": "",
-        "subtotal": "",
-        "tall": "",
-        "tasks": "",
        "totalhours": "",
        "touchtime": "",
-        "vertical": "",
        "viewname": "",
-        "wide": ""
-      },
-      "options": {
-        "horizontal": "",
-        "large": "",
-        "medium": "",
-        "small": "",
-        "vertical": ""
-      },
-      "settings": {
-        "board_settings": "",
-        "filters": {
-          "md_estimators": "",
-          "md_ins_cos": ""
-        },
-        "filters_title": "",
-        "information": "",
-        "layout": "",
-        "statistics": {
-          "jobs_in_production": "",
-          "tasks_in_production": "",
-          "tasks_on_board": "",
-          "total_amount_in_production": "",
-          "total_amount_on_board": "",
-          "total_hours_in_production": "",
-          "total_hours_on_board": "",
-          "total_jobs_on_board": "",
-          "total_lab_in_production": "",
-          "total_lab_on_board": "",
-          "total_lar_in_production": "",
-          "total_lar_on_board": ""
-        },
-        "statistics_title": ""
-      },
-      "statistics": {
-        "currency_symbol": "",
-        "hours": "",
-        "jobs": "",
-        "jobs_in_production": "",
-        "tasks": "",
-        "tasks_in_production": "",
-        "tasks_on_board": "",
-        "total_amount_in_production": "",
-        "total_amount_on_board": "",
-        "total_hours_in_production": "",
-        "total_hours_on_board": "",
-        "total_jobs_on_board": "",
-        "total_lab_in_production": "",
-        "total_lab_on_board": "",
-        "total_lar_in_production": "",
-        "total_lar_on_board": ""
+        "alerts": "",
+        "addnewprofile": ""
      },
      "successes": {
        "removed": ""
+      },
+      "statistics": {
+        "total_hours_in_production": "",
+        "total_lab_in_production": "",
+        "total_lar_in_production": "",
+        "total_amount_in_production": "",
+        "jobs_in_production": "",
+        "total_hours_on_board": "",
+        "total_lab_on_board": "",
+        "total_lar_on_board": "",
+        "total_amount_on_board": "",
+        "total_jobs_on_board": "",
+        "tasks_in_production": "",
+        "tasks_on_board": "",
+        "tasks": "",
+        "hours": "",
+        "currency_symbol": "",
+        "jobs": ""
      }
    },
    "profile": {
@@ -2938,8 +2927,6 @@
        "vendor": ""
      },
      "templates": {
-        "adp_payroll_flat": "",
-        "adp_payroll_straight": "",
        "anticipated_revenue": "",
        "ar_aging": "",
        "attendance_detail": "",
@@ -3431,18 +3418,6 @@
      "vehicledetail": "Detalles del vehículo {{vehicle}} | {{app}}",
      "vehicles": "Todos los vehiculos | {{app}}"
    },
-    "trello": {
-      "labels": {
-        "add_card": "",
-        "add_lane": "",
-        "cancel": "",
-        "delete_lane": "",
-        "description": "",
-        "label": "",
-        "lane_actions": "",
-        "title": ""
-      }
-    },
    "tt_approvals": {
      "actions": {
        "approveselected": ""
@@ -3581,6 +3556,18 @@
      "validation": {
        "unique_vendor_name": ""
      }
+    },
+    "trello": {
+      "labels": {
+        "add_card": "",
+        "add_lane": "",
+        "delete_lane": "",
+        "lane_actions": "",
+        "title": "",
+        "description": "",
+        "label": "",
+        "cancel": ""
+      }
    }
  }
 }
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
--- a/client/src/utils/CleanAxios.js
+++ b/client/src/utils/CleanAxios.js
@@ -2,9 +2,9 @@ import axios from "axios";
 import { auth } from "../firebase/firebase.utils";
 import InstanceRenderManager from "./instanceRenderMgr";

-axios.defaults.baseURL =
-  import.meta.env.VITE_APP_AXIOS_BASE_API_URL ||
-  (import.meta.env.MODE === "production" ? "https://api.imex.online/" : "http://localhost:4000/");
+axios.defaults.baseURL = import.meta.env.DEV
+  ? "/api/"
+  : import.meta.env.VITE_APP_AXIOS_BASE_API_URL || "https://api.imex.online/";

 export const axiosAuthInterceptorId = axios.interceptors.request.use(
  async (config) => {
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2158,32 +2158,6 @@ export const TemplateList = (type, context) => {
              field: i18n.t("tasks.fields.created_at")
            },
            group: "jobs"
-          },
-          adp_payroll_flat: {
-            title: i18n.t("reportcenter.templates.adp_payroll_flat"),
-            subject: i18n.t("reportcenter.templates.adp_payroll_flat"),
-            key: "adp_payroll_flat",
-            reporttype: "text",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.committed_at")
-            },
-            group: "payroll",
-            adp_payroll: true
-          },
-          adp_payroll_straight: {
-            title: i18n.t("reportcenter.templates.adp_payroll_straight"),
-            subject: i18n.t("reportcenter.templates.adp_payroll_straight"),
-            key: "adp_payroll_straight",
-            reporttype: "text",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.timetickets"),
-              field: i18n.t("timetickets.fields.date")
-            },
-            group: "payroll",
-            adp_payroll: true
          }
        }
      : {}),
--- a/client/src/utils/countdownHook.js
+++ b/client/src/utils/countdownHook.js
@@ -1,84 +0,0 @@
-import React from "react";
-
-const useCountDown = (timeToCount = 60 * 1000, interval = 1000) => {
-  const [timeLeft, setTimeLeft] = React.useState(0);
-  const timer = React.useRef({});
-
-  const run = (ts) => {
-    if (!timer.current.started) {
-      timer.current.started = ts;
-      timer.current.lastInterval = ts;
-    }
-
-    const localInterval = Math.min(interval, timer.current.timeLeft || Infinity);
-    if (ts - timer.current.lastInterval >= localInterval) {
-      timer.current.lastInterval += localInterval;
-      setTimeLeft((timeLeft) => {
-        timer.current.timeLeft = timeLeft - localInterval;
-        return timer.current.timeLeft;
-      });
-    }
-
-    if (ts - timer.current.started < timer.current.timeToCount) {
-      timer.current.requestId = window.requestAnimationFrame(run);
-    } else {
-      timer.current = {};
-      setTimeLeft(0);
-    }
-  };
-
-  const start = React.useCallback(
-    (ttc) => {
-      window.cancelAnimationFrame(timer.current.requestId);
-
-      const newTimeToCount = ttc !== undefined ? ttc : timeToCount;
-      timer.current.started = null;
-      timer.current.lastInterval = null;
-      timer.current.timeToCount = newTimeToCount;
-      timer.current.requestId = window.requestAnimationFrame(run);
-
-      setTimeLeft(newTimeToCount);
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
-  const pause = React.useCallback(() => {
-    window.cancelAnimationFrame(timer.current.requestId);
-    timer.current.started = null;
-    timer.current.lastInterval = null;
-    timer.current.timeToCount = timer.current.timeLeft;
-  }, []);
-
-  const resume = React.useCallback(
-    () => {
-      if (!timer.current.started && timer.current.timeLeft > 0) {
-        window.cancelAnimationFrame(timer.current.requestId);
-        timer.current.requestId = window.requestAnimationFrame(run);
-      }
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
-  const reset = React.useCallback(() => {
-    if (timer.current.timeLeft) {
-      window.cancelAnimationFrame(timer.current.requestId);
-      timer.current = {};
-      setTimeLeft(0);
-    }
-  }, []);
-
-  const actions = React.useMemo(
-    () => ({ start, pause, resume, reset }), // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
-  React.useEffect(() => {
-    return () => window.cancelAnimationFrame(timer.current.requestId);
-  }, []);
-
-  return [timeLeft, actions];
-};
-
-export default useCountDown;
--- a/client/vite.config.js
+++ b/client/vite.config.js
@@ -3,16 +3,21 @@ import { promises as fsPromises } from "fs";
 import { createRequire } from "module";
 import * as path from "path";
 import * as url from "url";
-import { defineConfig } from "vite";
+import { createLogger, defineConfig } from "vite";
 import { ViteEjsPlugin } from "vite-plugin-ejs";
 import eslint from "vite-plugin-eslint";
 import { VitePWA } from "vite-plugin-pwa";
 import InstanceRenderManager from "./src/utils/instanceRenderMgr";
+import chalk from "chalk";

 process.env.VITE_APP_GIT_SHA_DATE = new Date().toLocaleString("en-US", {
  timeZone: "America/Los_Angeles"
 });

+const getFormattedTimestamp = () =>
+  new Date().toLocaleTimeString("en-US", { hour12: true }).replace("AM", "a.m.").replace("PM", "p.m.");
+
+/** This is a hack around react-virtualized, should be removed when switching to react-virtuoso */
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`;

 function reactVirtualizedFix() {
@@ -32,6 +37,11 @@ function reactVirtualizedFix() {
    }
  };
 }
+/** End of hack */
+
+export const logger = createLogger("info", {
+  allowClearScreen: false
+});

 export default defineConfig({
  base: "/",
@@ -99,7 +109,6 @@ export default defineConfig({
    reactVirtualizedFix(),
    react(),
    eslint()
-    // CompressionPlugin(), //Cloudfront already compresses assets, so not needed.
  ],
  define: {
    APP_VERSION: JSON.stringify(process.env.npm_package_version)
@@ -107,7 +116,57 @@ export default defineConfig({
  server: {
    host: true,
    port: 3000,
-    open: true
+    open: true,
+    proxy: {
+      "/ws": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/api": {
+        target: "http://localhost:4000",
+        changeOrigin: true,
+        secure: false,
+        ws: false,
+        rewrite: (path) => {
+          const replacedValue = path.replace(/^\/api/, "");
+          logger.info(
+            `${chalk.grey.bold(getFormattedTimestamp())} ${chalk.cyan.bold("[vite]")} ${chalk.green.bold("[API]")} ${chalk.blue(replacedValue)}`
+          );
+          return replacedValue;
+        }
+      }
+    },
+    https: {
+      key: await fsPromises.readFile("../certs/key.pem"),
+      cert: await fsPromises.readFile("../certs/cert.pem"),
+      allowHTTP1: false // Force HTTP/2
+    }
+  },
+  preview: {
+    port: 6000,
+    host: true,
+    open: true,
+    https: {
+      key: await fsPromises.readFile("../certs/key.pem"),
+      cert: await fsPromises.readFile("../certs/cert.pem"),
+      allowHTTP1: false // Force HTTP/2
+    },
+    proxy: {
+      "/ws": {
+        target: "ws://localhost:4000",
+        rewriteWsOrigin: true,
+        secure: false,
+        ws: true
+      },
+      "/api": {
+        target: "http://localhost:4000",
+        changeOrigin: true,
+        secure: false,
+        ws: false
+      }
+    }
  },
  build: {
    rollupOptions: {
@@ -121,7 +180,18 @@ export default defineConfig({
    }
  },
  optimizeDeps: {
-    include: ["react", "react-dom", "antd", "@apollo/client", "@reduxjs/toolkit", "axios"],
+    include: [
+      "react",
+      "react-dom",
+      "antd",
+      "@apollo/client",
+      "@reduxjs/toolkit",
+      "axios",
+      "react-router-dom",
+      "dayjs",
+      "redux",
+      "react-redux"
+    ],
    esbuildOptions: {
      loader: {
        ".js": "jsx"
--- a/firebase/readme.md
+++ b/firebase/readme.md
@@ -1,4 +1,4 @@
 Must set the environment variables using:

-firebase functions:config:set auth.graphql_endpoint="https://db.dev.bodyshop.app/v1/graphql"
+firebase functions:config:set auth.graphql_endpoint="https://db.dev.imex.online/v1/graphql"
 auth.hasura_secret_admin_key="Dev-BodyShopApp!"
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -918,7 +918,6 @@
          - bill_tax_rates
          - cdk_configuration
          - cdk_dealerid
-          - chatterid
          - city
          - claimscorpid
          - convenient_company
@@ -940,7 +939,6 @@
          - inhousevendorid
          - insurance_vendor_id
          - intakechecklist
-          - intellipay_config
          - jc_hourly_rates
          - jobsizelimit
          - last_name_first
@@ -1042,7 +1040,6 @@
          - inhousevendorid
          - insurance_vendor_id
          - intakechecklist
-          - intellipay_config
          - jc_hourly_rates
          - last_name_first
          - localmediaserverhttp
@@ -4359,35 +4356,6 @@
        template_engine: Kriti
        url: '{{$base_url}}/opensearch'
        version: 2
- table:
-    name: jobs_inproduction
-    schema: public
-  object_relationships:
-    - name: bodyshop
-      using:
-        manual_configuration:
-          column_mapping:
-            shopid: id
-          insertion_order: null
-          remote_table:
-            name: bodyshops
-            schema: public
-  select_permissions:
-    - role: user
-      permission:
-        columns:
-          - id
-          - shopid
-          - updated_at
-        filter:
-          bodyshop:
-            associations:
-              _and:
-                - user:
-                    authid:
-                      _eq: X-Hasura-User-Id
-                - active:
-                    _eq: true
 - table:
    name: masterdata
    schema: public
--- a/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/down.sql
+++ b/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/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 "intellipay_config" jsonb
--  not null default jsonb_build_object();
--- a/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/up.sql
+++ b/hasura/migrations/1726511165929_alter_table_public_bodyshops_add_column_intellipay_config/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" add column "intellipay_config" jsonb
- not null default jsonb_build_object();
--- a/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/down.sql
+++ b/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/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 "chatterid" text
--  null;
--- a/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/up.sql
+++ b/hasura/migrations/1726528225033_alter_table_public_bodyshops_add_column_chatterid/up.sql
@@ -1,2 +0,0 @@
-alter table "public"."bodyshops" add column "chatterid" text
- null;
--- a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql
+++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "courtesycars_idx_fleet" on
-  "public"."courtesycars" using btree ("fleetnumber");
--- a/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql
+++ b/hasura/migrations/1726768560738_drop_index_courtesycars_idx_fleet/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet";
--- a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql
+++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_ownrfn" on
-  "public"."jobs" using gin ("ownr_fn");
--- a/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql
+++ b/hasura/migrations/1726768733548_drop_index_idx_jobs_ownrfn/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn";
--- a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql
+++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_ownrln" on
-  "public"."jobs" using gin ("ownr_ln");
--- a/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql
+++ b/hasura/migrations/1726768747444_drop_index_idx_jobs_ownrln/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_ownrln";
--- a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql
+++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "jobs_idx_iouparent" on
-  "public"."jobs" using btree ("iouparent");
--- a/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql
+++ b/hasura/migrations/1726768755516_drop_index_jobs_idx_iouparent/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."jobs_idx_iouparent";
--- a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql
+++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_ronumber" on
-  "public"."jobs" using gin ("ro_number");
--- a/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql
+++ b/hasura/migrations/1726768776395_drop_index_idx_jobs_ronumber/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_ronumber";
--- a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql
+++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_clmno" on
-  "public"."jobs" using gin ("clm_no");
--- a/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql
+++ b/hasura/migrations/1726768781889_drop_index_idx_jobs_clmno/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_clmno";
--- a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql
+++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_vmodeldesc" on
-  "public"."jobs" using gin ("v_model_desc");
--- a/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql
+++ b/hasura/migrations/1726768808135_drop_index_idx_jobs_vmodeldesc/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_vmodeldesc";
--- a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql
+++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_vmakedesc" on
-  "public"."jobs" using gin ("v_make_desc");
--- a/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql
+++ b/hasura/migrations/1726768818475_drop_index_idx_jobs_vmakedesc/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_vmakedesc";
--- a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql
+++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_plateno" on
-  "public"."jobs" using gin ("plate_no");
--- a/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql
+++ b/hasura/migrations/1726768826203_drop_index_idx_jobs_plateno/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_plateno";
--- a/hasura/migrations/1726773072213_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773072213_run_sql_migration/down.sql
@@ -1,11 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE
-- OR REPLACE VIEW "public"."jobs_inproduction" AS
-- SELECT
--   j.id,
--   j.updated_at
-- FROM
--   jobs j
-- WHERE
-- j.inproduction=true;
--- a/hasura/migrations/1726773072213_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773072213_run_sql_migration/up.sql
@@ -1,9 +0,0 @@
-CREATE
-OR REPLACE VIEW "public"."jobs_inproduction" AS
-SELECT
-  j.id,
-  j.updated_at
-FROM
-  jobs j
-WHERE
-j.inproduction=true;
--- a/hasura/migrations/1726773316245_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773316245_run_sql_migration/down.sql
@@ -1,8 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
--  SELECT j.id,
--     j.updated_at,
--     j.shopid
--    FROM jobs j
--   WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773316245_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773316245_run_sql_migration/up.sql
@@ -1,6 +0,0 @@
-CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
- SELECT j.id,
-    j.updated_at,
-    j.shopid
-   FROM jobs j
-  WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773326353_run_sql_migration/down.sql
+++ b/hasura/migrations/1726773326353_run_sql_migration/down.sql
@@ -1,8 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS
--  SELECT j.id,
--     j.updated_at,
--     j.shopid
--    FROM jobs j
--   WHERE (j.inproduction = true);
--- a/hasura/migrations/1726773326353_run_sql_migration/up.sql
+++ b/hasura/migrations/1726773326353_run_sql_migration/up.sql
@@ -1,6 +0,0 @@
-CREATE OR REPLACE VIEW "public"."jobs_inproduction" AS 
- SELECT j.id,
-    j.updated_at,
-    j.shopid
-   FROM jobs j
-  WHERE (j.inproduction = true);
--- a/hasura/migrations/1726775434726_run_sql_migration/down.sql
+++ b/hasura/migrations/1726775434726_run_sql_migration/down.sql
@@ -1,3 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;
--- a/hasura/migrations/1726775434726_run_sql_migration/up.sql
+++ b/hasura/migrations/1726775434726_run_sql_migration/up.sql
@@ -1 +0,0 @@
-CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql
+++ b/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/down.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_inproduction_true_cast" on
-  "public"."jobs" using btree ("inproduction");
--- a/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql
+++ b/hasura/migrations/1726775487038_drop_index_idx_jobs_inproduction_true_cast/up.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_inproduction_true_cast";
--- a/hasura/migrations/1726868398933_run_sql_migration/down.sql
+++ b/hasura/migrations/1726868398933_run_sql_migration/down.sql
@@ -1,3 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);
--- a/hasura/migrations/1726868398933_run_sql_migration/up.sql
+++ b/hasura/migrations/1726868398933_run_sql_migration/up.sql
@@ -1 +0,0 @@
-CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);
--- a/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/down.sql
+++ b/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_jobs_vehicleid";
--- a/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/up.sql
+++ b/hasura/migrations/1726868654375_create_index_idx_jobs_vehicleid/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_jobs_vehicleid" on
-  "public"."jobs" using btree ("vehicleid");
--- a/hasura/migrations/1726871373784_run_sql_migration/down.sql
+++ b/hasura/migrations/1726871373784_run_sql_migration/down.sql
@@ -1,34 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
--  RETURNS SETOF exportlog
--  LANGUAGE plpgsql
--  STABLE
-- AS $function$ BEGIN IF search = '' THEN RETURN query
-- SELECT
--   *
-- FROM
--   exportlog e;
--   ELSE RETURN query
-- SELECT
--   e.*
-- FROM
--   exportlog e
--   LEFT JOIN jobs j on j.id = e.jobid
-- LEFT JOIN payments p
--     ON p.id = e.paymentid
-- LEFT JOIN bills b
--     ON e.billid = b.id
-- WHERE
--   (
--     j.ro_number ILIKE '%' || search
--     OR b.invoice_number ILIKE '%' || search
--     OR p.paymentnum ILIKE '%' || search
--     OR e.useremail ILIKE '%' || search
--   )
--   AND (e.jobid = j.id
--   or e.paymentid = p.id
--  or e.billid = b.id)
-- ;
-- END IF;
-- END $function$;
--- a/hasura/migrations/1726871373784_run_sql_migration/up.sql
+++ b/hasura/migrations/1726871373784_run_sql_migration/up.sql
@@ -1,32 +0,0 @@
-CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
- RETURNS SETOF exportlog
- LANGUAGE plpgsql
- STABLE
-AS $function$ BEGIN IF search = '' THEN RETURN query
-SELECT
-  *
-FROM
-  exportlog e;
-  ELSE RETURN query
-SELECT
-  e.*
-FROM
-  exportlog e
-  LEFT JOIN jobs j on j.id = e.jobid
-LEFT JOIN payments p 
-    ON p.id = e.paymentid
-LEFT JOIN bills b
-    ON e.billid = b.id
-WHERE
-  (
-    j.ro_number ILIKE '%' || search 
-    OR b.invoice_number ILIKE '%' || search 
-    OR p.paymentnum ILIKE '%' || search 
-    OR e.useremail ILIKE '%' || search 
-  )
-  AND (e.jobid = j.id
-  or e.paymentid = p.id
- or e.billid = b.id)
-;
-END IF;
-END $function$;
--- a/hasura/migrations/1726871384601_run_sql_migration/down.sql
+++ b/hasura/migrations/1726871384601_run_sql_migration/down.sql
@@ -1,34 +0,0 @@
-- Could not auto-generate a down migration.
-- Please write an appropriate down migration for the SQL below:
-- CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
--  RETURNS SETOF exportlog
--  LANGUAGE plpgsql
--  STABLE
-- AS $function$ BEGIN IF search = '' THEN RETURN query
-- SELECT
--   *
-- FROM
--   exportlog e;
--   ELSE RETURN query
-- SELECT
--   e.*
-- FROM
--   exportlog e
--   LEFT JOIN jobs j on j.id = e.jobid
-- LEFT JOIN payments p
--     ON p.id = e.paymentid
-- LEFT JOIN bills b
--     ON e.billid = b.id
-- WHERE
--   (
--     j.ro_number ILIKE '%' || search
--     OR b.invoice_number ILIKE '%' || search
--     OR p.paymentnum ILIKE '%' || search
--     OR e.useremail ILIKE '%' || search
--   )
--   AND (e.jobid = j.id
--   or e.paymentid = p.id
--  or e.billid = b.id)
-- ;
-- END IF;
-- END $function$;
--- a/hasura/migrations/1726871384601_run_sql_migration/up.sql
+++ b/hasura/migrations/1726871384601_run_sql_migration/up.sql
@@ -1,32 +0,0 @@
-CREATE OR REPLACE FUNCTION public.search_exportlog(search text)
- RETURNS SETOF exportlog
- LANGUAGE plpgsql
- STABLE
-AS $function$ BEGIN IF search = '' THEN RETURN query
-SELECT
-  *
-FROM
-  exportlog e;
-  ELSE RETURN query
-SELECT
-  e.*
-FROM
-  exportlog e
-  LEFT JOIN jobs j on j.id = e.jobid
-LEFT JOIN payments p 
-    ON p.id = e.paymentid
-LEFT JOIN bills b
-    ON e.billid = b.id
-WHERE
-  (
-    j.ro_number ILIKE '%' || search 
-    OR b.invoice_number ILIKE '%' || search 
-    OR p.paymentnum ILIKE '%' || search 
-    OR e.useremail ILIKE '%' || search 
-  )
-  AND (e.jobid = j.id
-  or e.paymentid = p.id
- or e.billid = b.id)
-;
-END IF;
-END $function$;
--- a/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/down.sql
+++ b/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_bill_invoice_number";
--- a/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/up.sql
+++ b/hasura/migrations/1726871425044_create_index_idx_bill_invoice_number/up.sql
@@ -1,2 +0,0 @@
-CREATE  INDEX "idx_bill_invoice_number" on
-  "public"."bills" using btree ("invoice_number");
--- a/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/down.sql
+++ b/hasura/migrations/1726871466395_create_index_idx_payments_paymentnum/down.sql
@@ -1 +0,0 @@
-DROP INDEX IF EXISTS "public"."idx_payments_paymentnum";
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dave Richer	62185196a8	feature/IO-2924-Refactor-Production-Board-For-Sockets - Clear Stage Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 23:25:21 -04:00
Dave Richer	88b313b9d8	feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 17:50:00 -04:00
Dave Richer	08e1cf80c2	feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 17:45:20 -04:00
Dave Richer	2f3056b49b	feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 17:29:48 -04:00
Dave Richer	a08125df54	feature/IO-2924-Refactor-Production-Board-For-Sockets - Checkpoint - Hasura Trigger recreated / boilerplate Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 15:32:29 -04:00
Dave Richer	a2d95dbce3	feature/IO-2742-redis - Checkpoint - clear stage before moving to sub task Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-12 11:53:29 -04:00
Dave Richer	51c181dab7	feature/IO-2742-redis - Checkpoint, Final cleanup of server.js Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 20:52:49 -04:00
Dave Richer	4486858a86	feature/IO-2742-redis - Checkpoint, All optimizations to prevent multiple requests to redis have been applied. Things like using lists for the Log Events, to getting and setting multiple values at the same time when given the chance. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 20:27:40 -04:00
Dave Richer	f606228792	feature/IO-2742-redis - Checkpoint, Redis fully implemented. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 19:08:24 -04:00
Dave Richer	bca0a35cdd	Remove express line Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 11:12:14 -04:00
Dave Richer	0ee51ed4c1	- Update Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 11:06:36 -04:00
Dave Richer	11b903f24b	- Fix DMS Socket (missing reference) - Add preview mode Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-11 10:30:55 -04:00
Dave Richer	f83deb0c26	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 17:15:08 -04:00
Dave Richer	9a0d973b26	Normalize SocketIO App wide. Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 16:23:38 -04:00
Dave Richer	ea0a717895	feature/IO-2742-redis - Normalize Network Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 15:17:13 -04:00
Dave Richer	40f1a2f6ed	feature/IO-2742-redis - Dep Bump Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-10 14:34:50 -04:00
Dave Richer	3433b1a600	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2742-redis	2024-09-10 14:28:44 -04:00
Dave Richer	49a7313abb	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-09 23:27:28 -04:00
Dave Richer	319b24ce8a	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-2742-redis	2024-09-09 11:39:48 -04:00
Dave Richer	08d8a4f7dc	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-09 11:39:39 -04:00
Dave Richer	03e8b62e4f	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-06 13:22:17 -04:00
Dave Richer	44db8f20e9	- Checkpoint Signed-off-by: Dave Richer <dave@imexsystems.ca>	2024-09-06 11:53:08 -04:00
Dave Richer	f28068d0e7	Merge remote-tracking branch 'origin/release/2024-09-06' into feature/IO-2742-redis	2024-09-05 19:38:00 -04:00
Patrick Fic	5f082b9619	Basic connection to elasticache server.	2024-08-22 14:48:00 -07:00
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."courtesycars_idx_fleet";`
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."idx_jobs_ownrfn";`
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."jobs_idx_iouparent";`
				`@@ -1 +0,0 @@`
				`CREATE INDEX idx_jobs_inproduction_true_cast ON jobs(inproduction) WHERE inproduction = ('true') :: boolean;`
				`@@ -1 +0,0 @@`
				`CREATE INDEX idx_jobs_created_at_desc ON jobs (created_at DESC);`
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."idx_bill_invoice_number";`
				`@@ -1 +0,0 @@`
				`DROP INDEX IF EXISTS "public"."idx_payments_paymentnum";`