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

feat: add manual journal ability.

Browse Source
This commit is contained in:
elforjani13
2021-11-23 21:56:36 +02:00
parent 7393d68b7a
commit 3db52e9c63
3 changed files with 79 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js
View File

@@ -26,8 +26,11 @@ import withManualJournals from './withManualJournals';
import withSettingsActions from '../../Settings/withSettingsActions'; import withSettingsActions from '../../Settings/withSettingsActions';
import withSettings from '../../Settings/withSettings'; import withSettings from '../../Settings/withSettings';
import { If, DashboardActionViewsList } from 'components'; import { Can, If, DashboardActionViewsList } from 'components';
import {
Manual_Journal_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -86,13 +89,17 @@ function ManualJournalActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can
<Button I={Manual_Journal_Abilities.Create}
className={Classes.MINIMAL} a={AbilitySubject.ManualJournal}
icon={<Icon icon="plus" />} >
text={<T id={'journal_entry'} />} <Button
onClick={onClickNewManualJournal} className={Classes.MINIMAL}
/> icon={<Icon icon="plus" />}
text={<T id={'journal_entry'} />}
onClick={onClickNewManualJournal}
/>
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: manualJournalsFilterConditions, conditions: manualJournalsFilterConditions,

53
src/containers/Accounting/JournalsLanding/components.js
View File

@@ -13,7 +13,18 @@ import {
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { FormattedMessage as T, Choose, Money, If, Icon } from 'components'; import {
Can,
FormattedMessage as T,
Choose,
Money,
If,
Icon,
} from 'components';
import {
Manual_Journal_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
/** /**
@@ -150,25 +161,31 @@ export const ActionsMenu = ({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<MenuDivider /> <Can I={Manual_Journal_Abilities.Edit} a={AbilitySubject.ManualJournal}>
<If condition={!original.is_published}> <MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon="arrow-to-top" />}
text={intl.get('publish_journal')}
onClick={safeCallback(onPublish, original)}
/>
</If>
</Can>
<Can I={Manual_Journal_Abilities.Edit} a={AbilitySubject.ManualJournal}>
<MenuItem <MenuItem
icon={<Icon icon="arrow-to-top" />} icon={<Icon icon="pen-18" />}
text={intl.get('publish_journal')} text={intl.get('edit_journal')}
onClick={safeCallback(onPublish, original)} onClick={safeCallback(onEdit, original)}
/> />
</If> </Can>
<MenuItem <Can I={Manual_Journal_Abilities.Delete} a={AbilitySubject.ManualJournal}>
icon={<Icon icon="pen-18" />} <MenuItem
text={intl.get('edit_journal')} text={intl.get('delete_journal')}
onClick={safeCallback(onEdit, original)} icon={<Icon icon="trash-16" iconSize={16} />}
/> intent={Intent.DANGER}
<MenuItem onClick={safeCallback(onDelete, original)}
text={intl.get('delete_journal')} />
icon={<Icon icon="trash-16" iconSize={16} />} </Can>
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Menu> </Menu>
); );
}; };

44
src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.js
View File

@@ -8,14 +8,19 @@ import {
Intent, Intent,
NavbarDivider, NavbarDivider,
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import { FormattedMessage as T } from 'components'; import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar'; import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withAlertsActions from 'containers/Alert/withAlertActions'; import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions'; import withDrawerActions from 'containers/Drawer/withDrawerActions';
import { compose } from 'utils';
import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider'; import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider';
import {
Manual_Journal_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils';
/** /**
* Manual journal action bar. * Manual journal action bar.
@@ -44,20 +49,27 @@ function ManualJournalDrawerActionBar({
return ( return (
<DashboardActionsBar> <DashboardActionsBar>
<NavbarGroup> <NavbarGroup>
<Button <Can I={Manual_Journal_Abilities.Edit} a={AbilitySubject.ManualJournal}>
className={Classes.MINIMAL} <Button
icon={<Icon icon="pen-18" />} className={Classes.MINIMAL}
text={<T id={'edit_journal'} />} icon={<Icon icon="pen-18" />}
onClick={handleEditManualJournal} text={<T id={'edit_journal'} />}
/> onClick={handleEditManualJournal}
<NavbarDivider /> />
<Button <NavbarDivider />
className={Classes.MINIMAL} </Can>
icon={<Icon icon="trash-16" iconSize={16} />} <Can
text={<T id={'delete'} />} I={Manual_Journal_Abilities.Delete}
intent={Intent.DANGER} a={AbilitySubject.ManualJournal}
onClick={handleDeleteManualJournal} >
/> <Button
className={Classes.MINIMAL}
icon={<Icon icon="trash-16" iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteManualJournal}
/>
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );