From a3c79d98b0146e460755a765860244cb2c3840b5 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Sun, 27 Feb 2022 14:10:22 +0200 Subject: [PATCH] feat(account): add currency select. --- src/common/accountTypes.js | 2 ++ .../AccountDialog/AccountDialogForm.js | 1 + .../AccountDialog/AccountDialogFormContent.js | 23 ++++++++++++++++++- .../AccountDialog/AccountDialogProvider.js | 19 ++++++++++----- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/common/accountTypes.js b/src/common/accountTypes.js index 3e84a1e7d..144e75c30 100644 --- a/src/common/accountTypes.js +++ b/src/common/accountTypes.js @@ -221,3 +221,5 @@ export const ACCOUNT_TYPES = [ incomeSheet: true, }, ]; + +export const FOREIGN_CURRENCY_ACCOUNTS = ['cash', 'bank']; diff --git a/src/containers/Dialogs/AccountDialog/AccountDialogForm.js b/src/containers/Dialogs/AccountDialog/AccountDialogForm.js index 1ac575f2f..809ae6ea6 100644 --- a/src/containers/Dialogs/AccountDialog/AccountDialogForm.js +++ b/src/containers/Dialogs/AccountDialog/AccountDialogForm.js @@ -25,6 +25,7 @@ const defaultInitialValues = { name: '', code: '', description: '', + currency_code:'', subaccount: false, }; diff --git a/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.js b/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.js index 93cfbbfa2..ed249e561 100644 --- a/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.js +++ b/src/containers/Dialogs/AccountDialog/AccountDialogFormContent.js @@ -17,12 +17,14 @@ import { Hint, AccountsSelectList, AccountsTypesSelect, + CurrencySelect, } from 'components'; import withAccounts from 'containers/Accounts/withAccounts'; import { inputIntent } from 'utils'; import { compose } from 'redux'; import { useAutofocus } from 'hooks'; +import { FOREIGN_CURRENCY_ACCOUNTS } from '../../../common/accountTypes'; import { useAccountDialogContext } from './AccountDialogProvider'; /** @@ -37,7 +39,7 @@ function AccountFormDialogFields({ const accountNameFieldRef = useAutofocus(); // Account form context. - const { accounts, accountsTypes } = useAccountDialogContext(); + const { accounts, accountsTypes, currencies } = useAccountDialogContext(); return (