QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-17 21:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-11-29 00:17:05 +02:00
parent 011542e2a3 ac539e1b59
commit dcc9370d87
39 changed files with 1410 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/containers/Sales/Estimate/EstimateForm.js
View File

@@ -103,9 +103,9 @@ const EstimateForm = ({
: estimateNextNumber;
useEffect(() => {
const transNumber = !isNewMode ? estimate.estimate_number : estimateNumber;
const transNumber = !isNewMode ? estimate.estimate_number : estimateNumber;
if (isNewMode) {
if (!isNewMode) {
changePageTitle(formatMessage({ id: 'edit_estimate' }));
} else {
changePageTitle(formatMessage({ id: 'new_estimate' }));
@@ -199,11 +199,13 @@ const EstimateForm = ({
intent: Intent.SUCCESS,
});
setSubmitting(false);
resetForm();
if (submitPayload.redirect) {
history.push('/estimates');
}
if (submitPayload.resetForm) {
resetForm();
}
};
const onError = (errors) => {
@@ -267,8 +269,8 @@ const EstimateForm = ({
estimateId={estimateId}
onSubmitClick={handleSubmitClick}
onCancelClick={handleCancelClick}
estimatePublished={true}
/>
</Form>
)}
</Formik>