Merge branch 'feature/payroll' into feature/america

2023-06-02 09:32:00 -07:00
parent ce0fd42995 3d03de193e
commit dbf3226f97
19 changed files with 751 additions and 229 deletions
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -262,11 +262,13 @@ function Header({
              {t("menus.header.timetickets")}
            </Link>
          </Menu.Item>
-          <Menu.Item key="ttapprovals" icon={<FieldTimeOutlined />}>
-            <Link to="/manage/ttapprovals">
-              {t("menus.header.ttapprovals")}
-            </Link>
-          </Menu.Item>
+          {bodyshop?.md_tasks_presets?.use_approvals && (
+            <Menu.Item key="ttapprovals" icon={<FieldTimeOutlined />}>
+              <Link to="/manage/ttapprovals">
+                {t("menus.header.ttapprovals")}
+              </Link>
+            </Menu.Item>
+          )}
          <Menu.Item
            key="entertimetickets"
            icon={<Icon component={GiPlayerTime} />}