IO-3279 Set usage report to 1 year.

Release/2025 06 13 into master-AIO - IO-3222 IO-3256 IO-3254

bodyshop_translations.babel

@@ -12791,27 +12791,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>allow_text_message</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>checklist</name>
                                         <definition_loaded>false</definition_loaded>
@@ -42614,27 +42593,6 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
-                                    <concept_node>
-                                        <name>allow_text_message</name>
-                                        <definition_loaded>false</definition_loaded>
-                                        <description></description>
-                                        <comment></comment>
-                                        <default_text></default_text>
-                                        <translations>
-                                            <translation>
-                                                <language>en-US</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>es-MX</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                            <translation>
-                                                <language>fr-CA</language>
-                                                <approved>false</approved>
-                                            </translation>
-                                        </translations>
-                                    </concept_node>
                                     <concept_node>
                                         <name>name</name>
                                         <definition_loaded>false</definition_loaded>

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.12",
+    "@firebase/analytics": "^0.10.16",
-    "@firebase/app": "^0.11.4",
+    "@firebase/app": "^0.13.1",
-    "@firebase/auth": "^1.10.0",
+    "@firebase/auth": "^1.10.6",
-    "@firebase/firestore": "^4.7.10",
+    "@firebase/firestore": "^4.7.17",
-    "@firebase/messaging": "^0.12.17",
+    "@firebase/messaging": "^0.12.21",
     "@jsreport/browser-client": "^3.1.0",
-    "@reduxjs/toolkit": "^2.6.1",
+    "@reduxjs/toolkit": "^2.8.2",
-    "@sentry/cli": "^2.44.0",
+    "@sentry/cli": "^2.46.0",
-    "@sentry/react": "^9.15.0",
+    "@sentry/react": "^9.27.0",
-    "@sentry/vite-plugin": "^3.4.0",
+    "@sentry/vite-plugin": "^3.5.0",
-    "@splitsoftware/splitio-react": "^2.1.1",
+    "@splitsoftware/splitio-react": "^2.3.1",
     "@tanem/react-nprogress": "^5.0.53",
-    "antd": "^5.24.9",
+    "antd": "^5.25.4",
     "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",
@@ -41,24 +41,25 @@
     "i18next": "^24.2.3",
     "i18next-browser-languagedetector": "^8.1.0",
     "immutability-helper": "^3.1.1",
-    "libphonenumber-js": "^1.12.6",
+    "libphonenumber-js": "^1.12.9",
     "logrocket": "^9.0.2",
     "markerjs2": "^2.32.4",
     "memoize-one": "^6.0.0",
-    "normalize-url": "^8.0.1",
+    "normalize-url": "^8.0.2",
     "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",
+    "react-big-calendar": "^1.19.2",
     "react-color": "^2.19.3",
     "react-cookie": "^8.0.1",
     "react-dom": "^18.3.1",
     "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",
@@ -69,7 +70,7 @@
     "react-resizable": "^3.0.5",
     "react-router-dom": "^6.30.0",
     "react-sticky": "^6.0.3",
-    "react-virtuoso": "^4.12.7",
+    "react-virtuoso": "^4.12.8",
     "recharts": "^2.15.2",
     "redux": "^5.0.1",
     "redux-actions": "^3.0.3",
@@ -77,9 +78,9 @@
     "redux-saga": "^1.3.0",
     "redux-state-sync": "^3.1.4",
     "reselect": "^5.1.1",
-    "sass": "^1.86.3",
+    "sass": "^1.89.1",
     "socket.io-client": "^4.8.1",
-    "styled-components": "^6.1.17",
+    "styled-components": "^6.1.18",
     "subscriptions-transport-ws": "^0.11.0",
     "use-memo-one": "^1.1.3",
     "vite-plugin-ejs": "^1.7.0",
@@ -130,17 +131,17 @@
     "@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.28.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.1",
-    "browserslist": "^4.24.5",
+    "browserslist": "^4.25.0",
     "browserslist-to-esbuild": "^2.1.1",
     "chalk": "^5.4.1",
     "eslint": "^8.57.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.2.3",
     "workbox-window": "^7.3.0"
   }
 }

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" })),
+  setPartsOrderContext: (context) =>
-  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
+    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()}
       >

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 />

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

@@ -2,10 +2,11 @@ import { useApolloClient, useMutation } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Checkbox, Form, Modal, Space } from "antd";
 import _ from "lodash";
-import React, { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, 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 { INSERT_NEW_BILL } from "../../graphql/bills.queries";
 import { UPDATE_INVENTORY_LINES } from "../../graphql/inventory.queries";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
@@ -24,7 +25,6 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -196,7 +196,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           job: { lbr_adjustments: newAdjustments }
         }
       });
-      if (!!jobUpdate.errors) {
+      if (jobUpdate.errors) {
         notification["error"]({
           message: t("jobs.errors.saving", {
             message: JSON.stringify(jobUpdate.errors)
@@ -213,7 +213,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
         variables: { partsLineIds: markPolReceived.map((p) => p.id) },
         refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID"]
       });
-      if (!!r2.errors) {
+      if (r2.errors) {
         setLoading(false);
         setEnterAgain(false);
         notification["error"]({
@@ -224,7 +224,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
       }
     }
 
-    if (!!r1.errors) {
+    if (r1.errors) {
       setLoading(false);
       setEnterAgain(false);
       notification["error"]({
@@ -244,7 +244,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           consumedbybillid: billId
         }
       });
-      if (!!r2.errors) {
+      if (r2.errors) {
         setLoading(false);
         setEnterAgain(false);
         notification["error"]({
@@ -396,7 +396,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
             {t("bills.labels.generatepartslabel")}
           </Checkbox>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
-          <Button loading={loading} onClick={() => form.submit()}>
+          <Button loading={loading} onClick={() => form.submit()} id="save-bill-enter-modal">
             {t("general.actions.save")}
           </Button>
           {billEnterModal.context && billEnterModal.context.id ? null : (
@@ -406,13 +406,14 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
               onClick={() => {
                 setEnterAgain(true);
               }}
+              id="save-and-new-bill-enter-modal"
             >
               {t("general.actions.saveandnew")}
             </Button>
           )}
         </Space>
       }
-      destroyOnClose
+      destroyOnHidden
     >
       <Form
         onFinish={handleFinish}

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

@@ -1,6 +1,6 @@
 import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Checkbox, Input, Space, Table } from "antd";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -209,6 +209,7 @@ export function BillsListTableComponent({
                     }
                   });
                 }}
+                id="reconcile-bills-button"
               >
                 <LockerWrapperComponent featureName="bills"> {t("jobs.actions.reconcile")}</LockerWrapperComponent>
               </Button>

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}>

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>

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>

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 () => {
+      return () => {
-      if (socket && socket.connected) {
         unregisterMessagingHandlers({ socket });
-      }
+      };
-    };
+    }
   }, [bodyshop, socket, t, client]);
 
   if (!bodyshop || !bodyshop.messagingservicesid) return <></>;

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)]
-              newConversation,
+          : [newConversation]; // Prevent duplicates
-              ...existingList.conversations.filter((conv) => conv.id !== newConversation.id) // Prevent duplicates
-            ]
-          : [newConversation];
 
         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");
 };

client/src/components/chat-conversation-list/chat-conversation-list.component.jsx

@@ -1,5 +1,5 @@
-import { Badge, Card, List, Space, Tag } from "antd";
+import { Badge, Card, List, Space, Tag, Tooltip } 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";
@@ -9,36 +9,62 @@ import { TimeAgoFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import _ from "lodash";
+import { ExclamationCircleOutlined } from "@ant-design/icons";
 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 }) {
+function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
-  // That comma is there for a reason, do not remove it
+  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
+      forceUpdate((prev) => !prev);
-    }, 60000); // 1 minute in milliseconds
+    }, 60000);
-
+    return () => clearInterval(interval);
-    return () => clearInterval(interval); // Cleanup on unmount
   }, []);
 
-  // Memoize the sorted conversation list
+  const sortedConversationList = useMemo(() => {
-  const sortedConversationList = React.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 +86,18 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
       </>
     );
 
-    const cardExtra = <Badge count={item.messages_aggregate.aggregate.count} />;
+    const cardExtra = (
+      <>
+        <Badge count={item.messages_aggregate.aggregate.count} />
+        {hasOptOutEntry && (
+          <Tooltip title={t("consent.text_body")}>
+            <Tag color="red" icon={<ExclamationCircleOutlined />}>
+              {t("messaging.labels.no_consent")}
+            </Tag>
+          </Tooltip>
+        )}
+      </>
+    );
 
     const getCardStyle = () =>
       item.id === selectedConversation
@@ -73,9 +110,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}>
+        <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
-          <div style={{ display: "inline-block", width: "70%", textAlign: "left" }}>{cardContentLeft}</div>
+          <div
-          <div style={{ display: "inline-block", width: "30%", textAlign: "right" }}>{cardContentRight}</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 +138,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>

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 */

client/src/components/chat-conversation/chat-conversation.container.jsx

@@ -58,6 +58,7 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
               userid
               created_at
               read
