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

Fix : Auto-Increment Dialog

Browse Source
This commit is contained in:
elforjani3
2020-11-08 21:19:54 +02:00
parent 3ab6c4da2a
commit 6c8ff20847
19 changed files with 194 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/containers/Dialogs/EstimateNumberDialog/EstimateNumberDialogContent.js
View File

@@ -1,12 +1,12 @@
import React from 'react';
import React, { useCallback } from 'react';
import { DialogContent } from 'components';
import { useQuery, queryCache } from 'react-query';
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 withEstimateActions from 'containers/Sales/Estimate/withEstimateActions';
import withSettings from 'containers/Settings/withSettings';
import { compose, optionsMapToArray } from 'utils';
@@ -49,9 +49,9 @@ function EstimateNumberDialogContent({
});
};
const handleClose = () => {
const handleClose = useCallback(() => {
closeDialog('estimate-number-form');
};
}, [closeDialog]);
return (
<DialogContent isLoading={fetchSettings.isFetching}>
@@ -69,8 +69,8 @@ export default compose(
withDialogActions,
withSettingsActions,
withSettings(({ estimatesSettings }) => ({
nextNumber: estimatesSettings?.next_number,
numberPrefix: estimatesSettings?.number_prefix,
nextNumber: estimatesSettings?.nextNumber,
numberPrefix: estimatesSettings?.numberPrefix,
})),
withEstimateActions,
)(EstimateNumberDialogContent);

21
client/src/containers/Dialogs/InvoiceNumberDialog/InvoiceNumberDialogContent.js
View File

@@ -1,12 +1,13 @@
import React from 'react';
import React, { useCallback } from 'react';
import { DialogContent } from 'components';
import { useQuery, queryCache } from 'react-query';
import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import withSettings from 'containers/Settings/withSettings';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import withInvoicesActions from 'containers/Sales/Invoice/withInvoiceActions';
import { compose, optionsMapToArray } from 'utils';
@@ -25,6 +26,9 @@ function InvoiceNumberDialogContent({
// #withDialogActions
closeDialog,
// #withInvoicesActions
setInvoiceNumberChanged,
}) {
const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
@@ -40,6 +44,7 @@ function InvoiceNumberDialogContent({
setTimeout(() => {
queryCache.invalidateQueries('settings');
setInvoiceNumberChanged(true);
}, 250);
})
.catch(() => {
@@ -47,9 +52,9 @@ function InvoiceNumberDialogContent({
});
};
const handleClose = () => {
const handleClose = useCallback(() => {
closeDialog('invoice-number-form');
};
}, [closeDialog]);
return (
<DialogContent isLoading={fetchSettings.isFetching}>
@@ -67,8 +72,8 @@ export default compose(
withDialogActions,
withSettingsActions,
withSettings(({ invoiceSettings }) => ({
nextNumber: invoiceSettings?.next_number,
numberPrefix: invoiceSettings?.number_prefix,
nextNumber: invoiceSettings?.nextNumber,
numberPrefix: invoiceSettings?.numberPrefix,
})),
) (InvoiceNumberDialogContent);
withInvoicesActions,
)(InvoiceNumberDialogContent);

2
client/src/containers/Dialogs/InvoiceNumberDialog/index.js
View File

@@ -11,7 +11,7 @@ const InvoiceNumberDialogContent = lazy(() =>
function InvoiceNumberDialog({ dialogName, payload = { id: null }, isOpen }) {
return (
<Dialog
title={<T id={'bill_number_settings'} />}
title={<T id={'invoice_number_settings'} />}
name={dialogName}
autoFocus={true}
canEscapeKeyClose={true}

18
client/src/containers/Dialogs/ReceiptNumberDialog/ReceiptNumberDialogContent.js
View File

@@ -1,12 +1,13 @@
import React from 'react';
import React, { useCallback } from 'react';
import { DialogContent } from 'components';
import { useQuery, queryCache } from 'react-query';
import ReferenceNumberForm from 'containers/JournalNumber/ReferenceNumberForm';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import withSettings from 'containers/Settings/withSettings';
import withSettingsActions from 'containers/Settings/withSettingsActions';
import withReceiptActions from 'containers/Sales/Receipt/withReceiptActions';
import { compose, optionsMapToArray } from 'utils';
@@ -25,6 +26,9 @@ function ReceiptNumberDialogContent({
// #withDialogActions
closeDialog,
// #withReceiptActions
setReceiptNumberChanged,
}) {
const fetchSettings = useQuery(['settings'], () => requestFetchOptions({}));
@@ -40,6 +44,7 @@ function ReceiptNumberDialogContent({
setTimeout(() => {
queryCache.invalidateQueries('settings');
setReceiptNumberChanged(true);
}, 250);
})
.catch(() => {
@@ -47,9 +52,9 @@ function ReceiptNumberDialogContent({
});
};
const handleClose = () => {
const handleClose = useCallback(() => {
closeDialog('receipt-number-form');
};
}, [closeDialog]);
return (
<DialogContent isLoading={fetchSettings.isFetching}>
@@ -67,7 +72,8 @@ export default compose(
withDialogActions,
withSettingsActions,
withSettings(({ receiptSettings }) => ({
nextNumber: receiptSettings?.next_number,
numberPrefix: receiptSettings?.number_prefix,
nextNumber: receiptSettings?.nextNumber,
numberPrefix: receiptSettings?.numberPrefix,
})),
withReceiptActions,
)(ReceiptNumberDialogContent);