From ed25033852e0fb911d8330eba54178a102b1d3fd Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Mon, 15 Feb 2021 16:34:31 +0200 Subject: [PATCH 1/3] fix: Edit Account. --- client/src/hooks/query/accounts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/hooks/query/accounts.js b/client/src/hooks/query/accounts.js index afaa01b7c..d0b69e6c0 100644 --- a/client/src/hooks/query/accounts.js +++ b/client/src/hooks/query/accounts.js @@ -82,7 +82,7 @@ export function useEditAccount(props) { const query = useQueryClient(); return useMutation( - ([values, id]) => ApiService.post(`accounts/${id}`, values), + ([id,values]) => ApiService.post(`accounts/${id}`, values), { onSuccess: () => { query.invalidateQueries('ACCOUNTS'); From e20056d395c2fd2bf5130951228258b2fee6e4eb Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Tue, 16 Feb 2021 14:15:52 +0200 Subject: [PATCH 2/3] fix: make journal --- .../Accounting/MakeJournal/MakeJournalEntriesField.js | 4 ++-- .../Accounting/MakeJournal/MakeJournalFormFloatingActions.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesField.js b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesField.js index b0fa4d569..5bace16d6 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesField.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalEntriesField.js @@ -3,7 +3,7 @@ import { FastField } from 'formik'; import classNames from 'classnames'; import { CLASSES } from 'common/classes'; import MakeJournalEntriesTable from './MakeJournalEntriesTable'; -import { defaultManualJournal, MIN_LINES_NUMBER } from './utils'; +import { defaultEntry, MIN_LINES_NUMBER } from './utils'; /** * Make journal entries field. @@ -18,7 +18,7 @@ export default function MakeJournalEntriesField() { form.setFieldValue('entries', entries); }} entries={value} - defaultEntry={defaultManualJournal} + defaultEntry={defaultEntry} initialLinesNumber={MIN_LINES_NUMBER} error={error} /> diff --git a/client/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.js b/client/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.js index 80f42ace7..4d4c82fdc 100644 --- a/client/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.js +++ b/client/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.js @@ -49,6 +49,7 @@ export default function MakeJournalFloatingAction() { // Handle submit as draft button click. const handleSubmitDraftBtnClick = (event) => { + submitForm(); setSubmitPayload({ redirect: true, publish: false }); }; From dd1881e7ffa8fd96051d2e7ae396325040988f79 Mon Sep 17 00:00:00 2001 From: elforjani3 Date: Tue, 16 Feb 2021 16:13:09 +0200 Subject: [PATCH 3/3] fix: new child account --- client/src/containers/Accounts/AccountsDataTable.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/containers/Accounts/AccountsDataTable.js b/client/src/containers/Accounts/AccountsDataTable.js index 41b8e482d..876c605bb 100644 --- a/client/src/containers/Accounts/AccountsDataTable.js +++ b/client/src/containers/Accounts/AccountsDataTable.js @@ -106,7 +106,7 @@ function AccountsDataTable({ onDelete: handleDeleteAccount, onActivate: handleActivateAccount, onInactivate: handleInactivateAccount, - newChild: handleNewChildAccount + onNewChild: handleNewChildAccount }} /> );