IO-3249 Delete Job Watchers

Signed-off-by: Allan Carr <allan@imexsystems.ca>
Merged in feature/IO-3214-Extend-New-Fields-to-Audit-Log (pull request #2346 )
2025-05-26 12:49:58 -07:00 · 2025-05-26 19:10:16 +00:00 · 2025-05-26 12:11:26 -07:00 · 2025-05-26 19:08:47 +00:00 · 2025-05-26 15:07:57 -04:00 · 2025-05-26 14:49:02 -04:00
114 changed files with 2652 additions and 1799 deletions
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -13,21 +13,21 @@
        "@apollo/client": "^3.13.6",
        "@emotion/is-prop-valid": "^1.3.1",
        "@fingerprintjs/fingerprintjs": "^4.6.1",
-        "@firebase/analytics": "^0.10.13",
-        "@firebase/app": "^0.12.1",
-        "@firebase/auth": "^1.10.2",
-        "@firebase/firestore": "^4.7.12",
-        "@firebase/messaging": "^0.12.18",
+        "@firebase/analytics": "^0.10.16",
+        "@firebase/app": "^0.13.0",
+        "@firebase/auth": "^1.10.6",
+        "@firebase/firestore": "^4.7.16",
+        "@firebase/messaging": "^0.12.21",
        "@jsreport/browser-client": "^3.1.0",
-        "@reduxjs/toolkit": "^2.8.1",
+        "@reduxjs/toolkit": "^2.8.2",
        "@sentry/cli": "^2.45.0",
-        "@sentry/react": "^9.17.0",
-        "@sentry/vite-plugin": "^3.4.0",
+        "@sentry/react": "^9.22.0",
+        "@sentry/vite-plugin": "^3.5.0",
        "@splitsoftware/splitio-react": "^2.1.1",
        "@tanem/react-nprogress": "^5.0.53",
-        "antd": "^5.25.0",
+        "antd": "^5.25.3",
        "apollo-link-logger": "^2.0.1",
-        "apollo-link-sentry": "^4.2.0",
+        "apollo-link-sentry": "^4.3.0",
        "autosize": "^6.0.1",
        "axios": "^1.8.4",
        "classnames": "^2.5.1",
@@ -48,8 +48,9 @@
        "memoize-one": "^6.0.0",
        "normalize-url": "^8.0.1",
        "object-hash": "^3.0.0",
+        "phone": "^3.1.59",
        "prop-types": "^15.8.1",
-        "query-string": "^9.1.2",
+        "query-string": "^9.2.0",
        "raf-schd": "^4.0.3",
        "react": "^18.3.1",
        "react-big-calendar": "^1.18.0",
@@ -59,7 +60,7 @@
        "react-drag-listview": "^2.0.0",
        "react-grid-gallery": "^1.0.1",
        "react-grid-layout": "1.3.4",
-        "react-i18next": "^15.4.1",
+        "react-i18next": "^15.5.2",
        "react-icons": "^5.5.0",
        "react-image-lightbox": "^5.1.4",
        "react-markdown": "^10.1.0",
@@ -78,7 +79,7 @@
        "redux-saga": "^1.3.0",
        "redux-state-sync": "^3.1.4",
        "reselect": "^5.1.1",
-        "sass": "^1.86.3",
+        "sass": "^1.89.0",
        "socket.io-client": "^4.8.1",
        "styled-components": "^6.1.18",
        "subscriptions-transport-ws": "^0.11.0",
@@ -90,16 +91,16 @@
        "@ant-design/icons": "^6.0.0",
        "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
        "@babel/preset-react": "^7.27.1",
-        "@dotenvx/dotenvx": "^1.43.0",
+        "@dotenvx/dotenvx": "^1.44.1",
        "@emotion/babel-plugin": "^11.13.5",
        "@emotion/react": "^11.14.0",
-        "@eslint/js": "^9.26.0",
+        "@eslint/js": "^9.27.0",
        "@playwright/test": "^1.51.1",
-        "@sentry/webpack-plugin": "^3.4.0",
+        "@sentry/webpack-plugin": "^3.5.0",
        "@testing-library/dom": "^10.4.0",
        "@testing-library/jest-dom": "^6.6.3",
        "@testing-library/react": "^16.3.0",
-        "@vitejs/plugin-react": "^4.3.4",
+        "@vitejs/plugin-react": "^4.5.0",
        "browserslist": "^4.24.5",
        "browserslist-to-esbuild": "^2.1.1",
        "chalk": "^5.4.1",
@@ -108,7 +109,7 @@
        "eslint-plugin-react": "^7.37.5",
        "globals": "^15.15.0",
        "jsdom": "^26.0.0",
-        "memfs": "^4.17.1",
+        "memfs": "^4.17.2",
        "os-browserify": "^0.3.0",
        "playwright": "^1.51.1",
        "react-error-overlay": "^6.1.0",
@@ -120,7 +121,7 @@
        "vite-plugin-node-polyfills": "^0.23.0",
        "vite-plugin-pwa": "^1.0.0",
        "vite-plugin-style-import": "^2.0.0",
-        "vitest": "^3.1.3",
+        "vitest": "^3.1.4",
        "workbox-window": "^7.3.0"
      },
      "engines": {
@@ -2587,9 +2588,9 @@
      }
    },
    "node_modules/@dotenvx/dotenvx": {
-      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.43.0.tgz",
-      "integrity": "sha512-Z8XjM75aWZ/ekUzBjlr/OqQsLWtJY4nVtruxopAt+FlYHfY0/gKl85nD16aEqbTkU53kJcm5psID0L2/sQMmuw==",
+      "version": "1.44.1",
+      "resolved": "https://registry.npmjs.org/@dotenvx/dotenvx/-/dotenvx-1.44.1.tgz",
+      "integrity": "sha512-j1QImCqf/XJmhIjC1OPpgiZV9g370HG9MNT9s/CDwCKsoYzNCPEKK+GfsidahJx7yIlBbm+4dPLlGec+bKn7oA==",
      "dev": true,
      "license": "BSD-3-Clause",
      "dependencies": {
@@ -2912,13 +2913,16 @@
      }
    },
    "node_modules/@eslint/js": {
-      "version": "9.26.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.26.0.tgz",
-      "integrity": "sha512-I9XlJawFdSMvWjDt6wksMCrgns5ggLNfFwFvnShsleWruvXM514Qxk8V246efTw+eo9JABvVz+u3q2RiAowKxQ==",
+      "version": "9.27.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+      "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
      "dev": true,
      "license": "MIT",
      "engines": {
        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
      }
    },
    "node_modules/@fingerprintjs/fingerprintjs": {
@@ -2931,15 +2935,15 @@
      }
    },
    "node_modules/@firebase/analytics": {
-      "version": "0.10.13",
-      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.13.tgz",
-      "integrity": "sha512-X+6wMOPgA9l0AeeMdMcMfaCP4XKPvrhx55MGuMrfHvUrOvFKldpzBum7KkoGJMoexKmqmKP+mCmJMY9Fb8K6Hw==",
+      "version": "0.10.16",
+      "resolved": "https://registry.npmjs.org/@firebase/analytics/-/analytics-0.10.16.tgz",
+      "integrity": "sha512-cMtp19He7Fd6uaj/nDEul+8JwvJsN8aRSJyuA1QN3QrKvfDDp+efjVurJO61sJpkVftw9O9nNMdhFbRcTmTfRQ==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
-        "@firebase/installations": "0.6.14",
+        "@firebase/component": "0.6.17",
+        "@firebase/installations": "0.6.17",
        "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "tslib": "^2.1.0"
      },
      "peerDependencies": {
@@ -2947,14 +2951,14 @@
      }
    },
    "node_modules/@firebase/app": {
-      "version": "0.12.1",
-      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.12.1.tgz",
-      "integrity": "sha512-ASExOlmmjRMdwOQ65Oj6R9JBqa7iiT1/LgZjtbU7FqxoJZNWHrt39NJ/z2bjyYDdAHX8jkY7muFqzahScCXgfA==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@firebase/app/-/app-0.13.0.tgz",
+      "integrity": "sha512-Vj3MST245nq+V5UmmfEkB3isIgPouyUr8yGJlFeL9Trg/umG5ogAvrjAYvQ8gV7daKDoQSRnJKWI2JFpQqRsuQ==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
+        "@firebase/component": "0.6.17",
        "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "idb": "7.1.1",
        "tslib": "^2.1.0"
      },
@@ -2963,14 +2967,14 @@
      }
    },
    "node_modules/@firebase/auth": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.2.tgz",
-      "integrity": "sha512-HHudcj3CJyXpoMKslNOVHGSNJdAUjvy5xBA/G/uPb32QFqvx5F3EW9RDYvve2IHEN7Vpc1QTkk/28J32x83UGA==",
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/@firebase/auth/-/auth-1.10.6.tgz",
+      "integrity": "sha512-cFbo2FymQltog4atI9cKTO6CxKxS0dOMXslTQrlNZRH7qhDG44/d7QeI6GXLweFZtrnlecf52ESnNz1DU6ek8w==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
+        "@firebase/component": "0.6.17",
        "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "tslib": "^2.1.0"
      },
      "engines": {
@@ -2987,12 +2991,12 @@
      }
    },
    "node_modules/@firebase/component": {
-      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.14.tgz",
-      "integrity": "sha512-kf/zAT8GQJ9nYoHuj0mv7twp1QzifKYrO+GsmsVHHM+Hi9KkmI7E3B3J0CtihHpb34vinl4gbJrYJ2p2wfvc9A==",
+      "version": "0.6.17",
+      "resolved": "https://registry.npmjs.org/@firebase/component/-/component-0.6.17.tgz",
+      "integrity": "sha512-M6DOg7OySrKEFS8kxA3MU5/xc37fiOpKPMz6cTsMUcsuKB6CiZxxNAvgFta8HGRgEpZbi8WjGIj6Uf+TpOhyzg==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "tslib": "^2.1.0"
      },
      "engines": {
@@ -3000,14 +3004,14 @@
      }
    },
    "node_modules/@firebase/firestore": {
-      "version": "4.7.12",
-      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.12.tgz",
-      "integrity": "sha512-50KRdSp8xA7+G0wfWxlnCoEN951mt8BVdLMxeP57Rehj2DqIb41q6Fc6JH0dfQ4TlMqWua1YfVY1jPEAaHVF9w==",
+      "version": "4.7.16",
+      "resolved": "https://registry.npmjs.org/@firebase/firestore/-/firestore-4.7.16.tgz",
+      "integrity": "sha512-5OpvlwYVUTLEnqewOlXmtIpH8t2ISlZHDW0NDbKROM2D0ATMqFkMHdvl+/wz9zOAcb8GMQYlhCihOnVAliUbpQ==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
+        "@firebase/component": "0.6.17",
        "@firebase/logger": "0.4.4",
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "@firebase/webchannel-wrapper": "1.0.3",
        "@grpc/grpc-js": "~1.9.0",
        "@grpc/proto-loader": "^0.7.8",
@@ -3021,13 +3025,13 @@
      }
    },
    "node_modules/@firebase/installations": {
-      "version": "0.6.14",
-      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.14.tgz",
-      "integrity": "sha512-uE837g9+sv6PfjWPgOfG3JtjZ+hJ7KBHO4UVenVsvhzgOxFkvLjO/bgE7fyvsaD3fOHSXunx3adRIg4eUEMPyA==",
+      "version": "0.6.17",
+      "resolved": "https://registry.npmjs.org/@firebase/installations/-/installations-0.6.17.tgz",
+      "integrity": "sha512-zfhqCNJZRe12KyADtRrtOj+SeSbD1H/K8J24oQAJVv/u02eQajEGlhZtcx9Qk7vhGWF5z9dvIygVDYqLL4o1XQ==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
-        "@firebase/util": "1.11.1",
+        "@firebase/component": "0.6.17",
+        "@firebase/util": "1.12.0",
        "idb": "7.1.1",
        "tslib": "^2.1.0"
      },
@@ -3048,15 +3052,15 @@
      }
    },
    "node_modules/@firebase/messaging": {
-      "version": "0.12.18",
-      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.18.tgz",
-      "integrity": "sha512-2MGhUGoCZloB7ysoYzG/T2nnRmHYLT+AcqYouZuD6APabpkDhF8lHsmSQq4MFSlXhI3DKFOXxjuvbY8ec4C2JQ==",
+      "version": "0.12.21",
+      "resolved": "https://registry.npmjs.org/@firebase/messaging/-/messaging-0.12.21.tgz",
+      "integrity": "sha512-bYJ2Evj167Z+lJ1ach6UglXz5dUKY1zrJZd15GagBUJSR7d9KfiM1W8dsyL0lDxcmhmA/sLaBYAAhF1uilwN0g==",
      "license": "Apache-2.0",
      "dependencies": {
-        "@firebase/component": "0.6.14",
-        "@firebase/installations": "0.6.14",
+        "@firebase/component": "0.6.17",
+        "@firebase/installations": "0.6.17",
        "@firebase/messaging-interop-types": "0.2.3",
-        "@firebase/util": "1.11.1",
+        "@firebase/util": "1.12.0",
        "idb": "7.1.1",
        "tslib": "^2.1.0"
      },
@@ -3071,9 +3075,9 @@
      "license": "Apache-2.0"
    },
    "node_modules/@firebase/util": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.11.1.tgz",
-      "integrity": "sha512-RXg4WE8C2LUrvoV/TMGRTu223zZf9Dq9MR8yHZio9nF9TpLnpCPURw9VWWB2WATDl6HfIdWfl2x2SJYtHkN4hw==",
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.12.0.tgz",
+      "integrity": "sha512-Z4rK23xBCwgKDqmzGVMef+Vb4xso2j5Q8OG0vVL4m4fA5ZjPMYQazu8OJJC3vtQRC3SQ/Pgx/6TPNVsCd70QRw==",
      "hasInstallScript": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -3836,9 +3840,9 @@
      "license": "MIT"
    },
    "node_modules/@reduxjs/toolkit": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.1.tgz",
-      "integrity": "sha512-GLjHS13LiBdiuxSJvfWs3+Cx5yt97mCbuVlDteTusS6VRksPhoWviO8L1e3Re1G94m6lkw/l4pjEEyyNaGf19g==",
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.8.2.tgz",
+      "integrity": "sha512-MYlOhQ0sLdw4ud48FoC5w0dH9VfWQjtCjreKwYTT3l+r427qYC5Y8PihNutepr8XrNaBUDQo9khWUwQxZaqt5A==",
      "license": "MIT",
      "dependencies": {
        "@standard-schema/spec": "^1.0.0",
@@ -3882,6 +3886,13 @@
        "react": ">=16.8.0"
      }
    },
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-beta.9",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.9.tgz",
+      "integrity": "sha512-e9MeMtVWo186sgvFFJOPGy7/d2j2mZhLJIdVW0C/xDluuOvymEATqz6zKsP0ZmXGzQtqlyjz5sC1sYQUoJG98w==",
+      "dev": true,
+      "license": "MIT"
+    },
    "node_modules/@rollup/plugin-babel": {
      "version": "5.3.1",
      "resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@@ -4458,88 +4469,88 @@
      "license": "MIT"
    },
    "node_modules/@sentry-internal/browser-utils": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.17.0.tgz",
-      "integrity": "sha512-37n6NXtkUfdK7YiP3L5DJvhA/iusOmnjHQdX1e2VwI6a29xHCl/vRqLR3XNr5K4m+49al+3fWo2ltcKsfV+0xw==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.22.0.tgz",
+      "integrity": "sha512-Ou1tBnVxFAIn8i9gvrWzRotNJQYiu3awNXpsFCw6qFwmiKAVPa6b13vCdolhXnrIiuR77jY1LQnKh9hXpoRzsg==",
      "license": "MIT",
      "dependencies": {
-        "@sentry/core": "9.17.0"
+        "@sentry/core": "9.22.0"
      },
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry-internal/feedback": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.17.0.tgz",
-      "integrity": "sha512-C2jBlGgYVGm8eXK38wlYQyd6NsHKaQlENg5fx8TDFMKWMNmLf6BmnPZ+y73OsFwcUtBz04CwZteybYB2GgYrvQ==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.22.0.tgz",
+      "integrity": "sha512-zgMVkoC61fgi41zLcSZA59vOtKxcLrKBo1ECYhPD1hxEaneNqY5fhXDwlQBw96P5l2yqkgfX6YZtSdU4ejI9yA==",
      "license": "MIT",
      "dependencies": {
-        "@sentry/core": "9.17.0"
+        "@sentry/core": "9.22.0"
      },
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry-internal/replay": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.17.0.tgz",
-      "integrity": "sha512-oH4NolXkEpe73eRP9r3K6WpERYItZisYQudsNrtkUBQL5M/uENiE7YTOvL5osD8AWmU0hCKY3Oua+qDi2lB+8g==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.22.0.tgz",
+      "integrity": "sha512-9GOycoKbrclcRXfcbNV8svbmAsOS5R4wXBQmKF4pFLkmFA/lJv9kdZSNYkRvkrxdNfbMIJXP+DV9EqTZcryXig==",
      "license": "MIT",
      "dependencies": {
-        "@sentry-internal/browser-utils": "9.17.0",
-        "@sentry/core": "9.17.0"
+        "@sentry-internal/browser-utils": "9.22.0",
+        "@sentry/core": "9.22.0"
      },
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry-internal/replay-canvas": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.17.0.tgz",
-      "integrity": "sha512-w9AxBJIa+MbxDngvwnqouoJ/ezb7wNjxzFXtmaVtGp7hbC4yme/TOTNtFYg2J/ceQf3GMc8AfW5tsP6zU0R7gg==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.22.0.tgz",
+      "integrity": "sha512-EcG9IMSEalFe49kowBTJObWjof/iHteDwpyuAszsFDdQUYATrVUtwpwN7o52vDYWJud4arhjrQnMamIGxa79eQ==",
      "license": "MIT",
      "dependencies": {
-        "@sentry-internal/replay": "9.17.0",
-        "@sentry/core": "9.17.0"
+        "@sentry-internal/replay": "9.22.0",
+        "@sentry/core": "9.22.0"
      },
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry/babel-plugin-component-annotate": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.4.0.tgz",
-      "integrity": "sha512-tSzfc3aE7m0PM0Aj7HBDet5llH9AB9oc+tBQ8AvOqUSnWodLrNCuWeQszJ7mIBovD3figgCU3h0cvI6U5cDtsg==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@sentry/babel-plugin-component-annotate/-/babel-plugin-component-annotate-3.5.0.tgz",
+      "integrity": "sha512-s2go8w03CDHbF9luFGtBHKJp4cSpsQzNVqgIa9Pfa4wnjipvrK6CxVT4icpLA3YO6kg5u622Yoa5GF3cJdippw==",
      "license": "MIT",
      "engines": {
        "node": ">= 14"
      }
    },
    "node_modules/@sentry/browser": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.17.0.tgz",
-      "integrity": "sha512-3e/Q5bv06Q+XYV2cKmUgfMfnJtBY8MZKufpcwQ2ab2eMrastqau9KjYeWXapskDm179oPLfzLcDCSlDSTcvqpQ==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.22.0.tgz",
+      "integrity": "sha512-3TeRm74dvX0JdjX0AgkQa+22iUHwHnY+Q6M05NZ+tDeCNHGK/mEBTeqquS1oQX67jWyuvYmG3VV6RJUxtG9Paw==",
      "license": "MIT",
      "dependencies": {
-        "@sentry-internal/browser-utils": "9.17.0",
-        "@sentry-internal/feedback": "9.17.0",
-        "@sentry-internal/replay": "9.17.0",
-        "@sentry-internal/replay-canvas": "9.17.0",
-        "@sentry/core": "9.17.0"
+        "@sentry-internal/browser-utils": "9.22.0",
+        "@sentry-internal/feedback": "9.22.0",
+        "@sentry-internal/replay": "9.22.0",
+        "@sentry-internal/replay-canvas": "9.22.0",
+        "@sentry/core": "9.22.0"
      },
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry/bundler-plugin-core": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.4.0.tgz",
-      "integrity": "sha512-X1Q41AsQ6xcT6hB4wYmBDBukndKM/inT4IsR7pdKLi7ICpX2Qq6lisamBAEPCgEvnLpazSFguaiC0uiwMKAdqw==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@sentry/bundler-plugin-core/-/bundler-plugin-core-3.5.0.tgz",
+      "integrity": "sha512-zDzPrhJqAAy2VzV4g540qAZH4qxzisstK2+NIJPZUUKztWRWUV2cMHsyUtdctYgloGkLyGpZJBE3RE6dmP/xqQ==",
      "license": "MIT",
      "dependencies": {
        "@babel/core": "^7.18.5",
-        "@sentry/babel-plugin-component-annotate": "3.4.0",
+        "@sentry/babel-plugin-component-annotate": "3.5.0",
        "@sentry/cli": "2.42.2",
        "dotenv": "^16.3.1",
        "find-up": "^5.0.0",
@@ -4899,22 +4910,22 @@
      }
    },
    "node_modules/@sentry/core": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.17.0.tgz",
