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

Merge remote-tracking branch 'origin/fix_connectors'

Browse Source
This commit is contained in:
Ahmed Bouhuolia
2020-06-01 22:55:14 +02:00
parent 6d35051bab e1f56c873b
commit dc211bbe7e
52 changed files with 353 additions and 747 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,7 @@ import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import AppToaster from 'components/AppToaster';
import Dragzone from 'components/Dragzone';
import MediaConnect from 'connectors/Media.connect';
import withMediaActions from 'containers/Media/withMediaActions';
import useMedia from 'hooks/useMedia';
import { compose } from 'utils';
@@ -321,5 +321,5 @@ export default compose(
withManualJournalDetail,
withAccountsActions,
withDashboardActions,
MediaConnect,
withMediaActions,
)(MakeJournalEntriesForm);

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

@@ -16,10 +16,10 @@ import classNames from 'classnames';
import { useRouteMatch, useHistory } from 'react-router-dom';
import { FormattedMessage as T } from 'react-intl';
import FilterDropdown from 'components/FilterDropdown';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import DialogConnect from 'connectors/Dialog.connector';
import withDialogActions from 'containers/Dialog/withDialogActions';
import { If } from 'components';
import withResourceDetail from 'containers/Resources/withResourceDetails';
@@ -137,7 +137,7 @@ function ManualJournalActionsBar({
}
export default compose(
DialogConnect,
withDialogActions,
withResourceDetail(({ resourceFields }) => ({
resourceFields,
})),

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

@@ -13,23 +13,22 @@ import {
} from '@blueprintjs/core';
import { useParams } from 'react-router-dom';
import { FormattedMessage as T, useIntl } from 'react-intl';
import moment from 'moment';
import Icon from 'components/Icon';
import { compose } from 'utils';
import moment from 'moment';
import { useUpdateEffect } from 'hooks';
import LoadingIndicator from 'components/LoadingIndicator';
import DialogConnect from 'connectors/Dialog.connector';
import { useUpdateEffect } from 'hooks';
import { If, Money } from 'components';
import DataTable from 'components/DataTable';
import withDialogActions from 'containers/Dialog/withDialogActions';
import withDashboardActions from 'containers/Dashboard/withDashboardActions';
import withViewDetails from 'containers/Views/withViewDetails';
import withManualJournals from 'containers/Accounting/withManualJournals';
import withManualJournalsActions from 'containers/Accounting/withManualJournalsActions';
import { If, Money } from 'components';
function ManualJournalsDataTable({
loading,
@@ -272,7 +271,7 @@ function ManualJournalsDataTable({
}
export default compose(
DialogConnect,
withDialogActions,
withDashboardActions,
withManualJournalsActions,
withManualJournals(({ manualJournals, manualJournalsLoading }) => ({