feature/IO-3638-Reynolds-OpenSearch - Add Search on DMS id in Reynolds shops

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." }}

os-loader.js

@@ -32,6 +32,7 @@ async function OpenSearchUpdateHandler(req, res) {
           clm_no
           clm_total
           comment
+          dms_id
           ins_co_nm
           owner_owing
           ownr_co_nm

server/graphql-client/queries.js

@@ -2442,6 +2442,9 @@ exports.ACTIVE_SHOP_BY_USER = `query ACTIVE_SHOP_BY_USER($user: String) {
   associations(where: {active: {_eq: true}, useremail: {_eq: $user}}) {
     id
     shopid
+    bodyshop {
+      rr_dealerid
+    }
   }
 }`;
 

server/opensearch/os-handler.js

@@ -4,6 +4,7 @@ const queries = require("../graphql-client/queries");
 const client = require("../graphql-client/graphql-client").client;
 const { pick, isNil } = require("lodash");
 const { getClient } = require("../../libs/awsUtils");
+const { JOB_DOCUMENT_FIELDS, getGlobalSearchQueryStringFields } = require("./os-search-config");
 
 async function OpenSearchUpdateHandler(req, res) {
   try {
@@ -21,27 +22,7 @@ async function OpenSearchUpdateHandler(req, res) {
 
       switch (req.body.table.name) {
         case "jobs":
-          document = pick(req.body.event.data.new, [
-            "id",
-            "bodyshopid",
-            "clm_no",
-            "clm_total",
-            "comment",
-            "ins_co_nm",
-            "owner_owing",
-            "ownr_co_nm",
-            "ownr_fn",
-            "ownr_ln",
-            "ownr_ph1",
-            "ownr_ph2",
-            "plate_no",
-            "ro_number",
-            "status",
-            "v_model_yr",
-            "v_make_desc",
-            "v_model_desc",
-            "v_vin"
-          ]);
+          document = pick(req.body.event.data.new, JOB_DOCUMENT_FIELDS);
           document.bodyshopid = req.body.event.data.new.shopid;
           break;
         case "vehicles":
@@ -197,15 +178,18 @@ async function OpenSearchSearchHandler(req, res) {
       user: req.user.email
     });
 
-    if (assocs.length === 0) {
+    if (assocs.associations.length === 0) {
       res.sendStatus(401);
+      return;
     }
 
     const osClient = await getClient();
 
+    const activeAssociation = assocs.associations[0];
     const bodyShopIdMatchOverride = isNil(process.env.BODY_SHOP_ID_MATCH_OVERRIDE)
-      ? assocs.associations[0].shopid
+      ? activeAssociation.shopid
       : process.env.BODY_SHOP_ID_MATCH_OVERRIDE;
+    const isReynoldsEnabled = Boolean(activeAssociation.bodyshop?.rr_dealerid);
 
     const { body } = await osClient.search({
       ...(index ? { index } : { index: ["jobs", "vehicles", "owners", "bills", "payments"] }),
@@ -241,21 +225,8 @@ async function OpenSearchSearchHandler(req, res) {
                         query: `*${search}*`,
                         // Weighted Fields
                         fields: [
-                          "*ro_number^20",
-                          "*clm_no^14",
-                          "*v_vin^12",
-                          "*plate_no^12",
-                          "*ownr_ln^10",
-                          "transactionid^10",
-                          "paymentnum^10",
-                          "invoice_number^10",
-                          "*ownr_fn^8",
-                          "*ownr_co_nm^8",
-                          "*ownr_ph1^8",
-                          "*ownr_ph2^8",
-                          "*vendor.name^8",
-                          "*comment^6"
-                          //  "*"
+                          ...getGlobalSearchQueryStringFields({ isReynoldsEnabled })
+                          // "*"
                         ]
                       }
                     }

server/opensearch/os-search-config.js

@@ -0,0 +1,69 @@
+/**
+ * Fields to be included in the job document indexed in OpenSearch. These fields are used for both indexing and
+ * searching.
+ * @type {string[]}
+ */
+const JOB_DOCUMENT_FIELDS = [
+  "id",
+  "bodyshopid",
+  "clm_no",
+  "clm_total",
+  "comment",
+  "dms_id",
+  "ins_co_nm",
+  "owner_owing",
+  "ownr_co_nm",
+  "ownr_fn",
+  "ownr_ln",
+  "ownr_ph1",
+  "ownr_ph2",
+  "plate_no",
+  "ro_number",
+  "status",
+  "v_model_yr",
+  "v_make_desc",
+  "v_model_desc",
+  "v_vin"
+];
+
+/**
+ * Fields to be included in the global search query string. These fields are used for constructing the search query.
+ * @type {string[]}
+ */
+const BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS = [
+  "*ro_number^20",
+  "*clm_no^14",
+  "*v_vin^12",
+  "*plate_no^12",
+  "*ownr_ln^10",
+  "transactionid^10",
+  "paymentnum^10",
+  "invoice_number^10",
+  "*ownr_fn^8",
+  "*ownr_co_nm^8",
+  "*ownr_ph1^8",
+  "*ownr_ph2^8",
+  "*vendor.name^8",
+  "*comment^6"
+];
+
+/**
+ * Returns the fields to be included in the global search query string. If Reynolds is enabled, it includes the dms_id
+ * field with a higher boost.
+ * @param param0
+ * @param param0.isReynoldsEnabled
+ * @returns {string[]}
+ */
+const getGlobalSearchQueryStringFields = ({ isReynoldsEnabled = false } = {}) => {
+  if (!isReynoldsEnabled) {
+    return BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS;
+  }
+
+  return ["*dms_id^20", ...BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS];
+};
+
+module.exports = {
+  JOB_DOCUMENT_FIELDS,
+  BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS,
+  getGlobalSearchQueryStringFields
+};

server/opensearch/tests/os-search-config.test.js

@@ -0,0 +1,21 @@
+import { describe, expect, it } from "vitest";
+import { createRequire } from "module";
+
+const require = createRequire(import.meta.url);
+const { JOB_DOCUMENT_FIELDS, BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS, getGlobalSearchQueryStringFields } = require(
+  "../os-search-config"
+);
+
+describe("os-search-config", () => {
+  it("indexes dms_id on job documents", () => {
+    expect(JOB_DOCUMENT_FIELDS).toContain("dms_id");
+  });
+
+  it("includes dms_id in global search fields for Reynolds shops", () => {
+    expect(getGlobalSearchQueryStringFields({ isReynoldsEnabled: true })).toContain("*dms_id^20");
+  });
+
+  it("keeps the default search fields unchanged for non-Reynolds shops", () => {
+    expect(getGlobalSearchQueryStringFields()).toEqual(BASE_GLOBAL_SEARCH_QUERY_STRING_FIELDS);
+  });
+});

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"
-          }
-        }
-      ]
-    });
-  });
-});