Merge branch 'master' into feature/payroll

2023-07-06 13:04:50 -07:00
parent bccfc127f3 cb49c91983
commit b84cde1633
37 changed files with 516 additions and 174 deletions
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -334,7 +334,9 @@ function Header({
          icon={<SettingOutlined />}
        >
          <Menu.Item key="shop" icon={<Icon component={GiSettingsKnobs} />}>
-            <Link to="/manage/shop">{t("menus.header.shop_config")}</Link>
+            <Link to="/manage/shop?tab=info">
+              {t("menus.header.shop_config")}
+            </Link>
          </Menu.Item>
          <Menu.Item key="dashboard" icon={<DashboardFilled />}>
            <Link to="/manage/dashboard">{t("menus.header.dashboard")}</Link>