feat: add auto increment in vendor credit number.

This commit is contained in:
elforjani13
2021-12-01 14:02:54 +02:00
parent 432e2d202a
commit 43b91503d2
15 changed files with 366 additions and 19 deletions

View File

@@ -15,23 +15,31 @@ import VendorCreditNoteFormHeader from './VendorCreditNoteFormHeader';
import VendorCreditNoteItemsEntriesEditor from './VendorCreditNoteItemsEntriesEditor';
import VendorCreditNoteFormFooter from './VendorCreditNoteFormFooter';
import VendorCreditNoteFloatingActions from './VendorCreditNoteFloatingActions';
import VendorCreditNoteFormDialogs from './VendorCreditNoteFormDialogs';
import { useVendorCreditNoteFormContext } from './VendorCreditNoteFormProvider';
import { AppToaster } from 'components';
import { compose, safeSumBy } from 'utils';
import { compose, safeSumBy, transactionNumber } from 'utils';
import {
defaultVendorsCreditNote,
filterNonZeroEntries,
transformToEditForm,
transformFormValuesToRequest,
} from './utils';
import withSettings from 'containers/Settings/withSettings';
import withCurrentOrganization from 'containers/Organization/withCurrentOrganization';
/**
* Vendor Credit note form.
*/
function VendorCreditNoteForm({
// #withSettings
vendorcreditAutoIncrement,
vendorcreditNumberPrefix,
vendorcreditNextNumber,
// #withCurrentOrganization
organization: { base_currency },
}) {
@@ -46,6 +54,12 @@ function VendorCreditNoteForm({
editVendorCreditMutate,
} = useVendorCreditNoteFormContext();
// Credit number.
const vendorCreditNumber = transactionNumber(
vendorcreditNumberPrefix,
vendorcreditNextNumber,
);
// Initial values.
const initialValues = React.useMemo(
() => ({
@@ -55,6 +69,9 @@ function VendorCreditNoteForm({
}
: {
...defaultVendorsCreditNote,
...(vendorcreditAutoIncrement && {
vendor_credit_number: vendorCreditNumber,
}),
}),
}),
[vendorCredit, base_currency],
@@ -134,12 +151,19 @@ function VendorCreditNoteForm({
<VendorCreditNoteFormHeader />
<VendorCreditNoteItemsEntriesEditor />
<VendorCreditNoteFormFooter />
<VendorCreditNoteFloatingActions />
<VendorCreditNoteFormDialogs />
</Form>
</Formik>
</div>
);
}
export default compose(withCurrentOrganization())(VendorCreditNoteForm);
export default compose(
withSettings(({ vendorsCreditNoteSetting }) => ({
vendorcreditAutoIncrement: vendorsCreditNoteSetting?.autoIncrement,
vendorcreditNextNumber: vendorsCreditNoteSetting?.nextNumber,
vendorcreditNumberPrefix: vendorsCreditNoteSetting?.numberPrefix,
})),
withCurrentOrganization(),
)(VendorCreditNoteForm);

View File

@@ -0,0 +1,27 @@
import React from 'react';
import VendorCreditNumberDialog from '../../../Dialogs/VendorCreditNumberDialog';
import { useFormikContext } from 'formik';
/**
* Vendor credit form dialog.
*/
export default function VendorCreditNoteFormDialogs() {
// Update the form once the vendor credit number form submit confirm.
const handleVendorCreditNumberFormConfirm = ({
incrementNumber,
manually,
}) => {
setFieldValue('vendor_credit_number', incrementNumber || '');
setFieldValue('vendor_credit_no_manually', manually);
};
const { setFieldValue } = useFormikContext();
return (
<React.Fragment>
<VendorCreditNumberDialog
dialogName={'vendor-credit-form'}
onConfirm={handleVendorCreditNumberFormConfirm}
/>
</React.Fragment>
);
}

View File

@@ -1,5 +1,10 @@
import React from 'react';
import { FormGroup, InputGroup, Position } from '@blueprintjs/core';
import {
FormGroup,
InputGroup,
Position,
ControlGroup,
} from '@blueprintjs/core';
import { DateInput } from '@blueprintjs/datetime';
import { FastField, Field, ErrorMessage } from 'formik';
import { CLASSES } from 'common/classes';
@@ -7,10 +12,14 @@ import classNames from 'classnames';
import {
ContactSelecetList,
FieldRequiredHint,
InputPrependButton,
Icon,
FormattedMessage as T,
} from 'components';
import { vendorsFieldShouldUpdate } from './utils';
import {
vendorsFieldShouldUpdate,
useObserveVendorCreditNoSettings,
} from './utils';
import { useVendorCreditNoteFormContext } from './VendorCreditNoteFormProvider';
@@ -22,13 +31,48 @@ import {
handleDateChange,
} from 'utils';
import withSettings from 'containers/Settings/withSettings';
import withDialogActions from 'containers/Dialog/withDialogActions';
/**
* Vendor Credit note form header fields.
*/
function VendorCreditNoteFormHeaderFields({
// #withDialogActions
openDialog,
function VendorCreditNoteFormHeaderFields() {
// Credit note form context.
// #withSettings
vendorcreditAutoIncrement,
vendorcreditNumberPrefix,
vendorcreditNextNumber,
}) {
// Vendor Credit form context.
const { vendors } = useVendorCreditNoteFormContext();
// Handle vendor credit number changing.
const handleVendorCreditNumberChange = () => {
openDialog('vendor-credit-form');
};
// Handle vendor credit no. field blur.
const handleVendorCreditNoBlur = (form, field) => (event) => {
const newValue = event.target.value;
if (field.value !== newValue && vendorcreditAutoIncrement) {
openDialog('vendor-credit-form', {
initialFormValues: {
manualTransactionNo: newValue,
incrementMode: 'manual-transaction',
},
});
}
};
// Syncs vendor credit number settings with form.
useObserveVendorCreditNoSettings(
vendorcreditNumberPrefix,
vendorcreditNextNumber,
);
return (
<div className={classNames(CLASSES.PAGE_FORM_HEADER_FIELDS)}>
{/* ----------- Vendor name ----------- */}
@@ -94,7 +138,7 @@ function VendorCreditNoteFormHeaderFields() {
{/* ----------- Vendor Credit No # ----------- */}
<FastField name={'vendor_credit_number'}>
{({ field, meta: { error, touched } }) => (
{({ form, field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'credit_note.label_credit_note'} />}
inline={true}
@@ -102,12 +146,34 @@ function VendorCreditNoteFormHeaderFields() {
intent={inputIntent({ error, touched })}
helperText={<ErrorMessage name="vendor_credit_number" />}
>
<InputGroup minimal={true} {...field} />
<ControlGroup fill={true}>
<InputGroup
minimal={true}
value={field.value}
asyncControl={true}
onBlur={handleVendorCreditNoBlur(form, field)}
/>
<InputPrependButton
buttonProps={{
onClick: handleVendorCreditNumberChange,
icon: <Icon icon={'settings-18'} />,
}}
tooltip={true}
tooltipProps={{
content: (
<T
id={'setting_your_auto_generated_vendor_credit_number'}
/>
),
position: Position.BOTTOM_LEFT,
}}
/>
</ControlGroup>
</FormGroup>
)}
</FastField>
{/* ----------- Reference ----------- */}
{/* <FastField name={'reference_no'}>
<FastField name={'reference_no'}>
{({ field, meta: { error, touched } }) => (
<FormGroup
label={<T id={'reference_no'} />}
@@ -119,9 +185,16 @@ function VendorCreditNoteFormHeaderFields() {
<InputGroup minimal={true} {...field} />
</FormGroup>
)}
</FastField> */}
</FastField>
</div>
);
}
export default VendorCreditNoteFormHeaderFields;
export default compose(
withDialogActions,
withSettings(({ vendorsCreditNoteSetting }) => ({
vendorcreditAutoIncrement: vendorsCreditNoteSetting?.autoIncrement,
vendorcreditNextNumber: vendorsCreditNoteSetting?.nextNumber,
vendorcreditNumberPrefix: vendorsCreditNoteSetting?.numberPrefix,
})),
)(VendorCreditNoteFormHeaderFields);

View File

@@ -7,6 +7,7 @@ import {
useVendorCredit,
useItems,
useVendors,
useSettingsVendorCredits,
} from 'hooks/query';
const VendorCreditNoteFormContext = React.createContext();
@@ -23,6 +24,9 @@ function VendorCreditNoteFormProvider({ vendorCreditId, ...props }) {
page_size: 10000,
});
// Handle fetching settings.
useSettingsVendorCredits();
// Handle fetch vendors data table or list
const {
data: { vendors },

View File

@@ -6,12 +6,14 @@ import {
defaultFastFieldShouldUpdate,
transformToForm,
repeatValue,
transactionNumber,
orderingLinesIndexes,
} from 'utils';
import {
updateItemsEntriesTotal,
ensureEntriesHaveEmptyLine,
} from 'containers/Entries/utils';
import { useFormikContext } from 'formik';
export const MIN_LINES_NUMBER = 4;
@@ -30,6 +32,7 @@ export const defaultCreditNoteEntry = {
export const defaultVendorsCreditNote = {
vendor_id: '',
vendor_credit_number: '',
vendor_credit_no_manually: false,
vendor_credit_date: moment(new Date()).format('YYYY-MM-DD'),
// reference_no: '',
note: '',
@@ -112,3 +115,15 @@ export const entriesFieldShouldUpdate = (newProps, oldProps) => {
defaultFastFieldShouldUpdate(newProps, oldProps)
);
};
/**
* Syncs invoice no. settings with form.
*/
export const useObserveVendorCreditNoSettings = (prefix, nextNumber) => {
const { setFieldValue } = useFormikContext();
React.useEffect(() => {
const creditNo = transactionNumber(prefix, nextNumber);
setFieldValue('vendor_credit_number', creditNo);
}, [setFieldValue, prefix, nextNumber]);
};

View File

@@ -66,7 +66,7 @@ function VendorsCreditNoteActionsBar({
// Handle table row size change.
const handleTableRowSizeChange = (size) => {
addSetting('vendorCredits', 'tableSize', size);
addSetting('vendorCredit', 'tableSize', size);
};
return (