-      "integrity": "sha512-9f1A93/kY9lLH06L1thPx94IhyLjEP3aRxYAtjtBfzId8UtubSpwP92sbxgslodD73R4tURwWJj7nYZ9HLYBUg==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.22.0.tgz",
+      "integrity": "sha512-ixvtKmPF42Y6ckGUbFlB54OWI75H2gO5UYHojO6eXFpS7xO3ZGgV/QH6wb40mWK+0w5XZ0233FuU9VpsuE6mKA==",
      "license": "MIT",
      "engines": {
        "node": ">=18"
      }
    },
    "node_modules/@sentry/react": {
-      "version": "9.17.0",
-      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.17.0.tgz",
-      "integrity": "sha512-hJOVUheFoUKr5e4vHxyKiu72FRgqmMTFIUG9myim8PH8mJYDqab7Z7cOt4dsBR86soKanaRB5PJq5jGFuipLfg==",
+      "version": "9.22.0",
+      "resolved": "https://registry.npmjs.org/@sentry/react/-/react-9.22.0.tgz",
+      "integrity": "sha512-mI43NnioBYdG5TiXqRlhV1feZs9bnrrl+k5HOHBK7VQtymaXO0fkcsRLZTkdSgLRLMJGasZuvVhq2xK+18QyWQ==",
      "license": "MIT",
      "dependencies": {
-        "@sentry/browser": "9.17.0",
-        "@sentry/core": "9.17.0",
+        "@sentry/browser": "9.22.0",
+        "@sentry/core": "9.22.0",
        "hoist-non-react-statics": "^3.3.2"
      },
      "engines": {
@@ -4925,12 +4936,12 @@
      }
    },
    "node_modules/@sentry/vite-plugin": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.4.0.tgz",
-      "integrity": "sha512-pUFBGrKsHuc8K6A7B1wU2nx65n9aIzvTlcHX9yZ1qvjEO0cZFih0JCwu1Fcav/yrtT9RMN44L/ugu/kMBHQhjQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@sentry/vite-plugin/-/vite-plugin-3.5.0.tgz",
+      "integrity": "sha512-jUnpTdpicG8wefamw7eNo2uO+Q3KCbOAiF76xH4gfNHSW6TN2hBfOtmLu7J+ive4c0Al3+NEHz19bIPR0lkwWg==",
      "license": "MIT",
      "dependencies": {
-        "@sentry/bundler-plugin-core": "3.4.0",
+        "@sentry/bundler-plugin-core": "3.5.0",
        "unplugin": "1.0.1"
      },
      "engines": {
@@ -4938,13 +4949,13 @@
      }
    },
    "node_modules/@sentry/webpack-plugin": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-3.4.0.tgz",
-      "integrity": "sha512-i+nAxxniJV5ovijojjTF5n+Yj08Xk8my+vm8+oo0C0I7xcnI2gOKft6B0sJOq01CNbo85X5m/3/edL0PKoWE9w==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/@sentry/webpack-plugin/-/webpack-plugin-3.5.0.tgz",
+      "integrity": "sha512-xvclj0QY2HyU7uJLzOlHSrZQBDwfnGKJxp8mmlU4L7CwmK+8xMCqlO7tYZoqE4K/wU3c2xpXql70x8qmvNMxzQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@sentry/bundler-plugin-core": "3.4.0",
+        "@sentry/bundler-plugin-core": "3.5.0",
        "unplugin": "1.0.1",
        "uuid": "^9.0.0"
      },
@@ -5790,15 +5801,16 @@
      "license": "ISC"
    },
    "node_modules/@vitejs/plugin-react": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz",
-      "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.5.0.tgz",
+      "integrity": "sha512-JuLWaEqypaJmOJPLWwO335Ig6jSgC1FTONCWAxnqcQthLTK/Yc9aH6hr9z/87xciejbQcnP3GnA1FWUSWeXaeg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
        "@babel/core": "^7.26.10",
        "@babel/plugin-transform-react-jsx-self": "^7.25.9",
        "@babel/plugin-transform-react-jsx-source": "^7.25.9",
+        "@rolldown/pluginutils": "1.0.0-beta.9",
        "@types/babel__core": "^7.20.5",
        "react-refresh": "^0.17.0"
      },
@@ -5810,14 +5822,14 @@
      }
    },
    "node_modules/@vitest/expect": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.3.tgz",
-      "integrity": "sha512-7FTQQuuLKmN1Ig/h+h/GO+44Q1IlglPlR2es4ab7Yvfx+Uk5xsv+Ykk+MEt/M2Yn/xGmzaLKxGw2lgy2bwuYqg==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
+      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.1.3",
-        "@vitest/utils": "3.1.3",
+        "@vitest/spy": "3.1.4",
+        "@vitest/utils": "3.1.4",
        "chai": "^5.2.0",
        "tinyrainbow": "^2.0.0"
      },
@@ -5826,13 +5838,13 @@
      }
    },
    "node_modules/@vitest/mocker": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.3.tgz",
-      "integrity": "sha512-PJbLjonJK82uCWHjzgBJZuR7zmAOrSvKk1QBxrennDIgtH4uK0TB1PvYmc0XBCigxxtiAVPfWtAdy4lpz8SQGQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
+      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/spy": "3.1.3",
+        "@vitest/spy": "3.1.4",
        "estree-walker": "^3.0.3",
        "magic-string": "^0.30.17"
      },
@@ -5873,9 +5885,9 @@
      }
    },
    "node_modules/@vitest/pretty-format": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.3.tgz",
-      "integrity": "sha512-i6FDiBeJUGLDKADw2Gb01UtUNb12yyXAqC/mmRWuYl+m/U9GS7s8us5ONmGkGpUUo7/iAYzI2ePVfOZTYvUifA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
+      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5886,13 +5898,13 @@
      }
    },
    "node_modules/@vitest/runner": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.3.tgz",
-      "integrity": "sha512-Tae+ogtlNfFei5DggOsSUvkIaSuVywujMj6HzR97AHK6XK8i3BuVyIifWAm/sE3a15lF5RH9yQIrbXYuo0IFyA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
+      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/utils": "3.1.3",
+        "@vitest/utils": "3.1.4",
        "pathe": "^2.0.3"
      },
      "funding": {
@@ -5907,13 +5919,13 @@
      "license": "MIT"
    },
    "node_modules/@vitest/snapshot": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.3.tgz",
-      "integrity": "sha512-XVa5OPNTYUsyqG9skuUkFzAeFnEzDp8hQu7kZ0N25B1+6KjGm4hWLtURyBbsIAOekfWQ7Wuz/N/XXzgYO3deWQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
+      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.1.3",
+        "@vitest/pretty-format": "3.1.4",
        "magic-string": "^0.30.17",
        "pathe": "^2.0.3"
      },
@@ -5939,9 +5951,9 @@
      "license": "MIT"
    },
    "node_modules/@vitest/spy": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.3.tgz",
-      "integrity": "sha512-x6w+ctOEmEXdWaa6TO4ilb7l9DxPR5bwEb6hILKuxfU1NqWT2mpJD9NJN7t3OTfxmVlOMrvtoFJGdgyzZ605lQ==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
+      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -5952,13 +5964,13 @@
      }
    },
    "node_modules/@vitest/utils": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.3.tgz",
-      "integrity": "sha512-2Ltrpht4OmHO9+c/nmHtF09HWiyWdworqnHIwjfvDyWjuwKbdkcS9AnhsDn+8E2RM4x++foD1/tNuLPVvWG1Rg==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
+      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/pretty-format": "3.1.3",
+        "@vitest/pretty-format": "3.1.4",
        "loupe": "^3.1.3",
        "tinyrainbow": "^2.0.0"
      },
@@ -6088,12 +6100,12 @@
      }
    },
    "node_modules/antd": {
-      "version": "5.25.0",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.0.tgz",
-      "integrity": "sha512-p9d8Kuj/bipjNdg9NrTu1VmTrhcwIhURu2NfK6qaBMbb+LRyFdAUoseT+7J4a+5z3jNVjxH5zaYv/45Zf8Coyg==",
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.25.3.tgz",
+      "integrity": "sha512-tBBcAFRjmWM3sitxrL/FEbQL+MTQntYY5bGa5c1ZZZHXWCynkhS3Ch/gy25mGMUY1M/9Uw3pH029v/RGht1x3w==",
      "license": "MIT",
      "dependencies": {
-        "@ant-design/colors": "^7.2.0",
+        "@ant-design/colors": "^7.2.1",
        "@ant-design/cssinjs": "^1.23.0",
        "@ant-design/cssinjs-utils": "^1.1.3",
        "@ant-design/fast-color": "^2.0.6",
@@ -6128,11 +6140,11 @@
        "rc-rate": "~2.13.1",
        "rc-resize-observer": "^1.4.3",
        "rc-segmented": "~2.7.0",
-        "rc-select": "~14.16.6",
+        "rc-select": "~14.16.8",
        "rc-slider": "~11.1.8",
        "rc-steps": "~6.0.1",
        "rc-switch": "~4.1.0",
-        "rc-table": "~7.50.4",
+        "rc-table": "~7.50.5",
        "rc-tabs": "~15.6.1",
        "rc-textarea": "~1.10.0",
        "rc-tooltip": "~6.4.0",
@@ -6153,9 +6165,9 @@
      }
    },
    "node_modules/antd/node_modules/@ant-design/colors": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.0.tgz",
-      "integrity": "sha512-bjTObSnZ9C/O8MB/B4OUtd/q9COomuJAR2SYfhxLyHvCKn4EKwCN3e+fWGMo7H5InAyV0wL17jdE9ALrdOW/6A==",
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-7.2.1.tgz",
+      "integrity": "sha512-lCHDcEzieu4GA3n8ELeZ5VQ8pKQAWcGGLRTQ50aQM2iqPpq2evTxER84jfdPvsPAtEcZ7m44NI45edFMo8oOYQ==",
      "license": "MIT",
      "dependencies": {
        "@ant-design/fast-color": "^2.0.6"
@@ -6232,9 +6244,9 @@
      }
    },
    "node_modules/apollo-link-sentry": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-4.2.0.tgz",
-      "integrity": "sha512-w8EUM4aEw1/VxIB3KOP11T8qz44oWRcbXRd2vJq/qHnfRMKS5HkMerSIYwKN2e8k9H8ubfkwBvStH51CVf4wwg==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/apollo-link-sentry/-/apollo-link-sentry-4.3.0.tgz",
+      "integrity": "sha512-C3WK4iwIzW5vC5BoY3VPdKjm16P6ca/LGKFnxg6PvUuboxPlqs7LHQCYvEsdAxBkoY+8kRXd8Q3+3oU+HHUceA==",
      "license": "MIT",
      "dependencies": {
        "deepmerge": "^4.2.2",
@@ -11833,9 +11845,9 @@
      }
    },
    "node_modules/memfs": {
-      "version": "4.17.1",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.1.tgz",
-      "integrity": "sha512-thuTRd7F4m4dReCIy7vv4eNYnU6XI/tHMLSMMHLiortw/Y0QxqKtinG523U2aerzwYWGi606oBP4oMPy4+edag==",
+      "version": "4.17.2",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.17.2.tgz",
+      "integrity": "sha512-NgYhCOWgovOXSzvYgUW0LQ7Qy72rWQMGGFJDoWg4G30RHd3z77VbYdtJ4fembJXBy8pMIUA31XNAupobOQlwdg==",
      "dev": true,
      "license": "Apache-2.0",
      "dependencies": {
@@ -13263,6 +13275,15 @@
      "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
      "license": "MIT"
    },
+    "node_modules/phone": {
+      "version": "3.1.59",
+      "resolved": "https://registry.npmjs.org/phone/-/phone-3.1.59.tgz",
+      "integrity": "sha512-CUv22jw0Zgrb/h7v3sEd262zJXS/66h7zyCCRIynx+2FswAJuuFsXsJkIxMUT4UcosKxDx1bJwdZeGnDELLsCw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      }
+    },
    "node_modules/picocolors": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
@@ -13569,9 +13590,9 @@
      }
    },
    "node_modules/query-string": {
-      "version": "9.1.2",
-      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.1.2.tgz",
-      "integrity": "sha512-s3UlTyjxRux4KjwWaJsjh1Mp8zoCkSGKirbD9H89pEM9UOZsfpRZpdfzvsy2/mGlLfC3NnYVpy2gk7jXITHEtA==",
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/query-string/-/query-string-9.2.0.tgz",
+      "integrity": "sha512-YIRhrHujoQxhexwRLxfy3VSjOXmvZRd2nyw1PwL1UUqZ/ys1dEZd1+NSgXkne2l/4X/7OXkigEAuhTX0g/ivJQ==",
      "license": "MIT",
      "dependencies": {
        "decode-uri-component": "^0.4.1",
@@ -14024,9 +14045,9 @@
      }
    },
    "node_modules/rc-select": {
-      "version": "14.16.6",
-      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.6.tgz",
-      "integrity": "sha512-YPMtRPqfZWOm2XGTbx5/YVr1HT0vn//8QS77At0Gjb3Lv+Lbut0IORJPKLWu1hQ3u4GsA0SrDzs7nI8JG7Zmyg==",
+      "version": "14.16.8",
+      "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.16.8.tgz",
+      "integrity": "sha512-NOV5BZa1wZrsdkKaiK7LHRuo5ZjZYMDxPP6/1+09+FB4KoNi8jcG1ZqLE3AVCxEsYMBe65OBx71wFoHRTP3LRg==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.10.1",
@@ -14097,9 +14118,9 @@
      }
    },
    "node_modules/rc-table": {
-      "version": "7.50.4",
-      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.50.4.tgz",
-      "integrity": "sha512-Y+YuncnQqoS5e7yHvfvlv8BmCvwDYDX/2VixTBEhkMDk9itS9aBINp4nhzXFKiBP/frG4w0pS9d9Rgisl0T1Bw==",
+      "version": "7.50.5",
+      "resolved": "https://registry.npmjs.org/rc-table/-/rc-table-7.50.5.tgz",
+      "integrity": "sha512-FDZu8aolhSYd3v9KOc3lZOVAU77wmRRu44R0Wfb8Oj1dXRUsloFaXMSl6f7yuWZUxArJTli7k8TEOX2mvhDl4A==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.10.1",
@@ -14400,9 +14421,9 @@
      }
    },
    "node_modules/react-i18next": {
-      "version": "15.5.1",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.5.1.tgz",
-      "integrity": "sha512-C8RZ7N7H0L+flitiX6ASjq9p5puVJU1Z8VyL3OgM/QOMRf40BMZX+5TkpxzZVcTmOLPX5zlti4InEX5pFyiVeA==",
+      "version": "15.5.2",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.5.2.tgz",
+      "integrity": "sha512-ePODyXgmZQAOYTbZXQn5rRsSBu3Gszo69jxW6aKmlSgxKAI1fOhDwSu6bT4EKHciWPKQ7v7lPrjeiadR6Gi+1A==",
      "license": "MIT",
      "dependencies": {
        "@babel/runtime": "^7.25.0",
@@ -15375,9 +15396,9 @@
      "license": "MIT"
    },
    "node_modules/sass": {
-      "version": "1.87.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz",
-      "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
+      "version": "1.89.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+      "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
      "license": "MIT",
      "dependencies": {
        "chokidar": "^4.0.0",
@@ -17533,9 +17554,9 @@
      }
    },
    "node_modules/vite-node": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.3.tgz",
-      "integrity": "sha512-uHV4plJ2IxCl4u1up1FQRrqclylKAogbtBfOTwcuJ28xFi+89PZ57BRh+naIRvH70HPwxy5QHYzg1OrEaC7AbA==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
+      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
@@ -17731,19 +17752,19 @@
      }
    },
    "node_modules/vitest": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.3.tgz",
-      "integrity": "sha512-188iM4hAHQ0km23TN/adso1q5hhwKqUpv+Sd6p5sOuh6FhQnRNW3IsiIpvxqahtBabsJ2SLZgmGSpcYK4wQYJw==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
+      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
-        "@vitest/expect": "3.1.3",
-        "@vitest/mocker": "3.1.3",
-        "@vitest/pretty-format": "^3.1.3",
-        "@vitest/runner": "3.1.3",
-        "@vitest/snapshot": "3.1.3",
-        "@vitest/spy": "3.1.3",
-        "@vitest/utils": "3.1.3",
+        "@vitest/expect": "3.1.4",
+        "@vitest/mocker": "3.1.4",
+        "@vitest/pretty-format": "^3.1.4",
+        "@vitest/runner": "3.1.4",
+        "@vitest/snapshot": "3.1.4",
+        "@vitest/spy": "3.1.4",
+        "@vitest/utils": "3.1.4",
        "chai": "^5.2.0",
        "debug": "^4.4.0",
        "expect-type": "^1.2.1",
@@ -17756,7 +17777,7 @@
        "tinypool": "^1.0.2",
        "tinyrainbow": "^2.0.0",
        "vite": "^5.0.0 || ^6.0.0",
-        "vite-node": "3.1.3",
+        "vite-node": "3.1.4",
        "why-is-node-running": "^2.3.0"
      },
      "bin": {
@@ -17772,8 +17793,8 @@
        "@edge-runtime/vm": "*",
        "@types/debug": "^4.1.12",
        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
-        "@vitest/browser": "3.1.3",
-        "@vitest/ui": "3.1.3",
+        "@vitest/browser": "3.1.4",
+        "@vitest/ui": "3.1.4",
        "happy-dom": "*",
        "jsdom": "*"
      },
--- a/client/package.json
+++ b/client/package.json
@@ -12,21 +12,21 @@
    "@apollo/client": "^3.13.6",
    "@emotion/is-prop-valid": "^1.3.1",
    "@fingerprintjs/fingerprintjs": "^4.6.1",
-    "@firebase/analytics": "^0.10.13",
-    "@firebase/app": "^0.12.1",
-    "@firebase/auth": "^1.10.2",
-    "@firebase/firestore": "^4.7.12",
-    "@firebase/messaging": "^0.12.18",
+    "@firebase/analytics": "^0.10.16",
+    "@firebase/app": "^0.13.0",
+    "@firebase/auth": "^1.10.6",
+    "@firebase/firestore": "^4.7.16",
+    "@firebase/messaging": "^0.12.21",
    "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.8.1",
+    "@reduxjs/toolkit": "^2.8.2",
    "@sentry/cli": "^2.45.0",
-    "@sentry/react": "^9.17.0",
-    "@sentry/vite-plugin": "^3.4.0",
+    "@sentry/react": "^9.22.0",
+    "@sentry/vite-plugin": "^3.5.0",
    "@splitsoftware/splitio-react": "^2.1.1",
    "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.25.0",
+    "antd": "^5.25.3",
    "apollo-link-logger": "^2.0.1",
-    "apollo-link-sentry": "^4.2.0",
+    "apollo-link-sentry": "^4.3.0",
    "autosize": "^6.0.1",
    "axios": "^1.8.4",
    "classnames": "^2.5.1",
@@ -47,8 +47,9 @@
    "memoize-one": "^6.0.0",
    "normalize-url": "^8.0.1",
    "object-hash": "^3.0.0",
+    "phone": "^3.1.59",
    "prop-types": "^15.8.1",
-    "query-string": "^9.1.2",
+    "query-string": "^9.2.0",
    "raf-schd": "^4.0.3",
    "react": "^18.3.1",
    "react-big-calendar": "^1.18.0",
@@ -58,7 +59,7 @@
    "react-drag-listview": "^2.0.0",
    "react-grid-gallery": "^1.0.1",
    "react-grid-layout": "1.3.4",
-    "react-i18next": "^15.4.1",
+    "react-i18next": "^15.5.2",
    "react-icons": "^5.5.0",
    "react-image-lightbox": "^5.1.4",
    "react-markdown": "^10.1.0",
@@ -77,7 +78,7 @@
    "redux-saga": "^1.3.0",
    "redux-state-sync": "^3.1.4",
    "reselect": "^5.1.1",
-    "sass": "^1.86.3",
+    "sass": "^1.89.0",
    "socket.io-client": "^4.8.1",
    "styled-components": "^6.1.18",
    "subscriptions-transport-ws": "^0.11.0",
@@ -130,16 +131,16 @@
    "@ant-design/icons": "^6.0.0",
    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
    "@babel/preset-react": "^7.27.1",
-    "@dotenvx/dotenvx": "^1.43.0",
+    "@dotenvx/dotenvx": "^1.44.1",
    "@emotion/babel-plugin": "^11.13.5",
    "@emotion/react": "^11.14.0",
