Merge branch 'feature/payroll' into feature/america

client/src/pages/manage/manage.page.component.jsx

@@ -98,6 +98,11 @@ const BillEnterModalContainer = lazy(() =>
 const TimeTicketModalContainer = lazy(() =>
   import("../../components/time-ticket-modal/time-ticket-modal.container")
 );
+const TimeTicketModalTask = lazy(() =>
+  import(
+    "../../components/time-ticket-task-modal/time-ticket-task-modal.container"
+  )
+);
 const PaymentModalContainer = lazy(() =>
   import("../../components/payment-modal/payment-modal.container")
 );
@@ -207,6 +212,7 @@ export function Manage({ match, conflict, bodyshop }) {
       <ReportCenterModal />
       <EmailOverlayContainer />
       <TimeTicketModalContainer />
+      <TimeTicketModalTask />
       <PrintCenterModalContainer />
       <Route exact path={`${match.path}/_test`} component={TestComponent} />
       <Route exact path={`${match.path}`} component={ManageRootPage} />

client/src/pages/shop/shop.page.component.jsx

@@ -14,6 +14,8 @@ import {
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import ShopInfoUsersComponent from "../../components/shop-users/shop-users.component";
+import ShopTeamsContainer from "../../components/shop-teams/shop-teams.container";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -44,6 +46,9 @@ export function ShopPage({ bodyshop, setSelectedHeader, setBreadcrumbs }) {
         <Tabs.TabPane tab={t("bodyshop.labels.employees")} key="employees">
           <ShopEmployeesContainer />
         </Tabs.TabPane>
+        <Tabs.TabPane tab={t("bodyshop.labels.employee_teams")} key="teams">
+          <ShopTeamsContainer />
+        </Tabs.TabPane>
         <Tabs.TabPane tab={t("bodyshop.labels.licensing")} key="licensing">
           <ShopInfoUsersComponent />
         </Tabs.TabPane>