From 4efa01edd303a5a82e502547d31be7ef2023628f Mon Sep 17 00:00:00 2001
From: Allan Carr <allan@imexsystems.ca>
Date: Fri, 23 Jan 2026 22:26:22 -0800
Subject: [PATCH 1/2] IO-3514 Print Center Restrict Financial Group on Tech
 Station and Fix Drawer Close on Tech Console

Signed-off-by: Allan Carr <allan@imexsystems.ca>
---
 .../print-center-jobs-parts.component.jsx     | 43 +++++++-------
 .../print-center-jobs.component.jsx           | 56 ++++++++++---------
 .../tech-lookup-jobs-drawer.component.jsx     |  4 +-
 3 files changed, 56 insertions(+), 47 deletions(-)

diff --git a/client/src/components/print-center-jobs/print-center-jobs-parts.component.jsx b/client/src/components/print-center-jobs/print-center-jobs-parts.component.jsx
index e86db4255..54d9134c0 100644
--- a/client/src/components/print-center-jobs/print-center-jobs-parts.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs-parts.component.jsx
@@ -9,6 +9,7 @@ import { TemplateList } from "../../utils/TemplateConstants";
 import { GenerateDocument } from "../../utils/RenderTemplate";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { HistoryOutlined, MailOutlined, PrinterOutlined, UnorderedListOutlined } from "@ant-design/icons";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils.js";
 
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
@@ -29,27 +30,29 @@ export function PrintCenterJobsPartsComponent({ printCenterModal, bodyshop, tech
     names: ["Enhanced_Payroll"],
     splitKey: bodyshop.imexshopid
   });
-
-  const Templates =
-    bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
-      ? Object.keys(tempList)
-          .map((key) => tempList[key])
-          .filter(
-            (temp) =>
-              (!temp.regions ||
-                temp.regions?.[bodyshop.region_config] ||
-                (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)) &&
-              (!temp.dms || temp.dms === false)
-          )
-      : Object.keys(tempList)
-          .map((key) => tempList[key])
-          .filter(
-            (temp) =>
-              !temp.regions ||
+  const hasDMSKey = bodyshopHasDmsKey(bodyshop);
+  
+  const Templates = !hasDMSKey
+    ? Object.keys(tempList)
+        .map((key) => tempList[key])
+        .filter(
+          (temp) =>
+            (!temp.regions ||
               temp.regions?.[bodyshop.region_config] ||
-              (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
-          );
-
+              (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)) &&
+            (!temp.dms || temp.dms === false)
+        )
+        .filter((temp) => !technician || temp.group !== "financial")
+    : Object.keys(tempList)
+        .map((key) => tempList[key])
+        .filter(
+          (temp) =>
+            !temp.regions ||
+            temp.regions?.[bodyshop.region_config] ||
+            (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
+        )
+        .filter((temp) => !technician || temp.group !== "financial");
+  
   const JobsReportsList =
     Enhanced_Payroll.treatment === "on"
       ? Object.keys(Templates)
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index 2df39c0b5..a33a387e1 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -12,15 +12,18 @@ import Jobd3RdPartyModal from "../job-3rd-party-modal/job-3rd-party-modal.compon
 import PrintCenterItem from "../print-center-item/print-center-item.component";
 import PrintCenterJobsLabels from "../print-center-jobs-labels/print-center-jobs-labels.component";
 import PrintCenterSpeedPrint from "../print-center-speed-print/print-center-speed-print.component";
+import { bodyshopHasDmsKey } from "../../utils/dmsUtils";
+import { selectTechnician } from "../../redux/tech/tech.selectors";
 
 const mapStateToProps = createStructuredSelector({
   printCenterModal: selectPrintCenter,
-  bodyshop: selectBodyshop
+  bodyshop: selectBodyshop,
+  technician: selectTechnician
 });
 
 const mapDispatchToProps = () => ({});
 
-export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
+export function PrintCenterJobsComponent({ printCenterModal, bodyshop, technician }) {
   const [search, setSearch] = useState("");
   const { id: jobId, job } = printCenterModal.context;
   const tempList = TemplateList("job", {});
@@ -32,30 +35,33 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
     names: ["Enhanced_Payroll"],
     splitKey: bodyshop.imexshopid
   });
+  const hasDMSKey = bodyshopHasDmsKey(bodyshop);
 
-  const Templates =
-    bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null
-      ? Object.keys(tempList)
-          .map((key) => {
-            return tempList[key];
-          })
-          .filter(
-            (temp) =>
-              (!temp.regions ||
-                (temp.regions && temp.regions[bodyshop.region_config]) ||
-                (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)) &&
-              (!temp.dms || temp.dms === false)
-          )
-      : Object.keys(tempList)
-          .map((key) => {
-            return tempList[key];
-          })
-          .filter(
-            (temp) =>
-              !temp.regions ||
+  const Templates = !hasDMSKey
+    ? Object.keys(tempList)
+        .map((key) => {
+          return tempList[key];
+        })
+        .filter(
+          (temp) =>
+            (!temp.regions ||
               (temp.regions && temp.regions[bodyshop.region_config]) ||
-              (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
-          );
+              (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)) &&
+            (!temp.dms || temp.dms === false)
+        )
+        .filter((temp) => !technician || temp.group !== "financial")
+    : Object.keys(tempList)
+        .map((key) => {
+          return tempList[key];
+        })
+        .filter(
+          (temp) =>
+            !temp.regions ||
+            (temp.regions && temp.regions[bodyshop.region_config]) ||
+            (temp.regions && bodyshop.region_config.includes(Object.keys(temp.regions)) === true)
+        )
+        .filter((temp) => !technician || temp.group !== "financial");
+        
   const JobsReportsList =
     Enhanced_Payroll.treatment === "on"
       ? Object.keys(Templates)
@@ -89,7 +95,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
               <Space wrap>
                 <PrintCenterJobsLabels jobId={jobId} />
                 <Jobd3RdPartyModal jobId={jobId} job={job} />
-                <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
+                <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} enterButton />
               </Space>
             }
           >
