Merge remote-tracking branch 'origin/master-AIO' into feature/IO-3255-simplified-part-management

# Conflicts:
#	client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx

@@ -1,5 +1,5 @@
 import { Form, Statistic, Tooltip } from "antd";
-import React, { useMemo } from "react";
+import { useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -343,7 +343,11 @@ export function JobsDetailHeader({ job, bodyshop, disabled, insertAuditTrail, pa
       </Col>
       {!partsManagementOnly && (
         <Col {...colSpan}>
-          <Card style={{ height: "100%" }} title={t("jobs.labels.employeeassignments")}>
+          <Card
+            style={{ height: "100%" }}
+            title={<span id="job-employee-assignments-title">{t("jobs.labels.employeeassignments")}</span>}
+            id={"job-employee-assignments"}
+          >
             <div>
               <JobEmployeeAssignments job={job} />
               <Divider style={{ margin: ".5rem" }} />

client/src/components/scoreboard-display/scoreboard-display.component.jsx

@@ -1,5 +1,5 @@
 import { Col, Row } from "antd";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import ScoreboardChart from "../scoreboard-chart/scoreboard-chart.component";
 import ScoreboardLastDays from "../scoreboard-last-days/scoreboard-last-days.component";
 import ScoreboardTargetsTable from "../scoreboard-targets-table/scoreboard-targets-table.component";
@@ -31,13 +31,13 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
 
   const { data } = scoreboardSubscription;
   const client = useApolloClient();
-  const scoreBoardlist = (data && data.scoreboard) || [];
+  const scoreBoardlist = data?.scoreboard || [];
 
   const sbEntriesByDate = {};
 
   scoreBoardlist.forEach((i) => {
     const entryDate = i.date;
-    if (!!!sbEntriesByDate[entryDate]) {
+    if (!sbEntriesByDate[entryDate]) {
       sbEntriesByDate[entryDate] = [];
     }
     sbEntriesByDate[entryDate].push(i);
@@ -58,10 +58,9 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
         });
         appointments = data.appointments;
       }
-
+      dayjs.updateLocale(dayjs.locale(), {
-      dayjs.updateLocale("ca", {
         workingWeekdays: translateSettingsToWorkingDays(bodyshop.workingdays),
-        ...(appointments
+        ...(appointments?.length
           ? {
               holidays: appointments.map((h) => dayjs(h.start).format("MM-DD-YYYY"))
             }
@@ -78,11 +77,9 @@ export function ScoreboardDisplayComponent({ bodyshop }) {
       <Col span={24}>
         <ScoreboardTargetsTable scoreBoardlist={scoreBoardlist} />
       </Col>
-
       <Col span={24}>
         <ScoreboardLastDays sbEntriesByDate={sbEntriesByDate} />
       </Col>
-
       <Col span={24}>
         <ScoreboardChart sbEntriesByDate={sbEntriesByDate} />
       </Col>

client/src/components/shop-employees/shop-employees-form.component.jsx

@@ -1,13 +1,15 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useApolloClient, useMutation, useQuery } from "@apollo/client";
+import { useSplitTreatments } from "@splitsoftware/splitio-react";
 import { Button, Card, Form, Input, InputNumber, Select, Switch, Table } from "antd";
 import { useForm } from "antd/es/form/Form";
-import dayjs from "../../utils/day";
+import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { useLocation, useNavigate } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
+import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import {
   CHECK_EMPLOYEE_NUMBER,
@@ -20,19 +22,17 @@ import {
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import CiecaSelect from "../../utils/Ciecaselect";
 import { DateFormatter } from "../../utils/DateFormatter";
+import dayjs from "../../utils/day";
 import AlertComponent from "../alert/alert.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 import ShopEmployeeAddVacation from "./shop-employees-add-vacation.component";
-import queryString from "query-string";
-import { useSplitTreatments } from "@splitsoftware/splitio-react";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
-import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -83,7 +83,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
           }
         }
       })
-        .then((r) => {
+        .then(() => {
           notification["success"]({
             message: t("employees.successes.save")
           });
@@ -120,13 +120,13 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
       title: t("employees.fields.vacation.start"),
       dataIndex: "start",
       key: "start",
-      render: (text, record) => <DateFormatter>{text}</DateFormatter>
+      render: (text) => <DateFormatter>{text}</DateFormatter>
     },
     {
       title: t("employees.fields.vacation.end"),
       dataIndex: "end",
       key: "end",
-      render: (text, record) => <DateFormatter>{text}</DateFormatter>
+      render: (text) => <DateFormatter>{text}</DateFormatter>
     },
     {
       title: t("employees.fields.vacation.length"),
@@ -210,7 +210,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                 required: true
                 //message: t("general.validation.required"),
               },
-              ({ getFieldValue }) => ({
+              () => ({
                 async validator(rule, value) {
                   if (value) {
                     const response = await client.query({
@@ -369,8 +369,9 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                       add();
                     }}
                     style={{ width: "100%" }}
+                    id="add-employee-rate-button"
                   >
-                    {t("employees.actions.newrate")}
+                    <span id="new-employee-rate">{t("employees.actions.newrate")}</span>
                   </Button>
                 </Form.Item>
               </div>

client/src/components/shop-info/shop-info.general.component.jsx

@@ -14,6 +14,7 @@ import PhoneFormItem, { PhoneItemFormatterValidation } from "../form-items-forma
 import FormListMoveArrows from "../form-list-move-arrows/form-list-move-arrows.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
 
+// eslint-disable-next-line no-undef
 const timeZonesList = Intl.supportedValuesOf("timeZone");
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
@@ -143,8 +144,9 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           <InputNumber min={0} />
         </Form.Item>
       </LayoutFormRow>
-      <FeatureWrapper featureName="export" noauth={() => null}>
       <LayoutFormRow header={t("bodyshop.labels.accountingsetup")} id="accountingsetup">
+        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
+          <>
             <Form.Item label={t("bodyshop.labels.qbo")} valuePropName="checked" name={["accountingconfig", "qbo"]}>
               <Switch />
             </Form.Item>
@@ -218,6 +220,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
             >
               <Switch />
             </Form.Item>
+          </>
+        )}
         <Form.Item
           label={t("bodyshop.fields.inhousevendorid")}
           name={"inhousevendorid"}
@@ -252,6 +256,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         <Form.Item label={t("bodyshop.fields.state_tax_id")} name="state_tax_id">
           <Input />
         </Form.Item>
+        {HasFeatureAccess({ featureName: "bills", bodyshop }) && (
+          <>
             {InstanceRenderManager({
               imex: (
                 <Form.Item
@@ -292,6 +298,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
             >
               <InputNumber />
             </Form.Item>
+          </>
+        )}
         <Form.Item
           name={["md_payment_types"]}
           label={t("bodyshop.fields.md_payment_types")}
@@ -317,9 +325,8 @@ export function ShopInfoGeneral({ form, bodyshop }) {
         >
           <Select mode="tags" />
         </Form.Item>
-          <Form.Item name={["enforce_class"]} label={t("bodyshop.fields.enforce_class")} valuePropName="checked">
+        {HasFeatureAccess({ featureName: "export", bodyshop }) && (
-            <Switch />
+          <>
-          </Form.Item>
             <Form.Item
               name={["accountingconfig", "ReceivableCustomField1"]}
               label={t("bodyshop.fields.ReceivableCustomField", { number: 1 })}
@@ -353,6 +360,9 @@ export function ShopInfoGeneral({ form, bodyshop }) {
             >
               <Select mode="tags" />
             </Form.Item>
+            <Form.Item name={["enforce_class"]} label={t("bodyshop.fields.enforce_class")} valuePropName="checked">
+              <Switch />
+            </Form.Item>
             {ClosingPeriod.treatment === "on" && (
               <Form.Item
                 name={["accountingconfig", "ClosingPeriod"]}
@@ -371,8 +381,9 @@ export function ShopInfoGeneral({ form, bodyshop }) {
                 <Input />
               </Form.Item>
             )}
+          </>
+        )}
       </LayoutFormRow>
-      </FeatureWrapper>
       <FeatureWrapper featureName="scoreboard" noauth={() => null}>
         <LayoutFormRow header={t("bodyshop.labels.scoreboardsetup")} id="scoreboardsetup">
           <Form.Item
@@ -822,7 +833,11 @@ export function ShopInfoGeneral({ form, bodyshop }) {
           }}
         </Form.List>
       </LayoutFormRow>
-      <LayoutFormRow grow header=<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span> id="insurancecos">
+      <LayoutFormRow
+        grow
+        header=<span id="insurancecos-header">{t("bodyshop.labels.insurancecos")}</span>
+        id="insurancecos"
+      >
         <Form.List name={["md_ins_cos"]}>
           {(fields, { add, remove, move }) => {
             return (

client/src/components/shop-info/shop-info.scheduling.component.jsx

@@ -13,7 +13,7 @@ import { ColorPicker } from "./shop-info.rostatus.component";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -22,7 +22,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
 
   return (
     <div>
-      <LayoutFormRow>
+      <LayoutFormRow id="shopinfo-scheduling">
         <Form.Item
           label={t("bodyshop.fields.appt_length")}
           name={"appt_length"}
@@ -44,6 +44,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
               //message: t("general.validation.required"),
             }
           ]}
+          id="schedule_start_time"
         >
           <TimePicker disableSeconds={true} format="HH:mm" />
         </Form.Item>
@@ -56,6 +57,7 @@ export function ShopInfoSchedulingComponent({ form, bodyshop }) {
               //message: t("general.validation.required"),
             }
           ]}
+          id="schedule_end_time"
         >
           <TimePicker disableSeconds={true} format="HH:mm" />
         </Form.Item>

client/src/pages/scoreboard/scoreboard.page.container.jsx

@@ -1,7 +1,7 @@
 import Icon, { FieldTimeOutlined } from "@ant-design/icons";
 import { Card, Tabs } from "antd";
 import queryString from "query-string";
-import React, { useEffect } from "react";
+import { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { FaShieldAlt } from "react-icons/fa";
 import { connect } from "react-redux";
@@ -78,7 +78,7 @@ export function ScoreboardContainer({ setBreadcrumbs, setSelectedHeader }) {
       <RbacWrapper action="scoreboard:view">
         <Tabs
           activeKey={tab || "sb"}
-          destroyInactiveTabPane
+          destroyOnHidden
           onChange={(key) => {
             searchParams.tab = key;
             history({

server/job/job-totals-USA.js

@@ -381,7 +381,7 @@ async function CalculateRatesTotals({ job, client }) {
 
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
-      if (item.mod_lb_hrs === 0 && item.act_price > 0 && item.lbr_op === "OP14") {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
           ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();

server/job/job-totals.js

@@ -314,7 +314,8 @@ function CalculateRatesTotals(ratesList) {
 
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
-      if (item.mod_lb_hrs === 0 && item.act_price > 0 && item.lbr_op === "OP14") {
+      //Extend for when there are hours and a price.
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0)) {
         //Scenario where SGI may pay out hours using a part price.
         if (!ret[item.mod_lbr_ty.toLowerCase()].total) {
           ret[item.mod_lbr_ty.toLowerCase()].total = Dinero();