+              is_system
             }
           `,
           data: message

client/src/components/chat-media-selector/chat-media-selector.component.jsx

@@ -13,13 +13,14 @@ import JobDocumentsGalleryExternal from "../jobs-documents-gallery/jobs-document
 import JobsDocumentImgproxyGalleryExternal from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component";
 import JobDocumentsLocalGalleryExternal from "../jobs-documents-local-gallery/jobs-documents-local-gallery.external.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import "./chat-media-selector.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+const mapDispatchToProps = (dispatch) => ({});
-});
+
 export default connect(mapStateToProps, mapDispatchToProps)(ChatMediaSelector);
 
 export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, conversation }) {
@@ -37,9 +38,8 @@ 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]?.jobid
     },
-
     skip: !open || !conversation.job_conversations || conversation.job_conversations.length === 0
   });
 
@@ -56,25 +56,25 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
   //If Imageproxy is on, rely only on the LMS selector
   //If not on, use the old methods.
   const content = (
-    <div>
+    <div className="media-selector-content">
       {loading && <LoadingSpinner />}
       {error && <AlertComponent message={error.message} type="error" />}
       {selectedMedia.filter((s) => s.isSelected).length >= 10 ? (
-        <div style={{ color: "red" }}>{t("messaging.labels.maxtenimages")}</div>
+        <div className="error-message">{t("messaging.labels.maxtenimages")}</div>
       ) : null}
 
       {Imgproxy.treatment === "on" ? (
         <>
           {!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]?.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]?.jobid}
             />
           )}
         </>
@@ -100,12 +100,17 @@ export function ChatMediaSelector({ bodyshop, selectedMedia, setSelectedMedia, c
   return (
     <Popover
       content={
-        conversation.job_conversations.length === 0 ? <div>{t("messaging.errors.noattachedjobs")}</div> : content
+        conversation.job_conversations.length === 0 ? (
+          <div className="no-jobs-message">{t("messaging.errors.noattachedjobs")}</div>
+        ) : (
+          content
+        )
       }
       title={t("messaging.labels.selectmedia")}
       trigger="click"
       open={open}
       onOpenChange={handleVisibleChange}
+      overlayClassName="media-selector-popover"
     >
       <Badge count={selectedMedia.filter((s) => s.isSelected).length}>
         <PictureFilled style={{ margin: "0 .5rem" }} />

client/src/components/chat-media-selector/chat-media-selector.styles.scss

@@ -0,0 +1,52 @@
+.media-selector-popover {
+  .ant-popover-inner-content {
+    max-width: 640px;
+    max-height: 480px;
+    overflow-y: auto;
+    padding: 8px;
+    background-color: #fff;
+    border-radius: 8px;
+  }
+}
+
+.media-selector-content {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.error-message {
+  color: red;
+  font-size: 12px;
+  text-align: center;
+  margin-bottom: 8px;
+}
+
+.no-jobs-message {
+  font-size: 14px;
+  color: #888;
+  text-align: center;
+  padding: 8px;
+}
+
+/* Style images within gallery components */
+.media-selector-content img {
+
+  object-fit: cover;
+  border-radius: 4px;
+  margin: 4px;
+  cursor: pointer;
+  transition: transform 0.2s;
+
+  &:hover {
+    transform: scale(1.05);
+  }
+}
+
+/* Grid layout for gallery components */
+.media-selector-content .ant-image, /* Assuming gallery components use Ant Design's Image */
+.media-selector-content .gallery-container { /* Fallback for custom gallery classes */
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(100px, 1fr));
+  gap: 4px;
+}

client/src/components/chat-messages-list/chat-message-list.styles.scss

@@ -4,13 +4,16 @@
   height: 100%;
   width: 100%;
 }
+
 .archive-button {
   height: 20px;
   border-radius: 4px;
 }
+
 .chat-title {
   margin-bottom: 5px;
 }
+
 .messages {
   display: flex;
   flex-direction: column;
@@ -37,11 +40,13 @@
     gap: 8px;
   }
 }
-.chat-send-message-button{
+
+.chat-send-message-button {
   margin: 0.3rem;
   padding-left: 0.5rem;
-  
+
 }
+
 .message-icon {
   position: absolute;
   bottom: 0.1rem;
@@ -125,6 +130,37 @@
   }
 }
 
+.system {
+  align-items: center;
+  margin: 0.5rem 10%;
+
+  .message {
+    background-color: #f5f5f5;
+    border-radius: 10px;
+    padding: 0.5rem 1rem;
+    text-align: center;
+    font-style: italic;
+    color: #555;
+    width: fit-content;
+    max-width: 80%;
+  }
+
+  .system-label {
+    font-size: 0.75rem;
+    color: #888;
+    margin-bottom: 0.2rem;
+    display: block;
+  }
+
+  .system-date {
+    font-size: 0.75rem;
+    color: #888;
+    margin-top: 0.2rem;
+    text-align: center;
+  }
+}
+
+
 .virtuoso-container {
   flex: 1;
   overflow: auto;

client/src/components/chat-messages-list/renderMessage.jsx

@@ -2,17 +2,29 @@ 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) => {
   const message = messages[index];
+  const isSystem = message.is_system;
+
+  // Determine message class
+  const messageClass = isSystem ? "system messages" : message.isoutbound ? "mine messages" : "yours messages";
+
+  // Tooltip content based on message type
+  const tooltipTitle = isSystem ? (
+    i18n.t("consent.text_body")
+  ) : (
+    <DateTimeFormatter>{message.created_at}</DateTimeFormatter>
+  );
 
   return (
-    <div key={index} className={`${message.isoutbound ? "mine messages" : "yours messages"}`}>
+    <div key={index} className={messageClass}>
       <div className="message msgmargin">
-        <Tooltip title={DateTimeFormatter({ children: message.created_at })}>
+        <Tooltip title={tooltipTitle}>
           <div>
+            {isSystem && <span className="system-label">System</span>}
             {/* Render images if available */}
             {message.image && message.image_path?.length > 0 && (
               <div className="message-images">
@@ -26,20 +38,31 @@ export const renderMessage = (messages, index) => {
               </div>
             )}
             {/* Render text if available */}
-            {message.text && <div>{message.text}</div>}
+            {message.text && <div className="message-text">{message.text}</div>}
+            {/* Render date for system messages */}
+            {isSystem && (
+              <div className="system-date">
+                <DateTimeFormatter>{message.created_at}</DateTimeFormatter>
+              </div>
+            )}
           </div>
         </Tooltip>
 
-        {/* Message status icons */}
+        {/* Message status icons for non-system messages */}
-        {message.status && (message.status === "sent" || message.status === "delivered") && (
+        {!isSystem &&
-          <div className="message-status">
+          message.status &&
-            <Icon component={message.status === "sent" ? MdDone : MdDoneAll} className="message-icon" />
+          (message.status === "sent" || message.status === "delivered" || message.status === "failed") && (
-          </div>
+            <div className="message-status">
-        )}
+              <Icon
+                component={message.status === "sent" ? MdDone : message.status === "delivered" ? MdDoneAll : MdClose}
+                className="message-icon"
+                style={message.status === "failed" ? { color: "#ff0000" } : undefined}
+              />
+            </div>
+          )}
       </div>
-
+      {/* Outbound message metadata for non-system messages */}
-      {/* Outbound message metadata */}
+      {!isSystem && message.isoutbound && (
-      {message.isoutbound && (
         <div style={{ fontSize: 10 }}>
           {i18n.t("messaging.labels.sentby", {
             by: message.userid,

client/src/components/chat-send-message/chat-send-message.component.jsx

@@ -1,6 +1,6 @@
-import { LoadingOutlined, SendOutlined } from "@ant-design/icons";
+import { ExclamationCircleOutlined, LoadingOutlined, SendOutlined } from "@ant-design/icons";
-import { Input, Spin } from "antd";
+import { Alert, Input, Space, Spin, Tooltip } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+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,67 @@ function ChatSendMessageComponent({ conversation, bodyshop, sendMessage, isSendi
   };
 
   return (
-    <div className="imex-flex-row" style={{ width: "100%" }}>
+    <Space direction="vertical" style={{ width: "100%" }} size="middle">
-      <ChatPresetsComponent className="imex-flex-row__margin" />
+      {isOptedOut && (
-      <ChatMediaSelector
+        <Tooltip title={t("consent.text_body")}>
-        conversation={conversation}
+          <Alert
-        selectedMedia={selectedMedia}
+            showIcon={true}
-        setSelectedMedia={setSelectedMedia}
+            icon={<ExclamationCircleOutlined />}
-      />
+            message={t("messaging.errors.no_consent")}
-      <span style={{ flex: 1 }}>
+            type="error"
-        <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
-            }}
-            spin
           />
-        }
+        </Tooltip>
-      />
+      )}
-    </div>
+      <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();
+            }}
+          />
+        </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>
   );
 }
 

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}>

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%"}

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] ||
+    (typeof bodyshop?.features?.[featureName] === "boolean"
-    dayjs(bodyshop?.features[featureName]).isAfter(dayjs())
+      ? bodyshop?.features?.[featureName]
+      : dayjs(bodyshop?.features?.[featureName]).isAfter(dayjs()))
   );
 }
 

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: "remoteassist",
-              {
+          id: "header-remote-assist",
-                key: "rescue",
+          icon: <OneToOneOutlined />,
-                id: "header-rescue",
+          label: t("menus.header.remoteassist"),
-                icon: <CarFilled />,
+          children: [
-                label: t("menus.header.rescueme"),
+            ...(InstanceRenderManager({ imex: true, rome: false })
-                onClick: () => window.open("https://imexrescue.com/", "_blank")
+              ? [
-              }
+                  {
-            ]
+                    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>
           ),

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} />

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"
   });
 
@@ -394,30 +395,33 @@ export function ScheduleEventComponent({
         ) : (
           <ScheduleManualEvent event={event} />
         )}
-        {event.isintake && HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
+        {event.job &&
-          <Link
+          (HasFeatureAccess({ featureName: "checklist", bodyshop }) ? (
-            to={{
+            <Link
-              pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
+              to={{
-              search: `?appointmentId=${event.id}`
+                pathname: `/manage/jobs/${event.job && event.job.id}/intake`,
-            }}
+                search: `?appointmentId=${event.id}`
-          >
+              }}
-            <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
+            >
-          </Link>
+              <Button disabled={event.arrived}>{t("appointments.actions.intake")}</Button>
-        ) : (
+            </Link>
-          <Popover //open={open}
+          ) : (
-            content={popMenu}
+            <Popover //open={open}
-            open={popOverVisible}
+              content={popMenu}
-            onOpenChange={setPopOverVisible}
+              open={popOverVisible}
-            onClick={(e) => {
+              onOpenChange={setPopOverVisible}
-              getJobDetails();
+              onClick={(e) => {
-              e.stopPropagation();
+                if (event.job?.id) {
-            }}
+                  e.stopPropagation();
-            getPopupContainer={(trigger) => trigger.parentNode}
+                  getJobDetails();
-            trigger="click"
+                }
-          >
+              }}
-            <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
+              getPopupContainer={(trigger) => trigger.parentNode}
-          </Popover>
+              trigger="click"
-        )}
+            >
+              <Button disabled={event.arrived}>{t("jobs.actions.intake_quick")}</Button>
+            </Popover>
+          ))}
       </Space>
     </div>
   );

client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx

@@ -1,7 +1,7 @@
 import { useMutation } from "@apollo/client";
 import { Button, Card, Form, Input, Switch } from "antd";
 import queryString from "query-string";
-import React, { useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate, useParams } from "react-router-dom";
@@ -9,7 +9,6 @@ import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../../../firebase/firebase.utils";
 import { MARK_APPOINTMENT_ARRIVED, MARK_LATEST_APPOINTMENT_ARRIVED } from "../../../../graphql/appointments.queries";
 import { UPDATE_JOB } from "../../../../graphql/jobs.queries";
-import { UPDATE_OWNER } from "../../../../graphql/owners.queries";
 import { insertAuditTrail } from "../../../../redux/application/application.actions";
 import { selectBodyshop, selectCurrentUser } from "../../../../redux/user/user.selectors";
 import AuditTrailMapping from "../../../../utils/AuditTrailMappings";
@@ -32,7 +31,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
   const [loading, setLoading] = useState(false);
   const [markAptArrived] = useMutation(MARK_APPOINTMENT_ARRIVED);
   const [markLatestAptArrived] = useMutation(MARK_LATEST_APPOINTMENT_ARRIVED);
-  const [updateOwner] = useMutation(UPDATE_OWNER);
   const notification = useNotification();
 
   const { jobId } = useParams();
@@ -129,24 +127,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
       }
     }
 
-    if (type === "intake" && job.owner && job.owner.id) {
-      //Updae Owner Allow to Text
-      const updateOwnerResult = await updateOwner({
-        variables: {
-          ownerId: job.owner.id,
-          owner: { allow_text_message: values.allow_text_message }
-        }
-      });
-
-      if (!!updateOwnerResult.errors) {
-        notification["error"]({
-          message: t("checklist.errors.complete", {
-            error: JSON.stringify(result.errors)
-          })
-        });
-      }
-    }
-
     setLoading(false);
 
     if (!!!result.errors) {
@@ -189,7 +169,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
         initialValues={{
           ...(type === "intake" && {
             addToProduction: true,
-            allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
               (job && job.scheduled_completion && dayjs(job.scheduled_completion)) ||
               (job &&
@@ -228,14 +207,6 @@ export function JobChecklistForm({ insertAuditTrail, formItems, bodyshop, curren
             >
               <Switch disabled={readOnly} />
             </Form.Item>
-            <Form.Item
-              name="allow_text_message"
-              valuePropName="checked"
-              label={t("checklist.labels.allow_text_message")}
-              disabled={readOnly}
-            >
-              <Switch disabled={readOnly} />
-            </Form.Item>
             <Form.Item
               name="scheduled_completion"
               label={t("jobs.fields.scheduled_completion")}

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} />

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 ? (

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 ? (

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} />}

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
+            <Tooltip title={!isEmployee ? t("notifications.tooltips.not-employee") : ""} placement="top">
-              type={isWatching ? "primary" : "default"}
+              <span>
-              danger={!isWatching}
+                <Button
-              icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
+                  type={isWatching ? "primary" : "default"}
-              size="medium"
+                  danger={!isWatching}
-              onClick={handleToggleSelf}
+                  icon={isWatching ? <EyeOutlined /> : <EyeFilled />}
-              loading={adding || removing}
+                  size="medium"
-            >
+                  onClick={handleToggleSelf}
-              {isWatching ? t("notifications.labels.unwatch") : t("notifications.labels.watch")}
+                  loading={adding || removing}
-            </Button>
+                  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) =>
+          bodyshop?.employees?.filter(
-            jobWatchers.every((w) => w.user_email !== e.user_email && e.active && e.user_email)
+            (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")}

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 isEmployee = useIsEmployee(bodyshop, currentUser);
-  const jobid = job.id;
-
   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
     />
   );
 }

client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx

@@ -106,7 +106,12 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
           <Form.Item label={t("jobs.fields.date_open")} name="date_open">
             <DateTimePicker />
           </Form.Item>
-
+          <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
+            <DateTimePicker />
+          </Form.Item>
+          <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
+            <DateTimePicker />
+          </Form.Item>
           <Form.Item label={t("jobs.fields.date_scheduled")} name="date_scheduled">
             <DateTimePicker />
           </Form.Item>

client/src/components/jobs-available-scan/jobs-available-scan.component.jsx

@@ -1,19 +1,19 @@
 import { DownloadOutlined, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Input, Space, Table } from "antd";
 import axios from "axios";
-import React, { useState } from "react";
+import { 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 { selectPartnerVersion } from "../../redux/application/application.selectors";
 import { alphaSort } from "../../utils/sorters";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
   partnerVersion: selectPartnerVersion
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobsAvailableScan);
@@ -126,6 +126,7 @@ export function JobsAvailableScan({ partnerVersion, refetch }) {
             onClick={() => {
               scanEstimates();
             }}
+            id="scan-estimates-button"
           >
             <SyncOutlined />
           </Button>

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";
+        }
       }
     });
   });

client/src/components/jobs-create-owner-info/jobs-create-owner-info.new.component.jsx

@@ -1,4 +1,4 @@
-import { Form, Input, Switch } from "antd";
+import { Form, Input } from "antd";
 import React, { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
@@ -129,13 +129,6 @@ export default function JobsCreateOwnerInfoNewComponent() {
         <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
           <Input disabled={!state.owner.new} />
         </Form.Item>
-        <Form.Item
-          label={t("owners.fields.allow_text_message")}
-          valuePropName="checked"
-          name={["owner", "data", "allow_text_message"]}
-        >
-          <Switch disabled={!state.owner.new} />
-        </Form.Item>
       </LayoutFormRow>
     </div>
   );

client/src/components/jobs-create-owner-info/jobs-create-owner-info.search.component.jsx

@@ -1,5 +1,5 @@
 import { Card, Input, Table } from "antd";
-import React, { useContext, useState } from "react";
+import { useContext, useState } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 import PhoneFormatter from "../../utils/PhoneFormatter";
@@ -91,6 +91,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
             });
           }}
           enterButton
+          id="search-owner"
         />
       }
     >
@@ -112,9 +113,9 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
           type: "radio",
           selectedRowKeys: [state.owner.selectedid]
         }}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               if (record) {
                 if (record.id) {
                   setState({

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>

client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.search.component.jsx

@@ -1,9 +1,9 @@
-import React, { useContext, useState } from "react";
-import { useTranslation } from "react-i18next";
 import { Card, Input, Space, Table } from "antd";
+import { useContext, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
-import { alphaSort } from "../../utils/sorters";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
+import { alphaSort } from "../../utils/sorters";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 
 export default function JobsCreateVehicleInfoSearchComponent({ loading, vehicles }) {
@@ -63,6 +63,7 @@ export default function JobsCreateVehicleInfoSearchComponent({ loading, vehicles
               });
             }}
             enterButton
+            id="search-vehicle"
           />
         </Space>
       }
@@ -91,9 +92,9 @@ export default function JobsCreateVehicleInfoSearchComponent({ loading, vehicles
           type: "radio",
           selectedRowKeys: [state.vehicle.selectedid]
         }}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               if (record) {
                 if (record.id) {
                   setState({

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

@@ -7,6 +7,7 @@ import { selectJobReadOnly } from "../../redux/application/application.selectors
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component";
 import FormRow from "../layout-form-row/layout-form-row.component";
+import dayjs from "../../utils/day";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -40,6 +41,20 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_rentalresp")} name="date_rentalresp">
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
+        <Form.Item label={t("jobs.fields.estimate_sent_approval")} name="estimate_sent_approval">
+          <DateTimePicker
+            disabled={true}
+            value={job.estimate_sent_approval ? dayjs(job.estimate_sent_approval) : null}
+            placeholder={t("general.labels.na")}
+          />
+        </Form.Item>
+        <Form.Item label={t("jobs.fields.estimate_approved")} name="estimate_approved">
+          <DateTimePicker
+            disabled={true}
+            value={job.estimate_approved ? dayjs(job.estimate_approved) : null}
+            placeholder={t("general.labels.na")}
+          />
+        </Form.Item>
       </FormRow>
 
       <FormRow header={t("jobs.forms.scheddates")}>
@@ -76,21 +91,15 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
           <DateTimePicker disabled={jobRO} />
         </Form.Item>
         <Form.Item shouldUpdate>
-          {() => {
+          {() => (
-            return (
+            <Form.Item
-              <Form.Item
+              label={t("jobs.fields.actual_completion")}
-                label={t("jobs.fields.actual_completion")}
+              name="actual_completion"
-                name="actual_completion"
+              rules={[{ required: jobInPostProduction }]}
-                rules={[
+            >
-                  {
+              <DateTimePicker disabled={jobRO} />
-                    required: jobInPostProduction
+            </Form.Item>
-                  }
+          )}
-                ]}
-              >
-                <DateTimePicker disabled={jobRO} />
-              </Form.Item>
-            );
-          }}
         </Form.Item>
         <Form.Item label={t("jobs.fields.scheduled_delivery")} name="scheduled_delivery">
           <DateTimePicker disabled={jobRO} />
@@ -103,15 +112,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) {
         <Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_void")} name="date_void">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>
-
         <Form.Item label={t("jobs.fields.date_lost_sale")} name="date_lost_sale">
           <DateTimePicker disabled={true || jobRO} />
         </Form.Item>

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: (
+      label:
-        <Popconfirm
+        job.job_watchers.length === 0 ? (
-          title={t("jobs.labels.deleteconfirm")}
+          <Popconfirm
-          okText={t("general.labels.yes")}
+            title={t("jobs.labels.deleteconfirm")}
-          cancelText={t("general.labels.no")}
+            okText={t("general.labels.yes")}
-          onClick={(e) => e.stopPropagation()}
+            cancelText={t("general.labels.no")}
-          onConfirm={handleDeleteJob}
+            onClick={(e) => e.stopPropagation()}
-        >
+            onConfirm={handleDeleteJob}
-          {t("menus.jobsactions.deletejob")}
+          >
-        </Popconfirm>
+            {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"
+            okText={t("general.labels.yes")}
-            cancelText="No"
+            cancelText={t("general.labels.no")}
             onClick={(e) => e.stopPropagation()}
             onConfirm={handleVoidJob}
           >

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>
             </>

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

@@ -1,15 +1,20 @@
 import { BranchesOutlined, ExclamationCircleFilled, PauseCircleOutlined, WarningFilled } from "@ant-design/icons";
-import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
+import { useMutation } from "@apollo/client";
-import React, { useState } from "react";
+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 { 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 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";
@@ -29,41 +34,73 @@ 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({
+        jobid,
+        operation,
+        type
+      })
+    )
 });
 
 const colSpan = {
-  xs: {
+  xs: { span: 24 },
-    span: 24
+  sm: { span: 24 },
-  },
+  md: { span: 12 },
-  sm: {
+  lg: { span: 6 },
-    span: 24
+  xl: { span: 6 }
-  },
-  md: {
-    span: 12
-  },
-  lg: {
-    span: 6
-  },
-  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);
-  const vehicleTitle = `${job.v_model_yr || ""} ${job.v_color || ""}
+  const [updateJob] = useMutation(UPDATE_JOB);
-  ${job.v_make_desc || ""} 
+  const vehicleTitle =
-  ${job.v_model_desc || ""}`.trim();
+    `${job.v_model_yr || ""} ${job.v_color || ""} ${job.v_make_desc || ""} ${job.v_model_desc || ""}`.trim();
-
   const bodyHrs = job.joblines.filter((j) => j.mod_lbr_ty !== "LAR").reduce((acc, val) => acc + val.mod_lb_hrs, 0);
   const refinishHrs = job.joblines
     .filter((line) => line.mod_lbr_ty === "LAR")
     .reduce((acc, val) => acc + val.mod_lb_hrs, 0);
-
   const ownerTitle = OwnerNameDisplayFunction(job).trim();
 
+  // Handle checkbox changes
+  const handleCheckboxChange = async (field, checked) => {
+    const value = checked ? dayjs().toISOString() : null;
+    try {
+      const ret = await updateJob({
+        variables: {
+          jobId: job.id,
+          job: { [field]: value }
+        },
+        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 })
+      });
+    }
+  };
+
   return (
     <Row gutter={[16, 16]} style={{ alignItems: "stretch" }}>
       <Col {...colSpan}>
@@ -72,11 +109,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
             <DataLabel label={t("jobs.fields.status")}>
               <Space wrap>
                 {job.status}
-                {job.inproduction && (
+                {job.inproduction && <Tag color="#f50">{t("jobs.labels.inproduction")}</Tag>}
-                  <Tag color="#f50" key="production">
-                    {t("jobs.labels.inproduction")}
-                  </Tag>
-                )}
                 {job.suspended && <PauseCircleOutlined style={{ color: "orangered" }} />}
                 {job.iouparent && (
                   <Link to={`/manage/jobs/${job.iouparent}`}>
@@ -110,7 +143,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               <span style={{ margin: "0rem .5rem" }}>/</span>
               <CurrencyFormatter>{job.owner_owing}</CurrencyFormatter>
             </DataLabel>
-
             <DataLabel label={t("jobs.fields.alt_transport")}>
               {job.alt_transport}
               <JobAltTransportChange job={job} />
@@ -127,11 +159,39 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 ))}
               </DataLabel>
             )}
-
             <DataLabel label={t("jobs.fields.production_vars.note")}>
               <ProductionListColumnProductionNote record={job} />
             </DataLabel>
-
+            <DataLabel label={t("jobs.fields.estimate_sent_approval")}>
+              <Space>
+                <Checkbox
+                  checked={!!job.estimate_sent_approval}
+                  onChange={(e) => handleCheckboxChange("estimate_sent_approval", e.target.checked)}
+                  disabled={disabled}
+                >
+                  {job.estimate_sent_approval && (
+                    <span style={{ color: "#888" }}>
+                      <DateTimeFormatter>{job.estimate_sent_approval}</DateTimeFormatter>
+                    </span>
+                  )}
+                </Checkbox>
+              </Space>
+            </DataLabel>
+            <DataLabel label={t("jobs.fields.estimate_approved")}>
+              <Space>
+                <Checkbox
+                  checked={!!job.estimate_approved}
+                  onChange={(e) => handleCheckboxChange("estimate_approved", e.target.checked)}
+                  disabled={disabled}
+                >
+                  {job.estimate_approved && (
+                    <span style={{ color: "#888" }}>
+                      <DateTimeFormatter>{job.estimate_approved}</DateTimeFormatter>
+                    </span>
+                  )}
+                </Checkbox>
+              </Space>
+            </DataLabel>
             <Space wrap>
               {job.special_coverage_policy && (
                 <Tag color="tomato">

client/src/components/jobs-documents-gallery/jobs-documents-gallery.container.jsx

@@ -42,7 +42,7 @@ export function JobsDocumentsContainer({
     variables: { jobId: jobId },
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    skip: Imgproxy.treatment === "on" || !!billId
+    skip: !!billId
   });
 
   if (loading) return <LoadingSpinner />;

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -1,9 +1,9 @@
 import { SyncOutlined } from "@ant-design/icons";
 import { Button, Checkbox, Divider, Input, Space, Table } from "antd";
-import dayjs from "../../utils/day";
+import { useState } from "react";
-import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router-dom";
+import dayjs from "../../utils/day";
 import PhoneFormatter from "../../utils/PhoneFormatter";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
@@ -223,9 +223,9 @@ export default function JobsFindModalComponent({
           type: "radio",
           selectedRowKeys: [selectedJob]
         }}
-        onRow={(record, rowIndex) => {
+        onRow={(record) => {
           return {
-            onClick: (event) => {
+            onClick: () => {
               handleOnRowClick(record);
             }
           };
@@ -241,15 +241,17 @@ export default function JobsFindModalComponent({
               overrideHeaders: e.target.checked
             })
           }
+          id="override_header"
         >
           {t("jobs.labels.override_header")}
         </Checkbox>
-        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)}>
+        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
           {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
         </Checkbox>
         <Checkbox
           checked={updateSchComp.checked}
           onChange={(e) => setSchComp({ ...updateSchComp, checked: e.target.checked })}
+          id="update_scheduled_completion"
         >
           {t("jobs.labels.update_scheduled_completion")}
         </Checkbox>
@@ -261,6 +263,7 @@ export default function JobsFindModalComponent({
                 onChange={(e) => {
                   setSchComp({ ...updateSchComp, scheduled_completion: e });
                 }}
+                id="scheduled_completion_date_time_picker"
               />
             ) : null}
             <Checkbox
@@ -273,6 +276,7 @@ export default function JobsFindModalComponent({
                   automatic: true
                 });
               }}
+              id="calculate_scheduled_completion"
             >
               {t("jobs.labels.calc_scheuled_completion")}
             </Checkbox>

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -1,6 +1,5 @@
 import { useQuery } from "@apollo/client";
 import { Modal } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -65,8 +64,8 @@ export default connect(
     <Modal
       title={t("jobs.labels.existing_jobs")}
       width={"80%"}
-      destroyOnClose
+      destroyOnHidden
-      okButtonProps={{ disabled: selectedJob ? false : true }}
+      okButtonProps={{ disabled: selectedJob ? false : true, id: "jobs-find-modal-container-ok" }}
       {...modalProps}
     >
       {loading ? <LoadingSpinner /> : null}

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} />

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
+        {!isEmployee ? (
-          ref={virtuosoRef}
+          <div style={{ padding: 10 }}>
-          style={{ height: "400px", width: "100%" }}
+            <Alert message={t("notifications.labels.employee-notification")} type="warning" />
-          data={notifications}
+          </div>
-          totalCount={notifications.length}
+        ) : (
-          endReached={loadMore}
+          <Virtuoso
-          itemContent={renderNotification}
+            ref={virtuosoRef}
-        />
+            style={{ height: "400px", width: "100%" }}
+            data={notifications}
+            totalCount={notifications.length}
+            endReached={loadMore}
+            itemContent={renderNotification}
+          />
+        )}
       </div>
     );
   }

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);

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);

client/src/components/owner-detail-form/owner-detail-form.component.jsx

@@ -1,14 +1,15 @@
-import { Form, Input, Switch } from "antd";
+import { Form, Input, Tooltip } from "antd";
-import React from "react";
+import { CloseCircleFilled } from "@ant-design/icons";
 import { useTranslation } from "react-i18next";
 import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
-import FormItemPhone, { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
 
-export default function OwnerDetailFormComponent({ form, loading }) {
+export default function OwnerDetailFormComponent({ form, loading, isPhone1OptedOut, isPhone2OptedOut }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
+
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -26,7 +27,7 @@ export default function OwnerDetailFormComponent({ form, loading }) {
           <Input />
         </Form.Item>
         <Form.Item label={t("owners.fields.accountingid")} name="accountingid">
-          <Input disabled/>
+          <Input disabled />
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("owners.forms.address")}>
@@ -50,9 +51,6 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         </Form.Item>
       </LayoutFormRow>
       <LayoutFormRow header={t("owners.forms.contact")}>
-        <Form.Item label={t("owners.fields.allow_text_message")} name="allow_text_message" valuePropName="checked">
-          <Switch />
-        </Form.Item>
         <Form.Item
           label={t("owners.fields.ownr_ea")}
           name="ownr_ea"
@@ -65,19 +63,55 @@ export default function OwnerDetailFormComponent({ form, loading }) {
         >
           <FormItemEmail email={getFieldValue("ownr_ea")} />
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
-          label={t("owners.fields.ownr_ph1")}
+          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-          name="ownr_ph1"
+            <Form.Item
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph1")]}
+              name="ownr_ph1"
-        >
+              noStyle
-          <FormItemPhone />
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph1")]}
+            >
+              <Input style={{ flex: 1, minWidth: "150px" }} />
+            </Form.Item>
+            {isPhone1OptedOut && (
+              <Tooltip title={t("consent.text_body")}>
+                <CloseCircleFilled
+                  style={{
+                    color: "#ff4d4f",
+                    fontSize: 16,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    height: "100%"
+                  }}
+                />
+              </Tooltip>
+            )}
+          </div>
         </Form.Item>
-        <Form.Item
+        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
-          label={t("owners.fields.ownr_ph2")}
+          <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
-          name="ownr_ph2"
+            <Form.Item
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph2")]}
+              name="ownr_ph2"
-        >
+              noStyle
-          <FormItemPhone />
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "ownr_ph2")]}
+            >
+              <Input style={{ flex: 1, minWidth: "150px" }} />
+            </Form.Item>
+            {isPhone2OptedOut && (
+              <Tooltip title={t("consent.text_body")}>
+                <CloseCircleFilled
+                  style={{
+                    color: "#ff4d4f",
+                    fontSize: 16,
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                    height: "100%"
+                  }}
+                />
+              </Tooltip>
+            )}
+          </div>
         </Form.Item>
         <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
           <Input />

client/src/components/owner-detail-form/owner-detail-form.container.jsx

@@ -1,69 +1,115 @@
 import { Button, Form, Popconfirm } from "antd";
 import { PageHeader } from "@ant-design/pro-layout";
-
+import { useEffect, useState } from "react";
-import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
-import { useMutation } from "@apollo/client";
+import { useApolloClient, useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
 import { DELETE_OWNER, UPDATE_OWNER } from "../../graphql/owners.queries";
+import { selectBodyshop } from "../../redux/user/user.selectors"; // Adjust path
+import { phoneNumberOptOutService } from "../../utils/phoneOptOutService.js"; // Adjust path
 import OwnerDetailFormComponent from "./owner-detail-form.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { phone } from "phone"; // Import phone utility for formatting
 
-function OwnerDetailFormContainer({ owner, refetch }) {
+// Connect to Redux to access bodyshop
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+function OwnerDetailFormContainer({ owner, refetch, bodyshop }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
-  const history = useNavigate();
+  const navigate = useNavigate();
   const [loading, setLoading] = useState(false);
+  const [optedOutPhones, setOptedOutPhones] = useState(new Set());
   const [updateOwner] = useMutation(UPDATE_OWNER);
   const [deleteOwner] = useMutation(DELETE_OWNER);
   const notification = useNotification();
+  const apolloClient = useApolloClient();
+
+  // Fetch opt-out status on mount
+  useEffect(() => {
+    const fetchOptOutStatus = async () => {
+      if (bodyshop?.id && bodyshop?.messagingservicesid && (owner?.ownr_ph1 || owner?.ownr_ph2)) {
+        const phoneNumbers = [owner.ownr_ph1, owner.ownr_ph2].filter(Boolean);
+        const optOutSet = await phoneNumberOptOutService(apolloClient, bodyshop.id, phoneNumbers);
+        setOptedOutPhones(optOutSet);
+      } else {
+        setOptedOutPhones(new Set());
+      }
+    };
+
+    fetchOptOutStatus();
+  }, [apolloClient, bodyshop?.id, bodyshop?.messagingservicesid, owner?.ownr_ph1, owner?.ownr_ph2]);
+
+  // Reset form fields when owner changes
+  useEffect(() => {
+    form.setFieldsValue({
+      ownr_ph1: owner?.ownr_ph1,
+      ownr_ph2: owner?.ownr_ph2,
+      ...owner
+    });
+  }, [owner, form]);
 
   const handleDelete = async () => {
     setLoading(true);
-    const result = await deleteOwner({
+    try {
-      variables: { id: owner.id }
+      const result = await deleteOwner({
-    });
+        variables: { id: owner.id }
-    console.log(result);
+      });
-    if (result.errors) {
+      if (result.errors) {
-      notification["error"]({
+        notification.error({
+          message: t("owners.errors.deleting", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      } else {
+        notification.success({
+          message: t("owners.successes.delete")
+        });
+        navigate(`/manage/owners`);
+      }
+    } catch (error) {
+      notification.error({
         message: t("owners.errors.deleting", {
-          error: JSON.stringify(result.errors)
+          error: error.message
         })
       });
+    } finally {
       setLoading(false);
-    } else {
-      notification["success"]({
-        message: t("owners.successes.delete")
-      });
-      setLoading(false);
-      history(`/manage/owners`);
     }
   };
 
   const handleFinish = async (values) => {
     setLoading(true);
-    const result = await updateOwner({
+    try {
-      variables: { ownerId: owner.id, owner: values }
+      const result = await updateOwner({
-    });
+        variables: { ownerId: owner.id, owner: values }
-
+      });
-    if (!!result.errors) {
+      if (result.errors) {
-      notification["error"]({
+        notification.error({
+          message: t("owners.errors.saving", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      } else {
+        notification.success({
+          message: t("owners.successes.save")
+        });
+        if (refetch) await refetch();
+        form.resetFields();
+      }
+    } catch (error) {
+      notification.error({
         message: t("owners.errors.saving", {
-          error: JSON.stringify(result.errors)
+          error: error.message
         })
       });
+    } finally {
       setLoading(false);
-      return;
     }
-
-    notification["success"]({
-      message: t("owners.successes.save")
-    });
-
-    if (refetch) await refetch();
-    form.resetFields();
-    form.resetFields();
-    setLoading(false);
   };
 
   return (
@@ -72,6 +118,7 @@ function OwnerDetailFormContainer({ owner, refetch }) {
         title={t("menus.header.owners")}
         extra={[
           <Popconfirm
+            key="delete"
             trigger="click"
             onConfirm={handleDelete}
             disabled={owner.jobs.length !== 0}
@@ -81,16 +128,29 @@ function OwnerDetailFormContainer({ owner, refetch }) {
               {t("general.actions.delete")}
             </Button>
           </Popconfirm>,
-          <Button type="primary" loading={loading} onClick={() => form.submit()}>
+          <Button key="save" type="primary" loading={loading} onClick={() => form.submit()}>
             {t("general.actions.save")}
           </Button>
         ]}
       />
       <Form form={form} onFinish={handleFinish} autoComplete="off" layout="vertical" initialValues={owner}>
-        <OwnerDetailFormComponent loading={loading} form={form} />
+        <OwnerDetailFormComponent
+          loading={loading}
+          form={form}
+          isPhone1OptedOut={
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph1 &&
+            optedOutPhones.has(phone(owner.ownr_ph1, "CA").phoneNumber?.replace(/^\+1/, ""))
+          }
+          isPhone2OptedOut={
+            bodyshop?.messagingservicesid &&
+            owner?.ownr_ph2 &&
+            optedOutPhones.has(phone(owner.ownr_ph2, "CA").phoneNumber?.replace(/^\+1/, ""))
+          }
+        />
       </Form>
     </>
   );
 }
 
-export default OwnerDetailFormContainer;
+export default connect(mapStateToProps)(OwnerDetailFormContainer);

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -1,12 +1,12 @@
 import { useLazyQuery } from "@apollo/client";
 import { Input, Modal } from "antd";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { QUERY_SEARCH_OWNER_BY_IDX } from "../../graphql/owners.queries";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
-import OwnerFindModalComponent from "./owner-find-modal.component";
 import { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
+import OwnerFindModalComponent from "./owner-find-modal.component";
 
 export default function OwnerFindModalContainer({
   loading,
@@ -41,6 +41,7 @@ export default function OwnerFindModalContainer({
     <Modal
       title={<span id="owner-find-modal-title">{t("owners.labels.existing_owners")}</span>}
       width={"80%"}
+      okButtonProps={{ id: "owner-find-modal-ok-button" }}
       {...modalProps}
     >
       {loading ? <LoadingSpinner /> : null}

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 />}

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>

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
     >

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 ? (

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%"
     >

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%"

client/src/components/phone-number-consent/phone-number-consent.component.jsx

@@ -0,0 +1,146 @@
+import { useQuery } from "@apollo/client";
+import { Input, Table, Typography } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { GET_PHONE_NUMBER_OPT_OUTS } from "../../graphql/phone-number-opt-out.queries";
+import { TimeAgoFormatter } from "../../utils/DateFormatter";
+import ChatOpenButton from "../chat-open-button/chat-open-button.component";
+import { useTranslation } from "react-i18next";
+import { useState } from "react";
+
+const { Paragraph } = Typography;
+
+// Commented out Associated Owners section for now
+//import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+//import { Link } from "react-router-dom";
+//import { useMemo, useState } from "react";
+
+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"
+  });
+
+  // Commented out Associated Owners section for now
+  /*// 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"
+  });
+
+  // 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) => <ChatOpenButton phone={text} />,
+      sorter: (a, b) => a.phone_number.localeCompare(b.phone_number)
+    },
+    // Commented out Associated Owners section for now
+    /*{
+      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}>
+            <Space direction="horizontal">
+              <Link to={"/manage/owners/" + owner.id}>
+                <OwnerNameDisplay ownerObject={owner} />
+              </Link>
+              ({owner.phoneField})
+            </Space>
+          </div>
+        ));
+      },
+      sorter: (a, b) => {
+        const aOwners = getAssociatedOwners(a.phone_number);
+        const bOwners = getAssociatedOwners(b.phone_number);
+        const aName = aOwners[0] ? `${aOwners[0].ownr_fn} ${aOwners[0].ownr_ln}` : "";
+        const bName = bOwners[0] ? `${bOwners[0].ownr_fn} ${bOwners[0].ownr_ln}` : "";
+        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>
+      <Paragraph>{t("consent.text_body")}</Paragraph>
+      <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);

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>

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") }
           ]
         },
-        {
+        ...(HasFeatureAccess({ bodyshop, featureName: "smartscheduling" })
-          name: "cardcolor",
+          ? [
-          label: t("production.labels.cardcolor"),
+              {
-          options: [
+                name: "cardcolor",
-            { value: true, label: t("production.labels.on") },
+                label: t("production.labels.cardcolor"),
-            { value: false, label: t("production.labels.off") }
+                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);

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 (
     <>

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
+      // Validate drag type and source
-      if (type === "lane" && source && destination && !isEqual(source, destination)) {
+      if (type !== "lane" || !source) {
-        setDragTime(source.droppableId);
+        // Invalid drag type or missing source, attempt to revert if possible
-        setIsProcessing(true);
+        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 {
+      try {
-          await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
+        await onDragEnd({ draggableId, type, source, reason, mode, destination, combine });
-        } catch (err) {
+      } catch (err) {
-          console.error("Error in onLaneDrag", err);
+        console.error("Error in onLaneDrag", err);
-        } finally {
+        // Ensure revert on error
-          setIsProcessing(false);
+        dispatch(
-        }
+          actions.moveCardAcrossLanes({
+            fromLaneId: source.droppableId,
+            toLaneId: source.droppableId,
+            cardId: draggableId,
+            index: source.index
+          })
+        );
+      } finally {
+        setIsProcessing(false);
       }
     },
     [dispatch, onDragEnd, setDragTime]

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
+      // Always render placeholder for empty lanes in vertical mode to ensure droppable area
-      // a card is dragged over it
+      const shouldRenderPlaceholder = orientation === "vertical" ? collapsed || renderedCards.length === 0 : collapsed;
-      const shouldRenderPlaceholder = orientation !== "horizontal" && (collapsed || renderedCards.length === 0);
 
       return (
         <HeightMemoryWrapper
@@ -178,8 +177,8 @@ const Lane = ({
           override={orientation !== "horizontal" && (collapsed || !renderedCards.length)}
         >
           <div
-            ref={laneRef} // Ensure laneRef is set here
+            ref={laneRef}
-            style={{ height: "100%", width: "100%" }} // Make it scrollable
+            style={{ height: "100%", width: "100%" }}
             className={`react-trello-lane ${collapsed ? "lane-collapsed" : ""}`}
           >
             <div {...provided.droppableProps} ref={provided.innerRef} style={{ ...provided.droppableProps.style }}>

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>

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 }
 ];

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">

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
       }}

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" } }}

client/src/components/shop-info/shop-info.component.jsx

@@ -1,35 +1,34 @@
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Tabs } from "antd";
-import React from "react";
+import queryString from "query-string";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { selectBodyshop } from "../../redux/user/user.selectors";
+import InstanceRenderManager from "../../utils/instanceRenderMgr";
+import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
+import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import ShopInfoGeneral from "./shop-info.general.component";
 import ShopInfoIntakeChecklistComponent from "./shop-info.intake.component";
 import ShopInfoLaborRates from "./shop-info.laborrates.component";
+import ShopInfoNotificationsAutoadd from "./shop-info.notifications-autoadd.component.jsx";
 import ShopInfoOrderStatusComponent from "./shop-info.orderstatus.component";
 import ShopInfoPartsScan from "./shop-info.parts-scan";
 import ShopInfoRbacComponent from "./shop-info.rbac.component";
 import ShopInfoResponsibilityCenterComponent from "./shop-info.responsibilitycenters.component";
+import ShopInfoRoGuard from "./shop-info.roguard.component";
 import ShopInfoROStatusComponent from "./shop-info.rostatus.component";
 import ShopInfoSchedulingComponent from "./shop-info.scheduling.component";
 import ShopInfoSpeedPrint from "./shop-info.speedprint.component";
-import { useLocation, useNavigate } from "react-router-dom";
 import ShopInfoTaskPresets from "./shop-info.task-presets.component";
-import queryString from "query-string";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import ShopInfoRoGuard from "./shop-info.roguard.component";
 import ShopInfoIntellipay from "./shop-intellipay-config.component";
-import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import LockWrapperComponent from "../lock-wrapper/lock-wrapper.component";
-import { useSocket } from "../../contexts/SocketIO/useSocket.js";
-import ShopInfoNotificationsAutoadd from "./shop-info.notifications-autoadd.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoComponent);
@@ -158,7 +157,7 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
   return (
     <Card
       extra={
-        <Button type="primary" loading={saveLoading} onClick={() => form.submit()}>
+        <Button type="primary" loading={saveLoading} onClick={() => form.submit()} id="shop-info-save-button">
           {t("general.actions.save")}
         </Button>
       }

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);

client/src/components/shop-info/shop-info.general.component.jsx

@@ -1,7 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, DatePicker, Form, Input, InputNumber, Radio, Select, Space, Switch } from "antd";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -19,7 +18,7 @@ const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);
@@ -823,7 +822,7 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header={t("bodyshop.labels.insurancecos")} id="insurancecos">
+      <LayoutFormRow grow header=<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span> id="insurancecos">
         <Form.List name={["md_ins_cos"]}>
           {(fields, { add, remove, move }) => {
             return (

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>

client/src/components/shop-sub-status/shop-sub-status.component.jsx

@@ -16,5 +16,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShopSubStatus);
 export function ShopSubStatus({ bodyshop }) {
   const { t } = useTranslation();
   const { sub_status } = bodyshop;
-  return <Result status="403" title={t(`general.labels.sub_status.${sub_status}`)} />;
+  // ‘expired’ ‘trail-expired' are the valid sub_status values
+  return <Result status="403" title={t(`general.errors.sub_status.${sub_status}`)} />;
 }

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}

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 ? (

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>

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>

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

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();

client/src/graphql/bodyshop.queries.js

@@ -312,7 +312,6 @@ export const QUERY_INTAKE_CHECKLIST = gql`
       intakechecklist
       status
       owner {
-        allow_text_message
         id
       }
       labhrs: joblines_aggregate(where: { _and: [{ mod_lbr_ty: { _neq: "LAR" } }, { removed: { _eq: false } }] }) {

client/src/graphql/conversations.queries.js

@@ -43,6 +43,7 @@ export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
       id
       status
       text
+      is_system
       isoutbound
       image
       image_path
@@ -77,6 +78,7 @@ export const GET_CONVERSATION_DETAILS = gql`
         id
         status
         text
+        is_system
         isoutbound
         image
         image_path

client/src/graphql/jobs.queries.js

@@ -685,6 +685,8 @@ export const GET_JOB_BY_PK = gql`
       scheduled_delivery
       scheduled_in
       selling_dealer
+      estimate_approved
+      estimate_sent_approval
       selling_dealer_contact
       servicing_dealer
       servicing_dealer_contact
@@ -872,7 +874,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       }
       owner {
         id
-        allow_text_message
         preferred_contact
         tax_number
       }
