From 7536c28591b451026c1a4be3297798358f7b4baa Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Wed, 16 Dec 2020 17:25:01 +0200 Subject: [PATCH] feat: estimate status. --- .../Sales/Estimate/EstimateFloatingActions.js | 38 ++--- .../containers/Sales/Estimate/EstimateForm.js | 6 +- .../Sales/Estimate/EstimateForm.schema.js | 1 + .../containers/Sales/Estimate/EstimateList.js | 130 +++++++++++++++++- .../Sales/Estimate/EstimatesDataTable.js | 57 +++++++- .../containers/Sales/Estimate/components.js | 31 +++++ .../Sales/Estimate/withEstimateActions.js | 6 + .../Sales/Invoice/InvoiceFloatingActions.js | 12 +- client/src/lang/en/index.js | 21 +++ .../src/store/Estimate/estimates.actions.js | 14 +- 10 files changed, 282 insertions(+), 34 deletions(-) create mode 100644 client/src/containers/Sales/Estimate/components.js diff --git a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js index bb9b4b93a..3864c01fc 100644 --- a/client/src/containers/Sales/Estimate/EstimateFloatingActions.js +++ b/client/src/containers/Sales/Estimate/EstimateFloatingActions.js @@ -25,38 +25,38 @@ export default function EstimateFloatingActions({ onCancelClick, onClearClick, estimateId, - estimatePublished, + isDelivered, }) { const { resetForm, submitForm } = useFormikContext(); - const handleSubmitPublishBtnClick = (event) => { + const handleSubmitDeliverBtnClick = (event) => { saveInvoke(onSubmitClick, event, { redirect: true, - publish: true, + deliver: true, }); }; - const handleSubmitPublishAndNewBtnClick = (event) => { + const handleSubmitDeliverAndNewBtnClick = (event) => { submitForm(); saveInvoke(onSubmitClick, event, { redirect: false, - publish: true, + deliver: true, resetForm: true, }); }; - const handleSubmitPublishContinueEditingBtnClick = (event) => { + const handleSubmitDeliverContinueEditingBtnClick = (event) => { submitForm(); saveInvoke(onSubmitClick, event, { redirect: false, - publish: true, + deliver: true, }); }; const handleSubmitDraftBtnClick = (event) => { saveInvoke(onSubmitClick, event, { redirect: true, - publish: false, + deliver: false, }); }; @@ -64,7 +64,7 @@ export default function EstimateFloatingActions({ submitForm(); saveInvoke(onSubmitClick, event, { redirect: false, - publish: false, + deliver: false, resetForm: true, }); }; @@ -73,7 +73,7 @@ export default function EstimateFloatingActions({ submitForm(); saveInvoke(onSubmitClick, event, { redirect: false, - publish: false, + deliver: false, }); }; @@ -88,26 +88,26 @@ export default function EstimateFloatingActions({ return (
- {/* ----------- Save And Publish ----------- */} - + {/* ----------- Save And Deliver ----------- */} +