From 0d6d8e9d7c18a8053254f31c4d62f47d1581902f Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Thu, 13 Mar 2025 15:28:15 -0400
Subject: [PATCH 1/2] release/2025-03-14 - Fix issues caused by 3 of us merging
 stuff into release, 2 of which are months long.

---
 .../components/header/header.component.jsx    | 22 ++++---------------
 .../jobs-detail-header-actions.component.jsx  |  1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 1f7e10fcb..a33cea88f 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -208,32 +208,18 @@ function Header({
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
+      label: <Link to="/manage/payments"> {t("menus.header.allpayments")}</Link>
     },
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
-      icon: <Icon component={FaCreditCard} />,
+      icon: <FaCreditCard />,
       label: t("menus.header.enterpayment"),
-      onClick: () => {
+      onClick: () =>
+        HasFeatureAccess({ featureName: "payments", bodyshop }) &&
         setPaymentContext({
           actions: {},
           context: null
-        });
-      }
-    }
-  );
-
-  if (ImEXPay.treatment === "on") {
-    accountingChildren.push({
-      key: "entercardpayments",
-      id: "header-accounting-entercardpayments",
-      icon: <Icon component={FaCreditCard} />,
-      label: t("menus.header.entercardpayment"),
-      onClick: () => {
-        setCardPaymentContext({
-          actions: {},
-          context: null
         })
     },
     ...(ImEXPay.treatment === "on"
diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
index bfa85dfb2..02a6b3494 100644
--- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
+++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.component.jsx
@@ -32,6 +32,7 @@ import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 import AddToProduction from "./jobs-detail-header-actions.addtoproduction.util";
 import DuplicateJob from "./jobs-detail-header-actions.duplicate.util";
 import JobsDetailHeaderActionsToggleProduction from "./jobs-detail-header-actions.toggle-production";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,

From 0675f8438627cdd53c77addbee0477b7068812f9 Mon Sep 17 00:00:00 2001
From: Dave Richer <dave@imexsystems.ca>
Date: Thu, 13 Mar 2025 15:30:26 -0400
Subject: [PATCH 2/2] release/2025-03-14 - Fix issues caused by 3 of us merging
 stuff into release, 2 of which are months long.

---
 client/src/components/header/header.component.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index a33cea88f..386fa052d 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -208,7 +208,7 @@ function Header({
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: <Link to="/manage/payments"> {t("menus.header.allpayments")}</Link>
+      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
     },
     {
       key: "enterpayments",