feat: add expense ability.

This commit is contained in:
elforjani13
2021-11-23 22:15:02 +02:00
parent 3db52e9c63
commit 719302b241
5 changed files with 123 additions and 62 deletions

View File

@@ -1,14 +1,19 @@
export const AbilitySubject = {
Item: 'Item',
Inventory_Adjustment: 'Inventory_Adjustment',
Estimate: 'Estimate',
Invoice: 'Invoice',
Receipt: 'Receipt',
Inventory_Adjustment: 'InventoryAdjustment',
Estimate: 'SaleEstimate',
Invoice: 'SaleInvoice',
Receipt: 'SaleReceipt',
PaymentReceive: 'PaymentReceive',
Bill: 'Bill',
PaymentMade: 'PaymentMade',
Customer: 'Customer',
Vendor: 'Vendor',
Account: 'Account',
ManualJournal: 'ManualJournal',
Expense: 'Expense',
Cashflow: 'Cashflow',
Report: 'Report',
};
export const Item_Abilities = {
@@ -24,14 +29,14 @@ export const Inventory_Adjustment_Abilities = {
Delete: 'delete',
};
export const SaleEstimate = {
export const Estimate_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const SaleInvoice = {
export const Invoice_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
@@ -39,42 +44,72 @@ export const SaleInvoice = {
BadDebt: 'bad-debt',
};
export const SaleReceipt = {
export const Receipt_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const PaymentReceive = {
export const Payment_Receive_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const Bill = {
export const Bill_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const PaymentMade = {
export const Payment_Made_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const CustomerAbilities = {
export const Customer_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const VendorAbilities = {
export const Vendor_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const Account_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
TransactionsLocking: 'TransactionsLocking',
};
export const Manual_Journal_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const Expense_Abilities = {
View: 'view',
Create: 'create',
Edit: 'edit',
Delete: 'delete',
};
export const Cashflow__Abilities = {
View: 'view',
Create: 'create',
Delete: 'delete',
};

View File

@@ -6,12 +6,15 @@ import {
Item_Abilities,
AbilitySubject,
Inventory_Adjustment_Abilities,
SaleEstimate,
SaleInvoice,
SaleReceipt,
Estimate_Abilities,
Invoice_Abilities,
Receipt_Abilities,
PaymentReceive,
Bill,
PaymentMade,
Bill_Abilities,
Payment_Made_Abilities,
Customer_Abilities,
Vendor_Abilities,
Account_Abilities,
} from '../common/abilityOption';
export const AbilityContext = React.createContext();
@@ -20,12 +23,12 @@ export const Can = createContextualCan(AbilityContext.Consumer);
const AbilityContextProvider = (props) => {
const ability = new Ability([
{
subject: [AbilitySubject.PaymentMade],
action: [PaymentMade.Edit],
subject: [AbilitySubject.Account],
action: [Account_Abilities.Create],
},
{
subject: [AbilitySubject.Bill],
action: [Bill.Create],
subject: [AbilitySubject.Invoice],
action: [],
},
]);

View File

@@ -8,8 +8,11 @@ import {
Intent,
NavbarDivider,
} from '@blueprintjs/core';
import { FormattedMessage as T } from 'components';
import { Can, FormattedMessage as T } from 'components';
import {
Expense_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import withAlertsActions from 'containers/Alert/withAlertActions';
import withDrawerActions from 'containers/Drawer/withDrawerActions';
@@ -44,20 +47,24 @@ function ExpenseDrawerActionBar({
return (
<DashboardActionsBar>
<NavbarGroup>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_expense'} />}
onClick={handleEditExpense}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="trash-16" iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteExpense}
/>
<Can I={Expense_Abilities.Edit} a={AbilitySubject.Expense}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />}
text={<T id={'edit_expense'} />}
onClick={handleEditExpense}
/>
<NavbarDivider />
</Can>
<Can I={Expense_Abilities.Delete} a={AbilitySubject.Expense}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="trash-16" iconSize={16} />}
text={<T id={'delete'} />}
intent={Intent.DANGER}
onClick={handleDeleteExpense}
/>
</Can>
</NavbarGroup>
</DashboardActionsBar>
);

View File

@@ -15,6 +15,7 @@ import withDialogActions from 'containers/Dialog/withDialogActions';
import {
If,
Can,
DashboardRowsHeightButton,
DashboardActionViewsList,
DashboardFilterButton,
@@ -22,6 +23,10 @@ import {
FormattedMessage as T,
} from 'components';
import {
Expense_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { useRefreshExpenses } from 'hooks/query/expenses';
import { useExpensesListContext } from './ExpensesListProvider';
@@ -92,13 +97,14 @@ function ExpensesActionsBar({
onChange={handleTabChange}
/>
<NavbarDivider />
<Button
className={Classes.MINIMAL}
icon={<Icon icon="plus" />}
text={<T id={'new_expense'} />}
onClick={onClickNewExpense}
/>
<Can I={Expense_Abilities.Create} a={AbilitySubject.Expense}>
<Button
className={Classes.MINIMAL}
icon={<Icon icon="plus" />}
text={<T id={'new_expense'} />}
onClick={onClickNewExpense}
/>
</Can>
<AdvancedFilterPopover
advancedFilterProps={{
conditions: expensesFilterConditions,

View File

@@ -12,13 +12,17 @@ import {
MenuDivider,
} from '@blueprintjs/core';
import intl from 'react-intl-universal';
import {
Expense_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import {
FormatDateCell,
FormattedMessage as T,
Money,
Icon,
If,
Can,
} from 'components';
import { safeCallback } from 'utils';
@@ -54,25 +58,31 @@ export function ActionsMenu({
text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)}
/>
<MenuDivider />
<If condition={!original.is_published}>
<Can I={Expense_Abilities.Edit} a={AbilitySubject.Expense}>
<MenuDivider />
<If condition={!original.is_published}>
<MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />}
text={intl.get('publish_expense')}
onClick={safeCallback(onPublish, original)}
/>
</If>
</Can>
<Can I={Expense_Abilities.Edit} a={AbilitySubject.Expense}>
<MenuItem
icon={<Icon icon={'arrow-to-top'} size={16} />}
text={intl.get('publish_expense')}
onClick={safeCallback(onPublish, original)}
icon={<Icon icon="pen-18" />}
text={intl.get('edit_expense')}
onClick={safeCallback(onEdit, original)}
/>
</If>
<MenuItem
icon={<Icon icon="pen-18" />}
text={intl.get('edit_expense')}
onClick={safeCallback(onEdit, original)}
/>
<MenuItem
icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_expense')}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Can>
<Can I={Expense_Abilities.Delete} a={AbilitySubject.Expense}>
<MenuItem
icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_expense')}
intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)}
/>
</Can>
</Menu>
);
}