Merge branch 'feature/payroll' into feature/america

bodyshop_translations.babel

@@ -46441,6 +46441,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>payall</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>shiftalreadyclockedon</name>
                                         <definition_loaded>false</definition_loaded>
@@ -47401,6 +47422,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>payall</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                 </children>
                             </folder_node>
                             <folder_node>

client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx

@@ -1,5 +1,14 @@
-import { Button, Card, Col, Row, Space, Table, Typography } from "antd";
+import {
-import { SyncOutlined } from '@ant-design/icons'
+  Button,
+  Card,
+  Col,
+  Row,
+  Space,
+  Table,
+  Typography,
+  notification,
+} from "antd";
+import { SyncOutlined } from "@ant-design/icons";
 import axios from "axios";
 import _ from "lodash";
 import React, { useEffect, useMemo, useState } from "react";
@@ -225,10 +234,34 @@ export function PayrollLaborAllocationsTable({
             <Space>
               <Button
                 onClick={async () => {
-                  await axios.post("/payroll/payall", {
+                  const response = await axios.post("/payroll/payall", {
                     jobid: jobId,
                   });
-                  if (refetch) refetch();
+
+                  if (response.status === 200) {
+                    if (response.data.success) {
+                      notification.open({
+                        type: "success",
+                        message: t("timetickets.successes.payall"),
+                      });
+                    } else {
+                      notification.open({
+                        type: "error",
+                        message: t("timetickets.errors.payall", {
+                          error: response.data.error,
+                        }),
+                      });
+                    }
+
+                    if (refetch) refetch();
+                  } else {
+                    notification.open({
+                      type: "error",
+                      message: t("timetickets.errors.payall", {
+                        error: JSON.stringify(""),
+                      }),
+                    });
+                  }
                 }}
               >
                 {t("timetickets.actions.payall")}
@@ -242,7 +275,7 @@ export function PayrollLaborAllocationsTable({
                   refetch();
                 }}
               >
-                <SyncOutlined/>
+                <SyncOutlined />
               </Button>
             </Space>
           }

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

@@ -36,6 +36,7 @@ import FormDatePicker from "../form-date-picker/form-date-picker.component";
 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 { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -56,7 +57,11 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
   });
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const client = useApolloClient();
   useEffect(() => {
     if (data && data.employees_by_pk) form.setFieldsValue(data.employees_by_pk);
@@ -362,7 +367,7 @@ export function ShopEmployeesFormComponent({ bodyshop }) {
                             {t("timetickets.labels.shift")}
                           </Select.Option>
 
-                          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+                          {bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                             ? CiecaSelect(false, true)
                             : bodyshop.md_responsibility_centers.costs.map(
                                 (c) => (

client/src/components/shop-info/shop-info.task-presets.component.jsx

@@ -143,14 +143,6 @@ export function ShopInfoTaskPresets({ bodyshop, form }) {
                                 {t("joblines.fields.lbr_types.LAM")}
                               </Checkbox>
                             </Col>
-                            <Col span={4}>
-                              <Checkbox
-                                value="LAM"
-                                style={{ lineHeight: "32px" }}
-                              >
-                                {t("joblines.fields.lbr_types.LAM")}
-                              </Checkbox>
-                            </Col>
                             <Col span={4}>
                               <Checkbox
                                 value="LAR"

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

@@ -8,6 +8,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import JobSearchSelect from "../job-search-select/job-search-select.component";
 import JobsDetailLaborContainer from "../jobs-detail-labor/jobs-detail-labor.container";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -16,6 +17,11 @@ const mapStateToProps = createStructuredSelector({
 
 export function TechClockInComponent({ form, bodyshop, technician }) {
   const { t } = useTranslation();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const emps = bodyshop.employees.filter((e) => e.id === technician.id)[0];
   return (
     <div>
@@ -53,7 +59,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) {
                 <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
+                    : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === "on"
                     ? t(
                         `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
                       )

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

@@ -12,6 +12,7 @@ import TechClockInComponent from "./tech-job-clock-in-form.component";
 import TechJobPrintTickets from "../tech-job-print-tickets/tech-job-print-tickets.component";
 import moment from "moment";
 import { setModalContext } from "../../redux/modals/modals.actions";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   technician: selectTechnician,
@@ -26,9 +27,10 @@ export function TechClockInContainer({
   technician,
   bodyshop,
 }) {
-  console.log(
+  const { Enhanced_Payroll } = useTreatments(
-    "🚀 ~ file: tech-job-clock-in-form.container.jsx:29 ~ technician:",
+    ["Enhanced_Payroll"],
-    technician
+    {},
+    bodyshop.imexshopid
   );
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
@@ -56,7 +58,7 @@ export function TechClockInContainer({
             jobid: values.jobid,
             cost_center: values.cost_center,
             ciecacode:
-              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+              bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on'
                 ? values.cost_center
                 : Object.keys(
                     bodyshop.md_responsibility_centers.defaults.costs

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

@@ -24,6 +24,7 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import TechJobClockoutDelete from "../tech-job-clock-out-delete/tech-job-clock-out-delete.component";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -43,6 +44,12 @@ export function TechClockOffButton({
   const [updateTimeticket] = useMutation(UPDATE_TIME_TICKET);
   const [updateJobStatus] = useMutation(UPDATE_JOB_STATUS);
   const [form] = Form.useForm();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   const { queryLoading, data: lineTicketData } = useQuery(
     GET_LINE_TICKET_BY_PK,
     {
@@ -76,7 +83,9 @@ export function TechClockOffButton({
               ?.rate,
           flat_rate: emps && emps.flat_rate,
           ciecacode:
-            bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+            bodyshop.cdk_dealerid ||
+            bodyshop.pbs_serialnumber ||
+            Enhanced_Payroll.treatment === "on"
               ? values.cost_center
               : Object.keys(
                   bodyshop.md_responsibility_centers.defaults.costs

client/src/components/tech-sider/tech-sider.component.jsx

@@ -1,6 +1,7 @@
 import Icon, {
   SearchOutlined,
   ScheduleOutlined,
+  UserAddOutlined,
   CarOutlined,
 } from "@ant-design/icons";
 import { Layout, Menu } from "antd";
@@ -72,19 +73,28 @@ export function TechSider({
           <Link to={`/tech/joblookup`}>{t("menus.tech.joblookup")}</Link>
         </Menu.Item>
         {Enhanced_Payroll.treatment === "on" ? (
-          <Menu.Item
+          <>
-            key="3"
+            <Menu.Item
-            disabled={!!!technician}
+              key="TechAssignedProdJobs"
-            icon={<Icon component={FaBusinessTime} />}
+              disabled={!!!technician}
-            onClick={() => {
+              icon={<UserAddOutlined />}
-              setTimeTicketTaskContext({
+            >
-                actions: {},
+              <Link to={`/tech/assigned`}> {t("menus.tech.assignedjobs")}</Link>
-                context: { jobid: null },
+            </Menu.Item>
-              });
+            <Menu.Item
-            }}
+              key="3"
-          >
+              disabled={!!!technician}
-            {t("menus.tech.claimtask")}
+              icon={<Icon component={FaBusinessTime} />}
-          </Menu.Item>
+              onClick={() => {
+                setTimeTicketTaskContext({
+                  actions: {},
+                  context: { jobid: null },
+                });
+              }}
+            >
+              {t("menus.tech.claimtask")}
+            </Menu.Item>
+          </>
         ) : (
           <Menu.Item
             key="3"
@@ -120,13 +130,7 @@ export function TechSider({
         >
           <Link to={`/tech/board`}> {t("menus.tech.productionboard")}</Link>
         </Menu.Item>
-        <Menu.Item
+
-          key="TechAssignedProdJobs"
-          disabled={!!!technician}
-          icon={<Icon component={BsKanban} />}
-        >
-          <Link to={`/tech/assigned`}> {t("menus.tech.assignedjobs")}</Link>
-        </Menu.Item>
         <Menu.Item
           key="7"
           disabled={!!!technician}

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -20,6 +20,7 @@ import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
 import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
 import TimeTicketCalculatorComponent from "../time-ticket-calculator/time-ticket-calculator.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -41,6 +42,11 @@ export function TimeTicketModalComponent({
   employeeSelectDisabled,
 }) {
   const { t } = useTranslation();
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const [loadLineTicketData, { called, loading, data: lineTicketData }] =
     useLazyQuery(GET_LINE_TICKET_BY_PK, {
       fetchPolicy: "network-only",
@@ -58,7 +64,7 @@ export function TimeTicketModalComponent({
             <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
+                : bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatment === 'on'
                 ? t(
                     `joblines.fields.lbr_types.${item.cost_center.toUpperCase()}`
                   )

client/src/components/time-ticket-modal/time-ticket-modal.container.jsx

@@ -15,6 +15,7 @@ import { selectTimeTicket } from "../../redux/modals/modals.selectors";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
 import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   timeTicketModal: selectTimeTicket,
@@ -35,7 +36,11 @@ export function TimeTicketModalContainer({
   const [enterAgain, setEnterAgain] = useState(false);
   const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET);
   const [updateTicket] = useMutation(UPDATE_TIME_TICKET);
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const { data: EmployeeAutoCompleteData } = useQuery(QUERY_ACTIVE_EMPLOYEES, {
     skip: !timeTicketModal.visible,
     fetchPolicy: "network-only",
@@ -147,7 +152,7 @@ export function TimeTicketModalContainer({
     if (!!changedFields.cost_center && !!EmployeeAutoCompleteData) {
       form.setFieldsValue({
         ciecacode:
-          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber
+          bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber || Enhanced_Payroll.treatments === 'on'
             ? changedFields.cost_center
             : Object.keys(
                 bodyshop.md_responsibility_centers.defaults.costs

client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx

@@ -74,7 +74,7 @@ export function TimeTicketTaskModalComponent({
             <Form.Item dependencies={["task"]}>
               {() => {
                 const { task } = form.getFieldsValue();
-                const theTaskPreset = bodyshop.md_tasks_presets.presets.find(
+                const theTaskPreset = bodyshop.md_tasks_presets?.presets?.find(
                   (tp) => tp.name === task
                 );
 

client/src/pages/tech-assigned-prod-jobs/tech-assigned-prod-jobs.component.jsx

@@ -178,7 +178,7 @@ export function TechAssignedProdJobs({
       },
     },
     {
-      title: t("jobs.labels.actions"),
+      title: t("general.labels.actions"),
       dataIndex: "actions",
       key: "actions",
       render: (text, record) => (

client/src/translations/en_us/common.json

@@ -2755,6 +2755,7 @@
 				"deleting": "Error deleting time ticket. {{message}}",
 				"noemployeeforuser": "Unable to use Shift Clock",
 				"noemployeeforuser_sub": "An employee record has not been created for this user. Please create one before using the shift clock. ",
+				"payall": "Error flagging hours. {{error}}",
 				"shiftalreadyclockedon": "You are already clocked onto a shift. Unable to create shift entry."
 			},
 			"fields": {
@@ -2805,7 +2806,8 @@
 				"clockedout": "Clocked out successfully.",
 				"committed": "Time Tickets Committed Successfully",
 				"created": "Time ticket entered successfully.",
-				"deleted": "Time ticket deleted successfully."
+				"deleted": "Time ticket deleted successfully.",
+				"payall": "All hours paid out successfully."
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "Clock off time must be the same or after clock in time.",

client/src/translations/es/common.json

@@ -2755,6 +2755,7 @@
 				"deleting": "",
 				"noemployeeforuser": "",
 				"noemployeeforuser_sub": "",
+				"payall": "",
 				"shiftalreadyclockedon": ""
 			},
 			"fields": {
@@ -2805,7 +2806,8 @@
 				"clockedout": "",
 				"committed": "",
 				"created": "",
-				"deleted": ""
+				"deleted": "",
+				"payall": ""
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",

client/src/translations/fr/common.json

@@ -2755,6 +2755,7 @@
 				"deleting": "",
 				"noemployeeforuser": "",
 				"noemployeeforuser_sub": "",
+				"payall": "",
 				"shiftalreadyclockedon": ""
 			},
 			"fields": {
@@ -2805,7 +2806,8 @@
 				"clockedout": "",
 				"committed": "",
 				"created": "",
-				"deleted": ""
+				"deleted": "",
+				"payall": ""
 			},
 			"validation": {
 				"clockoffmustbeafterclockon": "",

server/payroll/pay-all.js

@@ -32,7 +32,7 @@ exports.payall = async function (req, res) {
     const { employeeHash, assignmentHash } = CalculateExpectedHoursForJob(job);
     const ticketHash = CalculateTicketsHoursForJob(job);
     if (assignmentHash.unassigned > 0) {
-      res.json({ success: false, error: "Unassigned hours." });
+      res.json({ success: false, error: "Not all hours have been assigned." });
       return;
     }
 
@@ -65,7 +65,7 @@ exports.payall = async function (req, res) {
               cost_center:
                 job.bodyshop.md_responsibility_centers.defaults.costs[key],
               flat_rate: true,
-              memo: `*SYS-PAY* Add unflagged hours. (${req.user.email})`,
+              memo: `Add unflagged hours. (${req.user.email})`,
             });
           });
         } else {
@@ -83,7 +83,7 @@ exports.payall = async function (req, res) {
               job.bodyshop.md_responsibility_centers.defaults.costs[
                 path.mod_lbr_ty
               ],
-            memo: `*SYS-PAY* Add unflagged hours. (${req.user.email})`,
+            memo: `Add unflagged hours. (${req.user.email})`,
           });
         }
       } else if (diff.op === "update") {
@@ -102,7 +102,7 @@ exports.payall = async function (req, res) {
             job.bodyshop.md_responsibility_centers.defaults.costs[
               path.mod_lbr_ty
             ],
-          memo: `*SYS-PAY* Adjust flagged hours per assignment. (${req.user.email})`,
+          memo: `Adjust flagged hours per assignment. (${req.user.email})`,
         });
       } else {
         //Has to be a delete
@@ -124,7 +124,7 @@ exports.payall = async function (req, res) {
               cost_center:
                 job.bodyshop.md_responsibility_centers.defaults.costs[key],
               flat_rate: true,
-              memo: `*SYS-PAY* Remove flagged hours per assignment. (${req.user.email})`,
+              memo: `Remove flagged hours per assignment. (${req.user.email})`,
             });
           });
         } else {
@@ -142,7 +142,7 @@ exports.payall = async function (req, res) {
                 path.mod_lbr_ty
               ],
             flat_rate: true,
-            memo: `*SYS-PAY* Remove flagged hours per assignment. (${req.user.email})`,
+            memo: `Remove flagged hours per assignment. (${req.user.email})`,
           });
         }
       }
@@ -163,10 +163,10 @@ exports.payall = async function (req, res) {
       jobid,
       {
         jobid: jobid,
-        error,
+        error: JSON.stringify(error),
       }
     );
-    res.status(503).send();
+    res.status(400).json({ error: error.message });
   }
 };