From 3db52e9c638df69dd7b809a798bf30d9681c29d8 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Tue, 23 Nov 2021 21:56:36 +0200
Subject: [PATCH] feat: add manual journal ability.
---
.../ManualJournalActionsBar.js | 25 +++++----
.../Accounting/JournalsLanding/components.js | 53 ++++++++++++-------
.../ManualJournalDrawerActionBar.js | 44 +++++++++------
3 files changed, 79 insertions(+), 43 deletions(-)
diff --git a/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js b/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js
index a3f65be13..483c0457c 100644
--- a/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js
+++ b/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js
@@ -26,8 +26,11 @@ import withManualJournals from './withManualJournals';
import withSettingsActions from '../../Settings/withSettingsActions';
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';
/**
@@ -86,13 +89,17 @@ function ManualJournalActionsBar({
onChange={handleTabChange}
/>
-
- }
- text={}
- onClick={onClickNewManualJournal}
- />
+
+ }
+ text={}
+ onClick={onClickNewManualJournal}
+ />
+
-
-
+
+
+
+ }
+ text={intl.get('publish_journal')}
+ onClick={safeCallback(onPublish, original)}
+ />
+
+
+
}
- text={intl.get('publish_journal')}
- onClick={safeCallback(onPublish, original)}
+ icon={}
+ text={intl.get('edit_journal')}
+ onClick={safeCallback(onEdit, original)}
/>
-
- }
- text={intl.get('edit_journal')}
- onClick={safeCallback(onEdit, original)}
- />
- }
- intent={Intent.DANGER}
- onClick={safeCallback(onDelete, original)}
- />
+
+
+ }
+ intent={Intent.DANGER}
+ onClick={safeCallback(onDelete, original)}
+ />
+
);
};
diff --git a/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.js b/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.js
index f8c5fb1b6..0c184af49 100644
--- a/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.js
+++ b/src/containers/Drawers/ManualJournalDrawer/ManualJournalDrawerActionBar.js
@@ -8,14 +8,19 @@ import {
Intent,
NavbarDivider,
} from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
+import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
-import { compose } from 'utils';
import { useManualJournalDrawerContext } from './ManualJournalDrawerProvider';
+import {
+ Manual_Journal_Abilities,
+ AbilitySubject,
+} from '../../../common/abilityOption';
+
+import { compose } from 'utils';
/**
* Manual journal action bar.
@@ -44,20 +49,27 @@ function ManualJournalDrawerActionBar({
return (
- }
- text={}
- onClick={handleEditManualJournal}
- />
-
- }
- text={}
- intent={Intent.DANGER}
- onClick={handleDeleteManualJournal}
- />
+
+ }
+ text={}
+ onClick={handleEditManualJournal}
+ />
+
+
+
+ }
+ text={}
+ intent={Intent.DANGER}
+ onClick={handleDeleteManualJournal}
+ />
+
);