-    "@eslint/js": "^9.26.0",
+    "@eslint/js": "^9.27.0",
    "@playwright/test": "^1.51.1",
-    "@sentry/webpack-plugin": "^3.4.0",
+    "@sentry/webpack-plugin": "^3.5.0",
    "@testing-library/dom": "^10.4.0",
    "@testing-library/jest-dom": "^6.6.3",
    "@testing-library/react": "^16.3.0",
-    "@vitejs/plugin-react": "^4.3.4",
+    "@vitejs/plugin-react": "^4.5.0",
    "browserslist": "^4.24.5",
    "browserslist-to-esbuild": "^2.1.1",
    "chalk": "^5.4.1",
@@ -148,7 +149,7 @@
    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "jsdom": "^26.0.0",
-    "memfs": "^4.17.1",
+    "memfs": "^4.17.2",
    "os-browserify": "^0.3.0",
    "playwright": "^1.51.1",
    "react-error-overlay": "^6.1.0",
@@ -160,7 +161,7 @@
    "vite-plugin-node-polyfills": "^0.23.0",
    "vite-plugin-pwa": "^1.0.0",
    "vite-plugin-style-import": "^2.0.0",
-    "vitest": "^3.1.3",
+    "vitest": "^3.1.4",
    "workbox-window": "^7.3.0"
  }
 }
--- a/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit-return.component.jsx
@@ -14,8 +14,21 @@ const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  setPartsOrderContext: (context) => dispatch(setModalContext({ context: context, modal: "partsOrder" })),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  setPartsOrderContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "partsOrder"
+      })
+    ),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });

 export default connect(mapStateToProps, mapDispatchToProps)(BillDetailEditReturn);
@@ -69,7 +82,7 @@ export function BillDetailEditReturn({ setPartsOrderContext, insertAuditTrail, b
      <Modal
        open={open}
        onCancel={() => setOpen(false)}
-        destroyOnClose
+        destroyOnHidden
        title={t("bills.actions.return")}
        onOk={() => form.submit()}
      >
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -29,7 +29,7 @@ export default function BillDetailEditcontainer() {
        delete search.billid;
        history({ search: queryString.stringify(search) });
      }}
-      destroyOnClose
+      destroyOnHidden
      open={search.billid}
    >
      <BillDetailEditComponent />
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -412,7 +412,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
          )}
        </Space>
      }
-      destroyOnClose
+      destroyOnHidden
    >
      <Form
        onFinish={handleFinish}
--- a/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
+++ b/client/src/components/ca-bc-etf-table-modal/ca-bc-etf-table-modal.container.jsx
@@ -75,7 +75,7 @@ export function ContractsFindModalContainer({ caBcEtfTableModal, toggleModalVisi
      title={t("payments.labels.findermodal")}
      onCancel={() => toggleModalVisible()}
      onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
      forceRender
    >
      <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>
--- a/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
+++ b/client/src/components/ca-bc-pvrt-calculator/ca-bc-pvrt-calculator.component.jsx
@@ -3,6 +3,7 @@ import { Button, Form, InputNumber, Popover, Space } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+
 export default function CABCpvrtCalculator({ disabled, form }) {
  const [visibility, setVisibility] = useState(false);

@@ -39,7 +40,7 @@ export default function CABCpvrtCalculator({ disabled, form }) {
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <Button disabled={disabled} onClick={() => setVisibility(true)}>
        <CalculatorFilled />
      </Button>
--- a/client/src/components/card-payment-modal/card-payment-modal.container.jsx
+++ b/client/src/components/card-payment-modal/card-payment-modal.container.jsx
@@ -40,7 +40,7 @@ function CardPaymentModalContainer({ cardPaymentModal, toggleModalVisible, bodys
        </Button>
      ]}
      width="80%"
-      destroyOnClose
+      destroyOnHidden
    >
      <CardPaymentModalComponent />
    </Modal>
--- a/client/src/components/chat-affix/chat-affix.container.jsx
+++ b/client/src/components/chat-affix/chat-affix.container.jsx
@@ -34,16 +34,14 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {

    SubscribeToTopicForFCMNotification();

-    //Register WS handlers
+    // Register WebSocket handlers
    if (socket && socket.connected) {
      registerMessagingHandlers({ socket, client });
-    }

-    return () => {
-      if (socket && socket.connected) {
+      return () => {
        unregisterMessagingHandlers({ socket });
-      }
-    };
+      };
+    }
  }, [bodyshop, socket, t, client]);

  if (!bodyshop || !bodyshop.messagingservicesid) return <></>;
--- a/client/src/components/chat-affix/registerMessagingSocketHandlers.js
+++ b/client/src/components/chat-affix/registerMessagingSocketHandlers.js
@@ -202,8 +202,6 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                      text: message.text
                    };

-                  // Add cases for other known message types as needed
-
                  default:
                    // Log a warning for unhandled message types
                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
@@ -211,7 +209,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
                }
              }

-              return messageRef; // Keep other messages unchanged
+              return messageRef;
            });
          }
        }
@@ -245,11 +243,8 @@ export const registerMessagingHandlers = ({ socket, client }) => {
        });

        const updatedList = existingList?.conversations
-          ? [
-              newConversation,
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
+          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
+          : [newConversation]; // Prevent duplicates

        client.cache.writeQuery({
          query: CONVERSATION_LIST_QUERY,
@@ -403,6 +398,7 @@ export const registerMessagingHandlers = ({ socket, client }) => {
          }

          break;
+
        default:
          logLocal("handleConversationChanged - Unhandled type", { type });
          client.cache.modify({
@@ -419,10 +415,95 @@ export const registerMessagingHandlers = ({ socket, client }) => {
    }
  };

+  // Existing handler for phone number opt-out
+  const handlePhoneNumberOptedOut = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedOut - Start", data);
+
+    try {
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            const phoneNumberExists = existing.some(
+              (ref) => readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid
+            );
+
+            if (phoneNumberExists) {
+              logLocal("handlePhoneNumberOptedOut - Phone number already in cache", { phone_number, bodyshopid });
+              return existing;
+            }
+
+            const newOptOut = {
+              __typename: "phone_number_opt_out",
+              id: `temporary-${phone_number}-${Date.now()}`,
+              bodyshopid,
+              phone_number,
+              created_at: new Date().toISOString(),
+              updated_at: new Date().toISOString()
+            };
+
+            return [...existing, newOptOut];
+          }
+        },
+        broadcast: true
+      });
+
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedOut - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-out:", error);
+      logLocal("handlePhoneNumberOptedOut - Error", { error: error.message });
+    }
+  };
+  
+  // New handler for phone number opt-in
+  const handlePhoneNumberOptedIn = async (data) => {
+    const { bodyshopid, phone_number } = data;
+    logLocal("handlePhoneNumberOptedIn - Start", data);
+
+    try {
+      // Update the Apollo cache for GET_PHONE_NUMBER_OPT_OUTS by removing the phone number
+      client.cache.modify({
+        id: "ROOT_QUERY",
+        fields: {
+          phone_number_opt_out(existing = [], { readField }) {
+            // Filter out the phone number from the opt-out list
+            return existing.filter(
+              (ref) => !(readField("phone_number", ref) === phone_number && readField("bodyshopid", ref) === bodyshopid)
+            );
+          }
+        },
+        broadcast: true // Trigger UI updates
+      });
+
+      // Evict the cache entry to force a refetch on next query
+      client.cache.evict({
+        id: "ROOT_QUERY",
+        fieldName: "phone_number_opt_out",
+        args: { bodyshopid, search: phone_number }
+      });
+      client.cache.gc();
+
+      logLocal("handlePhoneNumberOptedIn - Cache updated successfully", data);
+    } catch (error) {
+      console.error("Error updating cache for phone number opt-in:", error);
+      logLocal("handlePhoneNumberOptedIn - Error", { error: error.message });
+    }
+  };
+
  socket.on("new-message-summary", handleNewMessageSummary);
  socket.on("new-message-detailed", handleNewMessageDetailed);
  socket.on("message-changed", handleMessageChanged);
  socket.on("conversation-changed", handleConversationChanged);
+  socket.on("phone-number-opted-out", handlePhoneNumberOptedOut);
+  socket.on("phone-number-opted-in", handlePhoneNumberOptedIn);
 };

 export const unregisterMessagingHandlers = ({ socket }) => {
@@ -431,4 +512,6 @@ export const unregisterMessagingHandlers = ({ socket }) => {
  socket.off("new-message-detailed");
  socket.off("message-changed");
  socket.off("conversation-changed");
+  socket.off("phone-number-opted-out");
+  socket.off("phone-number-opted-in");
 };
--- a/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.component.jsx
@@ -1,5 +1,5 @@
 import { Badge, Card, List, Space, Tag } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { connect } from "react-redux";
 import { Virtuoso } from "react-virtuoso";
 import { createStructuredSelector } from "reselect";
@@ -10,35 +10,60 @@ import PhoneFormatter from "../../utils/PhoneFormatter";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import _ from "lodash";
 import "./chat-conversation-list.styles.scss";
+import { useQuery } from "@apollo/client";
+import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries.js";
+import { phone } from "phone";
+import { useTranslation } from "react-i18next";
+import { selectBodyshop } from "../../redux/user/user.selectors";

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

 const mapDispatchToProps = (dispatch) => ({
  setSelectedConversation: (conversationId) => dispatch(setSelectedConversation(conversationId))
 });

-function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation }) {
-  // That comma is there for a reason, do not remove it
+function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
+  const { t } = useTranslation();
  const [, forceUpdate] = useState(false);

-  // Re-render every minute
+  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
+
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+    variables: {
+      bodyshopid: bodyshop.id,
+      phone_numbers: phoneNumbers
+    },
+    skip: !conversationList.length,
+    fetchPolicy: "cache-and-network"
+  });
+
+  const optOutMap = useMemo(() => {
+    const map = new Map();
+    optOutData?.phone_number_opt_out?.forEach((optOut) => {
+      map.set(optOut.phone_number, true);
+    });
+    return map;
+  }, [optOutData?.phone_number_opt_out]);
+
  useEffect(() => {
    const interval = setInterval(() => {
-      forceUpdate((prev) => !prev); // Toggle state to trigger re-render
-    }, 60000); // 1 minute in milliseconds
-
-    return () => clearInterval(interval); // Cleanup on unmount
+      forceUpdate((prev) => !prev);
+    }, 60000);
+    return () => clearInterval(interval);
  }, []);

