Merged in release/2022-01-14 (pull request #344)

Release/2022 01 14

client/src/components/shop-employees/shop-employees.container.jsx

@@ -7,6 +7,8 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import AlertComponent from "../alert/alert.component";
 import ShopEmployeesFormComponent from "./shop-employees-form.component";
 import ShopEmployeesListComponent from "./shop-employees-list.component";
+import RbacWrapper from "../rbac-wrapper/rbac-wrapper.component";
+
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -21,11 +23,13 @@ function ShopEmployeesContainer({ bodyshop }) {
 
   return (
     <div>
-      <ShopEmployeesListComponent
+      <RbacWrapper action="employees:page">
-        employees={data ? data.employees : []}
+        <ShopEmployeesListComponent
-        loading={loading}
+          employees={data ? data.employees : []}
-      />
+          loading={loading}
-      <ShopEmployeesFormComponent />
+        />
+        <ShopEmployeesFormComponent />
+      </RbacWrapper>
     </div>
   );
 }

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx

@@ -49,9 +49,13 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
           <Select>
             {emps &&
               emps.rates.map((item) => (
-                <Select.Option key={item.cost_center}>
+                <Select.Option key={item.cost_center} value={item.cost_center}>
                   {item.cost_center === "timetickets.labels.shift"
                     ? t(item.cost_center)
+                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                    ? t(
+                        `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
+                      )
                     : item.cost_center}
                 </Select.Option>
               ))}

client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.container.jsx

@@ -36,14 +36,17 @@ export function TechClockInContainer({ technician, bodyshop }) {
             clockon: theTime,
             jobid: values.jobid,
             cost_center: values.cost_center,
-            ciecacode: Object.keys(
+            ciecacode:
-              bodyshop.md_responsibility_centers.defaults.costs
+              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
-            ).find((key) => {
+                ? values.cost_center
-              return (
+                : Object.keys(
-                bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                    bodyshop.md_responsibility_centers.defaults.costs
-                values.cost_center
+                  ).find((key) => {
-              );
+                    return (
-            }),
+                      bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                      values.cost_center
+                    );
+                  }),
           },
         ],
       },

client/src/components/tech-job-clock-out-button/tech-job-clock-out-button.component.jsx

@@ -55,6 +55,20 @@ export function TechClockOffButton({
         timeticket: {
           clockoff: (await axios.post("/utils/time")).data,
           ...values,
+          rate: emps.rates.filter(
+            (r) => r.cost_center === values.cost_center
+          )[0]?.rate,
+          ciecacode:
+            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+              ? values.cost_center
+              : Object.keys(
+                  bodyshop.md_responsibility_centers.defaults.costs
+                ).find((key) => {
+                  return (
+                    bodyshop.md_responsibility_centers.defaults.costs[key] ===
+                    values.cost_center
+                  );
+                }),
         },
       },
     });
@@ -141,6 +155,10 @@ export function TechClockOffButton({
                       <Select.Option key={item.cost_center}>
                         {item.cost_center === "timetickets.labels.shift"
                           ? t(item.cost_center)
+                          : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          ? t(
+                              `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
+                            )
                           : item.cost_center}
                       </Select.Option>
                     ))