mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-19 14:20:31 +00:00
feat: add auto increment/ money in.
This commit is contained in:
@@ -14,10 +14,11 @@ import { CreateMoneyInFormSchema } from './MoneyInForm.schema';
|
|||||||
|
|
||||||
import { useMoneyInDailogContext } from './MoneyInDialogProvider';
|
import { useMoneyInDailogContext } from './MoneyInDialogProvider';
|
||||||
|
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
import withDialogActions from 'containers/Dialog/withDialogActions';
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
|
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
|
||||||
|
|
||||||
import { compose } from 'utils';
|
import { compose, transactionNumber } from 'utils';
|
||||||
|
|
||||||
const defaultInitialValues = {
|
const defaultInitialValues = {
|
||||||
date: moment(new Date()).format('YYYY-MM-DD'),
|
date: moment(new Date()).format('YYYY-MM-DD'),
|
||||||
@@ -37,6 +38,11 @@ function MoneyInForm({
|
|||||||
|
|
||||||
// #withCurrentOrganization
|
// #withCurrentOrganization
|
||||||
organization: { base_currency },
|
organization: { base_currency },
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionNextNumber,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionIncrementMode,
|
||||||
}) {
|
}) {
|
||||||
const {
|
const {
|
||||||
dialogName,
|
dialogName,
|
||||||
@@ -46,11 +52,20 @@ function MoneyInForm({
|
|||||||
submitPayload,
|
submitPayload,
|
||||||
} = useMoneyInDailogContext();
|
} = useMoneyInDailogContext();
|
||||||
|
|
||||||
|
// transaction number.
|
||||||
|
const transactionNo = transactionNumber(
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
);
|
||||||
|
|
||||||
// Initial form values.
|
// Initial form values.
|
||||||
const initialValues = {
|
const initialValues = {
|
||||||
...defaultInitialValues,
|
...defaultInitialValues,
|
||||||
currency_code: base_currency,
|
currency_code: base_currency,
|
||||||
transaction_type: accountType,
|
transaction_type: accountType,
|
||||||
|
...(transactionIncrementMode && {
|
||||||
|
transaction_number: transactionNo,
|
||||||
|
}),
|
||||||
cashflow_account_id: accountId,
|
cashflow_account_id: accountId,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -91,4 +106,9 @@ function MoneyInForm({
|
|||||||
export default compose(
|
export default compose(
|
||||||
withDialogActions,
|
withDialogActions,
|
||||||
withCurrentOrganization(),
|
withCurrentOrganization(),
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
transactionIncrementMode: cashflowSetting?.autoIncrement,
|
||||||
|
})),
|
||||||
)(MoneyInForm);
|
)(MoneyInForm);
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import React from 'react';
|
|||||||
import { Form } from 'formik';
|
import { Form } from 'formik';
|
||||||
|
|
||||||
import MoneyInFormFields from './MoneyInFormFields';
|
import MoneyInFormFields from './MoneyInFormFields';
|
||||||
|
import MoneyInFormDialog from './MoneyInFormDialog';
|
||||||
import MoneyInFloatingActions from './MoneyInFloatingActions';
|
import MoneyInFloatingActions from './MoneyInFloatingActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -11,6 +12,7 @@ export default function MoneyInFormContent() {
|
|||||||
return (
|
return (
|
||||||
<Form>
|
<Form>
|
||||||
<MoneyInFormFields />
|
<MoneyInFormFields />
|
||||||
|
<MoneyInFormDialog />
|
||||||
<MoneyInFloatingActions />
|
<MoneyInFloatingActions />
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
28
src/containers/Dialogs/MoneyInDialog/MoneyInFormDialog.js
Normal file
28
src/containers/Dialogs/MoneyInDialog/MoneyInFormDialog.js
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { useFormikContext } from 'formik';
|
||||||
|
|
||||||
|
import TransactionNumberDialog from '../../Dialogs/TransactionNumberDialog';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Moneny in / transaction number form dialog.
|
||||||
|
*/
|
||||||
|
export default function MoneyInFormDialog() {
|
||||||
|
const { setFieldValue } = useFormikContext();
|
||||||
|
|
||||||
|
// Update the form once the transaction number form submit confirm.
|
||||||
|
const handleTransactionNumberFormConfirm = ({
|
||||||
|
incrementNumber,
|
||||||
|
manually,
|
||||||
|
}) => {
|
||||||
|
setFieldValue('transaction_number', incrementNumber || '');
|
||||||
|
setFieldValue('transaction_number_manually', manually);
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<React.Fragment>
|
||||||
|
<TransactionNumberDialog
|
||||||
|
dialogName={'transaction-number-form'}
|
||||||
|
onConfirm={handleTransactionNumberFormConfirm}
|
||||||
|
/>
|
||||||
|
</React.Fragment>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -15,8 +15,10 @@ import {
|
|||||||
InputPrependText,
|
InputPrependText,
|
||||||
MoneyInputGroup,
|
MoneyInputGroup,
|
||||||
FieldRequiredHint,
|
FieldRequiredHint,
|
||||||
|
Icon,
|
||||||
Col,
|
Col,
|
||||||
Row,
|
Row,
|
||||||
|
InputPrependButton,
|
||||||
} from 'components';
|
} from 'components';
|
||||||
import { DateInput } from '@blueprintjs/datetime';
|
import { DateInput } from '@blueprintjs/datetime';
|
||||||
import { useAutofocus } from 'hooks';
|
import { useAutofocus } from 'hooks';
|
||||||
@@ -27,19 +29,56 @@ import {
|
|||||||
momentFormatter,
|
momentFormatter,
|
||||||
tansformDateValue,
|
tansformDateValue,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
|
compose,
|
||||||
} from 'utils';
|
} from 'utils';
|
||||||
import { CLASSES } from 'common/classes';
|
import { CLASSES } from 'common/classes';
|
||||||
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Other income form fields.
|
* Other income form fields.
|
||||||
*/
|
*/
|
||||||
function OtherIncomeFormFields() {
|
function OtherIncomeFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money in dialog context.
|
// Money in dialog context.
|
||||||
const { accounts } = useMoneyInDailogContext();
|
const { accounts } = useMoneyInDailogContext();
|
||||||
|
|
||||||
const amountFieldRef = useAutofocus();
|
const amountFieldRef = useAutofocus();
|
||||||
|
|
||||||
|
// Handle tranaction number changing.
|
||||||
|
const handleTransactionNumberChange = () => {
|
||||||
|
openDialog('transaction-number-form');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle transaction no. field blur.
|
||||||
|
const handleTransactionNoBlur = (form, field) => (event) => {
|
||||||
|
const newValue = event.target.value;
|
||||||
|
|
||||||
|
if (field.value !== newValue && transactionAutoIncrement) {
|
||||||
|
openDialog('transaction-number-form', {
|
||||||
|
initialFormValues: {
|
||||||
|
manualTransactionNo: newValue,
|
||||||
|
incrementMode: 'manual-transaction',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Syncs transaction number settings with form.
|
||||||
|
useObserveTransactionNoSettings(
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<Row>
|
<Row>
|
||||||
@@ -81,10 +120,31 @@ function OtherIncomeFormFields() {
|
|||||||
helperText={<ErrorMessage name="transaction_number" />}
|
helperText={<ErrorMessage name="transaction_number" />}
|
||||||
className={'form-group--transaction_number'}
|
className={'form-group--transaction_number'}
|
||||||
>
|
>
|
||||||
<InputGroup
|
<ControlGroup fill={true}>
|
||||||
intent={inputIntent({ error, touched })}
|
<InputGroup
|
||||||
{...field}
|
minimal={true}
|
||||||
/>
|
value={field.value}
|
||||||
|
asyncControl={true}
|
||||||
|
onBlur={handleTransactionNoBlur(form, field)}
|
||||||
|
/>
|
||||||
|
<InputPrependButton
|
||||||
|
buttonProps={{
|
||||||
|
onClick: handleTransactionNumberChange,
|
||||||
|
icon: <Icon icon={'settings-18'} />,
|
||||||
|
}}
|
||||||
|
tooltip={true}
|
||||||
|
tooltipProps={{
|
||||||
|
content: (
|
||||||
|
<T
|
||||||
|
id={
|
||||||
|
'cash_flow.setting_your_auto_generated_transaction_number'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
position: Position.BOTTOM_LEFT,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</ControlGroup>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
)}
|
)}
|
||||||
</FastField>
|
</FastField>
|
||||||
@@ -191,4 +251,11 @@ function OtherIncomeFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default OtherIncomeFormFields;
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(OtherIncomeFormFields);
|
||||||
|
|||||||
@@ -15,8 +15,10 @@ import {
|
|||||||
InputPrependText,
|
InputPrependText,
|
||||||
MoneyInputGroup,
|
MoneyInputGroup,
|
||||||
FieldRequiredHint,
|
FieldRequiredHint,
|
||||||
|
Icon,
|
||||||
Col,
|
Col,
|
||||||
Row,
|
Row,
|
||||||
|
InputPrependButton,
|
||||||
} from 'components';
|
} from 'components';
|
||||||
import { DateInput } from '@blueprintjs/datetime';
|
import { DateInput } from '@blueprintjs/datetime';
|
||||||
import { useAutofocus } from 'hooks';
|
import { useAutofocus } from 'hooks';
|
||||||
@@ -26,18 +28,57 @@ import {
|
|||||||
momentFormatter,
|
momentFormatter,
|
||||||
tansformDateValue,
|
tansformDateValue,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
|
compose
|
||||||
} from 'utils';
|
} from 'utils';
|
||||||
import { CLASSES } from 'common/classes';
|
import { CLASSES } from 'common/classes';
|
||||||
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
|
/**
|
||||||
/**
|
/**
|
||||||
* Owner contribution form fields.
|
* Owner contribution form fields.
|
||||||
*/
|
*/
|
||||||
function OwnerContributionFormFields() {
|
function OwnerContributionFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money in dialog context.
|
// Money in dialog context.
|
||||||
const { accounts } = useMoneyInDailogContext();
|
const { accounts } = useMoneyInDailogContext();
|
||||||
|
|
||||||
const amountFieldRef = useAutofocus();
|
const amountFieldRef = useAutofocus();
|
||||||
|
|
||||||
|
// Handle tranaction number changing.
|
||||||
|
const handleTransactionNumberChange = () => {
|
||||||
|
openDialog('transaction-number-form');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle transaction no. field blur.
|
||||||
|
const handleTransactionNoBlur = (form, field) => (event) => {
|
||||||
|
const newValue = event.target.value;
|
||||||
|
|
||||||
|
if (field.value !== newValue && transactionAutoIncrement) {
|
||||||
|
openDialog('transaction-number-form', {
|
||||||
|
initialFormValues: {
|
||||||
|
manualTransactionNo: newValue,
|
||||||
|
incrementMode: 'manual-transaction',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Syncs transaction number settings with form.
|
||||||
|
useObserveTransactionNoSettings(
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<Row>
|
<Row>
|
||||||
@@ -79,10 +120,31 @@ function OwnerContributionFormFields() {
|
|||||||
helperText={<ErrorMessage name="transaction_number" />}
|
helperText={<ErrorMessage name="transaction_number" />}
|
||||||
className={'form-group--transaction_number'}
|
className={'form-group--transaction_number'}
|
||||||
>
|
>
|
||||||
<InputGroup
|
<ControlGroup fill={true}>
|
||||||
intent={inputIntent({ error, touched })}
|
<InputGroup
|
||||||
{...field}
|
minimal={true}
|
||||||
/>
|
value={field.value}
|
||||||
|
asyncControl={true}
|
||||||
|
onBlur={handleTransactionNoBlur(form, field)}
|
||||||
|
/>
|
||||||
|
<InputPrependButton
|
||||||
|
buttonProps={{
|
||||||
|
onClick: handleTransactionNumberChange,
|
||||||
|
icon: <Icon icon={'settings-18'} />,
|
||||||
|
}}
|
||||||
|
tooltip={true}
|
||||||
|
tooltipProps={{
|
||||||
|
content: (
|
||||||
|
<T
|
||||||
|
id={
|
||||||
|
'cash_flow.setting_your_auto_generated_transaction_number'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
position: Position.BOTTOM_LEFT,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</ControlGroup>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
)}
|
)}
|
||||||
</FastField>
|
</FastField>
|
||||||
@@ -187,4 +249,11 @@ function OwnerContributionFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default OwnerContributionFormFields;
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(OwnerContributionFormFields);
|
||||||
|
|||||||
@@ -15,8 +15,10 @@ import {
|
|||||||
InputPrependText,
|
InputPrependText,
|
||||||
MoneyInputGroup,
|
MoneyInputGroup,
|
||||||
FieldRequiredHint,
|
FieldRequiredHint,
|
||||||
|
Icon,
|
||||||
Col,
|
Col,
|
||||||
Row,
|
Row,
|
||||||
|
InputPrependButton,
|
||||||
} from 'components';
|
} from 'components';
|
||||||
import { DateInput } from '@blueprintjs/datetime';
|
import { DateInput } from '@blueprintjs/datetime';
|
||||||
import { useAutofocus } from 'hooks';
|
import { useAutofocus } from 'hooks';
|
||||||
@@ -27,19 +29,55 @@ import {
|
|||||||
momentFormatter,
|
momentFormatter,
|
||||||
tansformDateValue,
|
tansformDateValue,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
|
compose,
|
||||||
} from 'utils';
|
} from 'utils';
|
||||||
import { CLASSES } from 'common/classes';
|
import { CLASSES } from 'common/classes';
|
||||||
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
import { useMoneyInDailogContext } from '../MoneyInDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transfer from account form fields.
|
* Transfer from account form fields.
|
||||||
*/
|
*/
|
||||||
function TransferFromAccountFormFields() {
|
function TransferFromAccountFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money in dialog context.
|
// Money in dialog context.
|
||||||
const { accounts } = useMoneyInDailogContext();
|
const { accounts } = useMoneyInDailogContext();
|
||||||
|
|
||||||
const amountFieldRef = useAutofocus();
|
const amountFieldRef = useAutofocus();
|
||||||
|
|
||||||
|
// Handle tranaction number changing.
|
||||||
|
const handleTransactionNumberChange = () => {
|
||||||
|
openDialog('transaction-number-form');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle transaction no. field blur.
|
||||||
|
const handleTransactionNoBlur = (form, field) => (event) => {
|
||||||
|
const newValue = event.target.value;
|
||||||
|
|
||||||
|
if (field.value !== newValue && transactionAutoIncrement) {
|
||||||
|
openDialog('transaction-number-form', {
|
||||||
|
initialFormValues: {
|
||||||
|
manualTransactionNo: newValue,
|
||||||
|
incrementMode: 'manual-transaction',
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Syncs transaction number settings with form.
|
||||||
|
useObserveTransactionNoSettings(
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
);
|
||||||
return (
|
return (
|
||||||
<React.Fragment>
|
<React.Fragment>
|
||||||
<Row>
|
<Row>
|
||||||
@@ -81,10 +119,31 @@ function TransferFromAccountFormFields() {
|
|||||||
helperText={<ErrorMessage name="transaction_number" />}
|
helperText={<ErrorMessage name="transaction_number" />}
|
||||||
className={'form-group--transaction_number'}
|
className={'form-group--transaction_number'}
|
||||||
>
|
>
|
||||||
<InputGroup
|
<ControlGroup fill={true}>
|
||||||
intent={inputIntent({ error, touched })}
|
<InputGroup
|
||||||
{...field}
|
minimal={true}
|
||||||
/>
|
value={field.value}
|
||||||
|
asyncControl={true}
|
||||||
|
onBlur={handleTransactionNoBlur(form, field)}
|
||||||
|
/>
|
||||||
|
<InputPrependButton
|
||||||
|
buttonProps={{
|
||||||
|
onClick: handleTransactionNumberChange,
|
||||||
|
icon: <Icon icon={'settings-18'} />,
|
||||||
|
}}
|
||||||
|
tooltip={true}
|
||||||
|
tooltipProps={{
|
||||||
|
content: (
|
||||||
|
<T
|
||||||
|
id={
|
||||||
|
'cash_flow.setting_your_auto_generated_transaction_number'
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
position: Position.BOTTOM_LEFT,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</ControlGroup>
|
||||||
</FormGroup>
|
</FormGroup>
|
||||||
)}
|
)}
|
||||||
</FastField>
|
</FastField>
|
||||||
@@ -194,4 +253,11 @@ function TransferFromAccountFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default TransferFromAccountFormFields;
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(TransferFromAccountFormFields);
|
||||||
|
|||||||
12
src/containers/Dialogs/MoneyInDialog/utils.js
Normal file
12
src/containers/Dialogs/MoneyInDialog/utils.js
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { useFormikContext } from 'formik';
|
||||||
|
import { transactionNumber } from 'utils';
|
||||||
|
|
||||||
|
export const useObserveTransactionNoSettings = (prefix, nextNumber) => {
|
||||||
|
const { setFieldValue } = useFormikContext();
|
||||||
|
|
||||||
|
React.useEffect(() => {
|
||||||
|
const TransactionNo = transactionNumber(prefix, nextNumber);
|
||||||
|
setFieldValue('transacttion_numner', TransactionNo);
|
||||||
|
}, [setFieldValue, prefix, nextNumber]);
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user