-  // Memoize the sorted conversation list
-  const sortedConversationList = React.useMemo(() => {
+  const sortedConversationList = useMemo(() => {
    return _.orderBy(conversationList, ["updated_at"], ["desc"]);
  }, [conversationList]);

-  const renderConversation = (index) => {
+  const renderConversation = (index, t) => {
    const item = sortedConversationList[index];
+    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
+    const hasOptOutEntry = optOutMap.has(normalizedPhone);
+
    const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
    const cardContentLeft =
      item.job_conversations.length > 0
@@ -60,7 +85,12 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
      </>
    );

-    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
+    const cardExtra = (
+      <>
+        <Badge count={item.messages_aggregate.aggregate.count} />
+        {hasOptOutEntry && <Tag color="red">{t("messaging.labels.no_consent")}</Tag>}
+      </>
+    );

    const getCardStyle = () =>
      item.id === selectedConversation
@@ -73,9 +103,25 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
        onClick={() => setSelectedConversation(item.id)}
        className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
      >
-        <Card style={getCardStyle()} bordered={false} size="small" extra={cardExtra} title={cardTitle}>
-          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
-          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</div>
+        <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
+          <div
+            style={{
+              display: "inline-block",
+              width: "70%",
+              textAlign: "left"
+            }}
+          >
+            {cardContentLeft}
+          </div>
+          <div
+            style={{
+              display: "inline-block",
+              width: "30%",
+              textAlign: "right"
+            }}
+          >
+            {cardContentRight}
+          </div>
        </Card>
      </List.Item>
    );
@@ -85,7 +131,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
    <div className="chat-list-container">
      <Virtuoso
        data={sortedConversationList}
-        itemContent={(index) => renderConversation(index)}
+        itemContent={(index) => renderConversation(index, t)}
        style={{ height: "100%", width: "100%" }}
      />
    </div>
--- a/client/src/components/chat-conversation-list/chat-conversation-list.styles.scss
+++ b/client/src/components/chat-conversation-list/chat-conversation-list.styles.scss
@@ -24,7 +24,7 @@

 /* Add spacing and better alignment for items */
 .chat-list-item {
-  padding: 0.5rem 0; /* Add spacing between list items */
+  padding: 0.2rem 0; /* Add spacing between list items */

  .ant-card {
    border-radius: 8px; /* Slight rounding for card edges */
--- a/client/src/components/chat-media-selector/chat-media-selector.component.jsx
+++ b/client/src/components/chat-media-selector/chat-media-selector.component.jsx
@@ -37,7 +37,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
    fetchPolicy: "network-only",
    nextFetchPolicy: "network-only",
    variables: {
-      jobId: conversation.job_conversations[0] && conversation.job_conversations[0].jobid
+      jobId: conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid
    },

    skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
@@ -67,14 +67,14 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
        <>
          {!bodyshop.uselocalmediaserver && (
            <JobsDocumentImgproxyGalleryExternal
-              jobId={conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0]?.jobid}
              externalMediaState={[selectedMedia, setSelectedMedia]}
            />
          )}
          {bodyshop.uselocalmediaserver && open && (
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid}
            />
          )}
        </>
@@ -89,7 +89,7 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
          {bodyshop.uselocalmediaserver && open && (
            <JobDocumentsLocalGalleryExternal
              externalMediaState={[selectedMedia, setSelectedMedia]}
-              jobId={conversation.job_conversations[0] && conversation.job_conversations[0].jobid}
+              jobId={conversation.job_conversations[0] && conversation.job_conversations[0]?.jobid}
            />
          )}
        </>
--- a/client/src/components/chat-messages-list/renderMessage.jsx
+++ b/client/src/components/chat-messages-list/renderMessage.jsx
@@ -2,7 +2,7 @@ import Icon from "@ant-design/icons";
 import { Tooltip } from "antd";
 import i18n from "i18next";
 import dayjs from "../../utils/day";
-import { MdDone, MdDoneAll } from "react-icons/md";
+import { MdClose, MdDone, MdDoneAll } from "react-icons/md";
 import { DateTimeFormatter } from "../../utils/DateFormatter";

 export const renderMessage = (messages, index) => {
@@ -31,13 +31,16 @@ export const renderMessage = (messages, index) => {
        </Tooltip>

        {/* Message status icons */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
-          <div className="message-status">
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
-          </div>
-        )}
+        {message.status &&
+          (message.status === "sent" || message.status === "delivered" || message.status === "failed") && (
+            <div className="message-status">
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : MdClose}
+                className="message-icon"
+              />
+            </div>
+          )}
      </div>
-
      {/* Outbound message metadata */}
      {message.isoutbound && (
        <div style={{ fontSize: 10 }}>
--- a/client/src/components/chat-send-message/chat-send-message.component.jsx
+++ b/client/src/components/chat-send-message/chat-send-message.component.jsx
@@ -1,6 +1,6 @@
 import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
-import { Input, Spin } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import { Alert, Input, Space, Spin } from "antd";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -10,6 +10,9 @@ import { selectIsSending, selectMessage } from "../../redux/messaging/messaging.
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ChatMediaSelector from "../chat-media-selector/chat-media-selector.component";
 import ChatPresetsComponent from "../chat-presets/chat-presets.component";
+import { useQuery } from "@apollo/client";
+import { phone } from "phone";
+import { GET_PHONE_NUMBER_OPT_OUT } from "../../graphql/phone-number-opt-out.queries";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -25,16 +28,24 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSending, message, setMessage }) {
  const inputArea = useRef(null);
  const [selectedMedia, setSelectedMedia] = useState([]);
+  const { t } = useTranslation();
+
+  const normalizedPhone = phone(conversation.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUT, {
+    variables: { bodyshopid: bodyshop.id, phone_number: normalizedPhone },
+    fetchPolicy: "cache-and-network"
+  });
+
+  const isOptedOut = !!optOutData?.phone_number_opt_out?.[0];

  useEffect(() => {
    inputArea.current.focus();
  }, [isSending, setMessage]);

-  const { t } = useTranslation();
-
  const handleEnter = () => {
    const selectedImages = selectedMedia.filter((i) => i.isSelected);
    if ((message === "" || !message) && selectedImages.length === 0) return;
+    if (isOptedOut) return; // Prevent sending if phone number is opted out
    logImEXEvent("messaging_send_message");

    if (selectedImages.length < 11) {
@@ -44,7 +55,8 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
        messagingServiceSid: bodyshop.messagingservicesid,
        conversationid: conversation.id,
        selectedMedia: selectedImages,
-        imexshopid: bodyshop.imexshopid
+        imexshopid: bodyshop.imexshopid,
+        bodyshopid: bodyshop.id
      };
      sendMessage(newMessage);
      setSelectedMedia(
@@ -56,47 +68,58 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
  };

  return (
-    <div className="imex-flex-row" style={{ width: "100%" }}>
-      <ChatPresetsComponent className="imex-flex-row__margin" />
-      <ChatMediaSelector
-        conversation={conversation}
-        selectedMedia={selectedMedia}
-        setSelectedMedia={setSelectedMedia}
-      />
-      <span style={{ flex: 1 }}>
-        <Input.TextArea
-          className="imex-flex-row__margin imex-flex-row__grow"
-          allowClear
-          autoFocus
-          ref={inputArea}
-          autoSize={{ minRows: 1, maxRows: 4 }}
-          value={message}
-          disabled={isSending}
-          placeholder={t("messaging.labels.typeamessage")}
-          onChange={(e) => setMessage(e.target.value)}
-          onPressEnter={(event) => {
-            event.preventDefault();
-            if (!!!event.shiftKey) handleEnter();
-          }}
-        />
-      </span>
-      <SendOutlined
-        className="chat-send-message-button"
-        //  disabled={message === "" || !message}
-        onClick={handleEnter}
-      />
-      <Spin
-        style={{ display: `${isSending ? "" : "none"}` }}
-        indicator={
-          <LoadingOutlined
-            style={{
-              fontSize: 24
+    <Space direction="vertical" style={{ width: "100%" }} size="middle">
+      {isOptedOut && <Alert message={t("messaging.errors.no_consent")} type="error" />}
+      <div className="imex-flex-row" style={{ width: "100%" }}>
+        {!isOptedOut && (
+          <>
+            <ChatPresetsComponent disabled={isSending} className="imex-flex-row__margin" />
+            <ChatMediaSelector
+              disabled={isSending}
+              conversation={conversation}
+              selectedMedia={selectedMedia}
+              setSelectedMedia={setSelectedMedia}
+            />
+          </>
+        )}
+        <span style={{ flex: 1 }}>
+          <Input.TextArea
+            className="imex-flex-row__margin imex-flex-row__grow"
+            allowClear
+            autoFocus
+            ref={inputArea}
+            autoSize={{ minRows: 1, maxRows: 4 }}
+            value={message}
+            disabled={isSending || isOptedOut}
+            placeholder={t("messaging.labels.typeamessage")}
+            onChange={(e) => setMessage(e.target.value)}
+            onPressEnter={(event) => {
+              event.preventDefault();
+              if (!event.shiftKey && !isOptedOut) handleEnter();
            }}
-            spin
          />
-        }
-      />
-    </div>
+        </span>
+        {!isOptedOut && (
+          <SendOutlined
+            className="chat-send-message-button"
+            disabled={isSending || message === "" || !message}
+            onClick={handleEnter}
+          />
+        )}
+
+        <Spin
+          style={{ display: `${isSending ? "" : "none"}` }}
+          indicator={
+            <LoadingOutlined
+              style={{
+                fontSize: 24
+              }}
+              spin
+            />
+          }
+        />
+      </div>
+    </Space>
  );
 }

--- a/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
+++ b/client/src/components/contracts-find-modal/contracts-find-modal.container.jsx
@@ -63,7 +63,7 @@ export function ContractsFindModalContainer({
      title={t("contracts.labels.findermodal")}
      onCancel={() => toggleModalVisible()}
      onOk={() => toggleModalVisible()}
-      destroyOnClose
+      destroyOnHidden
      forceRender
    >
      <Form form={form} layout="vertical" autoComplete="no" onFinish={handleFinish}>
--- a/client/src/components/email-overlay/email-overlay.container.jsx
+++ b/client/src/components/email-overlay/email-overlay.container.jsx
@@ -152,7 +152,7 @@ export function EmailOverlayContainer({ emailConfig, modalVisible, toggleEmailOv
  }, [modalVisible]); // eslint-disable-line react-hooks/exhaustive-deps
  return (
    <Modal
-      destroyOnClose={true}
+      destroyOnHidden
      open={modalVisible}
      maskClosable={false}
      width={"80%"}
--- a/client/src/components/feature-wrapper/feature-wrapper.component.jsx
+++ b/client/src/components/feature-wrapper/feature-wrapper.component.jsx
@@ -81,8 +81,9 @@ export function HasFeatureAccess({ featureName, bodyshop, bypass, debug = false
  }
  return (
    bodyshop?.features?.allAccess ||
-    bodyshop?.features?.[featureName] ||
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+    (typeof bodyshop?.features?.[featureName] === "boolean"
+      ? bodyshop?.features?.[featureName]
+      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
  );
 }

--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -15,6 +15,7 @@ import {
  HomeFilled,
  ImportOutlined,
  LineChartOutlined,
+  OneToOneOutlined,
  PaperClipOutlined,
  PhoneOutlined,
  PlusCircleOutlined,
@@ -24,6 +25,7 @@ import {
  TeamOutlined,
  ToolFilled,
  UnorderedListOutlined,
+  UsergroupAddOutlined,
  UserOutlined
 } from "@ant-design/icons";
 import { useQuery } from "@apollo/client";
@@ -40,6 +42,7 @@ import { RiSurveyLine } from "react-icons/ri";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { GET_UNREAD_COUNT } from "../../graphql/notifications.queries.js";
 import { selectRecentItems, selectSelectedHeader } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -47,10 +50,10 @@ import { signOutStart } from "../../redux/user/user.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import day from "../../utils/day.js";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import LockWrapper from "../lock-wrapper/lock-wrapper.component";
 import NotificationCenterContainer from "../notification-center/notification-center.container.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.js";

 // Redux mappings
 const mapStateToProps = createStructuredSelector({
@@ -98,6 +101,7 @@ function Header({
  const baseTitleRef = useRef(document.title || "");
  const lastSetTitleRef = useRef("");
  const userAssociationId = bodyshop?.associations?.[0]?.id;
+  const isEmployee = useIsEmployee(bodyshop, currentUser);

  const {
    data: unreadData,
@@ -640,17 +644,32 @@ function Header({
          label: t("menus.header.help"),
          onClick: () => window.open("https://help.imex.online/", "_blank")
        },
-        ...(InstanceRenderManager({ imex: true, rome: false })
-          ? [
-              {
-                key: "rescue",
-                id: "header-rescue",
-                icon: <CarFilled />,
-                label: t("menus.header.rescueme"),
-                onClick: () => window.open("https://imexrescue.com/", "_blank")
-              }
-            ]
-          : []),
+        {
+          key: "remoteassist",
+          id: "header-remote-assist",
+          icon: <OneToOneOutlined />,
+          label: t("menus.header.remoteassist"),
+          children: [
+            ...(InstanceRenderManager({ imex: true, rome: false })
+              ? [
+                  {
+                    key: "rescue",
+                    id: "header-rescue",
+                    icon: <PlusCircleOutlined />,
+                    label: t("menus.header.rescueme"),
+                    onClick: () => window.open("https://imexrescue.com/", "_blank")
+                  }
+                ]
+              : []),
+            {
+              key: "rescue-zoho",
+              id: "header-rescue-zoho",
+              icon: <UsergroupAddOutlined />,
+              label: t("menus.header.rescuemezoho"),
+              onClick: () => window.open("https://join.zoho.com/", "_blank")
+            }
+          ]
+        },
        {
          key: "shiftclock",
          id: "header-shiftclock",
@@ -682,7 +701,7 @@ function Header({
          icon: unreadLoading ? (
            <Spin size="small" />
          ) : (
-            <Badge offset={[8, 0]} size="small" count={unreadCount}>
+            <Badge offset={[8, 0]} size="small" count={isEmployee ? unreadCount : 0}>
              <BellFilled />
            </Badge>
          ),
--- a/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx
+++ b/client/src/components/inventory-upsert-modal/inventory-upsert-modal.container.jsx
@@ -98,7 +98,7 @@ export function InventoryUpsertModalContainer({ currentUser, bodyshop, inventory
      onCancel={() => {
        toggleModalVisible();
      }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form form={form} onFinish={handleFinish} layout="vertical">
        <InventoryUpsertModal form={form} />
--- a/client/src/components/job-at-change/schedule-event.component.jsx
+++ b/client/src/components/job-at-change/schedule-event.component.jsx
@@ -66,7 +66,7 @@ export function ScheduleEventComponent({
  const [popOverVisible, setPopOverVisible] = useState(false);

  const [getJobDetails] = useLazyQuery(GET_JOB_BY_PK_QUICK_INTAKE, {
-    variables: { id: event.job.id },
+    variables: { id: event.job?.id },
    onCompleted: (data) => {
      if (data?.jobs_by_pk) {
        const totalHours =
@@ -83,6 +83,7 @@ export function ScheduleEventComponent({
        });
      }
    },
+
    fetchPolicy: "network-only"
  });

@@ -409,8 +410,10 @@ export function ScheduleEventComponent({
            open={popOverVisible}
            onOpenChange={setPopOverVisible}
            onClick={(e) => {
-              getJobDetails();
-              e.stopPropagation();
+              if (event.job?.id) {
+                e.stopPropagation();
+                getJobDetails();
+              }
            }}
            getPopupContainer={(trigger) => trigger.parentNode}
            trigger="click"
--- a/client/src/components/job-costing-modal/job-costing-modal.container.jsx
+++ b/client/src/components/job-costing-modal/job-costing-modal.container.jsx
@@ -49,7 +49,7 @@ export function JobCostingModalContainer({ jobCostingModal, toggleModalVisible }
      }}
      cancelButtonProps={{ style: { display: "none" } }}
      width="90%"
-      destroyOnClose
+      destroyOnHidden
    >
      {!costingData ? (
        <LoadingSpinner loading={true} />
--- a/client/src/components/job-detail-cards/job-detail-cards.component.jsx
+++ b/client/src/components/job-detail-cards/job-detail-cards.component.jsx
@@ -32,7 +32,13 @@ const mapStateToProps = createStructuredSelector({
 });

 const mapDispatchToProps = (dispatch) => ({
-  setPrintCenterContext: (context) => dispatch(setModalContext({ context: context, modal: "printCenter" })),
+  setPrintCenterContext: (context) =>
+    dispatch(
+      setModalContext({
+        context: context,
+        modal: "printCenter"
+      })
+    ),
  insertAuditTrail: ({ jobid, operation, type }) =>
    dispatch(
      insertAuditTrail({
@@ -87,7 +93,7 @@ export function JobDetailCards({ bodyshop, setPrintCenterContext, insertAuditTra
  };

  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
+++ b/client/src/components/job-employee-assignments/job-employee-assignments.component.jsx
@@ -80,7 +80,7 @@ export function JobEmployeeAssignments({
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
      <Spin spinning={loading}>
        <DataLabel label={t("jobs.fields.employee_body")}>
          {body ? (
--- a/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
+++ b/client/src/components/job-reconciliation-modal/job-reconciliation.modal.container.jsx
@@ -44,7 +44,7 @@ function JobReconciliationModalContainer({ reconciliationModal, toggleModalVisib
      onOk={handleCancel}
      onCancel={handleCancel}
      cancelButtonProps={{ display: "none" }}
-      destroyOnClose
+      destroyOnHidden
      className="imex-reconciliation-modal"
    >
      {loading && <LoadingSpinner loading={loading} />}
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.component.jsx
@@ -24,7 +24,8 @@ export default function JobWatcherToggleComponent({
  handleToggleSelf,
  handleRemoveWatcher,
  handleWatcherSelect,
-  handleTeamSelect
+  handleTeamSelect,
+  isEmployee
 }) {
  const { t } = useTranslation();

@@ -66,22 +67,32 @@ export default function JobWatcherToggleComponent({
      <List>
        <List.Item
          actions={[
-            <Button
-              type={isWatching ? "primary" : "default"}
-              danger={!isWatching}
-              icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
-              size="medium"
-              onClick={handleToggleSelf}
-              loading={adding || removing}
-            >
-              {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
-            </Button>
+            <Tooltip title={!isEmployee ? t("notifications.tooltips.not-employee") : ""} placement="top">
+              <span>
+                <Button
+                  type={isWatching ? "primary" : "default"}
+                  danger={!isWatching}
+                  icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
+                  size="medium"
+                  onClick={handleToggleSelf}
+                  loading={adding || removing}
+                  disabled={!isEmployee || adding || removing}
+                >
+                  {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
+                </Button>
+              </span>
+            </Tooltip>
          ]}
        >
          <List.Item.Meta>
            <Text type="secondary" style={{ marginBottom: 8, display: "block" }}>
              {t("notifications.labels.watching-issue")}
            </Text>
+            {!isEmployee && (
+              <Text type="danger" style={{ marginBottom: 8, display: "block" }}>
+                {t("notifications.tooltips.not-employee")}
+              </Text>
+            )}
          </List.Item.Meta>
        </List.Item>
      </List>
@@ -98,8 +109,11 @@ export default function JobWatcherToggleComponent({
      <EmployeeSearchSelectComponent
        style={{ minWidth: "100%" }}
        options={
-          bodyshop?.employees?.filter((e) =>
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
+          bodyshop?.employees?.filter(
+            (e) =>
+              e.user_email && // Ensure user_email is not null or undefined
+              e.active && // Ensure employee is active
+              jobWatchers.every((w) => w.user_email !== e.user_email) // Ensure not already a watcher
          ) || []
        }
        placeholder={t("notifications.labels.employee-search")}
--- a/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
+++ b/client/src/components/job-watcher-toggle/job-watcher-toggle.container.jsx
@@ -6,6 +6,7 @@ import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import JobWatcherToggleComponent from "./job-watcher-toggle.component.jsx";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -21,13 +22,14 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
    splitKey: bodyshop && bodyshop.imexshopid
  });

-  const userEmail = currentUser.email;
-  const jobid = job.id;
-
+  const isEmployee = useIsEmployee(bodyshop, currentUser);
  const [open, setOpen] = useState(false);
  const [selectedWatcher, setSelectedWatcher] = useState(null);
  const [selectedTeam, setSelectedTeam] = useState(null);

+  const userEmail = currentUser.email;
+  const jobid = job.id;
+
  // Fetch current watchers with refetch capability
  const {
    data: watcherData,
@@ -139,13 +141,13 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
  });

  const handleToggleSelf = useCallback(async () => {
-    if (adding || removing) return;
+    if (adding || removing || !isEmployee) return;
    if (isWatching) {
      await removeWatcher({ variables: { jobid, userEmail } });
    } else {
      await addWatcher({ variables: { jobid, userEmail } });
    }
-  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing]);
+  }, [isWatching, addWatcher, removeWatcher, jobid, userEmail, adding, removing, isEmployee]);

  const handleRemoveWatcher = useCallback(
    async (email) => {
@@ -187,7 +189,16 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
        setSelectedTeam(null);
        return;
      }
-      await Promise.all(newWatchers.map((email) => addWatcher({ variables: { jobid, userEmail: email } })));
+      await Promise.all(
+        newWatchers.map((email) =>
+          addWatcher({
+            variables: {
+              jobid,
+              userEmail: email
+            }
+          })
+        )
+      );
    },
    [jobWatchers, addWatcher, jobid, adding]
  );
@@ -212,6 +223,7 @@ function JobWatcherToggleContainer({ job, currentUser, bodyshop }) {
      handleWatcherSelect={handleWatcherSelect}
      handleTeamSelect={handleTeamSelect}
      currentUser={currentUser}
+      isEmployee={isEmployee} // Pass isEmployee to the component
    />
  );
 }
--- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx
+++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx
@@ -4,11 +4,12 @@ import { Col, Row } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, 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 { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
  DELETE_AVAILABLE_JOB,
@@ -33,7 +34,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai
 import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util";
 import HeaderFields from "./jobs-available-supplement.headerfields";
 import JobsAvailableTableComponent from "./jobs-available-table.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -195,7 +195,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail

      await deleteJob({
        variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
        refetch();
        setInsertLoading(false);
      });
@@ -315,7 +315,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail

      deleteJob({
        variables: { id: estData.id }
-      }).then((r) => {
+      }).then(() => {
        refetch();
        setInsertLoading(false);
      });
@@ -372,7 +372,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
    loadEstData({ variables: { id: record.id } });
    modalSearchState[1](record.clm_no);
    setJobModalVisible(true);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    // eslint-disable-next-line
  }, []);

  useEffect(() => {
@@ -456,7 +456,7 @@ function replaceEmpty(someObj, replaceValue = null) {
  return JSON.parse(temp);
 }

-async function CheckTaxRatesUSA(estData, bodyshop) {
+async function CheckTaxRatesUSA(estData) {
  if (!estData.parts_tax_rates?.PAM) {
    estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC;
  }
@@ -568,7 +568,7 @@ async function CheckTaxRates(estData, bodyshop) {
  });
  //}
 }
-function ResolveCCCLineIssues(estData, bodyshop) {
+function ResolveCCCLineIssues(estData) {
  //Find all misc amounts, populate them to the act price.
  //This needs to be done before cleansing unq_seq since some misc prices could move over.
  estData.joblines.data.forEach((line) => {
@@ -585,6 +585,9 @@ function ResolveCCCLineIssues(estData, bodyshop) {
          //  line.notes += ` | ET/UT Update (prev = ${line.mod_lbr_ty})`;
          line.mod_lbr_ty = "LAR";
        }
+        if (line.mod_lbr_ty === "OTSL") {
+          line.mod_lbr_ty = line.mod_lbr_hrs === 0 ? null : "LAB";
+        }
      }
    });
  });
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -72,7 +72,7 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
      open={open}
      placement="left"
      onOpenChange={handleOpenChange}
-      destroyTooltipOnHide
+      destroyOnHidden
    >
      <SearchOutlined style={{ cursor: "pointer" }} />
    </Popover>
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -9,6 +9,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { auth, logImEXEvent } from "../../firebase/firebase.utils";
 import { CANCEL_APPOINTMENTS_BY_JOB_ID, INSERT_MANUAL_APPT } from "../../graphql/appointments.queries";
@@ -32,7 +33,6 @@ import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
@@ -1078,17 +1078,26 @@ export function JobsDetailHeaderActions({
    menuItems.push({
      key: "deletejob",
      id: "job-actions-deletejob",
-      label: (
-        <Popconfirm
-          title={t("jobs.labels.deleteconfirm")}
-          okText={t("general.labels.yes")}
-          cancelText={t("general.labels.no")}
-          onClick={(e) => e.stopPropagation()}
-          onConfirm={handleDeleteJob}
-        >
-          {t("menus.jobsactions.deletejob")}
-        </Popconfirm>
-      )
+      label:
+        job.job_watchers.length === 0 ? (
+          <Popconfirm
+            title={t("jobs.labels.deleteconfirm")}
+            okText={t("general.labels.yes")}
+            cancelText={t("general.labels.no")}
+            onClick={(e) => e.stopPropagation()}
+            onConfirm={handleDeleteJob}
+          >
+            {t("menus.jobsactions.deletejob")}
+          </Popconfirm>
+        ) : (
+          <Popconfirm
+            title={t("jobs.labels.deletewatchers")}
+            onClick={(e) => e.stopPropagation()}
+            showCancel={false}
+          >
+            {t("menus.jobsactions.deletejob")}
+          </Popconfirm>
+        )
    });
  }

@@ -1109,8 +1118,8 @@ export function JobsDetailHeaderActions({
        <RbacWrapper action="jobs:void" noauth>
          <Popconfirm
            title={t("jobs.labels.voidjob")}
-            okText="Yes"
-            cancelText="No"
+            okText={t("general.labels.yes")}
+            cancelText={t("general.labels.no")}
            onClick={(e) => e.stopPropagation()}
            onConfirm={handleVoidJob}
          >
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.toggle-production.jsx
@@ -167,7 +167,18 @@ export function JobsDetailHeaderActionsToggleProduction({
                <FormDateTimePickerComponent disabled={jobRO} />
              </Form.Item>

-              <Form.Item name={["actual_delivery"]} label={t("jobs.fields.actual_delivery")}>
+              <Form.Item
+                name={["actual_delivery"]}
+                label={t("jobs.fields.actual_delivery")}
+                rules={[
+                  {
+                    required: bodyshop.deliverchecklist.actual_delivery
+                      ? bodyshop.deliverchecklist.actual_delivery
+                      : false
+                    //message: t("general.validation.required"),
+                  }
+                ]}
+              >
                <FormDateTimePickerComponent disabled={jobRO} />
              </Form.Item>
            </>
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,17 +1,20 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons";
+import { useMutation } from "@apollo/client";
 import { Card, Checkbox, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link } from "react-router-dom";
-import { useMutation } from "@apollo/client";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
-import { DateTimeFormatter } from "../../utils/DateFormatter";
+import { DateTimeFormatter, DateTimeFormatterFunction } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import PhoneNumberFormatter from "../../utils/PhoneFormatter";
 import ChatOpenButton from "../chat-open-button/chat-open-button.component";
@@ -24,7 +27,6 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  jobRO: selectJobReadOnly,
@@ -38,6 +40,14 @@ const mapDispatchToProps = (dispatch) => ({
        context: context,
        modal: "printCenter"
      })
+    ),
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
    )
 });

@@ -49,7 +59,7 @@ const colSpan = {
  xl: { span: 6 }
 };

-export function JobsDetailHeader({ job, bodyshop, disabled }) {
+export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail }) {
  const { t } = useTranslation();
  const { notification } = useNotification();
  const [notesClamped, setNotesClamped] = useState(true);
@@ -66,7 +76,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
  const handleCheckboxChange = async (field, checked) => {
    const value = checked ? dayjs().toISOString() : null;
    try {
-      await updateJob({
+      const ret = await updateJob({
        variables: {
          jobId: job.id,
          job: { [field]: value }
@@ -74,6 +84,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
        refetchQueries: ["GET_JOB_BY_PK"],
        awaitRefetchQueries: true
      });
+      insertAuditTrail({
+        jobid: job.id,
+        operation: AuditTrailMapping.jobfieldchange(
+          field,
+          ret.data.update_jobs.returning[0][field]
+            ? DateTimeFormatterFunction(ret.data.update_jobs.returning[0][field])
+            : checked
+        ),
+        type: "jobfieldchange"
+      });
    } catch (error) {
      notification.error({
        message: t("jobs.errors.saving", { error: error.message })
--- a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
+++ b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
@@ -65,7 +65,7 @@ export default connect(
    <Modal
      title={t("jobs.labels.existing_jobs")}
      width={"80%"}
-      destroyOnClose
+      destroyOnHidden
      okButtonProps={{ disabled: selectedJob ? false : true }}
      {...modalProps}
    >
--- a/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
+++ b/client/src/components/note-upsert-modal/note-upsert-modal.container.jsx
@@ -20,7 +20,14 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
  toggleModalVisible: () => dispatch(toggleModalVisible("noteUpsert")),
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+  insertAuditTrail: ({ jobid, operation, type }) =>
+    dispatch(
+      insertAuditTrail({
+        jobid,
+        operation,
+        type
+      })
+    )
 });

 export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleModalVisible, insertAuditTrail }) {
@@ -123,7 +130,7 @@ export function NoteUpsertModalContainer({ currentUser, noteUpsertModal, toggleM
      onCancel={() => {
        toggleModalVisible();
      }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form form={form} onFinish={handleFinish} layout="vertical">
        <NoteUpsertModalComponent form={form} />
--- a/client/src/components/notification-center/notification-center.component.jsx
+++ b/client/src/components/notification-center/notification-center.component.jsx
@@ -1,11 +1,11 @@
 import { Virtuoso } from "react-virtuoso";
-import { Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
+import { Alert, Badge, Button, Space, Spin, Switch, Tooltip, Typography } from "antd";
 import { CheckCircleFilled, CheckCircleOutlined, EyeFilled, EyeOutlined } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import { useNavigate } from "react-router-dom";
 import "./notification-center.styles.scss";
 import day from "../../utils/day.js";
-import { forwardRef, useRef, useEffect } from "react";
+import { forwardRef, useEffect, useRef } from "react";
 import { DateTimeFormat } from "../../utils/DateFormatter.jsx";

 const { Text, Title } = Typography;
@@ -26,7 +26,8 @@ const NotificationCenterComponent = forwardRef(
      markAllRead,
      loadMore,
      onNotificationClick,
-      unreadCount
+      unreadCount,
+      isEmployee
    },
    ref
  ) => {
@@ -93,7 +94,12 @@ const NotificationCenterComponent = forwardRef(
                ) : (
                  <EyeOutlined className="notification-toggle-icon" />
                )}
-                <Switch checked={showUnreadOnly} onChange={(checked) => toggleUnreadOnly(checked)} size="small" />
+                <Switch
+                  checked={showUnreadOnly}
+                  onChange={(checked) => toggleUnreadOnly(checked)}
+                  size="small"
+                  disabled={!isEmployee}
+                />
              </Space>
            </Tooltip>
            <Tooltip title={t("notifications.labels.mark-all-read")}>
@@ -106,14 +112,20 @@ const NotificationCenterComponent = forwardRef(
            </Tooltip>
          </div>
        </div>
-        <Virtuoso
-          ref={virtuosoRef}
-          style={{ height: "400px", width: "100%" }}
-          data={notifications}
-          totalCount={notifications.length}
-          endReached={loadMore}
-          itemContent={renderNotification}
-        />
+        {!isEmployee ? (
+          <div style={{ padding: 10 }}>
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
+          </div>
+        ) : (
+          <Virtuoso
+            ref={virtuosoRef}
+            style={{ height: "400px", width: "100%" }}
+            data={notifications}
+            totalCount={notifications.length}
+            endReached={loadMore}
+            itemContent={renderNotification}
+          />
+        )}
      </div>
    );
  }
--- a/client/src/components/notification-center/notification-center.container.jsx
+++ b/client/src/components/notification-center/notification-center.container.jsx
@@ -4,9 +4,10 @@ import { connect } from "react-redux";
 import NotificationCenterComponent from "./notification-center.component";
 import { GET_NOTIFICATIONS } from "../../graphql/notifications.queries";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors.js";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors.js";
 import day from "../../utils/day.js";
 import { INITIAL_NOTIFICATIONS, useSocket } from "../../contexts/SocketIO/useSocket.js";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";

 // This will be used to poll for notifications when the socket is disconnected
 const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
@@ -17,17 +18,18 @@ const NOTIFICATION_POLL_INTERVAL_SECONDS = 60;
 * @param onClose
 * @param bodyshop
 * @param unreadCount
+ * @param currentUser
 * @returns {JSX.Element}
 * @constructor
 */
-const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }) => {
+const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount, currentUser }) => {
  const [showUnreadOnly, setShowUnreadOnly] = useState(false);
  const [notifications, setNotifications] = useState([]);
  const [isLoading, setIsLoading] = useState(false);
  const { isConnected, markNotificationRead, markAllNotificationsRead } = useSocket();
  const notificationRef = useRef(null);
-
  const userAssociationId = bodyshop?.associations?.[0]?.id;
+  const isEmployee = useIsEmployee(bodyshop, currentUser);

  const baseWhereClause = useMemo(() => {
    return { associationid: { _eq: userAssociationId } };
@@ -51,7 +53,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
    fetchPolicy: "cache-and-network",
    notifyOnNetworkStatusChange: true,
    pollInterval: isConnected ? 0 : day.duration(NOTIFICATION_POLL_INTERVAL_SECONDS, "seconds").asMilliseconds(),
-    skip: !userAssociationId,
+    skip: !userAssociationId || !isEmployee,
    onError: (err) => {
      console.error(`Error polling Notifications: ${err?.message || ""}`);
      setTimeout(() => refetch(), day.duration(2, "seconds").asMilliseconds());
@@ -71,7 +73,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
  }, [visible, onClose]);

  useEffect(() => {
-    if (data?.notifications) {
+    if (data?.notifications && isEmployee) {
      const processedNotifications = data.notifications
        .map((notif) => {
          let scenarioText;
@@ -101,11 +103,13 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
        })
        .sort((a, b) => new Date(b.created_at) - new Date(a.created_at));
      setNotifications(processedNotifications);
+    } else if (!isEmployee) {
+      setNotifications([]); // Clear notifications if not an employee
    }
-  }, [data]);
+  }, [data, isEmployee]);

  const loadMore = useCallback(() => {
-    if (!queryLoading && data?.notifications.length) {
+    if (!queryLoading && data?.notifications.length && isEmployee) {
      setIsLoading(true); // Show spinner during fetchMore
      fetchMore({
        variables: { offset: data.notifications.length, where: whereClause },
@@ -121,13 +125,14 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
        })
        .finally(() => setIsLoading(false)); // Hide spinner when done
    }
-  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause]);
+  }, [data?.notifications?.length, fetchMore, queryLoading, whereClause, isEmployee]);

  const handleToggleUnreadOnly = (value) => {
    setShowUnreadOnly(value);
  };

  const handleMarkAllRead = useCallback(() => {
+    if (!isEmployee) return; // Do nothing if not an employee
    setIsLoading(true);
    markAllNotificationsRead()
      .then(() => {
@@ -147,7 +152,7 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
      })
      .catch((e) => console.error(`Error marking all notifications read: ${e?.message || ""}`))
      .finally(() => setIsLoading(false));
-  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly]);
+  }, [markAllNotificationsRead, userAssociationId, showUnreadOnly, isEmployee]);

  const handleNotificationClick = useCallback(
    (notificationId) => {
@@ -170,17 +175,18 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
  );

  useEffect(() => {
-    if (visible && !isConnected) {
+    if (visible && !isConnected && isEmployee) {
      setIsLoading(true);
      refetch()
        .catch((err) => console.error(`Error re-fetching notifications: ${err?.message || ""}`))
        .finally(() => setIsLoading(false));
    }
-  }, [visible, isConnected, refetch]);
+  }, [visible, isConnected, refetch, isEmployee]);

  return (
    <NotificationCenterComponent
      ref={notificationRef}
+      isEmployee={isEmployee}
      visible={visible}
      onClose={onClose}
      notifications={notifications}
@@ -196,7 +202,8 @@ const NotificationCenterContainer = ({ visible, onClose, bodyshop, unreadCount }
 };

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

 export default connect(mapStateToProps, null)(NotificationCenterContainer);
--- a/client/src/components/notification-settings/notification-settings-form.component.jsx
+++ b/client/src/components/notification-settings/notification-settings-form.component.jsx
@@ -1,10 +1,10 @@
 import { useMutation, useQuery } from "@apollo/client";
 import { useEffect, useState } from "react";
-import { Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
+import { Alert, Button, Card, Checkbox, Divider, Form, Space, Switch, Table, Typography } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import {
  QUERY_NOTIFICATION_SETTINGS,
@@ -16,14 +16,16 @@ import LoadingSpinner from "../loading-spinner/loading-spinner.component.jsx";
 import PropTypes from "prop-types";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import ColumnHeaderCheckbox from "../notification-settings/column-header-checkbox.component.jsx";
+import { useIsEmployee } from "../../utils/useIsEmployee.js";

 /**
 * Notifications Settings Form
 * @param currentUser
+ * @param bodyshop
 * @returns {JSX.Element}
 * @constructor
 */
-const NotificationSettingsForm = ({ currentUser }) => {
+const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
  const { t } = useTranslation();
  const [form] = Form.useForm();
  const [initialValues, setInitialValues] = useState({});
@@ -31,6 +33,7 @@ const NotificationSettingsForm = ({ currentUser }) => {
  const [autoAddEnabled, setAutoAddEnabled] = useState(false);
  const [initialAutoAdd, setInitialAutoAdd] = useState(false);
  const notification = useNotification();
+  const isEmployee = useIsEmployee(bodyshop, currentUser);

  // Fetch notification settings and notifications_autoadd
  const { loading, error, data } = useQuery(QUERY_NOTIFICATION_SETTINGS, {
@@ -199,6 +202,11 @@ const NotificationSettingsForm = ({ currentUser }) => {
          </Space>
        }
      >
+        {!isEmployee && (
+          <div style={{ width: "100%", marginBottom: "10px" }}>
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
+          </div>
+        )}
        <Table dataSource={dataSource} columns={columns} pagination={false} bordered rowKey="key" />
        <Divider />
      </Card>
@@ -209,11 +217,13 @@ const NotificationSettingsForm = ({ currentUser }) => {
 NotificationSettingsForm.propTypes = {
  currentUser: PropTypes.shape({
    email: PropTypes.string.isRequired
-  }).isRequired
+  }).isRequired,
+  bodyshop: PropTypes.object.isRequired
 };

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

 export default connect(mapStateToProps)(NotificationSettingsForm);
--- a/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
+++ b/client/src/components/parts-order-backorder-eta/parts-order-backorder-eta.component.jsx
@@ -75,7 +75,7 @@ export function PartsOrderBackorderEta({
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <DateFormatter>{backordered_eta}</DateFormatter>
      {isAlreadyBackordered && <CalendarFilled style={{ cursor: "pointer" }} onClick={handlePopover} />}
      {loading && <Spin />}
--- a/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
+++ b/client/src/components/parts-order-line-backorder-button/parts-order-line-backorder-button.component.jsx
@@ -84,7 +84,7 @@ export function PartsOrderLineBackorderButton({ partsOrderStatus, partsLineId, j
  );

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility} disabled={disabled}>
+    <Popover destroyOnHidden content={popContent} open={visibility} disabled={disabled}>
      <Button loading={loading} onClick={handlePopover}>
        {isAlreadyBackordered ? t("parts_orders.actions.receive") : t("parts_orders.actions.backordered")}
      </Button>
--- a/client/src/components/parts-order-modal/parts-order-modal.container.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.container.jsx
@@ -333,7 +333,7 @@ export function PartsOrderModalContainer({
      onOk={() => form.submit()}
      okButtonProps={{ loading: saving }}
      cancelButtonProps={{ loading: saving }}
-      destroyOnClose
+      destroyOnHidden
      width="75%"
      forceRender
    >
--- a/client/src/components/parts-queue-card/parts-queue-card.component.jsx
+++ b/client/src/components/parts-queue-card/parts-queue-card.component.jsx
@@ -46,7 +46,7 @@ export default function PartsQueueDetailCard() {
  };

  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx
+++ b/client/src/components/parts-receive-modal/parts-receive-modal.container.jsx
@@ -90,7 +90,7 @@ export function PartsReceiveModalContainer({ partsReceiveModal, toggleModalVisib
      onCancel={() => toggleModalVisible()}
      onOk={() => form.submit()}
      okButtonProps={{ loading: loading }}
-      destroyOnClose
+      destroyOnHidden
      forceRender
      width="50%"
    >
--- a/client/src/components/payment-modal/payment-modal.container.jsx
+++ b/client/src/components/payment-modal/payment-modal.container.jsx
@@ -134,7 +134,7 @@ function PaymentModalContainer({ paymentModal, toggleModalVisible, bodyshop }) {
    <Modal
      title={!context || (context && !context.id) ? t("payments.labels.new") : t("payments.labels.edit")}
      open={open}
-      destroyOnClose
+      destroyOnHidden
      okText={t("general.actions.save")}
      onOk={() => form.submit()}
      width="50%"
--- a/client/src/components/phone-number-consent/phone-number-consent.component.jsx
+++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
@@ -0,0 +1,144 @@
+import { useQuery } from "@apollo/client";
+import { Input, Table } from "antd";
+import { useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { GET_PHONE_NUMBER_OPT_OUTS, SEARCH_OWNERS_BY_PHONE_NUMBERS } from "../../graphql/phone-number-opt-out.queries";
+
+import PhoneNumberFormatter from "../../utils/PhoneFormatter";
+import { TimeAgoFormatter } from "../../utils/DateFormatter";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
+});
+
+const mapDispatchToProps = () => ({});
+
+function PhoneNumberConsentList({ bodyshop, currentUser }) {
+  const { t } = useTranslation();
+  const [search, setSearch] = useState("");
+
+  // Fetch opt-out phone numbers
+  const { loading: optOutLoading, data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+    variables: { bodyshopid: bodyshop.id, search: search ? `%${search}%` : undefined },
+    fetchPolicy: "network-only"
+  });
+
+  // Prepare phone numbers for owner query
+  const phoneNumbers = useMemo(() => {
+    return optOutData?.phone_number_opt_out?.map((item) => item.phone_number) || [];
+  }, [optOutData?.phone_number_opt_out]);
+  const allPhoneNumbers = useMemo(() => {
+    const normalized = phoneNumbers;
+    const withPlusOne = phoneNumbers.map((num) => `+1${num}`);
+    return [...normalized, ...withPlusOne].filter(Boolean);
+  }, [phoneNumbers]);
+
+  // Fetch owners for all phone numbers
+  const { loading: ownersLoading, data: ownersData } = useQuery(SEARCH_OWNERS_BY_PHONE_NUMBERS, {
+    variables: { bodyshopid: bodyshop.id, phone_numbers: allPhoneNumbers },
+    skip: allPhoneNumbers.length === 0 || !bodyshop.id,
+    fetchPolicy: "network-only"
+  });
+
+  // Format owner names for display
+  const formatOwnerName = (owner) => {
+    const parts = [];
+    if (owner.ownr_fn || owner.ownr_ln) {
+      parts.push([owner.ownr_fn, owner.ownr_ln].filter(Boolean).join(" "));
+    }
+    if (owner.ownr_co_nm) {
+      parts.push(owner.ownr_co_nm);
+    }
+    return parts.join(", ") || "-";
+  };
+
+  // Map phone numbers to their associated owners and identify phone field
+  const getAssociatedOwners = (phoneNumber) => {
+    if (!ownersData?.owners) return [];
+    const normalizedPhone = phoneNumber.replace(/^\+1/, "");
+    return ownersData.owners
+      .filter(
+        (owner) =>
+          owner.ownr_ph1 === phoneNumber ||
+          owner.ownr_ph2 === phoneNumber ||
+          owner.ownr_ph1 === normalizedPhone ||
+          owner.ownr_ph2 === normalizedPhone ||
+          owner.ownr_ph1 === `+1${phoneNumber}` ||
+          owner.ownr_ph2 === `+1${phoneNumber}`
+      )
+      .map((owner) => ({
+        ...owner,
+        phoneField:
+          [owner.ownr_ph1, owner.ownr_ph2].includes(phoneNumber) ||
+          [owner.ownr_ph1, owner.ownr_ph2].includes(normalizedPhone) ||
+          [owner.ownr_ph1, owner.ownr_ph2].includes(`+1${phoneNumber}`)
+            ? owner.ownr_ph1 === phoneNumber ||
+              owner.ownr_ph1 === normalizedPhone ||
+              owner.ownr_ph1 === `+1${phoneNumber}`
+              ? t("consent.phone_1")
+              : t("consent.phone_2")
+            : null
+      }));
+  };
+
+  const columns = [
+    {
+      title: t("consent.phone_number"),
+      dataIndex: "phone_number",
+      render: (text) => <PhoneNumberFormatter>{text}</PhoneNumberFormatter>,
+      sorter: (a, b) => a.phone_number.localeCompare(b.phone_number)
+    },
+    {
+      title: t("consent.associated_owners"),
+      dataIndex: "phone_number",
+      render: (phoneNumber) => {
+        const owners = getAssociatedOwners(phoneNumber);
+        if (!owners || owners.length === 0) {
+          return t("consent.no_owners");
+        }
+        return owners.map((owner) => (
+          <div key={owner.id}>
+            {formatOwnerName(owner)} ({owner.phoneField})
+          </div>
+        ));
+      },
+      sorter: (a, b) => {
+        const aOwners = getAssociatedOwners(a.phone_number);
+        const bOwners = getAssociatedOwners(b.phone_number);
+        const aName = aOwners[0] ? formatOwnerName(aOwners[0]) : "";
+        const bName = bOwners[0] ? formatOwnerName(bOwners[0]) : "";
+        return aName.localeCompare(bName);
+      }
+    },
+    {
+      title: t("consent.created_at"),
+      dataIndex: "created_at",
+      render: (text) => <TimeAgoFormatter>{text}</TimeAgoFormatter>,
+      sorter: (a, b) => new Date(a.created_at) - new Date(b.created_at)
+    }
+  ];
+
+  return (
+    <div>
+      <Input.Search
+        placeholder={t("general.labels.search")}
+        onSearch={(value) => setSearch(value)}
+        style={{ marginBottom: 16 }}
+      />
+
+      <Table
+        columns={columns}
+        dataSource={optOutData?.phone_number_opt_out}
+        loading={optOutLoading || ownersLoading}
+        rowKey="id"
+        style={{ marginTop: 16 }}
+      />
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(PhoneNumberConsentList);
--- a/client/src/components/print-center-modal/print-center-modal.container.jsx
+++ b/client/src/components/print-center-modal/print-center-modal.container.jsx
@@ -32,7 +32,7 @@ export function PrintCenterModalContainer({ printCenterModal, toggleModalVisible
      okText={t("general.actions.close")}
      width="90%"
      title={t("printcenter.labels.title")}
-      destroyOnClose
+      destroyOnHidden
    >
      <PrintCenterModalComponent context={context} />
    </Modal>
--- a/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
+++ b/client/src/components/production-board-kanban/settings/LayoutSettings.jsx
@@ -1,7 +1,15 @@
 import { Card, Col, Form, Radio, Row } from "antd";
 import PropTypes from "prop-types";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../../redux/user/user.selectors";
+import { HasFeatureAccess } from "../../feature-wrapper/feature-wrapper.component";

-const LayoutSettings = ({ t }) => (
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const LayoutSettings = ({ t, bodyshop }) => (
  <Card title={t("production.settings.layout")} style={{ maxWidth: "100%", overflowX: "auto" }}>
    <Row gutter={[16, 16]}>
      {[
@@ -30,14 +38,18 @@ const LayoutSettings = ({ t }) => (
            { value: false, label: t("production.labels.wide") }
          ]
        },
-        {
-          name: "cardcolor",
-          label: t("production.labels.cardcolor"),
-          options: [
-            { value: true, label: t("production.labels.on") },
-            { value: false, label: t("production.labels.off") }
-          ]
-        },
+        ...(HasFeatureAccess({ bodyshop, featureName: "smartscheduling" })
+          ? [
+              {
+                name: "cardcolor",
+                label: t("production.labels.cardcolor"),
+                options: [
+                  { value: true, label: t("production.labels.on") },
+                  { value: false, label: t("production.labels.off") }
+                ]
+              }
+            ]
+          : []),
        {
          name: "kiosk",
          label: t("production.labels.kiosk_mode"),
@@ -67,4 +79,4 @@ LayoutSettings.propTypes = {
  t: PropTypes.func.isRequired
 };

-export default LayoutSettings;
+export default connect(mapStateToProps)(LayoutSettings);
--- a/client/src/components/production-board-kanban/trello-board/controllers/Board.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/Board.jsx
@@ -20,7 +20,7 @@ const Board = ({ id, className, orientation, cardSettings, ...additionalProps })
      default:
        return cardSizesVertical.small;
    }
-  }, [cardSettings]);
+  }, [cardSettings?.cardSize]);

  return (
    <>
--- a/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/BoardContainer.jsx
@@ -101,11 +101,33 @@ const BoardContainer = ({
    async ({ draggableId, type, source, reason, mode, destination, combine }) => {
      setIsDragging(false);

-      // Only update drag time if it's a valid drop with a different destination
-      if (type === "lane" && source && destination && !isEqual(source, destination)) {
-        setDragTime(source.droppableId);
-        setIsProcessing(true);
+      // Validate drag type and source
+      if (type !== "lane" || !source) {
+        // Invalid drag type or missing source, attempt to revert if possible
+        if (source) {
+          dispatch(
+            actions.moveCardAcrossLanes({
+              fromLaneId: source.droppableId,
+              toLaneId: source.droppableId,
+              cardId: draggableId,
+              index: source.index
+            })
+          );
+        }
+        setIsProcessing(false);
+        try {
+          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+        } catch (err) {
+          console.error("Error in onLaneDrag for invalid drag type or source", err);
+        }
+        return;
+      }

+      setDragTime(source.droppableId);
+      setIsProcessing(true);
+
+      // Handle valid drop to a different lane or position
+      if (destination && !isEqual(source, destination)) {
        dispatch(
          actions.moveCardAcrossLanes({
            fromLaneId: source.droppableId,
@@ -114,14 +136,33 @@ const BoardContainer = ({
            index: destination.index
          })
        );
+      } else {
+        // Same-lane drop or no destination, revert to original position
+        dispatch(
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: source.droppableId,
+            cardId: draggableId,
+            index: source.index
+          })
+        );
+      }

-        try {
-          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-        } catch (err) {
-          console.error("Error in onLaneDrag", err);
-        } finally {
-          setIsProcessing(false);
-        }
+      try {
+        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+      } catch (err) {
+        console.error("Error in onLaneDrag", err);
+        // Ensure revert on error
+        dispatch(
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: source.droppableId,
+            cardId: draggableId,
+            index: source.index
+          })
+        );
+      } finally {
+        setIsProcessing(false);
      }
    },
    [dispatch, onDragEnd, setDragTime]
--- a/client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx
+++ b/client/src/components/production-board-kanban/trello-board/controllers/Lane.jsx
@@ -133,7 +133,9 @@ const Lane = ({
          Item: ItemComponent
        },
        itemContent: (index, item) => <ItemWrapper>{renderDraggable(index, item)}</ItemWrapper>,
-        overscan: { main: 10, reverse: 10 }
+        overscan: { main: 10, reverse: 10 },
+        // Ensure a minimum height for empty lanes to allow dropping
+        style: renderedCards.length === 0 ? { minHeight: "5px" } : {}
      };

      const horizontalProps = {
@@ -149,8 +151,6 @@ const Lane = ({

      const componentProps = orientation === "vertical" ? verticalProps : horizontalProps;

-      // If the lane is collapsed, we want to render a div instead of the virtualized list, and we want to set the height to the max height of the lane so that
-      // the lane doesn't shrink when collapsed (in horizontal mode)
      const finalComponentProps = collapsed
        ? orientation === "horizontal"
          ? {
@@ -161,9 +161,8 @@ const Lane = ({
          : {}
        : componentProps;

-      // If the lane is horizontal and collapsed, we want to render a placeholder so that the lane doesn't shrink to 0 height and grows when
-      // a card is dragged over it
-      const shouldRenderPlaceholder = orientation !== "horizontal" && (collapsed || renderedCards.length === 0);
+      // Always render placeholder for empty lanes in vertical mode to ensure droppable area
+      const shouldRenderPlaceholder = orientation === "vertical" ? collapsed || renderedCards.length === 0 : collapsed;

      return (
        <HeightMemoryWrapper
@@ -178,8 +177,8 @@ const Lane = ({
          override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
        >
          <div
-            ref={laneRef} // Ensure laneRef is set here
-            style={{ height: "100%", width: "100%" }} // Make it scrollable
+            ref={laneRef}
+            style={{ height: "100%", width: "100%" }}
            className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
          >
            <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>
--- a/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.empassignment.component.jsx
@@ -140,7 +140,7 @@ export function ProductionListEmpAssignment({ insertAuditTrail, bodyshop, record
  if (record[type]) theEmployee = bodyshop.employees.find((e) => e.id === record[type]);

  return (
-    <Popover destroyTooltipOnHide content={popContent} open={visibility}>
+    <Popover destroyOnHidden content={popContent} open={visibility}>
      <Spin spinning={loading}>
        {record[type] ? (
          <div>
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -6,6 +6,7 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { QUERY_ACTIVE_EMPLOYEES, QUERY_ACTIVE_EMPLOYEES_WITH_EMAIL } from "../../graphql/employees.queries";
 import { QUERY_ALL_VENDORS } from "../../graphql/vendors.queries";
 import { selectReportCenter } from "../../redux/modals/modals.selectors";
@@ -18,11 +19,10 @@ import EmployeeSearchSelectEmail from "../employee-search-select/employee-search
 import EmployeeSearchSelect from "../employee-search-select/employee-search-select.component";
 import BlurWrapperComponent from "../feature-wrapper/blur-wrapper.component";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import VendorSearchSelect from "../vendor-search-select/vendor-search-select.component";
 import ReportCenterModalFiltersSortersComponent from "./report-center-modal-filters-sorters-component";
 import "./report-center-modal.styles.scss";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";

 const mapStateToProps = createStructuredSelector({
  reportCenterModal: selectReportCenter,
@@ -389,5 +389,7 @@ const restrictedReports = [
  { key: "job_costing_ro_date_detail", days: 183 },
  { key: "job_costing_ro_estimator", days: 183 },
  { key: "job_lifecycle_date_detail", days: 183 },
-  { key: "job_lifecycle_date_summary", days: 183 }
+  { key: "job_lifecycle_date_summary", days: 183 },
+  { key: "customer_list", days: 183 },
+  { key: "customer_list_excel", days: 183 }
 ];
--- a/client/src/components/report-center-modal/report-center-modal.container.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.container.jsx
@@ -28,7 +28,7 @@ export function ReportCenterModalContainer({ reportCenterModal, toggleModalVisib
      onOk={() => toggleModalVisible()}
      onCancel={() => toggleModalVisible()}
      cancelButtonProps={{ style: { display: "none" } }}
-      destroyOnClose
+      destroyOnHidden
      width="80%"
    >
      <RbacWrapperComponent action="shop:reportcenter">
--- a/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
+++ b/client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
@@ -209,7 +209,7 @@ export function ScheduleJobModalContainer({
      onOk={() => form.submit()}
      width={"90%"}
      maskClosable={false}
-      destroyOnClose
+      destroyOnHidden
      okButtonProps={{
        loading: loading
      }}
--- a/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
+++ b/client/src/components/scoreboard-jobs-list/scoreboard-jobs-list.component.jsx
@@ -106,7 +106,7 @@ export default function ScoreboardJobsList({ scoreBoardlist }) {
    <>
      <Modal
        open={state.open}
-        destroyOnClose
+        destroyOnHidden
        width="80%"
        closable={false}
        cancelButtonProps={{ style: { display: "none" } }}
--- a/client/src/components/shop-info/shop-info.consent.component.jsx
+++ b/client/src/components/shop-info/shop-info.consent.component.jsx
@@ -0,0 +1,25 @@
+import { Typography } from "antd";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import PhoneNumberConsentList from "../phone-number-consent/phone-number-consent.component";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+const mapDispatchToProps = (dispatch) => ({});
+
+function ShopInfoConsentComponent({ bodyshop }) {
+  const { t } = useTranslation();
+
+  return (
+    <div>
+      <Typography.Title level={4}>{t("settings.title")}</Typography.Title>
+      {<PhoneNumberConsentList bodyshop={bodyshop} />}
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoConsentComponent);
--- a/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
+++ b/client/src/components/shop-info/shop-info.notifications-autoadd.component.jsx
@@ -8,7 +8,7 @@ export default function ShopInfoNotificationsAutoadd({ bodyshop }) {
  const { t } = useTranslation();

  // Filter employee options to ensure active employees with valid IDs
-  const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.id && typeof e.id === "string") || [];
+  const employeeOptions = bodyshop?.employees?.filter((e) => e.active && e.user_email && e.id) || [];

  return (
    <div>
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -275,7 +275,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
        toggleModalVisible();
      }}
      okButtonProps={{ disabled: !isTouched }}
-      destroyOnClose
+      destroyOnHidden
    >
      <Form
        form={form}
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -70,7 +70,7 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
  };

  return (
-    <Drawer open={!!selected} destroyOnClose width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
+    <Drawer open={!!selected} destroyOnHidden width={drawerPercentage} placement="right" onClose={handleDrawerClose}>
      {loading ? <LoadingSpinner /> : null}
      {error ? <AlertComponent message={error.message} type="error" /> : null}
      {data ? (
--- a/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
+++ b/client/src/components/time-ticket-calculator/time-ticket-calculator.component.jsx
@@ -107,7 +107,7 @@ export default function TimeTicketCalculatorComponent({
      open={visible}
      onOpenChange={handleOpenChange}
      placement="right"
-      destroyTooltipOnHide
+      destroyOnHidden
    >
      <Button onClick={(e) => e.preventDefault()}>
        <Space>
--- a/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list-team-pay.component.jsx
@@ -39,7 +39,7 @@ export function TimeTicketListTeamPay({ bodyshop, context, actions }) {

  return (
    <>
-      <Modal width={"80%"} open={visible} destroyOnClose onOk={handleOk} onCancel={() => setVisible(false)}>
+      <Modal width={"80%"} open={visible} destroyOnHidden onOk={handleOk} onCancel={() => setVisible(false)}>
        <Form layout="vertical" form={form} initialValues={{ jobid: jobId }}>
          <LayoutFormRow grow noDivider>
            <Form.Item shouldUpdate>
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -181,7 +181,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
          )}
        </Space>
      }
-      destroyOnClose
+      destroyOnHidden
      id="time-ticket-modal"
    >
      <Form
--- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
+++ b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
@@ -119,7 +119,7 @@ export function TimeTickeTaskModalContainer({

  return (
    <Modal
-      destroyOnClose
+      destroyOnHidden
      open={open}
      onCancel={() => {
        toggleModalVisible();
--- a/client/src/graphql/phone-number-opt-out.queries.js
+++ b/client/src/graphql/phone-number-opt-out.queries.js
@@ -0,0 +1,50 @@
+import { gql } from "@apollo/client";
+
+export const GET_PHONE_NUMBER_OPT_OUT = gql`
+  query GET_PHONE_NUMBER_OPT_OUT($bodyshopid: uuid!, $phone_number: String!) {
+    phone_number_opt_out(where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _eq: $phone_number } }) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+export const GET_PHONE_NUMBER_OPT_OUTS = gql`
+  query GET_PHONE_NUMBER_OPT_OUTS($bodyshopid: uuid!, $search: String) {
+    phone_number_opt_out(
+      where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _ilike: $search } }
+      order_by: [{ phone_number: asc }, { updated_at: desc }]
+    ) {
+      id
+      bodyshopid
+      phone_number
+      created_at
+      updated_at
+    }
+  }
+`;
+
+export const SEARCH_OWNERS_BY_PHONE_NUMBERS = gql`
+  query SEARCH_OWNERS_BY_PHONE_NUMBERS($bodyshopid: uuid!, $phone_numbers: [String!]) {
+    owners(
+      where: {
+        shopid: { _eq: $bodyshopid },
+        _or: [
+          { ownr_ph1: { _in: $phone_numbers } },
+          { ownr_ph2: { _in: $phone_numbers } }
+        ]
+      }
+    ) {
+      id
+      ownr_fn
+      ownr_ln
+      ownr_co_nm
+      ownr_ph1
+      ownr_ph2
+      __typename
+    }
+  }
+`;
--- a/client/src/pages/shop/shop.page.component.jsx
+++ b/client/src/pages/shop/shop.page.component.jsx
@@ -10,10 +10,10 @@ import ShopCsiConfig from "../../components/shop-csi-config/shop-csi-config.comp
 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 ShopInfoConsentComponent from "../../components/shop-info/shop-info.consent.component";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-
 import { HasFeatureAccess } from "../../components/feature-wrapper/feature-wrapper.component";
 import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";

@@ -91,6 +91,14 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
      children: <ShopCsiConfig />
    });
  }
+
+  // Add Consent Settings tab
+  items.push({
+    key: "consent",
+    label: t("bodyshop.labels.consent_settings"),
+    children: <ShopInfoConsentComponent bodyshop={bodyshop} />
+  });
+
  return (
    <RbacWrapper action="shop:config">
      <Tabs activeKey={search.tab} onChange={(key) => history({ search: `?tab=${key}` })} items={items} />
--- a/client/src/redux/user/user.reducer.js
+++ b/client/src/redux/user/user.reducer.js
@@ -105,7 +105,6 @@ const userReducer = (state = INITIAL_STATE, action) => {
          ...action.payload //Spread current user details in.
        }
      };
-
    case UserActionTypes.SET_SHOP_DETAILS:
      return {
        ...state,
@@ -126,6 +125,7 @@ const userReducer = (state = INITIAL_STATE, action) => {
        ...state,
        imexshopid: action.payload
      };
+
    default:
      return state;
  }
--- a/client/src/redux/user/user.sagas.js
+++ b/client/src/redux/user/user.sagas.js
@@ -335,20 +335,12 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
    }

    try {
-      InstanceRenderManager({
-        executeFunction: true,
-        args: [],
-        imex: () => {
-          window.$crisp.push(["set", "user:company", [payload.shopname]]);
-          window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-          if (authRecord[0] && authRecord[0].user.validemail) {
-            window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-          }
-        },
-        rome: () => {
-          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
-        }
-      });
+      window.$crisp.push(["set", "user:company", [payload.shopname]]);
+      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
+      if (authRecord[0] && authRecord[0].user.validemail) {
+        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
+      }
+
      payload.features?.allAccess === true
        ? window.$crisp.push(["set", "session:segments", [["allAccess"]]])
        : (() => {
@@ -359,6 +351,14 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
            );
            window.$crisp.push(["set", "session:segments", [["basic", ...featureKeys]]]);
          })();
+
+      InstanceRenderManager({
+        executeFunction: true,
+        args: [],
+        rome: () => {
+          window.$zoho.salesiq.visitor.info({ "Shop Name": payload.shopname });
+        }
+      });
    } catch (error) {
      console.warn("Couldnt find $crisp.", error.message);
    }
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -656,6 +656,7 @@
        }
      },
      "labels": {
+        "consent_settings": "Phone Number Opt-Out List",
        "2tiername": "Name => RO",
        "2tiersetup": "2 Tier Setup",
        "2tiersource": "Source => RO",
@@ -2031,9 +2032,10 @@
          "stands": "Stands",
          "waived": "Waived"
        },
-        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone. ",
+        "deleteconfirm": "Are you sure you want to delete this Job? This cannot be undone.",
        "deletedelivery": "Delete Delivery Checklist",
        "deleteintake": "Delete Intake Checklist",
+        "deletewatchers": "Remove Watchers before deleting this Job.",
        "deliverchecklist": "Deliver Checklist",
        "difference": "Difference",
        "diskscan": "Scan Disk for Estimates",
@@ -2301,8 +2303,10 @@
        "productionlist": "Production Board - List",
        "readyjobs": "Ready Jobs",
        "recent": "Recent Items",
+        "remoteassist": "Remote Assist",
        "reportcenter": "Report Center",
-        "rescueme": "Rescue me!",
+        "rescueme": "Rescue Me!",
+        "rescuemezoho": "Remote Me In!",
        "schedule": "Schedule",
        "scoreboard": "Scoreboard",
        "search": {
@@ -2377,7 +2381,8 @@
      "errors": {
        "invalidphone": "The phone number is invalid.  Unable to open conversation. ",
        "noattachedjobs": "No Jobs have been associated to this conversation. ",
-        "updatinglabel": "Error updating label. {{error}}"
+        "updatinglabel": "Error updating label. {{error}}",
+        "no_consent": "This phone number has Opted-out of Messaging."
      },
      "labels": {
        "addlabel": "Add a label to this conversation.",
@@ -2393,7 +2398,8 @@
        "selectmedia": "Select Media",
        "sentby": "Sent by {{by}} at {{time}}",
        "typeamessage": "Send a message...",
-        "unarchive": "Unarchive"
+        "unarchive": "Unarchive",
+        "no_consent": "Opt-out"
      },
      "render": {
        "conversation_list": "Conversation List"
@@ -2474,7 +2480,8 @@
        "teams-search": "Search for a Team",
        "unwatch": "Unwatch",
        "watch": "Watch",
-        "watching-issue": "Watching"
+        "watching-issue": "Watching",
+        "employee-notification": "Notifications are disabled because you do not have an associated Employee record."
      },
      "scenarios": {
        "alternate-transport-changed": "Alternate Transport Changed",
@@ -2494,7 +2501,9 @@
        "tasks-updated-created": "Tasks Updated / Created"
      },
      "tooltips": {
-        "job-watchers": "Job Watchers"
+        "job-watchers": "Job Watchers",
+        "not-employee": "You need to be an employee to watch this job. Reach out to your admin to get set up!",
+        "not-employee-notifications": "You must be an employee to receive notifications"
      }
    },
    "owner": {
@@ -3096,6 +3105,7 @@
        "credits_not_received_date_vendorid": "Credits not Received by Vendor",
        "csi": "CSI Responses",
        "customer_list": "Customer List",
+        "customer_list_excel": "Customer List - Excel",
        "cycle_time_analysis": "Cycle Time Analysis",
        "estimates_written_converted": "Estimates Written/Converted",
        "estimator_detail": "Jobs by Estimator (Detail)",
@@ -3859,6 +3869,17 @@
      "validation": {
        "unique_vendor_name": "You must enter a unique vendor name."
      }
+    },
+    "consent": {
+      "phone_number": "Phone Number",
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2"
+    },
+    "settings": {
+      "title": "Phone Number Opt-Out List"
    }
  }
 }
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -656,6 +656,7 @@
        }
      },
      "labels": {
+        "consent_settings": "",
        "2tiername": "",
        "2tiersetup": "",
        "2tiersource": "",
@@ -2034,6 +2035,7 @@
        "deleteconfirm": "",
        "deletedelivery": "",
        "deleteintake": "",
+        "deletewatchers": "",
        "deliverchecklist": "",
        "difference": "",
        "diskscan": "",
@@ -2301,8 +2303,10 @@
        "productionlist": "",
        "readyjobs": "",
        "recent": "",
+        "remoteassist": "",
        "reportcenter": "",
        "rescueme": "",
+        "rescuemezoho": "",
        "schedule": "Programar",
        "scoreboard": "",
        "search": {
@@ -2377,7 +2381,8 @@
      "errors": {
        "invalidphone": "",
        "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
      },
      "labels": {
        "addlabel": "",
@@ -2393,7 +2398,8 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Enviar un mensaje...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
      },
      "render": {
        "conversation_list": ""
@@ -2476,7 +2482,8 @@
        "teams-search": "",
        "unwatch": "",
        "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
      },
      "scenarios": {
        "alternate-transport-changed": "",
@@ -2496,7 +2503,9 @@
        "tasks-updated-created": ""
      },
      "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": "",
+        "not-employee-notifications": ""
      }
    },
    "owner": {
@@ -3098,6 +3107,7 @@
        "credits_not_received_date_vendorid": "",
        "csi": "",
        "customer_list": "",
+        "customer_list_excel": "",
        "cycle_time_analysis": "",
        "estimates_written_converted": "",
        "estimator_detail": "",
@@ -3861,6 +3871,17 @@
      "validation": {
        "unique_vendor_name": ""
      }
+    },
+    "consent": {
+      "phone_number": "",
+      "associated_owners": "",
+      "created_at": "",
+      "no_owners": "",
+      "phone_1": "",
+      "phone_2": ""
+    },
+    "settings": {
+      "title": ""
    }
  }
 }
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -656,6 +656,7 @@
        }
      },
      "labels": {
+        "consent_settings": "",
        "2tiername": "",
        "2tiersetup": "",
        "2tiersource": "",
@@ -2034,6 +2035,7 @@
        "deleteconfirm": "",
        "deletedelivery": "",
        "deleteintake": "",
+        "deletewatchers": "",
        "deliverchecklist": "",
        "difference": "",
        "diskscan": "",
@@ -2301,8 +2303,10 @@
        "productionlist": "",
        "readyjobs": "",
        "recent": "",
+        "remoteassist": "",
        "reportcenter": "",
        "rescueme": "",
+        "rescuemezoho": "",
        "schedule": "Programme",
        "scoreboard": "",
        "search": {
@@ -2377,7 +2381,8 @@
      "errors": {
        "invalidphone": "",
        "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
      },
      "labels": {
        "addlabel": "",
@@ -2393,7 +2398,8 @@
        "selectmedia": "",
        "sentby": "",
        "typeamessage": "Envoyer un message...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
      },
      "render": {
        "conversation_list": ""
@@ -2476,7 +2482,8 @@
        "teams-search": "",
        "unwatch": "",
        "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
      },
      "scenarios": {
        "alternate-transport-changed": "",
@@ -2496,7 +2503,9 @@
        "tasks-updated-created": ""
      },
      "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": "",
+        "not-employee-notifications": ""
      }
    },
    "owner": {
@@ -3098,6 +3107,7 @@
        "credits_not_received_date_vendorid": "",
        "csi": "",
        "customer_list": "",
+        "customer_list_excel": "",
        "cycle_time_analysis": "",
        "estimates_written_converted": "",
        "estimator_detail": "",
@@ -3861,6 +3871,17 @@
      "validation": {
        "unique_vendor_name": ""
      }
+    },
+    "consent": {
+      "phone_number": "Phone Number",
+      "associated_owners": "Associated Owners",
+      "created_at": "Opt-Out Date",
+      "no_owners": "No Associated Owners",
+      "phone_1": "Phone 1",
+      "phone_2": "Phone 2"
+    },
+    "settings": {
+      "title": ""
    }
  }
 }
--- a/client/src/utils/DateFormatter.jsx
+++ b/client/src/utils/DateFormatter.jsx
@@ -1,6 +1,5 @@
 import { Tooltip } from "antd";
 import dayjs from "../utils/day";
-import React from "react";

 export function DateFormatter(props) {
  return props.children ? dayjs(props.children).format(props.includeDay ? "ddd MM/DD/YYYY" : "MM/DD/YYYY") : null;
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -2004,6 +2004,18 @@ export const TemplateList = (type, context) => {
            },
            group: "customers"
          },
+          customer_list_excel: {
+            title: i18n.t("reportcenter.templates.customer_list_excel"),
+            subject: i18n.t("reportcenter.templates.customer_list_excel"),
+            key: "customer_list_excel",
+            reporttype: "excel",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.date_invoiced")
+            },
+            group: "customers"
+          },
          exported_gsr_by_ro: {
            title: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
            subject: i18n.t("reportcenter.templates.exported_gsr_by_ro"),
@@ -2241,7 +2253,7 @@ export const TemplateList = (type, context) => {
              field: i18n.t("bills.fields.date")
            },
            group: "purchases"
-          },
+          }
        }
      : {}),
    ...(!type || type === "courtesycarcontract"
--- a/client/src/utils/useIsEmployee.js
+++ b/client/src/utils/useIsEmployee.js
@@ -0,0 +1,19 @@
+import { useMemo } from "react";
+
+/**
+ * Check if the user is an employee of the bodyshop
+ * @param bodyshop
+ * @param userOrEmail
+ * @returns {boolean|*}
+ */
+export function useIsEmployee(bodyshop, userOrEmail) {
+  return useMemo(() => {
+    if (!bodyshop || !bodyshop.employees) return false;
+
+    // Handle both user object and email string
+    const email = typeof userOrEmail === "string" ? userOrEmail : userOrEmail?.email;
+    if (!email) return false;
+
+    return bodyshop.employees.some((employee) => employee.user_email === email);
+  }, [bodyshop, userOrEmail]);
+}
--- a/hasura/metadata/tables.yaml
+++ b/hasura/metadata/tables.yaml
@@ -2681,6 +2681,9 @@
                - active:
                    _eq: true
        allow_aggregations: true
+- table:
+    name: integration_log
+    schema: public
 - table:
    name: inventory
    schema: public
@@ -5861,6 +5864,32 @@
        template_engine: Kriti
        url: '{{$base_url}}/opensearch'
        version: 2
+- table:
+    name: phone_number_opt_out
+    schema: public
+  object_relationships:
+    - name: bodyshop
+      using:
+        foreign_key_constraint_on: bodyshopid
+  select_permissions:
+    - role: user
+      permission:
+        columns:
+          - phone_number
+          - created_at
+          - updated_at
+          - bodyshopid
+          - id
+        filter:
+          bodyshop:
+            associations:
+              _and:
+                - user:
+                    authid:
+                      _eq: X-Hasura-User-Id
+                - active:
+                    _eq: true
+      comment: ""
 - table:
    name: phonebook
    schema: public
--- a/hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/down.sql
+++ b/hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."bodyshops" add column "enforce_sms_consent" boolean
+--  null;
--- a/hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/up.sql
+++ b/hasura/migrations/1747158530097_alter_table_public_bodyshops_add_column_enforce_sms_consent/up.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" add column "enforce_sms_consent" boolean
+ null;
--- a/hasura/migrations/1747158981002_create_table_public_phone_number_consent/down.sql
+++ b/hasura/migrations/1747158981002_create_table_public_phone_number_consent/down.sql
@@ -0,0 +1 @@
+DROP TABLE "public"."phone_number_consent";
--- a/hasura/migrations/1747158981002_create_table_public_phone_number_consent/up.sql
+++ b/hasura/migrations/1747158981002_create_table_public_phone_number_consent/up.sql
@@ -0,0 +1,2 @@
+CREATE TABLE "public"."phone_number_consent" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "bodyshopid" uuid NOT NULL, "phone_number" text NOT NULL, "consent_status" boolean NOT NULL, "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "consent_updated_at" timestamptz NOT NULL DEFAULT now(), PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"), UNIQUE ("bodyshopid", "phone_number"));
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/down.sql
+++ b/hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/down.sql
@@ -0,0 +1 @@
+DROP TABLE "public"."phone_number_consent_history";
--- a/hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/up.sql
+++ b/hasura/migrations/1747759446622_create_table_public_phone_number_consent_history/up.sql
@@ -0,0 +1,2 @@
+CREATE TABLE "public"."phone_number_consent_history" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "phone_number_consent_id" uuid NOT NULL, "old_value" boolean NOT NULL, "new_value" boolean NOT NULL, "reason" text NOT NULL, "changed_at" timestamptz NOT NULL DEFAULT now(), "changed_by" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("phone_number_consent_id") REFERENCES "public"."phone_number_consent"("id") ON UPDATE restrict ON DELETE restrict, UNIQUE ("id"));
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/down.sql
+++ b/hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/down.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_consent_history" alter column "old_value" set not null;
--- a/hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/up.sql
+++ b/hasura/migrations/1747775597734_alter_table_public_phone_number_consent_history_alter_column_old_value/up.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_consent_history" alter column "old_value" drop not null;
--- a/hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/down.sql
+++ b/hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/down.sql
@@ -0,0 +1,3 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- DROP table "public"."phone_number_consent_history";
--- a/hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/up.sql
+++ b/hasura/migrations/1747850002182_drop_table_public_phone_number_consent_history/up.sql
@@ -0,0 +1 @@
+DROP table "public"."phone_number_consent_history";
--- a/hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/down.sql
+++ b/hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."phone_number_consent" alter column "consent_status" drop not null;
+alter table "public"."phone_number_consent" add column "consent_status" bool;
--- a/hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/up.sql
+++ b/hasura/migrations/1747850205206_alter_table_public_phone_number_consent_drop_column_consent_status/up.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_consent" drop column "consent_status" cascade;
--- a/hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/down.sql
+++ b/hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/down.sql
@@ -0,0 +1,3 @@
+alter table "public"."phone_number_consent" alter column "consent_updated_at" set default now();
+alter table "public"."phone_number_consent" alter column "consent_updated_at" drop not null;
+alter table "public"."phone_number_consent" add column "consent_updated_at" timestamptz;
--- a/hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/up.sql
+++ b/hasura/migrations/1747850221535_alter_table_public_phone_number_consent_drop_column_consent_updated_at/up.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_consent" drop column "consent_updated_at" cascade;
--- a/hasura/migrations/1747850386584_rename_table_public_phone_number_consent/down.sql
+++ b/hasura/migrations/1747850386584_rename_table_public_phone_number_consent/down.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_opt_out" rename to "phone_number_consent";
--- a/hasura/migrations/1747850386584_rename_table_public_phone_number_consent/up.sql
+++ b/hasura/migrations/1747850386584_rename_table_public_phone_number_consent/up.sql
@@ -0,0 +1 @@
+alter table "public"."phone_number_consent" rename to "phone_number_opt_out";
--- a/hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/down.sql
+++ b/hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/down.sql
@@ -0,0 +1,2 @@
+alter table "public"."bodyshops" alter column "enforce_sms_consent" drop not null;
+alter table "public"."bodyshops" add column "enforce_sms_consent" bool;
--- a/hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/up.sql
+++ b/hasura/migrations/1747850458206_alter_table_public_bodyshops_drop_column_enforce_sms_consent/up.sql
@@ -0,0 +1 @@
+alter table "public"."bodyshops" drop column "enforce_sms_consent" cascade;
--- a/hasura/migrations/1747932876194_create_table_public_integration_log/down.sql
+++ b/hasura/migrations/1747932876194_create_table_public_integration_log/down.sql
@@ -0,0 +1 @@
+DROP TABLE "public"."integration_log";
--- a/hasura/migrations/1747932876194_create_table_public_integration_log/up.sql
+++ b/hasura/migrations/1747932876194_create_table_public_integration_log/up.sql
@@ -0,0 +1,18 @@
+CREATE TABLE "public"."integration_log" ("id" uuid NOT NULL DEFAULT gen_random_uuid(), "created_at" timestamptz NOT NULL DEFAULT now(), "updated_at" timestamptz NOT NULL DEFAULT now(), "bodyshopid" uuid NOT NULL, "email" text NOT NULL, "jobid" uuid, "billid" uuid, "paymentid" uuid, "method" text NOT NULL, "name" text NOT NULL, "status" text NOT NULL, "platform" text NOT NULL, PRIMARY KEY ("id") , FOREIGN KEY ("bodyshopid") REFERENCES "public"."bodyshops"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("email") REFERENCES "public"."users"("email") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("billid") REFERENCES "public"."bills"("id") ON UPDATE restrict ON DELETE set null, FOREIGN KEY ("jobid") REFERENCES "public"."jobs"("id") ON UPDATE restrict ON DELETE restrict, FOREIGN KEY ("paymentid") REFERENCES "public"."payments"("id") ON UPDATE restrict ON DELETE set null);
+CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"()
+RETURNS TRIGGER AS $$
+DECLARE
+  _new record;
+BEGIN
+  _new := NEW;
+  _new."updated_at" = NOW();
+  RETURN _new;
+END;
+$$ LANGUAGE plpgsql;
+CREATE TRIGGER "set_public_integration_log_updated_at"
+BEFORE UPDATE ON "public"."integration_log"
+FOR EACH ROW
+EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"();
+COMMENT ON TRIGGER "set_public_integration_log_updated_at" ON "public"."integration_log"
+IS 'trigger to set value of column "updated_at" to current timestamp on row update';
+CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -16,14 +16,14 @@
    "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
  },
  "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.804.0",
-    "@aws-sdk/client-elasticache": "^3.804.0",
-    "@aws-sdk/client-s3": "^3.804.0",
-    "@aws-sdk/client-secrets-manager": "^3.804.0",
-    "@aws-sdk/client-ses": "^3.804.0",
-    "@aws-sdk/credential-provider-node": "^3.804.0",
-    "@aws-sdk/lib-storage": "^3.804.0",
-    "@aws-sdk/s3-request-presigner": "^3.804.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.817.0",
+    "@aws-sdk/client-elasticache": "^3.817.0",
+    "@aws-sdk/client-s3": "^3.817.0",
+    "@aws-sdk/client-secrets-manager": "^3.817.0",
+    "@aws-sdk/client-ses": "^3.817.0",
+    "@aws-sdk/credential-provider-node": "^3.817.0",
+    "@aws-sdk/lib-storage": "^3.817.0",
+    "@aws-sdk/s3-request-presigner": "^3.817.0",
    "@opensearch-project/opensearch": "^2.13.0",
    "@socket.io/admin-ui": "^0.5.1",
    "@socket.io/redis-adapter": "^8.3.0",
@@ -31,18 +31,18 @@
    "aws4": "^1.13.2",
    "axios": "^1.8.4",
    "better-queue": "^3.8.12",
-    "bullmq": "^5.52.2",
+    "bullmq": "^5.53.0",
    "chart.js": "^4.4.8",
    "cloudinary": "^2.6.1",
    "compression": "^1.8.0",
    "cookie-parser": "^1.4.7",
-    "cors": "2.8.5",
+    "cors": "^2.8.5",
    "crisp-status-reporter": "^1.2.2",
-    "dd-trace": "^5.51.0",
+    "dd-trace": "^5.53.0",
    "dinero.js": "^1.9.1",
    "dotenv": "^16.4.5",
    "express": "^4.21.1",
-    "firebase-admin": "^13.2.0",
+    "firebase-admin": "^13.4.0",
    "graphql": "^16.11.0",
    "graphql-request": "^6.1.0",
    "intuit-oauth": "^4.2.0",
@@ -52,12 +52,12 @@
    "juice": "^11.0.1",
    "lodash": "^4.17.21",
    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.48",
+    "moment-timezone": "^0.6.0",
    "multer": "^1.4.5-lts.1",
    "node-persist": "^4.0.4",
    "nodemailer": "^6.10.0",
    "phone": "^3.1.58",
-    "query-string": "^9.1.2",
+    "query-string": "7.1.3",
    "recursive-diff": "^1.0.9",
    "rimraf": "^6.0.1",
    "skia-canvas": "^2.0.2",
@@ -65,7 +65,7 @@
    "socket.io": "^4.8.1",
    "socket.io-adapter": "^2.5.5",
    "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.6.0",
+    "twilio": "^5.6.1",
    "uuid": "^11.1.0",
    "winston": "^3.17.0",
    "winston-cloudwatch": "^6.3.0",
@@ -73,14 +73,14 @@
    "xmlbuilder2": "^3.1.1"
  },
  "devDependencies": {
-    "@eslint/js": "^9.26.0",
-    "eslint": "^9.26.0",
+    "@eslint/js": "^9.27.0",
+    "eslint": "^9.27.0",
    "eslint-plugin-react": "^7.37.5",
    "globals": "^15.15.0",
    "mock-require": "^3.0.3",
    "p-limit": "^3.1.0",
    "prettier": "^3.5.3",
-    "supertest": "^7.1.0",
-    "vitest": "^3.1.3"
+    "supertest": "^7.1.1",
+    "vitest": "^3.1.4"
  }
 }
--- a/server.js
+++ b/server.js
@@ -282,6 +282,7 @@ const applySocketIO = async ({ server, app }) => {
    logger.log("Redis connections closed.", "INFO", "redis", "api");
  });

+  // IO Redis
  const ioRedis = new Server(server, {
    path: "/wss",
    adapter: createAdapter(pubClient, subClient),
--- a/server/accounting/qbo/qbo-callback.js
+++ b/server/accounting/qbo/qbo-callback.js
@@ -14,10 +14,8 @@ const oauthClient = new OAuthClient({
  clientSecret: process.env.QBO_SECRET,
  environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
  redirectUri: process.env.QBO_REDIRECT_URI,
-  logging: true
 });

-//TODO:AIO Add in QBO callbacks.
 const url = InstanceEndpoints();

 exports.default = async (req, res) => {
--- a/server/accounting/qbo/qbo-payables.js
+++ b/server/accounting/qbo/qbo-payables.js
@@ -20,7 +20,6 @@ exports.default = async (req, res) => {
    clientSecret: process.env.QBO_SECRET,
    environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
    redirectUri: process.env.QBO_REDIRECT_URI,
-    logging: true
  });

  try {
@@ -149,6 +148,15 @@ async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
        "Content-Type": "application/json"
      }
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "QueryVendorRecord",
+      billid: bill.id,
+      status: result.response?.status,
+      bodyshopid: bill.job.shopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return (
      result.json &&
@@ -178,6 +186,15 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
      },
      body: JSON.stringify(Vendor)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertVendorRecord",
+      billid: bill.id,
+      status: result.response?.status,
+      bodyshopid: bill.job.shopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json && result.json.Vendor;
  } catch (error) {
@@ -190,7 +207,7 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
 }

 async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop) {
-  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
+  const { accounts, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, bill.job.shopid);

  const lines = bill.billlines.map((il) =>
    generateBillLine(
@@ -246,11 +263,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      .format("YYYY-MM-DD"),
    ...(!bill.is_credit_memo &&
      bill.vendor.due_date && {
-        DueDate: moment(bill.date)
-          //.tz(bill.job.bodyshop.timezone)
-          .add(bill.vendor.due_date, "days")
-          .format("YYYY-MM-DD")
-      }),
+      DueDate: moment(bill.date)
+        //.tz(bill.job.bodyshop.timezone)
+        .add(bill.vendor.due_date, "days")
+        .format("YYYY-MM-DD")
+    }),
    DocNumber: bill.invoice_number,
    //...(bill.job.class ? { ClassRef: { Id: classes[bill.job.class] } } : {}),
    ...(!(
@@ -263,8 +280,8 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      : {}),
    ...(bodyshop.accountingconfig.qbo_departmentid &&
      bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-      }),
+      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+    }),
    PrivateNote: `RO ${bill.job.ro_number || ""}`,
    Line: lines
  };
@@ -280,6 +297,15 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
      },
      body: JSON.stringify(billQbo)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertBill",
+      billid: bill.id,
+      status: result.response?.status,
+      bodyshopid: bill.job.shopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json && result.json.Bill;
  } catch (error) {
@@ -327,8 +353,8 @@ const generateBillLine = (
        accountingconfig.qbo && accountingconfig.qbo_usa && region_config.includes("CA_")
          ? {}
          : {
-              value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
-            },
+            value: taxCodes[findTaxCode(billLine.applicable_taxes, ioSalesTaxCodes)]
+          },
      AccountRef: {
        value: accounts[account.accountname]
      }
@@ -342,7 +368,7 @@ const generateBillLine = (
  };
 };

-async function QueryMetaData(oauthClient, qbo_realmId, req) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
  const accounts = await oauthClient.makeApiCall({
    url: urlBuilder(
      qbo_realmId,
@@ -354,6 +380,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryAccountType",
+    status: accounts.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  setNewRefreshToken(req.user.email, accounts);
  const taxCodes = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From TaxCode`),
@@ -362,7 +396,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
-
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryTaxCode",
+    status: taxCodes.status,
+    bodyshopid,
+    email: req.user.email
+  })
  const classes = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From Class`),
    method: "POST",
@@ -370,7 +411,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
-
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryClasses",
+    status: classes.status,
+    bodyshopid,
+    email: req.user.email
+  })
  const taxCodeMapping = {};

  taxCodes.json &&
--- a/server/accounting/qbo/qbo-payments.js
+++ b/server/accounting/qbo/qbo-payments.js
@@ -29,7 +29,6 @@ exports.default = async (req, res) => {
    clientSecret: process.env.QBO_SECRET,
    environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
    redirectUri: process.env.QBO_REDIRECT_URI,
-    logging: true
  });
  try {
    //Fetch the API Access Tokens & Set them for the session.
@@ -198,7 +197,8 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
    req,
    payment.job.ro_number,
    false,
-    parentRef
+    parentRef,
+    payment.job.shopid
  );

  if (invoices && invoices.length !== 1) {
@@ -227,20 +227,20 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
    PaymentRefNum: payment.transactionid,
    ...(invoices && invoices.length === 1 && invoices[0]
      ? {
-          Line: [
-            {
-              Amount: Dinero({
-                amount: Math.round(payment.amount * 100)
-              }).toFormat(DineroQbFormat),
-              LinkedTxn: [
-                {
-                  TxnId: invoices[0].Id,
-                  TxnType: "Invoice"
-                }
-              ]
-            }
-          ]
-        }
+        Line: [
+          {
+            Amount: Dinero({
+              amount: Math.round(payment.amount * 100)
+            }).toFormat(DineroQbFormat),
+            LinkedTxn: [
+              {
+                TxnId: invoices[0].Id,
+                TxnType: "Invoice"
+              }
+            ]
+          }
+        ]
+      }
      : {})
  };
  logger.log("qbo-payments-objectlog", "DEBUG", req.user.email, payment.id, {
@@ -255,6 +255,15 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
      },
      body: JSON.stringify(paymentQbo)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertPayment",
+      paymentid: payment.id,
+      status: result.response?.status,
+      bodyshopid: payment.job.shopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.Bill;
  } catch (error) {
@@ -266,7 +275,7 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef,
  }
 }

-async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditMemo, parentTierRef) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditMemo, parentTierRef, bodyshopid) {
  const invoice = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From Invoice where DocNumber like '${ro_number}%'`),
    method: "POST",
@@ -274,7 +283,15 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryInvoice",

+    status: invoice.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  const paymentMethods = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From PaymentMethod`),
    method: "POST",
@@ -282,6 +299,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryPaymentMethod",
+    status: paymentMethods.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  setNewRefreshToken(req.user.email, paymentMethods);

  //   const classes = await oauthClient.makeApiCall({
@@ -325,6 +350,15 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
        "Content-Type": "application/json"
      }
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "QueryTaxCode",
+
+      status: taxCodes.response?.status,
+      bodyshopid,
+      email: req.user.email
+    })
    const items = await oauthClient.makeApiCall({
      url: urlBuilder(qbo_realmId, "query", `select * From Item`),
      method: "POST",
@@ -332,6 +366,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req, ro_number, isCreditM
        "Content-Type": "application/json"
      }
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "QueryItems",
+      status: items.response?.status,
+      bodyshopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, items);

    const itemMapping = {};
@@ -377,7 +419,8 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
    req,
    payment.job.ro_number,
    true,
-    parentRef
+    parentRef,
+    payment.job.shopid
  );

  if (invoices && invoices.length !== 1) {
@@ -406,14 +449,14 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
          TaxCodeRef: {
            value:
              taxCodes[
-                findTaxCode(
-                  {
-                    local: false,
-                    federal: false,
-                    state: false
-                  },
-                  payment.job.bodyshop.md_responsibility_centers.sales_tax_codes
-                )
+              findTaxCode(
+                {
+                  local: false,
+                  federal: false,
+                  state: false
+                },
+                payment.job.bodyshop.md_responsibility_centers.sales_tax_codes
+              )
              ]
          }
        }
@@ -432,6 +475,15 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
      },
      body: JSON.stringify(paymentQbo)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertCreditMemo",
+      paymentid: payment.id,
+      status: result.response?.status,
+      bodyshopid: req.user.bodyshopid,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.Bill;
  } catch (error) {
--- a/server/accounting/qbo/qbo-receivables.js
+++ b/server/accounting/qbo/qbo-receivables.js
@@ -22,8 +22,8 @@ exports.default = async (req, res) => {
    clientSecret: process.env.QBO_SECRET,
    environment: process.env.NODE_ENV === "production" ? "production" : "sandbox",
    redirectUri: process.env.QBO_REDIRECT_URI,
-    logging: true
  });
+
  try {
    //Fetch the API Access Tokens & Set them for the session.
    const response = await apiGqlClient.request(queries.GET_QBO_AUTH, {
@@ -233,6 +233,15 @@ async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
        "Content-Type": "application/json"
      }
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "QueryCustomer",
+      status: result.response?.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return (
      result.json &&
@@ -279,6 +288,15 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
      },
      body: JSON.stringify(Customer)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertCustomer",
+      status: result.response.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json.Customer;
  } catch (error) {
@@ -305,6 +323,15 @@ async function QueryOwner(oauthClient, qbo_realmId, req, job, isThreeTier, paren
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryCustomer",
+    status: result.response?.status,
+    bodyshopid: job.shopid,
+    jobid: job.id,
+    email: req.user.email
+  })
  setNewRefreshToken(req.user.email, result);
  return (
    result.json &&
@@ -331,11 +358,11 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
    ...(job.ownr_ea ? { PrimaryEmailAddr: { Address: job.ownr_ea.trim() } } : {}),
    ...(isThreeTier
      ? {
-          Job: true,
-          ParentRef: {
-            value: parentTierRef.Id
-          }
+        Job: true,
+        ParentRef: {
+          value: parentTierRef.Id
        }
+      }
      : {})
  };
  try {
@@ -347,6 +374,15 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
      },
      body: JSON.stringify(Customer)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertCustomer",
+      status: result.response?.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json.Customer;
  } catch (error) {
@@ -372,6 +408,15 @@ async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryCustomer",
+    status: result.response?.status,
+    bodyshopid: job.shopid,
+    jobid: job.id,
+    email: req.user.email
+  })
  setNewRefreshToken(req.user.email, result);
  return (
    result.json &&
@@ -411,6 +456,15 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
      },
      body: JSON.stringify(Customer)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertCustomer",
+      status: result.response?.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json.Customer;
  } catch (error) {
@@ -424,7 +478,7 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {

 exports.InsertJob = InsertJob;

-async function QueryMetaData(oauthClient, qbo_realmId, req) {
+async function QueryMetaData(oauthClient, qbo_realmId, req, bodyshopid) {
  const items = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From Item where active=true maxresults 1000`),
    method: "POST",
@@ -432,6 +486,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryItems",
+    status: items.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  setNewRefreshToken(req.user.email, items);
  const taxCodes = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From TaxCode where active=true`),
@@ -440,7 +502,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
-
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryTaxCodes",
+    status: taxCodes.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  const classes = await oauthClient.makeApiCall({
    url: urlBuilder(qbo_realmId, "query", `select * From Class`),
    method: "POST",
@@ -448,7 +517,14 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
      "Content-Type": "application/json"
    }
  });
-
+  logger.LogIntegrationCall({
+    platform: "QBO",
+    method: "POST",
+    name: "QueryClasses",
+    status: classes.response?.status,
+    bodyshopid,
+    email: req.user.email
+  })
  const taxCodeMapping = {};

  taxCodes.json &&
@@ -483,7 +559,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
 }

 async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, parentTierRef) {
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
+  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid);
  const InvoiceLineAdd = CreateInvoiceLines({
    bodyshop,
    jobs_by_pk: job,
@@ -499,57 +575,55 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
    DocNumber: job.ro_number,
    ...(job.class ? { ClassRef: { value: classes[job.class] } } : {}),
    CustomerMemo: {
-      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${
-        job.po_number ? `PO No: ${job.po_number}` : ``
-      } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
-        job.v_model_desc || ""
-      } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
+      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${job.po_number ? `PO No: ${job.po_number}` : ``
+        } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""
+        } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
    },
    CustomerRef: {
      value: parentTierRef.Id
    },
    ...(bodyshop.accountingconfig.qbo_departmentid &&
      bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-      }),
+      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+    }),
    CustomField: [
      ...(bodyshop.accountingconfig.ReceivableCustomField1
        ? [
-            {
-              DefinitionId: "1",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "1",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
+            Type: "StringType"
+          }
+        ]
        : []),
      ...(bodyshop.accountingconfig.ReceivableCustomField2
        ? [
-            {
-              DefinitionId: "2",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "2",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
+            Type: "StringType"
+          }
+        ]
        : []),
      ...(bodyshop.accountingconfig.ReceivableCustomField3
        ? [
-            {
-              DefinitionId: "3",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "3",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
+            Type: "StringType"
+          }
+        ]
        : [])
    ],
    ...(bodyshop.accountingconfig &&
      bodyshop.accountingconfig.qbo &&
      bodyshop.accountingconfig.qbo_usa && {
-        TxnTaxDetail: {
-          TxnTaxCodeRef: {
-            value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
-          }
+      TxnTaxDetail: {
+        TxnTaxCodeRef: {
+          value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
        }
-      }),
+      }
+    }),

    ...(bodyshop.accountingconfig.printlater ? { PrintStatus: "NeedToPrint" } : {}),
    ...(bodyshop.accountingconfig.emaillater && job.ownr_ea ? { EmailStatus: "NeedToSend" } : {}),
@@ -575,6 +649,15 @@ async function InsertInvoice(oauthClient, qbo_realmId, req, job, bodyshop, paren
      },
      body: JSON.stringify(invoiceObj)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertInvoice",
+      status: result.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json && result.json.Invoice;
  } catch (error) {
@@ -598,7 +681,7 @@ async function InsertInvoiceMultiPayerInvoice(
  payer,
  suffix
 ) {
-  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req);
+  const { items, taxCodes, classes } = await QueryMetaData(oauthClient, qbo_realmId, req, job.shopid);
  const InvoiceLineAdd = createMultiQbPayerLines({
    bodyshop,
    jobs_by_pk: job,
@@ -616,58 +699,56 @@ async function InsertInvoiceMultiPayerInvoice(
    DocNumber: job.ro_number + suffix,
    ...(job.class ? { ClassRef: { value: classes[job.class] } } : {}),
    CustomerMemo: {
-      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${
-        job.po_number ? `PO No: ${job.po_number}` : ``
-      } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${
-        job.v_model_desc || ""
-      } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
+      value: `${job.clm_no ? `Claim No: ${job.clm_no}` : ``}${job.po_number ? `PO No: ${job.po_number}` : ``
+        } Vehicle:${job.v_model_yr || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""
+        } ${job.v_vin || ""} ${job.plate_no || ""} `.trim()
    },
    CustomerRef: {
      value: parentTierRef.Id
    },
    ...(bodyshop.accountingconfig.qbo_departmentid &&
      bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
-        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
-      }),
+      DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid }
+    }),
    CustomField: [
      ...(bodyshop.accountingconfig.ReceivableCustomField1
        ? [
-            {
-              DefinitionId: "1",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "1",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField1],
+            Type: "StringType"
+          }
+        ]
        : []),
      ...(bodyshop.accountingconfig.ReceivableCustomField2
        ? [
-            {
-              DefinitionId: "2",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "2",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField2],
+            Type: "StringType"
+          }
+        ]
        : []),
      ...(bodyshop.accountingconfig.ReceivableCustomField3
        ? [
-            {
-              DefinitionId: "3",
-              StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
-              Type: "StringType"
-            }
-          ]
+          {
+            DefinitionId: "3",
+            StringValue: job[bodyshop.accountingconfig.ReceivableCustomField3],
+            Type: "StringType"
+          }
+        ]
        : [])
    ],
    ...(bodyshop.accountingconfig &&
      bodyshop.accountingconfig.qbo &&
      bodyshop.accountingconfig.qbo_usa &&
      bodyshop.region_config.includes("CA_") && {
-        TxnTaxDetail: {
-          TxnTaxCodeRef: {
-            value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
-          }
+      TxnTaxDetail: {
+        TxnTaxCodeRef: {
+          value: taxCodes[bodyshop.md_responsibility_centers.taxes.state.accountitem]
        }
-      }),
+      }
+    }),

    ...(bodyshop.accountingconfig.printlater ? { PrintStatus: "NeedToPrint" } : {}),
    ...(bodyshop.accountingconfig.emaillater && job.ownr_ea ? { EmailStatus: "NeedToSend" } : {}),
@@ -693,6 +774,15 @@ async function InsertInvoiceMultiPayerInvoice(
      },
      body: JSON.stringify(invoiceObj)
    });
+    logger.LogIntegrationCall({
+      platform: "QBO",
+      method: "POST",
+      name: "InsertInvoice",
+      status: result.response.status,
+      bodyshopid: job.shopid,
+      jobid: job.id,
+      email: req.user.email
+    })
    setNewRefreshToken(req.user.email, result);
    return result && result.json && result.json.Invoice;
  } catch (error) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Allan Carr	310321d0ab	IO-3249 Delete Job Watchers Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 12:49:58 -07:00
Allan Carr	7e884c42ea	Merged in feature/IO-3214-Extend-New-Fields-to-Audit-Log (pull request #2346 ) IO-3214 Extend New Fields to Audit Log Approved-by: Dave Richer	2025-05-26 19:10:16 +00:00
Allan Carr	e279bf41a4	IO-3214 Extend New Fields to Audit Log Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 12:11:26 -07:00
Dave Richer	4a060ab51c	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2345 ) Feature/IO-3182 Phone Number Consent	2025-05-26 19:08:47 +00:00
Dave Richer	62c1c77a18	feature/IO-3182-Phone-Number-Consent - Finish core functionality	2025-05-26 15:07:57 -04:00
Dave Richer	db19ecb28c	feature/IO-3182-Phone-Number-Consent - Front/Back Start/stop logic complete	2025-05-26 14:49:02 -04:00
Dave Richer	51748ce28d	feature/IO-3182-Phone-Number-Consent - Front/Back Start/stop logic complete	2025-05-26 14:44:27 -04:00
Allan Carr	4bbfd8a9da	Merged in feature/IO-3247-Quick-Deliver-Require-Delivery (pull request #2343 ) IO-3247 Quick Deliver Require Delivery Approved-by: Dave Richer	2025-05-26 17:37:36 +00:00
Allan Carr	d4d2db2cac	IO-3247 Quick Deliver Require Delivery Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-26 10:29:03 -07:00
Dave Richer	23483144e1	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2341 ) feature/IO-3182-Phone-Number-Consent - Up Deps	2025-05-26 17:09:48 +00:00
Dave Richer	67d5dcb062	feature/IO-3182-Phone-Number-Consent - Up Deps	2025-05-26 13:09:07 -04:00
Allan Carr	901a49e571	Merged in feature/IO-3246-Remote-Assist (pull request #2337 ) IO-3246 Remote Assist Approved-by: Dave Richer	2025-05-24 17:29:38 +00:00
Dave Richer	49ae107fde	release/2025-06-02 - add phone	2025-05-24 13:23:38 -04:00
Dave Richer	0135281bcd	release/2025-06-02 - test push	2025-05-24 13:15:53 -04:00
Allan Carr	99cf95daf0	IO-3246 Remote Assist Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-23 16:45:24 -07:00
Allan Carr	8c1758ae49	Merged in feature/IO-3075-Crisp-Basic-Info (pull request #2335 ) IO-3075 Crisp Basic Info Approved-by: Dave Richer	2025-05-23 18:03:15 +00:00
Allan Carr	2d764921ff	IO-3075 Crisp Basic Info Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-23 10:43:15 -07:00
Dave Richer	4859239f55	Merged in feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug (pull request #2332 ) feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug - Fix bug	2025-05-23 15:01:44 +00:00
Dave Richer	5c64d7185e	feature/IO-3242-Visual-Production-Board-Vertical-Drag-Bug - Fix bug	2025-05-23 11:00:21 -04:00
Patrick Fic	152479bc08	Merged in feature/IO-3239-integration-logging (pull request #2331 ) Feature/IO-3239 integration logging	2025-05-22 18:56:05 +00:00
Patrick Fic	2c508cf1a1	IO-3239 QBO Logging and integration log schema changes.	2025-05-22 11:54:17 -07:00
Patrick Fic	16a91c772a	Merged in release/2025-06-02 (pull request #2330 ) Release/2025 06 02	2025-05-22 16:46:27 +00:00
Dave Richer	5c47088b11	release/2025-06-02 - Lint Updates	2025-05-22 11:37:47 -04:00
Allan Carr	8e5dc4fa71	Merged in feature/IO-3243-Job-Costing-TOW (pull request #2327 ) IO-3243 Job Costing TOW Approved-by: Dave Richer	2025-05-22 15:13:34 +00:00
Allan Carr	39c3729f6d	Merged in feature/IO-3230-Customer-List-Excel (pull request #2326 ) IO-3230 Customer List Excel Approved-by: Dave Richer	2025-05-22 15:13:03 +00:00
Allan Carr	e3d854e02b	IO-3243 Job Costing TOW Signed-off-by: Allan Carr <allan@imexsystems.ca>	2025-05-21 17:53:33 -07:00
Allan Carr	618acf2acf	IO-3230 Customer List Excel Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-21 16:28:09 -07:00
Dave Richer	2cf2b70293	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2325 ) Feature/IO-3182 Phone Number Consent	2025-05-21 19:17:52 +00:00
Dave Richer	0541afceb8	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 15:17:11 -04:00
Dave Richer	28ed3f9936	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2324 ) DO NOT MERGE JUST USING TO UNDO	2025-05-21 19:03:58 +00:00
Dave Richer	6afa50332b	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 15:03:02 -04:00
Dave Richer	8c8c68867d	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 14:39:17 -04:00
Dave Richer	8ee52598e8	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-21 14:32:35 -04:00
Allan Carr	c822028174	Merged in feature/IO-3235-FeatureAccess-VisualBoard-Color (pull request #2322 ) IO-3235 FeatureAccess on VisualBoard for SmartSchedule Option of Color Cards Approved-by: Dave Richer	2025-05-21 18:06:04 +00:00
Allan Carr	36b82c6195	Merged in feature/IO-3236-HasFeatureAccess-Date (pull request #2323 ) IO-3236 HasFeatureAccess Date Approved-by: Dave Richer	2025-05-21 18:05:23 +00:00
Allan Carr	079dffce4d	IO-3236 HasFeatureAccess Date Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-20 17:16:27 -07:00
Allan Carr	831802f5af	IO-3235 FeatureAccess on VisualBoard for SmartSchedule Option of Color Cards Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-20 15:25:29 -07:00
Dave Richer	7bd5190bf2	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 18:19:39 -04:00
Dave Richer	83860152a9	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 16:04:36 -04:00
Dave Richer	1e10493615	Merged in feature/IO-3182-Phone-Number-Consent (pull request #2321 ) Feature/IO-3182 Phone Number Consent	2025-05-20 17:45:24 +00:00
Dave Richer	9d81c68a4d	feature/IO-3182-Phone-Number-Consent - Checkpoint	2025-05-20 13:14:05 -04:00
Dave Richer	985d066978	feature/IO-3182-Phone-Number-Consent - Finish Database changes	2025-05-20 12:49:32 -04:00
Dave Richer	6ad9e27d1d	feature/IO-3182-Phone-Number-Consent - Merge master / bump deps	2025-05-20 12:38:31 -04:00
Dave Richer	19ebdda5b3	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3182-Phone-Number-Consent	2025-05-20 12:30:15 -04:00
Allan Carr	4602dd1183	Merged in master-AIO (pull request #2320 ) IO-3217 OTSL Labor Type	2025-05-19 21:03:00 +00:00
Allan Carr	6005eaee6a	Merged in feature/IO-3217-OTSL-Labor-Type (pull request #2319 ) IO-3217 OTSL Labor Type	2025-05-19 21:02:01 +00:00
Patrick Fic	6d59e3994f	Merged in feature/IO-3105-qbo-version-update (pull request #2318 ) feature/IO-3105-qbo-version-update Approved-by: Patrick Fic	2025-05-19 19:30:34 +00:00
Patrick Fic	f770b2f1b1	IO-3105 Add QBO Minor Version.	2025-05-19 12:28:50 -07:00
Patrick Fic	b014744940	IO-3239 Add integration log statements on QBO.	2025-05-19 11:10:02 -07:00
Dave Richer	714c90c25e	Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3182-Phone-Number-Consent	2025-05-15 18:55:23 -04:00
Dave Richer	9a3a971da6	Clear Stage	2025-05-15 18:55:20 -04:00
Dave Richer	96cba0aaab	Clear Stage	2025-05-15 18:54:55 -04:00
Patrick Fic	c069600cfd	Merged in hotfix/2025-05-15 (pull request #2317 ) Hotfix/2025 05 15 IO-3217 IO-3066 IO-3210 IO-2328	2025-05-15 22:47:26 +00:00
Patrick Fic	186cbf2c97	Merge branch 'feature/IO-3066-ems-upload' into hotfix/2025-05-15	2025-05-15 15:47:04 -07:00
Patrick Fic	392988ae11	Io-3066 resolve typo.	2025-05-15 15:46:45 -07:00
Allan Carr	2e33b79eb9	Merged in feature/IO-3210-Podium-Datapump (pull request #2315 ) IO-3210 Podium Datapump Approved-by: Patrick Fic	2025-05-15 22:39:39 +00:00
Allan Carr	d4f718c44c	Merged in feature/IO-3210-Podium-Datapump (pull request #2314 ) IO-3210 Podium Datapump Approved-by: Patrick Fic	2025-05-15 22:39:28 +00:00
Patrick Fic	fa99ef7b37	Merge branch 'feature/IO-3066-ems-upload' into hotfix/2025-05-15	2025-05-15 15:36:44 -07:00
Patrick Fic	c4aff1b516	Merge branch 'feature/IO-2328-intellipay-querystring-package' into hotfix/2025-05-15	2025-05-15 15:36:31 -07:00
Patrick Fic	61276bb2d1	IO-2328 change querystring versions.	2025-05-15 15:35:56 -07:00
Allan Carr	8b89e2eb9d	IO-3210 Podium Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-15 15:27:59 -07:00
Patrick Fic	9ab41308e7	IO-3066 add EMS upload functionality.	2025-05-15 12:53:41 -07:00
Allan Carr	f76052ec9b	Merge branch 'master-AIO' into feature/IO-3210-Podium-Datapump Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-05-15 12:41:09 -07:00
Patrick Fic	b8841e3ded	Merged in release/2025-05-09 (pull request #2312 ) IO-3190 Add nulll coalesce and check for non-intake events. Approved-by: Patrick Fic	2025-05-15 00:57:44 +00:00
Patrick Fic	a49b3f6496	IO-3190 Add nulll coalesce and check for non-intake events.	2025-05-14 17:56:15 -07:00
Dave Richer	3e17ec3cf8	Merged in release/2025-05-09 (pull request #2310 ) [DO NOT MERGE ] Release/2025-05-09 into master-AIO	2025-05-14 20:10:07 +00:00
Dave Richer	76c0c7c41e	release/2025-05-09 - Bump Deps	2025-05-13 10:43:15 -04:00
Dave Richer	025b986f60	Merged in feature/IO-3228-Notifications-1.6-and-Deprecations (pull request #2308 ) feature/IO-3228-Notifications-1.6-and-Deprecations	2025-05-09 14:39:59 +00:00
Dave Richer	6e6addd62f	feature/IO-3228-Notifications-1.6-and-Deprecations - See Ticket for full details (Notifications restrictions, AntD deprecations)	2025-05-09 10:38:19 -04:00
Dave Richer	266c3acf34	Merged in feature/IO-3214-Job-Status-Card-Extension (pull request #2306 ) feature/IO-3214-Job-Status-Card-Extension - PR Notes/Package Updates	2025-05-08 15:27:53 +00:00
Dave Richer	ca18291425	Merged in feature/IO-3214-Job-Status-Card-Extension (pull request #2304 ) feature/IO-3214-Job-Status-Card-Extension - Complete	2025-05-06 21:10:52 +00:00
Dave Richer	a9814c1eb1	Merged in release/2025-04-25 (pull request #2287 ) Release/2025-04-25 into Master-AIO - IO-2282, IO-3066, IO-3164, IO-3187, IO-3190, IO-3200, IO-3210, IO-3212, IO-3213, IO-3215, IO-3220, IO-3223	2025-04-26 00:43:22 +00:00
Allan Carr	12c87ed689	IO-3217 OTSL Labor Type Signed-off-by: Allan Carr <allan.carr@thinkimex.com>	2025-04-23 18:48:35 -07:00
				`@@ -0,0 +1 @@`
				`DROP TABLE "public"."phone_number_consent";`
				`@@ -0,0 +1 @@`
				`alter table "public"."phone_number_consent_history" alter column "old_value" set not null;`
				`@@ -0,0 +1 @@`
				`alter table "public"."phone_number_opt_out" rename to "phone_number_consent";`
				`@@ -0,0 +1 @@`
				`alter table "public"."bodyshops" drop column "enforce_sms_consent" cascade;`