From 8bcc903f2b63ec5459dd48ef2be05f9c6e79be7f Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 31 Aug 2022 13:37:01 -0700 Subject: [PATCH] IO-1325 Automatically populate 3rd party modal. --- .../job-3rd-party-modal/job-3rd-party-modal.component.jsx | 8 +++++++- .../print-center-jobs/print-center-jobs.component.jsx | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx index faf43b492..622d7bf7e 100644 --- a/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx +++ b/client/src/components/job-3rd-party-modal/job-3rd-party-modal.component.jsx @@ -19,7 +19,7 @@ const mapDispatchToProps = (dispatch) => ({ }); export default connect(mapStateToProps, mapDispatchToProps)(Jobd3RdPartyModal); -export function Jobd3RdPartyModal({ bodyshop, jobId }) { +export function Jobd3RdPartyModal({ bodyshop, jobId, job }) { const [isModalVisible, setIsModalVisible] = useState(false); const { t } = useTranslation(); const [form] = Form.useForm(); @@ -33,6 +33,11 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) { ); const showModal = () => { + form.setFieldsValue({ + ded_amt: job.ded_amt, + deprecieation: job.depreciation_taxes, + cust_gst: job.cust_gst, + }); setIsModalVisible(true); }; @@ -42,6 +47,7 @@ export function Jobd3RdPartyModal({ bodyshop, jobId }) { }; const handleCancel = () => { + form.resetFields(); setIsModalVisible(false); }; const handleFinish = (values) => { diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx index bd21a6e25..6af0bb7ac 100644 --- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx +++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx @@ -20,7 +20,7 @@ const mapDispatchToProps = (dispatch) => ({}); export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) { const [search, setSearch] = useState(""); - const { id: jobId } = printCenterModal.context; + const { id: jobId, job } = printCenterModal.context; const tempList = TemplateList("job", {}); const { t } = useTranslation(); const JobsReportsList = Object.keys(tempList) @@ -54,7 +54,7 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) { extra={ - + setSearch(e.target.value)} value={search}