Merged in release/2026-06-05 (pull request #3288)

IO-3722 Remove delivery date for bypass vehicles.

client/src/components/job-line-dispatch-button/job-line-dispatch-button.component.jsx

@@ -63,7 +63,9 @@ export function JobLineDispatchButton({
             }
           }
           //joblineids: selectedLines.map((l) => l.id),
-        }
+        },
+        refetchQueries: ["QUERY_PARTS_BILLS_BY_JOBID", "GET_JOB_BY_PK"],
+        awaitRefetchQueries: true
       });
       if (result.errors) {
         console.log("🚀 ~ handleConvert ~ result.errors:", result.errors);

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -12,11 +12,11 @@ import { createStructuredSelector } from "reselect";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
+  CHECK_EMPLOYEE_EMAIL,
   CHECK_EMPLOYEE_NUMBER,
   DELETE_VACATION,
   INSERT_EMPLOYEES,
   QUERY_EMPLOYEE_BY_ID,
-  QUERY_USERS_BY_EMAIL,
   UPDATE_EMPLOYEE
 } from "../../graphql/employees.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -174,9 +174,10 @@ export function ShopEmployeesFormComponent({ bodyshop, form, onDirtyChange, isDi
 
   const handleFinish = async (values) => {
     const submitAction = saveAndResetSubmitAction();
+    const userEmail = typeof values.user_email === "string" ? values.user_email.trim() : values.user_email;
     const normalizedValues = {
       ...values,
-      user_email: values.user_email === "" ? null : values.user_email
+      user_email: userEmail === "" ? null : userEmail
     };
 
     if (search.employeeId && search.employeeId !== "new") {
@@ -491,18 +492,29 @@ export function ShopEmployeesFormComponent({ bodyshop, form, onDirtyChange, isDi
                 rules={[
                   ({ getFieldValue }) => ({
                     async validator(rule, value) {
-                      const user_email = getFieldValue("user_email");
+                      const user_email = typeof value === "string" ? value.trim() : getFieldValue("user_email");
 
                       if (user_email && value) {
                         const response = await client.query({
-                          query: QUERY_USERS_BY_EMAIL,
+                          query: CHECK_EMPLOYEE_EMAIL,
                           variables: {
-                            email: user_email
+                            email: user_email,
+                            shopId: bodyshop.id
                           }
                         });
 
                         if (response.data.users.length === 1) {
-                          return Promise.resolve();
+                          const matchingEmployees = response.data.employees_aggregate.nodes;
+                          const currentEmployeeId = form.getFieldValue("id") ?? search.employeeId;
+
+                          if (
+                            response.data.employees_aggregate.aggregate.count === 0 ||
+                            matchingEmployees.every((employee) => employee.id === currentEmployeeId)
+                          ) {
+                            return Promise.resolve();
+                          }
+
+                          return Promise.reject(t("employees.validation.unique_user_email"));
                         }
                         return Promise.reject(t("bodyshop.validation.useremailmustexist"));
                       } else {

client/src/components/shop-employees/shop-employees-form.component.test.jsx

@@ -4,6 +4,7 @@ import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { useEffect } from "react";
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import {
+  CHECK_EMPLOYEE_EMAIL,
   DELETE_VACATION,
   INSERT_EMPLOYEES,
   QUERY_EMPLOYEE_BY_ID,
@@ -16,6 +17,7 @@ const updateEmployeeMock = vi.fn();
 const deleteVacationMock = vi.fn();
 const useQueryMock = vi.fn();
 const useMutationMock = vi.fn();
+const apolloClientQueryMock = vi.fn();
 const navigateMock = vi.fn();
 const notification = {
   error: vi.fn(),
@@ -87,6 +89,10 @@ vi.mock("react-i18next", () => ({
         return "Employee number must be unique";
       }
 
+      if (key === "employees.validation.unique_user_email") {
+        return "User email already assigned";
+      }
+
       if (key === "bodyshop.validation.useremailmustexist") {
         return "User email must exist";
       }
@@ -203,18 +209,20 @@ describe("ShopEmployeesFormComponent", () => {
       return [vi.fn()];
     });
 
-    useApolloClient.mockReturnValue({
-      query: vi.fn().mockResolvedValue({
-        data: {
-          employees_aggregate: {
-            aggregate: {
-              count: 0
-            },
-            nodes: []
+    apolloClientQueryMock.mockResolvedValue({
+      data: {
+        employees_aggregate: {
+          aggregate: {
+            count: 0
           },
-          users: []
-        }
-      })
+          nodes: []
+        },
+        users: []
+      }
+    });
+
+    useApolloClient.mockReturnValue({
+      query: apolloClientQueryMock
     });
 
     insertEmployeesMock.mockResolvedValue({
@@ -356,4 +364,59 @@ describe("ShopEmployeesFormComponent", () => {
       title: "Saved"
     });
   });
+
+  it("blocks saving when the user email belongs to another employee in the shop", async () => {
+    apolloClientQueryMock.mockImplementation(({ query }) => {
+      if (query === CHECK_EMPLOYEE_EMAIL) {
+        return Promise.resolve({
+          data: {
+            users: [{ email: "jamie@example.com" }],
+            employees_aggregate: {
+              aggregate: {
+                count: 1
+              },
+              nodes: [{ id: "other-employee" }]
+            }
+          }
+        });
+      }
+
+      return Promise.resolve({
+        data: {
+          employees_aggregate: {
+            aggregate: {
+              count: 0
+            },
+            nodes: []
+          },
+          users: []
+        }
+      });
+    });
+
+    fireEvent.change(screen.getByRole("textbox", { name: "First Name" }), {
+      target: { value: "Jamie" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Last Name" }), {
+      target: { value: "Rivera" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Employee Number" }), {
+      target: { value: "42" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "PIN" }), {
+      target: { value: "1234" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "Hire Date" }), {
+      target: { value: "2026-04-20" }
+    });
+    fireEvent.change(screen.getByRole("textbox", { name: "User Email" }), {
+      target: { value: "jamie@example.com" }
+    });
+
+    fireEvent.click(screen.getByRole("button", { name: "Save Employee" }));
+
+    expect(await screen.findByText("User email already assigned")).toBeInTheDocument();
+    expect(insertEmployeesMock).not.toHaveBeenCalled();
+    expect(notification.success).not.toHaveBeenCalled();
+  });
 });

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

@@ -157,36 +157,36 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 </Col>
                 {HasFeatureAccess({ featureName: "export", bodyshop }) &&
                   ClosingPeriod.treatment === "on" && (
-                    <Col xs={24} sm={12} xl={8}>
-                      <Form.Item
-                        key="ClosingPeriod"
-                        name={["accountingconfig", "ClosingPeriod"]}
-                        label={t("bodyshop.fields.closingperiod")}
-                      >
-                        <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
-                      </Form.Item>
-                    </Col>
-                  )}
+                  <Col xs={24} sm={12} xl={8}>
+                    <Form.Item
+                      key="ClosingPeriod"
+                      name={["accountingconfig", "ClosingPeriod"]}
+                      label={t("bodyshop.fields.closingperiod")}
+                    >
+                      <DatePicker.RangePicker format="MM/DD/YYYY" presets={DatePickerRanges} />
+                    </Form.Item>
+                  </Col>
+                )}
                 {HasFeatureAccess({ featureName: "export", bodyshop }) &&
                   ADPPayroll.treatment === "on" && (
-                    <Col xs={24} sm={12} xl={8}>
-                      <Form.Item
-                        key="companyCode"
-                        name={["accountingconfig", "companyCode"]}
-                        label={t("bodyshop.fields.companycode")}
-                      >
-                        <Input />
-                      </Form.Item>
-                    </Col>
-                  )}
+                  <Col xs={24} sm={12} xl={8}>
+                    <Form.Item
+                      key="companyCode"
+                      name={["accountingconfig", "companyCode"]}
+                      label={t("bodyshop.fields.companycode")}
+                    >
+                      <Input />
+                    </Form.Item>
+                  </Col>
+                )}
                 {HasFeatureAccess({ featureName: "export", bodyshop }) &&
                   ADPPayroll.treatment === "on" && (
-                    <Col xs={24} sm={12} xl={8}>
+                  <Col xs={24} sm={12} xl={8}>
                       <Form.Item key="batchID" name={["accountingconfig", "batchID"]} label={t("bodyshop.fields.batchid")}>
-                        <Input />
-                      </Form.Item>
-                    </Col>
-                  )}
+                      <Input />
+                    </Form.Item>
+                  </Col>
+                )}
                 {HasFeatureAccess({ featureName: "export", bodyshop }) && !hasDMSKey && (
                   <>
                     <Col xs={24} sm={12} xl={8}>
@@ -512,6 +512,15 @@ export function ShopInfoResponsibilityCenterComponent({ bodyshop, form }) {
                 >
                   <InputNumber min={0} max={100} suffix="%" />
                 </Form.Item>
+                {bodyshop.cdk_dealerid && (
+                  <Form.Item
+                    label={t("bodyshop.fields.dms.disablecontact")}
+                    valuePropName="checked"
+                    name={["cdk_configuration", "disablecontact"]}
+                  >
+                    <Switch />
+                  </Form.Item>
+                )}
                 {bodyshop.pbs_serialnumber && (
                   <Form.Item
                     label={t("bodyshop.fields.dms.disablecontactvehiclecreation")}

client/src/graphql/employees.queries.js

@@ -49,6 +49,22 @@ export const CHECK_EMPLOYEE_NUMBER = gql`
   }
 `;
 
+export const CHECK_EMPLOYEE_EMAIL = gql`
+  query CHECK_EMPLOYEE_EMAIL($email: String!, $shopId: uuid!) {
+    users(where: { email: { _ilike: $email } }) {
+      email
+    }
+    employees_aggregate(where: { user_email: { _ilike: $email }, shopid: { _eq: $shopId } }) {
+      aggregate {
+        count
+      }
+      nodes {
+        id
+      }
+    }
+  }
+`;
+
 export const QUERY_ACTIVE_EMPLOYEES = gql`
   query QUERY_ACTIVE_EMPLOYEES {
     employees(where: { active: { _eq: true } }) {

client/src/translations/en_us/common.json

@@ -370,6 +370,7 @@
           "cashierid": "Cashier ID",
           "default_journal": "Default Journal",
           "disablebillwip": "Disable bill WIP for A/P Posting",
+          "disablecontact": "Disable Contact Updates/Creation",
           "disablecontactvehiclecreation": "Disable Contact & Vehicle Updates/Creation",
           "dms_acctnumber": "DMS Account #",
           "dms_control_override": "Static Control # Override",
@@ -1350,7 +1351,8 @@
         "vacationadded": "Employee vacation added."
       },
       "validation": {
-        "unique_employee_number": "You must enter a unique employee number."
+        "unique_employee_number": "You must enter a unique employee number.",
+        "unique_user_email": "This email is already assigned to another employee."
       }
     },
     "esignature": {

client/src/translations/es/common.json

@@ -370,6 +370,7 @@
           "cashierid": "",
           "default_journal": "",
           "disablebillwip": "",
+          "disablecontact": "",
           "disablecontactvehiclecreation": "",
           "dms_acctnumber": "",
           "dms_control_override": "",
@@ -1350,7 +1351,8 @@
         "vacationadded": ""
       },
       "validation": {
-        "unique_employee_number": ""
+        "unique_employee_number": "",
+        "unique_user_email": "Este correo electrónico ya está asignado a otro empleado."
       }
     },
     "esignature": {

client/src/translations/fr/common.json

@@ -370,6 +370,7 @@
           "cashierid": "",
           "default_journal": "",
           "disablebillwip": "",
+          "disablecontact": "",
           "disablecontactvehiclecreation": "",
           "dms_acctnumber": "",
           "dms_control_override": "",
@@ -1350,7 +1351,8 @@
         "vacationadded": ""
       },
       "validation": {
-        "unique_employee_number": ""
+        "unique_employee_number": "",
+        "unique_user_email": "Cette adresse courriel est déjà assignée à un autre employé."
       }
     },
     "esignature": {

server/fortellis/fortellis.js

@@ -15,7 +15,7 @@ const _ = require("lodash");
 const moment = require("moment-timezone");
 
 const replaceSpecialRegex = /[^a-zA-Z0-9 ]+/g;
-
+const bypassCustomerId = "bypass";
 // Helper function to handle FortellisApiError logging
 function handleFortellisApiError(socket, error, functionName, additionalDetails = {}) {
   if (error instanceof FortellisApiError) {
@@ -95,7 +95,8 @@ async function FortellisJobExport({ socket, redisHelpers, txEnvelope, jobid }) {
       defaultFortellisTTL
     );
 
-    let DMSVehCustomer;
+    let DMSVehCustomerFromVehicle;
+    //let DMSVehCustomer;
     if (!DMSVid.newId) {
       CreateFortellisLogEvent(socket, "DEBUG", `{2.1} Querying the Vehicle using the DMSVid: ${DMSVid.vehiclesVehId}`);
       const DMSVeh = await QueryDmsVehicleById({ socket, redisHelpers, JobData, DMSVid });
@@ -106,46 +107,66 @@ async function FortellisJobExport({ socket, redisHelpers, txEnvelope, jobid }) {
         DMSVeh,
         defaultFortellisTTL
       );
+      DMSVehCustomerFromVehicle = DMSVeh?.owners && DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
 
-      const DMSVehCustomerFromVehicle =
-        DMSVeh?.owners && DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
+      // //Add in contact bypass for Fortellis.
+      // if (!JobData.bodyshop.cdk_configuration.disablecontact) {
+      //   const DMSVehCustomerFromVehicle =
+      //     DMSVeh?.owners && DMSVeh.owners.find((o) => o.id.assigningPartyId === "CURRENT");
 
-      if (DMSVehCustomerFromVehicle?.id && DMSVehCustomerFromVehicle.id.value) {
-        CreateFortellisLogEvent(
-          socket,
-          "DEBUG",
-          `{2.2} Querying the Customer using the ID from DMSVeh: ${DMSVehCustomerFromVehicle.id.value}`
-        );
-        DMSVehCustomer = await QueryDmsCustomerById({
-          socket,
-          redisHelpers,
-          JobData,
-          CustomerId: DMSVehCustomerFromVehicle.id.value
-        });
-        await setSessionTransactionData(
-          socket.id,
-          getTransactionType(jobid),
-          FortellisCacheEnums.DMSVehCustomer,
-          DMSVehCustomer,
-          defaultFortellisTTL
-        );
-      }
+      //   if (DMSVehCustomerFromVehicle?.id && DMSVehCustomerFromVehicle.id.value) {
+      //     CreateFortellisLogEvent(
+      //       socket,
+      //       "DEBUG",
+      //       `{2.2} Querying the Customer using the ID from DMSVeh: ${DMSVehCustomerFromVehicle.id.value}`
+      //     );
+      //     DMSVehCustomer = await QueryDmsCustomerById({
+      //       socket,
+      //       redisHelpers,
+      //       JobData,
+      //       CustomerId: DMSVehCustomerFromVehicle.id.value
+      //     });
+      //     await setSessionTransactionData(
+      //       socket.id,
+      //       getTransactionType(jobid),
+      //       FortellisCacheEnums.DMSVehCustomer,
+      //       DMSVehCustomer,
+      //       defaultFortellisTTL
+      //     );
+      //   }
+      // }
     }
     CreateFortellisLogEvent(socket, "DEBUG", `{2.3} Querying the Customer using the name.`);
+    if (JobData.bodyshop.cdk_configuration.disablecontact) {
+      //Just go straight to posting.
+      await FortellisSelectedCustomer({ socket, redisHelpers, selectedCustomerId: bypassCustomerId, jobid });
+    } else {
+      const DMSCustList = await QueryDmsCustomerByName({ socket, redisHelpers, JobData });
+      await setSessionTransactionData(
+        socket.id,
+        getTransactionType(jobid),
+        FortellisCacheEnums.DMSCustList,
+        DMSCustList,
+        defaultFortellisTTL
+      );
 
-    const DMSCustList = await QueryDmsCustomerByName({ socket, redisHelpers, JobData });
-    await setSessionTransactionData(
-      socket.id,
-      getTransactionType(jobid),
-      FortellisCacheEnums.DMSCustList,
-      DMSCustList,
-      defaultFortellisTTL
-    );
-
-    socket.emit("fortellis-select-customer", [
-      ...(DMSVehCustomer ? [{ ...DMSVehCustomer, vinOwner: true }] : []),
-      ...DMSCustList
-    ]);
+      socket.emit("fortellis-select-customer",
+        //Removed to save one one API call while disputing with fortellis. 
+        //   [
+        //  // ...(DMSVehCustomer ? [{ ...DMSVehCustomer, vinOwner: true }] : []),
+        //   ...DMSCustList
+        // ]
+        DMSVehCustomerFromVehicle ?
+          DMSCustList.map(c => {
+            //if customer id is the same as the current assigned owner on the vehicle id, set it as vinowner true. )
+            if (DMSVehCustomerFromVehicle?.id?.value === c.customerId) {
+              return { ...c, vinOwner: true }
+            } else {
+              return c
+            }
+          }) : DMSCustList
+      );
+    }
   } catch (error) {
     CreateFortellisLogEvent(socket, "ERROR", `Error in FortellisJobExport - ${error} `, {
       error: error.message,
@@ -218,36 +239,40 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
       });
       return;
     }
-
+    //Bypass only the customer creation. We still need to create the vehicle and update it to post the service history later on.
     let DMSCust;
-    if (selectedCustomerId) {
-      CreateFortellisLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
+    if (!JobData.bodyshop.cdk_configuration.disablecontact) {
+      if (selectedCustomerId) {
+        CreateFortellisLogEvent(socket, "DEBUG", `{3.1} Querying the Customer using Customer ID: ${selectedCustomerId}`);
 
-      //Get cust list from Redis. Return the item
-      const DMSCustList =
-        (await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSCustList)) || [];
-      const existingCustomerInDMSCustList = DMSCustList.find((c) => c.customerId === selectedCustomerId);
-      DMSCust = existingCustomerInDMSCustList || {
-        customerId: selectedCustomerId //This is the fall back in case it is the generic customer.
-      };
-      await setSessionTransactionData(
-        socket.id,
-        getTransactionType(jobid),
-        FortellisCacheEnums.DMSCust,
-        DMSCust,
-        defaultFortellisTTL
-      );
-    } else {
-      CreateFortellisLogEvent(socket, "DEBUG", `{3.2} Creating new customer.`);
-      const DMSCustomerInsertResponse = await InsertDmsCustomer({ socket, redisHelpers, JobData });
-      DMSCust = { customerId: DMSCustomerInsertResponse.data };
-      await setSessionTransactionData(
-        socket.id,
-        getTransactionType(jobid),
-        FortellisCacheEnums.DMSCust,
-        DMSCust,
-        defaultFortellisTTL
-      );
+        //Get cust list from Redis. Return the item
+        const DMSCustList =
+          (await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSCustList)) || [];
+        const existingCustomerInDMSCustList = DMSCustList.find((c) => c.customerId === selectedCustomerId);
+        DMSCust = existingCustomerInDMSCustList || {
+          customerId: selectedCustomerId //This is the fall back in case it is the generic customer.
+        };
+        await setSessionTransactionData(
+          socket.id,
+          getTransactionType(jobid),
+          FortellisCacheEnums.DMSCust,
+          DMSCust,
+          defaultFortellisTTL
+        );
+      } else {
+        CreateFortellisLogEvent(socket, "DEBUG", `{3.2} Creating new customer.`);
+        const DMSCustomerInsertResponse = await InsertDmsCustomer({ socket, redisHelpers, JobData });
+        DMSCust = { customerId: DMSCustomerInsertResponse.data };
+        await setSessionTransactionData(
+          socket.id,
+          getTransactionType(jobid),
+          FortellisCacheEnums.DMSCust,
+          DMSCust,
+          defaultFortellisTTL
+        );
+      }
+    }else{
+      DMSCust = { customerId: bypassCustomerId };
     }
 
     let DMSVeh;
@@ -258,8 +283,12 @@ async function FortellisSelectedCustomer({ socket, redisHelpers, selectedCustome
       DMSVeh = await getSessionTransactionData(socket.id, getTransactionType(jobid), FortellisCacheEnums.DMSVeh);
       CreateFortellisLogEvent(socket, "DEBUG", `{4.3} Updating Existing Vehicle to associate to owner.`);
 
+      //If it's a bypass scenario, skip this all.
       //Check to see if the vehicle needs to be updated - i.e. the owner is not the selected customer.
-      if (!DMSVeh?.owners.find((o) => o.id.value === DMSCust.customerId && o.id.assigningPartyId === "CURRENT")) {
+      if (
+        selectedCustomerId !== bypassCustomerId &&
+        !DMSVeh?.owners.find((o) => o.id.value === DMSCust.customerId && o.id.assigningPartyId === "CURRENT")
+      ) {
         DMSVeh = await UpdateDmsVehicle({
           socket,
           redisHelpers,
@@ -782,12 +811,14 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
           // "chassis": "",
           // "color": "",
           // "dealerBodyStyle": "",
-          deliveryDate:
-            txEnvelope.dms_unsold === true
-              ? ""
-              : moment()
+          ...(DMSCust?.customerId !== bypassCustomerId && {
+            deliveryDate:
+              txEnvelope.dms_unsold === true
+                ? ""
+                : moment()
                   // .tz(JobData.bodyshop.timezone)
                   .format("YYYY-MM-DD"),
+          }),
           // "deliveryMileage": 4,
           // "doorsQuantity": 4,
           // "engineNumber": "",
@@ -902,14 +933,17 @@ async function InsertDmsVehicle({ socket, redisHelpers, JobData, txEnvelope, DMS
           // "warrantyExpDate": "2015-01-12",
           // "wheelbase": ""
         },
-        owners: [
-          {
-            id: {
-              assigningPartyId: "CURRENT",
-              value: DMSCust.customerId
+        // Owners is not required. Exclude it if we are bypassing.
+        ...(DMSCust?.customerId !== bypassCustomerId && {
+          owners: [
+            {
+              id: {
+                assigningPartyId: "CURRENT",
+                value: DMSCust.customerId
+              }
             }
-          }
-        ]
+          ]
+        })
         //"inventoryAccount": "237"
       }
     });
@@ -1009,12 +1043,14 @@ async function UpdateDmsVehicle({ socket, redisHelpers, JobData, DMSVeh, DMSCust
                 modelAbrev: txEnvelope.dms_model
               }
             : {}),
-          deliveryDate:
-            txEnvelope.dms_unsold === true
-              ? ""
-              : moment(DMSVehToSend.vehicle.deliveryDate)
+          ...(DMSCust?.customerId !== bypassCustomerId && {
+            deliveryDate:
+              txEnvelope.dms_unsold === true
+                ? ""
+                : moment(DMSVehToSend.vehicle.deliveryDate)
                   //.tz(JobData.bodyshop.timezone)
                   .toISOString()
+          })
         },
         owners: ids
       }