IO-3582 Remove Unneeded Query - Data in billQuery

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/email-overlay/email-overlay.component.jsx

@@ -41,7 +41,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const emailsToMenu = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email && e.active === true)
+        .filter((e) => e.user_email)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,
@@ -59,7 +59,7 @@ export function EmailOverlayComponent({ emailConfig, form, selectedMediaState, b
   const menuCC = {
     items: [
       ...bodyshop.employees
-        .filter((e) => e.user_email && e.active === true)
+        .filter((e) => e.user_email)
         .map((e, idx) => ({
           key: idx,
           label: `${e.first_name} ${e.last_name}`,

client/src/components/form-items-formatted/read-only-form-item.component.jsx

@@ -10,13 +10,8 @@ const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-const toFiniteNumber = (value) => {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : null;
-};
-
 const ReadOnlyFormItem = ({ bodyshop, value, type = "text" }) => {
-  if (value === null || value === undefined || value === "") return null;
+  if (!value) return null;
   switch (type) {
     case "employee": {
       const emp = bodyshop.employees.find((e) => e.id === value);
@@ -25,15 +20,8 @@ const ReadOnlyFormItem = ({ bodyshop, value, type = "text" }) => {
 
     case "text":
       return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
-    case "currency": {
-      const numericValue = toFiniteNumber(value);
-
-      if (numericValue === null) {
-        return null;
-      }
-
-      return <div>{Dinero({ amount: Math.round(numericValue * 100) }).toFormat()}</div>;
-    }
+    case "currency":
+      return <div>{Dinero({ amount: Math.round(value * 100) }).toFormat()}</div>;
     default:
       return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
   }

client/src/components/form-list-move-arrows/form-list-move-arrows.component.jsx

@@ -1,7 +1,7 @@
 import { DownOutlined, UpOutlined } from "@ant-design/icons";
 import { Space } from "antd";
 
-export default function FormListMoveArrows({ move, index, total, orientation = "vertical" }) {
+export default function FormListMoveArrows({ move, index, total }) {
   const upDisabled = index === 0;
   const downDisabled = index === total - 1;
 
@@ -14,7 +14,7 @@ export default function FormListMoveArrows({ move, index, total, orientation = "
   };
 
   return (
-    <Space orientation={orientation}>
+    <Space orientation="vertical">
       <UpOutlined disabled={upDisabled} onClick={handleUp} />
       <DownOutlined disabled={downDisabled} onClick={handleDown} />
     </Space>

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

@@ -33,7 +33,7 @@ import JobLinesBillRefernece from "../job-lines-bill-reference/job-lines-bill-re
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import _ from "lodash";
 import { FaTasks } from "react-icons/fa";
-import { selectAuthLevel, selectBodyshop } from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import { HasFeatureAccess } from "../feature-wrapper/feature-wrapper.component";
@@ -49,7 +49,6 @@ import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
 import JobLinesExpanderSimple from "./jobs-lines-expander-simple.component";
 import { logImEXEvent } from "../../firebase/firebase.utils";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
-import { HasRbacAccess } from "../rbac-wrapper/rbac-wrapper.component.jsx";
 
 const UPDATE_JOB_LINES_LOCATION_BULK = gql`
   mutation UPDATE_JOB_LINES_LOCATION_BULK($ids: [uuid!]!, $location: String!) {
@@ -67,8 +66,7 @@ const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly,
   technician: selectTechnician,
-  isPartsEntry: selectIsPartsEntry,
-  authLevel: selectAuthLevel
+  isPartsEntry: selectIsPartsEntry
 });
 
 const mapDispatchToProps = (dispatch) => ({
@@ -96,8 +94,7 @@ export function JobLinesComponent({
   setTaskUpsertContext,
   billsQuery,
   handlePartsOrderOnRowClick,
-  isPartsEntry,
-  authLevel
+  isPartsEntry
 }) {
   const [deleteJobLine] = useMutation(DELETE_JOB_LINE_BY_PK);
   const [bulkUpdateLocations] = useMutation(UPDATE_JOB_LINES_LOCATION_BULK);
@@ -389,20 +386,18 @@ export function JobLinesComponent({
             key: "actions",
             render: (text, record) => (
               <Space>
-                {(record.manual_line || jobIsPrivate) &&
-                  !technician &&
-                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    <Button
-                      disabled={jobRO}
-                      onClick={() => {
-                        setJobLineEditContext({
-                          actions: { refetch: refetch, submit: form && form.submit },
-                          context: { ...record, jobid: job.id }
-                        });
-                      }}
-                      icon={<EditFilled />}
-                    />
-                  )}
+                {(record.manual_line || jobIsPrivate) && !technician && (
+                  <Button
+                    disabled={jobRO}
+                    onClick={() => {
+                      setJobLineEditContext({
+                        actions: { refetch: refetch, submit: form && form.submit },
+                        context: { ...record, jobid: job.id }
+                      });
+                    }}
+                    icon={<EditFilled />}
+                  />
+                )}
                 <Button
                   title={t("tasks.buttons.create")}
                   onClick={() => {
@@ -415,30 +410,29 @@ export function JobLinesComponent({
                   }}
                   icon={<FaTasks />}
                 />
-                {(record.manual_line || jobIsPrivate) &&
-                  !technician &&
-                  HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
-                    <Button
-                      disabled={jobRO}
-                      onClick={async () => {
-                        await deleteJobLine({
-                          variables: { joblineId: record.id },
-                          update(cache) {
-                            cache.modify({
-                              fields: {
-                                joblines(existingJobLines, { readField }) {
-                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
-                                }
+
+                {(record.manual_line || jobIsPrivate) && !technician && (
+                  <Button
+                    disabled={jobRO}
+                    onClick={async () => {
+                      await deleteJobLine({
+                        variables: { joblineId: record.id },
+                        update(cache) {
+                          cache.modify({
+                            fields: {
+                              joblines(existingJobLines, { readField }) {
+                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
                               }
-                            });
-                          }
-                        });
-                        await axios.post("/job/totalsssu", { id: job.id });
-                        if (refetch) refetch();
-                      }}
-                      icon={<DeleteFilled />}
-                    />
-                  )}
+                            }
+                          });
+                        }
+                      });
+                      await axios.post("/job/totalsssu", { id: job.id });
+                      if (refetch) refetch();
+                    }}
+                    icon={<DeleteFilled />}
+                  />
+                )}
               </Space>
             )
           }
@@ -663,7 +657,7 @@ export function JobLinesComponent({
               <Button id="repair-data-mark-button">{t("jobs.actions.mark")}</Button>
             </Dropdown>
 
-            {!isPartsEntry && HasRbacAccess({ bodyshop, authLevel, action: "jobs:manual-line" }) && (
+            {!isPartsEntry && (
               <Button
                 disabled={jobRO || technician}
                 onClick={() => {

client/src/components/job-totals-table/job-totals.table.labor.component.jsx

@@ -144,11 +144,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mapa")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mapa ?? job.materials?.MAPA)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mapa ?? job.materials.MAPA).cal_maxdlr }),
+                    job.materials?.mapa &&
+                    job.materials.mapa.cal_maxdlr &&
+                    job.materials.mapa.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mapa.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MAPA?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MAPA.cal_maxdlr })
+                    job.materials?.MAPA &&
+                    job.materials.MAPA.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MAPA.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>
@@ -183,11 +190,18 @@ export default function JobTotalsTableLabor({ job }) {
                 {t("jobs.labels.mash")}
                 {InstanceRenderManager({
                   imex:
-                    (job.materials?.mash ?? job.materials?.MASH)?.cal_maxdlr > 0 &&
-                    t("jobs.labels.threshhold", { amount: (job.materials.mash ?? job.materials.MASH).cal_maxdlr }),
+                    job.materials?.mash &&
+                    job.materials.mash.cal_maxdlr &&
+                    job.materials.mash.cal_maxdlr > 0 &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.mash.cal_maxdlr
+                    }),
                   rome:
-                    job.materials?.MASH?.cal_maxdlr !== undefined &&
-                    t("jobs.labels.threshhold", { amount: job.materials.MASH.cal_maxdlr })
+                    job.materials?.MASH &&
+                    job.materials.MASH.cal_maxdlr !== undefined &&
+                    t("jobs.labels.threshhold", {
+                      amount: job.materials.MASH.cal_maxdlr
+                    })
                 })}
               </Space>
             </ResponsiveTable.Summary.Cell>

client/src/components/jobs-admin-class/jobs-admin-class.component.jsx

@@ -69,9 +69,7 @@ export function JobsAdminClass({ bodyshop, job }) {
       </Form>
 
       <Popconfirm title={t("jobs.labels.changeclass")} onConfirm={() => form.submit()}>
-        <Button loading={loading} type="primary">
-          {t("general.actions.save")}
-        </Button>
+        <Button loading={loading}>{t("general.actions.save")}</Button>
       </Popconfirm>
     </div>
   );

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

@@ -157,7 +157,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
         </LayoutFormRow>
       </Form>
 
-      <Button loading={loading} type="primary" onClick={() => form.submit()}>
+      <Button loading={loading} onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-admin-owner-reassociate/jobs-admin-owner-reassociate.component.jsx

@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
         </Form.Item>
       </Form>
       <div>{t("jobs.labels.associationwarning")}</div>
-      <Button loading={loading} type="primary" onClick={() => form.submit()}>
+      <Button loading={loading} onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-admin-vehicle-reassociate/jobs-admin-vehicle-reassociate.component.jsx

@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
         </Form.Item>
       </Form>
       <div>{t("jobs.labels.associationwarning")}</div>
-      <Button loading={loading} type="primary" onClick={() => form.submit()}>
+      <Button loading={loading} onClick={() => form.submit()}>
         {t("general.actions.save")}
       </Button>
     </div>

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -138,7 +138,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                           showSearch={{
                             optionFilterProp: "children",
                             filterOption: (input, option) =>
-                              option?.value?.toLowerCase().indexOf(input?.toLowerCase()) >= 0
+                              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
                           options={bodyshop.md_responsibility_centers.profits.map((p) => ({
@@ -166,7 +166,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
                           showSearch={{
                             optionFilterProp: "children",
                             filterOption: (input, option) =>
-                              option?.value?.toLowerCase().indexOf(input?.toLowerCase()) >= 0
+                              option.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
                           }}
                           disabled={jobRO}
                           options={bodyshop.md_responsibility_centers.profits.map((p) => ({

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

@@ -21,8 +21,6 @@ const mapStateToProps = createStructuredSelector({
   technician: selectTechnician
 });
 
-const getRequestErrorMessage = (error) => error?.response?.data?.error || error?.message || "";
-
 export function PayrollLaborAllocationsTable({
   jobId,
   joblines,
@@ -45,23 +43,16 @@ export function PayrollLaborAllocationsTable({
   });
   const notification = useNotification();
 
-  const loadTotals = async () => {
-    try {
+  useEffect(() => {
+    async function CalculateTotals() {
       const { data } = await axios.post("/payroll/calculatelabor", {
         jobid: jobId
       });
       setTotals(data);
-    } catch (error) {
-      setTotals([]);
-      notification.error({
-        title: getRequestErrorMessage(error)
-      });
     }
-  };
 
-  useEffect(() => {
     if (!!joblines && !!timetickets && !!bodyshop) {
-      loadTotals();
+      CalculateTotals();
     }
     if (!jobId) setTotals([]);
   }, [joblines, timetickets, bodyshop, adjustments, jobId]);
@@ -219,36 +210,28 @@ export function PayrollLaborAllocationsTable({
               <Button
                 disabled={!hasTimeTicketAccess}
                 onClick={async () => {
-                  try {
-                    const response = await axios.post("/payroll/payall", {
-                      jobid: jobId
-                    });
+                  const response = await axios.post("/payroll/payall", {
+                    jobid: jobId
+                  });
 
-                    if (response.status === 200) {
-                      if (response.data.success !== false) {
-                        notification.success({
-                          title: t("timetickets.successes.payall")
-                        });
-                      } else {
-                        notification.error({
-                          title: t("timetickets.errors.payall", {
-                            error: response.data.error
-                          })
-                        });
-                      }
-
-                      if (refetch) refetch();
+                  if (response.status === 200) {
+                    if (response.data.success !== false) {
+                      notification.success({
+                        title: t("timetickets.successes.payall")
+                      });
                     } else {
                       notification.error({
                         title: t("timetickets.errors.payall", {
-                          error: JSON.stringify("")
+                          error: response.data.error
                         })
                       });
                     }
-                  } catch (error) {
+
+                    if (refetch) refetch();
+                  } else {
                     notification.error({
                       title: t("timetickets.errors.payall", {
-                        error: getRequestErrorMessage(error)
+                        error: JSON.stringify("")
                       })
                     });
                   }
@@ -258,7 +241,10 @@ export function PayrollLaborAllocationsTable({
               </Button>
               <Button
                 onClick={async () => {
-                  await loadTotals();
+                  const { data } = await axios.post("/payroll/calculatelabor", {
+                    jobid: jobId
+                  });
+                  setTotals(data);
                   refetch();
                 }}
                 icon={<SyncOutlined />}

client/src/components/parts-order-list-table/parts-order-list-table-drawer.component.jsx

@@ -1,17 +1,16 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { PageHeader } from "@ant-design/pro-layout";
-import { useLazyQuery, useMutation } from "@apollo/client/react";
+import { useMutation } from "@apollo/client/react";
 import { Button, Drawer, Grid, Popconfirm, Space } from "antd";
 import ResponsiveTable from "../responsive-table/responsive-table.component";
 import queryString from "query-string";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaTasks } from "react-icons/fa";
 import { connect } from "react-redux";
 import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-import { QUERY_BILL_BY_PK } from "../../graphql/bills.queries";
 import { DELETE_PARTS_ORDER } from "../../graphql/parts-orders.queries";
 import { selectIsPartsEntry, selectJobReadOnly } from "../../redux/application/application.selectors";
 import { setModalContext } from "../../redux/modals/modals.actions";
@@ -92,34 +91,14 @@ export function PartsOrderListTableDrawerComponent({
     sortedInfo: {}
   });
 
-  const [billData, setBillData] = useState(null);
   const search = queryString.parse(useLocation().search);
   const selectedpartsorder = search.partsorderid;
 
   const [deletePartsOrder] = useMutation(DELETE_PARTS_ORDER);
   const parts_orders = billsQuery.data ? billsQuery.data.parts_orders : [];
   const { refetch } = billsQuery;
-  const [billQuery] = useLazyQuery(QUERY_BILL_BY_PK);
   const selectedPartsOrderRecord = parts_orders.find((r) => r.id === selectedpartsorder);
 
-  useEffect(() => {
-    const fetchData = async () => {
-      if (selectedPartsOrderRecord?.returnfrombill) {
-        try {
-          const { data } = await billQuery({
-            variables: {
-              billid: selectedPartsOrderRecord.returnfrombill
-            }
-          });
-          setBillData(data);
-        } catch (error) {
-          console.error("Error fetching bill data:", error);
-        }
-      } else setBillData(null);
-    };
-    fetchData();
-  }, [selectedPartsOrderRecord, billQuery]);
-
   const recordActions = (record) => (
     <Space orientation="horizontal" wrap>
       <Button
@@ -363,9 +342,9 @@ export function PartsOrderListTableDrawerComponent({
       <div>
         <PageHeader
           title={
-            billData
-              ? `${record.vendor.name} - ${record.order_number} - ${t("bills.labels.returnfrombill")}: ${billData.bills_by_pk.invoice_number}`
-              : `${record.vendor.name} - ${record.order_number}`
+            selectedPartsOrderRecord.returnfrombill
+              ? `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number} - ${t("bills.labels.returnfrombill")}: ${selectedPartsOrderRecord.bill.invoice_number}`
+              : `${selectedPartsOrderRecord.vendor.name} - ${selectedPartsOrderRecord.order_number}`
           }
           extra={recordActions(record)}
         />

client/src/components/production-list-columns/production-list-columns.comment.component.jsx

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Tooltip } from "antd";
-import { useState, useRef } from "react";
+import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
@@ -9,10 +9,10 @@ import { logImEXEvent } from "../../firebase/firebase.utils";
 
 export default function ProductionListColumnComment({ record, usePortal = false }) {
   const { t } = useTranslation();
+
   const [note, setNote] = useState(record.comment || "");
+
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -38,35 +38,23 @@ export default function ProductionListColumnComment({ record, usePortal = false
   };
 
   const handleOpenChange = (flag) => {
-    if (rafIdRef.current) {
-      cancelAnimationFrame(rafIdRef.current);
-      rafIdRef.current = null;
-    }
     setOpen(flag);
-    if (flag) {
-      setNote(record.comment || "");
-      rafIdRef.current = requestAnimationFrame(() => {
-        rafIdRef.current = null;
-        if (textAreaRef.current?.focus) {
-          try {
-            textAreaRef.current.focus({ preventScroll: true });
-          } catch {
-            textAreaRef.current.focus();
-          }
-        }
-      });
-    }
+    if (flag) setNote(record.comment || "");
   };
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-comment-${record.id}`}
         name="comment"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -79,13 +67,13 @@ export default function ProductionListColumnComment({ record, usePortal = false
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx

@@ -1,7 +1,7 @@
 import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/client/react";
 import { Button, Input, Popover, Space } from "antd";
-import { useCallback, useRef, useState } from "react";
+import { useCallback, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
@@ -20,8 +20,6 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   const { t } = useTranslation();
   const [note, setNote] = useState(record.production_vars?.note || "");
   const [open, setOpen] = useState(false);
-  const textAreaRef = useRef(null);
-  const rafIdRef = useRef(null);
 
   const [updateAlert] = useMutation(UPDATE_JOB);
 
@@ -54,37 +52,25 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
 
   const handleOpenChange = useCallback(
     (flag) => {
-      if (rafIdRef.current) {
-        cancelAnimationFrame(rafIdRef.current);
-        rafIdRef.current = null;
-      }
       setOpen(flag);
-      if (flag) {
-        setNote(record.production_vars?.note || "");
-        rafIdRef.current = requestAnimationFrame(() => {
-          rafIdRef.current = null;
-          if (textAreaRef.current?.focus) {
-            try {
-              textAreaRef.current.focus({ preventScroll: true });
-            } catch {
-              textAreaRef.current.focus();
-            }
-          }
-        });
-      }
+      if (flag) setNote(record.production_vars?.note || "");
     },
     [record]
   );
 
   const content = (
-    <div style={{ width: "30em" }} onClick={(e) => e.stopPropagation()} onPointerDown={(e) => e.stopPropagation()}>
+    <div 
+      style={{ width: "30em" }} 
+      onClick={(e) => e.stopPropagation()}
+      onPointerDown={(e) => e.stopPropagation()}
+    >
       <Input.TextArea
         id={`job-production-note-${record.id}`}
         name="production_note"
         rows={5}
         value={note}
         onChange={handleChange}
-        ref={textAreaRef}
+        autoFocus
         allowClear
         style={{ marginBottom: "1em" }}
       />
@@ -110,13 +96,13 @@ function ProductionListColumnProductionNote({ record, setNoteUpsertContext, useP
   );
 
   return (
-    <Popover
-      onOpenChange={handleOpenChange}
-      open={open}
-      content={content}
-      trigger="click"
+    <Popover 
+      onOpenChange={handleOpenChange} 
+      open={open} 
+      content={content} 
+      trigger="click" 
       destroyOnHidden
-      styles={{ body: { padding: "12px" } }}
+      styles={{ body: { padding: '12px' } }}
       {...(usePortal ? { getPopupContainer: (trigger) => trigger.parentElement || document.body } : {})}
     >
       <div

client/src/components/rbac-wrapper/rbac-defaults.js

@@ -26,7 +26,6 @@ const ret = {
   "jobs:partsqueue": 4,
   "jobs:checklist-view": 2,
   "jobs:list-ready": 1,
-  "jobs:manual-line": 1,
   "jobs:void": 5,
 
   "bills:enter": 2,

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

@@ -435,19 +435,6 @@ export function ShopInfoRbacComponent({ bodyshop }) {
           >
             <InputNumber />
           </Form.Item>,
-          <Form.Item
-            key="jobs:manual-line"
-            label={t("bodyshop.fields.rbac.jobs.manual-line")}
-            rules={[
-              {
-                required: true
-                //message: t("general.validation.required"),
-              }
-            ]}
-            name={["md_rbac", "jobs:manual-line"]}
-          >
-            <InputNumber />
-          </Form.Item>,
           <Form.Item
             key="jobs:partsqueue"
             label={t("bodyshop.fields.rbac.jobs.partsqueue")}

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

@@ -16,43 +16,6 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(ShopInfoTaskPresets);
 
-const normalizePercent = (value) => Math.round((Number(value || 0) + Number.EPSILON) * 10000) / 10000;
-
-const getTaskPresetAllocationErrors = (presets = [], t) => {
-  const totalsByLaborType = {};
-
-  presets.forEach((preset) => {
-    const percent = normalizePercent(preset?.percent);
-
-    if (!percent) {
-      return;
-    }
-
-    const laborTypes = Array.isArray(preset?.hourstype) ? preset.hourstype : [];
-
-    laborTypes.forEach((laborType) => {
-      if (!laborType) {
-        return;
-      }
-
-      totalsByLaborType[laborType] = normalizePercent((totalsByLaborType[laborType] || 0) + percent);
-    });
-  });
-
-  return Object.entries(totalsByLaborType)
-    .filter(([, total]) => total > 100)
-    .map(([laborType, total]) => {
-      const translatedLaborType = t(`joblines.fields.lbr_types.${laborType}`);
-      const laborTypeLabel =
-        translatedLaborType === `joblines.fields.lbr_types.${laborType}` ? laborType : translatedLaborType;
-
-      return t("bodyshop.errors.task_preset_allocation_exceeded", {
-        laborType: laborTypeLabel,
-        total
-      });
-    });
-};
-
 export function ShopInfoTaskPresets({ bodyshop }) {
   const { t } = useTranslation();
 
@@ -76,21 +39,8 @@ export function ShopInfoTaskPresets({ bodyshop }) {
       </LayoutFormRow>
 
       <LayoutFormRow header={t("bodyshop.labels.md_tasks_presets")}>
-        <Form.List
-          name={["md_tasks_presets", "presets"]}
-          rules={[
-            {
-              validator: async (_, presets) => {
-                const allocationErrors = getTaskPresetAllocationErrors(presets, t);
-
-                if (allocationErrors.length > 0) {
-                  throw new Error(allocationErrors.join(" "));
-                }
-              }
-            }
-          ]}
-        >
-          {(fields, { add, remove, move }, { errors }) => {
+        <Form.List name={["md_tasks_presets", "presets"]}>
+          {(fields, { add, remove, move }) => {
             return (
               <div>
                 {fields.map((field, index) => (
@@ -239,7 +189,6 @@ export function ShopInfoTaskPresets({ bodyshop }) {
                     </LayoutFormRow>
                   </Form.Item>
                 ))}
-                <Form.ErrorList errors={errors} />
                 <Form.Item>
                   <Button
                     type="dashed"

client/src/components/shop-teams/shop-employee-teams.form.component.jsx

@@ -1,6 +1,6 @@
 import { DeleteFilled } from "@ant-design/icons";
 import { useMutation, useQuery } from "@apollo/client/react";
-import { Button, Card, Col, Form, Input, InputNumber, Row, Select, Space, Switch, Tag, Typography } from "antd";
+import { Button, Card, Form, Input, InputNumber, Space, Switch } from "antd";
 
 import querystring from "query-string";
 import { useEffect } from "react";
@@ -26,59 +26,10 @@ import { useNotification } from "../../contexts/Notifications/notificationContex
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({});
-
-const LABOR_TYPES = ["LAA", "LAB", "LAD", "LAE", "LAF", "LAG", "LAM", "LAR", "LAS", "LAU", "LA1", "LA2", "LA3", "LA4"];
-
-const PAYOUT_METHOD_OPTIONS = [
-  { labelKey: "employee_teams.options.hourly", value: "hourly" },
-  { labelKey: "employee_teams.options.commission_percentage", value: "commission" }
-];
-
-const TEAM_MEMBER_PRIMARY_FIELD_COLS = {
-  employee: { xs: 24, lg: 13, xxl: 14 },
-  allocation: { xs: 24, sm: 12, lg: 4, xxl: 4 },
-  payoutMethod: { xs: 24, sm: 12, lg: 7, xxl: 6 }
-};
-
-const TEAM_MEMBER_RATE_FIELD_COLS = { xs: 24, sm: 12, md: 8, lg: 6, xxl: 4 };
-
-const normalizeTeamMember = (teamMember = {}) => ({
-  ...teamMember,
-  payout_method: teamMember.payout_method || "hourly",
-  labor_rates: teamMember.labor_rates || {},
-  commission_rates: teamMember.commission_rates || {}
+const mapDispatchToProps = () => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-const normalizeEmployeeTeam = (employeeTeam = {}) => ({
-  ...employeeTeam,
-  employee_team_members: (employeeTeam.employee_team_members || []).map(normalizeTeamMember)
-});
-
-const getSplitTotal = (teamMembers = []) =>
-  teamMembers.reduce((sum, member) => sum + Number(member?.percentage || 0), 0);
-
-const hasExactSplitTotal = (teamMembers = []) => Math.abs(getSplitTotal(teamMembers) - 100) < 0.00001;
-
-const getPayoutMethodTagColor = (payoutMethod) => (payoutMethod === "commission" ? "gold" : "blue");
-
-const getEmployeeDisplayName = (employees = [], employeeId) => {
-  const employee = employees.find((currentEmployee) => currentEmployee.id === employeeId);
-  if (!employee) return null;
-
-  const fullName = [employee.first_name, employee.last_name].filter(Boolean).join(" ").trim();
-  return fullName || employee.employee_number || null;
-};
-
-const formatAllocationPercentage = (percentage) => {
-  if (percentage === null || percentage === undefined || percentage === "") return null;
-
-  const numericValue = Number(percentage);
-  if (!Number.isFinite(numericValue)) return null;
-
-  return `${numericValue.toFixed(2).replace(/\.?0+$/, "")}%`;
-};
-
 export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
   const { t } = useTranslation();
   const [form] = Form.useForm();
@@ -94,100 +45,38 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
   });
 
   useEffect(() => {
-    if (data?.employee_teams_by_pk) {
-      form.setFieldsValue(normalizeEmployeeTeam(data.employee_teams_by_pk));
-    } else {
+    if (data?.employee_teams_by_pk) form.setFieldsValue(data.employee_teams_by_pk);
+    else {
       form.resetFields();
     }
   }, [form, data, search.employeeTeamId]);
 
   const [updateEmployeeTeam] = useMutation(UPDATE_EMPLOYEE_TEAM);
   const [insertEmployeeTeam] = useMutation(INSERT_EMPLOYEE_TEAM);
-  const payoutMethodOptions = PAYOUT_METHOD_OPTIONS.map(({ labelKey, value }) => ({
-    label: t(labelKey),
-    value
-  }));
-  const teamName = Form.useWatch("name", form);
-  const teamMembers = Form.useWatch(["employee_team_members"], form) || [];
-  const teamCardTitle = teamName?.trim() || t("employee_teams.fields.name");
-
-  const getTeamMemberTitle = (teamMember = {}) => {
-    const employeeName =
-      getEmployeeDisplayName(bodyshop.employees, teamMember.employeeid) || t("employee_teams.fields.employeeid");
-    const allocation = formatAllocationPercentage(teamMember.percentage);
-    const payoutMethod =
-      teamMember.payout_method === "commission"
-        ? t("employee_teams.options.commission")
-        : t("employee_teams.options.hourly");
-
-    return (
-      <div style={{ display: "flex", flexWrap: "wrap", alignItems: "center", gap: 8 }}>
-        <Typography.Text strong>{employeeName}</Typography.Text>
-        <Tag bordered={false} color="geekblue">
-          {`${t("employee_teams.fields.allocation")}: ${allocation || "--"}`}
-        </Tag>
-        <Tag bordered={false} color={getPayoutMethodTagColor(teamMember.payout_method)}>
-          {payoutMethod}
-        </Tag>
-      </div>
-    );
-  };
-
-  const handleFinish = async ({ employee_team_members = [], ...values }) => {
-    const normalizedTeamMembers = employee_team_members.map((teamMember) => {
-      const nextTeamMember = normalizeTeamMember({ ...teamMember });
-      delete nextTeamMember.__typename;
-      return nextTeamMember;
-    });
-
-    if (normalizedTeamMembers.length === 0) {
-      notification.error({
-        title: t("employee_teams.errors.minimum_one_member")
-      });
-      return;
-    }
-
-    const employeeIds = normalizedTeamMembers.map((teamMember) => teamMember.employeeid).filter(Boolean);
-    const duplicateEmployeeIds = employeeIds.filter((employeeId, index) => employeeIds.indexOf(employeeId) !== index);
-
-    if (duplicateEmployeeIds.length > 0) {
-      notification.error({
-        title: t("employee_teams.errors.duplicate_member")
-      });
-      return;
-    }
-
-    if (!hasExactSplitTotal(normalizedTeamMembers)) {
-      notification.error({
-        title: t("employee_teams.errors.allocation_total_exact")
-      });
-      return;
-    }
 
+  const handleFinish = async ({ employee_team_members, ...values }) => {
     if (search.employeeTeamId && search.employeeTeamId !== "new") {
+      //Update a record.
       logImEXEvent("shop_employee_update");
 
       const result = await updateEmployeeTeam({
         variables: {
           employeeTeamId: search.employeeTeamId,
           employeeTeam: values,
-          teamMemberUpdates: normalizedTeamMembers
-            .filter((teamMember) => teamMember.id)
-            .map((teamMember) => ({
-              where: { id: { _eq: teamMember.id } },
-              _set: teamMember
-            })),
-          teamMemberInserts: normalizedTeamMembers
-            .filter((teamMember) => teamMember.id === null || teamMember.id === undefined)
-            .map((teamMember) => ({ ...teamMember, teamid: search.employeeTeamId })),
-          teamMemberDeletes: data.employee_teams_by_pk.employee_team_members
-            .filter(
-              (teamMember) => !normalizedTeamMembers.find((currentTeamMember) => currentTeamMember.id === teamMember.id)
-            )
-            .map((teamMember) => teamMember.id)
+          teamMemberUpdates: employee_team_members
+            .filter((e) => e.id)
+            .map((e) => {
+              delete e.__typename;
+              return { where: { id: { _eq: e.id } }, _set: e };
+            }),
+          teamMemberInserts: employee_team_members
+            .filter((e) => e.id === null || e.id === undefined)
+            .map((e) => ({ ...e, teamid: search.employeeTeamId })),
+          teamMemberDeletes: data.employee_teams_by_pk.employee_team_members.filter(
+            (e) => !employee_team_members.find((etm) => etm.id === e.id)
+          )
         }
       });
-
       if (!result.errors) {
         notification.success({
           title: t("employees.successes.save")
@@ -200,19 +89,20 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
         });
       }
     } else {
+      //New record, insert it.
       logImEXEvent("shop_employee_insert");
 
       insertEmployeeTeam({
         variables: {
           employeeTeam: {
             ...values,
-            employee_team_members: { data: normalizedTeamMembers },
+            employee_team_members: { data: employee_team_members },
             bodyshopid: bodyshop.id
           }
         },
         refetchQueries: ["QUERY_TEAMS"]
-      }).then((response) => {
-        search.employeeTeamId = response.data.insert_employee_teams_one.id;
+      }).then((r) => {
+        search.employeeTeamId = r.data.insert_employee_teams_one.id;
         history({ search: querystring.stringify(search) });
         notification.success({
           title: t("employees.successes.save")
@@ -226,7 +116,6 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
 
   return (
     <Card
-      title={teamCardTitle}
       extra={
         <Button type="primary" onClick={() => form.submit()}>
           {t("general.actions.save")}
@@ -241,6 +130,7 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
             rules={[
               {
                 required: true
+                //message: t("general.validation.required"),
               }
             ]}
           >
@@ -255,6 +145,7 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
             rules={[
               {
                 required: true
+                //message: t("general.validation.required"),
               }
             ]}
           >
@@ -265,149 +156,243 @@ export function ShopEmployeeTeamsFormComponent({ bodyshop }) {
           {(fields, { add, remove, move }) => {
             return (
               <div>
-                {fields.map((field, index) => {
-                  const teamMember = normalizeTeamMember(teamMembers[field.name]);
-
-                  return (
-                    <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
-                      <Form.Item label={t("employees.fields.id")} key={`${index}`} name={[field.name, "id"]} hidden>
-                        <Input type="hidden" />
-                      </Form.Item>
-                      <LayoutFormRow
-                        grow
-                        title={getTeamMemberTitle(teamMember)}
-                        extra={
-                          <Space align="center" size="small">
-                            <Button
-                              type="text"
-                              icon={<DeleteFilled />}
-                              onClick={() => {
-                                remove(field.name);
-                              }}
-                            />
-                            <FormListMoveArrows
-                              move={move}
-                              index={index}
-                              total={fields.length}
-                              orientation="horizontal"
-                            />
-                          </Space>
-                        }
-                      >
-                        <div>
-                          <Row gutter={[16, 0]}>
-                            <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.employee}>
-                              <Form.Item
-                                label={t("employee_teams.fields.employeeid")}
-                                key={`${index}`}
-                                name={[field.name, "employeeid"]}
-                                rules={[
-                                  {
-                                    required: true
-                                  }
-                                ]}
-                              >
-                                <EmployeeSearchSelectComponent options={bodyshop.employees} />
-                              </Form.Item>
-                            </Col>
-                            <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.allocation}>
-                              <Form.Item
-                                label={t("employee_teams.fields.allocation_percentage")}
-                                key={`${index}`}
-                                name={[field.name, "percentage"]}
-                                rules={[
-                                  {
-                                    required: true
-                                  }
-                                ]}
-                              >
-                                <InputNumber min={0} max={100} precision={2} />
-                              </Form.Item>
-                            </Col>
-                            <Col {...TEAM_MEMBER_PRIMARY_FIELD_COLS.payoutMethod}>
-                              <Form.Item
-                                label={t("employee_teams.fields.payout_method")}
-                                key={`${index}-payout-method`}
-                                name={[field.name, "payout_method"]}
-                                initialValue="hourly"
-                                rules={[
-                                  {
-                                    required: true
-                                  }
-                                ]}
-                              >
-                                <Select options={payoutMethodOptions} />
-                              </Form.Item>
-                            </Col>
-                          </Row>
-                          <Form.Item noStyle dependencies={[["employee_team_members", field.name, "payout_method"]]}>
-                            {() => {
-                              const payoutMethod =
-                                form.getFieldValue(["employee_team_members", field.name, "payout_method"]) || "hourly";
-                              const fieldName = payoutMethod === "commission" ? "commission_rates" : "labor_rates";
-
-                              return (
-                                <Row gutter={[16, 0]}>
-                                  {LABOR_TYPES.map((laborType) => (
-                                    <Col {...TEAM_MEMBER_RATE_FIELD_COLS} key={`${index}-${fieldName}-${laborType}`}>
-                                      <Form.Item
-                                        label={
-                                          t(`joblines.fields.lbr_types.${laborType}`)
-                                        }
-                                        name={[field.name, fieldName, laborType]}
-                                        rules={[
-                                          {
-                                            required: true
-                                          }
-                                        ]}
-                                      >
-                                        {payoutMethod === "commission" ? (
-                                          <InputNumber min={0} max={100} precision={2} />
-                                        ) : (
-                                          <CurrencyInput />
-                                        )}
-                                      </Form.Item>
-                                    </Col>
-                                  ))}
-                                </Row>
-                              );
-                            }}
-                          </Form.Item>
-                        </div>
-                      </LayoutFormRow>
+                {fields.map((field, index) => (
+                  <Form.Item key={field.key} style={{ padding: 0, margin: 2 }}>
+                    <Form.Item label={t("employees.fields.id")} key={`${index}`} name={[field.name, "id"]} hidden>
+                      <Input type="hidden" />
                     </Form.Item>
-                  );
-                })}
+                    <LayoutFormRow grow>
+                      <Form.Item
+                        label={t("employee_teams.fields.employeeid")}
+                        key={`${index}`}
+                        name={[field.name, "employeeid"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <EmployeeSearchSelectComponent options={bodyshop.employees} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("employee_teams.fields.percentage")}
+                        key={`${index}`}
+                        name={[field.name, "percentage"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <InputNumber min={0} max={100} precision={2} />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAA")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAA"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAB")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAB"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAD")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAD"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAE")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAE"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAF")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAF"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAG")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAG"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAM")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAM"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAR")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAR"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAS")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAS"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LAU")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LAU"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA1")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA1"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA2")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA2"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA3")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA3"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("joblines.fields.lbr_types.LA4")}
+                        key={`${index}`}
+                        name={[field.name, "labor_rates", "LA4"]}
+                        rules={[
+                          {
+                            required: true
+                            //message: t("general.validation.required"),
+                          }
+                        ]}
+                      >
+                        <CurrencyInput />
+                      </Form.Item>
+                      <Space align="center">
+                        <DeleteFilled
+                          onClick={() => {
+                            remove(field.name);
+                          }}
+                        />
+                        <FormListMoveArrows move={move} index={index} total={fields.length} />
+                      </Space>
+                    </LayoutFormRow>
+                  </Form.Item>
+                ))}
                 <Form.Item>
                   <Button
                     type="dashed"
                     onClick={() => {
-                      add({
-                        percentage: 0,
-                        payout_method: "hourly",
-                        labor_rates: {},
-                        commission_rates: {}
-                      });
+                      add();
                     }}
                     style={{ width: "100%" }}
                   >
                     {t("employee_teams.actions.newmember")}
                   </Button>
                 </Form.Item>
-                <Form.Item noStyle shouldUpdate>
-                  {() => {
-                    const teamMembers = form.getFieldValue(["employee_team_members"]) || [];
-                    const splitTotal = getSplitTotal(teamMembers);
-
-                    return (
-                      <Typography.Text type={hasExactSplitTotal(teamMembers) ? undefined : "danger"}>
-                        {t("employee_teams.labels.allocation_total", {
-                          total: splitTotal.toFixed(2)
-                        })}
-                      </Typography.Text>
-                    );
-                  }}
-                </Form.Item>
               </div>
             );
           }}

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

@@ -66,9 +66,10 @@ export function TechClockInContainer({ setTimeTicketContext, technician, bodysho
             employeeid: technician.id,
             date:
               typeof bodyshop.timezone === "string"
-                ? dayjs(theTime).tz(bodyshop.timezone).format("YYYY-MM-DD")
+                ? // TODO: Client Update - This may be broken
+                  dayjs.tz(theTime, bodyshop.timezone).format("YYYY-MM-DD")
                 : typeof bodyshop.timezone === "number"
-                  ? dayjs(theTime).utcOffset(bodyshop.timezone).format("YYYY-MM-DD")
+                  ? dayjs(theTime).format("YYYY-MM-DD").utcOffset(bodyshop.timezone)
                   : dayjs(theTime).format("YYYY-MM-DD"),
             clockon: dayjs(theTime),
             jobid: values.jobid,

client/src/components/tech-lookup-jobs-drawer/tech-lookup-jobs-drawer.component.jsx

@@ -25,7 +25,10 @@ const mapDispatchToProps = (dispatch) => ({
 });
 
 export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
-  const screens = Grid.useBreakpoint();
+  const breakpoints = Grid.useBreakpoint();
+  const selectedBreakpoint = Object.entries(breakpoints)
+    .filter(([, isOn]) => !!isOn)
+    .slice(-1)[0];
 
   const bpoints = {
     xs: "100%",
@@ -33,16 +36,10 @@ export function TechLookupJobsDrawer({ bodyshop, setPrintCenterContext }) {
     md: "100%",
     lg: "100%",
     xl: "90%",
-    xxl: "90%"
+    xxl: "85%"
   };
 
-  let drawerPercentage = "100%";
-  if (screens.xxl) drawerPercentage = bpoints.xxl;
-  else if (screens.xl) drawerPercentage = bpoints.xl;
-  else if (screens.lg) drawerPercentage = bpoints.lg;
-  else if (screens.md) drawerPercentage = bpoints.md;
-  else if (screens.sm) drawerPercentage = bpoints.sm;
-  else if (screens.xs) drawerPercentage = bpoints.xs;
+  const drawerPercentage = selectedBreakpoint ? bpoints[selectedBreakpoint[0]] : "100%";
 
   const location = useLocation();
   const history = useNavigate();

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

@@ -15,18 +15,6 @@ const mapDispatchToProps = () => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(TimeTicketTaskModalComponent);
 
-const getPayoutMethodLabel = (payoutMethod, t) => {
-  if (!payoutMethod) {
-    return "";
-  }
-
-  if (payoutMethod === "hourly" || payoutMethod === "commission") {
-    return t(`timetickets.labels.payout_methods.${payoutMethod}`);
-  }
-
-  return payoutMethod;
-};
-
 export function TimeTicketTaskModalComponent({ bodyshop, form, loading, completedTasks, unassignedHours }) {
   const { t } = useTranslation();
 
@@ -47,15 +35,7 @@ export function TimeTicketTaskModalComponent({ bodyshop, form, loading, complete
             <JobSearchSelectComponent convertedOnly={true} notExported={true} />
           </Form.Item>
           <Space wrap>
-            <Form.Item
-              name="task"
-              label={t("timetickets.labels.task")}
-              rules={[
-                {
-                  required: true
-                }
-              ]}
-            >
+            <Form.Item name="task" label={t("timetickets.labels.task")}>
               {loading ? (
                 <Spin />
               ) : (
@@ -113,51 +93,33 @@ export function TimeTicketTaskModalComponent({ bodyshop, form, loading, complete
                           <th>{t("timetickets.fields.cost_center")}</th>
                           <th>{t("timetickets.fields.ciecacode")}</th>
                           <th>{t("timetickets.fields.productivehrs")}</th>
-                          <th>{t("timetickets.fields.payout_method")}</th>
-                          <th>{t("timetickets.fields.rate")}</th>
-                          <th>{t("timetickets.fields.amount")}</th>
                         </tr>
                       </thead>
                       <tbody>
-                        {fields.map((field, index) => {
-                          const payoutMethod = form.getFieldValue(["timetickets", field.name, "payout_context", "payout_method"]);
-
-                          return (
-                            <tr key={field.key}>
-                              <td>
-                                <Form.Item key={`${index}employeeid`} name={[field.name, "employeeid"]}>
-                                  <ReadOnlyFormItemComponent type="employee" />
-                                </Form.Item>
-                              </td>
-                              <td>
-                                <Form.Item key={`${index}cost_center`} name={[field.name, "cost_center"]}>
-                                  <ReadOnlyFormItemComponent />
-                                </Form.Item>
-                              </td>
-                              <td>
-                                <Form.Item key={`${index}ciecacode`} name={[field.name, "ciecacode"]}>
-                                  <ReadOnlyFormItemComponent />
-                                </Form.Item>
-                              </td>
-                              <td>
-                                <Form.Item key={`${index}productivehrs`} name={[field.name, "productivehrs"]}>
-                                  <ReadOnlyFormItemComponent />
-                                </Form.Item>
-                              </td>
-                              <td>{getPayoutMethodLabel(payoutMethod, t)}</td>
-                              <td>
-                                <Form.Item key={`${index}rate`} name={[field.name, "rate"]}>
-                                  <ReadOnlyFormItemComponent type="currency" />
-                                </Form.Item>
-                              </td>
-                              <td>
-                                <Form.Item key={`${index}payoutamount`} name={[field.name, "payoutamount"]}>
-                                  <ReadOnlyFormItemComponent type="currency" />
-                                </Form.Item>
-                              </td>
-                            </tr>
-                          );
-                        })}
+                        {fields.map((field, index) => (
+                          <tr key={field.key}>
+                            <td>
+                              <Form.Item key={`${index}employeeid`} name={[field.name, "employeeid"]}>
+                                <ReadOnlyFormItemComponent type="employee" />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item key={`${index}cost_center`} name={[field.name, "cost_center"]}>
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item key={`${index}ciecacode`} name={[field.name, "ciecacode"]}>
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                            <td>
+                              <Form.Item key={`${index}productivehrs`} name={[field.name, "productivehrs"]}>
+                                <ReadOnlyFormItemComponent />
+                              </Form.Item>
+                            </td>
+                          </tr>
+                        ))}
                       </tbody>
                     </table>
                     <Alert type="success" title={t("timetickets.labels.payrollclaimedtasks")} />

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

@@ -25,22 +25,6 @@ const mapDispatchToProps = (dispatch) => ({
 });
 export default connect(mapStateToProps, mapDispatchToProps)(TimeTickeTaskModalContainer);
 
-const toFiniteNumber = (value) => {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : null;
-};
-
-const getPreviewPayoutAmount = (ticket) => {
-  const productiveHours = toFiniteNumber(ticket?.productivehrs);
-  const rate = toFiniteNumber(ticket?.rate);
-
-  if (productiveHours === null || rate === null) {
-    return null;
-  }
-
-  return productiveHours * rate;
-};
-
 export function TimeTickeTaskModalContainer({ currentUser, technician, timeTicketTasksModal, toggleModalVisible }) {
   const [form] = Form.useForm();
   const { context, open, actions } = timeTicketTasksModal;
@@ -106,12 +90,7 @@ export function TimeTickeTaskModalContainer({ currentUser, technician, timeTicke
         if (actions?.refetch) actions.refetch();
         toggleModalVisible();
       } else if (handleFinish === false) {
-        form.setFieldsValue({
-          timetickets: (data.ticketsToInsert || []).map((ticket) => ({
-            ...ticket,
-            payoutamount: getPreviewPayoutAmount(ticket)
-          }))
-        });
+        form.setFieldsValue({ timetickets: data.ticketsToInsert });
         setUnassignedHours(data.unassignedHours);
       } else {
         notification.error({
@@ -122,9 +101,7 @@ export function TimeTickeTaskModalContainer({ currentUser, technician, timeTicke
       }
     } catch (error) {
       notification.error({
-        title: t("timetickets.errors.creating", {
-          message: error.response?.data?.error || error.message
-        })
+        title: t("timetickets.errors.creating", { message: error.message })
       });
     } finally {
       setLoading(false);

client/src/components/tt-approvals-list/tt-approvals-list.component.jsx

@@ -130,15 +130,7 @@ export function TtApprovalsListComponent({
       key: "memo",
       sorter: (a, b) => alphaSort(a.memo, b.memo),
       sortOrder: state.sortedInfo.columnKey === "memo" && state.sortedInfo.order,
-      render: (text, record) => (record.memo?.startsWith("timetickets.labels") ? t(record.memo) : record.memo)
-    },
-    {
-      title: t("timetickets.fields.task_name"),
-      dataIndex: "task_name",
-      key: "task_name",
-      sorter: (a, b) => alphaSort(a.task_name, b.task_name),
-      sortOrder: state.sortedInfo.columnKey === "task_name" && state.sortedInfo.order,
-      render: (text, record) => record.task_name || ""
+      render: (text, record) => (record.clockon || record.clockoff ? t(record.memo) : record.memo)
     },
     {
       title: t("timetickets.fields.clockon"),
@@ -148,12 +140,12 @@ export function TtApprovalsListComponent({
       render: (text, record) => <DateTimeFormatter>{record.clockon}</DateTimeFormatter>
     },
     {
-      title: t("timetickets.fields.pay"),
+      title: "Pay",
       dataIndex: "pay",
       key: "pay",
       render: (text, record) =>
-        Dinero({ amount: Math.round((record.rate || 0) * 100) })
-          .multiply(record.flat_rate ? record.productivehrs || 0 : record.actualhrs || 0)
+        Dinero({ amount: Math.round(record.rate * 100) })
+          .multiply(record.flat_rate ? record.productivehrs : record.actualhrs)
           .toFormat("$0.00")
     }
   ];
@@ -192,7 +184,7 @@ export function TtApprovalsListComponent({
       <ResponsiveTable
         loading={loading}
         columns={columns}
-        mobileColumnKeys={["ro_number", "date", "employeeid", "cost_center", "task_name"]}
+        mobileColumnKeys={["ro_number", "date", "employeeid", "cost_center"]}
         rowKey="id"
         scroll={{
           x: true

client/src/components/tt-approve-button/tt-approve-button.component.jsx

@@ -18,15 +18,7 @@ const mapStateToProps = createStructuredSelector({
   authLevel: selectAuthLevel
 });
 
-export function TtApproveButton({
-  bodyshop,
-  currentUser,
-  selectedTickets,
-  disabled,
-  authLevel,
-  completedCallback,
-  refetch
-}) {
+export function TtApproveButton({ bodyshop, currentUser, selectedTickets, disabled, authLevel }) {
   const { t } = useTranslation();
   const client = useApolloClient();
   const notification = useNotification();
@@ -62,12 +54,6 @@ export function TtApproveButton({
           })
         });
       } else {
-        if (typeof completedCallback === "function") {
-          completedCallback([]);
-        }
-        if (typeof refetch === "function") {
-          refetch();
-        }
         notification.success({
           title: t("timetickets.successes.created")
         });
@@ -82,6 +68,8 @@ export function TtApproveButton({
       setLoading(false);
     }
 
+    // if (!!completedCallback) completedCallback([]);
+    // if (!!loadingCallback) loadingCallback(false);
   };
 
   return (

client/src/graphql/bodyshop.queries.js

@@ -152,8 +152,6 @@ export const QUERY_BODYSHOP = gql`
           id
           employeeid
           labor_rates
-          payout_method
-          commission_rates
           percentage
         }
       }
@@ -287,8 +285,6 @@ export const UPDATE_SHOP = gql`
             id
             employeeid
             labor_rates
-            payout_method
-            commission_rates
             percentage
           }
         }

client/src/graphql/employee_teams.queries.js

@@ -10,8 +10,6 @@ export const QUERY_TEAMS = gql`
         id
         employeeid
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }
@@ -31,8 +29,6 @@ export const UPDATE_EMPLOYEE_TEAM = gql`
         employeeid
         id
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }
@@ -44,8 +40,6 @@ export const UPDATE_EMPLOYEE_TEAM = gql`
         employeeid
         id
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }
@@ -58,8 +52,6 @@ export const UPDATE_EMPLOYEE_TEAM = gql`
         employeeid
         id
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }
@@ -77,8 +69,6 @@ export const INSERT_EMPLOYEE_TEAM = gql`
         employeeid
         id
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }
@@ -96,8 +86,6 @@ export const QUERY_EMPLOYEE_TEAM_BY_ID = gql`
         employeeid
         id
         labor_rates
-        payout_method
-        commission_rates
         percentage
       }
     }

client/src/graphql/jobs.queries.js

@@ -1375,9 +1375,6 @@ export const QUERY_JOB_FOR_DUPE = gql`
       agt_ph2x
       area_of_damage
       cat_no
-      cieca_pfl
-      cieca_pfo
-      cieca_pft
       cieca_stl
       cieca_ttl
       clm_addr1
@@ -1455,7 +1452,6 @@ export const QUERY_JOB_FOR_DUPE = gql`
       labor_rate_desc
       labor_rate_id
       local_tax_rate
-      materials
       other_amount_payable
       owner_owing
       ownerid

client/src/graphql/timetickets.queries.js

@@ -260,7 +260,6 @@ export const INSERT_TIME_TICKET_AND_APPROVE = gql`
         id
         clockon
         clockoff
-        created_by
         employeeid
         productivehrs
         actualhrs
@@ -268,9 +267,6 @@ export const INSERT_TIME_TICKET_AND_APPROVE = gql`
         date
         memo
         flat_rate
-        task_name
-        payout_context
-        ttapprovalqueueid
         commited_by
         committed_at
       }

client/src/graphql/tt-approvals.queries.js

@@ -23,14 +23,7 @@ export const QUERY_ALL_TT_APPROVALS_PAGINATED = gql`
       ciecacode
       cost_center
       date
-      memo
-      flat_rate
-      clockon
-      clockoff
       rate
-      created_by
-      task_name
-      payout_context
     }
     tt_approval_queue_aggregate {
       aggregate {
@@ -49,16 +42,9 @@ export const INSERT_NEW_TT_APPROVALS = gql`
         productivehrs
         actualhrs
         ciecacode
-        cost_center
         date
         memo
         flat_rate
-        rate
-        clockon
-        clockoff
-        created_by
-        task_name
-        payout_context
       }
     }
   }
@@ -79,11 +65,6 @@ export const QUERY_TT_APPROVALS_BY_IDS = gql`
       ciecacode
       bodyshopid
       cost_center
-      clockon
-      clockoff
-      created_by
-      task_name
-      payout_context
     }
   }
 `;

client/src/pages/export-logs/export-logs.page.component.jsx

@@ -142,13 +142,13 @@ export function ExportLogsPageComponent() {
             <div>
               <ul>
                 {message.map((m, idx) => (
-                  <li key={idx}>{typeof m === "object" ? JSON.stringify(m) : m}</li>
+                  <li key={idx}>{m}</li>
                 ))}
               </ul>
             </div>
           );
         } else {
-          return <div>{typeof message === "object" ? JSON.stringify(message) : message}</div>;
+          return <div>{record.message}</div>;
         }
       }
     }

client/src/pages/jobs-create/jobs-create.component.jsx

@@ -10,12 +10,14 @@ import JobsCreateOwnerInfoContainer from "../../components/jobs-create-owner-inf
 import JobsCreateVehicleInfoContainer from "../../components/jobs-create-vehicle-info/jobs-create-vehicle-info.container";
 import JobCreateContext from "../../pages/jobs-create/jobs-create.context";
 
-export default function JobsCreateComponent({ form, isSubmitting }) {
+export default function JobsCreateComponent({ form }) {
   const [pageIndex, setPageIndex] = useState(0);
-  const [errorMessage, setErrorMessage] = useState(null);
-  const [state] = useContext(JobCreateContext);
-  const { t } = useTranslation();
 
+  const [errorMessage, setErrorMessage] = useState(null);
+
+  const [state] = useContext(JobCreateContext);
+
+  const { t } = useTranslation();
   const steps = [
     {
       title: t("jobs.labels.create.vehicleinfo"),
@@ -40,9 +42,11 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
 
   const next = () => {
     setPageIndex(pageIndex + 1);
+    console.log("Next");
   };
   const prev = () => {
     setPageIndex(pageIndex - 1);
+    console.log("Previous");
   };
 
   const ProgressButtons = ({ top }) => {
@@ -75,19 +79,17 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
             {pageIndex === steps.length - 1 && (
               <Button
                 type="primary"
-                loading={isSubmitting}
                 onClick={() => {
                   form
                     .validateFields()
                     .then(() => {
-                      form.submit();
+                      // NO OP
                     })
-                    .catch((error) => {
-                      console.log("error", error);
-                    });
+                    .catch((error) => console.log("error", error));
+                  form.submit();
                 }}
               >
-                {t("general.actions.done")}
+                Done
               </Button>
             )}
           </Space>
@@ -144,11 +146,13 @@ export default function JobsCreateComponent({ form, isSubmitting }) {
       ) : (
         <div>
           <ProgressButtons top />
+
           {errorMessage ? (
             <div>
               <AlertComponent title={errorMessage} type="error" />
             </div>
           ) : null}
+
           {steps.map((item, idx) => (
             <div
               key={idx}

client/src/pages/jobs-create/jobs-create.container.jsx

@@ -46,7 +46,6 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
   });
   const [form] = Form.useForm();
   const [state, setState] = contextState;
-  const [isSubmitting, setIsSubmitting] = useState(false);
   const [insertJob] = useMutation(INSERT_NEW_JOB);
   const [loadOwner, remoteOwnerData] = useLazyQuery(QUERY_OWNER_FOR_JOB_CREATION);
 
@@ -84,19 +83,16 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
           newJobId: resp.data.insert_jobs.returning[0].id
         });
         logImEXEvent("manual_job_create_completed", {});
-        setIsSubmitting(false);
       })
       .catch((error) => {
         notification.error({
           title: t("jobs.errors.creating", { error: error })
         });
         setState({ ...state, error: error });
-        setIsSubmitting(false);
       });
   };
 
   const handleFinish = (values) => {
-    setIsSubmitting(true);
     let job = Object.assign(
       {},
       values,
@@ -301,7 +297,7 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
             })
           }}
         >
-          <JobsCreateComponent form={form} isSubmitting={isSubmitting} />
+          <JobsCreateComponent form={form} />
         </Form>
       </RbacWrapper>
     </JobCreateContext.Provider>

client/src/redux/root.reducer.js

@@ -1,6 +1,6 @@
 import { combineReducers } from "redux";
 import { persistReducer } from "redux-persist";
-import storageModule from "redux-persist/lib/storage";
+import storage from "redux-persist/lib/storage";
 import { withReduxStateSync } from "redux-state-sync";
 import applicationReducer from "./application/application.reducer";
 import emailReducer from "./email/email.reducer";
@@ -11,8 +11,6 @@ import techReducer from "./tech/tech.reducer";
 import userReducer from "./user/user.reducer";
 import trelloReducer from "./trello/trello.reducer";
 
-const storage = storageModule?.default ?? storageModule;
-
 // const persistConfig = {
 //   key: "root",
 //   storage,

client/src/translations/en_us/common.json

@@ -305,8 +305,7 @@
         "creatingdefaultview": "Error creating default view.",
         "duplicate_insurance_company": "Duplicate insurance company name. Each insurance company name must be unique",
         "loading": "Unable to load shop details. Please call technical support.",
-        "saving": "Error encountered while saving. {{message}}",
-        "task_preset_allocation_exceeded": "{{laborType}} task preset total is {{total}}% and cannot exceed 100%."
+        "saving": "Error encountered while saving. {{message}}"
       },
       "fields": {
         "ReceivableCustomField": "QBO Receivable Custom Field {{number}}",
@@ -520,7 +519,6 @@
             "list-active": "Jobs -> List Active",
             "list-all": "Jobs -> List All",
             "list-ready": "Jobs -> List Ready",
-            "manual-line": "Jobs -> Manual Line",
             "partsqueue": "Jobs -> Parts Queue",
             "void": "Jobs -> Void"
           },
@@ -1176,28 +1174,12 @@
         "new": "New Team",
         "newmember": "New Team Member"
       },
-      "errors": {
-        "allocation_total_exact": "Team allocation must total exactly 100%.",
-        "duplicate_member": "Each employee can only appear once per team.",
-        "minimum_one_member": "Add at least one team member."
-      },
       "fields": {
         "active": "Active",
-        "allocation": "Allocation",
-        "allocation_percentage": "Allocation %",
         "employeeid": "Employee",
         "max_load": "Max Load",
         "name": "Team Name",
-        "payout_method": "Payout Method",
         "percentage": "Percent"
-      },
-      "labels": {
-        "allocation_total": "Allocation Total: {{total}}%"
-      },
-      "options": {
-        "commission": "Commission",
-        "commission_percentage": "Commission %",
-        "hourly": "Hourly"
       }
     },
     "employees": {
@@ -1313,7 +1295,6 @@
         "delete": "Delete",
         "deleteall": "Delete All",
         "deselectall": "Deselect All",
-        "done": "Done",
         "download": "Download",
         "edit": "Edit",
         "gotoadmin": "Go to Admin Panel",
@@ -3391,10 +3372,8 @@
         "void_ros": "Void ROs",
         "work_in_progress_committed_labour": "Work in Progress - Committed Labor",
         "work_in_progress_jobs": "Work in Progress - Jobs",
-        "work_in_progress_labour": "Work in Progress - Labor (Detail)",
-        "work_in_progress_labour_summary": "Work in Progress - Labor (Summary)",
-        "work_in_progress_payables": "Work in Progress - Payables (Detail)",
-        "work_in_progress_payables_summary": "Work in Progress - Payables (Summary)"
+        "work_in_progress_labour": "Work in Progress - Labor",
+        "work_in_progress_payables": "Work in Progress - Payables"
       }
     },
     "schedule": {
@@ -3611,7 +3590,6 @@
       },
       "fields": {
         "actualhrs": "Actual Hours",
-        "amount": "Amount",
         "ciecacode": "CIECA Code",
         "clockhours": "Clock Hours",
         "clockoff": "Clock Off",
@@ -3626,10 +3604,7 @@
         "employee_team": "Employee Team",
         "flat_rate": "Flat Rate?",
         "memo": "Memo",
-        "pay": "Pay",
-        "payout_method": "Payout Method",
         "productivehrs": "Productive Hours",
-        "rate": "Rate",
         "ro_number": "Job to Post Against",
         "task_name": "Task"
       },
@@ -3648,10 +3623,6 @@
         "lunch": "Lunch",
         "new": "New Time Ticket",
         "payrollclaimedtasks": "These time tickets will be automatically entered to the system as a part of claiming this task. These numbers are calculated using the jobs assigned lines. If lines are unassigned, they will be excluded from created tickets.",
-        "payout_methods": {
-          "commission": "Commission",
-          "hourly": "Hourly"
-        },
         "pmbreak": "PM Break",
         "pmshift": "PM Shift",
         "shift": "Shift",

client/src/translations/es/common.json

@@ -305,8 +305,7 @@
         "creatingdefaultview": "",
         "duplicate_insurance_company": "",
         "loading": "No se pueden cargar los detalles de la tienda. Por favor llame al soporte técnico.",
-        "saving": "",
-        "task_preset_allocation_exceeded": ""
+        "saving": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -520,7 +519,6 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
-            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },
@@ -1176,28 +1174,12 @@
         "new": "",
         "newmember": ""
       },
-      "errors": {
-        "allocation_total_exact": "",
-        "duplicate_member": "",
-        "minimum_one_member": ""
-      },
       "fields": {
         "active": "",
-        "allocation": "",
-        "allocation_percentage": "",
         "employeeid": "",
         "max_load": "",
         "name": "",
-        "payout_method": "",
         "percentage": ""
-      },
-      "labels": {
-        "allocation_total": ""
-      },
-      "options": {
-        "commission": "",
-        "commission_percentage": "",
-        "hourly": ""
       }
     },
     "employees": {
@@ -1313,7 +1295,6 @@
         "delete": "Borrar",
         "deleteall": "",
         "deselectall": "",
-        "done": "",
         "download": "",
         "edit": "Editar",
         "gotoadmin": "",
@@ -3392,9 +3373,7 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_labour_summary": "",
-        "work_in_progress_payables": "",
-        "work_in_progress_payables_summary": ""
+        "work_in_progress_payables": ""
       }
     },
     "schedule": {
@@ -3611,7 +3590,6 @@
       },
       "fields": {
         "actualhrs": "",
-        "amount": "",
         "ciecacode": "",
         "clockhours": "",
         "clockoff": "",
@@ -3626,10 +3604,7 @@
         "employee_team": "",
         "flat_rate": "",
         "memo": "",
-        "pay": "",
-        "payout_method": "",
         "productivehrs": "",
-        "rate": "",
         "ro_number": "",
         "task_name": ""
       },
@@ -3648,10 +3623,6 @@
         "lunch": "",
         "new": "",
         "payrollclaimedtasks": "",
-        "payout_methods": {
-          "commission": "",
-          "hourly": ""
-        },
         "pmbreak": "",
         "pmshift": "",
         "shift": "",

client/src/translations/fr/common.json

@@ -305,8 +305,7 @@
         "creatingdefaultview": "",
         "duplicate_insurance_company": "",
         "loading": "Impossible de charger les détails de la boutique. Veuillez appeler le support technique.",
-        "saving": "",
-        "task_preset_allocation_exceeded": ""
+        "saving": ""
       },
       "fields": {
         "ReceivableCustomField": "",
@@ -520,7 +519,6 @@
             "list-active": "",
             "list-all": "",
             "list-ready": "",
-            "manual-line": "",
             "partsqueue": "",
             "void": ""
           },
@@ -1176,28 +1174,12 @@
         "new": "",
         "newmember": ""
       },
-      "errors": {
-        "allocation_total_exact": "",
-        "duplicate_member": "",
-        "minimum_one_member": ""
-      },
       "fields": {
         "active": "",
-        "allocation": "",
-        "allocation_percentage": "",
         "employeeid": "",
         "max_load": "",
         "name": "",
-        "payout_method": "",
         "percentage": ""
-      },
-      "labels": {
-        "allocation_total": ""
-      },
-      "options": {
-        "commission": "",
-        "commission_percentage": "",
-        "hourly": ""
       }
     },
     "employees": {
@@ -1313,7 +1295,6 @@
         "delete": "Effacer",
         "deleteall": "",
         "deselectall": "",
-        "done": "",
         "download": "",
         "edit": "modifier",
         "gotoadmin": "",
@@ -3392,9 +3373,7 @@
         "work_in_progress_committed_labour": "",
         "work_in_progress_jobs": "",
         "work_in_progress_labour": "",
-        "work_in_progress_labour_summary": "",
-        "work_in_progress_payables": "",
-        "work_in_progress_payables_summary": ""
+        "work_in_progress_payables": ""
       }
     },
     "schedule": {
@@ -3611,7 +3590,6 @@
       },
       "fields": {
         "actualhrs": "",
-        "amount": "",
         "ciecacode": "",
         "clockhours": "",
         "clockoff": "",
@@ -3626,10 +3604,7 @@
         "employee_team": "",
         "flat_rate": "",
         "memo": "",
-        "pay": "",
-        "payout_method": "",
         "productivehrs": "",
-        "rate": "",
         "ro_number": "",
         "task_name": ""
       },
@@ -3648,10 +3623,6 @@
         "lunch": "",
         "new": "",
         "payrollclaimedtasks": "",
-        "payout_methods": {
-          "commission": "",
-          "hourly": ""
-        },
         "pmbreak": "",
         "pmshift": "",
         "shift": "",

client/src/utils/GraphQLClient.js

@@ -5,15 +5,13 @@ import { RetryLink } from "@apollo/client/link/retry";
 import { GraphQLWsLink } from "@apollo/client/link/subscriptions";
 import { getMainDefinition } from "@apollo/client/utilities";
 
-import apolloLoggerModule from "apollo-link-logger";
+import apolloLogger from "apollo-link-logger";
 import { createClient } from "graphql-ws";
 import { map } from "rxjs/operators";
 
 import { auth } from "../firebase/firebase.utils";
 import errorLink from "../graphql/apollo-error-handling";
 
-const apolloLogger = apolloLoggerModule?.default ?? apolloLoggerModule;
-
 /**
  * HTTP transport
  */

client/src/utils/TemplateConstants.js

@@ -1717,20 +1717,6 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "timetickets"
           },
-          work_in_progress_labour_summary: {
-            title: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
-            description: "",
-            subject: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
-            key: "work_in_progress_labour_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open")
-            },
-            group: "jobs",
-            featureNameRestricted: "timetickets"
-          },
           work_in_progress_committed_labour: {
             title: i18n.t("reportcenter.templates.work_in_progress_committed_labour"),
             description: "",
@@ -1760,20 +1746,6 @@ export const TemplateList = (type, context) => {
             group: "jobs",
             featureNameRestricted: "bills"
           },
-          work_in_progress_payables_summary: {
-            title: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
-            description: "",
-            subject: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
-            key: "work_in_progress_payables_summary",
-            //idtype: "vendor",
-            disabled: false,
-            rangeFilter: {
-              object: i18n.t("reportcenter.labels.objects.jobs"),
-              field: i18n.t("jobs.fields.date_open")
-            },
-            group: "jobs",
-            featureNameRestricted: "bills"
-          },
           lag_time: {
             title: i18n.t("reportcenter.templates.lag_time"),
             description: "",

hasura/metadata/tables.yaml

@@ -2156,12 +2156,10 @@
                   - active:
                       _eq: true
         columns:
-          - commission_rates
           - created_at
           - employeeid
           - id
           - labor_rates
-          - payout_method
           - percentage
           - teamid
           - updated_at
@@ -2169,12 +2167,10 @@
     - role: user
       permission:
         columns:
-          - commission_rates
           - created_at
           - employeeid
           - id
           - labor_rates
-          - payout_method
           - percentage
           - teamid
           - updated_at
@@ -2192,12 +2188,10 @@
     - role: user
       permission:
         columns:
-          - commission_rates
           - created_at
           - employeeid
           - id
           - labor_rates
-          - payout_method
           - percentage
           - teamid
           - updated_at
@@ -6512,7 +6506,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - task_name
@@ -6538,7 +6531,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - task_name
@@ -6573,7 +6565,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - task_name
@@ -6757,7 +6748,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - updated_at
@@ -6778,7 +6768,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - updated_at
@@ -6809,7 +6798,6 @@
           - id
           - jobid
           - memo
-          - payout_context
           - productivehrs
           - rate
           - updated_at

hasura/migrations/1773331250571_alter_table_public_employee_team_members_add_column_payout_method/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."employee_team_members" add column "payout_method" text
---  null;

hasura/migrations/1773331250571_alter_table_public_employee_team_members_add_column_payout_method/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."employee_team_members" add column "payout_method" text
- null;

hasura/migrations/1773331301662_alter_table_public_employee_team_members_add_column_commission_rates/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."employee_team_members" add column "commission_rates" jsonb
---  null;

hasura/migrations/1773331301662_alter_table_public_employee_team_members_add_column_commission_rates/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."employee_team_members" add column "commission_rates" jsonb
- null;

hasura/migrations/1773331441524_alter_table_public_timetickets_add_column_payout_context/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."timetickets" add column "payout_context" jsonb
---  null;

hasura/migrations/1773331441524_alter_table_public_timetickets_add_column_payout_context/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."timetickets" add column "payout_context" jsonb
- null;

hasura/migrations/1773331546522_alter_table_public_tt_approval_queue_add_column_payout_context/down.sql

@@ -1,4 +0,0 @@
--- Could not auto-generate a down migration.
--- Please write an appropriate down migration for the SQL below:
--- alter table "public"."tt_approval_queue" add column "payout_context" jsonb
---  null;

hasura/migrations/1773331546522_alter_table_public_tt_approval_queue_add_column_payout_context/up.sql

@@ -1,2 +0,0 @@
-alter table "public"."tt_approval_queue" add column "payout_context" jsonb
- null;

package.json

@@ -18,26 +18,25 @@
     "job-totals-fixtures:local": "docker exec node-app /usr/bin/node /app/download-job-totals-fixtures.js"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudwatch-logs": "^3.1009.0",
-    "@aws-sdk/client-elasticache": "^3.1009.0",
-    "@aws-sdk/client-s3": "^3.1009.0",
-    "@aws-sdk/client-secrets-manager": "^3.1009.0",
-    "@aws-sdk/client-ses": "^3.1009.0",
-    "@aws-sdk/client-sqs": "^3.1009.0",
-    "@aws-sdk/client-textract": "^3.1009.0",
-    "@aws-sdk/credential-provider-node": "^3.972.21",
-    "@aws-sdk/lib-storage": "^3.1009.0",
-    "@aws-sdk/s3-request-presigner": "^3.1009.0",
-    "@jsreport/nodejs-client": "^4.1.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.997.0",
+    "@aws-sdk/client-elasticache": "^3.997.0",
+    "@aws-sdk/client-s3": "^3.997.0",
+    "@aws-sdk/client-secrets-manager": "^3.997.0",
+    "@aws-sdk/client-ses": "^3.997.0",
+    "@aws-sdk/client-sqs": "^3.997.0",
+    "@aws-sdk/client-textract": "^3.997.0",
+    "@aws-sdk/credential-provider-node": "^3.972.12",
+    "@aws-sdk/lib-storage": "^3.997.0",
+    "@aws-sdk/s3-request-presigner": "^3.997.0",
     "@opensearch-project/opensearch": "^2.13.0",
     "@socket.io/admin-ui": "^0.5.1",
     "@socket.io/redis-adapter": "^8.3.0",
     "archiver": "^7.0.1",
     "aws4": "^1.13.2",
-    "axios": "^1.13.6",
+    "axios": "^1.13.5",
     "axios-curlirize": "^2.0.0",
     "better-queue": "^3.8.12",
-    "bullmq": "^5.71.0",
+    "bullmq": "^5.70.1",
     "chart.js": "^4.5.1",
     "cloudinary": "^2.9.0",
     "compression": "^1.8.1",
@@ -47,20 +46,20 @@
     "dinero.js": "^1.9.1",
     "dotenv": "^17.3.1",
     "express": "^4.21.1",
-    "fast-xml-parser": "^5.5.6",
-    "firebase-admin": "^13.7.0",
+    "fast-xml-parser": "^5.4.1",
+    "firebase-admin": "^13.6.1",
     "fuse.js": "^7.1.0",
-    "graphql": "^16.13.1",
-    "graphql-request": "^7.4.0",
+    "graphql": "^16.13.0",
+    "graphql-request": "^6.1.0",
     "intuit-oauth": "^4.2.2",
-    "ioredis": "^5.10.0",
+    "ioredis": "^5.9.3",
     "json-2-csv": "^5.5.10",
     "jsonwebtoken": "^9.0.3",
     "juice": "^11.1.1",
     "lodash": "^4.17.23",
     "moment": "^2.30.1",
     "moment-timezone": "^0.6.0",
-    "multer": "^2.1.1",
+    "multer": "^2.0.2",
     "mustache": "^4.2.0",
     "node-persist": "^4.0.4",
     "nodemailer": "^6.10.0",
@@ -70,15 +69,15 @@
     "recursive-diff": "^1.0.9",
     "rimraf": "^6.1.3",
     "skia-canvas": "^3.0.8",
-    "soap": "^1.8.0",
+    "soap": "^1.7.1",
     "socket.io": "^4.8.3",
     "socket.io-adapter": "^2.5.6",
     "ssh2-sftp-client": "^11.0.0",
-    "twilio": "^5.13.0",
+    "twilio": "^5.12.2",
     "uuid": "^11.1.0",
     "winston": "^3.19.0",
     "winston-cloudwatch": "^6.3.0",
-    "xml-formatter": "^3.7.0",
+    "xml-formatter": "^3.6.7",
     "xml2js": "^0.6.2",
     "xmlbuilder2": "^4.0.3",
     "yazl": "^3.3.1"
@@ -87,11 +86,11 @@
     "@eslint/js": "^9.39.2",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",
-    "globals": "^17.4.0",
+    "globals": "^17.3.0",
     "mock-require": "^3.0.3",
     "p-limit": "^3.1.0",
     "prettier": "^3.8.1",
     "supertest": "^7.2.2",
-    "vitest": "^4.1.0"
+    "vitest": "^4.0.18"
   }
 }

server/accounting/qbo/qbo-payables.js

@@ -130,13 +130,12 @@ exports.default = async (req, res) => {
 
 async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
   try {
-    const url = urlBuilder(
-      qbo_realmId,
-      "query",
-      `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
-    );
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(
+        qbo_realmId,
+        "query",
+        `select * From vendor where DisplayName = '${StandardizeName(bill.vendor.name)}'`
+      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -151,11 +150,6 @@ async function QueryVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payables-query", "DEBUG", req.user.email, null, {
-      method: "QueryVendorRecord",
-      call: url,
-      result: result.json
-    });
 
     return result.json?.QueryResponse?.Vendor?.[0];
   } catch (error) {
@@ -173,9 +167,8 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
     DisplayName: StandardizeName(bill.vendor.name)
   };
   try {
-    const url = urlBuilder(qbo_realmId, "vendor");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "vendor"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -191,12 +184,6 @@ async function InsertVendorRecord(oauthClient, qbo_realmId, req, bill) {
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
-      method: "InsertVendorRecord",
-      call: url,
-      Vendor: Vendor,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -287,12 +274,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     VendorRef: {
       value: vendor.Id
     },
-    ...(vendor.TermRef &&
-      !bill.is_credit_memo && {
-        SalesTermRef: {
-          value: vendor.TermRef.value
-        }
-      }),
+    ...(vendor.TermRef && !bill.is_credit_memo && {
+      SalesTermRef: {
+        value: vendor.TermRef.value
+      }
+    }),
     TxnDate: moment(bill.date)
       //.tz(bill.job.bodyshop.timezone)
       .format("YYYY-MM-DD"),
@@ -332,9 +318,8 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
     [logKey]: logValue
   });
   try {
-    const url = urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, bill.is_credit_memo ? "vendorcredit" : "bill"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -350,12 +335,6 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor, bodyshop)
       bodyshopid: bill.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payables-insert", "DEBUG", req.user.email, null, {
-      method: "InsertBill",
-      call: url,
-      postingObj: bill.is_credit_memo ? VendorCredit : billQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-payments.js

@@ -82,7 +82,14 @@ exports.default = async (req, res) => {
 
         if (isThreeTier || (!isThreeTier && twoTierPref === "name")) {
           //Insert the name/owner and account for whether the source should be the ins co in 3 tier..
-          ownerCustomerTier = await QueryOwner(oauthClient, qbo_realmId, req, payment.job, insCoCustomerTier);
+          ownerCustomerTier = await QueryOwner(
+            oauthClient,
+            qbo_realmId,
+            req,
+            payment.job,
+            isThreeTier,
+            insCoCustomerTier
+          );
           //Query for the owner itself.
           if (!ownerCustomerTier) {
             ownerCustomerTier = await InsertOwner(
@@ -222,9 +229,8 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
     paymentQbo
   });
   try {
-    const url = urlBuilder(qbo_realmId, "payment");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "payment"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -240,12 +246,6 @@ async function InsertPayment(oauthClient, qbo_realmId, req, payment, parentRef)
       bodyshopid: payment.job.shopid,
       email: req.user.email
     });
-    logger.log("qbo-payments-insert", "DEBUG", req.user.email, null, {
-      method: "InsertPayment",
-      call: url,
-      paymentQbo: paymentQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));
@@ -428,9 +428,8 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
     paymentQbo
   });
   try {
-    const url = urlBuilder(qbo_realmId, "creditmemo");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "creditmemo"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -446,12 +445,6 @@ async function InsertCreditMemo(oauthClient, qbo_realmId, req, payment, parentRe
       bodyshopid: req.user.bodyshopid,
       email: req.user.email
     });
-    logger.log("qbo-metadata-query", "DEBUG", req.user.email, null, {
-      method: "InsertCreditMemo",
-      call: url,
-      paymentQbo: paymentQbo,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/accounting/qbo/qbo-receivables.js

@@ -213,13 +213,12 @@ exports.default = async (req, res) => {
 
 async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
   try {
-    const url = urlBuilder(
-      qbo_realmId,
-      "query",
-      `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
-    );
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(
+        qbo_realmId,
+        "query",
+        `select * From Customer where DisplayName = '${StandardizeName(job.ins_co_nm.trim())}' and Active = true`
+      ),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -234,11 +233,6 @@ async function QueryInsuranceCo(oauthClient, qbo_realmId, req, job) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-      method: "QueryInsuranceCo",
-      call: url,
-      result: result.json
-    });
 
     return result.json?.QueryResponse?.Customer?.[0];
   } catch (error) {
@@ -272,9 +266,8 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
     }
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -290,12 +283,6 @@ async function InsertInsuranceCo(oauthClient, qbo_realmId, req, job, bodyshop) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertInsuranceCo",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -311,13 +298,12 @@ exports.InsertInsuranceCo = InsertInsuranceCo;
 
 async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
   const ownerName = generateOwnerTier(job, true, null);
-  const url = urlBuilder(
-    qbo_realmId,
-    "query",
-    `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
-  );
   const result = await oauthClient.makeApiCall({
-    url: url,
+    url: urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${StandardizeName(ownerName)}' and Active = true`
+    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -332,11 +318,6 @@ async function QueryOwner(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
-  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-    method: "QueryOwner",
-    call: url,
-    result: result.json
-  });
 
   return result.json?.QueryResponse?.Customer?.find((x) => x.ParentRef?.value === parentTierRef?.Id);
 }
@@ -366,9 +347,8 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       : {})
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -384,12 +364,6 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertOwner",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     return result.json?.Customer;
   } catch (error) {
@@ -404,13 +378,12 @@ async function InsertOwner(oauthClient, qbo_realmId, req, job, isThreeTier, pare
 exports.InsertOwner = InsertOwner;
 
 async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
-  const url = urlBuilder(
-    qbo_realmId,
-    "query",
-    `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
-  );
   const result = await oauthClient.makeApiCall({
-    url: url,
+    url: urlBuilder(
+      qbo_realmId,
+      "query",
+      `select * From Customer where DisplayName = '${job.ro_number}' and Active = true`
+    ),
     method: "POST",
     headers: {
       "Content-Type": "application/json"
@@ -425,11 +398,6 @@ async function QueryJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     jobid: job.id,
     email: req.user.email
   });
-  logger.log("qbo-receivables-query", "DEBUG", req.user.email, job.id, {
-    method: "QueryJob",
-    call: url,
-    result: result.json
-  });
 
   const customers = result.json?.QueryResponse?.Customer;
   return customers && (parentTierRef ? customers.find((x) => x.ParentRef.value === parentTierRef.Id) : customers[0]);
@@ -455,9 +423,8 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
     }
   };
   try {
-    const url = urlBuilder(qbo_realmId, "customer");
     const result = await oauthClient.makeApiCall({
-      url: url,
+      url: urlBuilder(qbo_realmId, "customer"),
       method: "POST",
       headers: {
         "Content-Type": "application/json"
@@ -473,12 +440,6 @@ async function InsertJob(oauthClient, qbo_realmId, req, job, parentTierRef) {
       jobid: job.id,
       email: req.user.email
     });
-    logger.log("qbo-receivables-insert", "DEBUG", req.user.email, job.id, {
-      method: "InsertJob",
-      call: url,
-      customerObj: Customer,
-      result: result.json
-    });
 
     if (result.status >= 400) {
       throw new Error(JSON.stringify(result.json.Fault));

server/cdk/cdk-get-makes.js

@@ -66,12 +66,7 @@ exports.default = async function ReloadCdkMakes(req, res) {
   } catch (error) {
     logger.log("cdk-replace-makes-models-error", "ERROR", req.user.email, null, {
       cdk_dealerid,
-      error: {
-        message: error?.message,
-        stack: error?.stack,
-        name: error?.name,
-        code: error?.code
-      }
+      error
     });
     res.status(500).json(error);
   }
@@ -110,12 +105,7 @@ async function GetCdkMakes(req, cdk_dealerid) {
   } catch (error) {
     logger.log("cdk-replace-makes-models-error", "ERROR", req.user.email, null, {
       cdk_dealerid,
-      error: {
-        message: error?.message,
-        stack: error?.stack,
-        name: error?.name,
-        code: error?.code
-      }
+      error
     });
 
     throw new Error(error);
@@ -151,12 +141,7 @@ async function GetFortellisMakes(req, cdk_dealerid) {
   } catch (error) {
     logger.log("fortellis-replace-makes-models-error", "ERROR", req.user.email, null, {
       cdk_dealerid,
-      error: {
-        message: error?.message,
-        stack: error?.stack,
-        name: error?.name,
-        code: error?.code
-      }
+      error
     });
 
     throw new Error(error);

server/fortellis/fortellis.js

@@ -959,7 +959,7 @@ async function UpdateDmsVehicle({ socket, redisHelpers, JobData, DMSVeh, DMSCust
     delete DMSVehToSend.inventoryAccount;
 
     !DMSVehToSend.vehicle.engineNumber && delete DMSVehToSend.vehicle.engineNumber;
-    !DMSVehToSend.vehicle.saleClassValue && (DMSVehToSend.vehicle.saleClassValue = "MISC");
+    !DMSVehToSend.vehicle.saleClassValue && DMSVehToSend.vehicle.saleClassValue === "MISC";
     !DMSVehToSend.vehicle.exteriorColor && delete DMSVehToSend.vehicle.exteriorColor;
 
     const result = await MakeFortellisCall({

server/graphql-client/queries.js

@@ -2463,8 +2463,6 @@ exports.QUERY_JOB_PAYROLL_DATA = `query QUERY_JOB_PAYROLL_DATA($id: uuid!) {
           }
           percentage
           labor_rates
-          payout_method
-          commission_rates
         }
       }
     }
@@ -2475,7 +2473,6 @@ exports.QUERY_JOB_PAYROLL_DATA = `query QUERY_JOB_PAYROLL_DATA($id: uuid!) {
       productivehrs
       actualhrs
       ciecacode
-      payout_context
     }
     lbr_adjustments
     ro_number
@@ -2567,8 +2564,6 @@ exports.QUERY_JOB_PAYROLL_DATA = `query QUERY_JOB_PAYROLL_DATA($id: uuid!) {
           }
           percentage
           labor_rates
-          payout_method
-          commission_rates
         }
       }
     }
@@ -2579,7 +2574,6 @@ exports.QUERY_JOB_PAYROLL_DATA = `query QUERY_JOB_PAYROLL_DATA($id: uuid!) {
       productivehrs
       actualhrs
       ciecacode
-      payout_context
     }
     lbr_adjustments
     ro_number

server/intellipay/lib/handleCommentBasedPayment.js

@@ -1,7 +1,7 @@
 const sendPaymentNotificationEmail = require("./sendPaymentNotificationEmail");
 const { INSERT_NEW_PAYMENT, GET_BODYSHOP_BY_ID, GET_JOBS_BY_PKS } = require("../../graphql-client/queries");
 const getPaymentType = require("./getPaymentType");
-const moment = require("moment-timezone");
+const moment = require("moment");
 
 const gqlClient = require("../../graphql-client/graphql-client").client;
 

server/intellipay/lib/handleInvoiceBasedPayment.js

@@ -8,7 +8,7 @@ const {
 
 const { sendTaskEmail } = require("../../email/sendemail");
 const getPaymentType = require("./getPaymentType");
-const moment = require("moment-timezone");
+const moment = require("moment");
 
 const gqlClient = require("../../graphql-client/graphql-client").client;
 

server/intellipay/lib/tests/intelliPayGeneralLibs.test.js

@@ -1,18 +1,5 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 
-const { mockSend } = vi.hoisted(() => ({
-  mockSend: vi.fn()
-}));
-
-vi.mock("@aws-sdk/client-secrets-manager", () => {
-  return {
-    SecretsManagerClient: vi.fn(() => ({
-      send: mockSend
-    })),
-    GetSecretValueCommand: vi.fn((input) => input)
-  };
-});
-
 const getPaymentType = require("../getPaymentType");
 const decodeComment = require("../decodeComment");
 const getCptellerUrl = require("../getCptellerUrl");
@@ -158,15 +145,28 @@ describe("Payment Processing Functions", () => {
   // GetShopCredentials Tests
   describe("getShopCredentials", () => {
     const originalEnv = { ...process.env };
+    let mockSend;
 
     beforeEach(() => {
-      mockSend.mockReset();
+      mockSend = vi.fn();
+      vi.mock("@aws-sdk/client-secrets-manager", () => {
+        return {
+          SecretsManagerClient: vi.fn(() => ({
+            send: mockSend
+          })),
+          GetSecretValueCommand: vi.fn((input) => input)
+        };
+      });
+
       process.env.INTELLIPAY_MERCHANTKEY = "test-merchant-key";
       process.env.INTELLIPAY_APIKEY = "test-api-key";
+      vi.resetModules();
     });
 
     afterEach(() => {
       process.env = { ...originalEnv };
+      vi.restoreAllMocks();
+      vi.unmock("@aws-sdk/client-secrets-manager");
     });
 
     it("returns environment variables in non-production environment", async () => {

server/job/job-totals.js

@@ -315,12 +315,7 @@ function CalculateRatesTotals(ratesList) {
     if (item.mod_lbr_ty) {
       //Check to see if it has 0 hours and a price instead.
       //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) &&
-        !IsAdditionalCost(item)
-      ) {
+      if (item.lbr_op === "OP14" && item.act_price > 0 && (!item.part_type || item.mod_lb_hrs === 0) && !IsAdditionalCost(item)) {
         //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();
@@ -344,30 +339,38 @@ function CalculateRatesTotals(ratesList) {
   let subtotal = Dinero({ amount: 0 });
   let rates_subtotal = Dinero({ amount: 0 });
 
-  for (const [property, values] of Object.entries(ret)) {
+  for (const property in ret) {
     //Skip calculating mapa and mash if we got the amounts.
-    const shouldSkipCalculation = (property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine);
-
-    if (!shouldSkipCalculation) {
-      values.total ??= Dinero();
-
-      //Check if there is a max for this type and apply it.
-      const maxDollar =
-        ratesList.materials?.[property]?.cal_maxdlr || ratesList.materials?.[property.toUpperCase()]?.cal_maxdlr;
-      const threshold = maxDollar > 0 ? Dinero({ amount: Math.round(maxDollar * 100) }) : null;
+    if (!((property === "mapa" && hasMapaLine) || (property === "mash" && hasMashLine))) {
+      if (!ret[property].total) {
+        ret[property].total = Dinero();
+      }
+      let threshold;
+      //Check if there is a max for this type.
+      if (ratesList.materials && ratesList.materials[property]) {
+        //
+        if (ratesList.materials[property].cal_maxdlr && ratesList.materials[property].cal_maxdlr > 0) {
+          //It has an upper threshhold.
+          threshold = Dinero({
+            amount: Math.round(ratesList.materials[property].cal_maxdlr * 100)
+          });
+        }
+      }
 
       const total = Dinero({
-        amount: Math.round((values.rate || 0) * 100)
-      }).multiply(values.hours);
+        amount: Math.round((ret[property].rate || 0) * 100)
+      }).multiply(ret[property].hours);
 
-      values.total = values.total.add(threshold && total.greaterThanOrEqual(threshold) ? threshold : total);
+      if (threshold && total.greaterThanOrEqual(threshold)) {
+        ret[property].total = ret[property].total.add(threshold);
+      } else {
+        ret[property].total = ret[property].total.add(total);
+      }
     }
 
-    subtotal = subtotal.add(values.total);
+    subtotal = subtotal.add(ret[property].total);
 
-    if (property !== "mapa" && property !== "mash") {
-      rates_subtotal = rates_subtotal.add(values.total);
-    }
+    if (property !== "mapa" && property !== "mash") rates_subtotal = rates_subtotal.add(ret[property].total);
   }
 
   ret.subtotal = subtotal;

server/job/test/job-totals.test.js

@@ -35,11 +35,6 @@ describe("TotalsServerSide fixture tests", () => {
 
   const fixtureFiles = fs.readdirSync(fixturesDir).filter((f) => f.endsWith(".json"));
 
-  if (fixtureFiles.length === 0) {
-    it.skip("skips when no job total fixtures are present", () => {});
-    return;
-  }
-
   const dummyClient = {
     request: async () => {
       return {};

server/payroll/calculate-totals.js

@@ -1,9 +1,20 @@
+const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
 const logger = require("../utils/logger");
 const { CalculateExpectedHoursForJob, CalculateTicketsHoursForJob } = require("./pay-all");
 
+// Dinero.defaultCurrency = "USD";
+// Dinero.globalLocale = "en-CA";
+Dinero.globalRoundingMode = "HALF_EVEN";
+
+const get = (obj, key) => {
+  return key.split(".").reduce((o, x) => {
+    return typeof o == "undefined" || o === null ? o : o[x];
+  }, obj);
+};
+
 exports.calculatelabor = async function (req, res) {
-  const { jobid } = req.body;
+  const { jobid, calculateOnly } = req.body;
   logger.log("job-payroll-calculate-labor", "DEBUG", req.user.email, jobid, null);
 
   const BearerToken = req.BearerToken;
@@ -30,19 +41,23 @@ exports.calculatelabor = async function (req, res) {
     Object.keys(employeeHash).forEach((employeeIdKey) => {
       //At the employee level.
       Object.keys(employeeHash[employeeIdKey]).forEach((laborTypeKey) => {
-        const expected = employeeHash[employeeIdKey][laborTypeKey];
-        const claimed = ticketHash?.[employeeIdKey]?.[laborTypeKey];
+        //At the labor level
+        Object.keys(employeeHash[employeeIdKey][laborTypeKey]).forEach((rateKey) => {
+          //At the rate level.
+          const expectedHours = employeeHash[employeeIdKey][laborTypeKey][rateKey];
+          //Will the following line fail? Probably if it doesn't exist.
+          const claimedHours = get(ticketHash, `${employeeIdKey}.${laborTypeKey}.${rateKey}`);
+          if (claimedHours) {
+            delete ticketHash[employeeIdKey][laborTypeKey][rateKey];
+          }
 
-        if (claimed) {
-          delete ticketHash[employeeIdKey][laborTypeKey];
-        }
-
-        totals.push({
-          employeeid: employeeIdKey,
-          rate: expected.rate,
-          mod_lbr_ty: laborTypeKey,
-          expectedHours: expected.hours,
-          claimedHours: claimed?.hours || 0
+          totals.push({
+            employeeid: employeeIdKey,
+            rate: rateKey,
+            mod_lbr_ty: laborTypeKey,
+            expectedHours,
+            claimedHours: claimedHours || 0
+          });
         });
       });
     });
@@ -50,14 +65,23 @@ exports.calculatelabor = async function (req, res) {
     Object.keys(ticketHash).forEach((employeeIdKey) => {
       //At the employee level.
       Object.keys(ticketHash[employeeIdKey]).forEach((laborTypeKey) => {
-        const claimed = ticketHash[employeeIdKey][laborTypeKey];
+        //At the labor level
+        Object.keys(ticketHash[employeeIdKey][laborTypeKey]).forEach((rateKey) => {
+          //At the rate level.
+          const expectedHours = 0;
+          //Will the following line fail? Probably if it doesn't exist.
+          const claimedHours = get(ticketHash, `${employeeIdKey}.${laborTypeKey}.${rateKey}`);
+          if (claimedHours) {
+            delete ticketHash[employeeIdKey][laborTypeKey][rateKey];
+          }
 
-        totals.push({
-          employeeid: employeeIdKey,
-          rate: claimed.rate,
-          mod_lbr_ty: laborTypeKey,
-          expectedHours: 0,
-          claimedHours: claimed.hours || 0
+          totals.push({
+            employeeid: employeeIdKey,
+            rate: rateKey,
+            mod_lbr_ty: laborTypeKey,
+            expectedHours,
+            claimedHours: claimedHours || 0
+          });
         });
       });
     });
@@ -77,6 +101,6 @@ exports.calculatelabor = async function (req, res) {
       jobid: jobid,
       error
     });
-    res.status(400).json({ error: error.message });
+    res.status(503).send();
   }
 };

server/payroll/claim-task.js

@@ -1,42 +1,11 @@
+const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
 const logger = require("../utils/logger");
-const { CalculateExpectedHoursForJob, RoundPayrollHours } = require("./pay-all");
+const { CalculateExpectedHoursForJob } = require("./pay-all");
 const moment = require("moment");
-
-const normalizePercent = (value) => Math.round((Number(value || 0) + Number.EPSILON) * 10000) / 10000;
-
-const getTaskPresetAllocationError = (taskPresets = []) => {
-  const totalsByLaborType = {};
-
-  taskPresets.forEach((taskPreset) => {
-    const percent = normalizePercent(taskPreset?.percent);
-
-    if (!percent) {
-      return;
-    }
-
-    const laborTypes = Array.isArray(taskPreset?.hourstype) ? taskPreset.hourstype : [];
-
-    laborTypes.forEach((laborType) => {
-      if (!laborType) {
-        return;
-      }
-
-      totalsByLaborType[laborType] = normalizePercent((totalsByLaborType[laborType] || 0) + percent);
-    });
-  });
-
-  const overAllocatedType = Object.entries(totalsByLaborType).find(([, total]) => total > 100);
-
-  if (!overAllocatedType) {
-    return null;
-  }
-
-  const [laborType, total] = overAllocatedType;
-  return `Task preset percentages for labor type ${laborType} total ${total}% and cannot exceed 100%.`;
-};
-
-exports.GetTaskPresetAllocationError = getTaskPresetAllocationError;
+// Dinero.defaultCurrency = "USD";
+// Dinero.globalLocale = "en-CA";
+Dinero.globalRoundingMode = "HALF_EVEN";
 
 exports.claimtask = async function (req, res) {
   const { jobid, task, calculateOnly, employee } = req.body;
@@ -52,25 +21,12 @@ exports.claimtask = async function (req, res) {
         id: jobid
       });
 
-    const taskPresets = job.bodyshop?.md_tasks_presets?.presets || [];
-    const taskPresetAllocationError = getTaskPresetAllocationError(taskPresets);
-    if (taskPresetAllocationError) {
-      res.status(400).json({ success: false, error: taskPresetAllocationError });
-      return;
-    }
-
-    const theTaskPreset = taskPresets.find((tp) => tp.name === task);
+    const theTaskPreset = job.bodyshop.md_tasks_presets.presets.find((tp) => tp.name === task);
     if (!theTaskPreset) {
       res.status(400).json({ success: false, error: "Provided task preset not found." });
       return;
     }
 
-    const taskAlreadyCompleted = (job.completed_tasks || []).some((completedTask) => completedTask?.name === task);
-    if (taskAlreadyCompleted) {
-      res.status(400).json({ success: false, error: "Provided task preset has already been completed for this job." });
-      return;
-    }
-
     //Get all of the assignments that are filtered.
     const { assignmentHash, employeeHash } = CalculateExpectedHoursForJob(job, theTaskPreset.hourstype);
     const ticketsToInsert = [];
@@ -79,37 +35,32 @@ exports.claimtask = async function (req, res) {
     Object.keys(employeeHash).forEach((employeeIdKey) => {
       //At the employee level.
       Object.keys(employeeHash[employeeIdKey]).forEach((laborTypeKey) => {
-        const expected = employeeHash[employeeIdKey][laborTypeKey];
-        const expectedHours = RoundPayrollHours(expected.hours * (theTaskPreset.percent / 100));
+        //At the labor level
+        Object.keys(employeeHash[employeeIdKey][laborTypeKey]).forEach((rateKey) => {
+          //At the rate level.
+          const expectedHours = employeeHash[employeeIdKey][laborTypeKey][rateKey] * (theTaskPreset.percent / 100);
 
-        ticketsToInsert.push({
-          task_name: task,
-          jobid: job.id,
-          bodyshopid: job.bodyshop.id,
-          employeeid: employeeIdKey,
-          productivehrs: expectedHours,
-          rate: expected.rate,
-          ciecacode: laborTypeKey,
-          flat_rate: true,
-          created_by: employee?.name || req.user.email,
-          payout_context: {
-            ...(expected.payoutContext || {}),
-            generated_by: req.user.email,
-            generated_at: new Date().toISOString(),
-            generated_from: "claimtask",
-            task_name: task
-          },
-          cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[laborTypeKey],
-          memo: `*Flagged Task* ${theTaskPreset.memo}`
+          ticketsToInsert.push({
+            task_name: task,
+            jobid: job.id,
+            bodyshopid: job.bodyshop.id,
+            employeeid: employeeIdKey,
+            productivehrs: expectedHours,
+            rate: rateKey,
+            ciecacode: laborTypeKey,
+            flat_rate: true,
+            cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[laborTypeKey],
+            memo: `*Flagged Task* ${theTaskPreset.memo}`
+          });
         });
       });
     });
     if (!calculateOnly) {
       //Insert the time ticekts if we're not just calculating them.
-      await client.request(queries.INSERT_TIME_TICKETS, {
+      const insertResult = await client.request(queries.INSERT_TIME_TICKETS, {
         timetickets: ticketsToInsert.filter((ticket) => ticket.productivehrs !== 0)
       });
-      await client.request(queries.UPDATE_JOB, {
+      const updateResult = await client.request(queries.UPDATE_JOB, {
         jobId: job.id,
         job: {
           status: theTaskPreset.nextstatus,
@@ -131,6 +82,6 @@ exports.claimtask = async function (req, res) {
       jobid: jobid,
       error
     });
-    res.status(400).json({ success: false, error: error.message });
+    res.status(503).send();
   }
 };

server/payroll/pay-all.js

@@ -1,196 +1,15 @@
 const Dinero = require("dinero.js");
 const queries = require("../graphql-client/queries");
+const rdiff = require("recursive-diff");
+
 const logger = require("../utils/logger");
 
+// Dinero.defaultCurrency = "USD";
+// Dinero.globalLocale = "en-CA";
 Dinero.globalRoundingMode = "HALF_EVEN";
-Dinero.globalFormatRoundingMode = "HALF_EVEN";
-
-const PAYOUT_METHODS = {
-  hourly: "hourly",
-  commission: "commission"
-};
-
-const CURRENCY_PRECISION = 2;
-const HOURS_PRECISION = 5;
-
-const toNumber = (value) => {
-  const parsed = Number(value);
-  return Number.isFinite(parsed) ? parsed : 0;
-};
-
-const normalizeNumericString = (value) => {
-  if (typeof value === "string") {
-    return value.trim();
-  }
-
-  if (typeof value === "number" && Number.isFinite(value)) {
-    const asString = value.toString();
-
-    if (!asString.toLowerCase().includes("e")) {
-      return asString;
-    }
-
-    return value.toFixed(12).replace(/0+$/, "").replace(/\.$/, "");
-  }
-
-  return `${value ?? ""}`.trim();
-};
-
-const decimalToDinero = (value, errorMessage = "Invalid numeric value.") => {
-  const normalizedValue = normalizeNumericString(value);
-  const parsedValue = Number(normalizedValue);
-
-  if (!Number.isFinite(parsedValue)) {
-    throw new Error(errorMessage);
-  }
-
-  const isNegative = normalizedValue.startsWith("-");
-  const unsignedValue = normalizedValue.replace(/^[+-]/, "");
-  const [wholePart = "0", fractionPartRaw = ""] = unsignedValue.split(".");
-  const wholeDigits = wholePart.replace(/\D/g, "") || "0";
-  const fractionDigits = fractionPartRaw.replace(/\D/g, "");
-  const amount = Number(`${wholeDigits}${fractionDigits}` || "0") * (isNegative ? -1 : 1);
-
-  return Dinero({
-    amount,
-    precision: fractionDigits.length
-  });
-};
-
-const roundValueWithDinero = (value, precision, errorMessage) =>
-  decimalToDinero(value, errorMessage).convertPrecision(precision, Dinero.globalRoundingMode).toUnit();
-
-const roundCurrency = (value, errorMessage = "Invalid currency value.") =>
-  roundValueWithDinero(value, CURRENCY_PRECISION, errorMessage);
-
-const roundHours = (value, errorMessage = "Invalid hours value.") => roundValueWithDinero(value, HOURS_PRECISION, errorMessage);
-
-const normalizePayoutMethod = (value) =>
-  value === PAYOUT_METHODS.commission ? PAYOUT_METHODS.commission : PAYOUT_METHODS.hourly;
-
-const hasOwnValue = (obj, key) => Object.prototype.hasOwnProperty.call(obj || {}, key);
-
-const getJobSaleRateField = (laborType) => `rate_${String(laborType || "").toLowerCase()}`;
-
-const getTeamMemberLabel = (teamMember) => {
-  const fullName = `${teamMember?.employee?.first_name || ""} ${teamMember?.employee?.last_name || ""}`.trim();
-  return fullName || teamMember?.employee?.id || teamMember?.employeeid || "unknown employee";
-};
-
-const parseRequiredNumber = (value, errorMessage) => {
-  const parsed = Number(value);
-
-  if (!Number.isFinite(parsed)) {
-    throw new Error(errorMessage);
-  }
-
-  return parsed;
-};
-
-const buildFallbackPayoutContext = ({ laborType, rate }) => ({
-  payout_type: "legacy",
-  payout_method: "legacy",
-  cut_percent_applied: null,
-  source_labor_rate: null,
-  source_labor_type: laborType,
-  effective_rate: roundCurrency(rate)
-});
-
-function BuildPayoutDetails(job, teamMember, laborType) {
-  const payoutMethod = normalizePayoutMethod(teamMember?.payout_method);
-  const teamMemberLabel = getTeamMemberLabel(teamMember);
-  const sourceLaborRateField = getJobSaleRateField(laborType);
-
-  if (payoutMethod === PAYOUT_METHODS.hourly && !hasOwnValue(teamMember?.labor_rates, laborType)) {
-    throw new Error(`Missing hourly payout rate for ${teamMemberLabel} on labor type ${laborType}.`);
-  }
-
-  if (payoutMethod === PAYOUT_METHODS.commission && !hasOwnValue(teamMember?.commission_rates, laborType)) {
-    throw new Error(`Missing commission percent for ${teamMemberLabel} on labor type ${laborType}.`);
-  }
-
-  if (payoutMethod === PAYOUT_METHODS.commission && !hasOwnValue(job, sourceLaborRateField)) {
-    throw new Error(`Missing sale rate ${sourceLaborRateField} for labor type ${laborType}.`);
-  }
-
-  const hourlyRate =
-    payoutMethod === PAYOUT_METHODS.hourly
-      ? roundCurrency(
-          parseRequiredNumber(
-            teamMember?.labor_rates?.[laborType],
-            `Invalid hourly payout rate for ${teamMemberLabel} on labor type ${laborType}.`
-          )
-        )
-      : null;
-
-  const commissionPercent =
-    payoutMethod === PAYOUT_METHODS.commission
-      ? roundCurrency(
-          parseRequiredNumber(
-            teamMember?.commission_rates?.[laborType],
-            `Invalid commission percent for ${teamMemberLabel} on labor type ${laborType}.`
-          )
-        )
-      : null;
-
-  if (commissionPercent !== null && (commissionPercent < 0 || commissionPercent > 100)) {
-    throw new Error(`Commission percent for ${teamMemberLabel} on labor type ${laborType} must be between 0 and 100.`);
-  }
-
-  const sourceLaborRate =
-    payoutMethod === PAYOUT_METHODS.commission
-      ? roundCurrency(
-          parseRequiredNumber(job?.[sourceLaborRateField], `Invalid sale rate ${sourceLaborRateField} for labor type ${laborType}.`)
-        )
-      : null;
-
-  const effectiveRate =
-    payoutMethod === PAYOUT_METHODS.commission
-      ? roundCurrency((sourceLaborRate * toNumber(commissionPercent)) / 100)
-      : hourlyRate;
-
-  return {
-    effectiveRate,
-    payoutContext: {
-      payout_type: payoutMethod === PAYOUT_METHODS.commission ? "cut" : "hourly",
-      payout_method: payoutMethod,
-      cut_percent_applied: commissionPercent,
-      source_labor_rate: sourceLaborRate,
-      source_labor_type: laborType,
-      effective_rate: effectiveRate
-    }
-  };
-}
-
-function BuildGeneratedPayoutContext({ baseContext, generatedBy, generatedFrom, taskName, usedTicketFallback }) {
-  return {
-    ...(baseContext || {}),
-    generated_by: generatedBy,
-    generated_at: new Date().toISOString(),
-    generated_from: generatedFrom,
-    task_name: taskName,
-    used_ticket_fallback: Boolean(usedTicketFallback)
-  };
-}
-
-function getAllKeys(...objects) {
-  return [...new Set(objects.flatMap((obj) => (obj ? Object.keys(obj) : [])))];
-}
-
-function buildPayAllMemo({ deltaHours, hasExpected, hasClaimed, userEmail }) {
-  if (!hasClaimed && deltaHours > 0) {
-    return `Add unflagged hours. (${userEmail})`;
-  }
-
-  if (!hasExpected && deltaHours < 0) {
-    return `Remove flagged hours per assignment. (${userEmail})`;
-  }
-
-  return `Adjust flagged hours per assignment. (${userEmail})`;
-}
 
 exports.payall = async function (req, res) {
-  const { jobid } = req.body;
+  const { jobid, calculateOnly } = req.body;
   logger.log("job-payroll-pay-all", "DEBUG", req.user.email, jobid, null);
 
   const BearerToken = req.BearerToken;
@@ -203,183 +22,253 @@ exports.payall = async function (req, res) {
         id: jobid
       });
 
+    //iterate over each ticket, building a hash of team -> employee to calculate total assigned hours.
+
     const { employeeHash, assignmentHash } = CalculateExpectedHoursForJob(job);
     const ticketHash = CalculateTicketsHoursForJob(job);
-
     if (assignmentHash.unassigned > 0) {
       res.json({ success: false, error: "Not all hours have been assigned." });
       return;
     }
 
+    //Calculate how much time each tech should have by labor type.
+    //Doing this order creates a diff of changes on the ticket hash to make it the same as the employee hash.
+    const recursiveDiff = rdiff.getDiff(ticketHash, employeeHash, true);
+
     const ticketsToInsert = [];
-    const employeeIds = getAllKeys(employeeHash, ticketHash);
 
-    employeeIds.forEach((employeeId) => {
-      const expectedByLabor = employeeHash[employeeId] || {};
-      const claimedByLabor = ticketHash[employeeId] || {};
+    recursiveDiff.forEach((diff) => {
+      //Every iteration is what we would need to insert into the time ticket hash
+      //so that it would match the employee hash exactly.
+      const path = diffParser(diff);
 
-      getAllKeys(expectedByLabor, claimedByLabor).forEach((laborType) => {
-        const expected = expectedByLabor[laborType];
-        const claimed = claimedByLabor[laborType];
-        const deltaHours = roundHours((expected?.hours || 0) - (claimed?.hours || 0));
-
-        if (deltaHours === 0) {
-          return;
+      if (diff.op === "add") {
+        // console.log(Object.keys(diff.val));
+        if (typeof diff.val === "object" && Object.keys(diff.val).length > 1) {
+          //Multiple values to add.
+          Object.keys(diff.val).forEach((key) => {
+            // console.log("Hours", diff.val[key][Object.keys(diff.val[key])[0]]);
+            // console.log("Rate", Object.keys(diff.val[key])[0]);
+            ticketsToInsert.push({
+              task_name: "Pay All",
+              jobid: job.id,
+              bodyshopid: job.bodyshop.id,
+              employeeid: path.employeeid,
+              productivehrs: diff.val[key][Object.keys(diff.val[key])[0]],
+              rate: Object.keys(diff.val[key])[0],
+              ciecacode: key,
+              cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[key],
+              flat_rate: true,
+              memo: `Add unflagged hours. (${req.user.email})`
+            });
+          });
+        } else {
+          //Only the 1 value to add.
+          ticketsToInsert.push({
+            task_name: "Pay All",
+            jobid: job.id,
+            bodyshopid: job.bodyshop.id,
+            employeeid: path.employeeid,
+            productivehrs: path.hours,
+            rate: path.rate,
+            ciecacode: path.mod_lbr_ty,
+            flat_rate: true,
+            cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[path.mod_lbr_ty],
+            memo: `Add unflagged hours. (${req.user.email})`
+          });
         }
-
-        const effectiveRate = roundCurrency(expected?.rate ?? claimed?.rate);
-        const payoutContext = BuildGeneratedPayoutContext({
-          baseContext:
-            expected?.payoutContext ||
-            claimed?.payoutContext ||
-            buildFallbackPayoutContext({ laborType, rate: effectiveRate }),
-          generatedBy: req.user.email,
-          generatedFrom: "payall",
-          taskName: "Pay All",
-          usedTicketFallback: !expected && Boolean(claimed)
-        });
-
+      } else if (diff.op === "update") {
+        //An old ticket amount isn't sufficient
+        //We can't modify the existing ticket, it might already be committed. So let's add a new one instead.
         ticketsToInsert.push({
           task_name: "Pay All",
           jobid: job.id,
           bodyshopid: job.bodyshop.id,
-          employeeid: employeeId,
-          productivehrs: deltaHours,
-          rate: effectiveRate,
-          ciecacode: laborType,
-          cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[laborType],
+          employeeid: path.employeeid,
+          productivehrs: diff.val - diff.oldVal,
+          rate: path.rate,
+          ciecacode: path.mod_lbr_ty,
           flat_rate: true,
-          created_by: req.user.email,
-          payout_context: payoutContext,
-          memo: buildPayAllMemo({
-            deltaHours,
-            hasExpected: Boolean(expected),
-            hasClaimed: Boolean(claimed),
-            userEmail: req.user.email
-          })
+          cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[path.mod_lbr_ty],
+          memo: `Adjust flagged hours per assignment. (${req.user.email})`
         });
-      });
+      } else {
+        //Has to be a delete
+        if (typeof diff.oldVal === "object" && Object.keys(diff.oldVal).length > 1) {
+          //Multiple oldValues to add.
+          Object.keys(diff.oldVal).forEach((key) => {
+            ticketsToInsert.push({
+              task_name: "Pay All",
+              jobid: job.id,
+              bodyshopid: job.bodyshop.id,
+              employeeid: path.employeeid,
+              productivehrs: diff.oldVal[key][Object.keys(diff.oldVal[key])[0]] * -1,
+              rate: Object.keys(diff.oldVal[key])[0],
+              ciecacode: key,
+              cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[key],
+              flat_rate: true,
+              memo: `Remove flagged hours per assignment. (${req.user.email})`
+            });
+          });
+        } else {
+          //Only the 1 value to add.
+          ticketsToInsert.push({
+            task_name: "Pay All",
+            jobid: job.id,
+            bodyshopid: job.bodyshop.id,
+            employeeid: path.employeeid,
+            productivehrs: path.hours * -1,
+            rate: path.rate,
+            ciecacode: path.mod_lbr_ty,
+            cost_center: job.bodyshop.md_responsibility_centers.defaults.costs[path.mod_lbr_ty],
+            flat_rate: true,
+            memo: `Remove flagged hours per assignment. (${req.user.email})`
+          });
+        }
+      }
     });
 
-    const filteredTickets = ticketsToInsert.filter((ticket) => ticket.productivehrs !== 0);
+    const insertResult = await client.request(queries.INSERT_TIME_TICKETS, {
+      timetickets: ticketsToInsert.filter((ticket) => ticket.productivehrs !== 0)
+    });
 
-    if (filteredTickets.length > 0) {
-      await client.request(queries.INSERT_TIME_TICKETS, {
-        timetickets: filteredTickets
-      });
-    }
-
-    res.json(filteredTickets);
+    res.json(ticketsToInsert.filter((ticket) => ticket.productivehrs !== 0));
   } catch (error) {
     logger.log("job-payroll-labor-totals-error", "ERROR", req.user.email, jobid, {
-      jobid,
+      jobid: jobid,
       error: JSON.stringify(error)
     });
     res.status(400).json({ error: error.message });
   }
 };
 
+function diffParser(diff) {
+  const type = typeof diff.oldVal;
+  let mod_lbr_ty, rate, hours;
+
+  if (diff.path.length === 1) {
+    if (diff.op === "add") {
+      mod_lbr_ty = Object.keys(diff.val)[0];
+      rate = Object.keys(diff.val[mod_lbr_ty])[0];
+      // hours = diff.oldVal[mod_lbr_ty][rate];
+    } else {
+      mod_lbr_ty = Object.keys(diff.oldVal)[0];
+      rate = Object.keys(diff.oldVal[mod_lbr_ty])[0];
+      // hours = diff.oldVal[mod_lbr_ty][rate];
+    }
+  } else if (diff.path.length === 2) {
+    mod_lbr_ty = diff.path[1];
+    if (diff.op === "add") {
+      rate = Object.keys(diff.val)[0];
+    } else {
+      rate = Object.keys(diff.oldVal)[0];
+    }
+  } else if (diff.path.length === 3) {
+    mod_lbr_ty = diff.path[1];
+    rate = diff.path[2];
+    //hours = 0;
+  }
+
+  //Set the hours
+  if (typeof diff.val === "number" && diff.val !== null && diff.val !== undefined) {
+    hours = diff.val;
+  } else if (diff.val !== null && diff.val !== undefined) {
+    if (diff.path.length === 1) {
+      hours = diff.val[Object.keys(diff.val)[0]][Object.keys(diff.val[Object.keys(diff.val)[0]])];
+    } else {
+      hours = diff.val[Object.keys(diff.val)[0]];
+    }
+  } else if (typeof diff.oldVal === "number" && diff.oldVal !== null && diff.oldVal !== undefined) {
+    hours = diff.oldVal;
+  } else {
+    hours = diff.oldVal[Object.keys(diff.oldVal)[0]];
+  }
+
+  const ret = {
+    multiVal: false,
+    employeeid: diff.path[0], // Always True
+    mod_lbr_ty,
+    rate,
+    hours
+  };
+  return ret;
+}
+
 function CalculateExpectedHoursForJob(job, filterToLbrTypes) {
   const assignmentHash = { unassigned: 0 };
-  const employeeHash = {}; // employeeid => Cieca labor type => { hours, rate, payoutContext }
-  const laborTypeFilter = Array.isArray(filterToLbrTypes) ? filterToLbrTypes : null;
-
+  const employeeHash = {}; // employeeid => Cieca labor type => rate => hours. Contains how many hours each person should be paid.
   job.joblines
     .filter((jobline) => {
-      if (!laborTypeFilter) {
-        return true;
+      if (!filterToLbrTypes) return true;
+      else {
+        return (
+          filterToLbrTypes.includes(jobline.mod_lbr_ty) ||
+          (jobline.convertedtolbr && filterToLbrTypes.includes(jobline.convertedtolbr_data.mod_lbr_ty))
+        );
       }
-
-      const convertedLaborType = jobline.convertedtolbr ? jobline.convertedtolbr_data?.mod_lbr_ty : null;
-      return laborTypeFilter.includes(jobline.mod_lbr_ty) || (convertedLaborType && laborTypeFilter.includes(convertedLaborType));
     })
     .forEach((jobline) => {
-      const laborType = jobline.convertedtolbr ? jobline.convertedtolbr_data?.mod_lbr_ty || jobline.mod_lbr_ty : jobline.mod_lbr_ty;
-      const laborHours = roundHours(
-        toNumber(jobline.mod_lb_hrs) + (jobline.convertedtolbr ? toNumber(jobline.convertedtolbr_data?.mod_lb_hrs) : 0)
-      );
-
-      if (laborHours === 0) {
-        return;
+      if (jobline.convertedtolbr) {
+        // Line has been converte to labor. Temporarily re-assign the hours.
+        jobline.mod_lbr_ty = jobline.convertedtolbr_data.mod_lbr_ty;
+        jobline.mod_lb_hrs += jobline.convertedtolbr_data.mod_lb_hrs;
       }
+      if (jobline.mod_lb_hrs != 0) {
+        //Check if the line is assigned. If not, keep track of it as an unassigned line by type.
+        if (jobline.assigned_team === null) {
+          assignmentHash.unassigned = assignmentHash.unassigned + jobline.mod_lb_hrs;
+        } else {
+          //Line is assigned.
+          if (!assignmentHash[jobline.assigned_team]) {
+            assignmentHash[jobline.assigned_team] = 0;
+          }
+          assignmentHash[jobline.assigned_team] = assignmentHash[jobline.assigned_team] + jobline.mod_lb_hrs;
 
-      if (jobline.assigned_team === null) {
-        assignmentHash.unassigned = roundHours(assignmentHash.unassigned + laborHours);
-        return;
-      }
+          //Create the assignment breakdown.
+          const theTeam = job.bodyshop.employee_teams.find((team) => team.id === jobline.assigned_team);
 
-      const theTeam = job.bodyshop.employee_teams.find((team) => team.id === jobline.assigned_team);
+          theTeam.employee_team_members.forEach((tm) => {
+            //Figure out how many hours they are owed at this line, and at what rate.
 
-      if (!theTeam) {
-        assignmentHash.unassigned = roundHours(assignmentHash.unassigned + laborHours);
-        return;
-      }
+            if (!employeeHash[tm.employee.id]) {
+              employeeHash[tm.employee.id] = {};
+            }
+            if (!employeeHash[tm.employee.id][jobline.mod_lbr_ty]) {
+              employeeHash[tm.employee.id][jobline.mod_lbr_ty] = {};
+            }
+            if (!employeeHash[tm.employee.id][jobline.mod_lbr_ty][tm.labor_rates[jobline.mod_lbr_ty]]) {
+              employeeHash[tm.employee.id][jobline.mod_lbr_ty][tm.labor_rates[jobline.mod_lbr_ty]] = 0;
+            }
 
-      assignmentHash[jobline.assigned_team] = roundHours((assignmentHash[jobline.assigned_team] || 0) + laborHours);
-
-      theTeam.employee_team_members.forEach((teamMember) => {
-        const employeeId = teamMember.employee.id;
-        const { effectiveRate, payoutContext } = BuildPayoutDetails(job, teamMember, laborType);
-
-        if (!employeeHash[employeeId]) {
-          employeeHash[employeeId] = {};
+            const hoursOwed = (tm.percentage * jobline.mod_lb_hrs) / 100;
+            employeeHash[tm.employee.id][jobline.mod_lbr_ty][tm.labor_rates[jobline.mod_lbr_ty]] =
+              employeeHash[tm.employee.id][jobline.mod_lbr_ty][tm.labor_rates[jobline.mod_lbr_ty]] + hoursOwed;
+          });
         }
-
-        if (!employeeHash[employeeId][laborType]) {
-          employeeHash[employeeId][laborType] = {
-            hours: 0,
-            rate: effectiveRate,
-            payoutContext
-          };
-        }
-
-        const hoursOwed = roundHours((toNumber(teamMember.percentage) * laborHours) / 100);
-        employeeHash[employeeId][laborType].hours = roundHours(employeeHash[employeeId][laborType].hours + hoursOwed);
-        employeeHash[employeeId][laborType].rate = effectiveRate;
-        employeeHash[employeeId][laborType].payoutContext = payoutContext;
-      });
+      }
     });
 
   return { assignmentHash, employeeHash };
 }
 
 function CalculateTicketsHoursForJob(job) {
-  const ticketHash = {}; // employeeid => Cieca labor type => { hours, rate, payoutContext }
-
+  const ticketHash = {}; // employeeid => Cieca labor type => rate => hours.
+  //Calculate how much each employee has been paid so far.
   job.timetickets.forEach((ticket) => {
-    if (!ticket?.employeeid || !ticket?.ciecacode) {
-      return;
-    }
-
     if (!ticketHash[ticket.employeeid]) {
       ticketHash[ticket.employeeid] = {};
     }
-
     if (!ticketHash[ticket.employeeid][ticket.ciecacode]) {
-      ticketHash[ticket.employeeid][ticket.ciecacode] = {
-        hours: 0,
-        rate: roundCurrency(ticket.rate),
-        payoutContext: ticket.payout_context || null
-      };
+      ticketHash[ticket.employeeid][ticket.ciecacode] = {};
     }
-
-    ticketHash[ticket.employeeid][ticket.ciecacode].hours = roundHours(
-      ticketHash[ticket.employeeid][ticket.ciecacode].hours + toNumber(ticket.productivehrs)
-    );
-
-    if (ticket.rate !== null && ticket.rate !== undefined) {
-      ticketHash[ticket.employeeid][ticket.ciecacode].rate = roundCurrency(ticket.rate);
-    }
-
-    if (ticket.payout_context) {
-      ticketHash[ticket.employeeid][ticket.ciecacode].payoutContext = ticket.payout_context;
+    if (!ticketHash[ticket.employeeid][ticket.ciecacode][ticket.rate]) {
+      ticketHash[ticket.employeeid][ticket.ciecacode][ticket.rate] = 0;
     }
+    ticketHash[ticket.employeeid][ticket.ciecacode][ticket.rate] =
+      ticketHash[ticket.employeeid][ticket.ciecacode][ticket.rate] + ticket.productivehrs;
   });
-
   return ticketHash;
 }
 
-exports.BuildPayoutDetails = BuildPayoutDetails;
 exports.CalculateExpectedHoursForJob = CalculateExpectedHoursForJob;
 exports.CalculateTicketsHoursForJob = CalculateTicketsHoursForJob;
-exports.RoundPayrollHours = roundHours;

server/payroll/payroll.test.js

@@ -1,465 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from "vitest";
-import mockRequire from "mock-require";
-
-const logMock = vi.fn();
-
-let payAllModule;
-let claimTaskModule;
-
-const buildBaseJob = (overrides = {}) => ({
-  id: "job-1",
-  completed_tasks: [],
-  rate_laa: 100,
-  bodyshop: {
-    id: "shop-1",
-    md_responsibility_centers: {
-      defaults: {
-        costs: {
-          LAA: "Body"
-        }
-      }
-    },
-    md_tasks_presets: {
-      presets: []
-    },
-    employee_teams: []
-  },
-  joblines: [],
-  timetickets: [],
-  ...overrides
-});
-
-const buildReqRes = ({ job, body = {}, userEmail = "payroll@example.com" }) => {
-  const client = {
-    setHeaders: vi.fn().mockReturnThis(),
-    request: vi.fn().mockResolvedValueOnce({ jobs_by_pk: job })
-  };
-
-  const req = {
-    body: {
-      jobid: job.id,
-      ...body
-    },
-    user: {
-      email: userEmail
-    },
-    BearerToken: "Bearer test",
-    userGraphQLClient: client
-  };
-
-  const res = {
-    json: vi.fn(),
-    status: vi.fn().mockReturnThis()
-  };
-
-  return { client, req, res };
-};
-
-beforeEach(() => {
-  vi.resetModules();
-  vi.clearAllMocks();
-  mockRequire.stopAll();
-  mockRequire("../utils/logger", { log: logMock });
-  payAllModule = require("./pay-all");
-  claimTaskModule = require("./claim-task");
-});
-
-describe("payroll payout helpers", () => {
-  it("defaults team members to hourly payout when no payout method is stored", () => {
-    const { effectiveRate, payoutContext } = payAllModule.BuildPayoutDetails(
-      {},
-      {
-        labor_rates: {
-          LAA: 27.5
-        },
-        employee: {
-          id: "emp-1"
-        }
-      },
-      "LAA"
-    );
-
-    expect(effectiveRate).toBe(27.5);
-    expect(payoutContext).toEqual(
-      expect.objectContaining({
-        payout_type: "hourly",
-        payout_method: "hourly",
-        cut_percent_applied: null,
-        source_labor_rate: null,
-        source_labor_type: "LAA",
-        effective_rate: 27.5
-      })
-    );
-  });
-
-  it("calculates commission payout rates from the raw job labor sale rate", () => {
-    const { effectiveRate, payoutContext } = payAllModule.BuildPayoutDetails(
-      {
-        rate_laa: 120
-      },
-      {
-        payout_method: "commission",
-        commission_rates: {
-          LAA: 35
-        },
-        employee: {
-          id: "emp-1"
-        }
-      },
-      "LAA"
-    );
-
-    expect(effectiveRate).toBe(42);
-    expect(payoutContext).toEqual(
-      expect.objectContaining({
-        payout_type: "cut",
-        payout_method: "commission",
-        cut_percent_applied: 35,
-        source_labor_rate: 120,
-        source_labor_type: "LAA",
-        effective_rate: 42
-      })
-    );
-  });
-
-  it("uses Dinero half-even rounding for stored hourly rates", () => {
-    const { effectiveRate, payoutContext } = payAllModule.BuildPayoutDetails(
-      {},
-      {
-        labor_rates: {
-          LAA: 10.005
-        },
-        employee: {
-          id: "emp-1"
-        }
-      },
-      "LAA"
-    );
-
-    expect(effectiveRate).toBe(10);
-    expect(payoutContext.effective_rate).toBe(10);
-  });
-
-  it("throws a useful error when commission configuration is incomplete", () => {
-    expect(() =>
-      payAllModule.BuildPayoutDetails(
-        {
-          rate_laa: 100
-        },
-        {
-          payout_method: "commission",
-          commission_rates: {},
-          employee: {
-            first_name: "Jane",
-            last_name: "Doe"
-          }
-        },
-        "LAA"
-      )
-    ).toThrow("Missing commission percent for Jane Doe on labor type LAA.");
-  });
-
-  it("throws a useful error when an hourly payout rate is missing", () => {
-    expect(() =>
-      payAllModule.BuildPayoutDetails(
-        {},
-        {
-          labor_rates: {},
-          employee: {
-            first_name: "John",
-            last_name: "Smith"
-          }
-        },
-        "LAB"
-      )
-    ).toThrow("Missing hourly payout rate for John Smith on labor type LAB.");
-  });
-});
-
-describe("payroll routes", () => {
-  it("aggregates claimed hours across prior ticket rates and inserts the remaining delta at the current rate", async () => {
-    const job = buildBaseJob({
-      bodyshop: {
-        id: "shop-1",
-        md_responsibility_centers: {
-          defaults: {
-            costs: {
-              LAA: "Body"
-            }
-          }
-        },
-        md_tasks_presets: {
-          presets: []
-        },
-        employee_teams: [
-          {
-            id: "team-1",
-            employee_team_members: [
-              {
-                percentage: 100,
-                payout_method: "commission",
-                commission_rates: {
-                  LAA: 40
-                },
-                labor_rates: {
-                  LAA: 30
-                },
-                employee: {
-                  id: "emp-1",
-                  first_name: "Jane",
-                  last_name: "Doe"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      joblines: [
-        {
-          mod_lbr_ty: "LAA",
-          mod_lb_hrs: 10,
-          assigned_team: "team-1",
-          convertedtolbr: false
-        }
-      ],
-      timetickets: [
-        {
-          employeeid: "emp-1",
-          ciecacode: "LAA",
-          productivehrs: 2,
-          rate: 30,
-          payout_context: {
-            payout_method: "hourly"
-          }
-        },
-        {
-          employeeid: "emp-1",
-          ciecacode: "LAA",
-          productivehrs: 3,
-          rate: 35,
-          payout_context: {
-            payout_method: "commission"
-          }
-        }
-      ]
-    });
-
-    const { client, req, res } = buildReqRes({ job });
-    client.request.mockResolvedValueOnce({ insert_timetickets: { affected_rows: 1 } });
-
-    await payAllModule.payall(req, res);
-
-    expect(client.request).toHaveBeenCalledTimes(2);
-
-    const insertedTickets = client.request.mock.calls[1][1].timetickets;
-    expect(insertedTickets).toHaveLength(1);
-    expect(insertedTickets[0]).toEqual(
-      expect.objectContaining({
-        task_name: "Pay All",
-        employeeid: "emp-1",
-        productivehrs: 5,
-        rate: 40,
-        ciecacode: "LAA",
-        cost_center: "Body",
-        created_by: "payroll@example.com"
-      })
-    );
-    expect(insertedTickets[0].payout_context).toEqual(
-      expect.objectContaining({
-        payout_method: "commission",
-        cut_percent_applied: 40,
-        source_labor_rate: 100,
-        generated_from: "payall",
-        task_name: "Pay All",
-        used_ticket_fallback: false
-      })
-    );
-    expect(res.json).toHaveBeenCalledWith(insertedTickets);
-  });
-
-  it("rejects duplicate claim-task submissions for completed presets", async () => {
-    const job = buildBaseJob({
-      completed_tasks: [{ name: "Disassembly" }],
-      bodyshop: {
-        id: "shop-1",
-        md_responsibility_centers: {
-          defaults: {
-            costs: {
-              LAA: "Body"
-            }
-          }
-        },
-        md_tasks_presets: {
-          presets: [
-            {
-              name: "Disassembly",
-              hourstype: ["LAA"],
-              percent: 50,
-              nextstatus: "In Progress",
-              memo: "Flag disassembly"
-            }
-          ]
-        },
-        employee_teams: []
-      }
-    });
-
-    const { client, req, res } = buildReqRes({
-      job,
-      body: {
-        task: "Disassembly",
-        calculateOnly: false,
-        employee: {
-          name: "Jane Doe",
-          employeeid: "emp-1"
-        }
-      }
-    });
-
-    await claimTaskModule.claimtask(req, res);
-
-    expect(client.request).toHaveBeenCalledTimes(1);
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(res.json).toHaveBeenCalledWith({
-      success: false,
-      error: "Provided task preset has already been completed for this job."
-    });
-  });
-
-  it("rejects claim-task when task presets over-allocate the same labor type", async () => {
-    const job = buildBaseJob({
-      bodyshop: {
-        id: "shop-1",
-        md_responsibility_centers: {
-          defaults: {
-            costs: {
-              LAA: "Body"
-            }
-          }
-        },
-        md_tasks_presets: {
-          presets: [
-            {
-              name: "Body Prep",
-              hourstype: ["LAA"],
-              percent: 60,
-              nextstatus: "Prep",
-              memo: "Prep body work"
-            },
-            {
-              name: "Body Prime",
-              hourstype: ["LAA"],
-              percent: 50,
-              nextstatus: "Prime",
-              memo: "Prime body work"
-            }
-          ]
-        },
-        employee_teams: []
-      }
-    });
-
-    const { client, req, res } = buildReqRes({
-      job,
-      body: {
-        task: "Body Prep",
-        calculateOnly: true,
-        employee: {
-          name: "Jane Doe",
-          employeeid: "emp-1"
-        }
-      }
-    });
-
-    await claimTaskModule.claimtask(req, res);
-
-    expect(client.request).toHaveBeenCalledTimes(1);
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(res.json).toHaveBeenCalledWith({
-      success: false,
-      error: "Task preset percentages for labor type LAA total 110% and cannot exceed 100%."
-    });
-  });
-
-  it("rejects claim-task when an assigned team member is missing the hourly rate for the selected labor type", async () => {
-    const job = buildBaseJob({
-      bodyshop: {
-        id: "shop-1",
-        md_responsibility_centers: {
-          defaults: {
-            costs: {
-              LAB: "Body"
-            }
-          }
-        },
-        md_tasks_presets: {
-          presets: [
-            {
-              name: "Teardown",
-              hourstype: ["LAB"],
-              percent: 100,
-              nextstatus: "In Progress",
-              memo: "Teardown"
-            }
-          ]
-        },
-        employee_teams: [
-          {
-            id: "team-1",
-            employee_team_members: [
-              {
-                percentage: 50,
-                labor_rates: {
-                  LAB: 45
-                },
-                employee: {
-                  id: "emp-1",
-                  first_name: "Configured",
-                  last_name: "Tech"
-                }
-              },
-              {
-                percentage: 50,
-                labor_rates: {},
-                employee: {
-                  id: "emp-2",
-                  first_name: "Missing",
-                  last_name: "Rate"
-                }
-              }
-            ]
-          }
-        ]
-      },
-      joblines: [
-        {
-          mod_lbr_ty: "LAB",
-          mod_lb_hrs: 4.4,
-          assigned_team: "team-1",
-          convertedtolbr: false
-        }
-      ]
-    });
-
-    const { client, req, res } = buildReqRes({
-      job,
-      body: {
-        task: "Teardown",
-        calculateOnly: true,
-        employee: {
-          name: "Dave",
-          email: "dave@rome.test"
-        }
-      }
-    });
-
-    await claimTaskModule.claimtask(req, res);
-
-    expect(client.request).toHaveBeenCalledTimes(1);
-    expect(res.status).toHaveBeenCalledWith(400);
-    expect(res.json).toHaveBeenCalledWith({
-      success: false,
-      error: "Missing hourly payout rate for Missing Rate on labor type LAB."
-    });
-  });
-});