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

feat: money out.

Browse Source
This commit is contained in:
elforjani13
2021-10-23 20:04:59 +02:00
parent 1fa03822f1
commit 75acab3348
24 changed files with 227 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/containers/Dialogs/MoneyOutDialog/MoneyOutContentFields.js Normal file
View File

@@ -0,0 +1,26 @@
import React from 'react';
import OtherExpnseFormFields from './OtherExpense/OtherExpnseFormFields';
import OwnerDrawingsFormFields from './OwnerDrawings/OwnerDrawingsFormFields';
import TransferToAccountFormFields from './TransferToAccount/TransferToAccountFormFields';
function MoneyOutContentFields({ accountType }) {
const handleTransactionType = () => {
switch (accountType) {
case 'onwers_drawing':
return <OwnerDrawingsFormFields />;
case 'other_expense':
return <OtherExpnseFormFields />;
case 'transfer_to_account':
return <TransferToAccountFormFields />;
default:
break;
}
};
return <React.Fragment>{handleTransactionType()}</React.Fragment>;
}
export default MoneyOutContentFields;

12
src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogContent.js
View File

@@ -1,6 +1,6 @@
import React from 'react';
import { MoneyOutProvider } from './MoneyOutProvider';
import MoneyOutDialogForm from './MoneyOutDialogForm';
import { MoneyOutProvider } from './MoneyOutDialogProvider';
import MoneyOutForm from './MoneyOutForm';
/**
* Money out dailog content.
@@ -12,8 +12,12 @@ export default function MoneyOutDialogContent({
accountType,
}) {
return (
<MoneyOutProvider accountId={accountId} dialogName={dialogName}>
<MoneyOutDialogForm accountType={accountType} />
<MoneyOutProvider
accountId={accountId}
accountType={accountType}
dialogName={dialogName}
>
<MoneyOutForm />
</MoneyOutProvider>
);
}

24
src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogForm.js
View File

@@ -1,24 +0,0 @@
import React from 'react';
import OwnerDrawingsForm from './OwnerDrawings/OwnerDrawingsForm';
import OtherExpenseForm from './OtherExpense/OtherExpenseForm';
import TransferToAccountForm from './TransferToAccount/TransferToAccountForm';
export default function MoneyOutDialogForm({ accountType }) {
// Handle from transaction.
const handleFromTransaction = () => {
switch (accountType) {
case 'ONWERS_DRAWING':
return <OwnerDrawingsForm />;
case 'OTHER_EXPENSE':
return <OtherExpenseForm />;
case 'TRANSFER_TO_ACCOUNT':
return <TransferToAccountForm />;
default:
break;
}
};
return <React.Fragment>{handleFromTransaction()}</React.Fragment>;
}

23
src/containers/Dialogs/MoneyOutDialog/MoneyOutProvider.js → src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js
View File

@@ -1,19 +1,23 @@
import React from 'react';
import { DialogContent } from 'components';
import { useAccounts, useCreateCashflowTransaction } from 'hooks/query';
import {
useAccounts,
useCreateCashflowTransaction,
useCashflowAccounts,
} from 'hooks/query';
const MoneyInDialogContent = React.createContext();
/**
* Money out dialog provider.
*/
function MoneyOutProvider({ accountId, dialogName, ...props }) {
function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) {
// Fetches accounts list.
const {
isFetching: isAccountFetching,
isLoading: isAccountsLoading,
data: accounts,
} = useAccounts();
const { isLoading: isAccountsLoading, data: accounts } = useAccounts();
// Fetch cash flow list .
const { data: cashflowAccounts, isLoading: isCashFlowAccountsLoading } =
useCashflowAccounts({}, { keepPreviousData: true });
const { mutateAsync: createCashflowTransactionMutate } =
useCreateCashflowTransaction();
@@ -25,8 +29,11 @@ function MoneyOutProvider({ accountId, dialogName, ...props }) {
const provider = {
accounts,
accountId,
accountType,
isAccountsLoading,
cashflowAccounts,
submitPayload,
dialogName,
@@ -35,7 +42,7 @@ function MoneyOutProvider({ accountId, dialogName, ...props }) {
};
return (
<DialogContent isLoading={isAccountsLoading}>
<DialogContent isLoading={isAccountsLoading || isCashFlowAccountsLoading}>
<MoneyInDialogContent.Provider value={provider} {...props} />
</DialogContent>
);

10
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFloatingActions.js → src/containers/Dialogs/MoneyOutDialog/MoneyOutFloatingActions.js
View File

@@ -3,15 +3,17 @@ import { Intent, Button, Classes } from '@blueprintjs/core';
import { useFormikContext } from 'formik';
import { FormattedMessage as T } from 'components';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
import { compose } from 'utils';
/**
* Owner drawings floating actions.
* Money out floating actions.
*/
function OwnerDrawingsFloatingActions({
function MoneyOutFloatingActions({
// #withDialogActions
closeDialog,
}) {
@@ -73,4 +75,4 @@ function OwnerDrawingsFloatingActions({
);
}
export default compose(withDialogActions)(OwnerDrawingsFloatingActions);
export default compose(withDialogActions)(MoneyOutFloatingActions);

35
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpenseForm.js → src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.js
View File

@@ -8,10 +8,11 @@ import intl from 'react-intl-universal';
import 'style/pages/CashFlow/CashflowTransactionForm.scss';
import { AppToaster } from 'components';
import { CreateOtherExpenseFormSchema } from './OtherExpenseForm.schema';
import OtherExpenseFormContent from './OtherExpenseFormContent';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import MoneyOutFormContent from './MoneyOutFormContent';
import { CreateMoneyOutSchema } from './MoneyOutForm.schema';
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
@@ -22,7 +23,7 @@ const defaultInitialValues = {
date: moment(new Date()).format('YYYY-MM-DD'),
amount: '',
transaction_number: '',
transaction_type: 'other_expense',
transaction_type: '',
reference_no: '',
cashflow_account_id: '',
credit_account_id: '',
@@ -30,10 +31,7 @@ const defaultInitialValues = {
published: '',
};
/**
* Other expense form.
*/
function OtherExpenseForm({
function MoneyOutForm({
// #withDialogActions
closeDialog,
@@ -43,6 +41,7 @@ function OtherExpenseForm({
const {
dialogName,
accountId,
accountType,
createCashflowTransactionMutate,
submitPayload,
} = useMoneyOutDialogContext();
@@ -51,6 +50,7 @@ function OtherExpenseForm({
const initialValues = {
...defaultInitialValues,
currency_code: base_currency,
transaction_type: accountType,
cashflow_account_id: accountId,
};
@@ -74,19 +74,20 @@ function OtherExpenseForm({
setSubmitting(true);
});
};
return (
<Formik
validationSchema={CreateOtherExpenseFormSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
<OtherExpenseFormContent />
</Formik>
<div>
<Formik
validationSchema={CreateMoneyOutSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
<MoneyOutFormContent />
</Formik>
</div>
);
}
export default compose(
withDialogActions,
withCurrentOrganization(),
)(OtherExpenseForm);
)(MoneyOutForm);

6
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountForm.schema.js → src/containers/Dialogs/MoneyOutDialog/MoneyOutForm.schema.js
View File

@@ -8,9 +8,7 @@ const Schema = Yup.object().shape({
transaction_number: Yup.string(),
transaction_type: Yup.string().required(),
reference_no: Yup.string(),
credit_account_id: Yup.number()
.required()
.label(intl.get('account')),
credit_account_id: Yup.number().required(),
cashflow_account_id: Yup.string().required(),
description: Yup.string()
.min(3)
@@ -19,4 +17,4 @@ const Schema = Yup.object().shape({
published: Yup.boolean(),
});
export const CreateTransferToAccountFormSchema = Schema;
export const CreateMoneyOutSchema = Schema;

17
src/containers/Dialogs/MoneyOutDialog/MoneyOutFormContent.js Normal file
View File

@@ -0,0 +1,17 @@
import React from 'react';
import { Form } from 'formik';
import MoneyOutFormFields from './MoneyOutFormFields';
import MoneyOutFloatingActions from './MoneyOutFloatingActions';
/**
* Money out form content.
*/
export default function MoneyOutFormContent() {
return (
<Form>
<MoneyOutFormFields />
<MoneyOutFloatingActions />
</Form>
);
}

27
src/containers/Dialogs/MoneyOutDialog/MoneyOutFormFields.js Normal file
View File

@@ -0,0 +1,27 @@
import React from 'react';
import { Classes } from '@blueprintjs/core';
import { If } from 'components';
import MoneyOutContentFields from './MoneyOutContentFields';
import TransactionTypeFields from './TransactionTypeFields';
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
/**
* Money out form fields.
*/
function MoneyOutFormFields() {
// Money in dialog context.
const { accountId, accountType } = useMoneyOutDialogContext();
return (
<div className={Classes.DIALOG_BODY}>
<If condition={!accountId}>
<TransactionTypeFields />
</If>
<MoneyOutContentFields accountType={accountType} />
</div>
);
}
export default MoneyOutFormFields;

76
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpenseFloatingActions.js
View File

@@ -1,76 +0,0 @@
import React from 'react';
import { Intent, Button, Classes } from '@blueprintjs/core';
import { useFormikContext } from 'formik';
import { FormattedMessage as T } from 'components';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
/**
* Other expense floating actions.
*/
function OtherExpenseFloatingActions({
// #withDialogActions
closeDialog,
}) {
// Formik context.
const { isSubmitting, submitForm } = useFormikContext();
// money in dialog context.
const { dialogName, setSubmitPayload, submitPayload } =
useMoneyOutDialogContext();
// handle submit as draft button click.
const handleSubmitDraftBtnClick = (event) => {
setSubmitPayload({ publish: false });
submitForm();
};
// Handle submit button click.
const handleSubmittBtnClick = (event) => {
setSubmitPayload({ publish: true });
submitForm();
};
// Handle close button click.
const handleCloseBtnClick = (event) => {
closeDialog(dialogName);
};
return (
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
disabled={isSubmitting}
onClick={handleCloseBtnClick}
style={{ minWidth: '75px' }}
>
<T id={'close'} />
</Button>
<Button
disabled={isSubmitting}
loading={isSubmitting && !submitPayload.publish}
style={{ minWidth: '75px' }}
type="submit"
onClick={handleSubmitDraftBtnClick}
>
{<T id={'save_as_draft'} />}
</Button>
<Button
intent={Intent.PRIMARY}
disabled={isSubmitting}
loading={isSubmitting && submitPayload.publish}
style={{ minWidth: '75px' }}
type="submit"
onClick={handleSubmittBtnClick}
>
{<T id={'save_and_publish'} />}
</Button>
</div>
</div>
);
}
export default compose(withDialogActions)(OtherExpenseFloatingActions);

22
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpenseForm.schema.js
View File

@@ -1,22 +0,0 @@
import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
date: Yup.date().required().label(intl.get('date')),
amount: Yup.number().required().label(intl.get('amount')),
transaction_number: Yup.string(),
transaction_type: Yup.string().required(),
reference_no: Yup.string(),
credit_account_id: Yup.number()
.required()
.label(intl.get('other_expense_account')),
cashflow_account_id: Yup.string().required(),
description: Yup.string()
.min(3)
.max(DATATYPES_LENGTH.TEXT)
.label(intl.get('description')),
published: Yup.boolean(),
});
export const CreateOtherExpenseFormSchema = Schema;

17
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpenseFormContent.js
View File

@@ -1,17 +0,0 @@
import React from 'react';
import { Form } from 'formik';
import OtherExpnseFormFields from './OtherExpnseFormFields';
import OtherExpenseFloatingActions from './OtherExpenseFloatingActions';
/**
* Other expense form content.
*/
export default function OtherExpenseFormContent() {
return (
<Form>
<OtherExpnseFormFields />
<OtherExpenseFloatingActions />
</Form>
);
}

6
src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js
View File

@@ -29,7 +29,7 @@ import {
handleDateChange,
} from 'utils';
import { CLASSES } from 'common/classes';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
/**
* Other expense form fields.
@@ -41,7 +41,7 @@ function OtherExpnseFormFields() {
const amountFieldRef = useAutofocus();
return (
<div className={Classes.DIALOG_BODY}>
<React.Fragment>
<Row>
<Col xs={5}>
{/*------------ Date -----------*/}
@@ -188,7 +188,7 @@ function OtherExpnseFormFields() {
</FormGroup>
)}
</FastField>
</div>
</React.Fragment>
);
}

91
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsForm.js
View File

@@ -1,91 +0,0 @@
import React from 'react';
import moment from 'moment';
import { Intent } from '@blueprintjs/core';
import { Formik } from 'formik';
import { omit } from 'lodash';
import intl from 'react-intl-universal';
import 'style/pages/CashFlow/CashflowTransactionForm.scss';
import { AppToaster } from 'components';
import { CreateOwnerDrawingsFormSchema } from './OwnerDrawingsForm.schema';
import OwnerDrawingsFormContent from './OwnerDrawingsFormContent';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
import { compose } from 'utils';
const defaultInitialValues = {
date: moment(new Date()).format('YYYY-MM-DD'),
amount: '',
transaction_number: '',
transaction_type: 'onwers_drawing',
reference_no: '',
cashflow_account_id: '',
credit_account_id: '',
description: '',
published: '',
};
/**
* Owner drawings form.
*/
function OwnerDrawingsForm({
// #withDialogActions
closeDialog,
// #withCurrentOrganization
organization: { base_currency },
}) {
const {
dialogName,
accountId,
submitPayload,
createCashflowTransactionMutate,
} = useMoneyOutDialogContext();
// Initial form values.
const initialValues = {
...defaultInitialValues,
currency_code: base_currency,
cashflow_account_id: accountId,
};
// Handles the form submit.
const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
const form = {
...omit(values, ['currency_code']),
published: submitPayload.publish,
};
setSubmitting(true);
createCashflowTransactionMutate(form)
.then(() => {
closeDialog(dialogName);
AppToaster.show({
message: intl.get('cash_flow_transaction_success_message'),
intent: Intent.SUCCESS,
});
})
.finally(() => {
setSubmitting(true);
});
};
return (
<Formik
validationSchema={CreateOwnerDrawingsFormSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
<OwnerDrawingsFormContent />
</Formik>
);
}
export default compose(
withDialogActions,
withCurrentOrganization(),
)(OwnerDrawingsForm);

22
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsForm.schema.js
View File

@@ -1,22 +0,0 @@
import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { DATATYPES_LENGTH } from 'common/dataTypes';
const Schema = Yup.object().shape({
date: Yup.date().required().label(intl.get('date')),
amount: Yup.number().required().label(intl.get('amount')),
transaction_number: Yup.string(),
transaction_type: Yup.string().required(),
reference_no: Yup.string(),
credit_account_id: Yup.number()
.required()
.label(intl.get('cash_flow_transaction.label_equity_account')),
cashflow_account_id: Yup.string().required(),
description: Yup.string()
.min(3)
.max(DATATYPES_LENGTH.TEXT)
.label(intl.get('description')),
published: Yup.boolean(),
});
export const CreateOwnerDrawingsFormSchema = Schema;

17
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormContent.js
View File

@@ -1,17 +0,0 @@
import React from 'react';
import { Form } from 'formik';
import OwnerDrawingsFormFields from './OwnerDrawingsFormFields';
import OwnerDrawingsFloatingActions from './OwnerDrawingsFloatingActions';
/**
* Owner drawings form content.
*/
export default function OwnerDrawingsFormContent() {
return (
<Form>
<OwnerDrawingsFormFields />
<OwnerDrawingsFloatingActions />
</Form>
);
}

7
src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js
View File

@@ -28,7 +28,7 @@ import {
handleDateChange,
} from 'utils';
import { CLASSES } from 'common/classes';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
/**
* Owner drawings form fields.
@@ -40,7 +40,7 @@ function OwnerDrawingsFormFields() {
const amountFieldRef = useAutofocus();
return (
<div className={Classes.DIALOG_BODY}>
<React.Fragment>
<Row>
<Col xs={5}>
{/*------------ Date -----------*/}
@@ -112,7 +112,6 @@ function OwnerDrawingsFormFields() {
onChange={(amount) => {
setFieldValue('amount', amount);
}}
inputRef={(ref) => (amountFieldRef.current = ref)}
intent={inputIntent({ error, touched })}
/>
@@ -185,7 +184,7 @@ function OwnerDrawingsFormFields() {
</FormGroup>
)}
</FastField>
</div>
</React.Fragment>
);
}

96
src/containers/Dialogs/MoneyOutDialog/TransactionTypeFields.js Normal file
View File

@@ -0,0 +1,96 @@
import React from 'react';
import { FastField, ErrorMessage } from 'formik';
import { FormGroup } from '@blueprintjs/core';
import classNames from 'classnames';
import {
FormattedMessage as T,
AccountsSuggestField,
FieldRequiredHint,
ListSelect,
Col,
Row,
} from 'components';
import { inputIntent } from 'utils';
import { CLASSES } from 'common/classes';
import { addMoneyOut } from '../../../common/cashflowOptions';
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
/**
* Transaction type fields.
*/
function TransactionTypeFields() {
// Money in dialog context.
const { cashflowAccounts } = useMoneyOutDialogContext();
return (
<div className="trasnaction-type-fileds">
<Row>
<Col xs={5}>
{/*------------ Current account -----------*/}
<FastField name={'cashflow_account_id'}>
{({ form, field: { value }, meta: { error, touched } }) => (
<FormGroup
label={'Current account'}
labelInfo={<FieldRequiredHint />}
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="cashflow_account_id" />}
minimal={true}
className={classNames(
CLASSES.FILL,
'form-group--cashflow_account_id',
)}
>
<AccountsSuggestField
accounts={cashflowAccounts}
onAccountSelected={({ id }) =>
form.setFieldValue('cashflow_account_id', id)
}
inputProps={{
intent: inputIntent({ error, touched }),
}}
/>
</FormGroup>
)}
</FastField>
{/*------------ Transaction type -----------*/}
</Col>
<Col xs={5}>
<FastField name={'transaction_type'}>
{({
form: { values, setFieldValue },
field: { value },
meta: { error, touched },
}) => (
<FormGroup
label={<T id={'transaction_type'} />}
labelInfo={<FieldRequiredHint />}
helperText={<ErrorMessage name="transaction_type" />}
intent={inputIntent({ error, touched })}
className={classNames(
CLASSES.FILL,
'form-group--transaction_type',
)}
>
<ListSelect
items={addMoneyOut}
onItemSelect={(type) => {
setFieldValue('transaction_type', type.value);
}}
filterable={false}
selectedItem={value}
selectedItemProp={'value'}
textProp={'name'}
popoverProps={{ minimal: true }}
/>
</FormGroup>
)}
</FastField>
</Col>
</Row>
</div>
);
}
export default TransactionTypeFields;

73
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFloatingActions.js
View File

@@ -1,73 +0,0 @@
import React from 'react';
import { Intent, Button, Classes } from '@blueprintjs/core';
import { useFormikContext } from 'formik';
import { FormattedMessage as T } from 'components';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { compose } from 'utils';
function TransferToAccountFloatingActions({
// #withDialogActions
closeDialog,
}) {
// Formik context.
const { isSubmitting, submitForm } = useFormikContext();
// money in dialog context.
const { dialogName, setSubmitPayload, submitPayload } =
useMoneyOutDialogContext();
// handle submit as draft button click.
const handleSubmitDraftBtnClick = (event) => {
setSubmitPayload({ publish: false });
submitForm();
};
// Handle submit button click.
const handleSubmittBtnClick = (event) => {
setSubmitPayload({ publish: true });
submitForm();
};
// Handle close button click.
const handleCloseBtnClick = (event) => {
closeDialog(dialogName);
};
return (
<div className={Classes.DIALOG_FOOTER}>
<div className={Classes.DIALOG_FOOTER_ACTIONS}>
<Button
disabled={isSubmitting}
onClick={handleCloseBtnClick}
style={{ minWidth: '75px' }}
>
<T id={'close'} />
</Button>
<Button
disabled={isSubmitting}
loading={isSubmitting && !submitPayload.publish}
style={{ minWidth: '75px' }}
type="submit"
onClick={handleSubmitDraftBtnClick}
>
{<T id={'save_as_draft'} />}
</Button>
<Button
intent={Intent.PRIMARY}
disabled={isSubmitting}
loading={isSubmitting && submitPayload.publish}
style={{ minWidth: '75px' }}
type="submit"
onClick={handleSubmittBtnClick}
>
{<T id={'save_and_publish'} />}
</Button>
</div>
</div>
);
}
export default compose(withDialogActions)(TransferToAccountFloatingActions);

92
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountForm.js
View File

@@ -1,92 +0,0 @@
import React from 'react';
import moment from 'moment';
import { Intent } from '@blueprintjs/core';
import { Formik } from 'formik';
import { omit } from 'lodash';
import intl from 'react-intl-universal';
import 'style/pages/CashFlow/CashflowTransactionForm.scss';
import { AppToaster } from 'components';
import { CreateTransferToAccountFormSchema } from './TransferToAccountForm.schema';
import TransferToAccountFromContent from './TransferToAccountFromContent';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
import { compose } from 'utils';
const defaultInitialValues = {
date: moment(new Date()).format('YYYY-MM-DD'),
amount: '',
transaction_number: '',
transaction_type: 'transfer_from_account',
reference_no: '',
cashflow_account_id: '',
credit_account_id: '',
description: '',
published: '',
};
/**
* Transfer to account form.
*/
function TransferToAccountForm({
// #withDialogActions
closeDialog,
// #withCurrentOrganization
organization: { base_currency },
}) {
const {
dialogName,
accountId,
createCashflowTransactionMutate,
submitPayload,
} = useMoneyOutDialogContext();
// Initial form values.
const initialValues = {
...defaultInitialValues,
currency_code: base_currency,
cashflow_account_id: accountId,
};
// Handles the form submit.
const handleFormSubmit = (values, { setSubmitting, setErrors }) => {
const form = {
...omit(values, ['currency_code']),
published: submitPayload.publish,
};
setSubmitting(true);
createCashflowTransactionMutate(form)
.then(() => {
closeDialog(dialogName);
AppToaster.show({
message: intl.get('cash_flow_transaction_success_message'),
intent: Intent.SUCCESS,
});
})
.finally(() => {
setSubmitting(true);
});
};
return (
<Formik
validationSchema={CreateTransferToAccountFormSchema}
initialValues={initialValues}
onSubmit={handleFormSubmit}
>
<TransferToAccountFromContent />
</Formik>
);
}
export default compose(
withDialogActions,
withCurrentOrganization(),
)(TransferToAccountForm);

6
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js
View File

@@ -29,7 +29,7 @@ import {
handleDateChange,
} from 'utils';
import { CLASSES } from 'common/classes';
import { useMoneyOutDialogContext } from '../MoneyOutProvider';
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
/**
* Transfer to account form fields.
@@ -41,7 +41,7 @@ function TransferToAccountFormFields() {
const accountRef = useAutofocus();
return (
<div className={Classes.DIALOG_BODY}>
<React.Fragment>
<Row>
<Col xs={5}>
{/*------------ Date -----------*/}
@@ -190,7 +190,7 @@ function TransferToAccountFormFields() {
</FormGroup>
)}
</FastField>
</div>
</React.Fragment>
);
}

14
src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFromContent.js
View File

@@ -1,14 +0,0 @@
import React from 'react';
import { Form } from 'formik';
import TransferToAccountFormFields from './TransferToAccountFormFields';
import TransferToAccountFloatingActions from './TransferToAccountFloatingActions';
export default function TransferToAccountFromContent() {
return (
<Form>
<TransferToAccountFormFields />
<TransferToAccountFloatingActions />
</Form>
);
}

4
src/containers/Dialogs/MoneyOutDialog/index.js
View File

@@ -20,7 +20,7 @@ function MoneyOutDialog({
<Dialog
name={dialogName}
title={intl.get('cash_flow_transaction.money_out', {
value: payload.account_type,
value: payload.account_type?.name,
})}
isOpen={isOpen}
canEscapeJeyClose={true}
@@ -31,7 +31,7 @@ function MoneyOutDialog({
<MoneyOutDialogContent
dialogName={dialogName}
accountId={payload.account_id}
accountType={payload.account_type}
accountType={payload.account_type?.value}
/>
</DialogSuspense>
</Dialog>