From 8590767e336b55c1ade038cc6592c9d00078a2d8 Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Tue, 4 Aug 2020 15:16:51 -0700 Subject: [PATCH] Added automatic parts order receiving BOD-218 --- .../invoice-enter-modal.container.jsx | 3 +- .../invoice-form.lines.component.jsx | 2 +- .../jobs-detail-pli.component.jsx | 2 +- .../parts-order-list-table.component.jsx | 61 ++++++++++++++++++- client/src/graphql/invoices.queries.js | 4 ++ 5 files changed, 66 insertions(+), 6 deletions(-) diff --git a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx index 40c1a1e4e..b90dc0eae 100644 --- a/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx +++ b/client/src/components/invoice-enter-modal/invoice-enter-modal.container.jsx @@ -101,6 +101,7 @@ function InvoiceEnterModalContainer({ if (enterAgain) { form.resetFields(); + form.setFieldsValue({ invoicelines: [] }); } else { toggleModalVisible(); } @@ -162,7 +163,6 @@ function InvoiceEnterModalContainer({ form={form} onFinishFailed={() => { setEnterAgain(false); - console.log("Finish failed"); }} initialValues={{ jobid: @@ -172,6 +172,7 @@ function InvoiceEnterModalContainer({ federal_tax_rate: bodyshop.invoice_tax_rates.federal_tax_rate || 0, state_tax_rate: bodyshop.invoice_tax_rates.state_tax_rate || 0, local_tax_rate: bodyshop.invoice_tax_rates.local_tax_rate || 0, + ...invoiceEnterModal.context.invoice, }} > diff --git a/client/src/components/invoice-form/invoice-form.lines.component.jsx b/client/src/components/invoice-form/invoice-form.lines.component.jsx index 3fe86b0f5..ba9e906d0 100644 --- a/client/src/components/invoice-form/invoice-form.lines.component.jsx +++ b/client/src/components/invoice-form/invoice-form.lines.component.jsx @@ -41,7 +41,6 @@ export default function InvoiceEnterModalLinesComponent({ "invoicelines", ]).invoicelines.map((item, idx) => { if (idx === index) { - console.log("opt", opt); return { ...item, line_desc: opt.line_desc, @@ -60,6 +59,7 @@ export default function InvoiceEnterModalLinesComponent({ }} /> + ({}); +const mapStateToProps = createStructuredSelector({ + //currentUser: selectCurrentUser + bodyshop: selectBodyshop, +}); + +const mapDispatchToProps = (dispatch) => ({ + setInvoiceEnterContext: (context) => + dispatch(setModalContext({ context: context, modal: "invoiceEnter" })), +}); export function PartsOrderListTableComponent({ + setInvoiceEnterContext, + bodyshop, job, loading, invoicesQuery, - handleOnRowClick, }) { + const responsibilityCenters = bodyshop.md_responsibility_centers; + const { t } = useTranslation(); const [state, setState] = useState({ sortedInfo: {}, @@ -71,6 +86,43 @@ export function PartsOrderListTableComponent({ {record.deliver_by} ), }, + { + title: t("general.labels.actions"), + dataIndex: "actions", + key: "actions", + render: (text, record) => ( + + ), + }, ]; const handleTableChange = (pagination, filters, sorter) => { @@ -229,4 +281,7 @@ export function PartsOrderListTableComponent({ ); } -export default connect(null, mapDispatchToProps)(PartsOrderListTableComponent); +export default connect( + mapStateToProps, + mapDispatchToProps +)(PartsOrderListTableComponent); diff --git a/client/src/graphql/invoices.queries.js b/client/src/graphql/invoices.queries.js index 090c01cfd..c0fe506fa 100644 --- a/client/src/graphql/invoices.queries.js +++ b/client/src/graphql/invoices.queries.js @@ -79,6 +79,10 @@ export const QUERY_INVOICES_BY_JOBID = gql` line_remarks quantity job_line_id + jobline { + id + part_type + } backordered_eta backordered_on }