From 23a9b3605f338962d040e251fac631669fb0565b Mon Sep 17 00:00:00 2001 From: Patrick Fic <> Date: Mon, 10 May 2021 13:44:08 -0700 Subject: [PATCH] IO-1023 receive parts modal updates. --- .../parts-order-list-table.component.jsx | 1 + .../parts-receive-modal.component.jsx | 16 ++++++++- .../parts-receive-modal.container.jsx | 21 +++++++---- client/src/graphql/jobs-lines.queries.js | 36 +++++++++++++++++++ 4 files changed, 67 insertions(+), 7 deletions(-) diff --git a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx index 40253afe6..9ae6695e5 100644 --- a/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx +++ b/client/src/components/parts-order-list-table/parts-order-list-table.component.jsx @@ -101,6 +101,7 @@ export function PartsOrderListTableComponent({ partsorderlines: record.parts_order_lines.map((pol) => { return { joblineid: pol.job_line_id, + id: pol.id, line_desc: pol.line_desc, quantity: pol.quantity, }; diff --git a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx index 5f7a851dc..92aaffd56 100644 --- a/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx +++ b/client/src/components/parts-receive-modal/parts-receive-modal.component.jsx @@ -1,5 +1,5 @@ import { DeleteFilled } from "@ant-design/icons"; -import { Form, Input, Select, Typography } from "antd"; +import { Form, Input, InputNumber, Select, Typography } from "antd"; import React from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -58,6 +58,13 @@ export function PartsReceiveModalComponent({ bodyshop, form }) { > + + + + + + ({ @@ -25,27 +28,27 @@ const mapDispatchToProps = (dispatch) => ({ }); export function PartsReceiveModalContainer({ - partsOrderModal, + partsReceiveModal, toggleModalVisible, currentUser, bodyshop, }) { const { t } = useTranslation(); - const { visible, context, actions } = partsOrderModal; + const { visible, context, actions } = partsReceiveModal; const { partsorderlines } = context; const { refetch } = actions; const [form] = Form.useForm(); - const [updateJobLines] = useMutation(UPDATE_JOB_LINE); + const [receivePartsLine] = useMutation(RECEIVE_PARTS_LINE); const handleFinish = async (values) => { logImEXEvent("parts_order_receive"); const result = await Promise.all( values.partsorderlines.map((li) => { - return updateJobLines({ + return receivePartsLine({ variables: { lineId: li.joblineid, line: { @@ -53,6 +56,11 @@ export function PartsReceiveModalContainer({ status: bodyshop.md_order_statuses.default_received || "Received*", }, + orderLineId: li.id, + orderLine: { + status: + bodyshop.md_order_statuses.default_received || "Received*", + }, }, }); }) @@ -93,6 +101,7 @@ export function PartsReceiveModalContainer({ onOk={() => form.submit()} destroyOnClose forceRender + width="50%" >