mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-21 15:20:34 +00:00
feat: add auto increment/ money out.
This commit is contained in:
@@ -14,10 +14,11 @@ import { CreateMoneyOutSchema } from './MoneyOutForm.schema';
|
|||||||
|
|
||||||
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
|
import { useMoneyOutDialogContext } from './MoneyOutDialogProvider';
|
||||||
|
|
||||||
|
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 MoneyOutForm({
|
|||||||
|
|
||||||
// #withCurrentOrganization
|
// #withCurrentOrganization
|
||||||
organization: { base_currency },
|
organization: { base_currency },
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionNextNumber,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionIncrementMode,
|
||||||
}) {
|
}) {
|
||||||
const {
|
const {
|
||||||
dialogName,
|
dialogName,
|
||||||
@@ -46,11 +52,20 @@ function MoneyOutForm({
|
|||||||
submitPayload,
|
submitPayload,
|
||||||
} = useMoneyOutDialogContext();
|
} = useMoneyOutDialogContext();
|
||||||
|
|
||||||
|
// 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,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -90,4 +105,9 @@ function MoneyOutForm({
|
|||||||
export default compose(
|
export default compose(
|
||||||
withDialogActions,
|
withDialogActions,
|
||||||
withCurrentOrganization(),
|
withCurrentOrganization(),
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
transactionIncrementMode: cashflowSetting?.autoIncrement,
|
||||||
|
})),
|
||||||
)(MoneyOutForm);
|
)(MoneyOutForm);
|
||||||
|
|||||||
@@ -2,8 +2,8 @@ import React from 'react';
|
|||||||
import { Form } from 'formik';
|
import { Form } from 'formik';
|
||||||
|
|
||||||
import MoneyOutFormFields from './MoneyOutFormFields';
|
import MoneyOutFormFields from './MoneyOutFormFields';
|
||||||
|
import MoneyOutFormDialog from './MoneyOutFormDialog'
|
||||||
import MoneyOutFloatingActions from './MoneyOutFloatingActions';
|
import MoneyOutFloatingActions from './MoneyOutFloatingActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Money out form content.
|
* Money out form content.
|
||||||
*/
|
*/
|
||||||
@@ -11,6 +11,7 @@ export default function MoneyOutFormContent() {
|
|||||||
return (
|
return (
|
||||||
<Form>
|
<Form>
|
||||||
<MoneyOutFormFields />
|
<MoneyOutFormFields />
|
||||||
|
<MoneyOutFormDialog/>
|
||||||
<MoneyOutFloatingActions />
|
<MoneyOutFloatingActions />
|
||||||
</Form>
|
</Form>
|
||||||
);
|
);
|
||||||
|
|||||||
27
src/containers/Dialogs/MoneyOutDialog/MoneyOutFormDialog.js
Normal file
27
src/containers/Dialogs/MoneyOutDialog/MoneyOutFormDialog.js
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { useFormikContext } from 'formik';
|
||||||
|
|
||||||
|
import TransactionNumberDialog from '../../Dialogs/TransactionNumberDialog';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Money out form dialog.
|
||||||
|
*/
|
||||||
|
export default function MoneyOutFormDialog() {
|
||||||
|
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 { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Other expense form fields.
|
* Other expense form fields.
|
||||||
*/
|
*/
|
||||||
function OtherExpnseFormFields() {
|
function OtherExpnseFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money in dialog context.
|
// Money in dialog context.
|
||||||
const { accounts } = useMoneyOutDialogContext();
|
const { accounts } = useMoneyOutDialogContext();
|
||||||
|
|
||||||
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 OtherExpnseFormFields() {
|
|||||||
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>
|
||||||
@@ -192,4 +252,11 @@ function OtherExpnseFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default OtherExpnseFormFields;
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(OtherExpnseFormFields);
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ import {
|
|||||||
InputPrependText,
|
InputPrependText,
|
||||||
MoneyInputGroup,
|
MoneyInputGroup,
|
||||||
FieldRequiredHint,
|
FieldRequiredHint,
|
||||||
|
InputPrependButton,
|
||||||
|
Icon,
|
||||||
Col,
|
Col,
|
||||||
Row,
|
Row,
|
||||||
} from 'components';
|
} from 'components';
|
||||||
@@ -26,19 +28,56 @@ import {
|
|||||||
momentFormatter,
|
momentFormatter,
|
||||||
tansformDateValue,
|
tansformDateValue,
|
||||||
handleDateChange,
|
handleDateChange,
|
||||||
|
compose,
|
||||||
} from 'utils';
|
} from 'utils';
|
||||||
import { CLASSES } from 'common/classes';
|
import { CLASSES } from 'common/classes';
|
||||||
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Owner drawings form fields.
|
* Owner drawings form fields.
|
||||||
*/
|
*/
|
||||||
function OwnerDrawingsFormFields() {
|
function OwnerDrawingsFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money out dialog context.
|
// Money out dialog context.
|
||||||
const { accounts } = useMoneyOutDialogContext();
|
const { accounts } = useMoneyOutDialogContext();
|
||||||
|
|
||||||
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>
|
||||||
@@ -80,10 +119,31 @@ function OwnerDrawingsFormFields() {
|
|||||||
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>
|
||||||
@@ -188,4 +248,11 @@ function OwnerDrawingsFormFields() {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
export default OwnerDrawingsFormFields;
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(OwnerDrawingsFormFields);
|
||||||
|
|||||||
@@ -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 { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
import { useMoneyOutDialogContext } from '../MoneyOutDialogProvider';
|
||||||
|
import { useObserveTransactionNoSettings } from '../utils';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Transfer to account form fields.
|
* Transfer to account form fields.
|
||||||
*/
|
*/
|
||||||
function TransferToAccountFormFields() {
|
function TransferToAccountFormFields({
|
||||||
|
// #withDialogActions
|
||||||
|
openDialog,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
transactionAutoIncrement,
|
||||||
|
transactionNumberPrefix,
|
||||||
|
transactionNextNumber,
|
||||||
|
}) {
|
||||||
// Money in dialog context.
|
// Money in dialog context.
|
||||||
const { accounts } = useMoneyOutDialogContext();
|
const { accounts } = useMoneyOutDialogContext();
|
||||||
|
|
||||||
const accountRef = useAutofocus();
|
const accountRef = 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 TransferToAccountFormFields() {
|
|||||||
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>
|
||||||
@@ -193,5 +253,11 @@ function TransferToAccountFormFields() {
|
|||||||
</React.Fragment>
|
</React.Fragment>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
export default compose(
|
||||||
export default TransferToAccountFormFields;
|
withDialogActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
transactionAutoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
transactionNextNumber: cashflowSetting?.nextNumber,
|
||||||
|
transactionNumberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
})),
|
||||||
|
)(TransferToAccountFormFields);
|
||||||
|
|||||||
12
src/containers/Dialogs/MoneyOutDialog/utils.js
Normal file
12
src/containers/Dialogs/MoneyOutDialog/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]);
|
||||||
|
};
|
||||||
@@ -0,0 +1,103 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import intl from 'react-intl-universal';
|
||||||
|
import { useSaveSettings } from 'hooks/query';
|
||||||
|
|
||||||
|
import { TransactionNumberDialogProvider } from './TransactionNumberDialogProvider';
|
||||||
|
import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
|
||||||
|
|
||||||
|
import withDialogActions from 'containers/Dialog/withDialogActions';
|
||||||
|
import withSettings from 'containers/Settings/withSettings';
|
||||||
|
import withSettingsActions from 'containers/Settings/withSettingsActions';
|
||||||
|
import { compose } from 'utils';
|
||||||
|
import {
|
||||||
|
transformFormToSettings,
|
||||||
|
transformSettingsToForm,
|
||||||
|
} from 'containers/JournalNumber/utils';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transaction number dialog content.
|
||||||
|
*/
|
||||||
|
function TransactionNumberDialogContent({
|
||||||
|
// #ownProps
|
||||||
|
initialValues,
|
||||||
|
onConfirm,
|
||||||
|
|
||||||
|
// #withSettings
|
||||||
|
nextNumber,
|
||||||
|
numberPrefix,
|
||||||
|
autoIncrement,
|
||||||
|
|
||||||
|
// #withDialogActions
|
||||||
|
closeDialog,
|
||||||
|
}) {
|
||||||
|
const { mutateAsync: saveSettings } = useSaveSettings();
|
||||||
|
const [referenceFormValues, setReferenceFormValues] = React.useState(null);
|
||||||
|
|
||||||
|
// Handle the submit form.
|
||||||
|
const handleSubmitForm = (values, { setSubmitting }) => {
|
||||||
|
// Handle the form success.
|
||||||
|
const handleSuccess = () => {
|
||||||
|
setSubmitting(false);
|
||||||
|
closeDialog('transaction-number-form');
|
||||||
|
onConfirm(values);
|
||||||
|
};
|
||||||
|
// Handle the form errors.
|
||||||
|
const handleErrors = () => {
|
||||||
|
setSubmitting(false);
|
||||||
|
};
|
||||||
|
if (values.incrementMode === 'manual-transaction') {
|
||||||
|
handleSuccess();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Transformes the form values to settings to save it.
|
||||||
|
const options = transformFormToSettings(values, 'cashflow');
|
||||||
|
|
||||||
|
// Save the settings.
|
||||||
|
saveSettings({ options }).then(handleSuccess).catch(handleErrors);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Description.
|
||||||
|
const description =
|
||||||
|
referenceFormValues?.incrementMode === 'auto'
|
||||||
|
? intl.get('cash_flow.auto_increment.auto')
|
||||||
|
: intl.get('cash_flow.auto_increment.manually');
|
||||||
|
|
||||||
|
// Handle the dialog close.
|
||||||
|
const handleClose = () => {
|
||||||
|
closeDialog('transaction-number-form');
|
||||||
|
};
|
||||||
|
|
||||||
|
// Handle form change.
|
||||||
|
const handleChange = (values) => {
|
||||||
|
setReferenceFormValues(values);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TransactionNumberDialogProvider>
|
||||||
|
<ReferenceNumberForm
|
||||||
|
initialValues={{
|
||||||
|
...transformSettingsToForm({
|
||||||
|
nextNumber,
|
||||||
|
numberPrefix,
|
||||||
|
autoIncrement,
|
||||||
|
}),
|
||||||
|
...initialValues,
|
||||||
|
}}
|
||||||
|
description={description}
|
||||||
|
onSubmit={handleSubmitForm}
|
||||||
|
onClose={handleClose}
|
||||||
|
onChange={handleChange}
|
||||||
|
/>
|
||||||
|
</TransactionNumberDialogProvider>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default compose(
|
||||||
|
withDialogActions,
|
||||||
|
withSettingsActions,
|
||||||
|
withSettings(({ cashflowSetting }) => ({
|
||||||
|
nextNumber: cashflowSetting?.nextNumber,
|
||||||
|
numberPrefix: cashflowSetting?.numberPrefix,
|
||||||
|
autoIncrement: cashflowSetting?.autoIncrement,
|
||||||
|
})),
|
||||||
|
)(TransactionNumberDialogContent);
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { DialogContent } from 'components';
|
||||||
|
import { useSettingCashFlow } from 'hooks/query';
|
||||||
|
|
||||||
|
const TransactionNumberDialogContext = React.createContext();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transaction number dialog provider.
|
||||||
|
*/
|
||||||
|
function TransactionNumberDialogProvider({ query, ...props }) {
|
||||||
|
const { isLoading: isSettingsLoading } = useSettingCashFlow();
|
||||||
|
|
||||||
|
// Provider payload.
|
||||||
|
const provider = { isSettingsLoading };
|
||||||
|
|
||||||
|
return (
|
||||||
|
<DialogContent isLoading={isSettingsLoading}>
|
||||||
|
<TransactionNumberDialogContext.Provider value={provider} {...props} />
|
||||||
|
</DialogContent>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const useTransactionNumberDialogContext = () =>
|
||||||
|
React.useContext(TransactionNumberDialogContext);
|
||||||
|
|
||||||
|
export { TransactionNumberDialogProvider, useTransactionNumberDialogContext };
|
||||||
42
src/containers/Dialogs/TransactionNumberDialog/index.js
Normal file
42
src/containers/Dialogs/TransactionNumberDialog/index.js
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { FormattedMessage as T } from 'components';
|
||||||
|
import { Dialog, DialogSuspense } from 'components';
|
||||||
|
import withDialogRedux from 'components/DialogReduxConnect';
|
||||||
|
import { compose, saveInvoke } from 'utils';
|
||||||
|
|
||||||
|
const TransactionNumberDialogContent = React.lazy(() =>
|
||||||
|
import('./TransactionNumberDialogContent'),
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transaction number dialog.
|
||||||
|
*/
|
||||||
|
function TransctionNumberDialog({
|
||||||
|
dialogName,
|
||||||
|
payload: { initialFormValues },
|
||||||
|
isOpen,
|
||||||
|
onConfirm,
|
||||||
|
}) {
|
||||||
|
const handleConfirm = (values) => {
|
||||||
|
saveInvoke(onConfirm, values);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog
|
||||||
|
title={<T id={'transaction_number_settings'} />}
|
||||||
|
name={dialogName}
|
||||||
|
autoFocus={true}
|
||||||
|
canEscapeKeyClose={true}
|
||||||
|
isOpen={isOpen}
|
||||||
|
>
|
||||||
|
<DialogSuspense>
|
||||||
|
<TransactionNumberDialogContent
|
||||||
|
initialValues={{ ...initialFormValues }}
|
||||||
|
onConfirm={handleConfirm}
|
||||||
|
/>
|
||||||
|
</DialogSuspense>
|
||||||
|
</Dialog>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default compose(withDialogRedux())(TransctionNumberDialog);
|
||||||
@@ -18,7 +18,7 @@ export default (mapState) => {
|
|||||||
vendorsSettings: state.settings.data.vendors,
|
vendorsSettings: state.settings.data.vendors,
|
||||||
cashflowSettings: state.settings.data.cashflowAccounts,
|
cashflowSettings: state.settings.data.cashflowAccounts,
|
||||||
cashflowTransactionsSettings: state.settings.data.cashflowTransactions,
|
cashflowTransactionsSettings: state.settings.data.cashflowTransactions,
|
||||||
|
cashflowSetting: state.settings.data.cashflow,
|
||||||
};
|
};
|
||||||
return mapState ? mapState(mapped, state, props) : mapped;
|
return mapState ? mapState(mapped, state, props) : mapped;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ export function useSettingsPaymentReceives(props) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve sale receipts settings.
|
* Retrieve sale receipts settings.
|
||||||
* @param {*} props
|
* @param {*} props
|
||||||
*/
|
*/
|
||||||
export function useSettingsReceipts(props) {
|
export function useSettingsReceipts(props) {
|
||||||
return useSettingsQuery(
|
return useSettingsQuery(
|
||||||
@@ -91,7 +91,7 @@ export function useSettingsReceipts(props) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve sale receipts settings.
|
* Retrieve sale receipts settings.
|
||||||
* @param {*} props
|
* @param {*} props
|
||||||
*/
|
*/
|
||||||
export function useSettingsManualJournals(props) {
|
export function useSettingsManualJournals(props) {
|
||||||
return useSettingsQuery(
|
return useSettingsQuery(
|
||||||
@@ -103,12 +103,23 @@ export function useSettingsManualJournals(props) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Retrieve sale receipts settings.
|
* Retrieve sale receipts settings.
|
||||||
* @param {*} props
|
* @param {*} props
|
||||||
*/
|
*/
|
||||||
export function useSettingsItems(props) {
|
export function useSettingsItems(props) {
|
||||||
return useSettingsQuery(
|
return useSettingsQuery(
|
||||||
[t.SETTING, t.SETTING_ITEMS],
|
[t.SETTING, t.SETTING_ITEMS],
|
||||||
{ group: 'items' },
|
{ group: 'items' },
|
||||||
props,
|
props,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Retrieve cashflow settings.
|
||||||
|
*/
|
||||||
|
export function useSettingCashFlow(props) {
|
||||||
|
return useSettingsQuery(
|
||||||
|
[t.SETTING, t.SETTING_CASHFLOW],
|
||||||
|
{ group: 'cashflow' },
|
||||||
|
props,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ const SETTING = {
|
|||||||
SETTING_PAYMENT_RECEIVES: 'SETTING_PAYMENT_RECEIVES',
|
SETTING_PAYMENT_RECEIVES: 'SETTING_PAYMENT_RECEIVES',
|
||||||
SETTING_MANUAL_JOURNALS: 'SETTING_MANUAL_JOURNALS',
|
SETTING_MANUAL_JOURNALS: 'SETTING_MANUAL_JOURNALS',
|
||||||
SETTING_ITEMS: 'SETTING_ITEMS',
|
SETTING_ITEMS: 'SETTING_ITEMS',
|
||||||
|
SETTING_CASHFLOW: 'SETTING_CASHFLOW',
|
||||||
};
|
};
|
||||||
|
|
||||||
const ORGANIZATIONS = {
|
const ORGANIZATIONS = {
|
||||||
|
|||||||
@@ -641,6 +641,7 @@
|
|||||||
"Estimate_number_settings": "Estimate Number Settings",
|
"Estimate_number_settings": "Estimate Number Settings",
|
||||||
"receipt_number_settings": "Receipt Number Settings",
|
"receipt_number_settings": "Receipt Number Settings",
|
||||||
"invoice_number_settings": "Invoice Number Settings",
|
"invoice_number_settings": "Invoice Number Settings",
|
||||||
|
"transaction_number_settings": "Transaction Number Settings",
|
||||||
"receipt_number": "Receipt Number",
|
"receipt_number": "Receipt Number",
|
||||||
"estimate_number_is_not_unqiue": "Estimate number is not unqiue",
|
"estimate_number_is_not_unqiue": "Estimate number is not unqiue",
|
||||||
"invoice_number_is_not_unqiue": "Invoice number is not unqiue",
|
"invoice_number_is_not_unqiue": "Invoice number is not unqiue",
|
||||||
@@ -1393,7 +1394,11 @@
|
|||||||
"cash_flow_transaction.label_transfer_to_account":"Transfer to account",
|
"cash_flow_transaction.label_transfer_to_account":"Transfer to account",
|
||||||
"cash_flow_transaction.label_current_account":"Current account",
|
"cash_flow_transaction.label_current_account":"Current account",
|
||||||
"cash_flow_transaction.delete.alert_message":"The cashflow transaction has been deleted successfully",
|
"cash_flow_transaction.delete.alert_message":"The cashflow transaction has been deleted successfully",
|
||||||
"cash_flow_transaction_once_delete_this_transaction_you_will_able_to_restore_it": "Once you delete this transaction, you won't be able to restore it later. Are you sure you want to delete this transaction?"
|
"cash_flow_transaction_once_delete_this_transaction_you_will_able_to_restore_it": "Once you delete this transaction, you won't be able to restore it later. Are you sure you want to delete this transaction?",
|
||||||
|
"cash_flow.auto_increment.auto":"Your transaction numbers are set on auto-increment mode. Are you sure changing this setting?",
|
||||||
|
"cash_flow.auto_increment.manually":"Yor transaction numbers are set on manual mode. Are you sure chaning this settings?",
|
||||||
|
"cash_flow.setting_your_auto_generated_transaction_number": "Setting your auto-generated transaction number"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user