@@ -929,6 +930,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       date_exported
       date_repairstarted
       date_scheduled
+      estimate_sent_approval
+      estimate_approved
       date_estimated
       employee_body_rel {
         id
@@ -1077,6 +1080,8 @@ export const UPDATE_JOB = gql`
         date_repairstarted
         date_void
         date_lost_sale
+        estimate_sent_approval
+        estimate_approved
       }
     }
   }
@@ -2065,7 +2070,6 @@ export const QUERY_JOB_CHECKLISTS = gql`
       production_vars
       owner {
         id
-        allow_text_message
       }
       bodyshop {
         id
@@ -2422,7 +2426,6 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       ownr_ph2
       owner {
         id
-        allow_text_message
         preferred_contact
         tax_number
       }
@@ -2431,6 +2434,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       plate_st
       po_number
       production_vars
+      estimate_sent_approval
+      estimate_approved
       ro_number
       scheduled_completion
       scheduled_delivery

client/src/graphql/owners.queries.js

@@ -49,7 +49,6 @@ export const QUERY_OWNER_BY_ID = gql`
     owners_by_pk(id: $id) {
       id
       accountingid
-      allow_text_message
       ownr_addr1
       ownr_addr2
       ownr_co_nm
@@ -104,7 +103,6 @@ export const QUERY_ALL_OWNERS = gql`
   query QUERY_ALL_OWNERS {
     owners {
       id
-      allow_text_message
       created_at
       ownr_addr1
       ownr_addr2
@@ -129,7 +127,6 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
   query QUERY_ALL_OWNERS_PAGINATED($search: String, $offset: Int, $limit: Int, $order: [owners_order_by!]!) {
     search_owners(args: { search: $search }, offset: $offset, limit: $limit, order_by: $order) {
       id
-      allow_text_message
       created_at
       ownr_addr1
       ownr_addr2

client/src/graphql/phone-number-opt-out.queries.js

@@ -0,0 +1,64 @@
+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 GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS = gql`
+  query GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS($bodyshopid: uuid!, $phone_numbers: [String!]) {
+    phone_number_opt_out(
+      where: { bodyshopid: { _eq: $bodyshopid }, phone_number: { _in: $phone_numbers } }
+    ) {
+      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
+    }
+  }
+`;

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -114,7 +114,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     if (!!!job.ownerid) {
       ownerData = job.owner.data;
       ownerData.shopid = bodyshop.id;
-      delete ownerData.allow_text_message;
       delete ownerData.preferred_contact;
       delete job.ownerid;
     } else {

client/src/pages/jobs-detail/jobs-detail.page.component.jsx

@@ -14,7 +14,7 @@ import { Badge, Button, Divider, Form, Space, Tabs } from "antd";
 import Axios from "axios";
 import _ from "lodash";
 import queryString from "query-string";
-import React, { useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaHardHat, FaRegStickyNote, FaShieldAlt, FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -28,6 +28,7 @@ import JobLineUpsertModalContainer from "../../components/job-lines-upsert-modal
 import JobProfileDataWarning from "../../components/job-profile-data-warning/job-profile-data-warning.component";
 import JobReconciliationModal from "../../components/job-reconciliation-modal/job-reconciliation.modal.container";
 import JobSyncButton from "../../components/job-sync-button/job-sync-button.component";
+import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 import JobsChangeStatus from "../../components/jobs-change-status/jobs-change-status.component";
 import JobsConvertButton from "../../components/jobs-convert-button/jobs-convert-button.component";
 import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
@@ -45,6 +46,8 @@ import LockWrapperComponent from "../../components/lock-wrapper/lock-wrapper.com
 import NoteUpsertModalComponent from "../../components/note-upsert-modal/note-upsert-modal.container";
 import ScheduleJobModalContainer from "../../components/schedule-job-modal/schedule-job-modal.container";
 import TaskListContainer from "../../components/task-list/task-list.container.jsx";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 import { QUERY_PARTS_BILLS_BY_JOBID } from "../../graphql/bills.queries.js";
 import { QUERY_JOB_TASKS_PAGINATED } from "../../graphql/tasks.queries.js";
 import { insertAuditTrail } from "../../redux/application/application.actions";
@@ -55,9 +58,6 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { DateTimeFormat } from "../../utils/DateFormatter";
 import dayjs from "../../utils/day";
 import UndefinedToNull from "../../utils/undefinedtonull";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { useSocket } from "../../contexts/SocketIO/useSocket.js";
-import JobWatcherToggleContainer from "../../components/job-watcher-toggle/job-watcher-toggle.container.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -322,11 +322,11 @@ export function JobsDetailPage({
       >
         <PageHeader
           // onBack={() => window.history.back()}
-
+          id="job-detail-header"
           title={
             <Space>
               {scenarioNotificationsOn && <JobWatcherToggleContainer job={job} />}
-              {job.ro_number || t("general.labels.na")}
+              <span id="job-ro_number">{job.ro_number || t("general.labels.na")}</span>
             </Space>
           }
           extra={menuExtra}

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,16 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
       children: <ShopCsiConfig />
     });
   }
+
+  if (bodyshop.messagingservicesid) {
+    // 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} />

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;
   }

client/src/redux/user/user.sagas.js

@@ -335,20 +335,12 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
     }
 
     try {
-      InstanceRenderManager({
+      window.$crisp.push(["set", "user:company", [payload.shopname]]);
-        executeFunction: true,
+      window.$crisp.push(["set", "session:segments", [[`region:${payload.region_config}`]]]);
-        args: [],
+      if (authRecord[0] && authRecord[0].user.validemail) {
-        imex: () => {
+        window.$crisp.push(["set", "user:email", [authRecord[0].user.email]]);
-          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 });
-        }
-      });
       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);
     }

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",
@@ -774,7 +775,6 @@
       },
       "labels": {
         "addtoproduction": "Add Job to Production?",
-        "allow_text_message": "Permission to Text?",
         "checklist": "Checklist",
         "printpack": "Job Intake Print Pack",
         "removefromproduction": "Remove Job from Production?"
@@ -1230,7 +1230,11 @@
         "fcm": "You must allow notification permissions to have real time messaging.  Click to try again.",
         "notfound": "No record was found.",
         "sizelimit": "The selected items exceed the size limit.",
-        "submit-for-testing": "Error submitting Job for testing."
+        "submit-for-testing": "Error submitting Job for testing.",
+        "sub_status": {
+          "expired": "The subscription for this shop has expired. Please contact Sales to reactivate.",
+          "trial-expired": "The trial for this shop has expired. Please contact Sales to reactivate."
+        }
       },
       "itemtypes": {
         "contract": "CC Contract",
@@ -1650,6 +1654,8 @@
         "adjustment_bottom_line": "Adjustments",
         "adjustmenthours": "Adjustment Hours",
         "alt_transport": "Alt. Trans.",
+        "estimate_sent_approval": "Estimate Sent for Approval",
+        "estimate_approved": "Estimate Approved",
         "area_of_damage_impact": {
           "10": "Left Front Side",
           "11": "Left Front Corner",
@@ -1955,6 +1961,8 @@
         "scheddates": "Schedule Dates"
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "Accounts Receivable",
         "act_price_ppc": "New Part Price",
         "actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
@@ -2027,9 +2035,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",
@@ -2297,8 +2306,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": {
@@ -2373,7 +2384,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.",
@@ -2389,7 +2401,8 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive"
+        "unarchive": "Unarchive",
+        "no_consent": "Opted-out"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -2470,7 +2483,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",
@@ -2490,7 +2504,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": {
@@ -2511,7 +2527,6 @@
       "fields": {
         "accountingid": "Accounting ID",
         "address": "Address",
-        "allow_text_message": "Permission to Text?",
         "name": "Name",
         "note": "Owner Note",
         "ownr_addr1": "Address",
@@ -3092,6 +3107,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)",
@@ -3855,6 +3871,18 @@
       "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",
+      "text_body": "Users can opt out of receiving SMS messages by replying with keywords such as STOP, UNSUBSCRIBE, CANCEL, END, QUIT, STOPALL, REVOKE and OPTOUT. To opt back in, users can reply with START, YES, or UNSTOP. Even after opting out, users can still send messages to us, which will be received and processed as needed. Ensure customers are informed to reply with these keywords to manage their messaging preferences. After opting out, users receive a confirmation message and will not receive further messages until they opt back in."
+    },
+    "settings": {
+      "title": "Phone Number Opt-Out List"
     }
   }
 }

