Merge branch 'master-AIO' into feature/IO-3286-Additional-Product-Fruit-IDs

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -25,6 +25,7 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleUploadToImageProxy } from "../documents-upload-imgproxy/documents-upload-imgproxy.utility";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -53,10 +54,10 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
   const notification = useNotification();
 
   const {
-    treatments: { Enhanced_Payroll }
+    treatments: { Enhanced_Payroll, Imgproxy }
   } = useSplitTreatments({
     attributes: {},
-    names: ["Enhanced_Payroll"],
+    names: ["Enhanced_Payroll", "Imgproxy"],
     splitKey: bodyshop.imexshopid
   });
 
@@ -297,6 +298,24 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
             notification
           });
         });
+      } else {
+        //Check if using Imgproxy or cloudinary
+
+        if (Imgproxy.treatment === "on") {
+          upload.forEach((u) => {
+            handleUploadToImageProxy(
+              { file: u.originFileObj },
+              {
+                bodyshop: bodyshop,
+                uploaded_by: currentUser.email,
+                jobId: values.jobid,
+                billId: billId,
+                tagsArray: null,
+                callback: null
+              },
+              notification
+            );
+          });
         } else {
           upload.forEach((u) => {
             handleUpload(
@@ -314,6 +333,7 @@ function BillEnterModalContainer({ billEnterModal, toggleModalVisible, bodyshop,
           });
         }
       }
+    }
     ///////////////////////////
     setLoading(false);
     notification["success"]({

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-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/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();