Merge branch 'feature/IO-2278-parts-dispatching' into feature/payroll

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

@@ -45,6 +45,7 @@ import JobSendPartPriceChangeComponent from "../job-send-parts-price-change/job-
 import PartsOrderModalContainer from "../parts-order-modal/parts-order-modal.container";
 import JobLinesExpander from "./job-lines-expander.component";
 import JobLinesPartPriceChange from "./job-lines-part-price-change.component";
+import JobLineDispatchButton from "../job-line-dispatch-button/job-line-dispatch-button.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
@@ -106,7 +107,9 @@ export function JobLinesComponent({
       onCell: (record) => ({
         className: record.manual_line && "job-line-manual",
         style: {
-          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
+          ...(record.critical || true
+            ? { boxShadow: " -.5em 0 0 #FFC107" }
+            : {}),
         },
       }),
       sortOrder:
@@ -121,10 +124,21 @@ export function JobLinesComponent({
       sortOrder:
         state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
       ellipsis: true,
-      render: (text, record) =>
-        `${record.oem_partno || ""} ${
-          record.alt_partno ? `(${record.alt_partno})` : ""
-        }`.trim(),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.parts_dispatch_lines[0]?.accepted_at || true
+            ? { boxShadow: " -.5em 0 0 #FFC107" }
+            : {}),
+        },
+      }),
+      render: (text, record) => (
+        <span class="ant-table-cell-content">
+          {`${record.oem_partno || ""} ${
+            record.alt_partno ? `(${record.alt_partno})` : ""
+          }`.trim()}
+        </span>
+      ),
     },
     {
       title: t("joblines.fields.op_code_desc"),
@@ -427,6 +441,11 @@ export function JobLinesComponent({
                 </Space>
               </Tag>
             )}
+            <JobLineDispatchButton
+              selectedLines={selectedLines}
+              setSelectedLines={setSelectedLines}
+              job={job}
+            />
             <Button
               disabled={
                 (job && !job.converted) ||