Merge remote-tracking branch 'origin/master' into feature/payroll

2023-04-17 13:12:47 -07:00
parent 542eca5867 ed6eab4c38
commit 8465e7539f
25 changed files with 373 additions and 49 deletions
--- a/client/src/components/shop-info/shop-info.general.component.jsx
+++ b/client/src/components/shop-info/shop-info.general.component.jsx
@@ -589,6 +589,13 @@ export default function ShopInfoGeneral({ form }) {
        >
          <Switch />
        </Form.Item>
+        <Form.Item
+          name={["tt_enforce_hours_for_tech_console"]}
+          label={t("bodyshop.fields.tt_enforce_hours_for_tech_console")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
        <Form.Item
          name={["bill_allow_post_to_closed"]}
          label={t("bodyshop.fields.bill_allow_post_to_closed")}