diff --git a/src/containers/CashFlow/AccountTransactions/components.js b/src/containers/CashFlow/AccountTransactions/components.js
index 528d6afe2..78dae22d5 100644
--- a/src/containers/CashFlow/AccountTransactions/components.js
+++ b/src/containers/CashFlow/AccountTransactions/components.js
@@ -4,9 +4,13 @@ import intl from 'react-intl-universal';
import { Intent, Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
import { MaterialProgressBar } from 'components';
-import { FormatDateCell, If, Icon } from 'components';
+import { Can, FormatDateCell, If, Icon } from 'components';
import { useAccountTransactionsContext } from './AccountTransactionsProvider';
import { TRANSACRIONS_TYPE } from 'common/cashflowOptions';
+import {
+ AbilitySubject,
+ Cashflow_Abilities,
+} from '../../../common/abilityOption';
import { safeCallback } from 'utils';
export function ActionsMenu({
@@ -20,15 +24,17 @@ export function ActionsMenu({
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
-
-
- }
- />
-
+
+
+
+ }
+ />
+
+
);
}
@@ -83,7 +89,7 @@ export function useAccountTransactionsColumns() {
className: 'deposit',
textOverview: true,
align: 'right',
- clickable: true
+ clickable: true,
},
{
id: 'withdrawal',
@@ -93,7 +99,7 @@ export function useAccountTransactionsColumns() {
width: 150,
textOverview: true,
align: 'right',
- clickable: true
+ clickable: true,
},
{
id: 'running_balance',
@@ -103,7 +109,7 @@ export function useAccountTransactionsColumns() {
width: 150,
textOverview: true,
align: 'right',
- clickable: true
+ clickable: true,
},
{
id: 'balance',
diff --git a/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.js b/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.js
index cb9e86b84..68420cfb4 100644
--- a/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.js
+++ b/src/containers/CashFlow/CashFlowAccounts/CashFlowAccountsActionsBar.js
@@ -7,8 +7,12 @@ import {
Alignment,
Switch,
} from '@blueprintjs/core';
-import { Icon, FormattedMessage as T } from 'components';
+import { Can, Icon, FormattedMessage as T } from 'components';
import { useRefreshCashflowAccounts } from 'hooks/query';
+import {
+ Cashflow_Abilities,
+ AbilitySubject,
+} from '../../../common/abilityOption';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
@@ -56,19 +60,22 @@ function CashFlowAccountsActionsBar({
return (
- }
- text={}
- onClick={handleAddBankAccount}
- />
- }
- text={}
- onClick={handleAddCashAccount}
- />
-
+
+ }
+ text={}
+ onClick={handleAddBankAccount}
+ />
+
+ }
+ text={}
+ onClick={handleAddCashAccount}
+ />
+
+
}
@@ -85,13 +92,15 @@ function CashFlowAccountsActionsBar({
text={}
/>
-
- }
- defaultChecked={false}
- onChange={handleInactiveSwitchChange}
- />
+
+ }
+ defaultChecked={false}
+ onChange={handleInactiveSwitchChange}
+ />
+
+
-
- }
- icon={}
- >
-
-
-
- }
- icon={}
- >
-
-
-
-
- }
- text={intl.get('edit_account')}
- onClick={safeCallback(onEditClick)}
- />
-
-
+
+
}
- onClick={safeCallback(onInactivateClick)}
- />
-
-
+ text={}
+ icon={}
+ >
+
+
+
}
- onClick={safeCallback(onActivateClick)}
+ text={}
+ icon={}
+ >
+
+
+
+
+
+
+ }
+ text={intl.get('edit_account')}
+ onClick={safeCallback(onEditClick)}
/>
-
- }
- intent={Intent.DANGER}
- onClick={safeCallback(onDeleteClick)}
- />
+
+
+
+
+ }
+ onClick={safeCallback(onInactivateClick)}
+ />
+
+
+ }
+ onClick={safeCallback(onActivateClick)}
+ />
+
+
+
+ }
+ intent={Intent.DANGER}
+ onClick={safeCallback(onDeleteClick)}
+ />
+
);
}
diff --git a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.js b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.js
index 2099f063e..ea5902ec9 100644
--- a/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.js
+++ b/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerActionBar.js
@@ -1,12 +1,15 @@
import React from 'react';
import Icon from 'components/Icon';
import { Button, Classes, NavbarGroup, Intent } from '@blueprintjs/core';
-import { FormattedMessage as T } from 'components';
+import { Can, FormattedMessage as T } from 'components';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { useCashflowTransactionDrawerContext } from './CashflowTransactionDrawerProvider';
import withAlertsActions from 'containers/Alert/withAlertActions';
-
+import {
+ AbilitySubject,
+ Cashflow_Abilities,
+} from '../../../common/abilityOption';
import { compose } from 'utils';
/**
@@ -24,17 +27,19 @@ function CashflowTransactionDrawerActionBar({
};
return (
-
-
- }
- text={}
- intent={Intent.DANGER}
- onClick={handleDeleteCashflowTransaction}
- />
-
-
+
+
+
+ }
+ text={}
+ intent={Intent.DANGER}
+ onClick={handleDeleteCashflowTransaction}
+ />
+
+
+
);
}
export default compose(withAlertsActions)(CashflowTransactionDrawerActionBar);
diff --git a/src/containers/Vendors/VendorsLanding/VendorActionsBar.js b/src/containers/Vendors/VendorsLanding/VendorActionsBar.js
index e5e5b2d6f..bcd20c9ab 100644
--- a/src/containers/Vendors/VendorsLanding/VendorActionsBar.js
+++ b/src/containers/Vendors/VendorsLanding/VendorActionsBar.js
@@ -142,12 +142,15 @@ function VendorActionsBar({
onChange={handleTableRowSizeChange}
/>
- }
- defaultChecked={vendorsInactiveMode}
- onChange={handleInactiveSwitchChange}
- />
+
+ }
+ defaultChecked={vendorsInactiveMode}
+ onChange={handleInactiveSwitchChange}
+ />
+
+