Started refactoring parts order reconciliation BOD-406

This commit is contained in:
Patrick Fic
2020-10-01 09:21:22 -07:00
parent c68835153f
commit 88951da11d
7 changed files with 117 additions and 98 deletions

View File

@@ -2,6 +2,7 @@ import { Col, Row } from "antd";
import React, { useState } from "react";
import JobReconciliationBillsTable from "../job-reconciliation-bills-table/job-reconciliation-bills-table.component";
import JobReconciliationPartsTable from "../job-reconciliation-parts-table/job-reconciliation-parts-table.component";
import JobReconciliationTotals from "../job-reconciliation-totals/job-reconciliation-totals.component";
export default function JobReconciliationModalComponent({ job, bills }) {
const jobLineState = useState([]);
@@ -11,16 +12,18 @@ export default function JobReconciliationModalComponent({ job, bills }) {
bills
.map((i) =>
i.billlines.map((il) => {
return { ...il, is_credit_memo: i.is_credit_memo };
return { ...il, bill: i };
})
)
.flat() || [];
const jobLineData = job.joblines.filter((j) => j.part_type !== null);
const jobLineData = job.joblines.filter(
(j) => j.part_type !== null && j.part_type !== "PAE"
);
return (
<div>
<Row>
<Row gutter={[16, 16]}>
<Col span={12}>
<JobReconciliationPartsTable
jobLineData={jobLineData}
@@ -34,6 +37,14 @@ export default function JobReconciliationModalComponent({ job, bills }) {
/>
</Col>
</Row>
<Row>
<JobReconciliationTotals
jobLines={jobLineData}
selectedJobLines={jobLineState[0]}
billLines={invoiceLineData}
selectedBillLines={billLineState[0]}
/>
</Row>
</div>
);
}

View File

@@ -31,9 +31,10 @@ function JobReconciliationModalContainer({
title={t("jobs.labels.reconciliationheader")}
width={"90%"}
visible={visible}
okText={t("general.actions.save")}
okText={t("general.actions.close")}
onOk={handleCancel}
onCancel={handleCancel}
cancelButtonProps={{ display: "none" }}
destroyOnClose
>
<JobReconciliationModalComponent job={job} bills={bills} />