Merge remote-tracking branch 'origin/feature/IO-3172-RO-Basic-Payments' into release/2025-03-14

client/src/components/header/header.component.jsx

@@ -208,28 +208,32 @@ function Header({
       key: "allpayments",
       id: "header-accounting-allpayments",
       icon: <BankFilled />,
-      label: (
+      label: <Link to="/manage/payments">{t("menus.header.allpayments")}</Link>
-        <Link to="/manage/payments">
-          <LockWrapper featureName="payments" bodyshop={bodyshop}>
-            {t("menus.header.allpayments")}
-          </LockWrapper>
-        </Link>
-      )
     },
     {
       key: "enterpayments",
       id: "header-accounting-enterpayments",
-      icon: <FaCreditCard />,
+      icon: <Icon component={FaCreditCard} />,
-      label: (
+      label: t("menus.header.enterpayment"),
-        <LockWrapper featureName="payments" bodyshop={bodyshop}>
+      onClick: () => {
-          {t("menus.header.enterpayment")}
-        </LockWrapper>
-      ),
-      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"

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

@@ -28,11 +28,10 @@ import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import LockerWrapperComponent from "../lock-wrapper/lock-wrapper.component";
 import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+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";
-import ShareToTeamsButton from "../share-to-teams/share-to-teams.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -775,15 +774,14 @@ export function JobsDetailHeaderActions({
     key: "enterpayments",
     id: "job-actions-enterpayments",
     disabled: !job.converted,
-    label: <LockerWrapperComponent featureName="payments">{t("menus.header.enterpayment")}</LockerWrapperComponent>,
+    label: t("menus.header.enterpayment"),
     onClick: () => {
       logImEXEvent("job_header_enter_payment");
 
-      HasFeatureAccess({ featureName: "payments", bodyshop }) &&
+      setPaymentContext({
-        setPaymentContext({
+        actions: {},
-          actions: {},
+        context: { jobid: job.id }
-          context: { jobid: job.id }
+      });
-        });
     }
   });
 

client/src/pages/payments-all/payments-all.container.page.jsx

@@ -1,6 +1,6 @@
 import { useQuery } from "@apollo/client";
 import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
@@ -10,23 +10,17 @@ import PaymentsListPaginated from "../../components/payments-list-paginated/paym
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_ALL_PAYMENTS_PAGINATED } from "../../graphql/payments.queries";
 import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
-import { selectBodyshop } from "../../redux/user/user.selectors";
 import { pageLimit } from "../../utils/config";
-import FeatureWrapperComponent from "../../components/feature-wrapper/feature-wrapper.component";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
-import UpsellComponent, { upsellEnum } from "../../components/upsell/upsell.component";
-import { Card } from "antd";
 
-const mapStateToProps = createStructuredSelector({
+const mapStateToProps = createStructuredSelector({});
-  bodyshop: selectBodyshop
-});
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
   setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
 });
 
-export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
+export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, searchObj } = searchParams;
 
@@ -60,25 +54,15 @@ export function AllJobs({ bodyshop, setBreadcrumbs, setSelectedHeader }) {
 
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
-    <FeatureWrapperComponent
+    <RbacWrapper action="payments:list">
-      featureName="payments"
+      <PaymentsListPaginated
-      noauth={
+        refetch={refetch}
-        <Card>
+        loading={loading}
-          <UpsellComponent upsell={upsellEnum().payments.general} />
+        searchParams={searchParams}
-        </Card>
+        total={data ? data.payments_aggregate.aggregate.count : 0}
-      }
+        payments={data ? data.payments : []}
-      z
+      />
-    >
+    </RbacWrapper>
-      <RbacWrapper action="payments:list">
-        <PaymentsListPaginated
-          refetch={refetch}
-          loading={loading}
-          searchParams={searchParams}
-          total={data ? data.payments_aggregate.aggregate.count : 0}
-          payments={data ? data.payments : []}
-        />
-      </RbacWrapper>
-    </FeatureWrapperComponent>
   );
 }