client/src/translations/es/common.json

@@ -656,6 +656,7 @@
         }
       },
       "labels": {
+        "consent_settings": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -774,7 +775,6 @@
       },
       "labels": {
         "addtoproduction": "",
-        "allow_text_message": "",
         "checklist": "",
         "printpack": "",
         "removefromproduction": ""
@@ -1230,7 +1230,11 @@
         "fcm": "",
         "notfound": "",
         "sizelimit": "",
-        "submit-for-testing": ""
+        "submit-for-testing": "",
+        "sub_status": {
+          "expired": "",
+          "trial-expired": ""
+        }
       },
       "itemtypes": {
         "contract": "",
@@ -1642,6 +1646,8 @@
         "voiding": ""
       },
       "fields": {
+        "estimate_sent_approval": "",
+        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Realización real",
         "actual_delivery": "Entrega real",
@@ -1955,6 +1961,8 @@
         "scheddates": ""
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -2030,6 +2038,7 @@
         "deleteconfirm": "",
         "deletedelivery": "",
         "deleteintake": "",
+        "deletewatchers": "",
         "deliverchecklist": "",
         "difference": "",
         "diskscan": "",
@@ -2297,8 +2306,10 @@
         "productionlist": "",
         "readyjobs": "",
         "recent": "",
+        "remoteassist": "",
         "reportcenter": "",
         "rescueme": "",
+        "rescuemezoho": "",
         "schedule": "Programar",
         "scoreboard": "",
         "search": {
@@ -2373,7 +2384,8 @@
       "errors": {
         "invalidphone": "",
         "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
       },
       "labels": {
         "addlabel": "",
@@ -2389,7 +2401,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Enviar un mensaje...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
       },
       "render": {
         "conversation_list": ""
@@ -2472,7 +2485,8 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -2492,7 +2506,9 @@
         "tasks-updated-created": ""
       },
       "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": "",
+        "not-employee-notifications": ""
       }
     },
     "owner": {
@@ -2513,7 +2529,6 @@
       "fields": {
         "accountingid": "",
         "address": "Dirección",
-        "allow_text_message": "Permiso de texto?",
         "name": "Nombre",
         "note": "",
         "ownr_addr1": "Dirección",
@@ -3094,6 +3109,7 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
+        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",
@@ -3857,6 +3873,18 @@
       "validation": {
         "unique_vendor_name": ""
       }
+    },
+    "consent": {
+      "phone_number": "",
+      "associated_owners": "",
+      "created_at": "",
+      "no_owners": "",
+      "phone_1": "",
+      "phone_2": "",
+      "text_body": ""
+    },
+    "settings": {
+      "title": ""
     }
   }
 }