diff --git a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
index de15aa46c..9610728a3 100644
--- a/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
+++ b/client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx
@@ -59,7 +59,8 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
 
   const handleDrawerClose = () => {
     // Immutable omit (no delete/mutation)
-    const { ...rest } = searchParams || {};
+    const { selected, ...rest } = searchParams || {};
+    void selected;
     history({
       search: queryString.stringify(rest)
     });
@@ -72,7 +73,6 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
 
       {data ? (
         <PageHeader
-          onBack={() => window.history.back()}
           title={data.jobs_by_pk.ro_number || t("general.labels.na")}
           extra={
             <Button

From 35366eda2237187088a8ebb57ce910fc8b868045 Mon Sep 17 00:00:00 2001
From: Allan Carr <allan@imexsystems.ca>
Date: Tue, 27 Jan 2026 07:27:43 -0800
Subject: [PATCH 2/2] IO-3512 Great Search Fix

Signed-off-by: Allan Carr <allan@imexsystems.ca>
---
 .../monthly-job-costing/monthly-job-costing.component.jsx       | 1 +
 client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx | 1 +
 .../job-costing-parts-table.component.jsx                       | 1 +
 .../jobs-create-vehicle-info.predefined.component.jsx           | 2 +-
 .../components/owner-find-modal/owner-find-modal.container.jsx  | 1 +
 .../phone-number-consent/phone-number-consent.component.jsx     | 1 +
 .../print-center-jobs/print-center-jobs.component.jsx           | 2 +-
 .../report-center-modal/report-center-modal.component.jsx       | 2 +-
 8 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
index 0bc11183f..7088bc684 100644
--- a/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
+++ b/client/src/components/dashboard-components/monthly-job-costing/monthly-job-costing.component.jsx
@@ -96,6 +96,7 @@ export default function DashboardMonthlyJobCosting({ data, ...cardProps }) {
               e.preventDefault();
               setSearchText(e.target.value);
             }}
+            enterButton
           />
         </Space>
       }
diff --git a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
index 46aa6182e..4a73fb265 100644
--- a/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
+++ b/client/src/components/dms-cdk-makes/dms-cdk-makes.component.jsx
@@ -62,6 +62,7 @@ export function DmsCdkVehicles({ form, job }) {
             <Input.Search
               onSearch={(val) => callSearch({ variables: { search: val } })}
               placeholder={t("general.labels.search")}
+              enterButton
             />
           )}
           columns={columns}
diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
index 03746a709..04289f81e 100644
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -76,6 +76,7 @@ export default function JobCostingPartsTable({ data, summaryData }) {
                   e.preventDefault();
                   setSearchText(e.target.value);
                 }}
+                enterButton
               />
             </Space>
           );
diff --git a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
index 90efce131..b6a93e1e7 100644
--- a/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
+++ b/client/src/components/jobs-create-vehicle-info/jobs-create-vehicle-info.predefined.component.jsx
@@ -24,7 +24,7 @@ export default function JobsCreateVehicleInfoPredefined({ disabled, form }) {
     <div>
       <Table
         size="small"
-        title={() => <Input.Search onSearch={(value) => setSearch(value)} />}
+        title={() => <Input.Search onSearch={(value) => setSearch(value)} enterButton/>}
         dataSource={filteredPredefinedVehicles}
         columns={[
           {
diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index 24fea4287..a8dd3927c 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -48,6 +48,7 @@ export default function OwnerFindModalContainer({
             value={searchText}
             onChange={(e) => setSearchText(e.target.value)}
             onSearch={(val) => callSearchowners({ variables: { search: val.trim() } })}
+            enterButton
           />
           <OwnerFindModalComponent
             selectedOwner={selectedOwner}
diff --git a/client/src/components/phone-number-consent/phone-number-consent.component.jsx b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
index cba56a12a..991731ea4 100644
--- a/client/src/components/phone-number-consent/phone-number-consent.component.jsx
+++ b/client/src/components/phone-number-consent/phone-number-consent.component.jsx
@@ -129,6 +129,7 @@ function PhoneNumberConsentList({ bodyshop }) {
         placeholder={t("general.labels.search")}
         onSearch={(value) => setSearch(value)}
         style={{ marginBottom: 16 }}
+        enterButton
       />
 
       <Table
diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
index 2df39c0b5..49f43ea85 100644
--- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx
+++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx
@@ -89,7 +89,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) {
               <Space wrap>
                 <PrintCenterJobsLabels jobId={jobId} />
                 <Jobd3RdPartyModal jobId={jobId} job={job} />
-                <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
+                <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} enterButton />
               </Space>
             }
           >
diff --git a/client/src/components/report-center-modal/report-center-modal.component.jsx b/client/src/components/report-center-modal/report-center-modal.component.jsx
index c02c5fb60..7205939f2 100644
--- a/client/src/components/report-center-modal/report-center-modal.component.jsx
+++ b/client/src/components/report-center-modal/report-center-modal.component.jsx
@@ -145,7 +145,7 @@ export function ReportCenterModalComponent({ reportCenterModal, bodyshop }) {
   return (
     <div className="report-center-modal">
       <Form onFinish={handleFinish} autoComplete={"off"} layout="vertical" form={form}>
-        <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} />
+        <Input.Search onChange={(e) => setSearch(e.target.value)} value={search} enterButton />
         <Form.Item name="defaultSorters" hidden>
           <Input type="hidden" />
         </Form.Item>