QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs.

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-05-12 04:40:42 +02:00
parent 4ab85eaf09
commit 5ffb54992e
22 changed files with 221 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/containers/Accounting/MakeJournalEntriesForm.js
View File

@@ -132,7 +132,7 @@ function MakeJournalEntriesForm({
initialValues: {
...initialValues,
},
onSubmit: async (values, { setErrors, setSubmitting }) => {
onSubmit: async (values, { setErrors, setSubmitting, resetForm }) => {
const entries = values.entries.filter((entry) => (
(entry.credit || entry.debit)
));
@@ -171,11 +171,12 @@ function MakeJournalEntriesForm({
setSubmitting(false);
saveInvokeSubmit({ action: 'update', ...payload });
clearSavedMediaIds([]);
resetForm();
resolve(response);
}).catch((errors) => {
if (errors.find(e => e.type === 'JOURNAL.NUMBER.ALREADY.EXISTS')) {
setErrors({
journal_number: 'Journal number is already used.',
journal_number: formatMessage({ id: 'journal_number_is_already_used' }),
});
}
setSubmitting(false);
@@ -194,11 +195,12 @@ function MakeJournalEntriesForm({
setSubmitting(false);
saveInvokeSubmit({ action: 'new', ...payload });
clearSavedMediaIds();
resetForm();
resolve(response);
}).catch((errors) => {
if (errors.find(e => e.type === 'JOURNAL.NUMBER.ALREADY.EXISTS')) {
setErrors({
journal_number: 'Journal number is already used.',
journal_number: formatMessage({ id: 'journal_number_is_already_used' }),
});
}
setSubmitting(false);

1
client/src/containers/Accounting/ManualJournalActionsBar.js
View File

@@ -27,6 +27,7 @@ import withManualJournalsActions from 'containers/Accounting/withManualJournalsA
import { FormattedMessage as T, useIntl } from 'react-intl';
function ManualJournalActionsBar({
// #withResourceDetail
resourceName = 'manual_journal',

5
client/src/containers/Accounting/ManualJournalsDataTable.js
View File

@@ -9,6 +9,7 @@ import {
MenuItem,
MenuDivider,
Position,
Tag,
} from '@blueprintjs/core';
import { useParams } from 'react-router-dom';
import { FormattedMessage as T, useIntl } from 'react-intl';
@@ -145,7 +146,9 @@ function ManualJournalsDataTable({
id: 'status',
Header: formatMessage({ id: 'status' }),
accessor: (r) => {
return r.status ? 'Published' : 'Draft';
return r.status
? <Tag minimal={true}><T id={'published'} /></Tag> :
<Tag minimal={true} intent={Intent.WARNING}><T id={'draft'} /></Tag>;
},
disableResizing: true,
width: 100,

93
client/src/containers/Accounting/ManualJournalsList.js
View File

@@ -1,4 +1,4 @@
import React, { useEffect, useState, useCallback } from 'react';
import React, { useEffect, useState, useMemo, useCallback } from 'react';
import { Route, Switch, useHistory } from 'react-router-dom';
import { useQuery } from 'react-query';
import { Alert, Intent } from '@blueprintjs/core';
@@ -36,17 +36,20 @@ function ManualJournalsTable({
addManualJournalsTableQueries,
}) {
const history = useHistory();
const [deleteManualJournal, setDeleteManualJournal] = useState(false);
const [deleteBulk, setDeleteBulk] = useState(false);
const [selectedRows, setSelectedRows] = useState([]);
const [bulkDelete, setBulkDelete] = useState(false);
const { formatMessage } = useIntl();
const fetchViews = useQuery('journals-resource-views', () => {
return requestFetchResourceViews('manual_journals');
});
const fetchManualJournals = useQuery('manual-journals-table', () =>
requestFetchManualJournalsTable()
);
const fetchManualJournals = useQuery('manual-journals-table',
() => requestFetchManualJournalsTable());
useEffect(() => {
changePageTitle(formatMessage({id:'manual_journals'}));
@@ -68,11 +71,24 @@ function ManualJournalsTable({
// Handle confirm delete manual journal.
const handleConfirmManualJournalDelete = useCallback(() => {
requestDeleteManualJournal(deleteManualJournal.id).then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_journal_has_been_successfully_deleted',
}, {
number: deleteManualJournal.journal_number,
}),
intent: Intent.SUCCESS,
});
setDeleteManualJournal(false);
AppToaster.show({ message: 'the_manual_Journal_has_been_deleted' });
});
}, [deleteManualJournal, requestDeleteManualJournal]);
// Calculates the selected rows count.
const selectedRowsCount = useMemo(
() => Object.values(selectedRows).length,
[selectedRows]);
const handleBulkDelete = useCallback(
(accountsIds) => {
setBulkDelete(accountsIds);
@@ -80,17 +96,26 @@ function ManualJournalsTable({
[setBulkDelete]
);
// Handle confirm journals bulk delete.
const handleConfirmBulkDelete = useCallback(() => {
requestDeleteBulkManualJournals(bulkDelete)
.then(() => {
AppToaster.show({
message: formatMessage({
id: 'the_journals_has_been_successfully_deleted',
}, {
count: selectedRowsCount,
}),
intent: Intent.SUCCESS,
});
setBulkDelete(false);
AppToaster.show({ message: 'the_accounts_have_been_deleted' });
})
.catch((error) => {
setBulkDelete(false);
});
}, [requestDeleteBulkManualJournals, bulkDelete]);
// Handle cancel bulk delete alert.
const handleCancelBulkDelete = useCallback(() => {
setBulkDelete(false);
}, []);
@@ -104,28 +129,23 @@ function ManualJournalsTable({
// Handle filter change to re-fetch data-table.
const handleFilterChanged = useCallback(() => {
fetchManualJournals.refetch();
}, [fetchManualJournals]);
// Handle view change to re-fetch data table.
const handleViewChanged = useCallback(() => {
fetchManualJournals.refetch();
}, [fetchManualJournals]);
// Handle fetch data of manual jouranls datatable.
const handleFetchData = useCallback(
({ pageIndex, pageSize, sortBy }) => {
addManualJournalsTableQueries({
...(sortBy.length > 0
? {
column_sort_by: sortBy[0].id,
sort_order: sortBy[0].desc ? 'desc' : 'asc',
}
: {}),
});
},
[addManualJournalsTableQueries]
);
const handleFetchData = useCallback(({ pageIndex, pageSize, sortBy }) => {
addManualJournalsTableQueries({
...(sortBy.length > 0) ? {
column_sort_by: sortBy[0].id,
sort_order: sortBy[0].desc ? 'desc' : 'asc',
} : {},
});
}, [addManualJournalsTableQueries]);
const handlePublishJournal = useCallback(
(journal) => {
@@ -165,45 +185,40 @@ function ManualJournalsTable({
'/dashboard/accounting/manual-journals/:custom_view_id/custom_view',
'/dashboard/accounting/manual-journals',
]}>
<ManualJournalsViewTabs />
<ManualJournalsDataTable
onDeleteJournal={handleDeleteJournal}
onFetchData={handleFetchData}
onEditJournal={handleEditJournal}
onPublishJournal={handlePublishJournal}
onSelectedRowsChange={handleSelectedRowsChange}
/>
</Route>
</Switch>
<ManualJournalsDataTable
onDeleteJournal={handleDeleteJournal}
onFetchData={handleFetchData}
onEditJournal={handleEditJournal}
onPublishJournal={handlePublishJournal}
onSelectedRowsChange={handleSelectedRowsChange}
/>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'move_to_trash'} />}
confirmButtonText={<T id={'delete'} />}
icon='trash'
intent={Intent.DANGER}
isOpen={deleteManualJournal}
onCancel={handleCancelManualJournalDelete}
onConfirm={handleConfirmManualJournalDelete}
>
<p>
Are you sure you want to move <b>filename</b> to Trash? You will be
able to restore it later, but it will become private to you.
</p>
<p><T id={'once_delete_this_journal_category_you_will_able_to_restore_it'} /></p>
</Alert>
<Alert
cancelButtonText={<T id={'cancel'} />}
confirmButtonText={<T id={'move_to_trash'} />}
confirmButtonText={<T id={'delete_count'} values={{ count: selectedRowsCount }} />}
icon='trash'
intent={Intent.DANGER}
isOpen={bulkDelete}
onCancel={handleCancelBulkDelete}
onConfirm={handleConfirmBulkDelete}
>
<p>
Are you sure you want to move <b>filename</b> to Trash? You will be
able to restore it later, but it will become private to you.
</p>
<p><T id={'once_delete_these_journalss_you_will_not_able_restore_them'} /></p>
</Alert>
</DashboardPageContent>
</DashboardInsider>

25
client/src/containers/Accounting/ManualJournalsViewTabs.js
View File

@@ -8,12 +8,14 @@ import {
Tab,
Button,
} from '@blueprintjs/core';
import { useParams } from 'react-router-dom';
import Icon from 'components/Icon';
import { useParams, withRouter } from 'react-router-dom';
import { Link } from 'react-router-dom';
import { compose } from 'utils';
import { connect } from 'react-redux';
import { FormattedMessage as T } from 'react-intl';
import { useUpdateEffect } from 'hooks';
import { compose } from 'utils';
import Icon from 'components/Icon';
import withManualJournals from './withManualJournals';
import withManualJournalsActions from './withManualJournalsActions';
@@ -85,10 +87,14 @@ function ManualJournalsViewTabs({
<Tab
id='all'
title={
<Link to={`/dashboard/accounting/manual-journals`}>All</Link>
<Link to={`/dashboard/accounting/manual-journals`}>
<T id={'all'} />
</Link>
}
/>
{tabs}
{ tabs }
<Button
className='button--new-view'
icon={<Icon icon='plus' />}
@@ -101,7 +107,16 @@ function ManualJournalsViewTabs({
);
}
const mapStateToProps = (state, ownProps) => ({
// Mapping view id from matched route params.
viewId: ownProps.match.params.custom_view_id,
});
const withManualJournalsViewTabs = connect(mapStateToProps);
export default compose(
withRouter,
withManualJournalsViewTabs,
withManualJournals(({ manualJournalsViews }) => ({
manualJournalsViews,
})),