client/src/translations/fr/common.json

@@ -656,6 +656,7 @@
         }
       },
       "labels": {
+        "consent_settings": "",
         "2tiername": "",
         "2tiersetup": "",
         "2tiersource": "",
@@ -774,7 +775,6 @@
       },
       "labels": {
         "addtoproduction": "",
-        "allow_text_message": "",
         "checklist": "",
         "printpack": "",
         "removefromproduction": ""
@@ -1230,7 +1230,11 @@
         "fcm": "",
         "notfound": "",
         "sizelimit": "",
-        "submit-for-testing": ""
+        "submit-for-testing": "",
+        "sub_status": {
+          "expired": "",
+          "trial-expired": ""
+        }
       },
       "itemtypes": {
         "contract": "",
@@ -1642,6 +1646,8 @@
         "voiding": ""
       },
       "fields": {
+        "estimate_sent_approval": "",
+        "estimate_approved": "",
         "active_tasks": "",
         "actual_completion": "Achèvement réel",
         "actual_delivery": "Livraison réelle",
@@ -1955,6 +1961,8 @@
         "scheddates": ""
       },
       "labels": {
+        "sent": "",
+        "approved": "",
         "accountsreceivable": "",
         "act_price_ppc": "",
         "actual_completion_inferred": "",
@@ -2030,6 +2038,7 @@
         "deleteconfirm": "",
         "deletedelivery": "",
         "deleteintake": "",
+        "deletewatchers": "",
         "deliverchecklist": "",
         "difference": "",
         "diskscan": "",
@@ -2297,8 +2306,10 @@
         "productionlist": "",
         "readyjobs": "",
         "recent": "",
+        "remoteassist": "",
         "reportcenter": "",
         "rescueme": "",
+        "rescuemezoho": "",
         "schedule": "Programme",
         "scoreboard": "",
         "search": {
@@ -2373,7 +2384,8 @@
       "errors": {
         "invalidphone": "",
         "noattachedjobs": "",
-        "updatinglabel": ""
+        "updatinglabel": "",
+        "no_consent": ""
       },
       "labels": {
         "addlabel": "",
@@ -2389,7 +2401,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Envoyer un message...",
-        "unarchive": ""
+        "unarchive": "",
+        "no_consent": ""
       },
       "render": {
         "conversation_list": ""
@@ -2472,7 +2485,8 @@
         "teams-search": "",
         "unwatch": "",
         "watch": "",
-        "watching-issue": ""
+        "watching-issue": "",
+        "employee-notification": ""
       },
       "scenarios": {
         "alternate-transport-changed": "",
@@ -2492,7 +2506,9 @@
         "tasks-updated-created": ""
       },
       "tooltips": {
-        "job-watchers": ""
+        "job-watchers": "",
+        "not-employee": "",
+        "not-employee-notifications": ""
       }
     },
     "owner": {
@@ -2513,7 +2529,6 @@
       "fields": {
         "accountingid": "",
         "address": "Adresse",
-        "allow_text_message": "Autorisation de texte?",
         "name": "Prénom",
         "note": "",
         "ownr_addr1": "Adresse",
@@ -3094,6 +3109,7 @@
         "credits_not_received_date_vendorid": "",
         "csi": "",
         "customer_list": "",
+        "customer_list_excel": "",
         "cycle_time_analysis": "",
         "estimates_written_converted": "",
         "estimator_detail": "",
@@ -3857,6 +3873,18 @@
       "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",
+      "text_body": ""
+    },
+    "settings": {
+      "title": ""
     }
   }
 }

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;

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"

