Updated pay all calculations and introduction of split.

client/src/components/job-detail-lines/job-lines.component.jsx

@@ -48,6 +48,7 @@ import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JoblineTeamAssignment from "../job-line-team-assignment/job-line-team-assignmnent.component";
 import JobLineDispatchButton from "../job-line-dispatch-button/job-line-dispatch-button.component";
 import JobLineBulkAssignComponent from "../job-line-bulk-assign/job-line-bulk-assign.component";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -79,7 +80,11 @@ export function JobLinesComponent({
   setBillEnterContext,
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
-
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
   const [selectedLines, setSelectedLines] = useState([]);
   const [state, setState] = useState({
     sortedInfo: {},
@@ -289,14 +294,19 @@ export function JobLinesComponent({
         state.sortedInfo.columnKey === "line_ind" && state.sortedInfo.order,
       responsive: ["md"],
     },
-    {
-      title: t("joblines.fields.assigned_team"),
-      dataIndex: "assigned_team",
-      key: "assigned_team",
-      render: (text, record) => (
-        <JoblineTeamAssignment disabled={jobRO} jobline={record} />
-      ),
-    },
+    ...(Enhanced_Payroll.treatment === "on"
+      ? [
+          {
+            title: t("joblines.fields.assigned_team"),
+            dataIndex: "assigned_team",
+            key: "assigned_team",
+            render: (text, record) => (
+              <JoblineTeamAssignment disabled={jobRO} jobline={record} />
+            ),
+          },
+        ]
+      : []),
+
     {
       title: t("joblines.fields.notes"),
       dataIndex: "notes",
@@ -464,11 +474,13 @@ export function JobLinesComponent({
               setSelectedLines={setSelectedLines}
               job={job}
             />
-            <JobLineBulkAssignComponent
-              selectedLines={selectedLines}
-              setSelectedLines={setSelectedLines}
-              job={job}
-            />
+            {Enhanced_Payroll.treatment === "on" && (
+              <JobLineBulkAssignComponent
+                selectedLines={selectedLines}
+                setSelectedLines={setSelectedLines}
+                job={job}
+              />
+            )}
             <Button
               disabled={
                 (job && !job.converted) ||

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

@@ -5,10 +5,13 @@ import { createStructuredSelector } from "reselect";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
 import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
 import TimeTicketList from "../time-ticket-list/time-ticket-list.component";
-import PayrollLaborAllocationsTable  from "../labor-allocations-table/labor-allocations-table.payroll.component";
+import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import { useTreatments } from "@splitsoftware/splitio-react";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
+  bodyshop: selectBodyshop,
 });
 
 export default connect(mapStateToProps, null)(JobsDetailLaborContainer);
@@ -49,6 +52,7 @@ const adjSpan = {
 };
 
 export function JobsDetailLaborContainer({
+  bodyshop,
   jobRO,
   job,
   jobId,
@@ -59,6 +63,12 @@ export function JobsDetailLaborContainer({
   techConsole,
   adjustments,
 }) {
+  const { Enhanced_Payroll } = useTreatments(
+    ["Enhanced_Payroll"],
+    {},
+    bodyshop.imexshopid
+  );
+
   return (
     <Row gutter={[16, 16]}>
       <Col {...ticketSpan}>
@@ -71,22 +81,26 @@ export function JobsDetailLaborContainer({
           jobId={jobId}
         />
       </Col>
-      <Col {...adjSpan}>
-        <LaborAllocationsTableComponent
-          jobId={jobId}
-          joblines={joblines}
-          timetickets={timetickets}
-          adjustments={adjustments}
-        />
-      </Col>
-      <Col {...adjSpan}>
-        <PayrollLaborAllocationsTable
-          jobId={jobId}
-          joblines={joblines}
-          timetickets={timetickets}
-          adjustments={adjustments}
-        />
-      </Col>
+
+      {Enhanced_Payroll.treatment === "on" ? (
+        <Col {...adjSpan}>
+          <PayrollLaborAllocationsTable
+            jobId={jobId}
+            joblines={joblines}
+            timetickets={timetickets}
+            adjustments={adjustments}
+          />
+        </Col>
+      ) : (
+        <Col {...adjSpan}>
+          <LaborAllocationsTableComponent
+            jobId={jobId}
+            joblines={joblines}
+            timetickets={timetickets}
+            adjustments={adjustments}
+          />
+        </Col>
+      )}
     </Row>
   );
 }

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

@@ -70,7 +70,7 @@ export function PayrollLaborAllocationsTable({
       sorter: (a, b) => a.total - b.total,
       sortOrder:
         state.sortedInfo.columnKey === "total" && state.sortedInfo.order,
-      render: (text, record) => record.total.toFixed(1),
+      render: (text, record) => record.total.toFixed(2),
     },
     {
       title: t("jobs.labels.hrs_claimed"),
@@ -79,7 +79,7 @@ export function PayrollLaborAllocationsTable({
       sorter: (a, b) => a.claimed - b.claimed,
       sortOrder:
         state.sortedInfo.columnKey === "claimed" && state.sortedInfo.order,
-      render: (text, record) => record.claimed && record.claimed.toFixed(1),
+      render: (text, record) => record.claimed && record.claimed.toFixed(2),
     },
     {
       title: t("jobs.labels.adjustments"),
@@ -90,7 +90,7 @@ export function PayrollLaborAllocationsTable({
         state.sortedInfo.columnKey === "adjustments" && state.sortedInfo.order,
       render: (text, record) => (
         <Space wrap>
-          {record.adjustments.toFixed(1)}
+          {record.adjustments.toFixed(2)}
           {!technician && (
             <LaborAllocationsAdjustmentEdit
               jobId={jobId}
@@ -182,7 +182,7 @@ export function PayrollLaborAllocationsTable({
       render: (text, record) =>
         record.convertedtolbr_data &&
         record.convertedtolbr_data.mod_lb_hrs &&
-        record.convertedtolbr_data.mod_lb_hrs.toFixed(1),
+        record.convertedtolbr_data.mod_lb_hrs.toFixed(2),
     },
   ];
 
@@ -208,10 +208,17 @@ export function PayrollLaborAllocationsTable({
       <Col span={24}>
         <Button
           onClick={async () => {
-            console.log(
-              await axios.post("/payroll/payall", {
-                jobid: jobId,
-              })
+            const { data } = await axios.post("/payroll/payall", {
+              jobid: jobId,
+            });
+
+            setTotals(
+              CalculateAllocationsTotals(
+                bodyshop,
+                joblines,
+                [...timetickets, ...data],
+                adjustments
+              )
             );
           }}
         >
@@ -235,16 +242,16 @@ export function PayrollLaborAllocationsTable({
                   </Typography.Title>
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.hrs_total.toFixed(1)}
+                  {summary.hrs_total.toFixed(2)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.hrs_claimed.toFixed(1)}
+                  {summary.hrs_claimed.toFixed(2)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.adjustments.toFixed(1)}
+                  {summary.adjustments.toFixed(2)}
                 </Table.Summary.Cell>
                 <Table.Summary.Cell>
-                  {summary.difference.toFixed(1)}
+                  {summary.difference.toFixed(2)}
                 </Table.Summary.Cell>
               </Table.Summary.Row>
             )}