Merged in release/2025-12-19 (pull request #2802)

Release/2025-12-19 into master-AIO IO-1710, IO-2566, IO-3401, IO-3431, IO-3464, IO-3477, IO-3478, IO-3479, IO-3480, IO-3484, IO-3487, IO-3491, IO-3492, IO-3494, IO-3496

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

@@ -2,7 +2,6 @@ import { useApolloClient } from "@apollo/client";
 import { getToken } from "@firebase/messaging";
 import axios from "axios";
 import { useEffect } from "react";
-import { useTranslation } from "react-i18next";
 import { messaging, requestForToken } from "../../firebase/firebase.utils";
 import ChatPopupComponent from "../chat-popup/chat-popup.component";
 import "./chat-affix.styles.scss";
@@ -10,14 +9,14 @@ import { registerMessagingHandlers, unregisterMessagingHandlers } from "./regist
 import { useSocket } from "../../contexts/SocketIO/useSocket.js";
 
 export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
-  const { t } = useTranslation();
   const client = useApolloClient();
   const { socket } = useSocket();
 
+  // 1) FCM subscription (independent of socket handler registration)
   useEffect(() => {
     if (!bodyshop?.messagingservicesid) return;
 
-    async function SubscribeToTopicForFCMNotification() {
+    async function subscribeToTopicForFCMNotification() {
       try {
         await requestForToken();
         await axios.post("/notifications/subscribe", {
@@ -32,17 +31,35 @@ export function ChatAffixContainer({ bodyshop, chatVisible, currentUser }) {
       }
     }
 
-    SubscribeToTopicForFCMNotification();
+    subscribeToTopicForFCMNotification();
+  }, [bodyshop?.messagingservicesid, bodyshop?.imexshopid]);
 
-    // Register WebSocket handlers
-    if (socket?.connected) {
-      registerMessagingHandlers({ socket, client, currentUser, bodyshop, t });
+  // 2) Register socket handlers as soon as socket is connected (regardless of chatVisible)
+  useEffect(() => {
+    if (!socket) return;
+    if (!bodyshop?.messagingservicesid) return;
+    if (!bodyshop?.id) return;
 
-      return () => {
-        unregisterMessagingHandlers({ socket });
-      };
+    // If socket isn't connected yet, ensure no stale handlers remain.
+    if (!socket.connected) {
+      unregisterMessagingHandlers({ socket });
+      return;
     }
-  }, [bodyshop, socket, t, client]);
+
+    // Prevent duplicate listeners if this effect runs more than once.
+    unregisterMessagingHandlers({ socket });
+
+    registerMessagingHandlers({
+      socket,
+      client,
+      currentUser,
+      bodyshop
+    });
+
+    return () => {
+      unregisterMessagingHandlers({ socket });
+    };
+  }, [socket, socket?.connected, bodyshop?.id, bodyshop?.messagingservicesid, client, currentUser?.email]);
 
   if (!bodyshop?.messagingservicesid) return <></>;
 

client/src/components/chat-affix/registerMessagingSocketHandlers.js

@@ -13,68 +13,241 @@ const logLocal = (message, ...args) => {
   }
 };
 
-// Utility function to enrich conversation data
-const enrichConversation = (conversation, isOutbound) => ({
+const safeIsoNow = () => new Date().toISOString();
+const isSystemMsid = (msid) => typeof msid === "string" && msid.startsWith("SYS_");
+
+const normalizeConversationForList = (raw, { isoutbound, isSystem } = {}) => {
+  const c = raw || {};
+  const id = c.id;
+
+  return {
+    __typename: "conversations",
+    id,
+    phone_num: c.phone_num ?? null,
+    updated_at: c.updated_at ?? safeIsoNow(),
+    unreadcnt: typeof c.unreadcnt === "number" ? c.unreadcnt : 0,
+    archived: c.archived ?? false,
+    label: c.label ?? null,
+
+    job_conversations: Array.isArray(c.job_conversations)
+      ? c.job_conversations.map((jc) => {
+          const job = jc?.job || {};
+          const jobId = jc?.jobid ?? job?.id ?? null;
+
+          return {
+            __typename: "job_conversations",
+            jobid: jobId,
+            conversationid: jc?.conversationid ?? id ?? null,
+            job: {
+              __typename: "jobs",
+              id: jobId,
+              ro_number: job?.ro_number ?? null,
+              ownr_fn: job?.ownr_fn ?? null,
+              ownr_ln: job?.ownr_ln ?? null,
+              ownr_co_nm: job?.ownr_co_nm ?? null
+            }
+          };
+        })
+      : [],
+
+    messages_aggregate: c.messages_aggregate || {
+      __typename: "messages_aggregate",
+      aggregate: {
+        __typename: "messages_aggregate_fields",
+        count: isoutbound || isSystem ? 0 : 1
+      }
+    }
+  };
+};
+
+const CONVERSATION_LIST_ITEM_FRAGMENT = gql`
+  fragment _ConversationListItem on conversations {
+    id
+    phone_num
+    updated_at
+    unreadcnt
+    archived
+    label
+    job_conversations {
+      jobid
+      conversationid
+      job {
+        id
+        ro_number
+        ownr_fn
+        ownr_ln
+        ownr_co_nm
+      }
+    }
+    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
+      aggregate {
+        count
+      }
+    }
+  }
+`;
+
+const normalizeMessageForCache = (raw, fallbackConversationId) => {
+  const m = raw || {};
+
+  return {
+    __typename: "messages",
+    id: m.id,
+    conversationid: m.conversationid ?? m.conversation?.id ?? fallbackConversationId,
+
+    status: m.status ?? null,
+    text: m.text ?? "",
+    is_system: typeof m.is_system === "boolean" ? m.is_system : false,
+    isoutbound: typeof m.isoutbound === "boolean" ? m.isoutbound : false,
+    image: typeof m.image === "boolean" ? m.image : false,
+    image_path: m.image_path ?? null,
+    userid: m.userid ?? null,
+    created_at: m.created_at ?? safeIsoNow(),
+    read: typeof m.read === "boolean" ? m.read : false
+  };
+};
+
+const isConversationDetailsCached = (client, conversationId) => {
+  try {
+    return !!client.cache.readQuery({
+      query: GET_CONVERSATION_DETAILS,
+      variables: { conversationId }
+    })?.conversations_by_pk;
+  } catch {
+    return false;
+  }
+};
+
+const conversationDetailsCached = (client, conversationId) => {
+  try {
+    const res = client.cache.readQuery({
+      query: GET_CONVERSATION_DETAILS,
+      variables: { conversationId }
+    });
+    return !!res?.conversations_by_pk;
+  } catch {
+    return false;
+  }
+};
+
+const messageEntityCached = (client, messageId) => {
+  const cacheId = client.cache.identify({ __typename: "messages", id: messageId });
+  if (!cacheId) return false;
+
+  try {
+    client.cache.readFragment({
+      id: cacheId,
+      fragment: gql`
+        fragment _MsgExists on messages {
+          id
+        }
+      `
+    });
+    return true;
+  } catch {
+    return false;
+  }
+};
+
+const enrichConversation = (conversation, { isoutbound, isSystem }) => ({
   ...conversation,
-  updated_at: conversation.updated_at || new Date().toISOString(),
-  unreadcnt: conversation.unreadcnt || 0,
-  archived: conversation.archived || false,
-  label: conversation.label || null,
+  updated_at: conversation.updated_at || safeIsoNow(),
+  unreadcnt: typeof conversation.unreadcnt === "number" ? conversation.unreadcnt : 0,
+  archived: conversation.archived ?? false,
+  label: conversation.label ?? null,
   job_conversations: conversation.job_conversations || [],
   messages_aggregate: conversation.messages_aggregate || {
     __typename: "messages_aggregate",
     aggregate: {
       __typename: "messages_aggregate_fields",
-      count: isOutbound ? 0 : 1
+      count: isoutbound || isSystem ? 0 : 1
     }
   },
   __typename: "conversations"
 });
 
-// Can be uncommonted to test the playback of the notification sound
-// window.testTone = () => {
-//   const notificationSound = new Audio(newMessageSound);
-//   notificationSound.play().catch((error) => {
-//     console.error("Error playing notification sound:", error);
-//   });
-// };
+const upsertConversationIntoOffsetZeroList = (client, conversationObj, { isoutbound, isSystem } = {}) => {
+  const normalized = normalizeConversationForList(conversationObj, { isoutbound, isSystem });
+  if (!normalized?.id) return;
+
+  const convCacheId = client.cache.identify(normalized);
+  if (!convCacheId) return;
+
+  client.cache.writeFragment({
+    id: convCacheId,
+    fragment: CONVERSATION_LIST_ITEM_FRAGMENT,
+    data: normalized
+  });
+
+  client.cache.modify({
+    id: "ROOT_QUERY",
+    fields: {
+      conversations(existing = [], { args, readField }) {
+        if (!args || args.offset !== 0) return existing;
+
+        const archivedEq = args?.where?.archived?._eq;
+        if (archivedEq === true) return existing;
+
+        const without = existing.filter((c) => readField("id", c) !== normalized.id);
+        return [{ __ref: convCacheId }, ...without];
+      }
+    }
+  });
+};
 
 export const registerMessagingHandlers = ({ socket, client, currentUser, bodyshop }) => {
   if (!(socket && client)) return;
 
-  const handleNewMessageSummary = async (message) => {
-    const { conversationId, newConversation, existingConversation, isoutbound } = message;
+  // Coalesce unread refetches (avoid spamming during bursts)
+  let unreadRefetchInFlight = null;
+  const refetchUnreadCount = () => {
+    if (unreadRefetchInFlight) return;
 
-    // True only when DB value is strictly true; falls back to true on cache miss
-    const isNewMessageSoundEnabled = (client) => {
+    unreadRefetchInFlight = client
+      .refetchQueries({
+        include: ["UNREAD_CONVERSATION_COUNT"]
+      })
+      .catch(() => {
+        // best-effort
+      })
+      .finally(() => {
+        unreadRefetchInFlight = null;
+      });
+  };
+
+  const handleNewMessageSummary = async (message) => {
+    const { conversationId, newConversation, existingConversation, isoutbound, msid, updated_at } = message;
+    const isSystem = isSystemMsid(msid);
+
+    const isNewMessageSoundEnabled = (clientInstance) => {
       try {
         const email = currentUser?.email;
-        if (!email) return true; // default allow if we can't resolve user
-        const res = client.readQuery({
+        if (!email) return true;
+        const res = clientInstance.readQuery({
           query: QUERY_ACTIVE_ASSOCIATION_SOUND,
           variables: { email }
         });
         const flag = res?.associations?.[0]?.new_message_sound;
-        return flag === true; // strictly true => enabled
+        return flag === true;
       } catch {
-        // If the query hasn't been seeded in cache yet, default ON
         return true;
       }
     };
 
     logLocal("handleNewMessageSummary - Start", { message, isNew: !existingConversation });
 
-    const queryVariables = { offset: 0 };
-
     if (!isoutbound) {
-      // Play notification sound for new inbound message (scoped to bodyshop)
       if (isLeaderTab(bodyshop.id) && isNewMessageSoundEnabled(client)) {
         playNewMessageSound(bodyshop.id);
       }
+
+      // Real-time badge update for affix (best-effort, coalesced)
+      if (!isSystem) {
+        refetchUnreadCount();
+      }
     }
 
     if (!existingConversation && conversationId) {
-      // Attempt to read from the cache to determine if this is actually a new conversation
       try {
         const cachedConversation = client.cache.readFragment({
           id: client.cache.identify({ __typename: "conversations", id: conversationId }),
@@ -86,75 +259,54 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         });
 
         if (cachedConversation) {
-          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", {
-            conversationId
-          });
-          return handleNewMessageSummary({
-            ...message,
-            existingConversation: true
-          });
+          logLocal("handleNewMessageSummary - Existing Conversation inferred from cache", { conversationId });
+          return handleNewMessageSummary({ ...message, existingConversation: true });
         }
       } catch {
-        logLocal("handleNewMessageSummary - Cache miss", { conversationId });
+        // Cache miss is normal
       }
     }
 
-    // Handle new conversation
     if (!existingConversation && newConversation?.phone_num) {
-      logLocal("handleNewMessageSummary - New Conversation", newConversation);
-
       try {
-        const queryResults = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: queryVariables
-        });
-
-        const existingConversations = queryResults?.conversations || [];
-        const enrichedConversation = enrichConversation(newConversation, isoutbound);
-
-        if (!existingConversations.some((conv) => conv.id === enrichedConversation.id)) {
-          client.cache.modify({
-            id: "ROOT_QUERY",
-            fields: {
-              conversations(existingConversations = []) {
-                return [enrichedConversation, ...existingConversations];
-              }
-            }
-          });
-        }
+        upsertConversationIntoOffsetZeroList(client, newConversation, { isoutbound, isSystem });
       } catch (error) {
         console.error("Error updating cache for new conversation:", error);
       }
       return;
     }
 
-    // Handle existing conversation
-    if (existingConversation) {
+    if (existingConversation && conversationId) {
       try {
         client.cache.modify({
           id: client.cache.identify({ __typename: "conversations", id: conversationId }),
           fields: {
-            updated_at: () => new Date().toISOString(),
+            updated_at: () => updated_at || safeIsoNow(),
             archived: () => false,
-            messages_aggregate(cached = { aggregate: { count: 0 } }) {
-              const currentCount = cached.aggregate?.count || 0;
-              if (!isoutbound) {
-                return {
-                  __typename: "messages_aggregate",
-                  aggregate: {
-                    __typename: "messages_aggregate_fields",
-                    count: currentCount + 1
-                  }
-                };
-              }
-              return cached;
+
+            messages_aggregate(cached = null) {
+              if (isoutbound || isSystem) return cached;
+
+              const currentCount = cached?.aggregate?.count ?? 0;
+              return {
+                __typename: "messages_aggregate",
+                aggregate: {
+                  __typename: "messages_aggregate_fields",
+                  count: currentCount + 1
+                }
+              };
+            },
+
+            unreadcnt(cached) {
+              if (isoutbound || isSystem) return cached;
+              const n = typeof cached === "number" ? cached : 0;
+              return n + 1;
             }
           }
         });
       } catch (error) {
         console.error("Error updating cache for existing conversation:", error);
       }
-
       return;
     }
 
@@ -166,88 +318,78 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
 
     logLocal("handleNewMessageDetailed - Start", message);
 
-    try {
-      // Check if the conversation exists in the cache
-      const queryResults = client.cache.readQuery({
-        query: GET_CONVERSATION_DETAILS,
-        variables: { conversationId }
-      });
+    if (!conversationId || !isConversationDetailsCached(client, conversationId)) return;
 
-      if (!queryResults?.conversations_by_pk) {
-        console.warn("Conversation not found in cache:", { conversationId });
+    try {
+      const normalized = normalizeMessageForCache(newMessage, conversationId);
+
+      const messageCacheId = client.cache.identify(normalized);
+      if (!messageCacheId) {
+        console.warn("handleNewMessageDetailed - Could not identify message for cache", {
+          conversationId,
+          newMessageId: newMessage?.id
+        });
         return;
       }
 
-      // Append the new message to the conversation's message list using cache.modify
+      client.cache.writeFragment({
+        id: messageCacheId,
+        fragment: gql`
+          fragment _IncomingMessage on messages {
+            id
+            conversationid
+            status
+            text
+            is_system
+            isoutbound
+            image
+            image_path
+            userid
+            created_at
+            read
+          }
+        `,
+        data: normalized
+      });
+
       client.cache.modify({
         id: client.cache.identify({ __typename: "conversations", id: conversationId }),
         fields: {
-          messages(existingMessages = []) {
-            return [...existingMessages, newMessage];
+          messages(existing = [], { readField }) {
+            const already = existing.some((ref) => readField("id", ref) === normalized.id);
+            if (already) return existing;
+            return [...existing, { __ref: messageCacheId }];
+          },
+          updated_at() {
+            return normalized.created_at || safeIsoNow();
           }
         }
       });
 
-      logLocal("handleNewMessageDetailed - Message appended successfully", {
-        conversationId,
-        newMessage
-      });
+      logLocal("handleNewMessageDetailed - Message appended successfully", { conversationId });
     } catch (error) {
       console.error("Error updating conversation messages in cache:", error);
     }
   };
 
   const handleMessageChanged = (message) => {
-    if (!message) {
-      logLocal("handleMessageChanged - No message provided", message);
-      return;
-    }
+    if (!message?.id) return;
 
     logLocal("handleMessageChanged - Start", message);
 
+    if (!messageEntityCached(client, message.id)) return;
+
     try {
+      const msgCacheId = client.cache.identify({ __typename: "messages", id: message.id });
+
       client.cache.modify({
-        id: client.cache.identify({ __typename: "conversations", id: message.conversationid }),
+        id: msgCacheId,
         fields: {
-          messages(existingMessages = [], { readField }) {
-            return existingMessages.map((messageRef) => {
-              // Check if this is the message to update
-              if (readField("id", messageRef) === message.id) {
-                const currentStatus = readField("status", messageRef);
-
-                // Handle known types of message changes
-                switch (message.type) {
-                  case "status-changed":
-                    // Prevent overwriting if the current status is already "delivered"
-                    if (currentStatus === "delivered") {
-                      logLocal("handleMessageChanged - Status already delivered, skipping update", {
-                        messageId: message.id
-                      });
-                      return messageRef;
-                    }
-
-                    // Update the status field
-                    return {
-                      ...messageRef,
-                      status: message.status
-                    };
-
-                  case "text-updated":
-                    // Handle changes to the message text
-                    return {
-                      ...messageRef,
-                      text: message.text
-                    };
-
-                  default:
-                    // Log a warning for unhandled message types
-                    logLocal("handleMessageChanged - Unhandled message type", { type: message.type });
-                    return messageRef;
-                }
-              }
-
-              return messageRef;
-            });
+          status(existing) {
+            return message.type === "status-changed" ? (message.status ?? existing) : existing;
+          },
+          text(existing) {
+            return message.type === "text-updated" ? (message.text ?? existing) : existing;
           }
         }
       });
@@ -262,149 +404,140 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
   };
 
   const handleConversationChanged = async (data) => {
-    if (!data) {
-      logLocal("handleConversationChanged - No data provided", data);
-      return;
-    }
+    if (!data?.conversationId) return;
+
+    const {
+      conversationId,
+      type,
+      job_conversations,
+      messageIds,
+      messageIdsMarkedRead,
+      lastUnreadMessageId,
+      unreadCount,
+      ...fields
+    } = data;
 
-    const { conversationId, type, job_conversations, messageIds, ...fields } = data;
     logLocal("handleConversationChanged - Start", data);
 
-    const updatedAt = new Date().toISOString();
+    const updatedAt = safeIsoNow();
+    const detailsCached = conversationDetailsCached(client, conversationId);
 
-    const updateConversationList = (newConversation) => {
-      try {
-        const existingList = client.cache.readQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 }
-        });
-
-        const updatedList = existingList?.conversations
-          ? [newConversation, ...existingList.conversations.filter((conv) => conv.id !== newConversation.id)]
-          : [newConversation]; // Prevent duplicates
-
-        client.cache.writeQuery({
-          query: CONVERSATION_LIST_QUERY,
-          variables: { offset: 0 },
-          data: {
-            conversations: updatedList
-          }
-        });
-
-        logLocal("handleConversationChanged - Conversation list updated successfully", newConversation);
-      } catch (error) {
-        console.error("Error updating conversation list in the cache:", error);
-      }
-    };
-
-    // Handle specific types
     try {
       switch (type) {
-        case "conversation-marked-read":
-          if (conversationId && messageIds?.length > 0) {
-            client.cache.modify({
-              id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-              fields: {
-                messages(existingMessages = [], { readField }) {
-                  return existingMessages.map((message) => {
-                    if (messageIds.includes(readField("id", message))) {
-                      return { ...message, read: true };
-                    }
-                    return message;
-                  });
-                },
-                messages_aggregate: () => ({
-                  __typename: "messages_aggregate",
-                  aggregate: { __typename: "messages_aggregate_fields", count: 0 }
-                })
-              }
+        case "conversation-marked-read": {
+          refetchUnreadCount();
+
+          if (detailsCached && Array.isArray(messageIds)) {
+            messageIds.forEach((id) => {
+              if (!messageEntityCached(client, id)) return;
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id }),
+                fields: { read: () => true }
+              });
             });
           }
-          break;
 
-        case "conversation-created":
-          updateConversationList({ ...fields, job_conversations, updated_at: updatedAt });
+          client.cache.modify({
+            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+            fields: {
+              messages_aggregate: () => ({
+                __typename: "messages_aggregate",
+                aggregate: { __typename: "messages_aggregate_fields", count: 0 }
+              }),
+              unreadcnt: () => 0,
+              updated_at: () => updatedAt
+            }
+          });
+
           break;
+        }
+
+        case "conversation-marked-unread": {
+          refetchUnreadCount();
+
+          const safeUnreadCount = typeof unreadCount === "number" ? unreadCount : 1;
+          const idsMarkedRead = Array.isArray(messageIdsMarkedRead) ? messageIdsMarkedRead : [];
+
+          if (detailsCached) {
+            idsMarkedRead.forEach((id) => {
+              if (!messageEntityCached(client, id)) return;
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id }),
+                fields: { read: () => true }
+              });
+            });
+
+            if (lastUnreadMessageId && messageEntityCached(client, lastUnreadMessageId)) {
+              client.cache.modify({
+                id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
+                fields: { read: () => false }
+              });
+            }
+          }
+
+          client.cache.modify({
+            id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+            fields: {
+              updated_at: () => updatedAt,
+              messages_aggregate: () => ({
+                __typename: "messages_aggregate",
+                aggregate: {
+                  __typename: "messages_aggregate_fields",
+                  count: safeUnreadCount
+                }
+              }),
+              unreadcnt: () => safeUnreadCount
+            }
+          });
+
+          break;
+        }
+
+        case "conversation-created": {
+          // New conversation likely implies new unread inbound message(s)
+          refetchUnreadCount();
+
+          const conv = enrichConversation(
+            { id: conversationId, job_conversations, ...fields, updated_at: updatedAt },
+            { isoutbound: false, isSystem: false }
+          );
+          upsertConversationIntoOffsetZeroList(client, conv);
+          break;
+        }
 
         case "conversation-unarchived":
-        case "conversation-archived":
-          try {
-            const listQueryVariables = { offset: 0 };
-            const detailsQueryVariables = { conversationId };
+        case "conversation-archived": {
+          // Keep unread badge correct even if archiving affects counts
+          refetchUnreadCount();
 
-            // Check if conversation details exist in the cache
-            const detailsExist = !!client.cache.readQuery({
-              query: GET_CONVERSATION_DETAILS,
-              variables: detailsQueryVariables
-            });
-
-            // Refetch conversation list
-            await client.refetchQueries({
-              include: [CONVERSATION_LIST_QUERY, ...(detailsExist ? [GET_CONVERSATION_DETAILS] : [])],
-              variables: [
-                { query: CONVERSATION_LIST_QUERY, variables: listQueryVariables },
-                ...(detailsExist
-                  ? [
-                      {
-                        query: GET_CONVERSATION_DETAILS,
-                        variables: detailsQueryVariables
-                      }
-                    ]
-                  : [])
-              ]
-            });
-
-            logLocal("handleConversationChanged - Refetched queries after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change:", error);
-          }
+          await client.refetchQueries({
+            include: [CONVERSATION_LIST_QUERY, GET_CONVERSATION_DETAILS]
+          });
           break;
+        }
 
         case "tag-added": {
-          // Ensure `job_conversations` is properly formatted
-          const formattedJobConversations = job_conversations.map((jc) => ({
+          const formattedJobConversations = (job_conversations || []).map((jc) => ({
             __typename: "job_conversations",
             jobid: jc.jobid || jc.job?.id,
             conversationid: conversationId,
-            job: jc.job || {
+            job: {
               __typename: "jobs",
-              id: data.selectedJob.id,
-              ro_number: data.selectedJob.ro_number,
-              ownr_co_nm: data.selectedJob.ownr_co_nm,
-              ownr_fn: data.selectedJob.ownr_fn,
-              ownr_ln: data.selectedJob.ownr_ln
+              id: jc.job?.id,
+              ro_number: jc.job?.ro_number,
+              ownr_co_nm: jc.job?.ownr_co_nm,
+              ownr_fn: jc.job?.ownr_fn,
+              ownr_ln: jc.job?.ownr_ln
             }
           }));
 
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
             fields: {
-              job_conversations: (existing = []) => {
-                // Ensure no duplicates based on both `conversationid` and `jobid`
-                const existingLinks = new Set(
-                  existing.map((jc) => {
-                    const jobId = client.cache.readFragment({
-                      id: client.cache.identify(jc),
-                      fragment: gql`
-                        fragment JobConversationLinkAdded on job_conversations {
-                          jobid
-                          conversationid
-                        }
-                      `
-                    })?.jobid;
-                    return `${jobId}:${conversationId}`; // Unique identifier for a job-conversation link
-                  })
-                );
-
-                const newItems = formattedJobConversations.filter((jc) => {
-                  const uniqueLink = `${jc.jobid}:${jc.conversationid}`;
-                  return !existingLinks.has(uniqueLink);
-                });
-
-                return [...existing, ...newItems];
+              job_conversations(existing = [], { readField }) {
+                const seen = new Set(existing.map((x) => readField("jobid", x)).filter(Boolean));
+                const incoming = formattedJobConversations.filter((x) => x.jobid && !seen.has(x.jobid));
+                return [...existing, ...incoming];
               }
             }
           });
@@ -412,46 +545,31 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
           break;
         }
 
-        case "tag-removed":
-          try {
-            const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
-
-            // Evict the specific cache entry for job_conversations
-            client.cache.evict({
-              id: conversationCacheId,
-              fieldName: "job_conversations"
-            });
-
-            // Garbage collect evicted entries
-            client.cache.gc();
-
-            logLocal("handleConversationChanged - tag removed - Refetched conversation list after state change", {
-              conversationId,
-              type
-            });
-          } catch (error) {
-            console.error("Error refetching queries after conversation state change: (Tag Removed)", error);
-          }
+        case "tag-removed": {
+          const conversationCacheId = client.cache.identify({ __typename: "conversations", id: conversationId });
 
+          client.cache.evict({
+            id: conversationCacheId,
+            fieldName: "job_conversations"
+          });
+          client.cache.gc();
           break;
+        }
 
-        default:
-          logLocal("handleConversationChanged - Unhandled type", { type });
+        default: {
           client.cache.modify({
             id: client.cache.identify({ __typename: "conversations", id: conversationId }),
-            fields: {
-              ...Object.fromEntries(
-                Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
-              )
-            }
+            fields: Object.fromEntries(
+              Object.entries(fields).map(([key, value]) => [key, (cached) => (value !== undefined ? value : cached)])
+            )
           });
+        }
       }
     } catch (error) {
       console.error("Error handling conversation changes:", { type, error });
     }
   };
 
-  // Existing handler for phone number opt-out
   const handlePhoneNumberOptedOut = async (data) => {
     const { bodyshopid, phone_number } = data;
     logLocal("handlePhoneNumberOptedOut - Start", data);
@@ -461,22 +579,18 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         id: "ROOT_QUERY",
         fields: {
           phone_number_opt_out(existing = [], { readField }) {
-            const phoneNumberExists = existing.some(
+            const exists = 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;
-            }
+            if (exists) 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()
+              created_at: safeIsoNow(),
+              updated_at: safeIsoNow()
             };
 
             return [...existing, newOptOut];
@@ -491,46 +605,36 @@ export const registerMessagingHandlers = ({ socket, client, currentUser, bodysho
         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
+        broadcast: true
       });
 
-      // 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 });
     }
   };
 

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

@@ -12,7 +12,7 @@ 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 { GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS } from "../../graphql/phone-number-opt-out.queries.js";
 import { phone } from "phone";
 import { useTranslation } from "react-i18next";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -29,13 +29,26 @@ const mapDispatchToProps = (dispatch) => ({
 function ChatConversationListComponent({ conversationList, selectedConversation, setSelectedConversation, bodyshop }) {
   const { t } = useTranslation();
   const [, forceUpdate] = useState(false);
-  const phoneNumbers = conversationList.map((item) => phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, ""));
-  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS, {
+
+  const phoneNumbers = useMemo(() => {
+    return (conversationList || [])
+      .map((item) => {
+        try {
+          const p = phone(item.phone_num, "CA")?.phoneNumber;
+          return p ? p.replace(/^\+1/, "") : null;
+        } catch {
+          return null;
+        }
+      })
+      .filter(Boolean);
+  }, [conversationList]);
+
+  const { data: optOutData } = useQuery(GET_PHONE_NUMBER_OPT_OUTS_BY_NUMBERS, {
     variables: {
-      bodyshopid: bodyshop.id,
+      bodyshopid: bodyshop?.id,
       phone_numbers: phoneNumbers
     },
-    skip: !conversationList.length,
+    skip: !bodyshop?.id || phoneNumbers.length === 0,
     fetchPolicy: "cache-and-network"
   });
 
@@ -58,15 +71,25 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     return _.orderBy(conversationList, ["updated_at"], ["desc"]);
   }, [conversationList]);
 
-  const renderConversation = (index, t) => {
+  const renderConversation = (index) => {
     const item = sortedConversationList[index];
-    const normalizedPhone = phone(item.phone_num, "CA").phoneNumber.replace(/^\+1/, "");
-    const hasOptOutEntry = optOutMap.has(normalizedPhone);
+
+    const normalizedPhone = (() => {
+      try {
+        return phone(item.phone_num, "CA")?.phoneNumber?.replace(/^\+1/, "") || "";
+      } catch {
+        return "";
+      }
+    })();
+
+    const hasOptOutEntry = normalizedPhone ? optOutMap.has(normalizedPhone) : false;
+
     const cardContentRight = <TimeAgoFormatter>{item.updated_at}</TimeAgoFormatter>;
     const cardContentLeft =
       item.job_conversations.length > 0
         ? item.job_conversations.map((j, idx) => <Tag key={idx}>{j.job.ro_number}</Tag>)
         : null;
+
     const names = <>{_.uniq(item.job_conversations.map((j) => OwnerNameDisplayFunction(j.job)))}</>;
     const cardTitle = (
       <>
@@ -80,9 +103,10 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
+
     const cardExtra = (
       <>
-        <Badge count={item.messages_aggregate.aggregate.count} />
+        <Badge count={item.messages_aggregate?.aggregate?.count || 0} />
         {hasOptOutEntry && (
           <Tooltip title={t("consent.text_body")}>
             <Tag color="red" icon={<ExclamationCircleOutlined />}>
@@ -92,6 +116,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         )}
       </>
     );
+
     const getCardStyle = () =>
       item.id === selectedConversation
         ? { backgroundColor: "var(--card-selected-bg)" }
@@ -104,24 +129,8 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
         className={`chat-list-item ${item.id === selectedConversation ? "chat-list-selected-conversation" : ""}`}
       >
         <Card style={getCardStyle()} variant={true} size="small" extra={cardExtra} title={cardTitle}>
-          <div
-            style={{
-              display: "inline-block",
-              width: "70%",
-              textAlign: "left"
-            }}
-          >
-            {cardContentLeft}
-          </div>
-          <div
-            style={{
-              display: "inline-block",
-              width: "30%",
-              textAlign: "right"
-            }}
-          >
-            {cardContentRight}
-          </div>
+          <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>
     );
@@ -131,7 +140,7 @@ function ChatConversationListComponent({ conversationList, selectedConversation,
     <div className="chat-list-container">
       <Virtuoso
         data={sortedConversationList}
-        itemContent={(index) => renderConversation(index, t)}
+        itemContent={(index) => renderConversation(index)}
         style={{ height: "100%", width: "100%" }}
       />
     </div>

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

@@ -5,24 +5,24 @@ import ChatConversationTitleTags from "../chat-conversation-title-tags/chat-conv
 import ChatLabelComponent from "../chat-label/chat-label.component";
 import ChatPrintButton from "../chat-print-button/chat-print-button.component";
 import ChatTagRoContainer from "../chat-tag-ro/chat-tag-ro.container";
-import { createStructuredSelector } from "reselect";
-import { connect } from "react-redux";
+import ChatMarkUnreadButton from "../chat-mark-unread-button/chat-mark-unread-button.component";
 
-const mapStateToProps = createStructuredSelector({});
-
-const mapDispatchToProps = () => ({});
-
-export function ChatConversationTitle({ conversation }) {
+export function ChatConversationTitle({ conversation, onMarkUnread, markUnreadDisabled, markUnreadLoading }) {
   return (
     <Space className="chat-title" wrap>
       <PhoneNumberFormatter>{conversation?.phone_num}</PhoneNumberFormatter>
+
       <ChatLabelComponent conversation={conversation} />
       <ChatPrintButton conversation={conversation} />
+
       <ChatConversationTitleTags jobConversations={conversation?.job_conversations || []} />
       <ChatTagRoContainer conversation={conversation || []} />
+
+      <ChatMarkUnreadButton disabled={markUnreadDisabled} loading={markUnreadLoading} onMarkUnread={onMarkUnread} />
+
       <ChatArchiveButton conversation={conversation} />
     </Space>
   );
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(ChatConversationTitle);
+export default ChatConversationTitle;

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

@@ -19,7 +19,9 @@ export function ChatConversationComponent({
   conversation,
   messages,
   handleMarkConversationAsRead,
-  bodyshop
+  handleMarkLastMessageAsUnread,
+  markingAsUnreadInProgress,
+  canMarkUnread
 }) {
   const [loading, error] = subState;
 
@@ -33,7 +35,12 @@ export function ChatConversationComponent({
       onMouseDown={handleMarkConversationAsRead}
       onKeyDown={handleMarkConversationAsRead}
     >
-      <ChatConversationTitle conversation={conversation} bodyshop={bodyshop} />
+      <ChatConversationTitle
+        conversation={conversation}
+        onMarkUnread={handleMarkLastMessageAsUnread}
+        markUnreadDisabled={!canMarkUnread}
+        markUnreadLoading={markingAsUnreadInProgress}
+      />
       <ChatMessageListComponent messages={messages} />
       <ChatSendMessage conversation={conversation} />
     </div>

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

@@ -1,6 +1,6 @@
 import { gql, useApolloClient, useQuery, useSubscription } from "@apollo/client";
 import axios from "axios";
-import { useCallback, useEffect, useState } from "react";
+import { useCallback, useEffect, useMemo, useState } from "react";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERSATION_SUBSCRIPTION_BY_PK, GET_CONVERSATION_DETAILS } from "../../graphql/conversations.queries";
@@ -18,8 +18,8 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
   const client = useApolloClient();
   const { socket } = useSocket();
   const [markingAsReadInProgress, setMarkingAsReadInProgress] = useState(false);
+  const [markingAsUnreadInProgress, setMarkingAsUnreadInProgress] = useState(false);
 
-  // Fetch conversation details
   const {
     loading: convoLoading,
     error: convoError,
@@ -27,24 +27,23 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
   } = useQuery(GET_CONVERSATION_DETAILS, {
     variables: { conversationId: selectedConversation },
     fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only"
+    nextFetchPolicy: "network-only",
+    skip: !selectedConversation
   });
 
-  // Subscription for conversation updates
+  const conversation = convoData?.conversations_by_pk;
+
+  // Subscription for conversation updates (used when socket is NOT connected)
   useSubscription(CONVERSATION_SUBSCRIPTION_BY_PK, {
-    skip: socket?.connected,
+    skip: socket?.connected || !selectedConversation,
     variables: { conversationId: selectedConversation },
     onData: ({ data: subscriptionResult, client }) => {
-      // Extract the messages array from the result
       const messages = subscriptionResult?.data?.messages;
-      if (!messages || messages.length === 0) {
-        console.warn("No messages found in subscription result.");
-        return;
-      }
+      if (!messages || messages.length === 0) return;
 
       messages.forEach((message) => {
         const messageRef = client.cache.identify(message);
-        // Write the new message to the cache
+
         client.cache.writeFragment({
           id: messageRef,
           fragment: gql`
@@ -64,7 +63,6 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
           data: message
         });
 
-        // Update the conversation cache to include the new message
         client.cache.modify({
           id: client.cache.identify({ __typename: "conversations", id: selectedConversation }),
           fields: {
@@ -82,6 +80,28 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     }
   });
 
+  /**
+   * Best-effort badge update:
+   * This assumes your list query uses messages_aggregate.aggregate.count as UNREAD inbound count.
+   * If it’s total messages, rename/create a dedicated unread aggregate in the list query and update that field instead.
+   */
+  const setConversationUnreadCountBestEffort = useCallback(
+    (conversationId, unreadCount) => {
+      if (!conversationId) return;
+
+      client.cache.modify({
+        id: client.cache.identify({ __typename: "conversations", id: conversationId }),
+        fields: {
+          messages_aggregate(existing) {
+            if (!existing?.aggregate) return existing;
+            return { ...existing, aggregate: { ...existing.aggregate, count: unreadCount } };
+          }
+        }
+      });
+    },
+    [client.cache]
+  );
+
   const updateCacheWithReadMessages = useCallback(
     (conversationId, messageIds) => {
       if (!conversationId || !messageIds?.length) return;
@@ -89,13 +109,34 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
       messageIds.forEach((messageId) => {
         client.cache.modify({
           id: client.cache.identify({ __typename: "messages", id: messageId }),
-          fields: {
-            read: () => true
-          }
+          fields: { read: () => true }
         });
       });
+
+      setConversationUnreadCountBestEffort(conversationId, 0);
     },
-    [client.cache]
+    [client.cache, setConversationUnreadCountBestEffort]
+  );
+
+  const applyUnreadStateWithMaxOneUnread = useCallback(
+    ({ conversationId, lastUnreadMessageId, messageIdsMarkedRead = [], unreadCount = 1 }) => {
+      if (!conversationId || !lastUnreadMessageId) return;
+
+      messageIdsMarkedRead.forEach((id) => {
+        client.cache.modify({
+          id: client.cache.identify({ __typename: "messages", id }),
+          fields: { read: () => true }
+        });
+      });
+
+      client.cache.modify({
+        id: client.cache.identify({ __typename: "messages", id: lastUnreadMessageId }),
+        fields: { read: () => false }
+      });
+
+      setConversationUnreadCountBestEffort(conversationId, unreadCount);
+    },
+    [client.cache, setConversationUnreadCountBestEffort]
   );
 
   // WebSocket event handlers
@@ -103,20 +144,25 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     if (!socket?.connected) return;
 
     const handleConversationChange = (data) => {
-      if (data.type === "conversation-marked-read") {
-        const { conversationId, messageIds } = data;
-        updateCacheWithReadMessages(conversationId, messageIds);
+      if (data?.type === "conversation-marked-read") {
+        updateCacheWithReadMessages(data.conversationId, data.messageIds);
+      }
+
+      if (data?.type === "conversation-marked-unread") {
+        applyUnreadStateWithMaxOneUnread({
+          conversationId: data.conversationId,
+          lastUnreadMessageId: data.lastUnreadMessageId,
+          messageIdsMarkedRead: data.messageIdsMarkedRead,
+          unreadCount: data.unreadCount
+        });
       }
     };
 
     socket.on("conversation-changed", handleConversationChange);
+    return () => socket.off("conversation-changed", handleConversationChange);
+  }, [socket, updateCacheWithReadMessages, applyUnreadStateWithMaxOneUnread]);
 
-    return () => {
-      socket.off("conversation-changed", handleConversationChange);
-    };
-  }, [socket, updateCacheWithReadMessages]);
-
-  // Join and leave conversation via WebSocket
+  // Join/leave conversation via WebSocket
   useEffect(() => {
     if (!socket?.connected || !selectedConversation || !bodyshop?.id) return;
 
@@ -133,15 +179,21 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     };
   }, [socket, bodyshop, selectedConversation]);
 
-  // Mark conversation as read
-  const handleMarkConversationAsRead = async () => {
-    if (!convoData || markingAsReadInProgress) return;
+  const inboundNonSystemMessages = useMemo(() => {
+    const msgs = conversation?.messages || [];
+    return msgs
+      .filter((m) => m && !m.isoutbound && !m.is_system)
+      .slice()
+      .sort((a, b) => new Date(a.created_at).getTime() - new Date(b.created_at).getTime());
+  }, [conversation?.messages]);
 
-    const conversation = convoData.conversations_by_pk;
-    if (!conversation) return;
+  const canMarkUnread = inboundNonSystemMessages.length > 0;
+
+  const handleMarkConversationAsRead = async () => {
+    if (!conversation || markingAsReadInProgress) return;
 
     const unreadMessageIds = conversation.messages
-      ?.filter((message) => !message.read && !message.isoutbound)
+      ?.filter((message) => !message.read && !message.isoutbound && !message.is_system)
       .map((message) => message.id);
 
     if (unreadMessageIds?.length > 0) {
@@ -162,12 +214,48 @@ function ChatConversationContainer({ bodyshop, selectedConversation }) {
     }
   };
 
+  const handleMarkLastMessageAsUnread = async () => {
+    if (!conversation || markingAsUnreadInProgress) return;
+    if (!bodyshop?.id || !bodyshop?.imexshopid) return;
+
+    const lastInbound = inboundNonSystemMessages[inboundNonSystemMessages.length - 1];
+    if (!lastInbound?.id) return;
+
+    setMarkingAsUnreadInProgress(true);
+    try {
+      const res = await axios.post("/sms/markLastMessageUnread", {
+        conversationId: conversation.id,
+        imexshopid: bodyshop.imexshopid,
+        bodyshopid: bodyshop.id
+      });
+
+      const payload = res?.data || {};
+      if (payload.lastUnreadMessageId) {
+        applyUnreadStateWithMaxOneUnread({
+          conversationId: conversation.id,
+          lastUnreadMessageId: payload.lastUnreadMessageId,
+          messageIdsMarkedRead: payload.messageIdsMarkedRead || [],
+          unreadCount: typeof payload.unreadCount === "number" ? payload.unreadCount : 1
+        });
+      } else {
+        setConversationUnreadCountBestEffort(conversation.id, 0);
+      }
+    } catch (error) {
+      console.error("Error marking last message unread:", error.message);
+    } finally {
+      setMarkingAsUnreadInProgress(false);
+    }
+  };
+
   return (
     <ChatConversationComponent
       subState={[convoLoading, convoError]}
-      conversation={convoData?.conversations_by_pk || {}}
-      messages={convoData?.conversations_by_pk?.messages || []}
+      conversation={conversation || {}}
+      messages={conversation?.messages || []}
       handleMarkConversationAsRead={handleMarkConversationAsRead}
+      handleMarkLastMessageAsUnread={handleMarkLastMessageAsUnread}
+      markingAsUnreadInProgress={markingAsUnreadInProgress}
+      canMarkUnread={canMarkUnread}
     />
   );
 }

client/src/components/chat-mark-unread-button/chat-mark-unread-button.component.jsx

@@ -0,0 +1,24 @@
+import { Button, Tooltip } from "antd";
+import { useTranslation } from "react-i18next";
+
+export default function ChatMarkUnreadButton({ disabled, loading, onMarkUnread }) {
+  const { t } = useTranslation();
+
+  return (
+    <Tooltip title={t("messaging.labels.mark_unread")}>
+      <Button
+        size="small"
+        className="unread-button"
+        type="primary"
+        children={t("messaging.labels.mark_unread")}
+        loading={loading}
+        disabled={disabled}
+        onMouseDown={(e) => e.stopPropagation()} // prevent parent mark-read handler
+        onClick={(e) => {
+          e.stopPropagation();
+          onMarkUnread?.();
+        }}
+      />
+    </Tooltip>
+  );
+}

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

@@ -10,6 +10,11 @@
   border-radius: 4px;
 }
 
+.unread-button {
+  height: 20px;
+  border-radius: 4px;
+}
+
 .chat-title {
   margin-bottom: 5px;
 }

client/src/components/chat-open-button/chat-open-button.component.jsx

@@ -19,30 +19,35 @@ const mapDispatchToProps = (dispatch) => ({
   openChatByPhone: (phone) => dispatch(openChatByPhone(phone))
 });
 
-export function ChatOpenButton({ bodyshop, searchingForConversation, phone, jobid, openChatByPhone }) {
+export function ChatOpenButton({ bodyshop, searchingForConversation, phone, type, jobid, openChatByPhone }) {
   const { t } = useTranslation();
   const { socket } = useSocket();
   const notification = useNotification();
 
   if (!phone) return <></>;
 
-  if (!bodyshop.messagingservicesid) return <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>;
+  if (!bodyshop.messagingservicesid) {
+    return <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>;
+  }
 
   return (
     <a
       href="# "
       onClick={(e) => {
+        e.preventDefault();
         e.stopPropagation();
+
+        if (searchingForConversation) return; // Prevent finding the same thing twice.
+
         const p = parsePhoneNumber(phone, "CA");
-        if (searchingForConversation) return; //This is to prevent finding the same thing twice.
         if (p && p.isValid()) {
-          openChatByPhone({ phone_num: p.formatInternational(), jobid: jobid, socket });
+          openChatByPhone({ phone_num: p.formatInternational(), jobid, socket });
         } else {
           notification["error"]({ message: t("messaging.error.invalidphone") });
         }
       }}
     >
-      <PhoneNumberFormatter>{phone}</PhoneNumberFormatter>
+      <PhoneNumberFormatter type={type}>{phone}</PhoneNumberFormatter>
     </a>
   );
 }

client/src/components/chat-popup/chat-popup.component.jsx

@@ -1,7 +1,7 @@
 import { InfoCircleOutlined, MessageOutlined, ShrinkOutlined, SyncOutlined } from "@ant-design/icons";
 import { useApolloClient, useLazyQuery, useQuery } from "@apollo/client";
 import { Badge, Card, Col, Row, Space, Tag, Tooltip, Typography } from "antd";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -27,32 +27,52 @@ const mapDispatchToProps = (dispatch) => ({
 
 export function ChatPopupComponent({ chatVisible, selectedConversation, toggleChatVisible }) {
   const { t } = useTranslation();
-  const [pollInterval, setPollInterval] = useState(0);
   const { socket } = useSocket();
-  const client = useApolloClient(); // Apollo Client instance for cache operations
+  const client = useApolloClient();
 
-  // Lazy query for conversations
-  const [getConversations, { loading, data, refetch }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
+  // When socket is connected, we do NOT poll (socket should push updates).
+  // When disconnected, we poll as a fallback.
+  const [pollInterval, setPollInterval] = useState(0);
+
+  // Ensure conversations query runs once on initial page load (component mount).
+  const hasLoadedConversationsOnceRef = useRef(false);
+
+  // Preserve the last known unread aggregate count so the badge doesn't "vanish"
+  // when UNREAD_CONVERSATION_COUNT gets skipped after socket connects.
+  const [unreadAggregateCount, setUnreadAggregateCount] = useState(0);
+
+  // Lazy query for conversations (executed manually)
+  const [getConversations, { loading, data, refetch, called }] = useLazyQuery(CONVERSATION_LIST_QUERY, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    skip: !chatVisible,
+    notifyOnNetworkStatusChange: true,
     ...(pollInterval > 0 ? { pollInterval } : {})
   });
 
-  // Query for unread count when chat is not visible
-  const { data: unreadData } = useQuery(UNREAD_CONVERSATION_COUNT, {
+  // Query for unread count when chat is not visible and socket is not connected.
+  // (Once socket connects, we stop this query; we keep the last known value in state.)
+  useQuery(UNREAD_CONVERSATION_COUNT, {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
-    pollInterval: 60 * 1000 // TODO: This is a fix for now, should be coming from sockets
+    skip: chatVisible || socket?.connected,
+    pollInterval: socket?.connected ? 0 : 60 * 1000,
+    onCompleted: (result) => {
+      const nextCount = result?.messages_aggregate?.aggregate?.count;
+      if (typeof nextCount === "number") setUnreadAggregateCount(nextCount);
+    },
+    onError: (err) => {
+      // Keep last known count; do not force badge to zero on transient failures
+      console.warn("UNREAD_CONVERSATION_COUNT failed:", err?.message || err);
+    }
   });
 
-  // Socket connection status
+  // Socket connection status -> polling strategy for CONVERSATION_LIST_QUERY
   useEffect(() => {
     const handleSocketStatus = () => {
       if (socket?.connected) {
-        setPollInterval(15 * 60 * 1000); // 15 minutes
+        setPollInterval(0); // skip polling if socket connected
       } else {
-        setPollInterval(60 * 1000); // 60 seconds
+        setPollInterval(60 * 1000); // fallback polling if disconnected
       }
     };
 
@@ -71,19 +91,32 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
     };
   }, [socket]);
 
-  // Fetch conversations when chat becomes visible
+  // Run conversations query exactly once on initial load (component mount)
   useEffect(() => {
-    if (chatVisible)
-      getConversations({
-        variables: {
-          offset: 0
-        }
-      }).catch((err) => {
-        console.error(`Error fetching conversations: ${(err, err.message || "")}`);
-      });
-  }, [chatVisible, getConversations]);
+    if (hasLoadedConversationsOnceRef.current) return;
 
-  // Get unread count from the cache
+    hasLoadedConversationsOnceRef.current = true;
+
+    getConversations({
+      variables: { offset: 0 }
+    }).catch((err) => {
+      console.error(`Error fetching conversations: ${err?.message || ""}`, err);
+    });
+  }, [getConversations]);
+
+  const handleManualRefresh = async () => {
+    try {
+      if (called && typeof refetch === "function") {
+        await refetch({ offset: 0 });
+      } else {
+        await getConversations({ variables: { offset: 0 } });
+      }
+    } catch (err) {
+      console.error(`Error refreshing conversations: ${err?.message || ""}`, err);
+    }
+  };
+
+  // Get unread count from the cache (preferred). Fallback to preserved aggregate count.
   const unreadCount = (() => {
     try {
       const cachedData = client.readQuery({
@@ -91,18 +124,23 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
         variables: { offset: 0 }
       });
 
-      if (!cachedData?.conversations) {
-        return unreadData?.messages_aggregate?.aggregate?.count;
+      const conversations = cachedData?.conversations;
+
+      if (!Array.isArray(conversations) || conversations.length === 0) {
+        return unreadAggregateCount;
       }
 
-      // Aggregate unread message count
-      return cachedData.conversations.reduce((total, conversation) => {
-        const unread = conversation.messages_aggregate?.aggregate?.count || 0;
+      const hasUnreadCounts = conversations.some((c) => c?.messages_aggregate?.aggregate?.count != null);
+      if (!hasUnreadCounts) {
+        return unreadAggregateCount;
+      }
+
+      return conversations.reduce((total, conversation) => {
+        const unread = conversation?.messages_aggregate?.aggregate?.count || 0;
         return total + unread;
       }, 0);
-    } catch (error) {
-      console.warn("Unread count not found in cache:", error);
-      return 0; // Fallback if not in cache
+    } catch {
+      return unreadAggregateCount;
     }
   })();
 
@@ -117,9 +155,12 @@ export function ChatPopupComponent({ chatVisible, selectedConversation, toggleCh
               <Tooltip title={t("messaging.labels.recentonly")}>
                 <InfoCircleOutlined />
               </Tooltip>
-              <SyncOutlined style={{ cursor: "pointer" }} onClick={() => refetch()} />
+
+              <SyncOutlined style={{ cursor: "pointer" }} onClick={handleManualRefresh} />
+
               {!socket?.connected && <Tag color="yellow">{t("messaging.labels.nopush")}</Tag>}
             </Space>
+
             <ShrinkOutlined
               onClick={() => toggleChatVisible()}
               style={{ position: "absolute", right: ".5rem", top: ".5rem" }}

client/src/components/contract-convert-to-ro/contract-convert-to-ro.component.jsx

@@ -133,6 +133,9 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       ownr_ln: contract.job.owner.ownr_ln,
       ownr_co_nm: contract.job.owner.ownr_co_nm,
       ownr_ph1: contract.job.owner.ownr_ph1,
+      ownr_ph2: contract.job.owner.ownr_ph2,
+      ownr_ph1_ty: contract.job.owner.ownr_ph1_ty,
+      ownr_ph2_ty: contract.job.owner.ownr_ph2_ty,
       ownr_ea: contract.job.owner.ownr_ea,
       v_model_desc: contract.job.vehicle && contract.job.vehicle.v_model_desc,
       v_model_yr: contract.job.vehicle && contract.job.vehicle.v_model_yr,
@@ -253,6 +256,10 @@ export function ContractConvertToRo({ bodyshop, currentUser, contract, disabled
       }
     };
 
+    if (currentUser?.email) {
+      newJob.created_user_email = currentUser.email;
+    }
+
     //Calcualte the new job totals.
 
     const newTotals = (

client/src/components/dashboard-components/scheduled-delivery-today/scheduled-delivery-today.component.jsx

@@ -256,9 +256,9 @@ export default function DashboardScheduledDeliveryToday({ data, ...cardProps })
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,6 +397,8 @@ export const DashboardScheduledDeliveryTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_delivery

client/src/components/dashboard-components/scheduled-in-today/scheduled-in-today.component.jsx

@@ -48,6 +48,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
         ownr_ln: item.job.ownr_ln,
         ownr_ph1: item.job.ownr_ph1,
         ownr_ph2: item.job.ownr_ph2,
+        ownr_ph1_ty: item.job.ownr_ph1_ty,
+        ownr_ph2_ty: item.job.ownr_ph2_ty,
         production_vars: item.job.production_vars,
         ro_number: item.job.ro_number,
         suspended: item.job.suspended,
@@ -264,8 +266,8 @@ export default function DashboardScheduledInToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -400,6 +402,8 @@ export const DashboardScheduledInTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       suspended

client/src/components/dashboard-components/scheduled-out-today/scheduled-out-today.component.jsx

@@ -256,9 +256,9 @@ export default function DashboardScheduledOutToday({ data, ...cardProps }) {
       responsive: ["md"],
       render: (text, record) => (
         <Space size="small" wrap>
-          <ChatOpenButton phone={record.ownr_ph1} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.jobid} />
 
-          <ChatOpenButton phone={record.ownr_ph2} jobid={record.jobid} />
+          <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.jobid} />
         </Space>
       )
     },
@@ -397,6 +397,8 @@ export const DashboardScheduledOutTodayGql = `
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       production_vars
       ro_number
       scheduled_completion

client/src/components/document-editor/document-editor-local.component.jsx

@@ -0,0 +1,166 @@
+import axios from "axios";
+import { Result } from "antd";
+import * as markerjs2 from "markerjs2";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
+import { handleUpload } from "../documents-local-upload/documents-local-upload.utility";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
+const mapStateToProps = createStructuredSelector({
+  currentUser: selectCurrentUser,
+  bodyshop: selectBodyshop
+});
+const mapDispatchToProps = () => ({});
+
+export function DocumentEditorLocalComponent({ imageUrl, filename, jobid }) {
+  const imgRef = useRef(null);
+  const [loading, setLoading] = useState(false);
+  const [uploaded, setuploaded] = useState(false);
+  const [loadedImageUrl, setLoadedImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
+  const markerArea = useRef(null);
+  const { t } = useTranslation();
+  const notification = useNotification();
+  const [uploading, setUploading] = useState(false);
+
+  const triggerUpload = useCallback(
+    async (dataUrl) => {
+      if (uploading) return;
+      setUploading(true);
+      const blob = await b64toBlob(dataUrl);
+      const nameWithoutExt = filename.split(".").slice(0, -1).join(".").trim();
+      const parts = nameWithoutExt.split("-");
+      const baseParts = [];
+      for (let i = 0; i < parts.length; i++) {
+        if (/^\d+$/.test(parts[i])) {
+          break;
+        }
+        baseParts.push(parts[i]);
+      }
+      const adjustedBase = baseParts.length > 0 ? baseParts.join("-") : "edited";
+      const adjustedFilename = `${adjustedBase}.jpg`;
+      const file = new File([blob], adjustedFilename, { type: "image/jpeg" });
+
+      handleUpload({
+        ev: {
+          file: file,
+          filename: adjustedFilename,
+          onSuccess: () => {
+            setUploading(false);
+            setLoading(false);
+            setuploaded(true);
+          },
+          onError: () => {
+            setUploading(false);
+            setLoading(false);
+          }
+        },
+        context: {
+          jobid: jobid,
+          callback: () => {} // Optional callback
+        },
+        notification
+      });
+    },
+    [filename, jobid, notification, uploading]
+  );
+
+  useEffect(() => {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
+      // create a marker.js MarkerArea
+      markerArea.current = new markerjs2.MarkerArea(imgRef.current);
+
+      // attach an event handler to assign annotated image back to our image element
+      markerArea.current.addEventListener("close", () => {
+        // NO OP
+      });
+
+      markerArea.current.addEventListener("render", (event) => {
+        const dataUrl = event.dataUrl;
+        imgRef.current.src = dataUrl;
+        markerArea.current.close();
+        triggerUpload(dataUrl);
+      });
+      // launch marker.js
+
+      markerArea.current.renderAtNaturalSize = true;
+      markerArea.current.renderImageType = "image/jpeg";
+      markerArea.current.renderImageQuality = 1;
+      //markerArea.current.settings.displayMode = "inline";
+      markerArea.current.show();
+    }
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!imageUrl) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.get(imageUrl, { responseType: "blob", signal: controller.signal });
+        const blobUrl = URL.createObjectURL(response.data);
+        setLoadedImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch image blob", error);
+      } finally {
+        if (!controller.signal.aborted) {
+          setImageLoading(false);
+        }
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [imageUrl]);
+
+  useEffect(() => {
+    return () => {
+      if (loadedImageUrl) {
+        URL.revokeObjectURL(loadedImageUrl);
+      }
+    };
+  }, [loadedImageUrl]);
+
+  async function b64toBlob(url) {
+    const res = await fetch(url);
+    return await res.blob();
+  }
+
+  return (
+    <div>
+      {!loading && !uploaded && loadedImageUrl && (
+        <img
+          ref={imgRef}
+          src={loadedImageUrl}
+          alt="sample"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load image", error);
+          }}
+          style={{ maxWidth: "90vw", maxHeight: "90vh" }}
+        />
+      )}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
+      {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
+    </div>
+  );
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(DocumentEditorLocalComponent);

client/src/components/document-editor/document-editor.component.jsx

@@ -1,4 +1,5 @@
 //import "tui-image-editor/dist/tui-image-editor.css";
+import axios from "axios";
 import { Result } from "antd";
 import * as markerjs2 from "markerjs2";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -6,8 +7,7 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
-import { handleUpload } from "../documents-upload/documents-upload.utility";
-import { GenerateSrcUrl } from "../jobs-documents-gallery/job-documents.utility";
+import { handleUpload } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility.js";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
@@ -23,6 +23,9 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   const imgRef = useRef(null);
   const [loading, setLoading] = useState(false);
   const [uploaded, setuploaded] = useState(false);
+  const [imageUrl, setImageUrl] = useState(null);
+  const [imageLoaded, setImageLoaded] = useState(false);
+  const [imageLoading, setImageLoading] = useState(true);
   const markerArea = useRef(null);
   const { t } = useTranslation();
   const notification = useNotification();
@@ -55,7 +58,7 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
   );
 
   useEffect(() => {
-    if (imgRef.current !== null) {
+    if (imgRef.current !== null && imageLoaded && !markerArea.current) {
       // create a marker.js MarkerArea
       markerArea.current = new markerjs2.MarkerArea(imgRef.current);
 
@@ -78,7 +81,52 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
       //markerArea.current.settings.displayMode = "inline";
       markerArea.current.show();
     }
-  }, [triggerUpload]);
+  }, [triggerUpload, imageLoaded]);
+
+  useEffect(() => {
+    if (!document?.id) return;
+    const controller = new AbortController();
+
+    const loadImage = async () => {
+      setImageLoaded(false);
+      setImageLoading(true);
+      try {
+        const response = await axios.post(
+          "/media/imgproxy/original",
+          { documentId: document.id },
+          {
+            responseType: "blob",
+            signal: controller.signal
+          }
+        );
+        const blobUrl = URL.createObjectURL(response.data);
+        setImageUrl((prevUrl) => {
+          if (prevUrl) URL.revokeObjectURL(prevUrl);
+          return blobUrl;
+        });
+      } catch (error) {
+        if (axios.isCancel?.(error) || error.name === "CanceledError") {
+          // request was aborted — safe to ignore
+          return;
+        }
+        console.error("Failed to fetch original image blob", error);
+      } finally {
+        setImageLoading(false);
+      }
+    };
+    loadImage();
+    return () => {
+      controller.abort();
+    };
+  }, [document]);
+
+  useEffect(() => {
+    return () => {
+      if (imageUrl) {
+        URL.revokeObjectURL(imageUrl);
+      }
+    };
+  }, [imageUrl]);
 
   async function b64toBlob(url) {
     const res = await fetch(url);
@@ -87,16 +135,21 @@ export function DocumentEditorComponent({ currentUser, bodyshop, document }) {
 
   return (
     <div>
-      {!loading && !uploaded && (
+      {!loading && !uploaded && imageUrl && (
         <img
           ref={imgRef}
-          src={GenerateSrcUrl(document)}
+          src={imageUrl}
           alt="sample"
-          crossOrigin="anonymous"
+          onLoad={() => setImageLoaded(true)}
+          onError={(error) => {
+            console.error("Failed to load original image", error);
+          }}
           style={{ maxWidth: "90vw", maxHeight: "90vh" }}
         />
       )}
-      {loading && <LoadingSpinner message={t("documents.labels.uploading")} />}
+      {(loading || imageLoading || !imageLoaded) && !uploaded && (
+        <LoadingSpinner message={t("documents.labels.uploading")} />
+      )}
       {uploaded && <Result status="success" title={t("documents.successes.edituploaded")} />}
     </div>
   );

client/src/components/document-editor/document-editor.container.jsx

@@ -11,6 +11,7 @@ import { setBodyshop } from "../../redux/user/user.actions";
 import AlertComponent from "../alert/alert.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import DocumentEditor from "./document-editor.component";
+import { DocumentEditorLocalComponent } from "./document-editor-local.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBodyshop: (bs) => dispatch(setBodyshop(bs))
@@ -21,7 +22,7 @@ export default connect(null, mapDispatchToProps)(DocumentEditorContainer);
 export function DocumentEditorContainer({ setBodyshop }) {
   //Get the image details for the image to be saved.
   //Get the document id from the search string.
-  const { documentId } = queryString.parse(useLocation().search);
+  const { documentId, imageUrl, filename, jobid } = queryString.parse(useLocation().search);
   const { t } = useTranslation();
   const {
     loading: loadingShop,
@@ -32,24 +33,45 @@ export function DocumentEditorContainer({ setBodyshop }) {
     nextFetchPolicy: "network-only"
   });
 
-  useEffect(() => {
-    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
-  }, [dataShop, setBodyshop]);
+  const isLocalMedia = !!dataShop?.bodyshops?.[0]?.uselocalmediaserver;
 
-  const { loading, error, data } = useQuery(GET_DOCUMENT_BY_PK, {
+  const {
+    loading: loadingDoc,
+    error: errorDoc,
+    data: dataDoc
+  } = useQuery(GET_DOCUMENT_BY_PK, {
     variables: { documentId },
-    skip: !documentId,
+    skip: !documentId || isLocalMedia,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
 
-  if (loading || loadingShop) return <LoadingSpinner />;
-  if (error || errorShop) return <AlertComponent message={error.message || errorShop.message} type="error" />;
+  useEffect(() => {
+    if (dataShop) setBodyshop(dataShop.bodyshops[0]);
+  }, [dataShop, setBodyshop]);
 
-  if (!data || !data.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
+  if (loadingShop) return <LoadingSpinner />;
+  if (errorShop) return <AlertComponent message={errorShop.message} type="error" />;
+
+  if (isLocalMedia) {
+    if (imageUrl && filename && jobid) {
+      return (
+        <div>
+          <DocumentEditorLocalComponent imageUrl={imageUrl} filename={filename} jobid={jobid} />
+        </div>
+      );
+    } else {
+      return <Result status="404" title={t("general.errors.notfound")} />;
+    }
+  }
+
+  if (loadingDoc) return <LoadingSpinner />;
+  if (errorDoc) return <AlertComponent message={errorDoc.message} type="error" />;
+
+  if (!dataDoc || !dataDoc.documents_by_pk) return <Result status="404" title={t("general.errors.notfound")} />;
   return (
     <div>
-      <DocumentEditor document={data ? data.documents_by_pk : null} />
+      <DocumentEditor document={dataDoc ? dataDoc.documents_by_pk : null} />
     </div>
   );
 }

client/src/components/global-search/global-search-os.component.jsx

@@ -73,8 +73,8 @@ export default function GlobalSearchOs() {
                       <span>
                         <OwnerNameDisplay ownerObject={owner} />
                       </span>
-                      <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                      <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                      <PhoneNumberFormatter type={owner?.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                     </Space>
                   </Link>
                 )

client/src/components/global-search/global-search.component.jsx

@@ -63,8 +63,8 @@ export default function GlobalSearch() {
                     <span>
                       <OwnerNameDisplay ownerObject={owner} />
                     </span>
-                    <PhoneNumberFormatter>{owner.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{owner.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph1_ty}>{owner.ownr_ph1}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={owner.ownr_ph2_ty}>{owner.ownr_ph2}</PhoneNumberFormatter>
                   </Space>
                 </Link>
               )

client/src/components/job-at-change/schedule-event.component.jsx

@@ -220,10 +220,10 @@ export function ScheduleEventComponent({
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ea")}>{(event.job && event.job.ownr_ea) || ""}</DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph1")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph1} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph1} type={event?.job?.ownr_ph1_ty} jobid={event.job.id} />
           </DataLabel>
           <DataLabel label={t("jobs.fields.ownr_ph2")}>
-            <ChatOpenButton phone={event.job && event.job.ownr_ph2} jobid={event.job.id} />
+            <ChatOpenButton phone={event?.job?.ownr_ph2} type={event?.job?.ownr_ph2_ty} jobid={event.job.id} />
           </DataLabel>
           <DataLabel hideIfNull label={t("jobs.fields.loss_of_use")}>
             {(event.job && event.job.loss_of_use) || ""}

client/src/components/job-create-iou/job-create-iou.component.jsx

@@ -43,16 +43,18 @@ export function JobCreateIOU({ bodyshop, currentUser, job, selectedJobLines, tec
   const handleCreateIou = async () => {
     setLoading(true);
     //Query all of the job details to recreate.
-    const iouId = await CreateIouForJob(
-      client,
-      job.id,
-      {
+    const iouId = await CreateIouForJob({
+      apolloClient: client,
+      jobLinesToKeep: selectedJobLines,
+      jobId: job.id,
+      config: {
         status: bodyshop.md_ro_statuses.default_open,
         bodyshopid: bodyshop.id,
         useremail: currentUser.email
       },
-      selectedJobLines
-    );
+      currentUser
+    });
+
     notification.open({
       type: "success",
       message: t("jobs.successes.ioucreated"),

client/src/components/job-detail-cards/job-detail-cards.documents.component.jsx

@@ -1,13 +1,21 @@
 import { Carousel } from "antd";
+import { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
-import { GenerateThumbUrl } from "../jobs-documents-gallery/job-documents.utility";
+import { fetchImgproxyThumbnails } from "../jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component";
 import UpsellComponent, { upsellEnum } from "../upsell/upsell.component";
 import CardTemplate from "./job-detail-cards.template.component";
 
 export default function JobDetailCardsDocumentsComponent({ loading, data, bodyshop }) {
   const { t } = useTranslation();
   const hasMediaAccess = HasFeatureAccess({ bodyshop, featureName: "media" });
+  const [thumbnails, setThumbnails] = useState([]);
+
+  useEffect(() => {
+    if (data?.id) {
+      fetchImgproxyThumbnails({ setStateCallback: setThumbnails, jobId: data.id, imagesOnly: true });
+    }
+  }, [data?.id]);
 
   if (!data)
     return (
@@ -22,18 +30,19 @@ export default function JobDetailCardsDocumentsComponent({ loading, data, bodysh
       title={t("jobs.labels.cards.documents")}
       extraLink={`/manage/jobs/${data.id}?tab=documents`}
     >
-      {!hasMediaAccess && (
-        <UpsellComponent disableMask upsell={upsellEnum().media.general}>
-          {data.documents.length > 0 ? (
+      {!hasMediaAccess && <UpsellComponent disableMask upsell={upsellEnum().media.general} />}
+      {hasMediaAccess && (
+        <>
+          {thumbnails.length > 0 ? (
             <Carousel autoplay>
-              {data.documents.map((item) => (
-                <img key={item.id} src={GenerateThumbUrl(item)} alt={item.name} />
+              {thumbnails.map((item) => (
+                <img key={item.id} src={item.src} alt={item.filename} />
               ))}
             </Carousel>
           ) : (
             <div>{t("documents.errors.nodocuments")}</div>
           )}
-        </UpsellComponent>
+        </>
       )}
     </CardTemplate>
   );

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -9,10 +9,10 @@ import {
   WarningFilled
 } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useMutation } from "@apollo/client";
-import { Button, Dropdown, Input, Space, Table, Tag } from "antd";
+import { gql, useMutation } from "@apollo/client";
+import { Button, Dropdown, Input, Modal, Select, Space, Table, Tag, Typography } from "antd";
 import axios from "axios";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -47,6 +47,19 @@ import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+
+const UPDATE_JOB_LINES_LOCATION_BULK = gql`
+  mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
+    update_joblines(where: { id: { _in: $ids } }, _set: { location: $location }) {
+      affected_rows
+      returning {
+        id
+        location
+      }
+    }
+  }
+`;
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -83,6 +96,9 @@ export function JobLinesComponent({
   isPartsEntry
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
+  const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
+  const notification = useNotification();
+
   const {
     treatments: { Enhanced_Payroll }
   } = useSplitTreatments({
@@ -103,9 +119,83 @@ export function JobLinesComponent({
     }
   });
 
+  // Bulk location modal state
+  const [bulkLocationOpen, setBulkLocationOpen] = useState(false);
+  const [bulkLocation, setBulkLocation] = useState(null);
+  const [bulkLocationSaving, setBulkLocationSaving] = useState(false);
+
   const { t } = useTranslation();
   const jobIsPrivate = bodyshop.md_ins_cos.find((c) => c.name === job.ins_co_nm)?.private;
 
+  const selectedLineIds = useMemo(() => selectedLines.map((l) => l?.id).filter(Boolean), [selectedLines]);
+
+  const commonSelectedLocation = useMemo(() => {
+    const locs = selectedLines
+      .map((l) => (typeof l?.location === "string" ? l.location : ""))
+      .map((x) => x.trim())
+      .filter(Boolean);
+
+    if (locs.length === 0) return null;
+
+    const uniq = _.uniq(locs);
+    return uniq.length === 1 ? uniq[0] : null;
+  }, [selectedLines]);
+
+  const openBulkLocationModal = () => {
+    setBulkLocation(commonSelectedLocation);
+    setBulkLocationOpen(true);
+    logImEXEvent("joblines_bulk_location_open", { count: selectedLineIds.length });
+  };
+
+  const closeBulkLocationModal = () => {
+    setBulkLocationOpen(false);
+    setBulkLocation(null);
+  };
+
+  const saveBulkLocation = async () => {
+    if (selectedLineIds.length === 0) return;
+
+    setBulkLocationSaving(true);
+
+    try {
+      const locationToSave = (bulkLocation ?? "").toString();
+
+      const result = await bulkUpdateLocations({
+        variables: {
+          ids: selectedLineIds,
+          location: locationToSave
+        }
+      });
+
+      if (!result?.errors) {
+        // Keep UI selection consistent without waiting for refetch
+        setSelectedLines((prev) =>
+          prev.map((l) => (l && selectedLineIds.includes(l.id) ? { ...l, location: locationToSave } : l))
+        );
+
+        notification["success"]({ message: t("joblines.successes.saved") });
+
+        logImEXEvent("joblines_bulk_location_saved", {
+          count: selectedLineIds.length,
+          location: locationToSave
+        });
+
+        closeBulkLocationModal();
+        if (refetch) refetch();
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.saving", { error: JSON.stringify(result.errors) })
+        });
+      }
+    } catch (error) {
+      notification["error"]({
+        message: t("joblines.errors.saving", { error: error?.message || String(error) })
+      });
+    } finally {
+      setBulkLocationSaving(false);
+    }
+  };
+
   const columns = [
     {
       title: "#",
@@ -171,46 +261,16 @@ export function JobLinesComponent({
             ? ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG", "PAO"]
             : ["PAN", "PAC", "PAR", "PAL", "PAA", "PAM", "PAP", "PAS", "PASL", "PAG"]
         },
-        {
-          text: t("joblines.fields.part_types.PAN"),
-          value: ["PAN"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAP"),
-          value: ["PAP"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAL"),
-          value: ["PAL"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAA"),
-          value: ["PAA"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAG"),
-          value: ["PAG"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAS"),
-          value: ["PAS"]
-        },
-        {
-          text: t("joblines.fields.part_types.PASL"),
-          value: ["PASL"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAC"),
-          value: ["PAC"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAR"),
-          value: ["PAR"]
-        },
-        {
-          text: t("joblines.fields.part_types.PAM"),
-          value: ["PAM"]
-        },
+        { text: t("joblines.fields.part_types.PAN"), value: ["PAN"] },
+        { text: t("joblines.fields.part_types.PAP"), value: ["PAP"] },
+        { text: t("joblines.fields.part_types.PAL"), value: ["PAL"] },
+        { text: t("joblines.fields.part_types.PAA"), value: ["PAA"] },
+        { text: t("joblines.fields.part_types.PAG"), value: ["PAG"] },
+        { text: t("joblines.fields.part_types.PAS"), value: ["PAS"] },
+        { text: t("joblines.fields.part_types.PASL"), value: ["PASL"] },
+        { text: t("joblines.fields.part_types.PAC"), value: ["PAC"] },
+        { text: t("joblines.fields.part_types.PAR"), value: ["PAR"] },
+        { text: t("joblines.fields.part_types.PAM"), value: ["PAM"] },
         ...(isPartsEntry
           ? [
               {
@@ -220,7 +280,6 @@ export function JobLinesComponent({
             ]
           : [])
       ],
-
       onFilter: (value, record) => value.includes(record.part_type),
       render: (text, record) => (record.part_type ? t(`joblines.fields.part_types.${record.part_type}`) : null)
     },
@@ -246,7 +305,6 @@ export function JobLinesComponent({
             title: t("joblines.fields.mod_lbr_ty"),
             dataIndex: "mod_lbr_ty",
             key: "mod_lbr_ty",
-
             sorter: (a, b) => alphaSort(a.mod_lbr_ty, b.mod_lbr_ty),
             sortOrder: state.sortedInfo.columnKey === "mod_lbr_ty" && state.sortedInfo.order,
             render: (text, record) => (record.mod_lbr_ty ? t(`joblines.fields.lbr_types.${record.mod_lbr_ty}`) : null)
@@ -255,7 +313,6 @@ export function JobLinesComponent({
             title: t("joblines.fields.mod_lb_hrs"),
             dataIndex: "mod_lb_hrs",
             key: "mod_lb_hrs",
-
             sorter: (a, b) => a.mod_lb_hrs - b.mod_lb_hrs,
             sortOrder: state.sortedInfo.columnKey === "mod_lb_hrs" && state.sortedInfo.order
           },
@@ -310,18 +367,12 @@ export function JobLinesComponent({
       sorter: (a, b) => alphaSort(a.status, b.status),
       sortOrder: state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       filteredValue: state.filteredInfo.status || null,
-
       filters:
         (jobLines &&
           jobLines
             .map((l) => l.status)
             .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || t("dashboard.errors.status"),
-                value: [s]
-              };
-            })) ||
+            .map((s) => ({ text: s || t("dashboard.errors.status"), value: [s] }))) ||
         [],
       onFilter: (value, record) => value.includes(record.status),
       render: (text, record) => <JobLineStatusPopup jobline={record} disabled={jobRO} />
@@ -376,9 +427,7 @@ export function JobLinesComponent({
                           });
                         }
                       });
-                      await axios.post("/job/totalsssu", {
-                        id: job.id
-                      });
+                      await axios.post("/job/totalsssu", { id: job.id });
                       if (refetch) refetch();
                     }}
                   >
@@ -448,6 +497,36 @@ export function JobLinesComponent({
   return (
     <div>
       <PartsOrderModalContainer />
+
+      <Modal
+        open={bulkLocationOpen}
+        title={t("joblines.actions.updatelocation")}
+        onCancel={closeBulkLocationModal}
+        onOk={saveBulkLocation}
+        okButtonProps={{
+          disabled: jobRO || technician || selectedLineIds.length === 0,
+          loading: bulkLocationSaving
+        }}
+        destroyOnHidden
+      >
+        <Space direction="vertical" style={{ width: "100%" }}>
+          <Typography.Text type="secondary">
+            {t("general.labels.selected")}: {selectedLineIds.length}
+          </Typography.Text>
+
+          <Select
+            allowClear
+            placeholder={t("joblines.fields.location")}
+            value={bulkLocation}
+            style={{ width: "100%" }}
+            popupMatchSelectWidth={false}
+            onChange={(val) => setBulkLocation(val ?? null)}
+            options={(bodyshop?.md_parts_locations || []).map((loc) => ({ label: loc, value: loc }))}
+          />
+          <Typography.Text type="secondary">{t("joblines.labels.bulk_location_help")}</Typography.Text>
+        </Space>
+      </Modal>
+
       {!technician && (
         <PartsOrderDrawer
           job={job}
@@ -457,6 +536,7 @@ export function JobLinesComponent({
           setTaskUpsertContext={setTaskUpsertContext}
         />
       )}
+
       <PageHeader
         title={t("jobs.labels.estimatelines")}
         extra={
@@ -465,6 +545,16 @@ export function JobLinesComponent({
               <SyncOutlined />
             </Button>
 
+            {/* Bulk Update Location */}
+            <Button
+              id="job-lines-bulk-update-location-button"
+              disabled={jobRO || technician || selectedLineIds.length === 0}
+              onClick={openBulkLocationModal}
+            >
+              {t("joblines.actions.updatelocation")}
+              {selectedLineIds.length > 0 && ` (${selectedLineIds.length})`}
+            </Button>
+
             {job.special_coverage_policy && (
               <Tag color="tomato">
                 <Space>
@@ -473,6 +563,7 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
+
             {!isPartsEntry && (
               <JobLineDispatchButton
                 selectedLines={selectedLines}
@@ -481,9 +572,11 @@ export function JobLinesComponent({
                 disabled={technician}
               />
             )}
+
             {Enhanced_Payroll.treatment === "on" && (
               <JobLineBulkAssignComponent selectedLines={selectedLines} setSelectedLines={setSelectedLines} job={job} />
             )}
+
             {!isPartsEntry && (
               <Button
                 disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -499,27 +592,20 @@ export function JobLinesComponent({
                         isinhouse: true,
                         date: dayjs(),
                         total: 0,
-                        billlines: selectedLines.map((p) => {
-                          return {
-                            joblineid: p.id,
-                            actual_price: p.act_price,
-                            actual_cost: 0, //p.act_price,
-                            line_desc: p.line_desc,
-                            line_remarks: p.line_remarks,
-                            part_type: p.part_type,
-                            quantity: p.quantity || 1,
-                            applicable_taxes: {
-                              local: false,
-                              state: false,
-                              federal: false
-                            }
-                          };
-                        })
+                        billlines: selectedLines.map((p) => ({
+                          joblineid: p.id,
+                          actual_price: p.act_price,
+                          actual_cost: 0,
+                          line_desc: p.line_desc,
+                          line_remarks: p.line_remarks,
+                          part_type: p.part_type,
+                          quantity: p.quantity || 1,
+                          applicable_taxes: { local: false, state: false, federal: false }
+                        }))
                       }
                     }
                   });
 
-                  //Clear out the selected lines. IO-785
                   setSelectedLines([]);
                 }}
               >
@@ -528,6 +614,7 @@ export function JobLinesComponent({
                 {selectedLines.length > 0 && ` (${selectedLines.length})`}
               </Button>
             )}
+
             <Button
               id="job-lines-order-parts-button"
               disabled={(job && !job.converted) || (selectedLines.length > 0 ? false : true) || jobRO || technician}
@@ -544,13 +631,13 @@ export function JobLinesComponent({
                   }
                 });
 
-                //Clear out the selected lines. IO-785
                 setSelectedLines([]);
               }}
             >
               {t("parts.actions.order")}
               {selectedLines.length > 0 && ` (${selectedLines.length})`}
             </Button>
+
             {!isPartsEntry && (
               <Button
                 id="job-lines-filter-parts-only-button"
@@ -567,9 +654,11 @@ export function JobLinesComponent({
                 <FilterFilled /> {t("jobs.actions.filterpartsonly")}
               </Button>
             )}
+
             <Dropdown menu={markMenu} trigger={["click"]}>
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
+
             {!isPartsEntry && (
               <Button
                 disabled={jobRO || technician}
@@ -583,9 +672,12 @@ export function JobLinesComponent({
                 {t("joblines.actions.new")}
               </Button>
             )}
+
             {!isPartsEntry &&
               InstanceRenderManager({ rome: <JobSendPartPriceChangeComponent job={job} disabled={technician} /> })}
+
             <JobCreateIOU job={job} selectedJobLines={selectedLines} />
+
             <Input.Search
               placeholder={t("general.labels.search")}
               onChange={(e) => {
@@ -596,6 +688,7 @@ export function JobLinesComponent({
           </Space>
         }
       />
+
       <Table
         columns={columns}
         rowKey="id"
@@ -603,9 +696,7 @@ export function JobLinesComponent({
         pagination={false}
         dataSource={jobLines}
         onChange={handleTableChange}
-        scroll={{
-          x: true
-        }}
+        scroll={{ x: true }}
         expandable={{
           expandedRowRender: (record) =>
             isPartsEntry ? (
@@ -614,7 +705,6 @@ export function JobLinesComponent({
               <JobLinesExpander jobline={record} jobid={job.id} />
             ),
           rowExpandable: () => true,
-          //expandRowByClick: true,
           expandIcon: ({ expanded, onExpand, record }) =>
             expanded ? (
               <MinusCircleTwoTone onClick={(e) => onExpand(record, e)} />
@@ -627,17 +717,15 @@ export function JobLinesComponent({
               />
             )
         }}
-        onRow={(record) => {
-          return {
-            onDoubleClick: () => {
-              logImEXEvent("joblines_double_click_select", {});
-              const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
-              notMatchingLines.length !== selectedLines.length
-                ? setSelectedLines(notMatchingLines)
-                : setSelectedLines([...selectedLines, record]);
-            } // double click row
-          };
-        }}
+        onRow={(record) => ({
+          onDoubleClick: () => {
+            logImEXEvent("joblines_double_click_select", {});
+            const notMatchingLines = selectedLines.filter((i) => i.id !== record.id);
+            notMatchingLines.length !== selectedLines.length
+              ? setSelectedLines(notMatchingLines)
+              : setSelectedLines([...selectedLines, record]);
+          }
+        })}
         rowSelection={{
           selectedRowKeys: selectedLines.map((item) => item && item.id),
           onSelectAll: (selected, selectedRows) => {

client/src/components/job-line-location-popup/job-line-location-popup.component.jsx

@@ -1,25 +1,23 @@
 import { useMutation } from "@apollo/client";
-import { Select, Space } from "antd";
-import { useEffect, useState } from "react";
+import { Select, Space, Tag } from "antd";
+import { useEffect, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
+const mapDispatchToProps = () => ({});
+
+const CLEAR_VALUE = "__CLEAR_LOCATION__";
 
 export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
   const [editing, setEditing] = useState(false);
-  const [loading, setLoading] = useState(false);
+  const [saving, setSaving] = useState(false);
   const [location, setLocation] = useState(jobline.location);
   const [updateJob] = useMutation(UPDATE_JOB_LINE);
   const { t } = useTranslation();
@@ -29,55 +27,78 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
     if (editing) setLocation(jobline.location);
   }, [editing, jobline.location]);
 
-  const handleChange = (e) => {
-    setLocation(e);
-  };
+  const options = useMemo(() => {
+    const locs = bodyshop?.md_parts_locations || [];
+    return [
+      { label: t("general.labels.none", "No location"), value: CLEAR_VALUE },
+      ...locs.map((loc) => ({ label: loc, value: loc }))
+    ];
+  }, [bodyshop?.md_parts_locations, t]);
 
-  const handleSave = async () => {
-    setLoading(true);
-    const result = await updateJob({
-      variables: { lineId: jobline.id, line: { location: location || "" } }
-    });
+  const saveLocation = async (nextLocation) => {
+    setSaving(true);
 
-    if (!result.errors) {
-      notification["success"]({ message: t("joblines.successes.saved") });
-    } else {
-      notification["error"]({
-        message: t("joblines.errors.saving", {
-          error: JSON.stringify(result.errors)
-        })
+    try {
+      const result = await updateJob({
+        variables: { lineId: jobline.id, line: { location: nextLocation || "" } }
       });
+
+      if (!result.errors) {
+        notification["success"]({ message: t("joblines.successes.saved") });
+      } else {
+        notification["error"]({
+          message: t("joblines.errors.saving", {
+            error: JSON.stringify(result.errors)
+          })
+        });
+      }
+    } catch (error) {
+      notification["error"]({
+        message: t("joblines.errors.saving", { error: error?.message || String(error) })
+      });
+    } finally {
+      setSaving(false);
+      setEditing(false);
     }
-    setLoading(false);
-    setEditing(false);
   };
 
-  if (editing)
+  const handleChange = async (value) => {
+    const next = value === CLEAR_VALUE ? null : value;
+    setLocation(next);
+    await saveLocation(next);
+  };
+
+  if (editing) {
     return (
-      <div>
-        <LoadingSpinner loading={loading}>
-          <Select
-            autoFocus
-            allowClear
-            popupMatchSelectWidth={100}
-            value={location}
-            onClear={() => setLocation(null)}
-            onSelect={handleChange}
-            onBlur={handleSave}
-          >
-            {bodyshop.md_parts_locations.map((loc, idx) => (
-              <Select.Option key={idx} value={loc}>
-                {loc}
-              </Select.Option>
-            ))}
-          </Select>
-        </LoadingSpinner>
+      <div style={{ width: "100%", display: "flex", alignItems: "center" }}>
+        <Select
+          autoFocus
+          size="small"
+          value={location ?? undefined}
+          loading={saving}
+          disabled={saving}
+          style={{ flex: 1, minWidth: 0 }}
+          popupMatchSelectWidth={false}
+          getPopupContainer={(triggerNode) => triggerNode.parentNode}
+          onChange={handleChange}
+          onBlur={() => !saving && setEditing(false)}
+          options={options}
+        />
       </div>
     );
+  }
+
   return (
-    <div style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }} onClick={() => !disabled && setEditing(true)}>
+    <div
+      style={{ width: "100%", minHeight: "2rem", cursor: disabled ? "default" : "pointer" }}
+      onClick={() => !disabled && setEditing(true)}
+    >
       <Space wrap>
-        {jobline.location}
+        {jobline.location ? (
+          <Tag>{jobline.location}</Tag>
+        ) : (
+          <span style={{ opacity: 0.6 }}>{t("general.labels.none")}</span>
+        )}
         {jobline.parts_dispatch_lines?.length > 0 && "-Disp"}
       </Space>
     </div>

client/src/components/job-parts-received/job-parts-received.component.jsx

@@ -0,0 +1,105 @@
+import { useCallback, useMemo, useState } from "react";
+import PropTypes from "prop-types";
+import { Popover } from "antd";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
+import { useTranslation } from "react-i18next";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop
+});
+
+/**
+ * Displays "Parts Received" summary (modeled after the Production Board List column),
+ * and on click shows a popover with the Parts Status grid (existing JobPartsQueueCount UI).
+ * @param bodyshop
+ * @param parts
+ * @param displayMode
+ * @param popoverPlacement
+ * @returns {JSX.Element}
+ * @constructor
+ */
+export function JobPartsReceived({ bodyshop, parts, displayMode = "full", popoverPlacement = "top" }) {
+  const [open, setOpen] = useState(false);
+  const { t } = useTranslation();
+
+  const summary = useMemo(() => {
+    const receivedStatus = bodyshop?.md_order_statuses?.default_received;
+
+    if (!Array.isArray(parts) || parts.length === 0 || !receivedStatus) {
+      return { total: 0, received: 0, percentLabel: t("general.labels.na") };
+    }
+
+    // Keep consistent with JobPartsQueueCount: exclude PAS / PASL from parts math
+    const { total, received } = parts.reduce(
+      (acc, val) => {
+        if (val?.part_type === "PAS" || val?.part_type === "PASL") return acc;
+        const count = Number(val?.count || 0);
+        acc.total += count;
+
+        if (val?.status === receivedStatus) {
+          acc.received += count;
+        }
+        return acc;
+      },
+      { total: 0, received: 0 }
+    );
+
+    const percentLabel = total > 0 ? `${Math.round((received / total) * 100)}%` : t("general.labels.na");
+    return { total, received, percentLabel };
+  }, [parts, bodyshop?.md_order_statuses?.default_received]);
+
+  const canOpen = summary.total > 0;
+
+  const handleOpenChange = useCallback(
+    (nextOpen) => {
+      if (!canOpen) return;
+      setOpen(nextOpen);
+    },
+    [canOpen]
+  );
+
+  const displayText =
+    displayMode === "compact" ? summary.percentLabel : `${summary.percentLabel} (${summary.received}/${summary.total})`;
+
+  // Prevent row/cell click handlers (table selection, drawer selection, etc.)
+  const stop = (e) => e.stopPropagation();
+
+  return (
+    <Popover
+      open={open}
+      onOpenChange={handleOpenChange}
+      trigger={["click"]}
+      placement={popoverPlacement}
+      content={
+        <div onClick={stop} style={{ minWidth: 260 }}>
+          <JobPartsQueueCount parts={parts} />
+        </div>
+      }
+    >
+      <div
+        onClick={stop}
+        style={{
+          width: "100%",
+          height: "19px",
+          cursor: canOpen ? "pointer" : "default",
+          userSelect: "none"
+        }}
+        title={canOpen ? t("production.labels.click_for_statuses") : undefined}
+      >
+        {displayText}
+      </div>
+    </Popover>
+  );
+}
+
+JobPartsReceived.propTypes = {
+  bodyshop: PropTypes.object,
+  parts: PropTypes.array,
+  displayMode: PropTypes.oneOf(["full", "compact"]),
+  popoverPlacement: PropTypes.string
+};
+
+export default connect(mapStateToProps)(JobPartsReceived);

client/src/components/jobs-available-table/jobs-available-table.container.jsx

@@ -154,6 +154,10 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail
         : {})
     };
 
+    if (currentUser?.email) {
+      newJob.created_user_email = currentUser.email;
+    }
+
     if (selectedOwner) {
       newJob.ownerid = selectedOwner;
       delete newJob.owner;

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

@@ -1,15 +1,33 @@
-import { Form, Input } from "antd";
+import { Form, Input, Select } from "antd";
 import { useContext } from "react";
 import { useTranslation } from "react-i18next";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 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 { buildOwnerPhoneTypeOptions } from "../../utils/phoneTypeOptions.js";
 
 export default function JobsCreateOwnerInfoNewComponent() {
   const [state] = useContext(JobCreateContext);
-
   const { t } = useTranslation();
+
+  const PHONE_TYPE_OPTIONS = buildOwnerPhoneTypeOptions(t);
+
+  const PREFERRED_CONTACT_OPTIONS = [
+    {
+      label: t("owners.labels.email", { defaultValue: "Email" }),
+      options: [{ label: t("owners.labels.email", { defaultValue: "Email" }), value: "Email" }]
+    },
+    {
+      label: t("owners.labels.sms", { defaultValue: "SMS" }),
+      options: [{ label: t("owners.labels.sms", { defaultValue: "SMS" }), value: "SMS" }]
+    },
+    {
+      label: t("owners.labels.phone", { defaultValue: "Phone" }),
+      options: PHONE_TYPE_OPTIONS
+    }
+  ];
+
   return (
     <div>
       <LayoutFormRow header={t("owners.forms.name")} grow>
@@ -105,29 +123,59 @@ export default function JobsCreateOwnerInfoNewComponent() {
           ]}
           name={["owner", "data", "ownr_ea"]}
         >
-          <FormItemEmail
-            //email={form.getFieldValue("ownr_ea")}
-            disabled={!state.owner.new}
-          />
+          <FormItemEmail disabled={!state.owner.new} />
         </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph1")}
-          name={["owner", "data", "ownr_ph1"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 1 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph1"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph1")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph1_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
         </Form.Item>
-        <Form.Item
-          label={t("owners.fields.ownr_ph2")}
-          name={["owner", "data", "ownr_ph2"]}
-          rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
-        >
-          <FormItemPhone disabled={!state.owner.new} />
+
+        {/* Phone 2 + Type */}
+        <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
+          <div style={{ display: "flex", alignItems: "center", gap: 8 }}>
+            <Form.Item
+              name={["owner", "data", "ownr_ph2"]}
+              noStyle
+              rules={[({ getFieldValue }) => PhoneItemFormatterValidation(getFieldValue, "owner.data.ownr_ph2")]}
+            >
+              <FormItemPhone disabled={!state.owner.new} style={{ flex: 1, minWidth: 150 }} />
+            </Form.Item>
+
+            <Form.Item name={["owner", "data", "ownr_ph2_ty"]} noStyle>
+              <Select
+                disabled={!state.owner.new}
+                allowClear
+                placeholder="Type"
+                options={PHONE_TYPE_OPTIONS}
+                style={{ width: 110 }}
+              />
+            </Form.Item>
+          </div>
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow grow>
         <Form.Item label={t("owners.fields.preferred_contact")} name={["owner", "data", "preferred_contact"]}>
-          <Input disabled={!state.owner.new} />
+          <Select disabled={!state.owner.new} allowClear placeholder="Type" options={PREFERRED_CONTACT_OPTIONS} />
         </Form.Item>
       </LayoutFormRow>
     </div>

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

@@ -61,7 +61,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph1, b.ownr_ph1),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph1" && tableState.sortedInfo.order
     },
@@ -69,7 +69,7 @@ export default function JobsCreateOwnerInfoSearchComponent({ loading, owners })
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>,
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>,
       sorter: (a, b) => alphaSort(a.ownr_ph2, b.ownr_ph2),
       sortOrder: tableState.sortedInfo.columnKey === "ownr_ph2" && tableState.sortedInfo.order
     }

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

@@ -175,25 +175,33 @@ export function JobsDetailHeaderActions({
   };
 
   const handleDuplicate = () =>
-    DuplicateJob(
-      client,
-      job.id,
-      { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
-      (newJobId) => {
+    DuplicateJob({
+      apolloClient: client,
+      jobId: job.id,
+      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+      completionCallback: (newJobId) => {
         history(`/manage/jobs/${newJobId}`);
         notification.success({
           message: t("jobs.successes.duplicated")
         });
       },
-      true
-    );
+      keepJobLines: true,
+      currentUser
+    });
 
   const handleDuplicateConfirm = () =>
-    DuplicateJob(client, job.id, { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported }, (newJobId) => {
-      history(`/manage/jobs/${newJobId}`);
-      notification.success({
-        message: t("jobs.successes.duplicated")
-      });
+    DuplicateJob({
+      apolloClient: client,
+      jobId: job.id,
+      config: { defaultOpenStatus: bodyshop.md_ro_statuses.default_imported },
+      completionCallback: (newJobId) => {
+        history(`/manage/jobs/${newJobId}`);
+        notification.success({
+          message: t("jobs.successes.duplicated")
+        });
+      },
+      keepJobLines: false,
+      currentUser
     });
 
   const handleFinish = async (values) => {

client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js

@@ -5,7 +5,14 @@ import { INSERT_NEW_JOB, QUERY_JOB_FOR_DUPE } from "../../graphql/jobs.queries";
 import dayjs from "../../utils/day";
 import i18n from "i18next";
 
-export default async function DuplicateJob(apolloClient, jobId, config, completionCallback, keepJobLines = false) {
+export default async function DuplicateJob({
+  apolloClient,
+  jobId,
+  config,
+  completionCallback,
+  keepJobLines = false,
+  currentUser
+}) {
   logImEXEvent("job_duplicate");
 
   const { defaultOpenStatus } = config;
@@ -19,6 +26,7 @@ export default async function DuplicateJob(apolloClient, jobId, config, completi
   const existingJob = _.cloneDeep(jobs_by_pk);
   delete existingJob.__typename;
   delete existingJob.id;
+  delete existingJob.created_user_email;
   delete existingJob.createdat;
   delete existingJob.updatedat;
   delete existingJob.cieca_stl;
@@ -29,6 +37,10 @@ export default async function DuplicateJob(apolloClient, jobId, config, completi
     status: defaultOpenStatus
   };
 
+  if (currentUser?.email) {
+    newJob.created_user_email = currentUser.email;
+  }
+
   const _tempLines = _.cloneDeep(existingJob.joblines);
   _tempLines.forEach((line) => {
     delete line.id;
@@ -55,7 +67,7 @@ export default async function DuplicateJob(apolloClient, jobId, config, completi
   return;
 }
 
-export async function CreateIouForJob(apolloClient, jobId, config, jobLinesToKeep) {
+export async function CreateIouForJob({ apolloClient, jobId, config, jobLinesToKeep, currentUser }) {
   logImEXEvent("job_create_iou");
 
   const { status } = config;
@@ -109,6 +121,9 @@ export async function CreateIouForJob(apolloClient, jobId, config, jobLinesToKee
   delete newJob.joblines;
   newJob.joblines = { data: _tempLines };
 
+  if (currentUser?.email) {
+    newJob.created_user_email = currentUser.email;
+  }
   const res2 = await apolloClient.mutate({
     mutation: INSERT_NEW_JOB,
     variables: { job: [newJob] }

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

@@ -251,16 +251,16 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, is
             <div>
               <DataLabel key="2" label={t("jobs.fields.ownr_ph1")}>
                 {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph1}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton phone={job.ownr_ph1} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph1_ty} phone={job.ownr_ph1} jobid={job.id} />
                 )}
               </DataLabel>
               <DataLabel key="22" label={t("jobs.fields.ownr_ph2")}>
                 {disabled || isPartsEntry ? (
-                  <PhoneNumberFormatter>{job.ownr_ph2}</PhoneNumberFormatter>
+                  <PhoneNumberFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2}</PhoneNumberFormatter>
                 ) : (
-                  <ChatOpenButton phone={job.ownr_ph2} jobid={job.id} />
+                  <ChatOpenButton type={job.ownr_ph2_ty} phone={job.ownr_ph2} jobid={job.id} />
                 )}
               </DataLabel>
               <DataLabel key="3" label={t("owners.fields.address")}>

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.component.jsx

@@ -1,10 +1,9 @@
-import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Button, Card, Col, Row, Space } from "antd";
 import axios from "axios";
 import i18n from "i18next";
 import { isFunction } from "lodash";
 import { useCallback, useEffect, useState } from "react";
-import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import Lightbox from "react-image-lightbox";
 import "react-image-lightbox/style.css";
@@ -18,19 +17,13 @@ import JobsDocumentsDownloadButton from "./jobs-document-imgproxy-gallery.downlo
 import JobsDocumentsGalleryReassign from "./jobs-document-imgproxy-gallery.reassign.component";
 import JobsDocumentsDeleteButton from "./jobs-documents-imgproxy-gallery.delete.component";
 import JobsDocumentsGallerySelectAllComponent from "./jobs-documents-imgproxy-gallery.selectall.component";
+import LocalMediaGrid from "../jobs-documents-local-gallery/local-media-grid.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = () => ({});
 
-/*
-################################################################################################
- Developer Note:
- Known Technical Debt Item
-         Modifications to this code requires complementary changes to the Cloudinary code. Cloudinary code will be removed upon completed migration.
-################################################################################################
-*/
 function JobsDocumentsImgproxyComponent({
   bodyshop,
   data,
@@ -119,17 +112,12 @@ function JobsDocumentsImgproxyComponent({
         )}
         <Col span={24}>
           <Card title={t("jobs.labels.documents-images")}>
-            <Gallery
+            <LocalMediaGrid
               images={galleryImages.images}
               onClick={(index) => {
                 setModalState({ open: true, index: index });
-                // window.open(
-                //   item.fullsize,
-                //   "_blank",
-                //   "toolbar=0,location=0,menubar=0"
-                // );
               }}
-              onSelect={(index) => {
+              onToggle={(index) => {
                 setGalleryImages({
                   ...galleryImages,
                   images: galleryImages.images.map((g, idx) =>
@@ -137,30 +125,26 @@ function JobsDocumentsImgproxyComponent({
                   )
                 });
               }}
+              minColumns={4}
+              expandHeight={true}
             />
           </Card>
         </Col>
         <Col span={24}>
           <Card title={t("jobs.labels.documents-other")}>
-            <Gallery
+            <LocalMediaGrid
               images={galleryImages.other}
-              thumbnailStyle={() => {
-                return {
-                  backgroundImage: <FileExcelFilled />,
-                  height: "100%",
-                  width: "100%",
-                  cursor: "pointer"
-                };
-              }}
               onClick={(index) => {
                 window.open(galleryImages.other[index].source, "_blank", "toolbar=0,location=0,menubar=0");
               }}
-              onSelect={(index) => {
+              onToggle={(index) => {
                 setGalleryImages({
                   ...galleryImages,
                   other: galleryImages.other.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g))
                 });
               }}
+              minColumns={4}
+              expandHeight={true}
             />
           </Card>
         </Col>
@@ -221,6 +205,7 @@ export const fetchImgproxyThumbnails = async ({ setStateCallback, jobId, billId,
           width: 225,
           isSelected: false,
           key: value.key,
+          filename: value.key,
           extension: value.extension,
           id: value.id,
           type: value.type,
@@ -259,6 +244,7 @@ export const fetchImgproxyThumbnails = async ({ setStateCallback, jobId, billId,
           isSelected: false,
           extension: value.extension,
           key: value.key,
+          filename: value.key,
           id: value.id,
           type: value.type,
           size: value.size

client/src/components/jobs-documents-imgproxy-gallery/jobs-documents-imgproxy-gallery.external.component.jsx

@@ -1,31 +1,61 @@
-import { useEffect } from "react";
-import { Gallery } from "react-grid-gallery";
+import { useEffect, useState, useCallback } from "react";
+import { useTranslation } from "react-i18next";
+import LocalMediaGrid from "../jobs-documents-local-gallery/local-media-grid.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 import { fetchImgproxyThumbnails } from "./jobs-documents-imgproxy-gallery.component";
 
-/*
-################################################################################################
- Developer Note:
- Known Technical Debt Item
-         Modifications to this code requires complementary changes to the Cloudinary code. Cloudinary code will be removed upon completed migration.
-################################################################################################
-*/
-
-function JobsDocumentImgproxyGalleryExternal({ jobId, externalMediaState }) {
+function JobsDocumentImgproxyGalleryExternal({ jobId, externalMediaState, context = "chat" }) {
   const [galleryImages, setgalleryImages] = externalMediaState;
+  const [isLoading, setIsLoading] = useState(false);
+  const { t } = useTranslation();
 
-  useEffect(() => {
-    if (jobId) fetchImgproxyThumbnails({ setStateCallback: setgalleryImages, jobId, imagesOnly: true });
+  const fetchThumbnails = useCallback(async () => {
+    await fetchImgproxyThumbnails({ setStateCallback: setgalleryImages, jobId, imagesOnly: true });
   }, [jobId, setgalleryImages]);
 
+  useEffect(() => {
+    if (!jobId) return;
+    setIsLoading(true);
+    fetchThumbnails().finally(() => setIsLoading(false));
+  }, [jobId, fetchThumbnails]);
+
+  const handleToggle = useCallback(
+    (idx) => {
+      setgalleryImages((imgs) => imgs.map((g, gIdx) => (gIdx === idx ? { ...g, isSelected: !g.isSelected } : g)));
+    },
+    [setgalleryImages]
+  );
+
+  const messageStyle = { textAlign: "center", padding: "1rem" };
+
+  if (!jobId) {
+    return (
+      <div aria-label="media gallery unavailable" style={{ position: "relative", minHeight: 80 }}>
+        <div style={messageStyle}>No job selected.</div>
+      </div>
+    );
+  }
+
   return (
-    <div className="clearfix">
-      <Gallery
-        images={galleryImages}
-        backdropClosesModal={true}
-        onSelect={(index) => {
-          setgalleryImages(galleryImages.map((g, idx) => (index === idx ? { ...g, isSelected: !g.isSelected } : g)));
-        }}
-      />
+    <div
+      className="clearfix"
+      style={{ position: "relative", minHeight: 80 }}
+      data-jobid={jobId}
+      aria-label={`media gallery for job ${jobId}`}
+    >
+      {isLoading && galleryImages.length === 0 && (
+        <div className="local-gallery-loading" style={messageStyle} role="status" aria-live="polite">
+          <LoadingSpinner />
+        </div>
+      )}
+      {galleryImages.length > 0 && (
+        <LocalMediaGrid images={galleryImages} minColumns={4} context={context} onToggle={handleToggle} />
+      )}
+      {galleryImages.length > 0 && (
+        <div style={{ fontSize: 10, color: "#888", marginTop: 4 }} aria-live="off">
+          {`${t("general.labels.media")}: ${galleryImages.length}`}
+        </div>
+      )}
     </div>
   );
 }

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

@@ -1,7 +1,6 @@
-import { FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { EditFilled, SyncOutlined } from "@ant-design/icons";
 import { Alert, Button, Card, Col, Row, Space } from "antd";
 import { useEffect, useState } from "react";
-import { Gallery } from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -14,6 +13,7 @@ import JobsDocumentsLocalDeleteButton from "./jobs-documents-local-gallery.delet
 import JobsLocalGalleryDownloadButton from "./jobs-documents-local-gallery.download";
 import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
 import JobsDocumentsLocalGallerySelectAllComponent from "./jobs-documents-local-gallery.selectall.component";
+import LocalMediaGrid from "./local-media-grid.component";
 
 import Lightbox from "react-image-lightbox";
 import "react-image-lightbox/style.css";
@@ -132,59 +132,54 @@ export function JobsDocumentsLocalGallery({
         </Col>
         <Col span={24}>
           <Card title={t("jobs.labels.documents-images")}>
-            <Gallery
+            {optimized && (
+              <Alert style={{ margin: "4px" }} message={t("documents.labels.optimizedimage")} type="success" />
+            )}
+            <LocalMediaGrid
               images={jobMedia.images}
-              onSelect={(index, image) => {
-                toggleMediaSelected({ jobid: job.id, filename: image.filename });
-              }}
-              {...(optimized && {
-                customControls: [
-                  <Alert
-                    key="optimizedImageALert"
-                    style={{ margin: "4px" }}
-                    message={t("documents.labels.optimizedimage")}
-                    type="success"
-                  />
-                ]
-              })}
               onClick={(index) => {
                 setModalState({ open: true, index: index });
-                // const media = allMedia[job.id].find(
-                //   (m) => m.optimized === item.src
-                // );
-
-                // window.open(
-                //   media ? media.fullsize : item.fullsize,
-                //   "_blank",
-                //   "toolbar=0,location=0,menubar=0"
-                // );
               }}
+              onToggle={(index) => {
+                toggleMediaSelected({ jobid: job.id, filename: jobMedia.images[index].filename });
+              }}
+              minColumns={4}
+              expandHeight={true}
             />
           </Card>
         </Col>
         <Col span={24}>
           <Card title={t("jobs.labels.documents-other")}>
-            <Gallery
+            <LocalMediaGrid
               images={jobMedia.other}
-              thumbnailStyle={() => {
-                return {
-                  backgroundImage: <FileExcelFilled />,
-                  height: "100%",
-                  width: "100%",
-                  cursor: "pointer"
-                };
-              }}
               onClick={(index) => {
                 window.open(jobMedia.other[index].fullsize, "_blank", "toolbar=0,location=0,menubar=0");
               }}
-              onSelect={(index, image) => {
-                toggleMediaSelected({ jobid: job.id, filename: image.filename });
+              onToggle={(index) => {
+                toggleMediaSelected({ jobid: job.id, filename: jobMedia.other[index].filename });
               }}
+              minColumns={4}
+              expandHeight={true}
             />
           </Card>
         </Col>
         {modalState.open && (
           <Lightbox
+            toolbarButtons={[
+              <EditFilled
+                key="edit"
+                onClick={() => {
+                  const newWindow = window.open(
+                    `${window.location.protocol}//${window.location.host}/edit?imageUrl=${
+                      jobMedia.images[modalState.index].fullsize
+                    }&filename=${jobMedia.images[modalState.index].filename}&jobid=${job.id}`,
+                    "_blank",
+                    "noopener,noreferrer"
+                  );
+                  if (newWindow) newWindow.opener = null;
+                }}
+              />
+            ]}
             mainSrc={jobMedia.images[modalState.index].fullsize}
             nextSrc={jobMedia.images[(modalState.index + 1) % jobMedia.images.length].fullsize}
             prevSrc={jobMedia.images[(modalState.index + jobMedia.images.length - 1) % jobMedia.images.length].fullsize}

client/src/components/jobs-documents-local-gallery/local-media-grid.component.jsx

@@ -1,3 +1,4 @@
+import { Checkbox } from "antd";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 
 /**
@@ -6,16 +7,20 @@ import { useCallback, useEffect, useMemo, useRef, useState } from "react";
  * Props:
  *  - images: Array<{ src, fullsize, filename?, isSelected? }>
  *  - onToggle(index)
+ *  - onClick(index) optional for viewing
+ *  - thumbSize: automatically set to 125 for chat, 250 for default
  */
 export function LocalMediaGrid({
   images,
   onToggle,
-  thumbSize = 100,
+  onClick,
   gap = 8,
   minColumns = 3,
   maxColumns = 12,
-  context = "default"
+  context = "default",
+  expandHeight = false
 }) {
+  const thumbSize = context === "chat" ? 100 : 180;
   const containerRef = useRef(null);
   const [cols, setCols] = useState(() => {
     // Pre-calc initial columns to stabilize layout before images render
@@ -114,8 +119,7 @@ export function LocalMediaGrid({
         display: "grid",
         gridTemplateColumns,
         gap,
-        maxHeight: 420,
-        overflowY: "auto",
+        ...(expandHeight ? {} : { maxHeight: 420, overflowY: "auto" }),
         overflowX: "hidden",
         padding: 4,
         justifyContent: justifyMode,
@@ -131,7 +135,7 @@ export function LocalMediaGrid({
           role="listitem"
           tabIndex={0}
           aria-label={img.filename || `image ${idx + 1}`}
-          onClick={() => onToggle(idx)}
+          onClick={() => (onClick ? onClick(idx) : onToggle(idx))}
           onKeyDown={(e) => handleKeyDown(e, idx)}
           style={{
             position: "relative",
@@ -197,6 +201,24 @@ export function LocalMediaGrid({
               }}
             />
           )}
+          {onClick && (
+            <Checkbox
+              checked={img.isSelected}
+              onChange={(e) => {
+                e.stopPropagation();
+                onToggle(idx);
+              }}
+              onClick={(e) => e.stopPropagation()}
+              style={{
+                position: "absolute",
+                top: 5,
+                left: 5,
+                zIndex: 2,
+                opacity: img.isSelected ? 1 : 0.4,
+                transition: "opacity 0.3s"
+              }}
+            />
+          )}
         </div>
       ))}
       {/* No placeholders needed; layout uses auto-fit for non-chat or fixed columns for chat */}

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

@@ -64,7 +64,11 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph1 ? <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph1 ? (
+          <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
       }
     },
     {
@@ -74,7 +78,11 @@ export default function JobsFindModalComponent({
       width: "12%",
       ellipsis: true,
       render: (text, record) => {
-        return record.ownr_ph2 ? <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter> : t("general.labels.unknown");
+        return record.ownr_ph2 ? (
+          <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
       }
     },
     {
@@ -245,7 +253,11 @@ export default function JobsFindModalComponent({
         >
           {t("jobs.labels.override_header")}
         </Checkbox>
-        <Checkbox checked={partsQueueToggle} onChange={(e) => setPartsQueueToggle(e.target.checked)} id="parts_queue_toggle">
+        <Checkbox
+          checked={partsQueueToggle}
+          onChange={(e) => setPartsQueueToggle(e.target.checked)}
+          id="parts_queue_toggle"
+        >
           {t("bodyshop.fields.md_functionality_toggles.parts_queue_toggle")}
         </Checkbox>
         <Checkbox

client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx

@@ -72,14 +72,14 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <StartChatButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <StartChatButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),

client/src/components/jobs-list/jobs-list.component.jsx

@@ -139,7 +139,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -147,7 +147,7 @@ export function JobsList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
 
     {

client/src/components/jobs-ready-list/jobs-ready-list.component.jsx

@@ -140,7 +140,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph1",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph1} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph1_ty} phone={record.ownr_ph1} jobid={record.id} />
     },
     {
       title: t("jobs.fields.ownr_ph2"),
@@ -148,7 +148,7 @@ export function JobsReadyList({ bodyshop }) {
       key: "ownr_ph2",
       ellipsis: true,
       responsive: ["md"],
-      render: (text, record) => <ChatOpenButton phone={record.ownr_ph2} jobid={record.id} />
+      render: (text, record) => <ChatOpenButton type={record.ownr_ph2_ty} phone={record.ownr_ph2} jobid={record.id} />
     },
     {
       title: t("jobs.fields.status"),

client/src/components/notification-settings/notification-settings-form.component.jsx

@@ -132,7 +132,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
       dataIndex: "scenarioLabel",
       key: "scenario",
       render: (_, record) => t(`notifications.scenarios.${record.key}`),
-      width: "90%"
+      width: "80%"
     },
     {
       title: <ColumnHeaderCheckbox channel="app" form={form} onHeaderChange={() => setIsDirty(true)} />,
@@ -156,20 +156,23 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
         </Form.Item>
       )
     }
-    // TODO: Disabled for now until FCM is implemented.
-    // {
-    //   title: <ColumnHeaderCheckbox channel="fcm" form={form} disabled onHeaderChange={() => setIsDirty(true)} />,
-    //   dataIndex: "fcm",
-    //   key: "fcm",
-    //   align: "center",
-    //   render: (_, record) => (
-    //     <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
-    //       <Checkbox disabled />
-    //     </Form.Item>
-    //   )
-    // }
   ];
 
+  // Currently disabled for prod
+  if (!import.meta.env.PROD) {
+    columns.push({
+      title: <ColumnHeaderCheckbox channel="fcm" form={form} onHeaderChange={() => setIsDirty(true)} />,
+      dataIndex: "fcm",
+      key: "fcm",
+      align: "center",
+      render: (_, record) => (
+        <Form.Item name={[record.key, "fcm"]} valuePropName="checked" noStyle>
+          <Checkbox />
+        </Form.Item>
+      )
+    });
+  }
+
   const dataSource = notificationScenarios.map((scenario) => ({ key: scenario }));
 
   return (
@@ -186,13 +189,7 @@ const NotificationSettingsForm = ({ currentUser, bodyshop }) => {
         extra={
           <Space>
             <Typography.Text type="secondary">{t("notifications.labels.auto-add")}</Typography.Text>
-            <Switch
-              checked={autoAddEnabled}
-              onChange={handleAutoAddToggle}
-              loading={savingAutoAdd}
-              // checkedChildren={t("notifications.labels.auto-add-on")}
-              // unCheckedChildren={t("notifications.labels.auto-add-off")}
-            />
+            <Switch checked={autoAddEnabled} onChange={handleAutoAddToggle} loading={savingAutoAdd} />
             <Button type="default" onClick={handleReset} disabled={!isDirty && !isAutoAddDirty}>
               {t("general.actions.clear")}
             </Button>

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

@@ -1,15 +1,26 @@
-import { Form, Input, Tooltip } from "antd";
+import { Form, Input, Select, Tooltip } from "antd";
 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 LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import { PhoneItemFormatterValidation } from "../form-items-formatted/phone-form-item.component";
+import { buildOwnerPhoneTypeOptions } from "../../utils/phoneTypeOptions.js";
 
 export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPhone2OptedOut }) {
   const { t } = useTranslation();
   const { getFieldValue } = form;
-
+  const PHONE_TYPE_OPTIONS = buildOwnerPhoneTypeOptions(t);
+  const PREFERRED_CONTACT_OPTIONS = [
+    {
+      label: t("owners.labels.email", { defaultValue: "Email" }),
+      options: [{ label: t("owners.labels.email", { defaultValue: "Email" }), value: "Email" }]
+    },
+    {
+      label: t("owners.labels.phone", { defaultValue: "Phone" }),
+      options: PHONE_TYPE_OPTIONS
+    }
+  ];
   return (
     <div>
       <FormFieldsChanged form={form} />
@@ -30,6 +41,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input disabled />
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow header={t("owners.forms.address")}>
         <Form.Item label={t("owners.fields.ownr_addr1")} name="ownr_addr1">
           <Input />
@@ -50,6 +62,7 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
           <Input />
         </Form.Item>
       </LayoutFormRow>
+
       <LayoutFormRow header={t("owners.forms.contact")}>
         <Form.Item
           label={t("owners.fields.ownr_ea")}
@@ -63,6 +76,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
         >
           <FormItemEmail email={getFieldValue("ownr_ea")} />
         </Form.Item>
+
+        {/* Phone 1 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph1")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -72,6 +87,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
+
+            <Form.Item name="ownr_ph1_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
             {isPhone1OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -88,6 +108,8 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
+
+        {/* Phone 2 + Type + Opt-out icon */}
         <Form.Item label={t("owners.fields.ownr_ph2")} style={{ marginBottom: 0 }}>
           <div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
             <Form.Item
@@ -97,6 +119,11 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             >
               <Input style={{ flex: 1, minWidth: "150px" }} />
             </Form.Item>
+
+            <Form.Item name="ownr_ph2_ty" noStyle>
+              <Select allowClear placeholder="Type" options={PHONE_TYPE_OPTIONS} style={{ width: 110 }} />
+            </Form.Item>
+
             {isPhone2OptedOut && (
               <Tooltip title={t("consent.text_body")}>
                 <CloseCircleFilled
@@ -113,13 +140,16 @@ export default function OwnerDetailFormComponent({ form, isPhone1OptedOut, isPho
             )}
           </div>
         </Form.Item>
+
         <Form.Item label={t("owners.fields.preferred_contact")} name="preferred_contact">
-          <Input />
+          <Select allowClear placeholder="Type" options={PREFERRED_CONTACT_OPTIONS} />
         </Form.Item>
+
         <Form.Item label={t("owners.fields.tax_number")} name="tax_number">
           <Input />
         </Form.Item>
       </LayoutFormRow>
+
       <Form.Item label={t("owners.fields.note")} name="note">
         <Input.TextArea rows={4} />
       </Form.Item>

client/src/components/owner-detail-update-jobs/owner-detail-update-jobs.component.jsx

@@ -25,8 +25,10 @@ export default function OwnerDetailUpdateJobsComponent({ owner, selectedJobs, di
           ownr_ea: owner["ownr_ea"],
           ownr_fn: owner["ownr_fn"],
           ownr_ph1: owner["ownr_ph1"],
+          ownr_ph1_ty: owner["ownr_ph1_ty"],
           ownr_ln: owner["ownr_ln"],
           ownr_ph2: owner["ownr_ph2"],
+          ownr_ph2_ty: owner["ownr_ph2_ty"],
           ownr_st: owner["ownr_st"],
           ownr_title: owner["ownr_title"],
           ownr_zip: owner["ownr_zip"]

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

@@ -47,13 +47,13 @@ export default function OwnerFindModalComponent({
       title: t("owners.fields.ownr_ph1"),
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: t("owners.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: t("owners.fields.note"),

client/src/components/owner-tag-popover/owner-tag-popover.component.jsx

@@ -15,10 +15,10 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph1_ty}>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.ownr_ph2_ty}>{job.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
@@ -36,13 +36,10 @@ export default function OwnerTagPopoverComponent({ job }) {
               <OwnerNameDisplay ownerObject={job.owner} />
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
-              <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
-            </Descriptions.Item>
-            <Descriptions.Item key="22" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph1_ty}>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph2")}>
-              <PhoneFormatter>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
+              <PhoneFormatter type={job.owner.ownr_ph2_ty}>{job.owner.ownr_ph2 || ""}</PhoneFormatter>
             </Descriptions.Item>
             <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${

client/src/components/owners-list/owners-list.component.jsx

@@ -39,7 +39,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>;
       }
     },
     {
@@ -47,7 +47,7 @@ export default function OwnersListComponent({ loading, owners, total, refetch })
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       render: (text, record) => {
-        return <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>;
+        return <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>;
       }
     },
     {

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -16,11 +16,11 @@ import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
 import AlertComponent from "../alert/alert.component";
-import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
 import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
 import OwnerNameDisplay, { OwnerNameDisplayFunction } from "../owner-name-display/owner-name-display.component";
 import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import JobPartsReceived from "../job-parts-received/job-parts-received.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -235,7 +235,9 @@ export function PartsQueueListComponent({ bodyshop }) {
       title: t("jobs.fields.partsstatus"),
       dataIndex: "partsstatus",
       key: "partsstatus",
-      render: (text, record) => <JobPartsQueueCount parts={record.joblines_status} />
+      render: (text, record) => (
+        <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />
+      )
     },
     {
       title: t("jobs.fields.comment"),

client/src/components/production-board-kanban/production-board-kanban-card.component.jsx

@@ -19,6 +19,7 @@ import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.c
 import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
 import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import { PiMicrosoftTeamsLogo } from "react-icons/pi";
+import ProductionListColumnPartsReceived from "../production-list-columns/production-list-columns.partsreceived.component";
 
 const cardColor = (ssbuckets, totalHrs) => {
   const bucket = ssbuckets.find((bucket) => bucket.gte <= totalHrs && (!bucket.lt || bucket.lt > totalHrs));
@@ -312,6 +313,20 @@ const TasksToolTip = ({ metadata, cardSettings, t }) =>
     </Col>
   );
 
+const PartsReceivedComponent = ({ metadata, cardSettings, card }) =>
+  cardSettings?.partsreceived && (
+    <Col span={24} style={{ textAlign: "center" }}>
+      <ProductionListColumnPartsReceived
+        displayMode="full"
+        popoverPlacement="topLeft"
+        record={{
+          ...metadata,
+          id: card?.id,
+          refetch: card?.refetch
+        }}
+      />
+    </Col>
+  );
 export default function ProductionBoardCard({ technician, card, bodyshop, cardSettings }) {
   const { t } = useTranslation();
   const { metadata } = card;
@@ -411,6 +426,7 @@ export default function ProductionBoardCard({ technician, card, bodyshop, cardSe
       <SubletsComponent metadata={metadata} cardSettings={cardSettings} />
       <ProductionNoteComponent metadata={metadata} cardSettings={cardSettings} card={card} />
       <PartsStatusComponent metadata={metadata} cardSettings={cardSettings} />
+      <PartsReceivedComponent metadata={metadata} cardSettings={cardSettings} card={card} />
     </Row>
   );
 

client/src/components/production-board-kanban/settings/InformationSettings.jsx

@@ -18,7 +18,8 @@ const InformationSettings = ({ t }) => (
         "partsstatus",
         "estimator",
         "subtotal",
-        "tasks"
+        "tasks",
+        "partsreceived"
       ].map((item) => (
         <Col xs={24} sm={12} md={8} lg={6} key={item}>
           <Form.Item name={item} valuePropName="checked">

client/src/components/production-board-kanban/settings/defaultKanbanSettings.js

@@ -74,6 +74,7 @@ const defaultKanbanSettings = {
   cardSize: "small",
   model_info: true,
   kiosk: false,
+  partsreceived: false,
   totalHrs: true,
   totalAmountInProduction: false,
   totalLAB: true,

client/src/components/production-list-columns/production-list-columns.data.jsx

@@ -161,7 +161,6 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       dataIndex: "actual_in_time",
       key: "actual_in_time",
       ellipsis: true,
-
       render: (text, record) => <TimeFormatter>{record.actual_in}</TimeFormatter>
     },
     {
@@ -181,6 +180,22 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
 
       render: (text, record) => <TimeFormatter>{record.scheduled_completion}</TimeFormatter>
     },
+    {
+      title: i18n.t("jobs.fields.actual_completion"),
+      dataIndex: "actual_completion",
+      key: "actual_completion",
+      ellipsis: true,
+      sorter: (a, b) => dateSort(a.actual_completion, b.actual_completion),
+      sortOrder: state.sortedInfo.columnKey === "actual_completion" && state.sortedInfo.order,
+      render: (text, record) => <ProductionListDate record={record} field="actual_completion" time />
+    },
+    {
+      title: i18n.t("jobs.fields.actual_completion") + " (HH:MM)",
+      dataIndex: "actual_completion_time",
+      key: "actual_completion_time",
+      ellipsis: true,
+      render: (text, record) => <TimeFormatter>{record.actual_completion}</TimeFormatter>
+    },
     {
       title: i18n.t("jobs.fields.date_last_contacted"),
       dataIndex: "date_last_contacted",
@@ -255,14 +270,14 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       dataIndex: "ownr_ph1",
       key: "ownr_ph1",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph1_ty}>{record.ownr_ph1}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.ownr_ph2"),
       dataIndex: "ownr_ph2",
       key: "ownr_ph2",
       ellipsis: true,
-      render: (text, record) => <PhoneFormatter>{record.ownr_ph2}</PhoneFormatter>
+      render: (text, record) => <PhoneFormatter type={record.ownr_ph2_ty}>{record.ownr_ph2}</PhoneFormatter>
     },
     {
       title: i18n.t("jobs.fields.specialcoveragepolicy"),

client/src/components/production-list-columns/production-list-columns.partsreceived.component.jsx

@@ -1,33 +1,5 @@
-import { useMemo } from "react";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import JobPartsReceived from "../job-parts-received/job-parts-received.component";
 
-const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
-});
-const mapDispatchToProps = () => ({
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
-});
-export default connect(mapStateToProps, mapDispatchToProps)(ProductionListColumnPartsReceived);
-
-export function ProductionListColumnPartsReceived({ bodyshop, record }) {
-  const amount = useMemo(() => {
-    const amount = record.joblines_status.reduce(
-      (acc, val) => {
-        acc.total += val.count;
-        acc.received =
-          val.status === bodyshop.md_order_statuses.default_received ? acc.received + val.count : acc.received;
-        return acc;
-      },
-      { total: 0, received: 0 }
-    );
-
-    return {
-      ...amount,
-      percent: amount.total !== 0 ? ((amount.received / amount.total) * 100).toFixed(0) + "%" : "N/A"
-    };
-  }, [record, bodyshop.md_order_statuses]);
-
-  return `${amount.percent} (${amount.received}/${amount.total})`;
+export default function ProductionListColumnPartsReceived({ record }) {
+  return <JobPartsReceived parts={record.joblines_status} displayMode="full" popoverPlacement="topLeft" />;
 }

client/src/components/production-list-detail/production-list-detail.component.jsx

@@ -154,13 +154,25 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
                 <OwnerNameDisplay ownerObject={theJob} />
                 {!technician ? (
                   <>
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph1} jobid={data.jobs_by_pk.id} />
-                    <StartChatButton phone={data.jobs_by_pk.ownr_ph2} jobid={data.jobs_by_pk.id} />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph1_ty}
+                      phone={data.jobs_by_pk.ownr_ph1}
+                      jobid={data.jobs_by_pk.id}
+                    />
+                    <StartChatButton
+                      type={data.jobs_by_pk.ownr_ph2_ty}
+                      phone={data.jobs_by_pk.ownr_ph2}
+                      jobid={data.jobs_by_pk.id}
+                    />
                   </>
                 ) : (
                   <>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph1}</PhoneNumberFormatter>
-                    <PhoneNumberFormatter>{data.jobs_by_pk.ownr_ph2}</PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph1_ty}>
+                      {data.jobs_by_pk.ownr_ph1}
+                    </PhoneNumberFormatter>
+                    <PhoneNumberFormatter type={data.jobs_by_pk.ownr_ph2_ty}>
+                      {data.jobs_by_pk.ownr_ph2}
+                    </PhoneNumberFormatter>
                   </>
                 )}
               </Space>
@@ -187,7 +199,7 @@ export function ProductionListDetail({ bodyshop, jobs, setPrintCenterContext, te
           {!bodyshop.uselocalmediaserver && (
             <>
               <div style={{ height: "8px" }} />
-              <JobDetailCardsDocumentsComponent loading={loading} data={data ? data.jobs_by_pk : null} />
+              <JobDetailCardsDocumentsComponent loading={loading} data={data ? data.jobs_by_pk : null} bodyshop={bodyshop} />
             </>
           )}
         </div>

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

@@ -1,12 +1,9 @@
 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 { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import DatePickerRanges from "../../utils/DatePickerRanges";
-import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import FeatureWrapper, { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
@@ -26,14 +23,6 @@ export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoGeneral);
 export function ShopInfoGeneral({ form, bodyshop }) {
   const { t } = useTranslation();
 
-  const {
-    treatments: { ClosingPeriod, ADPPayroll }
-  } = useSplitTreatments({
-    attributes: {},
-    names: ["ClosingPeriod", "ADPPayroll"],
-    splitKey: bodyshop?.imexshopid
-  });
-
   return (
     <div>
       <LayoutFormRow header={t("bodyshop.labels.businessinformation")} id="businessinformation">
@@ -143,299 +132,6 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           <InputNumber min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
-        {[
-          ...(HasFeatureAccess({ featureName: "export", bodyshop })
-            ? [
-                <Form.Item
-                  key="qbo"
-                  label={t("bodyshop.labels.qbo")}
-                  valuePropName="checked"
-                  name={["accountingconfig", "qbo"]}
-                >
-                  <Switch />
-                </Form.Item>,
-                InstanceRenderManager({
-                  imex: (
-                    <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
-                      {() => (
-                        <Form.Item
-                          label={t("bodyshop.labels.qbo_usa")}
-                          shouldUpdate
-                          valuePropName="checked"
-                          name={["accountingconfig", "qbo_usa"]}
-                        >
-                          <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
-                        </Form.Item>
-                      )}
-                    </Form.Item>
-                  )
-                }),
-                <Form.Item
-                  key="qbo_departmentid"
-                  label={t("bodyshop.labels.qbo_departmentid")}
-                  name={["accountingconfig", "qbo_departmentid"]}
-                >
-                  <Input />
-                </Form.Item>,
-                <Form.Item
-                  key="accountingtiers"
-                  label={t("bodyshop.labels.accountingtiers")}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                  name={["accountingconfig", "tiers"]}
-                >
-                  <Radio.Group>
-                    <Radio value={2}>2</Radio>
-                    <Radio value={3}>3</Radio>
-                  </Radio.Group>
-                </Form.Item>,
-                <Form.Item key="twotierpref_wrapper" shouldUpdate>
-                  {() => {
-                    return (
-                      <Form.Item
-                        label={t("bodyshop.labels.2tiersetup")}
-                        shouldUpdate
-                        rules={[
-                          {
-                            required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
-                            //message: t("general.validation.required"),
-                          }
-                        ]}
-                        name={["accountingconfig", "twotierpref"]}
-                      >
-                        <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
-                          <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
-                          <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
-                        </Radio.Group>
-                      </Form.Item>
-                    );
-                  }}
-                </Form.Item>,
-                <Form.Item
-                  key="printlater"
-                  label={t("bodyshop.labels.printlater")}
-                  valuePropName="checked"
-                  name={["accountingconfig", "printlater"]}
-                >
-                  <Switch />
-                </Form.Item>,
-                <Form.Item
-                  key="emaillater"
-                  label={t("bodyshop.labels.emaillater")}
-                  valuePropName="checked"
-                  name={["accountingconfig", "emaillater"]}
-                >
-                  <Switch />
-                </Form.Item>
-              ]
-            : []),
-          <Form.Item
-            key="inhousevendorid"
-            label={t("bodyshop.fields.inhousevendorid")}
-            name={"inhousevendorid"}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <Input />
-          </Form.Item>,
-          <Form.Item
-            key="default_adjustment_rate"
-            label={t("bodyshop.fields.default_adjustment_rate")}
-            name={"default_adjustment_rate"}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-          >
-            <InputNumber min={0} precision={2} />
-          </Form.Item>,
-          InstanceRenderManager({
-            imex: (
-              <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
-                <Input />
-              </Form.Item>
-            )
-          }),
-          <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
-            <Input />
-          </Form.Item>,
-          ...(HasFeatureAccess({ featureName: "bills", bodyshop })
-            ? [
-                InstanceRenderManager({
-                  imex: (
-                    <Form.Item
-                      key="invoice_federal_tax_rate"
-                      label={t("bodyshop.fields.invoice_federal_tax_rate")}
-                      name={["bill_tax_rates", "federal_tax_rate"]}
-                      rules={[
-                        {
-                          required: true
-                          //message: t("general.validation.required"),
-                        }
-                      ]}
-                    >
-                      <InputNumber />
-                    </Form.Item>
-                  )
-                }),
-                <Form.Item
-                  key="invoice_state_tax_rate"
-                  label={t("bodyshop.fields.invoice_state_tax_rate")}
-                  name={["bill_tax_rates", "state_tax_rate"]}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                >
-                  <InputNumber />
-                </Form.Item>,
-                <Form.Item
-                  key="invoice_local_tax_rate"
-                  label={t("bodyshop.fields.invoice_local_tax_rate")}
-                  name={["bill_tax_rates", "local_tax_rate"]}
-                  rules={[
-                    {
-                      required: true
-                      //message: t("general.validation.required"),
-                    }
-                  ]}
-                >
-                  <InputNumber />
-                </Form.Item>
-              ]
-            : []),
-          <Form.Item
-            key="md_payment_types"
-            name={["md_payment_types"]}
-            label={t("bodyshop.fields.md_payment_types")}
-            rules={[
-              {
-                required: true,
-                //message: t("general.validation.required"),
-                type: "array"
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>,
-          <Form.Item
-            key="md_categories"
-            name={["md_categories"]}
-            label={t("bodyshop.fields.md_categories")}
-            rules={[
-              {
-                //message: t("general.validation.required"),
-                type: "array"
-              }
-            ]}
-          >
-            <Select mode="tags" />
-          </Form.Item>,
-          ...(HasFeatureAccess({ featureName: "export", bodyshop })
-            ? [
-                <Form.Item
-                  key="ReceivableCustomField1"
-                  name={["accountingconfig", "ReceivableCustomField1"]}
-                  label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
-                >
-                  {ReceivableCustomFieldSelect}
-                </Form.Item>,
-                <Form.Item
-                  key="ReceivableCustomField2"
-                  name={["accountingconfig", "ReceivableCustomField2"]}
-                  label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
-                >
-                  {ReceivableCustomFieldSelect}
-                </Form.Item>,
-                <Form.Item
-                  key="ReceivableCustomField3"
-                  name={["accountingconfig", "ReceivableCustomField3"]}
-                  label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
-                >
-                  {ReceivableCustomFieldSelect}
-                </Form.Item>,
-                <Form.Item
-                  key="md_classes"
-                  name={["md_classes"]}
-                  label={t("bodyshop.fields.md_classes")}
-                  rules={[
-                    ({ getFieldValue }) => {
-                      return {
-                        required: getFieldValue("enforce_class"),
-                        //message: t("general.validation.required"),
-                        type: "array"
-                      };
-                    }
-                  ]}
-                >
-                  <Select mode="tags" />
-                </Form.Item>,
-                <Form.Item
-                  key="enforce_class"
-                  name={["enforce_class"]}
-                  label={t("bodyshop.fields.enforce_class")}
-                  valuePropName="checked"
-                >
-                  <Switch />
-                </Form.Item>,
-                ...(ClosingPeriod.treatment === "on"
-                  ? [
-                      <Form.Item
-                        key="ClosingPeriod"
-                        name={["accountingconfig", "ClosingPeriod"]}
-                        label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
-                      >
-                        <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-                      </Form.Item>
-                    ]
-                  : []),
-                ...(ADPPayroll.treatment === "on"
-                  ? [
-                      <Form.Item
-                        key="companyCode"
-                        name={["accountingconfig", "companyCode"]}
-                        label={t("bodyshop.fields.companycode")}
-                      >
-                        <Input />
-                      </Form.Item>
-                    ]
-                  : []),
-                ...(ADPPayroll.treatment === "on"
-                  ? [
-                      <Form.Item
-                        key="batchID"
-                        name={["accountingconfig", "batchID"]}
-                        label={t("bodyshop.fields.batchid")}
-                      >
-                        <Input />
-                      </Form.Item>
-                    ]
-                  : [])
-              ]
-            : []),
-          <Form.Item
-            key="accumulatePayableLines"
-            name={["accountingconfig", "accumulatePayableLines"]}
-            label={t("bodyshop.fields.accumulatePayableLines")}
-            valuePropName="checked"
-          >
-            <Switch />
-          </Form.Item>
-        ]}
-      </LayoutFormRow>
       <FeatureWrapper featureName="scoreboard" noauth={() => null}>
         <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")} id="scoreboardsetup">
           <Form.Item
@@ -499,6 +195,19 @@ export function ShopInfoGeneral({ form, bodyshop }) {
       </FeatureWrapper>
       <LayoutFormRow header={t("bodyshop.labels.systemsettings")} id="systemsettings">
         {[
+          <Form.Item
+            key="md_categories"
+            name={["md_categories"]}
+            label={t("bodyshop.fields.md_categories")}
+            rules={[
+              {
+                //message: t("general.validation.required"),
+                type: "array"
+              }
+            ]}
+          >
+            <Select mode="tags" />
+          </Form.Item>,
           <Form.Item
             key="md_referral_sources"
             name={["md_referral_sources"]}
@@ -934,6 +643,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           }}
         </Form.List>
       </LayoutFormRow>
+
+      {/*Start Insurance Provider Row */}
       <LayoutFormRow
         grow
         header={<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span>}
@@ -950,11 +661,31 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                         label={t("bodyshop.fields.md_ins_co.name")}
                         key={`${index}name`}
                         name={[field.name, "name"]}
+                        dependencies={[["md_ins_cos"]]}
                         rules={[
                           {
                             required: true
                             //message: t("general.validation.required"),
-                          }
+                          },
+                          ({ getFieldValue }) => ({
+                            validator: async (_, value) => {
+                              const normalizedValue = (value ?? "").toString().trim().toLowerCase();
+                              if (!normalizedValue) return Promise.resolve(); // handled by required
+
+                              const list = getFieldValue(["md_ins_cos"]) || [];
+                              const normalizedNames = list
+                                .map((c) => (c?.name ?? "").toString().trim().toLowerCase())
+                                .filter(Boolean);
+
+                              const count = normalizedNames.filter((n) => n === normalizedValue).length;
+
+                              if (count > 1) {
+                                throw new Error(t("bodyshop.errors.duplicate_insurance_company"));
+                              }
+
+                              return Promise.resolve();
+                            }
+                          })
                         ]}
                       >
                         <Input />
@@ -1031,6 +762,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           }}
         </Form.List>
       </LayoutFormRow>
+      {/*End Insurance Provider Row */}
+
       <LayoutFormRow grow header={t("bodyshop.labels.estimators")} id="estimators">
         <Form.List name={["md_estimators"]}>
           {(fields, { add, remove, move }) => {
@@ -1568,11 +1301,3 @@ export function ShopInfoGeneral({ form, bodyshop }) {
     </div>
   );
 }
-
-const ReceivableCustomFieldSelect = (
-  <Select allowClear>
-    <Select.Option value="v_vin">VIN</Select.Option>
-    <Select.Option value="clm_no">Claim No.</Select.Option>
-    <Select.Option value="ded_amt">Deductible Amount</Select.Option>
-  </Select>
-);

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

@@ -1,6 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import { Button, Form, Input, InputNumber, Select, Space, Switch } from "antd";
+import { Button, DatePicker, Form, Input, InputNumber, Radio, Select, Space, Switch } from "antd";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -14,6 +14,7 @@ import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.c
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
 import ShopInfoResponsibilitycentersTaxesComponent from "./shop-info.responsibilitycenters.taxes.component";
+import DatePickerRanges from "../../utils/DatePickerRanges";
 
 const SelectorDiv = styled.div`
   .ant-form-item .ant-select {
@@ -34,11 +35,11 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
   const { t } = useTranslation();
 
   const {
-    treatments: { Qb_Multi_Ar, DmsAp }
+    treatments: { ClosingPeriod, ADPPayroll, Qb_Multi_Ar, DmsAp }
   } = useSplitTreatments({
     attributes: {},
-    names: ["Qb_Multi_Ar", "DmsAp"],
-    splitKey: bodyshop && bodyshop.imexshopid
+    names: ["ClosingPeriod", "ADPPayroll", "Qb_Multi_Ar", "DmsAp"],
+    splitKey: bodyshop?.imexshopid
   });
 
   const [costOptions, setCostOptions] = useState([
@@ -58,6 +59,14 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
     setProfitOptions([...(form.getFieldValue(["md_responsibility_centers", "profits"]).map((i) => i && i.name) || [])]);
   };
 
+  const ReceivableCustomFieldSelect = (
+    <Select allowClear>
+      <Select.Option value="v_vin">VIN</Select.Option>
+      <Select.Option value="clm_no">Claim No.</Select.Option>
+      <Select.Option value="ded_amt">Deductible Amount</Select.Option>
+    </Select>
+  );
+
   return (
     <div>
       <RbacWrapper action="shop:responsibilitycenter">
@@ -314,6 +323,286 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
             </DataLabel>
           </>
         )}
+        <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
+          {[
+            ...(HasFeatureAccess({ featureName: "export", bodyshop })
+              ? [
+                  <Form.Item
+                    key="qbo"
+                    label={t("bodyshop.labels.qbo")}
+                    valuePropName="checked"
+                    name={["accountingconfig", "qbo"]}
+                  >
+                    <Switch />
+                  </Form.Item>,
+                  InstanceRenderManager({
+                    imex: (
+                      <Form.Item key="qbo_usa_wrapper" shouldUpdate noStyle>
+                        {() => (
+                          <Form.Item
+                            label={t("bodyshop.labels.qbo_usa")}
+                            shouldUpdate
+                            valuePropName="checked"
+                            name={["accountingconfig", "qbo_usa"]}
+                          >
+                            <Switch disabled={!form.getFieldValue(["accountingconfig", "qbo"])} />
+                          </Form.Item>
+                        )}
+                      </Form.Item>
+                    )
+                  }),
+                  <Form.Item
+                    key="qbo_departmentid"
+                    label={t("bodyshop.labels.qbo_departmentid")}
+                    name={["accountingconfig", "qbo_departmentid"]}
+                  >
+                    <Input />
+                  </Form.Item>,
+                  <Form.Item
+                    key="accountingtiers"
+                    label={t("bodyshop.labels.accountingtiers")}
+                    rules={[
+                      {
+                        required: true
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                    name={["accountingconfig", "tiers"]}
+                  >
+                    <Radio.Group>
+                      <Radio value={2}>2</Radio>
+                      <Radio value={3}>3</Radio>
+                    </Radio.Group>
+                  </Form.Item>,
+                  <Form.Item key="twotierpref_wrapper" shouldUpdate>
+                    {() => {
+                      return (
+                        <Form.Item
+                          label={t("bodyshop.labels.2tiersetup")}
+                          shouldUpdate
+                          rules={[
+                            {
+                              required: form.getFieldValue(["accountingconfig", "tiers"]) === 2
+                              //message: t("general.validation.required"),
+                            }
+                          ]}
+                          name={["accountingconfig", "twotierpref"]}
+                        >
+                          <Radio.Group disabled={form.getFieldValue(["accountingconfig", "tiers"]) === 3}>
+                            <Radio value="name">{t("bodyshop.labels.2tiername")}</Radio>
+                            <Radio value="source">{t("bodyshop.labels.2tiersource")}</Radio>
+                          </Radio.Group>
+                        </Form.Item>
+                      );
+                    }}
+                  </Form.Item>,
+                  <Form.Item
+                    key="printlater"
+                    label={t("bodyshop.labels.printlater")}
+                    valuePropName="checked"
+                    name={["accountingconfig", "printlater"]}
+                  >
+                    <Switch />
+                  </Form.Item>,
+                  <Form.Item
+                    key="emaillater"
+                    label={t("bodyshop.labels.emaillater")}
+                    valuePropName="checked"
+                    name={["accountingconfig", "emaillater"]}
+                  >
+                    <Switch />
+                  </Form.Item>
+                ]
+              : []),
+            <Form.Item
+              key="inhousevendorid"
+              label={t("bodyshop.fields.inhousevendorid")}
+              name={"inhousevendorid"}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <Input />
+            </Form.Item>,
+            <Form.Item
+              key="default_adjustment_rate"
+              label={t("bodyshop.fields.default_adjustment_rate")}
+              name={"default_adjustment_rate"}
+              rules={[
+                {
+                  required: true
+                  //message: t("general.validation.required"),
+                }
+              ]}
+            >
+              <InputNumber min={0} precision={2} />
+            </Form.Item>,
+            InstanceRenderManager({
+              imex: (
+                <Form.Item key="federal_tax_id" label={t("bodyshop.fields.federal_tax_id")} name="federal_tax_id">
+                  <Input />
+                </Form.Item>
+              )
+            }),
+            <Form.Item key="state_tax_id" label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
+              <Input />
+            </Form.Item>,
+            ...(HasFeatureAccess({ featureName: "bills", bodyshop })
+              ? [
+                  InstanceRenderManager({
+                    imex: (
+                      <Form.Item
+                        key="invoice_federal_tax_rate"
+                        label={t("bodyshop.fields.invoice_federal_tax_rate")}
+                        name={["bill_tax_rates", "federal_tax_rate"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
+                    )
+                  }),
+                  <Form.Item
+                    key="invoice_state_tax_rate"
+                    label={t("bodyshop.fields.invoice_state_tax_rate")}
+                    name={["bill_tax_rates", "state_tax_rate"]}
+                    rules={[
+                      {
+                        required: true
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber />
+                  </Form.Item>,
+                  <Form.Item
+                    key="invoice_local_tax_rate"
+                    label={t("bodyshop.fields.invoice_local_tax_rate")}
+                    name={["bill_tax_rates", "local_tax_rate"]}
+                    rules={[
+                      {
+                        required: true
+                        //message: t("general.validation.required"),
+                      }
+                    ]}
+                  >
+                    <InputNumber />
+                  </Form.Item>
+                ]
+              : []),
+            <Form.Item
+              key="md_payment_types"
+              name={["md_payment_types"]}
+              label={t("bodyshop.fields.md_payment_types")}
+              rules={[
+                {
+                  required: true,
+                  //message: t("general.validation.required"),
+                  type: "array"
+                }
+              ]}
+            >
+              <Select mode="tags" />
+            </Form.Item>,
+            ...(HasFeatureAccess({ featureName: "export", bodyshop })
+              ? [
+                  <Form.Item
+                    key="ReceivableCustomField1"
+                    name={["accountingconfig", "ReceivableCustomField1"]}
+                    label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
+                  >
+                    {ReceivableCustomFieldSelect}
+                  </Form.Item>,
+                  <Form.Item
+                    key="ReceivableCustomField2"
+                    name={["accountingconfig", "ReceivableCustomField2"]}
+                    label={t("bodyshop.fields.ReceivableCustomField", { number: 2 })}
+                  >
+                    {ReceivableCustomFieldSelect}
+                  </Form.Item>,
+                  <Form.Item
+                    key="ReceivableCustomField3"
+                    name={["accountingconfig", "ReceivableCustomField3"]}
+                    label={t("bodyshop.fields.ReceivableCustomField", { number: 3 })}
+                  >
+                    {ReceivableCustomFieldSelect}
+                  </Form.Item>,
+                  <Form.Item
+                    key="md_classes"
+                    name={["md_classes"]}
+                    label={t("bodyshop.fields.md_classes")}
+                    rules={[
+                      ({ getFieldValue }) => {
+                        return {
+                          required: getFieldValue("enforce_class"),
+                          //message: t("general.validation.required"),
+                          type: "array"
+                        };
+                      }
+                    ]}
+                  >
+                    <Select mode="tags" />
+                  </Form.Item>,
+                  <Form.Item
+                    key="enforce_class"
+                    name={["enforce_class"]}
+                    label={t("bodyshop.fields.enforce_class")}
+                    valuePropName="checked"
+                  >
+                    <Switch />
+                  </Form.Item>,
+                  ...(ClosingPeriod.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="ClosingPeriod"
+                          name={["accountingconfig", "ClosingPeriod"]}
+                          label={t("bodyshop.fields.closingperiod")} //{t("reportcenter.labels.dates")}
+                        >
+                          <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+                        </Form.Item>
+                      ]
+                    : []),
+                  ...(ADPPayroll.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="companyCode"
+                          name={["accountingconfig", "companyCode"]}
+                          label={t("bodyshop.fields.companycode")}
+                        >
+                          <Input />
+                        </Form.Item>
+                      ]
+                    : []),
+                  ...(ADPPayroll.treatment === "on"
+                    ? [
+                        <Form.Item
+                          key="batchID"
+                          name={["accountingconfig", "batchID"]}
+                          label={t("bodyshop.fields.batchid")}
+                        >
+                          <Input />
+                        </Form.Item>
+                      ]
+                    : [])
+                ]
+              : []),
+            <Form.Item
+              key="accumulatePayableLines"
+              name={["accountingconfig", "accumulatePayableLines"]}
+              label={t("bodyshop.fields.accumulatePayableLines")}
+              valuePropName="checked"
+            >
+              <Switch />
+            </Form.Item>
+          ]}
+        </LayoutFormRow>
         {HasFeatureAccess({ featureName: "export", bodyshop }) && (
           <>
             <LayoutFormRow header={t("bodyshop.labels.responsibilitycenters.costs")} id="costs">

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -1,6 +1,7 @@
 import { useLazyQuery } from "@apollo/client";
 import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Card, Form, Input, InputNumber, Select, Space, Switch } from "antd";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -33,7 +34,9 @@ export function TimeTicketModalComponent({
   authLevel,
   employeeAutoCompleteOptions,
   disabled,
-  employeeSelectDisabled
+  employeeSelectDisabled,
+  lineTicketRefreshKey,
+  isOpen
 }) {
   const { t } = useTranslation();
   const {
@@ -48,6 +51,18 @@ export function TimeTicketModalComponent({
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+
+  // Watch the jobid field so we can refetch the bottom section without relying on jobid changes
+  const watchedJobId = Form.useWatch("jobid", form);
+
+  useEffect(() => {
+    if (!isOpen) return;
+    if (!watchedJobId) return;
+    if (!lineTicketRefreshKey) return;
+
+    loadLineTicketData({ variables: { id: watchedJobId } });
+  }, [lineTicketRefreshKey, watchedJobId, isOpen]);
+
   const CostCenterSelect = ({ emps, value, ...props }) => {
     return (
       <Select
@@ -304,6 +319,7 @@ export function TimeTicketModalComponent({
           )}
         </Form.Item>
       </LayoutFormRow>
+
       <Form.Item dependencies={["jobid"]}>
         {() => {
           const jobid = form.getFieldValue("jobid");

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -29,6 +29,9 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [enterAgain, setEnterAgain] = useState(false);
+
+  const [lineTicketRefreshKey, setLineTicketRefreshKey] = useState(0);
+
   const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET);
   const [updateTicket] = useMutation(UPDATE_TIME_TICKET);
   const {
@@ -85,11 +88,17 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
     notification["success"]({
       message: t("timetickets.successes.created")
     });
-    if (timeTicketModal.actions.refetch) timeTicketModal.actions.refetch();
-    if (enterAgain) {
-      //Capture the existing information and repopulate it.
 
-      const prev = form.getFieldsValue(["date", "employeeid", "flat_rate"]);
+    // Refresh parent screens (Job Labor tab, etc.)
+    if (timeTicketModal.actions.refetch) timeTicketModal.actions.refetch();
+
+    // Refresh the modal "bottom section" (allocations + embedded ticket list) for the current job
+    setLineTicketRefreshKey((k) => k + 1);
+
+    if (enterAgain) {
+      // Capture existing information and repopulate it.
+      // (Include jobid so Save & New stays on the same RO if it was selected in-form.)
+      const prev = form.getFieldsValue(["jobid", "date", "employeeid", "flat_rate"]);
 
       form.resetFields();
 
@@ -229,6 +238,7 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
             </Space>
           }
         />
+
         <TimeTicketModalComponent
           isEdit={timeTicketModal.context.id}
           form={form}
@@ -238,6 +248,8 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
             timeTicketModal.context?.timeticket?.committed_at ||
             (timeTicketModal.context?.timeticket?.employeeid && !timeTicketModal.context.id ? true : false)
           }
+          lineTicketRefreshKey={lineTicketRefreshKey}
+          isOpen={timeTicketModal.open}
         />
       </Form>
     </Modal>

client/src/graphql/appointments.queries.js

@@ -40,6 +40,8 @@ export const QUERY_ALL_ACTIVE_APPOINTMENTS = gql`
         ownr_fn
         ownr_ph1
         ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
         ownr_ea
         clm_total
         id

client/src/graphql/conversations.queries.js

@@ -2,7 +2,27 @@ import { gql } from "@apollo/client";
 
 export const UNREAD_CONVERSATION_COUNT = gql`
   query UNREAD_CONVERSATION_COUNT {
-    messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+    # How many conversations have at least one unread inbound, non-system message
+    conversations_aggregate(
+      where: {
+        archived: { _eq: false }
+        messages: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }
+      }
+    ) {
+      aggregate {
+        count
+      }
+    }
+
+    # How many unread inbound, non-system messages exist (excluding archived conversations)
+    messages_aggregate(
+      where: {
+        read: { _eq: false }
+        isoutbound: { _eq: false }
+        is_system: { _eq: false }
+        conversation: { archived: { _eq: false } }
+      }
+    ) {
       aggregate {
         count
       }
@@ -19,7 +39,7 @@ export const CONVERSATION_LIST_QUERY = gql`
       unreadcnt
       archived
       label
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
         aggregate {
           count
         }
@@ -41,6 +61,7 @@ export const CONVERSATION_SUBSCRIPTION_BY_PK = gql`
   subscription CONVERSATION_SUBSCRIPTION_BY_PK($conversationId: uuid!) {
     messages(order_by: { created_at: asc_nulls_first }, where: { conversationid: { _eq: $conversationId } }) {
       id
+      conversationid
       status
       text
       is_system
@@ -76,6 +97,7 @@ export const GET_CONVERSATION_DETAILS = gql`
       }
       messages(order_by: { created_at: asc_nulls_first }) {
         id
+        conversationid
         status
         text
         is_system
@@ -110,7 +132,7 @@ export const CONVERSATION_ID_BY_PHONE = gql`
           ro_number
         }
       }
-      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+      messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
         aggregate {
           count
         }
@@ -139,7 +161,7 @@ export const CREATE_CONVERSATION = gql`
             ro_number
           }
         }
-        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false } }) {
+        messages_aggregate(where: { read: { _eq: false }, isoutbound: { _eq: false }, is_system: { _eq: false } }) {
           aggregate {
             count
           }

client/src/graphql/jobs.queries.js

@@ -19,7 +19,9 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
       ownr_ln
       ownr_co_nm
       ownr_ph1
+      ownr_ph1_ty
       ownr_ph2
+      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -69,6 +71,8 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
       ownerid
       comment
@@ -122,6 +126,8 @@ export const QUERY_PARTS_QUEUE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
       plate_no
       plate_st
@@ -179,6 +185,8 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -249,6 +257,8 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars
@@ -615,6 +625,8 @@ export const GET_JOB_BY_PK = gql`
         ownr_ln
         ownr_ph1
         ownr_ph2
+        ownr_ph1_ty
+        ownr_ph2_ty
         ownr_st
         ownr_zip
         tax_number
@@ -631,6 +643,8 @@ export const GET_JOB_BY_PK = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_st
       ownr_zip
       parts_tax_rates
@@ -714,7 +728,7 @@ export const GET_JOB_BY_PK = gql`
       v_model_yr
       v_model_desc
       v_vin
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
         created_at
         created_by
         critical
@@ -830,6 +844,8 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       comment
       ownr_ea
       ca_gst_registrant
@@ -1000,7 +1016,6 @@ export const QUERY_JOB_CARD_DETAILS = gql`
         key
         type
       }
-
     }
   }
 `;
@@ -1096,6 +1111,7 @@ export const UPDATE_JOB = gql`
         scheduled_completion
         scheduled_delivery
         actual_in
+        actual_completion
         date_repairstarted
         date_void
         date_lost_sale
@@ -1230,6 +1246,8 @@ export const GET_JOB_INFO_FOR_STRIPE = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_ea
     }
   }
@@ -1443,8 +1461,10 @@ export const QUERY_JOB_FOR_DUPE = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
+      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1690,8 +1710,10 @@ export const QUERY_ALL_JOB_FIELDS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph1x
+      ownr_ph1_ty
       ownr_ph2
       ownr_ph2x
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -1829,6 +1851,8 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -1869,6 +1893,8 @@ export const QUERY_SIMPLIFIED_PARTS_PAGINATED_STATUS_FILTERED = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       plate_no
       plate_st
       v_vin
@@ -2117,6 +2143,8 @@ export const GET_JOB_FOR_CC_CONTRACT = gql`
       ownr_zip
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
     }
   }
 `;
@@ -2415,7 +2443,7 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
         start
         status
       }
-      notes(where:{pinned: {_eq: true}}, order_by: {updated_at: desc}) {
+      notes(where: { pinned: { _eq: true } }, order_by: { updated_at: desc }) {
         created_at
         created_by
         critical
@@ -2503,6 +2531,8 @@ export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
       ownr_ln
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       owner {
         id
         preferred_contact
@@ -2592,6 +2622,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       vehicleid
       plate_no
       actual_in
+      actual_completion
       scheduled_completion
       scheduled_delivery
       date_last_contacted
@@ -2600,6 +2631,8 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       clm_total
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       special_coverage_policy
       owner_owing
       production_vars

client/src/graphql/owners.queries.js

@@ -8,6 +8,8 @@ export const QUERY_SEARCH_OWNER_BY_IDX = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
       ownr_addr1
       ownr_addr2
       ownr_city
@@ -57,8 +59,10 @@ export const QUERY_OWNER_BY_ID = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -112,8 +116,10 @@ export const QUERY_ALL_OWNERS = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -136,8 +142,10 @@ export const QUERY_ALL_OWNERS_PAGINATED = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip
@@ -164,8 +172,10 @@ export const QUERY_OWNER_FOR_JOB_CREATION = gql`
       ownr_ea
       ownr_fn
       ownr_ph1
+      ownr_ph1_ty
       ownr_ln
       ownr_ph2
+      ownr_ph2_ty
       ownr_st
       ownr_title
       ownr_zip

client/src/graphql/parts-orders.queries.js

@@ -177,10 +177,12 @@ export const QUERY_PARTS_ORDER_OEC = gql`
         ownr_fax
         ownr_faxx
         ownr_ph1
+        ownr_ph1_ty
         ownr_fn
         ownr_ln
         ownr_ph1x
         ownr_ph2
+        ownr_ph2_ty
         ownr_ph2x
         ownr_st
         ownr_title

client/src/graphql/search.queries.js

@@ -22,6 +22,8 @@ export const GLOBAL_SEARCH_QUERY = gql`
       ownr_co_nm
       ownr_ph1
       ownr_ph2
+      ownr_ph1_ty
+      ownr_ph2_ty
     }
     search_vehicles(args: { search: $search }, limit: 25) {
       id

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

@@ -9,21 +9,23 @@ import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { QUERY_OWNER_FOR_JOB_CREATION } from "../../graphql/owners.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+
 const mapStateToProps = createStructuredSelector({
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  currentUser: selectCurrentUser
 });
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, currentUser }) {
   const { t } = useTranslation();
   const notification = useNotification();
 
@@ -45,7 +47,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   const [form] = Form.useForm();
   const [state, setState] = contextState;
   const [insertJob] = useMutation(INSERT_NEW_JOB);
-  const [loadOwner, RemoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
+  const [loadOwner, remoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
 
   useEffect(() => {
     if (state.owner.selectedid) {
@@ -74,7 +76,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
   }, [t, setBreadcrumbs, setSelectedHeader]);
 
   const runInsertJob = (job) => {
-    insertJob({ variables: { job: job } })
+    insertJob({ variables: { job } })
       .then((resp) => {
         setState({
           ...state,
@@ -114,15 +116,20 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
 
     let ownerData;
     if (!job.ownerid) {
-      ownerData = job.owner.data;
-      ownerData.shopid = bodyshop.id;
+      // Keep preferred_contact for the nested owner insert...
+      job.owner.data.shopid = bodyshop.id;
+
+      // ...but do NOT flatten preferred_contact into the job row.
+      ownerData = _.cloneDeep(job.owner.data);
       delete ownerData.preferred_contact;
+
       delete job.ownerid;
     } else {
-      ownerData = _.cloneDeep(RemoteOwnerData.data.owners_by_pk);
+      ownerData = _.cloneDeep(remoteOwnerData.data.owners_by_pk);
       delete ownerData.id;
       delete ownerData.__typename;
     }
+
     if (!state.vehicle.none) {
       if (!job.vehicleid) {
         delete job.vehicleid;
@@ -150,6 +157,11 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
     if (job.owner === null) delete job.owner;
     if (job.vehicle === null) delete job.vehicle;
 
+    // Associate to the current user if one exists
+    if (currentUser?.email) {
+      job.created_user_email = currentUser.email;
+    }
+
     runInsertJob(job);
   };
 

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

@@ -239,22 +239,13 @@ export function* signInSuccessSaga({ payload }) {
 
   try {
     window.$crisp.push(["set", "user:nickname", [payload.displayName || payload.email]]);
-    const currentUserSegment = InstanceRenderManager({
-      imex: "imex-online-user",
-      rome: "rome-online-user"
-    });
-    window.$crisp.push(["set", "session:segments", [[currentUserSegment]]]);
 
     InstanceRenderManager({
       executeFunction: true,
       args: [],
-      imex: () => {
-        window.$crisp.push(["set", "session:segments", [["imex"]]]);
-      },
       rome: () => {
         window.$zoho.salesiq.visitor.name(payload.displayName || payload.email);
         window.$zoho.salesiq.visitor.email(payload.email);
-        window.$crisp.push(["set", "session:segments", [["rome"]]]);
       }
     });
 
@@ -262,11 +253,13 @@ export function* signInSuccessSaga({ payload }) {
     try {
       const state = yield select();
       const isParts = state?.application?.isPartsEntry === true;
-      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
+      const instanceSeg = InstanceRenderManager({
+        imex: ["imex-online-user", "imex"],
+        rome: ["rome-online-user", "rome"]
+      });
       // Always ensure segments include instance + user, and append partsManagement if applicable
       const segs = [
-        currentUserSegment,
-        instanceSeg,
+        ...instanceSeg,
         ...(isParts
           ? [
               InstanceRenderManager({
@@ -373,7 +366,10 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
 
       // Build consolidated Crisp segments including instance, region, features, and parts mode
       const isParts = yield select((state) => state.application.isPartsEntry === true);
-      const instanceSeg = InstanceRenderManager({ imex: "imex", rome: "rome" });
+      const instanceSeg = InstanceRenderManager({
+        imex: ["imex-online-user", "imex"],
+        rome: ["rome-online-user", "rome"]
+      });
 
       const featureSegments =
         payload.features?.allAccess === true
@@ -402,7 +398,7 @@ export function* SetAuthLevelFromShopDetails({ payload }) {
       featureSegments.push(...additionalSegments);
 
       const regionSeg = payload.region_config ? `region:${payload.region_config}` : null;
-      const segments = [instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
+      const segments = [...instanceSeg, ...(regionSeg ? [regionSeg] : []), ...featureSegments];
       if (isParts) {
         segments.push(InstanceRenderManager({ imex: "ImexPartsManagement", rome: "RomePartsManagement" }));
       }

client/src/translations/en_us/common.json

@@ -277,7 +277,8 @@
       "errors": {
         "creatingdefaultview": "Error creating default view.",
         "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}"
+        "saving": "Error encountered while saving. {{message}}",
+        "duplicate_insurance_company": "Duplicate insurance company name. Each insurance company name must be unique"
       },
       "fields": {
         "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -1270,6 +1271,7 @@
         "vehicle": "Vehicle"
       },
       "labels": {
+        "selected": "Selected",
         "settings": "Settings",
         "actions": "Actions",
         "areyousure": "Are you sure?",
@@ -1491,7 +1493,8 @@
         "assign_team": "Assign Team",
         "converttolabor": "Convert amount to Labor.",
         "dispatchparts": "Dispatch Parts ({{count}})",
-        "new": "New Line"
+        "new": "New Line",
+        "updatelocation": "Update Location"
       },
       "errors": {
         "creating": "Error encountered while creating job line.  {{message}}",
@@ -1572,7 +1575,8 @@
         "ioucreated": "IOU",
         "new": "New Line",
         "nostatus": "No Status",
-        "presets": "Jobline Presets"
+        "presets": "Jobline Presets",
+        "bulk_location_help": "This will set the same location on all selected lines."
       },
       "successes": {
         "created": "Job line created successfully.",
@@ -2430,7 +2434,8 @@
         "selectmedia": "Select Media",
         "sentby": "Sent by {{by}} at {{time}}",
         "typeamessage": "Send a message...",
-        "unarchive": "Unarchive"
+        "unarchive": "Unarchive",
+        "mark_unread": "Mark as unread"
       },
       "render": {
         "conversation_list": "Conversation List"
@@ -2590,7 +2595,14 @@
         "fromclaim": "Current Claim",
         "fromowner": "Historical Owner Record",
         "relatedjobs": "Related Jobs",
-        "updateowner": "Update Owner"
+        "updateowner": "Update Owner",
+        "work": "Work",
+        "home": "Home",
+        "cell": "Cell",
+        "other": "Other",
+        "email": "Email",
+        "phone": "Phone",
+        "sms": "SMS"
       },
       "successes": {
         "delete": "Owner deleted successfully.",
@@ -2950,6 +2962,8 @@
         "settings": "Error saving board settings: {{error}}"
       },
       "labels": {
+        "click_for_statuses": "Click to view parts statuses",
+        "partsreceived": "Parts Received",
         "actual_in": "Actual In",
         "addnewprofile": "Add New Profile",
         "alert": "Alert",

client/src/translations/es/common.json

@@ -277,7 +277,8 @@
       "errors": {
         "creatingdefaultview": "",
         "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": ""
+        "saving": "",
+        "duplicate_insurance_company": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -1270,6 +1271,7 @@
         "vehicle": ""
       },
       "labels": {
+        "selected": "",
         "actions": "Comportamiento",
         "settings": "",
         "areyousure": "",
@@ -1491,7 +1493,8 @@
         "assign_team": "",
         "converttolabor": "",
         "dispatchparts": "",
-        "new": ""
+        "new": "",
+        "updatelocation": ""
       },
       "errors": {
         "creating": "",
@@ -1572,7 +1575,8 @@
         "ioucreated": "",
         "new": "Nueva línea",
         "nostatus": "",
-        "presets": ""
+        "presets": "",
+        "bulk_location_help": ""
       },
       "successes": {
         "created": "",
@@ -2430,7 +2434,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Enviar un mensaje...",
-        "unarchive": ""
+        "unarchive": "",
+        "mark_unread": ""
       },
       "render": {
         "conversation_list": ""
@@ -2590,7 +2595,14 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": "",
+        "other": "",
+        "email": "",
+        "phone": "",
+        "sms": ""
       },
       "successes": {
         "delete": "",
@@ -2950,6 +2962,8 @@
         "settings": ""
       },
       "labels": {
+        "click_for_statuses": "",
+        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",

client/src/translations/fr/common.json

@@ -277,7 +277,8 @@
       "errors": {
         "creatingdefaultview": "",
         "loading": "Impossible de charger les détails de la boutique. Veuillez appeler le support technique.",
-        "saving": ""
+        "saving": "",
+        "duplicate_insurance_company": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -1270,6 +1271,7 @@
         "vehicle": ""
       },
       "labels": {
+        "selected": "",
         "settings": "",
         "actions": "actes",
         "areyousure": "",
@@ -1491,7 +1493,8 @@
         "assign_team": "",
         "converttolabor": "",
         "dispatchparts": "",
-        "new": ""
+        "new": "",
+        "updatelocation": ""
       },
       "errors": {
         "creating": "",
@@ -1572,7 +1575,8 @@
         "ioucreated": "",
         "new": "Nouvelle ligne",
         "nostatus": "",
-        "presets": ""
+        "presets": "",
+        "bulk_location_help": ""
       },
       "successes": {
         "created": "",
@@ -2430,7 +2434,8 @@
         "selectmedia": "",
         "sentby": "",
         "typeamessage": "Envoyer un message...",
-        "unarchive": ""
+        "unarchive": "",
+        "mark_unread": ""
       },
       "render": {
         "conversation_list": ""
@@ -2590,7 +2595,14 @@
         "fromclaim": "",
         "fromowner": "",
         "relatedjobs": "",
-        "updateowner": ""
+        "updateowner": "",
+        "work": "",
+        "home": "",
+        "cell": "",
+        "other": "",
+        "email": "",
+        "phone": "",
+        "sms": ""
       },
       "successes": {
         "delete": "",
@@ -2950,6 +2962,8 @@
         "settings": ""
       },
       "labels": {
+        "click_for_statuses": "",
+        "partsreceived": "",
         "actual_in": "",
         "addnewprofile": "",
         "alert": "",

client/src/utils/GraphQLClient.js

@@ -148,6 +148,26 @@ const cache = new InMemoryCache({
     Query: {
       fields: {
         // Note: This is required because we switch from a read to an unread state with a toggle,
+        conversations: {
+          keyArgs: ["where", "order_by"], // keep separate caches for archived/unarchived + sort
+          merge(existing = [], incoming = [], { args, readField }) {
+            const offset = args?.offset ?? 0;
+            const merged = existing ? existing.slice(0) : [];
+
+            for (let i = 0; i < incoming.length; i++) {
+              merged[offset + i] = incoming[i];
+            }
+
+            // Deduplicate by id (important when you also upsert via sockets)
+            const seen = new Set();
+            return merged.filter((ref) => {
+              const id = readField("id", ref);
+              if (!id || seen.has(id)) return false;
+              seen.add(id);
+              return true;
+            });
+          }
+        },
         notifications: {
           merge(existing = [], incoming = [], { readField }) {
             // Create a map to deduplicate by __ref

client/src/utils/PhoneFormatter.jsx

@@ -1,7 +1,23 @@
-//import NumberFormat from "react-number-format";
+import { Typography } from "antd";
 import parsePhoneNumber from "libphonenumber-js";
 
-export default function PhoneNumberFormatter(props) {
-  const p = parsePhoneNumber(props.children || "", "CA");
-  return p ? <span>{p.formatNational()}</span> : null;
+const { Text } = Typography;
+
+export default function PhoneNumberFormatter({ children, type }) {
+  const p = parsePhoneNumber(children || "", "CA");
+  if (!p) return null;
+
+  const phone = p.formatNational();
+
+  return (
+    <span>
+      <Text>{phone}</Text>
+      {type ? (
+        <>
+          {" "}
+          <Text type="secondary">({type})</Text>
+        </>
+      ) : null}
+    </span>
+  );
 }

client/src/utils/phoneTypeOptions.js

@@ -0,0 +1,13 @@
+export const OWNER_PHONE_TYPE_VALUES = {
+  HOME: "Home",
+  WORK: "Work",
+  CELL: "Cell",
+  OTHER: "Other"
+};
+
+export const buildOwnerPhoneTypeOptions = (t) => [
+  { label: t("owners.labels.home"), value: OWNER_PHONE_TYPE_VALUES.HOME },
+  { label: t("owners.labels.work"), value: OWNER_PHONE_TYPE_VALUES.WORK },
+  { label: t("owners.labels.cell"), value: OWNER_PHONE_TYPE_VALUES.CELL },
+  { label: t("owners.labels.other"), value: OWNER_PHONE_TYPE_VALUES.OTHER }
+];

hasura/metadata/tables.yaml

@@ -3684,6 +3684,7 @@
           - completed_tasks
           - converted
           - created_at
+          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -3798,8 +3799,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -3961,6 +3964,7 @@
           - completed_tasks
           - converted
           - created_at
+          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -4077,8 +4081,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4251,6 +4257,7 @@
           - completed_tasks
           - converted
           - created_at
+          - created_user_email
           - cust_pr
           - date_estimated
           - date_exported
@@ -4367,8 +4374,10 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph1x
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_ph2x
           - ownr_st
           - ownr_title
@@ -4641,7 +4650,7 @@
       request_transform:
         body:
           action: transform
-          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
+          template: "{\r\n  \"event\": {\r\n  \"session_variables\": {\r\n    \"x-hasura-user-id\": {{$body?.event?.session_variables?.x-hasura-user-id ?? \"Internal\"}},\r\n    \"x-hasura-role\": {{$body?.event?.session_variables?.x-hasura-role ?? \"Internal\"}}\r\n    }, \r\n    \"op\": {{$body.event.op}},\r\n    \"data\": {\r\n      \"new\": {\r\n        \"id\": {{$body.event.data.new.id}},\r\n        \"shopid\": {{$body.event.data.new?.shopid}},\r\n        \"ro_number\": {{$body.event.data.new?.ro_number}},\r\n        \"created_user_email\": {{$body.event.data.new?.created_user_email}}\r\n      }\r\n    }\r\n  },\r\n  \"trigger\": {\r\n    \"name\": \"notifications_jobs_autoadd\"\r\n  },\r\n  \"table\": {\r\n    \"schema\": \"public\",\r\n    \"name\": \"jobs\"\r\n  }\r\n}\r\n"
         method: POST
         query_params: {}
         template_engine: Kriti
@@ -5168,7 +5177,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5193,7 +5204,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip
@@ -5229,7 +5242,9 @@
           - ownr_fn
           - ownr_ln
           - ownr_ph1
+          - ownr_ph1_ty
           - ownr_ph2
+          - ownr_ph2_ty
           - ownr_st
           - ownr_title
           - ownr_zip

hasura/migrations/1766427606596_alter_table_public_jobs_add_column_created_user_email/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "created_user_email" text
+--  null;

hasura/migrations/1766427606596_alter_table_public_jobs_add_column_created_user_email/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "created_user_email" text
+ null;

hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "ownr_ph1_ty" text
+--  null;

hasura/migrations/1767133700390_alter_table_public_owners_add_column_ownr_ph1_ty/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph1_ty" text
+ null;

hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."owners" add column "ownr_ph2_ty" text
+--  null;

hasura/migrations/1767133729078_alter_table_public_owners_add_column_ownr_ph2_ty/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."owners" add column "ownr_ph2_ty" text
+ null;

hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "ownr_ph1_ty" text
+--  null;

hasura/migrations/1767138645058_alter_table_public_jobs_add_column_ownr_ph1_ty/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph1_ty" text
+ null;

hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/down.sql

@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- alter table "public"."jobs" add column "ownr_ph2_ty" text
+--  null;

hasura/migrations/1767138667991_alter_table_public_jobs_add_column_ownr_ph2_ty/up.sql

@@ -0,0 +1,2 @@
+alter table "public"."jobs" add column "ownr_ph2_ty" text
+ null;

server.js

@@ -38,6 +38,7 @@ const { registerCleanupTask, initializeCleanupManager } = require("./server/util
 
 const { loadEmailQueue } = require("./server/notifications/queues/emailQueue");
 const { loadAppQueue } = require("./server/notifications/queues/appQueue");
+const { loadFcmQueue } = require("./server/notifications/queues/fcmQueue");
 
 const CLUSTER_RETRY_BASE_DELAY = 100;
 const CLUSTER_RETRY_MAX_DELAY = 5000;
@@ -355,9 +356,10 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   const queueSettings = { pubClient, logger, redisHelpers, ioRedis };
 
   // Assuming loadEmailQueue and loadAppQueue return Promises
-  const [notificationsEmailsQueue, notificationsAppQueue] = await Promise.all([
+  const [notificationsEmailsQueue, notificationsAppQueue, notificationsFcmQueue] = await Promise.all([
     loadEmailQueue(queueSettings),
-    loadAppQueue(queueSettings)
+    loadAppQueue(queueSettings),
+    loadFcmQueue(queueSettings)
   ]);
 
   // Add error listeners or other setup for queues if needed
@@ -368,6 +370,10 @@ const loadQueues = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
   notificationsAppQueue.on("error", (error) => {
     logger.log(`Error in notificationsAppQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
   });
+
+  notificationsFcmQueue.on("error", (error) => {
+    logger.log(`Error in notificationsFCMQueue: ${error}`, "ERROR", "queue", "api", null, { error: error?.message });
+  });
 };
 
 /**

server/accounting/qbo/qbo-payables.js

@@ -283,6 +283,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     VendorRef: {
       value: vendor.Id
     },
+    ...(vendor.TermRef && {
+      SalesTermRef: {
+        value: vendor.TermRef.value
+      }
+    }),
     TxnDate: moment(bill.date)
       //.tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),

server/graphql-client/queries.js

@@ -123,7 +123,7 @@ mutation RECEIVE_MESSAGE($msg: [messages_insert_input!]!) {
 
 exports.INSERT_MESSAGE = `
 mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!) {
-  update_conversations_by_pk(pk_columns: {id: $conversationid}, _set: {archived: false}) {
+  update_conversations_by_pk(pk_columns: { id: $conversationid }, _set: { archived: false }) {
     id
     archived
   }
@@ -147,6 +147,7 @@ mutation INSERT_MESSAGE($msg: [messages_insert_input!]!, $conversationid: uuid!)
       image_path
       image
       isoutbound
+      is_system
       msid
       read
       text
@@ -1506,6 +1507,7 @@ exports.GET_JOB_BY_PK = `query GET_JOB_BY_PK($id: uuid!) {
       est_ct_fn
       shopid
       est_ct_ln
+      ciecaid
       cieca_pfl
       cieca_pft
       cieca_pfo
@@ -3089,17 +3091,19 @@ exports.INSERT_JOB_WATCHERS = `
 `;
 
 exports.GET_NOTIFICATION_WATCHERS = `
-  query GET_NOTIFICATION_WATCHERS($shopId: uuid!, $employeeIds: [uuid!]!) {
+  query GET_NOTIFICATION_WATCHERS($shopId: uuid!, $employeeIds: [uuid!]!, $createdUserEmail: String!) {
     associations(where: {
       _and: [
         { shopid: { _eq: $shopId } },
         { active: { _eq: true } },
-        { notifications_autoadd: { _eq: true } }
+        { notifications_autoadd: { _eq: true } },
+        { useremail: { _eq: $createdUserEmail } }
       ]
     }) {
       id
       useremail
     }
+
     employees(where: { id: { _in: $employeeIds }, shopid: { _eq: $shopId }, active: { _eq: true } }) {
       user_email
     }
@@ -3187,3 +3191,20 @@ mutation INSERT_MEDIA_ANALYTICS($mediaObject: media_analytics_insert_input!) {
   }
 }
 `;
+
+exports.GET_USERS_FCM_TOKENS_BY_EMAILS = /* GraphQL */ `
+  query GET_USERS_FCM_TOKENS_BY_EMAILS($emails: [String!]!) {
+    users(where: { email: { _in: $emails } }) {
+      email
+      fcmtokens
+    }
+  }
+`;
+
+exports.UPDATE_USER_FCM_TOKENS_BY_EMAIL = /* GraphQL */ `
+  mutation UPDATE_USER_FCM_TOKENS_BY_EMAIL($email: String!, $fcmtokens: jsonb) {
+    update_users(where: { email: { _eq: $email } }, _set: { fcmtokens: $fcmtokens }) {
+      affected_rows
+    }
+  }
+`;

server/job/job-totals-USA.js

@@ -381,7 +381,12 @@ async function CalculateRatesTotals({ job, client }) {
 
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
-      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
+      if (
+        item.lbr_op === "OP14" &&
+        item.act_price > 0 &&
+        (!item.part_type || item.mod_lb_hrs === 0) &&
+        !IsAdditionalCost(item)
+      ) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
           ret[item.mod_lbr_ty.toLowerCase()].base = Dinero();
@@ -943,13 +948,27 @@ function CalculateTaxesTotals(job, otherTotals) {
         amount: Math.round(stlTowing.t_amt * 100)
       })
     );
-  if (stlStorage)
+  if (!stlTowing && !job.ciecaid && job.towing_payable)
     taxableAmounts.TOW = taxableAmounts.TOW.add(
-      (taxableAmounts.TOW = Dinero({
+      Dinero({
+        amount: Math.round((job.towing_payable || 0) * 100)
+      })
+    );
+
+  if (stlStorage)
+    taxableAmounts.STOR = taxableAmounts.STOR.add(
+      (taxableAmounts.STOR = Dinero({
         amount: Math.round(stlStorage.t_amt * 100)
       }))
     );
 
+  if (!stlStorage && !job.ciecaid && job.storage_payable)
+    taxableAmounts.STOR = taxableAmounts.STOR.add(
+      Dinero({
+        amount: Math.round((job.storage_payable || 0) * 100)
+      })
+    );
+
   const pfp = job.parts_tax_rates;
 
   //For any profile level markups/discounts, add them in now as well.
@@ -988,7 +1007,7 @@ function CalculateTaxesTotals(job, otherTotals) {
   const pfo = job.cieca_pfo;
   Object.keys(taxableAmounts).map((key) => {
     try {
-      if (key.startsWith("PA")) {
+      if (key.startsWith("PA") && key !== "PAE") {
         const typeOfPart = key; // === "PAM" ? "PAC" : key;
         //At least one of these scenarios must be taxable.
         for (let tyCounter = 1; tyCounter <= 5; tyCounter++) {

server/media/imgproxy-media.js

@@ -44,25 +44,25 @@ const generateSignedUploadUrls = async (req, res) => {
     for (const filename of filenames) {
       const key = filename;
       const client = new S3Client({ region: InstanceRegion() });
-      
+
       // Check if filename indicates PDF and set content type accordingly
-      const isPdf = filename.toLowerCase().endsWith('.pdf');
+      const isPdf = filename.toLowerCase().endsWith(".pdf");
       const commandParams = {
         Bucket: imgproxyDestinationBucket,
         Key: key,
         StorageClass: "INTELLIGENT_TIERING"
       };
-      
+
       if (isPdf) {
         commandParams.ContentType = "application/pdf";
       }
-      
+
       const command = new PutObjectCommand(commandParams);
 
       // For PDFs, we need to add conditions to the presigned URL to enforce content type
       const presignedUrlOptions = { expiresIn: 360 };
       if (isPdf) {
-        presignedUrlOptions.signableHeaders = new Set(['content-type']);
+        presignedUrlOptions.signableHeaders = new Set(["content-type"]);
       }
 
       const presignedUrl = await getSignedUrl(client, command, presignedUrlOptions);
@@ -265,6 +265,82 @@ const downloadFiles = async (req, res) => {
   }
 };
 
+/**
+ * Stream original image content by document ID
+ * @param req
+ * @param res
+ * @returns {Promise<*>}
+ */
+const getOriginalImageByDocumentId = async (req, res) => {
+  const {
+    body: { documentId },
+    user,
+    userGraphQLClient
+  } = req;
+
+  if (!documentId) {
+    return res.status(400).json({ message: "documentId is required" });
+  }
+
+  try {
+    logger.log("imgproxy-original-image", "DEBUG", user?.email, null, { documentId });
+
+    const { documents } = await userGraphQLClient.request(GET_DOCUMENTS_BY_IDS, { documentIds: [documentId] });
+
+    if (!documents || documents.length === 0) {
+      return res.status(404).json({ message: "Document not found" });
+    }
+
+    const [document] = documents;
+    const { type } = document;
+
+    if (!type || !type.startsWith("image")) {
+      return res.status(400).json({ message: "Document is not an image" });
+    }
+
+    const s3client = new S3Client({ region: InstanceRegion() });
+    const key = keyStandardize(document);
+
+    let s3Response;
+    try {
+      s3Response = await s3client.send(
+        new GetObjectCommand({
+          Bucket: imgproxyDestinationBucket,
+          Key: key
+        })
+      );
+    } catch (err) {
+      logger.log("imgproxy-original-image-s3-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      return res.status(400).json({ message: "Unable to retrieve image" });
+    }
+
+    res.setHeader("Content-Type", type || "image/jpeg");
+
+    s3Response.Body.on("error", (err) => {
+      logger.log("imgproxy-original-image-s3stream-error", "ERROR", user?.email, null, {
+        key,
+        message: err.message,
+        stack: err.stack
+      });
+      res.destroy(err);
+    });
+
+    s3Response.Body.pipe(res);
+  } catch (error) {
+    logger.log("imgproxy-original-image-error", "ERROR", req.user?.email, null, {
+      documentId,
+      message: error.message,
+      stack: error.stack
+    });
+
+    return res.status(400).json({ message: error.message, stack: error.stack });
+  }
+};
+
 /**
  * Delete Files
  * @param req
@@ -425,6 +501,7 @@ const keyStandardize = (doc) => {
 module.exports = {
   generateSignedUploadUrls,
   getThumbnailUrls,
+  getOriginalImageByDocumentId,
   downloadFiles,
   deleteFiles,
   moveFiles

server/notifications/autoAddWatchers.js

@@ -39,6 +39,7 @@ const autoAddWatchers = async (req) => {
   const jobId = event?.data?.new?.id;
   const shopId = event?.data?.new?.shopid;
   const roNumber = event?.data?.new?.ro_number || "unknown";
+  const createdUserEmail = event?.data?.new?.created_user_email || "Unknown";
 
   if (!jobId || !shopId) {
     throw new Error(`Missing jobId (${jobId}) or shopId (${shopId}) for auto-add watchers`);
@@ -61,7 +62,8 @@ const autoAddWatchers = async (req) => {
     const [notificationData, existingWatchersData] = await Promise.all([
       gqlClient.request(GET_NOTIFICATION_WATCHERS, {
         shopId,
-        employeeIds: notificationFollowers
+        employeeIds: notificationFollowers,
+        createdUserEmail
       }),
       gqlClient.request(GET_JOB_WATCHERS_MINIMAL, { jobid: jobId })
     ]);

server/notifications/eventHandlers.js

@@ -205,9 +205,8 @@ const handleTaskSocketEmit = (req) => {
  * @returns {Promise<Object>} JSON response with a success message.
  */
 const handleTasksChange = async (req, res) => {
-  // Handle Notification Event
-  processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
   handleTaskSocketEmit(req);
+  return processNotificationEvent(req, res, "req.body.event.new.jobid", "Tasks Notifications Event Handled.");
 };
 
 /**

server/notifications/queues/appQueue.js

@@ -42,6 +42,13 @@ const buildNotificationContent = (notifications) => {
   };
 };
 
+/**
+ * Convert MS to S
+ * @param ms
+ * @returns {number}
+ */
+const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
+
 /**
  * Initializes the notification queues and workers for adding and consolidating notifications.
  */
@@ -52,6 +59,13 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
 
     devDebugLogger(`Initializing Notifications Queues with prefix: ${prefix}`);
 
+    // Redis key helpers (per jobId)
+    const recipientsSetKey = (jobId) => `app:${devKey}:recipients:${jobId}`; // set of `${user}:${bodyShopId}`
+    const recipientAssocHashKey = (jobId) => `app:${devKey}:recipientAssoc:${jobId}`; // hash `${user}:${bodyShopId}` => associationId
+    const consolidateFlagKey = (jobId) => `app:${devKey}:consolidate:${jobId}`;
+    const lockKeyForJob = (jobId) => `lock:${devKey}:consolidate:${jobId}`;
+    const listKey = ({ jobId, user, bodyShopId }) => `app:${devKey}:notifications:${jobId}:${user}:${bodyShopId}`;
+
     addQueue = new Queue("notificationsAdd", {
       prefix,
       connection: pubClient,
@@ -70,27 +84,39 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
         const { jobId, key, variables, recipients, body, jobRoNumber } = job.data;
         devDebugLogger(`Adding notifications for jobId ${jobId}`);
 
-        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
         const notification = { key, variables, body, jobRoNumber, timestamp: Date.now() };
 
-        for (const recipient of recipients) {
-          const { user } = recipient;
-          const userKey = `${redisKeyPrefix}:${user}`;
-          const existingNotifications = await pubClient.get(userKey);
-          const notifications = existingNotifications ? JSON.parse(existingNotifications) : [];
-          notifications.push(notification);
-          await pubClient.set(userKey, JSON.stringify(notifications), "EX", NOTIFICATION_STORAGE_EXPIRATION / 1000);
-          devDebugLogger(`Stored notification for ${user} under ${userKey}: ${JSON.stringify(notifications)}`);
+        // Store notifications atomically (RPUSH) and store recipients in a Redis set
+        for (const recipient of recipients || []) {
+          const { user, bodyShopId, associationId } = recipient;
+          if (!user || !bodyShopId) continue;
+
+          const rk = `${user}:${bodyShopId}`;
+
+          // (1) Store notification payload in a list (atomic append)
+          const lk = listKey({ jobId, user, bodyShopId });
+          await pubClient.rpush(lk, JSON.stringify(notification));
+          await pubClient.expire(lk, seconds(NOTIFICATION_STORAGE_EXPIRATION));
+
+          // (2) Track recipients in a set, and associationId in a hash
+          await pubClient.sadd(recipientsSetKey(jobId), rk);
+          await pubClient.expire(recipientsSetKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
+
+          if (associationId) {
+            await pubClient.hset(recipientAssocHashKey(jobId), rk, String(associationId));
+          }
+          await pubClient.expire(recipientAssocHashKey(jobId), seconds(NOTIFICATION_STORAGE_EXPIRATION));
         }
 
-        const consolidateKey = `app:${devKey}:consolidate:${jobId}`;
-        const flagSet = await pubClient.setnx(consolidateKey, "pending");
+        // Schedule consolidation once per jobId
+        const flagKey = consolidateFlagKey(jobId);
+        const flagSet = await pubClient.setnx(flagKey, "pending");
         devDebugLogger(`Consolidation flag set for jobId ${jobId}: ${flagSet}`);
 
         if (flagSet) {
           await consolidateQueue.add(
             "consolidate-notifications",
-            { jobId, recipients },
+            { jobId },
             {
               jobId: `consolidate-${jobId}`,
               delay: APP_CONSOLIDATION_DELAY,
@@ -98,8 +124,9 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
               backoff: LOCK_EXPIRATION
             }
           );
+
+          await pubClient.expire(flagKey, seconds(CONSOLIDATION_FLAG_EXPIRATION));
           devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
-          await pubClient.expire(consolidateKey, CONSOLIDATION_FLAG_EXPIRATION / 1000);
         } else {
           devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
         }
@@ -114,122 +141,167 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     const consolidateWorker = new Worker(
       "notificationsConsolidate",
       async (job) => {
-        const { jobId, recipients } = job.data;
+        const { jobId } = job.data;
         devDebugLogger(`Consolidating notifications for jobId ${jobId}`);
 
-        const redisKeyPrefix = `app:${devKey}:notifications:${jobId}`;
-        const lockKey = `lock:${devKey}:consolidate:${jobId}`;
-
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
+        const lockKey = lockKeyForJob(jobId);
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
         devDebugLogger(`Lock acquisition for jobId ${jobId}: ${lockAcquired}`);
 
-        if (lockAcquired) {
-          try {
-            const allNotifications = {};
-            const uniqueUsers = [...new Set(recipients.map((r) => r.user))];
-            devDebugLogger(`Unique users for jobId ${jobId}: ${uniqueUsers}`);
-
-            for (const user of uniqueUsers) {
-              const userKey = `${redisKeyPrefix}:${user}`;
-              const notifications = await pubClient.get(userKey);
-              devDebugLogger(`Retrieved notifications for ${user}: ${notifications}`);
-
-              if (notifications) {
-                const parsedNotifications = JSON.parse(notifications);
-                const userRecipients = recipients.filter((r) => r.user === user);
-                for (const { bodyShopId } of userRecipients) {
-                  allNotifications[user] = allNotifications[user] || {};
-                  allNotifications[user][bodyShopId] = parsedNotifications;
-                }
-                await pubClient.del(userKey);
-                devDebugLogger(`Deleted Redis key ${userKey}`);
-              } else {
-                devDebugLogger(`No notifications found for ${user} under ${userKey}`);
-              }
-            }
-
-            devDebugLogger(`Consolidated notifications: ${JSON.stringify(allNotifications)}`);
-
-            // Insert notifications into the database and collect IDs
-            const notificationInserts = [];
-            const notificationIdMap = new Map();
-
-            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
-              const userRecipients = recipients.filter((r) => r.user === user);
-              const associationId = userRecipients[0]?.associationId;
-
-              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
-                const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
-                notificationInserts.push({
-                  jobid: jobId,
-                  associationid: associationId,
-                  scenario_text: JSON.stringify(scenario_text),
-                  fcm_text: fcm_text,
-                  scenario_meta: JSON.stringify(scenario_meta)
-                });
-                notificationIdMap.set(`${user}:${bodyShopId}`, null);
-              }
-            }
-
-            if (notificationInserts.length > 0) {
-              const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, {
-                objects: notificationInserts
-              });
-              devDebugLogger(
-                `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
-              );
-
-              insertResponse.insert_notifications.returning.forEach((row, index) => {
-                const user = uniqueUsers[Math.floor(index / Object.keys(allNotifications[uniqueUsers[0]]).length)];
-                const bodyShopId = Object.keys(allNotifications[user])[
-                  index % Object.keys(allNotifications[user]).length
-                ];
-                notificationIdMap.set(`${user}:${bodyShopId}`, row.id);
-              });
-            }
-
-            // Emit notifications to users via Socket.io with notification ID
-            for (const [user, bodyShopData] of Object.entries(allNotifications)) {
-              const userMapping = await redisHelpers.getUserSocketMapping(user);
-              const userRecipients = recipients.filter((r) => r.user === user);
-              const associationId = userRecipients[0]?.associationId;
-
-              for (const [bodyShopId, notifications] of Object.entries(bodyShopData)) {
-                const notificationId = notificationIdMap.get(`${user}:${bodyShopId}`);
-                const jobRoNumber = notifications[0]?.jobRoNumber;
-
-                if (userMapping && userMapping[bodyShopId]?.socketIds) {
-                  userMapping[bodyShopId].socketIds.forEach((socketId) => {
-                    ioRedis.to(socketId).emit("notification", {
-                      jobId,
-                      jobRoNumber,
-                      bodyShopId,
-                      notifications,
-                      notificationId,
-                      associationId
-                    });
-                  });
-                  devDebugLogger(
-                    `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} with notificationId ${notificationId}`
-                  );
-                } else {
-                  devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
-                }
-              }
-            }
-
-            await pubClient.del(`app:${devKey}:consolidate:${jobId}`);
-          } catch (err) {
-            logger.log(`app-queue-consolidation-error`, "ERROR", "notifications", "api", {
-              message: err?.message,
-              stack: err?.stack
-            });
-            throw err;
-          } finally {
-            await pubClient.del(lockKey);
-          }
-        } else {
+        if (!lockAcquired) {
           devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
+          return;
+        }
+
+        try {
+          const rkSet = recipientsSetKey(jobId);
+          const assocHash = recipientAssocHashKey(jobId);
+
+          const recipientKeys = await pubClient.smembers(rkSet);
+          if (!recipientKeys?.length) {
+            devDebugLogger(`No recipients found for jobId ${jobId}, nothing to consolidate.`);
+            await pubClient.del(consolidateFlagKey(jobId));
+            return;
+          }
+
+          const assocMap = await pubClient.hgetall(assocHash);
+
+          // Collect notifications by recipientKey
+          const notificationsByRecipient = new Map(); // rk => parsed notifications array
+          const listKeysToDelete = []; // delete only after successful insert+emit
+
+          for (const rk of recipientKeys) {
+            const [user, bodyShopId] = rk.split(":");
+            const lk = listKey({ jobId, user, bodyShopId });
+
+            const items = await pubClient.lrange(lk, 0, -1);
+            if (!items?.length) continue;
+
+            const parsed = items
+              .map((x) => {
+                try {
+                  return JSON.parse(x);
+                } catch {
+                  return null;
+                }
+              })
+              .filter(Boolean);
+
+            if (parsed.length) {
+              notificationsByRecipient.set(rk, parsed);
+
+              // IMPORTANT: do NOT delete list yet; only delete after successful insert+emit
+              listKeysToDelete.push(lk);
+            }
+          }
+
+          if (!notificationsByRecipient.size) {
+            devDebugLogger(`No notifications found in lists for jobId ${jobId}, nothing to insert/emit.`);
+            if (listKeysToDelete.length) {
+              await pubClient.del(...listKeysToDelete);
+            }
+            await pubClient.del(rkSet);
+            await pubClient.del(assocHash);
+            await pubClient.del(consolidateFlagKey(jobId));
+            return;
+          }
+
+          // Build DB inserts
+          const inserts = [];
+          const insertMeta = []; // keep rk + associationId to emit after insert
+
+          for (const [rk, notifications] of notificationsByRecipient.entries()) {
+            const associationId = assocMap?.[rk];
+
+            // If your DB requires associationid NOT NULL, skip if missing
+            if (!associationId) {
+              devDebugLogger(`Skipping insert for ${rk} (missing associationId).`);
+              continue;
+            }
+
+            const { scenario_text, fcm_text, scenario_meta } = buildNotificationContent(notifications);
+
+            inserts.push({
+              jobid: jobId,
+              associationid: associationId,
+              // NOTE: if these are jsonb columns, remove JSON.stringify and pass arrays directly.
+              scenario_text: JSON.stringify(scenario_text),
+              fcm_text,
+              scenario_meta: JSON.stringify(scenario_meta)
+            });
+
+            insertMeta.push({ rk, associationId });
+          }
+
+          // Map notificationId by associationId from Hasura returning rows
+          const idByAssociationId = new Map();
+
+          if (inserts.length > 0) {
+            const insertResponse = await graphQLClient.request(INSERT_NOTIFICATIONS_MUTATION, { objects: inserts });
+
+            const returning = insertResponse?.insert_notifications?.returning || [];
+            returning.forEach((row) => {
+              // Expecting your mutation to return associationid as well as id.
+              // If your mutation currently doesn’t return associationid, update it.
+              if (row?.associationid) idByAssociationId.set(String(row.associationid), row.id);
+            });
+
+            devDebugLogger(
+              `Inserted ${insertResponse.insert_notifications.affected_rows} notifications for jobId ${jobId}`
+            );
+          }
+
+          // Emit via Socket.io
+          // Group by user to reduce mapping lookups
+          const uniqueUsers = [...new Set(insertMeta.map(({ rk }) => rk.split(":")[0]))];
+
+          for (const user of uniqueUsers) {
+            const userMapping = await redisHelpers.getUserSocketMapping(user);
+            const entriesForUser = insertMeta
+              .map((m) => ({ ...m, user: m.rk.split(":")[0], bodyShopId: m.rk.split(":")[1] }))
+              .filter((m) => m.user === user);
+
+            for (const entry of entriesForUser) {
+              const { rk, bodyShopId, associationId } = entry;
+              const notifications = notificationsByRecipient.get(rk) || [];
+              if (!notifications.length) continue;
+
+              const jobRoNumber = notifications[0]?.jobRoNumber;
+              const notificationId = idByAssociationId.get(String(associationId)) || null;
+
+              if (userMapping && userMapping[bodyShopId]?.socketIds) {
+                userMapping[bodyShopId].socketIds.forEach((socketId) => {
+                  ioRedis.to(socketId).emit("notification", {
+                    jobId,
+                    jobRoNumber,
+                    bodyShopId,
+                    notifications,
+                    notificationId,
+                    associationId
+                  });
+                });
+
+                devDebugLogger(
+                  `Sent ${notifications.length} consolidated notifications to ${user} for jobId ${jobId} (notificationId ${notificationId})`
+                );
+              } else {
+                devDebugLogger(`No socket IDs found for ${user} in bodyShopId ${bodyShopId}`);
+              }
+            }
+          }
+
+          // Cleanup recipient tracking keys + consolidation flag
+          await pubClient.del(rkSet);
+          await pubClient.del(assocHash);
+          await pubClient.del(consolidateFlagKey(jobId));
+        } catch (err) {
+          logger.log("app-queue-consolidation-error", "ERROR", "notifications", "api", {
+            message: err?.message,
+            stack: err?.stack
+          });
+          throw err;
+        } finally {
+          await pubClient.del(lockKey);
         }
       },
       {
@@ -244,13 +316,14 @@ const loadAppQueue = async ({ pubClient, logger, redisHelpers, ioRedis }) => {
     consolidateWorker.on("completed", (job) => devDebugLogger(`Consolidate job ${job.id} completed`));
 
     addWorker.on("failed", (job, err) =>
-      logger.log(`app-queue-notification-error`, "ERROR", "notifications", "api", {
+      logger.log("app-queue-notification-error", "ERROR", "notifications", "api", {
         message: err?.message,
         stack: err?.stack
       })
     );
+
     consolidateWorker.on("failed", (job, err) =>
-      logger.log(`app-queue-consolidation-failed:`, "ERROR", "notifications", "api", {
+      logger.log("app-queue-consolidation-failed", "ERROR", "notifications", "api", {
         message: err?.message,
         stack: err?.stack
       })
@@ -285,11 +358,13 @@ const dispatchAppsToQueue = async ({ appsToDispatch }) => {
 
   for (const app of appsToDispatch) {
     const { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber } = app;
+
     await appQueue.add(
       "add-notification",
       { jobId, bodyShopId, key, variables, recipients, body, jobRoNumber },
       { jobId: `${jobId}-${Date.now()}` }
     );
+
     devDebugLogger(`Added notification to queue for jobId ${jobId} with ${recipients.length} recipients`);
   }
 };

server/notifications/queues/emailQueue.js

@@ -27,6 +27,16 @@ let emailConsolidateQueue;
 let emailAddWorker;
 let emailConsolidateWorker;
 
+const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
+
+const escapeHtml = (s = "") =>
+  String(s)
+    .replace(/&/g, "&")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&#39;");
+
 /**
  * Initializes the email notification queues and workers.
  *
@@ -65,17 +75,21 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
 
         const redisKeyPrefix = `email:${devKey}:notifications:${jobId}`;
 
-        for (const recipient of recipients) {
+        for (const recipient of recipients || []) {
           const { user, firstName, lastName } = recipient;
+          if (!user) continue;
           const userKey = `${redisKeyPrefix}:${user}`;
           await pubClient.rpush(userKey, body);
-          await pubClient.expire(userKey, NOTIFICATION_EXPIRATION / 1000);
+          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
           const detailsKey = `email:${devKey}:recipientDetails:${jobId}:${user}`;
           await pubClient.hsetnx(detailsKey, "firstName", firstName || "");
           await pubClient.hsetnx(detailsKey, "lastName", lastName || "");
-          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", bodyShopTimezone);
-          await pubClient.expire(detailsKey, NOTIFICATION_EXPIRATION / 1000);
-          await pubClient.sadd(`email:${devKey}:recipients:${jobId}`, user);
+          const tzValue = bodyShopTimezone || "UTC";
+          await pubClient.hsetnx(detailsKey, "bodyShopTimezone", tzValue);
+          await pubClient.expire(detailsKey, seconds(NOTIFICATION_EXPIRATION));
+          const recipientsSetKey = `email:${devKey}:recipients:${jobId}`;
+          await pubClient.sadd(recipientsSetKey, user);
+          await pubClient.expire(recipientsSetKey, seconds(NOTIFICATION_EXPIRATION));
           devDebugLogger(`Stored message for ${user} under ${userKey}: ${body}`);
         }
 
@@ -93,7 +107,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
             }
           );
           devDebugLogger(`Scheduled email consolidation for jobId ${jobId}`);
-          await pubClient.expire(consolidateKey, CONSOLIDATION_KEY_EXPIRATION / 1000);
+          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
         } else {
           devDebugLogger(`Email consolidation already scheduled for jobId ${jobId}`);
         }
@@ -113,7 +127,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
         devDebugLogger(`Consolidating emails for jobId ${jobId}`);
 
         const lockKey = `lock:${devKey}:emailConsolidate:${jobId}`;
-        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", LOCK_EXPIRATION / 1000);
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
         if (lockAcquired) {
           try {
             const recipientsSet = `email:${devKey}:recipients:${jobId}`;
@@ -139,7 +153,7 @@ const loadEmailQueue = async ({ pubClient, logger }) => {
                     <table class="row" style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; padding: 0; width: 100%; position: relative; display: table;"><tbody style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; display: table-row-group;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;">
                       <th class="small-12 large-12 columns first last" style="word-wrap: break-word; -webkit-hyphens: auto; -moz-hyphens: auto; hyphens: auto; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; line-height: 1.2; margin: 0 auto; Margin: 0 auto; padding-bottom: 16px; width: 734px; padding-left: 8px; padding-right: 8px; border-collapse: collapse;"><table style="border-spacing: 0; border-collapse: collapse; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; width: 100%;"><tr style="padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; vertical-align: top; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif;"><td style="word-wrap: break-word; vertical-align: top; color: #0a0a0a; font-weight: normal; padding-top: 0; padding-right: 0; padding-bottom: 0; padding-left: 0; margin: 0; Margin: 0; text-align: left; font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 15px; word-break: keep-all; -moz-hyphens: none; -ms-hyphens: none; -webkit-hyphens: none; hyphens: none; line-height: 1.2; border-collapse: collapse;">
                         <ul style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; margin: 1%; padding-left: 30px;">
-                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${msg}</li>`).join("")}
+                          ${messages.map((msg) => `<li style="font-family: 'Montserrat', 'Montserrat Alternates', sans-serif; font-size: 90%;">${escapeHtml(msg)}</li>`).join("")}
                         </ul>
                       </td></tr></table></th>
                     </tr><tbody></table>
@@ -239,7 +253,13 @@ const dispatchEmailsToQueue = async ({ emailsToDispatch, logger }) => {
   const emailAddQueue = getQueue();
 
   for (const email of emailsToDispatch) {
-    const { jobId, jobRoNumber, bodyShopName, bodyShopTimezone, body, recipients } = email;
+    const { jobId, bodyShopName, bodyShopTimezone, body, recipients } = email;
+    let { jobRoNumber } = email;
+
+    // Make sure Jobs that have not been coverted yet can still get notifications
+    if (jobRoNumber === null) {
+      jobRoNumber = "N/A";
+    }
 
     if (!jobId || !jobRoNumber || !bodyShopName || !body || !recipients.length) {
       devDebugLogger(

server/notifications/queues/fcmQueue.js

@@ -0,0 +1,569 @@
+// NOTE: Despite the filename, this implementation targets Expo Push Tokens (ExponentPushToken[...]).
+// It does NOT use Firebase Admin and does NOT require credentials (no EXPO_ACCESS_TOKEN).
+
+const { Queue, Worker } = require("bullmq");
+const { registerCleanupTask } = require("../../utils/cleanupManager");
+const getBullMQPrefix = require("../../utils/getBullMQPrefix");
+const devDebugLogger = require("../../utils/devDebugLogger");
+
+const { client: gqlClient } = require("../../graphql-client/graphql-client");
+const { GET_USERS_FCM_TOKENS_BY_EMAILS, UPDATE_USER_FCM_TOKENS_BY_EMAIL } = require("../../graphql-client/queries");
+
+const FCM_CONSOLIDATION_DELAY_IN_MINS = (() => {
+  const envValue = process.env?.FCM_CONSOLIDATION_DELAY_IN_MINS;
+  const parsedValue = envValue ? parseInt(envValue, 10) : NaN;
+  return isNaN(parsedValue) ? 3 : Math.max(1, parsedValue);
+})();
+
+const FCM_CONSOLIDATION_DELAY = FCM_CONSOLIDATION_DELAY_IN_MINS * 60000;
+
+// pegged constants (pattern matches your other queues)
+const CONSOLIDATION_KEY_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
+
+// IMPORTANT: lock must outlive a full consolidation run to avoid duplicate sends.
+const LOCK_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
+
+// Keep Bull backoff separate from lock TTL to avoid unexpected long retries.
+const BACKOFF_DELAY = Math.max(1000, Math.floor(FCM_CONSOLIDATION_DELAY * 0.25));
+
+const RATE_LIMITER_DURATION = FCM_CONSOLIDATION_DELAY * 0.1;
+const NOTIFICATION_EXPIRATION = FCM_CONSOLIDATION_DELAY * 1.5;
+
+const EXPO_PUSH_ENDPOINT = "https://exp.host/--/api/v2/push/send";
+const EXPO_MAX_MESSAGES_PER_REQUEST = 100;
+
+let fcmAddQueue;
+let fcmConsolidateQueue;
+let fcmAddWorker;
+let fcmConsolidateWorker;
+
+/**
+ * Milliseconds to seconds.
+ * @param ms
+ * @returns {number}
+ */
+const seconds = (ms) => Math.max(1, Math.ceil(ms / 1000));
+
+/**
+ * Chunk an array into smaller arrays of given size.
+ * @param arr
+ * @param size
+ * @returns {*[]}
+ */
+const chunk = (arr, size) => {
+  const out = [];
+  for (let i = 0; i < arr.length; i += size) out.push(arr.slice(i, i + size));
+  return out;
+};
+
+/**
+ * Check if a string is an Expo push token.
+ * @param s
+ * @returns {boolean}
+ */
+const isExpoPushToken = (s) => {
+  if (!s || typeof s !== "string") return false;
+  // Common formats observed in the wild:
+  // - ExponentPushToken[xxxxxxxxxxxxxxxxxxxxxx]
+  // - ExpoPushToken[xxxxxxxxxxxxxxxxxxxxxx]
+  return /^ExponentPushToken\[[^\]]+\]$/.test(s) || /^ExpoPushToken\[[^\]]+\]$/.test(s);
+};
+
+/**
+ * Get unique, trimmed strings from an array.
+ * @param arr
+ * @returns {any[]}
+ */
+const uniqStrings = (arr) => [
+  ...new Set(
+    arr
+      .filter(Boolean)
+      .map((x) => String(x).trim())
+      .filter(Boolean)
+  )
+];
+
+/**
+ * Normalize users.fcmtokens (jsonb) into an array of Expo push tokens.
+ *
+ * New expected shape (example):
+ * {
+ *   "ExponentPushToken[dksJAdLUTofdEk7P59thue]": {
+ *     "platform": "ios",
+ *     "timestamp": 1767397802709,
+ *     "pushTokenString": "ExponentPushToken[dksJAdLUTofdEk7P59thue]"
+ *   }
+ * }
+ *
+ * Also supports older/alternate shapes:
+ *  - string: "ExponentPushToken[...]"
+ *  - array: ["ExponentPushToken[...]", ...]
+ *  - object: token keys OR values containing token-like fields
+ * @param fcmtokens
+ * @returns {string[]|*[]}
+ */
+const normalizeTokens = (fcmtokens) => {
+  if (!fcmtokens) return [];
+
+  if (typeof fcmtokens === "string") {
+    const s = fcmtokens.trim();
+    return isExpoPushToken(s) ? [s] : [];
+  }
+
+  if (Array.isArray(fcmtokens)) {
+    return uniqStrings(fcmtokens).filter(isExpoPushToken);
+  }
+
+  if (typeof fcmtokens === "object") {
+    const keys = Object.keys(fcmtokens || {});
+    const vals = Object.values(fcmtokens || {});
+
+    const fromKeys = keys.filter(isExpoPushToken);
+
+    const fromValues = vals
+      .map((v) => {
+        if (!v) return null;
+
+        // Some shapes store token as a string value directly
+        if (typeof v === "string") return v;
+
+        if (typeof v === "object") {
+          // Your new shape uses pushTokenString
+          return v.pushTokenString || v.token || v.expoPushToken || null;
+        }
+
+        return null;
+      })
+      .filter(Boolean)
+      .map(String);
+
+    return uniqStrings([...fromKeys, ...fromValues]).filter(isExpoPushToken);
+  }
+
+  return [];
+};
+
+/**
+ * Remove specified tokens from the stored fcmtokens jsonb while preserving the original shape.
+ * @param fcmtokens
+ * @param tokensToRemove
+ * @returns {*}
+ */
+const removeTokensFromFcmtokens = (fcmtokens, tokensToRemove) => {
+  const remove = new Set((tokensToRemove || []).map((t) => String(t).trim()).filter(Boolean));
+  if (!remove.size) return fcmtokens;
+  if (!fcmtokens) return fcmtokens;
+
+  if (typeof fcmtokens === "string") {
+    const s = fcmtokens.trim();
+    return remove.has(s) ? null : fcmtokens;
+  }
+
+  if (Array.isArray(fcmtokens)) {
+    const next = fcmtokens.filter((t) => !remove.has(String(t).trim()));
+    return next.length ? next : [];
+  }
+
+  if (typeof fcmtokens === "object") {
+    const next = {};
+    for (const [k, v] of Object.entries(fcmtokens)) {
+      const keyIsToken = isExpoPushToken(k) && remove.has(k);
+
+      let valueToken = null;
+      if (typeof v === "string") valueToken = v;
+      else if (v && typeof v === "object") valueToken = v.pushTokenString || v.token || v.expoPushToken || null;
+
+      const valueIsToken = valueToken && remove.has(String(valueToken).trim());
+
+      if (keyIsToken || valueIsToken) continue;
+      next[k] = v;
+    }
+    return Object.keys(next).length ? next : {};
+  }
+
+  return fcmtokens;
+};
+
+/**
+ * Safely parse JSON response.
+ * @param res
+ * @returns {Promise<*|null>}
+ */
+const safeJson = async (res) => {
+  try {
+    return await res.json();
+  } catch {
+    return null;
+  }
+};
+
+/**
+ * Send Expo push notifications.
+ * Returns invalid tokens that should be removed (e.g., DeviceNotRegistered).
+ *
+ * @param {Array<Object>} messages Expo messages array
+ * @param {Object} logger
+ * @returns {Promise<{invalidTokens: string[], ticketIds: string[]}>}
+ */
+const sendExpoPush = async ({ messages, logger }) => {
+  if (!messages?.length) return { invalidTokens: [], ticketIds: [] };
+
+  const invalidTokens = new Set();
+  const ticketIds = [];
+
+  for (const batch of chunk(messages, EXPO_MAX_MESSAGES_PER_REQUEST)) {
+    const res = await fetch(EXPO_PUSH_ENDPOINT, {
+      method: "POST",
+      headers: {
+        accept: "application/json",
+        "content-type": "application/json"
+      },
+      body: JSON.stringify(batch)
+    });
+
+    const payload = await safeJson(res);
+
+    if (!res.ok) {
+      logger?.log?.("expo-push-http-error", "ERROR", "notifications", "api", {
+        status: res.status,
+        statusText: res.statusText,
+        payload
+      });
+      throw new Error(`Expo push HTTP error: ${res.status} ${res.statusText}`);
+    }
+
+    const tickets = Array.isArray(payload?.data) ? payload.data : payload?.data ? [payload.data] : [];
+
+    if (!tickets.length) {
+      logger?.log?.("expo-push-bad-response", "ERROR", "notifications", "api", { payload });
+      continue;
+    }
+
+    // Expo returns tickets in the same order as messages in the request batch
+    for (let i = 0; i < tickets.length; i++) {
+      const t = tickets[i];
+      const msg = batch[i];
+      const token = typeof msg?.to === "string" ? msg.to : null;
+
+      if (t?.status === "ok" && t?.id) ticketIds.push(String(t.id));
+
+      if (t?.status === "error") {
+        const errCode = t?.details?.error;
+        const msgText = String(t?.message || "");
+
+        const shouldDelete =
+          errCode === "DeviceNotRegistered" || /not a registered push notification recipient/i.test(msgText);
+
+        if (shouldDelete && token && isExpoPushToken(token)) {
+          invalidTokens.add(token);
+        }
+
+        logger?.log?.("expo-push-ticket-error", "ERROR", "notifications", "api", {
+          token,
+          ticket: t
+        });
+      }
+    }
+  }
+
+  return { invalidTokens: [...invalidTokens], ticketIds };
+};
+
+/**
+ * Build a summary string for push notification body.
+ * @param count
+ * @param jobRoNumber
+ * @param bodyShopName
+ * @returns {`${string} ${string} for ${string|string}${string|string}`}
+ */
+const buildPushSummary = ({ count, jobRoNumber, bodyShopName }) => {
+  const updates = count === 1 ? "update" : "updates";
+  const ro = jobRoNumber ? `RO ${jobRoNumber}` : "a job";
+  const shop = bodyShopName ? ` at ${bodyShopName}` : "";
+  return `${count} ${updates} for ${ro}${shop}`;
+};
+
+/**
+ * Loads the push notification queues and workers (Expo push).
+ * @param pubClient
+ * @param logger
+ * @returns {Promise<Queue|null>}
+ */
+const loadFcmQueue = async ({ pubClient, logger }) => {
+  if (!fcmAddQueue || !fcmConsolidateQueue) {
+    const prefix = getBullMQPrefix();
+    const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
+
+    devDebugLogger(`Initializing Expo Push Queues with prefix: ${prefix}`);
+
+    fcmAddQueue = new Queue("fcmAdd", {
+      prefix,
+      connection: pubClient,
+      defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
+    });
+
+    fcmConsolidateQueue = new Queue("fcmConsolidate", {
+      prefix,
+      connection: pubClient,
+      defaultJobOptions: { removeOnComplete: true, removeOnFail: true }
+    });
+
+    fcmAddWorker = new Worker(
+      "fcmAdd",
+      async (job) => {
+        const { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients } =
+          job.data;
+
+        devDebugLogger(`Adding push notifications for jobId ${jobId}`);
+
+        const recipientsSetKey = `fcm:${devKey}:recipients:${jobId}`; // set of user emails
+        const metaKey = `fcm:${devKey}:meta:${jobId}`;
+        const redisKeyPrefix = `fcm:${devKey}:notifications:${jobId}`; // per-user list keys
+
+        // Store job-level metadata (always keep latest values)
+        await pubClient.hset(metaKey, "jobRoNumber", jobRoNumber || "");
+        await pubClient.hset(metaKey, "bodyShopId", bodyShopId || "");
+        await pubClient.hset(metaKey, "bodyShopName", bodyShopName || "");
+        await pubClient.expire(metaKey, seconds(NOTIFICATION_EXPIRATION));
+
+        for (const r of recipients || []) {
+          const user = r?.user;
+          const associationId = r?.associationId;
+
+          if (!user) continue;
+
+          const userKey = `${redisKeyPrefix}:${user}`;
+          const payload = JSON.stringify({
+            body: body || "",
+            scenarioKey: scenarioKey || "",
+            key: key || "",
+            variables: variables || {},
+            associationId: associationId ? String(associationId) : null,
+            ts: Date.now()
+          });
+
+          await pubClient.rpush(userKey, payload);
+          await pubClient.expire(userKey, seconds(NOTIFICATION_EXPIRATION));
+
+          await pubClient.sadd(recipientsSetKey, user);
+          await pubClient.expire(recipientsSetKey, seconds(NOTIFICATION_EXPIRATION));
+        }
+
+        const consolidateKey = `fcm:${devKey}:consolidate:${jobId}`;
+        const flagSet = await pubClient.setnx(consolidateKey, "pending");
+
+        if (flagSet) {
+          await fcmConsolidateQueue.add(
+            "consolidate-fcm",
+            { jobId },
+            {
+              jobId: `consolidate-${jobId}`,
+              delay: FCM_CONSOLIDATION_DELAY,
+              attempts: 3,
+              backoff: BACKOFF_DELAY
+            }
+          );
+
+          await pubClient.expire(consolidateKey, seconds(CONSOLIDATION_KEY_EXPIRATION));
+          devDebugLogger(`Scheduled consolidation for jobId ${jobId}`);
+        } else {
+          devDebugLogger(`Consolidation already scheduled for jobId ${jobId}`);
+        }
+      },
+      { prefix, connection: pubClient, concurrency: 5 }
+    );
+
+    fcmConsolidateWorker = new Worker(
+      "fcmConsolidate",
+      async (job) => {
+        const { jobId } = job.data;
+        const devKey = process.env?.NODE_ENV === "production" ? "prod" : "dev";
+
+        const lockKey = `lock:${devKey}:fcmConsolidate:${jobId}`;
+        const lockAcquired = await pubClient.set(lockKey, "locked", "NX", "EX", seconds(LOCK_EXPIRATION));
+
+        if (!lockAcquired) {
+          devDebugLogger(`Skipped consolidation for jobId ${jobId} - lock held by another worker`);
+          return;
+        }
+
+        try {
+          const recipientsSet = `fcm:${devKey}:recipients:${jobId}`;
+          const userEmails = await pubClient.smembers(recipientsSet);
+
+          if (!userEmails?.length) {
+            devDebugLogger(`No recipients found for jobId ${jobId}`);
+            await pubClient.del(`fcm:${devKey}:consolidate:${jobId}`);
+            return;
+          }
+
+          // Load meta
+          const metaKey = `fcm:${devKey}:meta:${jobId}`;
+          const meta = await pubClient.hgetall(metaKey);
+          const jobRoNumber = meta?.jobRoNumber || "";
+          const bodyShopId = meta?.bodyShopId || "";
+          const bodyShopName = meta?.bodyShopName || "";
+
+          // Fetch tokens for all recipients (1 DB round-trip)
+          const usersResp = await gqlClient.request(GET_USERS_FCM_TOKENS_BY_EMAILS, { emails: userEmails });
+
+          // Map: email -> { raw, tokens }
+          const tokenMap = new Map(
+            (usersResp?.users || []).map((u) => [
+              String(u.email),
+              { raw: u.fcmtokens, tokens: normalizeTokens(u.fcmtokens) }
+            ])
+          );
+
+          for (const userEmail of userEmails) {
+            const userKey = `fcm:${devKey}:notifications:${jobId}:${userEmail}`;
+            const raw = await pubClient.lrange(userKey, 0, -1);
+
+            if (!raw?.length) {
+              await pubClient.del(userKey);
+              continue;
+            }
+
+            const parsed = raw
+              .map((x) => {
+                try {
+                  return JSON.parse(x);
+                } catch {
+                  return null;
+                }
+              })
+              .filter(Boolean);
+
+            const count = parsed.length;
+            const notificationBody = buildPushSummary({ count, jobRoNumber, bodyShopName });
+
+            // associationId should be stable for a user in a job’s bodyshop; take first non-null
+            const firstWithAssociation = parsed.find((p) => p?.associationId != null);
+            const associationId =
+              firstWithAssociation?.associationId != null ? String(firstWithAssociation.associationId) : "";
+
+            const tokenInfo = tokenMap.get(String(userEmail)) || { raw: null, tokens: [] };
+            const tokens = tokenInfo.tokens || [];
+
+            if (!tokens.length) {
+              devDebugLogger(`No Expo push tokens for ${userEmail}; skipping push for jobId ${jobId}`);
+              await pubClient.del(userKey);
+              continue;
+            }
+
+            // Build 1 message per device token
+            const messages = tokens.map((token) => ({
+              to: token,
+              title: "ImEX Online",
+              body: notificationBody,
+              priority: "high",
+              data: {
+                type: "job-notification",
+                jobId: String(jobId),
+                jobRoNumber: String(jobRoNumber || ""),
+                bodyShopId: String(bodyShopId || ""),
+                bodyShopName: String(bodyShopName || ""),
+                associationId: String(associationId || ""),
+                userEmail: String(userEmail),
+                count: String(count)
+              }
+            }));
+
+            const { invalidTokens } = await sendExpoPush({ messages, logger });
+
+            // Opportunistic cleanup: remove invalid tokens from users.fcmtokens
+            if (invalidTokens?.length) {
+              try {
+                const nextFcmtokens = removeTokensFromFcmtokens(tokenInfo.raw, invalidTokens);
+
+                await gqlClient.request(UPDATE_USER_FCM_TOKENS_BY_EMAIL, {
+                  email: String(userEmail),
+                  fcmtokens: nextFcmtokens
+                });
+
+                devDebugLogger(`Cleaned ${invalidTokens.length} invalid Expo tokens for ${userEmail}`);
+              } catch (e) {
+                logger?.log?.("expo-push-token-cleanup-failed", "ERROR", "notifications", "api", {
+                  userEmail: String(userEmail),
+                  message: e?.message,
+                  stack: e?.stack
+                });
+                // Do not throw: cleanup failure should not retry the whole consolidation and risk duplicate pushes.
+              }
+            }
+
+            devDebugLogger(`Sent Expo push to ${userEmail} for jobId ${jobId} (${count} updates)`);
+
+            await pubClient.del(userKey);
+          }
+
+          await pubClient.del(recipientsSet);
+          await pubClient.del(metaKey);
+          await pubClient.del(`fcm:${devKey}:consolidate:${jobId}`);
+        } catch (err) {
+          logger.log("fcm-queue-consolidation-error", "ERROR", "notifications", "api", {
+            message: err?.message,
+            stack: err?.stack
+          });
+          throw err;
+        } finally {
+          await pubClient.del(lockKey);
+        }
+      },
+      { prefix, connection: pubClient, concurrency: 1, limiter: { max: 1, duration: RATE_LIMITER_DURATION } }
+    );
+
+    fcmAddWorker.on("failed", (job, err) =>
+      logger.log("fcm-add-failed", "ERROR", "notifications", "api", { message: err?.message, stack: err?.stack })
+    );
+
+    fcmConsolidateWorker.on("failed", (job, err) =>
+      logger.log("fcm-consolidate-failed", "ERROR", "notifications", "api", {
+        message: err?.message,
+        stack: err?.stack
+      })
+    );
+
+    const shutdown = async () => {
+      devDebugLogger("Closing push queue workers...");
+      await Promise.all([fcmAddWorker.close(), fcmConsolidateWorker.close()]);
+      devDebugLogger("Push queue workers closed");
+    };
+
+    registerCleanupTask(shutdown);
+  }
+
+  return fcmAddQueue;
+};
+
+/**
+ * Get the add queue.
+ * @returns {*}
+ */
+const getQueue = () => {
+  if (!fcmAddQueue) throw new Error("FCM add queue not initialized. Ensure loadFcmQueue is called during bootstrap.");
+  return fcmAddQueue;
+};
+
+/**
+ * Dispatch push notifications to the add queue.
+ * @param fcmsToDispatch
+ * @returns {Promise<void>}
+ */
+const dispatchFcmsToQueue = async ({ fcmsToDispatch }) => {
+  const queue = getQueue();
+
+  for (const fcm of fcmsToDispatch) {
+    const { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients } = fcm;
+
+    if (!jobId || !recipients?.length) continue;
+
+    await queue.add(
+      "add-fcm-notification",
+      { jobId, jobRoNumber, bodyShopId, bodyShopName, scenarioKey, key, variables, body, recipients },
+      { jobId: `${jobId}-${Date.now()}` }
+    );
+  }
+};
+
+module.exports = { loadFcmQueue, getQueue, dispatchFcmsToQueue };

server/notifications/scenarioBuilders.js

@@ -19,6 +19,8 @@ const buildNotification = (data, key, body, variables = {}) => {
       jobId: data.jobId,
       jobRoNumber: data.jobRoNumber,
       bodyShopId: data.bodyShopId,
+      scenarioKey: data.scenarioKey,
+      scenarioTable: data.scenarioTable,
       key,
       body,
       variables,
@@ -32,21 +34,47 @@ const buildNotification = (data, key, body, variables = {}) => {
       body,
       recipients: []
     },
-    fcm: { recipients: [] }
+    fcm: {
+      jobId: data.jobId,
+      jobRoNumber: data.jobRoNumber,
+      bodyShopId: data.bodyShopId,
+      bodyShopName: data.bodyShopName,
+      bodyShopTimezone: data.bodyShopTimezone,
+      scenarioKey: data.scenarioKey,
+      scenarioTable: data.scenarioTable,
+      key,
+      body,
+      variables,
+      recipients: []
+    }
   };
 
   // Populate recipients from scenarioWatchers
   data.scenarioWatchers.forEach((recipients) => {
     const { user, app, fcm, email, firstName, lastName, employeeId, associationId } = recipients;
-    if (app === true)
+
+    if (app === true) {
       result.app.recipients.push({
         user,
         bodyShopId: data.bodyShopId,
         employeeId,
         associationId
       });
-    if (fcm === true) result.fcm.recipients.push(user);
-    if (email === true) result.email.recipients.push({ user, firstName, lastName });
+    }
+
+    if (email === true) {
+      result.email.recipients.push({ user, firstName, lastName });
+    }
+
+    if (fcm === true) {
+      // Keep structure consistent and future-proof (token lookup is done server-side)
+      result.fcm.recipients.push({
+        user,
+        bodyShopId: data.bodyShopId,
+        employeeId,
+        associationId
+      });
+    }
   });
 
   return result;

server/notifications/scenarioParser.js

@@ -14,6 +14,7 @@ const { isEmpty, isFunction } = require("lodash");
 const { getMatchingScenarios } = require("./scenarioMapper");
 const { dispatchEmailsToQueue } = require("./queues/emailQueue");
 const { dispatchAppsToQueue } = require("./queues/appQueue");
+const { dispatchFcmsToQueue } = require("./queues/fcmQueue"); // NEW
 
 // If true, the user who commits the action will NOT receive notifications; if false, they will.
 const FILTER_SELF_FROM_WATCHERS = process.env?.FILTER_SELF_FROM_WATCHERS !== "false";
@@ -298,6 +299,16 @@ const scenarioParser = async (req, jobIdField) => {
       })
     );
   }
+
+  const fcmsToDispatch = scenariosToDispatch.map((scenario) => scenario?.fcm);
+  if (!isEmpty(fcmsToDispatch)) {
+    dispatchFcmsToQueue({ fcmsToDispatch, logger }).catch((e) =>
+      logger.log("Something went wrong dispatching FCMs to the FCM Notification Queue", "error", "queue", null, {
+        message: e?.message,
+        stack: e?.stack
+      })
+    );
+  }
 };
 
 module.exports = scenarioParser;

server/routes/mediaRoutes.js

@@ -4,6 +4,7 @@ const { createSignedUploadURL, downloadFiles, renameKeys, deleteFiles } = requir
 const {
   generateSignedUploadUrls: createSignedUploadURLImgproxy,
   getThumbnailUrls: getThumbnailUrlsImgproxy,
+  getOriginalImageByDocumentId: getOriginalImageByDocumentIdImgproxy,
   downloadFiles: downloadFilesImgproxy,
   moveFiles: moveFilesImgproxy,
   deleteFiles: deleteFilesImgproxy
@@ -24,5 +25,6 @@ router.post("/imgproxy/thumbnails", getThumbnailUrlsImgproxy);
 router.post("/imgproxy/download", downloadFilesImgproxy);
 router.post("/imgproxy/rename", moveFilesImgproxy);
 router.post("/imgproxy/delete", deleteFilesImgproxy);
+router.post("/imgproxy/original", getOriginalImageByDocumentIdImgproxy);
 
 module.exports = router;

server/routes/smsRoutes.js

@@ -3,7 +3,7 @@ const router = express.Router();
 const twilio = require("twilio");
 const { receive } = require("../sms/receive");
 const { send } = require("../sms/send");
-const { status, markConversationRead } = require("../sms/status");
+const { status, markConversationRead, markLastMessageUnread } = require("../sms/status");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
 
 // Twilio Webhook Middleware for production
@@ -14,5 +14,6 @@ router.post("/receive", twilioWebhookMiddleware, receive);
 router.post("/send", validateFirebaseIdTokenMiddleware, send);
 router.post("/status", twilioWebhookMiddleware, status);
 router.post("/markConversationRead", validateFirebaseIdTokenMiddleware, markConversationRead);
+router.post("/markLastMessageUnread", validateFirebaseIdTokenMiddleware, markLastMessageUnread);
 
 module.exports = router;

server/sms/send.js

@@ -61,7 +61,8 @@ const send = async (req, res) => {
       isoutbound: true,
       userid: req.user.email,
       image: selectedMedia.length > 0,
-      image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : []
+      image_path: selectedMedia.length > 0 ? selectedMedia.map((i) => i.src) : [],
+      is_system: false
     };
 
     try {

server/sms/status.js

@@ -8,6 +8,46 @@ const {
 const logger = require("../utils/logger");
 const { phone } = require("phone");
 
+// Local GraphQL for “mark unread” (kept here to avoid requiring edits to graphql-client/queries.js)
+const GET_LAST_INBOUND_NON_SYSTEM_MESSAGE = `
+  query GetLastInboundNonSystemMessage($conversationId: uuid!) {
+    messages(
+      where: {
+        conversationid: { _eq: $conversationId }
+        isoutbound: { _eq: false }
+        is_system: { _eq: false }
+      }
+      order_by: { created_at: desc }
+      limit: 1
+    ) {
+      id
+      created_at
+      read
+    }
+  }
+`;
+
+const MARK_LAST_INBOUND_MESSAGE_UNREAD_MAX_ONE = `
+  mutation MarkLastInboundMessageUnreadMaxOne($conversationId: uuid!, $lastId: uuid!) {
+    markOthersRead: update_messages(
+      _set: { read: true }
+      where: {
+        conversationid: { _eq: $conversationId }
+        isoutbound: { _eq: false }
+        is_system: { _eq: false }
+        id: { _neq: $lastId }
+      }
+    ) {
+      affected_rows
+      returning { id }
+    }
+
+    markLastUnread: update_messages_by_pk(pk_columns: { id: $lastId }, _set: { read: false }) {
+      id
+    }
+  }
+`;
+
 /**
  * Handle the status of an SMS message
  * @param req
@@ -176,7 +216,80 @@ const markConversationRead = async (req, res) => {
   }
 };
 
+/**
+ * Mark last inbound (customer) non-system message as unread.
+ * Enforces: max unread inbound non-system messages per thread = 1
+ *
+ * Body: { conversationId, imexshopid, bodyshopid }
+ */
+const markLastMessageUnread = async (req, res) => {
+  const {
+    ioRedis,
+    ioHelpers: { getBodyshopRoom }
+  } = req;
+
+  const { conversationId, imexshopid, bodyshopid } = req.body;
+
+  if (!conversationId || !imexshopid || !bodyshopid) {
+    return res.status(400).json({ error: "Invalid conversation data provided." });
+  }
+
+  try {
+    const lastResp = await client.request(GET_LAST_INBOUND_NON_SYSTEM_MESSAGE, { conversationId });
+    const last = lastResp?.messages?.[0];
+
+    if (!last?.id) {
+      // No inbound message to mark unread
+      const broadcastRoom = getBodyshopRoom(bodyshopid);
+      ioRedis.to(broadcastRoom).emit("conversation-changed", {
+        type: "conversation-marked-unread",
+        conversationId,
+        lastUnreadMessageId: null,
+        messageIdsMarkedRead: [],
+        unreadCount: 0
+      });
+
+      return res.status(200).json({
+        success: true,
+        conversationId,
+        lastUnreadMessageId: null,
+        messageIdsMarkedRead: [],
+        unreadCount: 0
+      });
+    }
+
+    const mutResp = await client.request(MARK_LAST_INBOUND_MESSAGE_UNREAD_MAX_ONE, {
+      conversationId,
+      lastId: last.id
+    });
+
+    const messageIdsMarkedRead = mutResp?.markOthersRead?.returning?.map((m) => m.id) || [];
+
+    const broadcastRoom = getBodyshopRoom(bodyshopid);
+
+    ioRedis.to(broadcastRoom).emit("conversation-changed", {
+      type: "conversation-marked-unread",
+      conversationId,
+      lastUnreadMessageId: last.id,
+      messageIdsMarkedRead,
+      unreadCount: 1
+    });
+
+    return res.status(200).json({
+      success: true,
+      conversationId,
+      lastUnreadMessageId: last.id,
+      messageIdsMarkedRead,
+      unreadCount: 1
+    });
+  } catch (error) {
+    console.error("Error marking last message unread:", error);
+    return res.status(500).json({ error: "Failed to mark last message unread." });
+  }
+};
+
 module.exports = {
   status,
-  markConversationRead
+  markConversationRead,
+  markLastMessageUnread
 };