IO-1366 Refine audit trail detail logging

Extend for Time Ticket Changes, Manual Lines, Manual Job, Bill Edits

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

client/src/components/bill-detail-edit/bill-detail-edit-component.jsx

@@ -13,6 +13,7 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import dayjs from "../../utils/day";
+import { buildBillUpdateAuditDetails } from "../../utils/auditTrailDetails";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
@@ -134,10 +135,16 @@ export function BillDetailEditcontainer({ insertAuditTrail, bodyshop }) {
 
     await Promise.all(updates);
 
+    const details = buildBillUpdateAuditDetails({
+      originalBill: data?.bills_by_pk,
+      bill,
+      billlines
+    });
+
     insertAuditTrail({
-      jobid: bill.jobid,
+      jobid: bill.jobid ?? data?.bills_by_pk?.jobid,
       billid: search.billid,
-      operation: AuditTrailMapping.billupdated(bill.invoice_number),
+      operation: AuditTrailMapping.billupdated(bill.invoice_number, details),
       type: "billupdated"
     });
 

client/src/components/dms-allocations-summary/rr-dms-allocations-summary.component.jsx

@@ -64,7 +64,7 @@ function normalizeJobAllocations(ack) {
  * RR-specific DMS Allocations Summary
  * Focused on what we actually send to RR:
  *  - ROGOG (split by taxable / non-taxable segments)
- *  - ROLABOR labor rows with bill hours / rates
+ *  - ROLABOR shell
  *
  * The heavy lifting (ROGOG/ROLABOR split, cost allocation, tax flags)
  * is now done on the backend via buildRogogFromAllocations/buildRolaborFromRogog.
@@ -181,30 +181,21 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
   const rolaborRows = useMemo(() => {
     if (!rolaborPreview || !Array.isArray(rolaborPreview.ops)) return [];
 
-    return rolaborPreview.ops
-      .filter((op) =>
-        [op.bill?.jobTotalHrs, op.bill?.billTime, op.bill?.billRate, op.amount?.custPrice, op.amount?.totalAmt]
-          .map((value) => Number.parseFloat(value ?? "0"))
-          .some((value) => !Number.isNaN(value) && value !== 0)
-      )
-      .map((op, idx) => {
-        const rowOpCode = opCode || op.opCode;
+    return rolaborPreview.ops.map((op, idx) => {
+      const rowOpCode = opCode || op.opCode;
 
-        return {
-          key: `${op.jobNo}-${idx}`,
-          opCode: rowOpCode,
-          jobNo: op.jobNo,
-          custPayTypeFlag: op.custPayTypeFlag,
-          custTxblNtxblFlag: op.custTxblNtxblFlag,
-          payType: op.bill?.payType,
-          jobTotalHrs: op.bill?.jobTotalHrs,
-          billTime: op.bill?.billTime,
-          billRate: op.bill?.billRate,
-          amtType: op.amount?.amtType,
-          custPrice: op.amount?.custPrice,
-          totalAmt: op.amount?.totalAmt
-        };
-      });
+      return {
+        key: `${op.jobNo}-${idx}`,
+        opCode: rowOpCode,
+        jobNo: op.jobNo,
+        custPayTypeFlag: op.custPayTypeFlag,
+        custTxblNtxblFlag: op.custTxblNtxblFlag,
+        payType: op.bill?.payType,
+        amtType: op.amount?.amtType,
+        custPrice: op.amount?.custPrice,
+        totalAmt: op.amount?.totalAmt
+      };
+    });
   }, [rolaborPreview, opCode]);
 
   // Totals for ROGOG (sum custPrice + dlrCost over all lines)
@@ -254,9 +245,6 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
     { title: "CustPayType", dataIndex: "custPayTypeFlag", key: "custPayTypeFlag" },
     { title: "CustTxblFlag", dataIndex: "custTxblNtxblFlag", key: "custTxblNtxblFlag" },
     { title: "PayType", dataIndex: "payType", key: "payType" },
-    { title: "JobTotalHrs", dataIndex: "jobTotalHrs", key: "jobTotalHrs" },
-    { title: "BillTime", dataIndex: "billTime", key: "billTime" },
-    { title: "BillRate", dataIndex: "billRate", key: "billRate" },
     { title: "AmtType", dataIndex: "amtType", key: "amtType" },
     { title: "CustPrice", dataIndex: "custPrice", key: "custPrice" },
     { title: "TotalAmt", dataIndex: "totalAmt", key: "totalAmt" }
@@ -329,13 +317,12 @@ export function RrAllocationsSummary({ socket, bodyshop, jobId, title, onAllocat
       children: (
         <>
           <Typography.Paragraph type="secondary" style={{ marginBottom: 8 }}>
-            This mirrors the labor rows RR will receive, including weighted bill hours and rates derived from the
-            job&apos;s labor lines.
+            This mirrors the shell that would be sent for ROLABOR when all financials are carried in GOG.
           </Typography.Paragraph>
           <ResponsiveTable
             pagination={false}
             columns={rolaborColumns}
-            mobileColumnKeys={["jobNo", "opCode", "billRate", "custPrice"]}
+            mobileColumnKeys={["jobNo", "opCode", "breakOut", "itemType"]}
             rowKey="key"
             dataSource={rolaborRows}
             locale={{ emptyText: "No ROLABOR lines would be generated." }}

client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx

@@ -14,16 +14,20 @@ import CriticalPartsScan from "../../utils/criticalPartsScan";
 import UndefinedToNull from "../../utils/undefinedtonull";
 import JobLinesUpdsertModal from "./job-lines-upsert-modal.component";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
+import { buildJobLineInsertAuditDetails, buildJobLineUpdateAuditDetails } from "../../utils/auditTrailDetails.js";
 
 const mapStateToProps = createStructuredSelector({
   jobLineEditModal: selectJobLineEditModal,
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit"))
+  toggleModalVisible: () => dispatch(toggleModalVisible("jobLineEdit")),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
-function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bodyshop }) {
+function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bodyshop, insertAuditTrail }) {
   const {
     treatments: { CriticalPartsScanning }
   } = useTreatmentsWithConfig({
@@ -74,6 +78,11 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
         notification.success({
           title: t("joblines.successes.created")
         });
+        insertAuditTrail({
+          jobid: jobLineEditModal.context.jobid,
+          operation: AuditTrailMapping.jobmanuallineinsert(buildJobLineInsertAuditDetails(values)),
+          type: "jobmanuallineinsert"
+        });
       } else {
         notification.error({
           title: t("joblines.errors.creating", {
@@ -103,6 +112,17 @@ function JobLinesUpsertModalContainer({ jobLineEditModal, toggleModalVisible, bo
         notification.success({
           title: t("joblines.successes.updated")
         });
+        insertAuditTrail({
+          jobid: jobLineEditModal.context.jobid,
+          operation: AuditTrailMapping.joblineupdate(
+            values.line_desc || jobLineEditModal.context.line_desc || "manual line",
+            buildJobLineUpdateAuditDetails({
+              originalLine: jobLineEditModal.context,
+              values
+            })
+          ),
+          type: "joblineupdate"
+        });
       } else {
         notification.success({
           title: t("joblines.errors.updating", {

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

@@ -58,7 +58,6 @@ export function ProductionColumnsComponent({
 
   const columnKeys = columns.map((i) => i.key);
   const cols = dataSource({
-    bodyshop,
     technician,
     data,
     state: tableState,

client/src/components/production-list-columns/production-list-columns.data.jsx

@@ -609,19 +609,7 @@ const productionListColumnsData = ({ technician, state, activeStatuses, data, bo
       ellipsis: true,
 
       render: (text, record) => <TimeFormatter>{record.date_repairstarted}</TimeFormatter>
-    },
-    ...(bodyshop && bodyshop.rr_dealerid
-      ? [
-          {
-            title: i18n.t("jobs.fields.dms.id"),
-            dataIndex: "dms_id",
-            key: "dms_id",
-            ellipsis: true,
-            sorter: (a, b) => alphaSort(a.dms_id, b.dms_id),
-            sortOrder: state.sortedInfo.columnKey === "dms_id" && state.sortedInfo.order
-          }
-        ]
-      : []),
+    }
   ];
 };
 export default productionListColumnsData;

client/src/components/production-list-table/production-list-config-manager.component.jsx

@@ -244,7 +244,6 @@ export function ProductionListConfigManager({
           nextConfig.columns.columnKeys.map((k) => {
             return {
               ...ProductionListColumns({
-                bodyshop,
                 technician,
                 state: ensureDefaultState(state),
                 refetch,
@@ -271,7 +270,6 @@ export function ProductionListConfigManager({
           activeConfig.columns.columnKeys.map((k) => {
             return {
               ...ProductionListColumns({
-                bodyshop,
                 technician,
                 state: ensureDefaultState(state),
                 refetch,

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

@@ -2,7 +2,7 @@ import { PageHeader } from "@ant-design/pro-layout";
 import { useMutation, useQuery } from "@apollo/client/react";
 import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import { Button, Form, Modal, Space } from "antd";
-import { useEffect, useState } from "react";
+import { useEffect, useState, useRef } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -15,21 +15,27 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import dayjs from "../../utils/day";
 import TimeTicketsCommitToggleComponent from "../time-tickets-commit-toggle/time-tickets-commit-toggle.component";
 import TimeTicketModalComponent from "./time-ticket-modal.component";
+import { insertAuditTrail } from "../../redux/application/application.actions.js";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
+import { buildTimeTicketAuditSummary } from "../../utils/auditTrailDetails.js";
 
 const mapStateToProps = createStructuredSelector({
   timeTicketModal: selectTimeTicket,
   bodyshop: selectBodyshop
 });
 const mapDispatchToProps = (dispatch) => ({
-  toggleModalVisible: () => dispatch(toggleModalVisible("timeTicket"))
+  toggleModalVisible: () => dispatch(toggleModalVisible("timeTicket")),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
-export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible, bodyshop }) {
+export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible, bodyshop, insertAuditTrail }) {
   const [form] = Form.useForm();
   const [loading, setLoading] = useState(false);
   const { t } = useTranslation();
   const [enterAgain, setEnterAgain] = useState(false);
 
+  const lastSubmittedRef = useRef(null);
+
   const [lineTicketRefreshKey, setLineTicketRefreshKey] = useState(0);
 
   const [insertTicket] = useMutation(INSERT_NEW_TIME_TICKET);
@@ -48,47 +54,77 @@ export function TimeTicketModalContainer({ timeTicketModal, toggleModalVisible,
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only"
   });
+  const employees = EmployeeAutoCompleteData?.employees ?? [];
 
   const handleFinish = (values) => {
+    lastSubmittedRef.current = values;
     setLoading(true);
-    const emps = EmployeeAutoCompleteData?.employees.filter((e) => e.id === values.employeeid);
-    if (timeTicketModal.context.id) {
-      updateTicket({
-        variables: {
-          timeticketId: timeTicketModal.context.id,
-          timeticket: {
-            ...values,
-            rate: emps.length === 1 ? emps[0].rates.filter((r) => r.cost_center === values.cost_center)[0]?.rate : null
-          }
-        }
-      })
-        .then(handleMutationSuccess)
-        .catch(handleMutationError);
-    } else {
-      //Get selected employee rate.
-      insertTicket({
-        variables: {
-          timeTicketInput: [
-            {
+    const isEdit = Boolean(timeTicketModal.context.id);
+    const emps = employees.filter((employee) => employee.id === values.employeeid);
+    const mutation = isEdit
+      ? updateTicket({
+          variables: {
+            timeticketId: timeTicketModal.context.id,
+            timeticket: {
               ...values,
               rate:
-                emps.length === 1 ? emps[0].rates.filter((r) => r.cost_center === values.cost_center)[0].rate : null,
-              bodyshopid: bodyshop.id,
-              created_by: timeTicketModal.context.created_by
+                emps.length === 1 ? emps[0].rates.filter((r) => r.cost_center === values.cost_center)[0]?.rate : null
             }
-          ]
-        }
-      })
-        .then(handleMutationSuccess)
-        .catch(handleMutationError);
-    }
+          }
+        })
+      : insertTicket({
+          variables: {
+            timeTicketInput: [
+              {
+                ...values,
+                rate:
+                  emps.length === 1 ? emps[0].rates.filter((r) => r.cost_center === values.cost_center)[0].rate : null,
+                bodyshopid: bodyshop.id,
+                created_by: timeTicketModal.context.created_by
+              }
+            ]
+          }
+        });
+
+    mutation.then((result) => handleMutationSuccess(result, isEdit)).catch(handleMutationError);
   };
 
-  const handleMutationSuccess = () => {
+  const handleMutationSuccess = (result, isEdit) => {
     notification.success({
       title: t("timetickets.successes.created")
     });
 
+    const savedTicket =
+      result?.data?.update_timetickets?.returning?.[0] ?? result?.data?.insert_timetickets?.returning?.[0] ?? {};
+    const originalTicket = timeTicketModal.context?.timeticket ?? {};
+    const submittedValues = {
+      ...(lastSubmittedRef.current ?? {}),
+      date: lastSubmittedRef.current?.date ?? savedTicket.date ?? originalTicket.date ?? null,
+      employeeid: lastSubmittedRef.current?.employeeid ?? savedTicket.employeeid ?? originalTicket.employeeid ?? null,
+      jobid:
+        lastSubmittedRef.current?.jobid ??
+        savedTicket.jobid ??
+        timeTicketModal.context.jobId ??
+        originalTicket.job?.id ??
+        originalTicket.jobid ??
+        null
+    };
+    const auditSummary = buildTimeTicketAuditSummary({
+      originalTicket,
+      submittedValues,
+      employees
+    });
+
+    if (auditSummary.jobid) {
+      insertAuditTrail({
+        jobid: auditSummary.jobid,
+        operation: isEdit
+          ? AuditTrailMapping.timeticketupdated(auditSummary.employeeName, auditSummary.date, auditSummary.details)
+          : AuditTrailMapping.timeticketcreated(auditSummary.employeeName, auditSummary.date, auditSummary.details),
+        type: isEdit ? "timeticketupdated" : "timeticketcreated"
+      });
+    }
+
     // Refresh parent screens (Job Labor tab, etc.)
     if (timeTicketModal.actions.refetch) timeTicketModal.actions.refetch();
 

client/src/graphql/jobs.queries.js

@@ -197,7 +197,6 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql`
       employee_prep
       employee_csr
       date_repairstarted
-      dms_id
       joblines_status {
         part_type
         status
@@ -270,7 +269,6 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql`
       employee_prep
       employee_csr
       date_repairstarted
-      dms_id
       joblines_status {
         part_type
         status
@@ -2673,7 +2671,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       suspended
       job_totals
       date_repairstarted
-      dms_id
       joblines_status {
         part_type
         status

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

@@ -8,13 +8,14 @@ import { createStructuredSelector } from "reselect";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { INSERT_NEW_JOB } from "../../graphql/jobs.queries";
 import { QUERY_OWNER_FOR_JOB_CREATION } from "../../graphql/owners.queries";
-import { setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
+import { insertAuditTrail, setBreadcrumbs, setSelectedHeader } from "../../redux/application/application.actions";
 import { selectBodyshop, selectCurrentUser } from "../../redux/user/user.selectors";
 import InstanceRenderManager from "../../utils/instanceRenderMgr";
 import JobsCreateComponent from "./jobs-create.component";
 import JobCreateContext from "./jobs-create.context";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
 import { logImEXEvent } from "../../firebase/firebase.utils";
+import AuditTrailMapping from "../../utils/AuditTrailMappings.js";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -22,10 +23,11 @@ const mapStateToProps = createStructuredSelector({
 });
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
-  setSelectedHeader: (key) => dispatch(setSelectedHeader(key))
+  setSelectedHeader: (key) => dispatch(setSelectedHeader(key)),
+  insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 
-function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, currentUser }) {
+function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, currentUser, insertAuditTrail }) {
   const { t } = useTranslation();
   const notification = useNotification();
 
@@ -84,6 +86,11 @@ function JobsCreateContainer({ bodyshop, setBreadcrumbs, setSelectedHeader, curr
           newJobId: resp.data.insert_jobs.returning[0].id
         });
         logImEXEvent("manual_job_create_completed", {});
+        insertAuditTrail({
+          jobid: resp.data.insert_jobs.returning[0].id,
+          operation: AuditTrailMapping.jobmanualcreate(),
+          type: "jobmanualcreate"
+        });
         setIsSubmitting(false);
       })
       .catch((error) => {

client/src/translations/en_us/common.json

@@ -122,7 +122,7 @@
         "billdeleted": "Bill with invoice number {{invoice_number}} deleted.",
         "billmarkforreexport": "Bill with invoice number {{invoice_number}} marked for re-export.",
         "billposted": "Bill with invoice number {{invoice_number}} posted.",
-        "billupdated": "Bill with invoice number {{invoice_number}} updated.",
+        "billupdated": "Bill with invoice number {{invoice_number}} updated with the following details: {{details}}.",
         "failedpayment": "Failed payment attempt.",
         "jobassignmentchange": "Employee {{name}} assigned to {{operation}}",
         "jobassignmentremoved": "Employee assignment removed for {{operation}}",
@@ -137,6 +137,9 @@
         "jobintake": "Job intake completed. Status set to {{status}}. Scheduled completion is {{scheduled_completion}}.",
         "jobinvoiced": "Job has been invoiced.",
         "jobioucreated": "IOU Created.",
+        "joblineupdate": "Job line {{lineDescription}} updated with the following details: {{details}}.",
+        "jobmanualcreate": "Job manually created.",
+        "jobmanuallineinsert": "Job line manually added with the following details: {{details}}.",
         "jobmodifylbradj": "Labor adjustments modified {{mod_lbr_ty}} / {{hours}}.",
         "jobnoteadded": "Note added to Job.",
         "jobnotedeleted": "Note deleted from Job.",
@@ -152,7 +155,9 @@
         "tasks_deleted": "Task '{{title}}' deleted by {{deletedBy}}",
         "tasks_uncompleted": "Task '{{title}}' uncompleted by {{uncompletedBy}}",
         "tasks_undeleted": "Task '{{title}}' undeleted by {{undeletedBy}}",
-        "tasks_updated": "Task '{{title}}' updated by {{updatedBy}}"
+        "tasks_updated": "Task '{{title}}' updated by {{updatedBy}}",
+        "timeticketcreated": "Time Ticket for {{employee}} on {{date}} created with the following details: {{details}}.",
+        "timeticketupdated": "Time Ticket for {{employee}} on {{date}} updated with the following details: {{details}}"
       }
     },
     "billlines": {

client/src/translations/es/common.json

@@ -122,7 +122,6 @@
         "billdeleted": "",
         "billposted": "",
         "billmarkforreexport": "",
-        "billupdated": "",
         "failedpayment": "",
         "jobassignmentchange": "",
         "jobassignmentremoved": "",

client/src/translations/fr/common.json

@@ -122,7 +122,6 @@
         "billdeleted": "",
         "billmarkforreexport": "",
         "billposted": "",
-        "billupdated": "",
         "failedpayment": "",
         "jobassignmentchange": "",
         "jobassignmentremoved": "",

client/src/utils/AuditTrailMappings.js

@@ -10,7 +10,7 @@ const AuditTrailMapping = {
   billdeleted: (invoice_number) => i18n.t("audit_trail.messages.billdeleted", { invoice_number }),
   billmarkforreexport: (invoice_number) => i18n.t("audit_trail.messages.billmarkforreexport", { invoice_number }),
   billposted: (invoice_number) => i18n.t("audit_trail.messages.billposted", { invoice_number }),
-  billupdated: (invoice_number) => i18n.t("audit_trail.messages.billupdated", { invoice_number }),
+  billupdated: (invoice_number, details) => i18n.t("audit_trail.messages.billupdated", { invoice_number, details }),
   jobassignmentchange: (operation, name) => i18n.t("audit_trail.messages.jobassignmentchange", { operation, name }),
   jobassignmentremoved: (operation) => i18n.t("audit_trail.messages.jobassignmentremoved", { operation }),
   jobchecklist: (type, inproduction, status) =>
@@ -26,6 +26,10 @@ const AuditTrailMapping = {
   jobinproductionchange: (inproduction) => i18n.t("audit_trail.messages.jobinproductionchange", { inproduction }),
   jobinvoiced: () => i18n.t("audit_trail.messages.jobinvoiced"),
   jobclosedwithbypass: () => i18n.t("audit_trail.messages.jobclosedwithbypass"),
+  joblineupdate: (lineDescription, details) =>
+    i18n.t("audit_trail.messages.joblineupdate", { details, lineDescription }),
+  jobmanualcreate: () => i18n.t("audit_trail.messages.jobmanualcreate"),
+  jobmanuallineinsert: (details) => i18n.t("audit_trail.messages.jobmanuallineinsert", { details }),
   jobmodifylbradj: ({ mod_lbr_ty, hours }) => i18n.t("audit_trail.messages.jobmodifylbradj", { mod_lbr_ty, hours }),
   jobnoteadded: () => i18n.t("audit_trail.messages.jobnoteadded"),
   jobnoteupdated: () => i18n.t("audit_trail.messages.jobnoteupdated"),
@@ -72,7 +76,11 @@ const AuditTrailMapping = {
     i18n.t("audit_trail.messages.tasks_uncompleted", {
       title,
       uncompletedBy
-    })
+    }),
+  timeticketcreated: (employee, date, details) =>
+    i18n.t("audit_trail.messages.timeticketcreated", { employee, date, details }),
+  timeticketupdated: (employee, date, details) =>
+    i18n.t("audit_trail.messages.timeticketupdated", { employee, date, details })
 };
 
 export default AuditTrailMapping;

client/src/utils/auditTrailDetails.js

@@ -0,0 +1,186 @@
+import dayjs from "./day";
+
+const EMPTY_VALUE = "<<empty>>";
+const NO_CHANGES = "No changes";
+
+const BILL_LINE_KEYS = ["line_desc", "quantity", "actual_price", "actual_cost", "cost_center"];
+const JOB_LINE_SKIP_KEYS = new Set(["ah_detail_line", "prt_dsmk_p"]);
+const DATE_ONLY_KEYS = new Set(["date"]);
+const DATE_TIME_KEYS = new Set(["clockon", "clockoff"]);
+const CURRENCY_KEYS = new Set(["actual_price", "actual_cost", "act_price", "db_price", "rate"]);
+const HOUR_KEYS = new Set(["productivehrs", "actualhrs", "mod_lb_hrs"]);
+
+const isBlank = (value) => value == null || value === "";
+
+const isStructuredValue = (value) => value != null && typeof value === "object" && !dayjs.isDayjs?.(value);
+
+const formatDate = (value) => (isBlank(value) ? EMPTY_VALUE : dayjs(value).format("YYYY-MM-DD"));
+
+const formatDateTime = (value) => (isBlank(value) ? EMPTY_VALUE : dayjs(value).format("YYYY-MM-DD HH:mm"));
+
+const formatNumber = (value, fractionDigits) =>
+  typeof value === "number" ? value.toFixed(fractionDigits) : String(value);
+
+const compareValue = (key, value) => {
+  if (isBlank(value)) return EMPTY_VALUE;
+  if (DATE_TIME_KEYS.has(key)) return formatDateTime(value);
+  if (DATE_ONLY_KEYS.has(key)) return formatDate(value);
+  if (dayjs.isDayjs?.(value)) return formatDateTime(value);
+  return String(value);
+};
+
+const buildFieldChangeDetails = ({ keys, original = {}, updated = {}, displayValue, skippedKeys = new Set() }) =>
+  keys
+    .filter((key) => key !== "__typename" && !skippedKeys.has(key))
+    .filter((key) => !isStructuredValue(original[key]) && !isStructuredValue(updated[key]))
+    .map((key) => {
+      if (compareValue(key, original[key]) === compareValue(key, updated[key])) return null;
+      return `${key}: ${displayValue(key, original[key])} -> ${displayValue(key, updated[key])}`;
+    })
+    .filter(Boolean);
+
+const formatBillValue = (key, value) => {
+  if (isBlank(value)) return EMPTY_VALUE;
+  if (DATE_ONLY_KEYS.has(key)) return formatDate(value);
+  if (CURRENCY_KEYS.has(key)) return typeof value === "number" ? `$${value.toFixed(2)}` : String(value);
+  return String(value);
+};
+
+const formatJobLineValue = (key, value) => {
+  if (isBlank(value)) return EMPTY_VALUE;
+  if (CURRENCY_KEYS.has(key)) return typeof value === "number" ? `$${value.toFixed(2)}` : String(value);
+  if (HOUR_KEYS.has(key)) return formatNumber(value, 1);
+  return String(value);
+};
+
+const getEmployeeName = (employeeId, employees = [], fallbackEmployee) => {
+  if (
+    (employeeId == null || fallbackEmployee?.id === employeeId) &&
+    (fallbackEmployee?.first_name || fallbackEmployee?.last_name)
+  ) {
+    return [fallbackEmployee.first_name, fallbackEmployee.last_name].filter(Boolean).join(" ");
+  }
+
+  const employee = employees.find(({ id }) => id === employeeId);
+  if (employee) {
+    return [employee.first_name, employee.last_name].filter(Boolean).join(" ");
+  }
+
+  return employeeId ? String(employeeId) : EMPTY_VALUE;
+};
+
+const formatTimeTicketValue = (key, value, { employees = [], fallbackEmployee } = {}) => {
+  if (isBlank(value)) return EMPTY_VALUE;
+  if (key === "employeeid") return getEmployeeName(value, employees, fallbackEmployee);
+  if (DATE_TIME_KEYS.has(key)) return formatDateTime(value);
+  if (DATE_ONLY_KEYS.has(key)) return formatDate(value);
+  if (CURRENCY_KEYS.has(key)) return typeof value === "number" ? `$${value.toFixed(2)}` : String(value);
+  if (HOUR_KEYS.has(key)) return formatNumber(value, 1);
+  if (typeof value === "boolean") return value ? "true" : "false";
+  return String(value);
+};
+
+const buildBillLineSummary = (line) =>
+  BILL_LINE_KEYS.map((key) => `${key}: ${formatBillValue(key, line[key])}`).join(", ");
+
+export function buildBillUpdateAuditDetails({ originalBill = {}, bill = {}, billlines = [] }) {
+  const updatedBill = { ...bill, billlines };
+  const billKeys = Array.from(new Set([...Object.keys(originalBill), ...Object.keys(updatedBill)])).filter(
+    (key) => key !== "billlines"
+  );
+
+  const changed = buildFieldChangeDetails({
+    keys: billKeys,
+    original: originalBill,
+    updated: updatedBill,
+    displayValue: formatBillValue
+  });
+
+  const originalBillLines = originalBill.billlines ?? [];
+  const updatedBillLines = updatedBill.billlines ?? [];
+
+  const addedLines = updatedBillLines
+    .filter((line) => !line.id)
+    .map((line) => `+${line.line_desc || line.description || "new line"} (${buildBillLineSummary(line)})`);
+
+  const removedLines = originalBillLines
+    .filter((line) => !updatedBillLines.some((updatedLine) => updatedLine.id === line.id))
+    .map(
+      (line) => `-${line.line_desc || line.description || line.id || "removed line"} (${buildBillLineSummary(line)})`
+    );
+
+  const modifiedLines = updatedBillLines
+    .filter((line) => line.id)
+    .flatMap((line) => {
+      const originalLine = originalBillLines.find(({ id }) => id === line.id);
+      if (!originalLine) return [];
+
+      const lineChanges = buildFieldChangeDetails({
+        keys: BILL_LINE_KEYS,
+        original: originalLine,
+        updated: line,
+        displayValue: formatBillValue
+      });
+
+      if (!lineChanges.length) return [];
+
+      return [`${line.line_desc || line.description || line.id}: ${lineChanges.join("; ")}`];
+    });
+
+  if (addedLines.length) changed.push(`billlines added: ${addedLines.join(" | ")}`);
+  if (removedLines.length) changed.push(`billlines removed: ${removedLines.join(" | ")}`);
+  if (modifiedLines.length) changed.push(`billlines modified: ${modifiedLines.join(" | ")}`);
+
+  return changed.length ? changed.join("; ") : NO_CHANGES;
+}
+
+export function buildJobLineInsertAuditDetails(values = {}) {
+  const details = Object.entries(values)
+    .filter(([key, value]) => !JOB_LINE_SKIP_KEYS.has(key) && !isBlank(value))
+    .map(([key, value]) => `${key}: ${formatJobLineValue(key, value)}`);
+
+  return details.length ? details.join("; ") : NO_CHANGES;
+}
+
+export function buildJobLineUpdateAuditDetails({ originalLine = {}, values = {} }) {
+  const details = buildFieldChangeDetails({
+    keys: Object.keys(values),
+    original: originalLine,
+    updated: values,
+    displayValue: formatJobLineValue,
+    skippedKeys: JOB_LINE_SKIP_KEYS
+  });
+
+  return details.length ? details.join("; ") : NO_CHANGES;
+}
+
+export function buildTimeTicketAuditSummary({ originalTicket = {}, submittedValues = {}, employees = [] }) {
+  const normalizedOriginal = {
+    ...originalTicket,
+    jobid: originalTicket.job?.id ?? originalTicket.jobid ?? null
+  };
+
+  const details = buildFieldChangeDetails({
+    keys: Object.keys(submittedValues),
+    original: normalizedOriginal,
+    updated: submittedValues,
+    displayValue: (key, value) =>
+      formatTimeTicketValue(key, value, {
+        employees,
+        fallbackEmployee: key === "employeeid" ? normalizedOriginal.employee : null
+      })
+  });
+
+  const employeeName = getEmployeeName(
+    submittedValues.employeeid ?? normalizedOriginal.employeeid,
+    employees,
+    normalizedOriginal.employee
+  );
+
+  return {
+    date: formatDate(submittedValues.date ?? normalizedOriginal.date),
+    details: details.length ? details.join("; ") : NO_CHANGES,
+    employeeName,
+    jobid: submittedValues.jobid ?? normalizedOriginal.jobid ?? null
+  };
+}

server/rr/rr-calculate-allocations.js

@@ -46,11 +46,6 @@ const summarizeAllocationsArray = (arr) =>
     cost: summarizeMoney(a.cost)
   }));
 
-const toFiniteNumber = (value) => {
-  const parsed = Number.parseFloat(value);
-  return Number.isFinite(parsed) ? parsed : 0;
-};
-
 /**
  * Internal per-center bucket shape for *sales*.
  * We keep separate buckets for RR so we can split
@@ -67,8 +62,6 @@ function emptyCenterBucket() {
     // Labor
     laborTaxableSale: zero, // labor that should be taxed in RR
     laborNonTaxableSale: zero, // labor that should NOT be taxed in RR
-    laborTaxableHours: 0,
-    laborNonTaxableHours: 0,
 
     // Extras (MAPA/MASH/towing/PAO/etc)
     extrasSale: zero, // total extras (taxable + non-taxable)
@@ -460,7 +453,6 @@ function buildProfitCenterHash(job, debugLog, taxContext) {
 
       const rateKey = `rate_${val.mod_lbr_ty.toLowerCase()}`;
       const rate = job[rateKey];
-      const lineHours = toFiniteNumber(val.mod_lb_hrs);
 
       const laborAmount = Dinero({
         amount: Math.round(rate * 100)
@@ -468,10 +460,8 @@ function buildProfitCenterHash(job, debugLog, taxContext) {
 
       if (isLaborTaxable(val, taxContext)) {
         bucket.laborTaxableSale = bucket.laborTaxableSale.add(laborAmount);
-        bucket.laborTaxableHours += lineHours;
       } else {
         bucket.laborNonTaxableSale = bucket.laborNonTaxableSale.add(laborAmount);
-        bucket.laborNonTaxableHours += lineHours;
       }
     }
 
@@ -488,8 +478,6 @@ function buildProfitCenterHash(job, debugLog, taxContext) {
       partsNonTaxable: summarizeMoney(b.partsNonTaxableSale),
       laborTaxable: summarizeMoney(b.laborTaxableSale),
       laborNonTaxable: summarizeMoney(b.laborNonTaxableSale),
-      laborTaxableHours: b.laborTaxableHours,
-      laborNonTaxableHours: b.laborNonTaxableHours,
       extras: summarizeMoney(b.extrasSale),
       extrasTaxable: summarizeMoney(b.extrasTaxableSale),
       extrasNonTaxable: summarizeMoney(b.extrasNonTaxableSale)
@@ -928,8 +916,6 @@ function buildJobAllocations(bodyshop, profitCenterHash, costCenterHash, debugLo
       // Labor
       laborTaxableSale: bucket.laborTaxableSale,
       laborNonTaxableSale: bucket.laborNonTaxableSale,
-      laborTaxableHours: bucket.laborTaxableHours,
-      laborNonTaxableHours: bucket.laborNonTaxableHours,
 
       // Extras
       extrasSale,

server/rr/rr-job-export.js

@@ -1,4 +1,4 @@
-const { buildRRRepairOrderPayload, buildMinimalRolaborFromJob } = require("./rr-job-helpers");
+const { buildRRRepairOrderPayload } = require("./rr-job-helpers");
 const { buildClientAndOpts } = require("./rr-lookup");
 const CreateRRLogEvent = require("./rr-logger-event");
 const { withRRRequestXml } = require("./rr-log-xml");
@@ -56,27 +56,6 @@ const deriveRRStatus = (rrRes = {}) => {
   };
 };
 
-const resolveRROpCode = (bodyshop, txEnvelope = {}) => {
-  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
-  let opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
-
-  if (!opCodeOverride) {
-    const opPrefix = txEnvelope?.opPrefix ?? txEnvelope?.op_prefix ?? null;
-    const opBase = txEnvelope?.opBase ?? txEnvelope?.op_base ?? null;
-    const opSuffix = txEnvelope?.opSuffix ?? txEnvelope?.op_suffix ?? null;
-
-    if (opPrefix || opBase || opSuffix) {
-      const combined = `${opPrefix || ""}${opBase || ""}${opSuffix || ""}`.trim();
-      if (combined) {
-        opCodeOverride = combined;
-      }
-    }
-  }
-
-  if (!opCodeOverride && !resolvedBaseOpCode) return null;
-  return String(opCodeOverride || resolvedBaseOpCode).trim() || null;
-};
-
 /**
  * Early RO Creation: Create a minimal RR Repair Order with basic info (customer, advisor, mileage, story).
  * Used when creating RO from convert button or admin page before full job export.
@@ -114,9 +93,7 @@ const createMinimalRRRepairOrder = async (args) => {
   const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
   const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
 
-  // Build minimal RO payload for early review mode.
-  // We keep it lightweight, but include a single labor row when we can so Ignite
-  // exposes the labor subsection for editing.
+  // Build minimal RO payload - just header, no allocations/parts/labor
   const cleanVin =
     (job?.v_vin || "")
       .toString()
@@ -139,12 +116,6 @@ const createMinimalRRRepairOrder = async (args) => {
     resolvedMileageIn: mileageIn
   });
 
-  const earlyRoOpCode = resolveRROpCode(bodyshop, txEnvelope);
-  const earlyRoLabor = buildMinimalRolaborFromJob(job, {
-    opCode: earlyRoOpCode,
-    payType: "Cust"
-  });
-
   const payload = {
     customerNo: String(selected),
     advisorNo: String(advisorNo),
@@ -170,14 +141,9 @@ const createMinimalRRRepairOrder = async (args) => {
   if (makeOverride) {
     payload.makeOverride = makeOverride;
   }
-  if (earlyRoLabor) {
-    payload.rolabor = earlyRoLabor;
-  }
 
   CreateRRLogEvent(socket, "INFO", "Creating minimal RR Repair Order (early creation)", {
-    payload,
-    earlyRoOpCode,
-    hasRolabor: !!earlyRoLabor
+    payload
   });
 
   const response = await client.createRepairOrder(payload, finalOpts);
@@ -255,10 +221,15 @@ const updateRRRepairOrderWithFullData = async (args) => {
   const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
   const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
 
+  // Optional RR OpCode segments coming from the FE (RRPostForm)
+  const opPrefix = txEnvelope?.opPrefix ?? txEnvelope?.op_prefix ?? null;
+  const opBase = txEnvelope?.opBase ?? txEnvelope?.op_base ?? null;
+  const opSuffix = txEnvelope?.opSuffix ?? txEnvelope?.op_suffix ?? null;
+
   // RR-only extras
   let rrCentersConfig = null;
   let allocations = null;
-  const opCode = resolveRROpCode(bodyshop, txEnvelope);
+  let opCode = null;
 
   // 1) Responsibility center config (for visibility / debugging)
   try {
@@ -309,9 +280,28 @@ const updateRRRepairOrderWithFullData = async (args) => {
     allocations = [];
   }
 
+  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
+
+  let opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
+
+  // If the FE only sends segments, combine them here.
+  if (!opCodeOverride && (opPrefix || opBase || opSuffix)) {
+    const combined = `${opPrefix || ""}${opBase || ""}${opSuffix || ""}`.trim();
+    if (combined) {
+      opCodeOverride = combined;
+    }
+  }
+
+  if (opCodeOverride || resolvedBaseOpCode) {
+    opCode = String(opCodeOverride || resolvedBaseOpCode).trim() || null;
+  }
+
   CreateRRLogEvent(socket, "SILLY", "RR OP config resolved", {
     opCode,
-    baseFromConfig: resolveRROpCodeFromBodyshop(bodyshop)
+    baseFromConfig: resolvedBaseOpCode,
+    opPrefix,
+    opBase,
+    opSuffix
   });
 
   // Build full RO payload for update with allocations
@@ -436,10 +426,15 @@ const exportJobToRR = async (args) => {
   const story = txEnvelope?.story ? String(txEnvelope.story).trim() : null;
   const makeOverride = txEnvelope?.makeOverride ? String(txEnvelope.makeOverride).trim() : null;
 
+  // Optional RR OpCode segments coming from the FE (RRPostForm)
+  const opPrefix = txEnvelope?.opPrefix ?? txEnvelope?.op_prefix ?? null;
+  const opBase = txEnvelope?.opBase ?? txEnvelope?.op_base ?? null;
+  const opSuffix = txEnvelope?.opSuffix ?? txEnvelope?.op_suffix ?? null;
+
   // RR-only extras
   let rrCentersConfig = null;
   let allocations = null;
-  const opCode = resolveRROpCode(bodyshop, txEnvelope);
+  let opCode = null;
 
   // 1) Responsibility center config (for visibility / debugging)
   try {
@@ -482,9 +477,28 @@ const exportJobToRR = async (args) => {
     allocations = [];
   }
 
+  const resolvedBaseOpCode = resolveRROpCodeFromBodyshop(bodyshop);
+
+  let opCodeOverride = txEnvelope?.opCode || txEnvelope?.opcode || txEnvelope?.op_code || null;
+
+  // If the FE only sends segments, combine them here.
+  if (!opCodeOverride && (opPrefix || opBase || opSuffix)) {
+    const combined = `${opPrefix || ""}${opBase || ""}${opSuffix || ""}`.trim();
+    if (combined) {
+      opCodeOverride = combined;
+    }
+  }
+
+  if (opCodeOverride || resolvedBaseOpCode) {
+    opCode = String(opCodeOverride || resolvedBaseOpCode).trim() || null;
+  }
+
   CreateRRLogEvent(socket, "SILLY", "RR OP config resolved", {
     opCode,
-    baseFromConfig: resolveRROpCodeFromBodyshop(bodyshop)
+    baseFromConfig: resolvedBaseOpCode,
+    opPrefix,
+    opBase,
+    opSuffix
   });
 
   // Build RO payload for create.

server/rr/rr-job-helpers.js

@@ -52,19 +52,6 @@ const asN2 = (dineroLike) => {
   return amount.toFixed(2);
 };
 
-const toFiniteNumber = (value) => {
-  if (typeof value === "number") {
-    return Number.isFinite(value) ? value : 0;
-  }
-
-  if (typeof value === "string") {
-    const parsed = Number.parseFloat(value);
-    return Number.isFinite(parsed) ? parsed : 0;
-  }
-
-  return 0;
-};
-
 /**
  * Normalize various "money-like" shapes to integer cents.
  * Supports:
@@ -113,100 +100,6 @@ const toMoneyCents = (value) => {
 
 const asN2FromCents = (cents) => asN2({ amount: Number.isFinite(cents) ? cents : 0, precision: 2 });
 
-const formatDecimal = (value, maxDecimals = 2) => {
-  const factor = Math.pow(10, maxDecimals);
-  const rounded = Math.round(Math.max(0, toFiniteNumber(value)) * factor) / factor;
-  if (!Number.isFinite(rounded)) return "0";
-  return rounded.toFixed(maxDecimals).replace(/\.?0+$/, "") || "0";
-};
-
-const buildRolaborBillFields = ({ amountUnits = 0, hours = 0, rate = 0 } = {}) => {
-  const normalizedAmount = toFiniteNumber(amountUnits);
-
-  if (normalizedAmount <= 0) {
-    return {
-      jobTotalHrs: "0",
-      billTime: "0",
-      billRate: "0"
-    };
-  }
-
-  let resolvedHours = toFiniteNumber(hours);
-  let resolvedRate = toFiniteNumber(rate);
-
-  if (resolvedHours > 0 && resolvedRate <= 0) {
-    resolvedRate = normalizedAmount / resolvedHours;
-  } else if (resolvedRate > 0 && resolvedHours <= 0) {
-    resolvedHours = normalizedAmount / resolvedRate;
-  } else if (resolvedHours <= 0 && resolvedRate <= 0) {
-    // Keep the math internally consistent even if the source job has dollars but no usable hours.
-    resolvedHours = 1;
-    resolvedRate = normalizedAmount;
-  }
-
-  return {
-    jobTotalHrs: formatDecimal(resolvedHours),
-    billTime: formatDecimal(resolvedHours),
-    billRate: resolvedRate.toFixed(2)
-  };
-};
-
-const buildMinimalRolaborFromJob = (job, { opCode, payType = "Cust" } = {}) => {
-  const trimmedOpCode = opCode != null ? String(opCode).trim() : "";
-  if (!job || !trimmedOpCode) return null;
-
-  let totalHours = 0;
-  let totalAmountUnits = 0;
-
-  for (const line of job?.joblines || []) {
-    const laborType = typeof line?.mod_lbr_ty === "string" ? line.mod_lbr_ty.trim() : "";
-    if (!laborType) continue;
-
-    const lineHours = toFiniteNumber(line?.mod_lb_hrs ?? line?.db_hrs);
-    const configuredRate = toFiniteNumber(job?.[`rate_${laborType.toLowerCase()}`]);
-    let lineAmountUnits = toFiniteNumber(line?.lbr_amt);
-
-    if (lineAmountUnits <= 0 && lineHours > 0 && configuredRate > 0) {
-      lineAmountUnits = lineHours * configuredRate;
-    }
-
-    if (lineAmountUnits <= 0 && lineHours <= 0) continue;
-
-    totalHours += lineHours;
-    totalAmountUnits += lineAmountUnits;
-  }
-
-  if (totalAmountUnits <= 0 && totalHours <= 0) return null;
-
-  const bill = buildRolaborBillFields({
-    amountUnits: totalAmountUnits,
-    hours: totalHours,
-    rate: totalHours > 0 ? totalAmountUnits / totalHours : 0
-  });
-  const formattedAmount = totalAmountUnits.toFixed(2);
-
-  return {
-    ops: [
-      {
-        opCode: trimmedOpCode,
-        jobNo: "1",
-        custPayTypeFlag: "C",
-        custTxblNtxblFlag: toFiniteNumber(job?.tax_lbr_rt) > 0 ? "T" : "N",
-        bill: {
-          payType,
-          ...bill
-        },
-        amount: {
-          payType,
-          amtType: "Job",
-          custPrice: formattedAmount,
-          totalAmt: formattedAmount
-        }
-      }
-    ]
-  };
-};
-
 /**
  * Build RR estimate block from allocation totals.
  * @param {Array} allocations
@@ -433,13 +326,6 @@ const buildRogogFromAllocations = (allocations, { opCode, payType = "Cust", roNo
     // Each segment becomes its own op / JobNo with a single line
     segments.forEach((seg, idx) => {
       const jobNo = String(ops.length + 1); // global, 1-based JobNo across all centers/segments
-      const isLaborSegment = seg.kind === "laborTaxable" || seg.kind === "laborNonTaxable";
-      const segmentHours = isLaborSegment
-        ? seg.kind === "laborTaxable"
-          ? toFiniteNumber(alloc.laborTaxableHours)
-          : toFiniteNumber(alloc.laborNonTaxableHours)
-        : 0;
-      const segmentBillRate = isLaborSegment && segmentHours > 0 ? seg.saleCents / 100 / segmentHours : 0;
 
       const line = {
         breakOut,
@@ -463,9 +349,7 @@ const buildRogogFromAllocations = (allocations, { opCode, payType = "Cust", roNo
         // Extra metadata for UI / debugging
         segmentKind: seg.kind,
         segmentIndex: idx,
-        segmentCount,
-        segmentHours,
-        segmentBillRate
+        segmentCount
       });
     });
   }
@@ -484,9 +368,9 @@ const buildRogogFromAllocations = (allocations, { opCode, payType = "Cust", roNo
  *
  * We still keep a 1:1 mapping with GOG ops: each op gets a corresponding
  * OpCodeLaborInfo entry using the same JobNo and the same tax flag as its
- * GOG line. Labor sale amounts are mirrored into ROLABOR and, when hours
- * are available from allocations, weighted bill hours/rates are also
- * populated so the labor subsection is editable in Ignite.
+ * GOG line. Labor-specific hours/rate remain zeroed out, but actual labor
+ * sale amounts are mirrored into ROLABOR for labor segments so RR receives
+ * the expected labor pricing on updates. Non-labor ops remain zeroed.
  *
  * @param {Object} rogg - result of buildRogogFromAllocations
  * @param {Object} opts
@@ -507,17 +391,6 @@ const buildRolaborFromRogog = (rogg, { payType = "Cust" } = {}) => {
     const linePayType = firstLine.custPayTypeFlag || "C";
     const isLaborSegment = op.segmentKind === "laborTaxable" || op.segmentKind === "laborNonTaxable";
     const laborAmount = isLaborSegment ? String(firstLine?.amount?.custPrice ?? "0") : "0";
-    const laborBill = isLaborSegment
-      ? buildRolaborBillFields({
-          amountUnits: laborAmount,
-          hours: op.segmentHours,
-          rate: op.segmentBillRate
-        })
-      : {
-          jobTotalHrs: "0",
-          billTime: "0",
-          billRate: "0"
-        };
 
     return {
       opCode: op.opCode,
@@ -526,7 +399,9 @@ const buildRolaborFromRogog = (rogg, { payType = "Cust" } = {}) => {
       custTxblNtxblFlag: txFlag,
       bill: {
         payType,
-        ...laborBill
+        jobTotalHrs: "0",
+        billTime: "0",
+        billRate: "0"
       },
       amount: {
         payType,
@@ -811,6 +686,5 @@ module.exports = {
   normalizeCustomerCandidates,
   normalizeVehicleCandidates,
   buildRogogFromAllocations,
-  buildRolaborFromRogog,
-  buildMinimalRolaborFromJob
+  buildRolaborFromRogog
 };

server/rr/rr-job-helpers.test.js

@@ -1,118 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import { createRequire } from "node:module";
-
-const require = createRequire(import.meta.url);
-const mock = require("mock-require");
-
-const graphClientModuleId = require.resolve("../graphql-client/graphql-client");
-const queriesModuleId = require.resolve("../graphql-client/queries");
-const helpersModuleId = require.resolve("./rr-job-helpers");
-
-const loadHelpers = () => {
-  mock.stopAll();
-  mock(graphClientModuleId, { client: { request: async () => ({}) } });
-  mock(queriesModuleId, { GET_JOB_BY_PK: "GET_JOB_BY_PK" });
-  delete require.cache[helpersModuleId];
-  return require(helpersModuleId);
-};
-
-afterEach(() => {
-  mock.stopAll();
-  delete require.cache[helpersModuleId];
-});
-
-describe("server/rr/rr-job-helpers", () => {
-  it("builds a single early-RO labor row from aggregated job labor", () => {
-    const { buildMinimalRolaborFromJob } = loadHelpers();
-
-    const rolabor = buildMinimalRolaborFromJob(
-      {
-        tax_lbr_rt: 13,
-        joblines: [
-          { mod_lbr_ty: "LAB", mod_lb_hrs: 2, lbr_amt: 200 },
-          { mod_lbr_ty: "LAD", mod_lb_hrs: 1.5, lbr_amt: 180 }
-        ]
-      },
-      { opCode: "51DOZ" }
-    );
-
-    expect(rolabor).toEqual({
-      ops: [
-        {
-          opCode: "51DOZ",
-          jobNo: "1",
-          custPayTypeFlag: "C",
-          custTxblNtxblFlag: "T",
-          bill: {
-            payType: "Cust",
-            jobTotalHrs: "3.5",
-            billTime: "3.5",
-            billRate: "108.57"
-          },
-          amount: {
-            payType: "Cust",
-            amtType: "Job",
-            custPrice: "380.00",
-            totalAmt: "380.00"
-          }
-        }
-      ]
-    });
-  });
-
-  it("populates labor bill fields from allocation hours on the full RR payload", () => {
-    const { buildRRRepairOrderPayload } = loadHelpers();
-
-    const payload = buildRRRepairOrderPayload({
-      job: {
-        id: "job-1",
-        ro_number: "RO-123",
-        v_vin: "1HGBH41JXMN109186"
-      },
-      selectedCustomer: { customerNo: "1134485" },
-      advisorNo: "70754",
-      allocations: [
-        {
-          center: "Body Labor",
-          partsSale: { amount: 0, precision: 2 },
-          laborTaxableSale: { amount: 24000, precision: 2 },
-          laborNonTaxableSale: { amount: 0, precision: 2 },
-          extrasSale: { amount: 0, precision: 2 },
-          totalSale: { amount: 24000, precision: 2 },
-          cost: { amount: 12000, precision: 2 },
-          laborTaxableHours: 2,
-          laborNonTaxableHours: 0,
-          profitCenter: {
-            rr_gogcode: "BL",
-            rr_item_type: "G",
-            accountdesc: "BODY LABOR"
-          }
-        }
-      ],
-      opCode: "51DOZ"
-    });
-
-    expect(payload.rolabor).toEqual({
-      ops: [
-        {
-          opCode: "51DOZ",
-          jobNo: "1",
-          custPayTypeFlag: "C",
-          custTxblNtxblFlag: "T",
-          bill: {
-            payType: "Cust",
-            jobTotalHrs: "2",
-            billTime: "2",
-            billRate: "120.00"
-          },
-          amount: {
-            payType: "Cust",
-            amtType: "Job",
-            custPrice: "240.00",
-            totalAmt: "240.00"
-          }
-        }
-      ]
-    });
-  });
-});