Merged in feature/IO-3673-Order-Parts-Receive-Bill-Bug (pull request #3222)

feature/IO-3673-Order-Parts-Receive-Bill-Bug - Fix

Approved-by: Allan Carr

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -176,6 +176,9 @@ export function PartsOrderModalComponent({
                       >
                         <Input />
                       </Form.Item>
+                      <Form.Item key={`${index}job_line_id`} name={[field.name, "job_line_id"]} hidden>
+                        <Input type="hidden" />
+                      </Form.Item>
                       <Form.Item
                         label={t("parts_orders.fields.line_remarks")}
                         key={`${index}line_remarks`}

client/src/components/parts-order-modal/parts-order-modal.container.jsx

@@ -23,6 +23,7 @@ import { useTreatmentsWithConfig } from "@splitsoftware/splitio-react";
 import _ from "lodash";
 import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { buildSubmittedPartsOrderLines, getSubmittedPartsOrderJobLineIds } from "./parts-order-modal.utils.js";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
@@ -82,15 +83,10 @@ export function PartsOrderModalContainer({
 
     // Force job_line_id from context so it never gets dropped by AntD form submission behavior.
     const submittedLines = values?.parts_order_lines?.data ?? [];
-    const forcedLines = submittedLines.map((p, index) => {
-      const originalLine = linesToOrder?.[index];
-      const jobLineId = isReturn ? originalLine?.joblineid : originalLine?.id;
-
-      return {
-        ...p,
-        job_line_id: jobLineId,
-        ...(isReturn && { cm_received: false })
-      };
+    const forcedLines = buildSubmittedPartsOrderLines({
+      submittedLines,
+      linesToOrder,
+      isReturn
     });
 
     let insertResult;
@@ -147,10 +143,7 @@ export function PartsOrderModalContainer({
       type: isReturn ? "jobspartsreturn" : "jobspartsorder"
     });
 
-    // Use linesToOrder from context instead of form values to preserve job line ids
-    const jobLineIds = (linesToOrder ?? [])
-      .filter((line) => (isReturn ? line.joblineid : line.id))
-      .map((line) => (isReturn ? line.joblineid : line.id));
+    const jobLineIds = getSubmittedPartsOrderJobLineIds(forcedLines);
 
     try {
       const jobLinesResult = await updateJobLines({
@@ -206,23 +199,20 @@ export function PartsOrderModalContainer({
             isinhouse: true,
             date: dayjs(),
             total: 0,
-            billlines: forcedLines.map((p, index) => {
-              const originalLine = linesToOrder?.[index];
-              return {
-                joblineid: isReturn ? originalLine?.joblineid : originalLine?.id,
-                actual_price: p.act_price,
-                actual_cost: 0, // p.act_price,
-                line_desc: p.line_desc,
-                line_remarks: p.line_remarks,
-                part_type: p.part_type,
-                quantity: p.quantity || 1,
-                applicable_taxes: {
-                  local: false,
-                  state: false,
-                  federal: false
-                }
-              };
-            })
+            billlines: forcedLines.map((p) => ({
+              joblineid: p.job_line_id,
+              actual_price: p.act_price,
+              actual_cost: 0, // p.act_price,
+              line_desc: p.line_desc,
+              line_remarks: p.line_remarks,
+              part_type: p.part_type,
+              quantity: p.quantity || 1,
+              applicable_taxes: {
+                local: false,
+                state: false,
+                federal: false
+              }
+            }))
           }
         }
       });

client/src/components/parts-order-modal/parts-order-modal.utils.js

@@ -0,0 +1,23 @@
+export const getPartsOrderJobLineId = ({ line, originalLine, isReturn }) => {
+  return line?.job_line_id || (isReturn ? originalLine?.joblineid : originalLine?.id);
+};
+
+export const buildSubmittedPartsOrderLines = ({ submittedLines = [], linesToOrder = [], isReturn }) => {
+  return submittedLines.map((line, index) => {
+    const jobLineId = getPartsOrderJobLineId({
+      line,
+      originalLine: linesToOrder?.[index],
+      isReturn
+    });
+
+    return {
+      ...line,
+      job_line_id: jobLineId,
+      ...(isReturn && { cm_received: false })
+    };
+  });
+};
+
+export const getSubmittedPartsOrderJobLineIds = (partsOrderLines = []) => {
+  return partsOrderLines.map((line) => line.job_line_id).filter(Boolean);
+};

client/src/components/parts-order-modal/parts-order-modal.utils.test.js

@@ -0,0 +1,32 @@
+import { describe, expect, it } from "vitest";
+import { buildSubmittedPartsOrderLines, getSubmittedPartsOrderJobLineIds } from "./parts-order-modal.utils.js";
+
+describe("parts order modal utilities", () => {
+  it("preserves submitted job line ids after a row is removed", () => {
+    const submittedLines = [
+      { line_desc: "second line", job_line_id: "job-line-2" },
+      { line_desc: "third line", job_line_id: "job-line-3" }
+    ];
+    const linesToOrder = [{ id: "job-line-1" }, { id: "job-line-2" }, { id: "job-line-3" }];
+
+    const result = buildSubmittedPartsOrderLines({ submittedLines, linesToOrder, isReturn: false });
+
+    expect(result.map((line) => line.job_line_id)).toEqual(["job-line-2", "job-line-3"]);
+    expect(getSubmittedPartsOrderJobLineIds(result)).toEqual(["job-line-2", "job-line-3"]);
+  });
+
+  it("falls back to original return line ids when the form omits hidden metadata", () => {
+    const submittedLines = [{ line_desc: "return line" }];
+    const linesToOrder = [{ joblineid: "return-job-line-1" }];
+
+    const result = buildSubmittedPartsOrderLines({ submittedLines, linesToOrder, isReturn: true });
+
+    expect(result).toEqual([
+      {
+        line_desc: "return line",
+        job_line_id: "return-job-line-1",
+        cm_received: false
+      }
+    ]);
+  });
+});