client/src/utils/phoneOptOutService.js

@@ -0,0 +1,48 @@
+import { phone } from "phone";
+import { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../graphql/phone-number-opt-out.queries";
+
+/**
+ * Check if phone numbers are opted out for a given bodyshop
+ * @param {Object} apolloClient - Apollo Client instance
+ * @param {string} bodyshopId - The ID of the bodyshop
+ * @param {string[]} phoneNumbers - Array of phone numbers to check
+ * @returns {Promise<Set<string>>} - Set of normalized opted-out phone numbers
+ */
+export const phoneNumberOptOutService = async (apolloClient, bodyshopId, phoneNumbers) => {
+  if (!apolloClient || !bodyshopId || !phoneNumbers?.length) {
+    return new Set();
+  }
+
+  // Normalize phone numbers (remove +1 for CA numbers)
+  const normalizedPhones = phoneNumbers
+    .filter(Boolean)
+    .map((num) => phone(num, "CA").phoneNumber?.replace(/^\+1/, ""))
+    .filter(Boolean);
+
+  if (!normalizedPhones.length) {
+    return new Set();
+  }
+
+  const optedOutPhones = new Set();
+
+  try {
+    const { data } = await apolloClient.query({
+      query: GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS,
+      variables: {
+        bodyshopid: bodyshopId,
+        phone_numbers: normalizedPhones // Array of phone numbers
+      },
+      fetchPolicy: "network-only"
+    });
+
+    if (data?.phone_number_opt_out?.length) {
+      data.phone_number_opt_out.forEach((optOut) => {
+        optedOutPhones.add(optOut.phone_number);
+      });
+    }
+  } catch (error) {
+    console.error("Error checking opt-out statuses:", error);
+  }
+
+  return optedOutPhones;
+};

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]);
+}

hasura/metadata/tables.yaml

@@ -1035,6 +1035,7 @@
           - use_fippa
           - use_paint_scale_data
           - uselocalmediaserver
+          - external_shop_id
           - website
           - workingdays
           - zip_post
@@ -1130,6 +1131,7 @@
           - use_fippa
           - use_paint_scale_data
           - uselocalmediaserver
+          - external_shop_id
           - website
           - workingdays
           - zip_post
@@ -2681,6 +2683,9 @@
                 - active:
                     _eq: true
         allow_aggregations: true
+- table:
+    name: integration_log
+    schema: public
 - table:
     name: inventory
     schema: public
@@ -3702,6 +3707,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt
@@ -3976,6 +3983,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt
@@ -4262,6 +4271,8 @@
           - est_ph1
           - est_st
           - est_zip
+          - estimate_approved
+          - estimate_sent_approval
           - federal_tax_rate
           - flat_rate_ats
           - g_bett_amt
@@ -4733,6 +4744,7 @@
           - id
           - image
           - image_path
+          - is_system
           - isoutbound
           - msid
           - read
@@ -5855,6 +5867,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