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/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -53,7 +53,9 @@ export function ShopInfoComponent({ bodyshop, form, saveLoading }) {
      <Tabs
        defaultActiveKey={search.subtab}
        onChange={(key) =>
-          history.push({ search: `?tab=${search.tab}&subtab=${key}` })
+          history.push({
+            search: `?tab=${search.tab}&subtab=${key}`,
+          })
        }
      >
        <Tabs.TabPane key="general" tab={t("bodyshop.labels.shopinfo")}>