feat: add customer & vendor ability.

This commit is contained in:
elforjani13
2021-11-23 21:26:34 +02:00
parent 1cba4b5f18
commit 6ec86d3cf7
7 changed files with 214 additions and 141 deletions

View File

@@ -14,6 +14,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import { import {
If, If,
Icon, Icon,
Can,
FormattedMessage as T, FormattedMessage as T,
DashboardActionViewsList, DashboardActionViewsList,
AdvancedFilterPopover, AdvancedFilterPopover,
@@ -29,6 +30,10 @@ import withCustomersActions from './withCustomersActions';
import withAlertActions from 'containers/Alert/withAlertActions'; import withAlertActions from 'containers/Alert/withAlertActions';
import withSettingsActions from '../../Settings/withSettingsActions'; import withSettingsActions from '../../Settings/withSettingsActions';
import withSettings from '../../Settings/withSettings'; import withSettings from '../../Settings/withSettings';
import {
Customer_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
@@ -103,7 +108,7 @@ function CustomerActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={Customer_Abilities.Create} a={AbilitySubject.Item}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />} icon={<Icon icon={'plus'} />}
@@ -111,7 +116,7 @@ function CustomerActionsBar({
onClick={onClickNewCustomer} onClick={onClickNewCustomer}
/> />
<NavbarDivider /> <NavbarDivider />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: customersFilterConditions, conditions: customersFilterConditions,
@@ -152,11 +157,13 @@ function CustomerActionsBar({
onChange={handleTableRowSizeChange} onChange={handleTableRowSizeChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={Customer_Abilities.Edit} a={AbilitySubject.Customer}>
<Switch <Switch
labelElement={<T id={'inactive'} />} labelElement={<T id={'inactive'} />}
defaultChecked={accountsInactiveMode} defaultChecked={accountsInactiveMode}
onChange={handleInactiveSwitchChange} onChange={handleInactiveSwitchChange}
/> />
</Can>
</NavbarGroup> </NavbarGroup>
<NavbarGroup align={Alignment.RIGHT}> <NavbarGroup align={Alignment.RIGHT}>
<Button <Button

View File

@@ -4,7 +4,11 @@ import clsx from 'classnames';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { Icon, Money, If, AvaterCell } from 'components'; import { Can, Icon, Money, If, AvaterCell } from 'components';
import {
Customer_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback } from 'utils'; import { safeCallback } from 'utils';
@@ -29,17 +33,23 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<Can I={Customer_Abilities.Edit} a={AbilitySubject.Customer}>
<MenuDivider /> <MenuDivider />
<MenuItem <MenuItem
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
text={intl.get('edit_customer')} text={intl.get('edit_customer')}
onClick={safeCallback(onEdit, original)} onClick={safeCallback(onEdit, original)}
/> />
</Can>
<Can I={Customer_Abilities.Create} a={AbilitySubject.Customer}>
<MenuItem <MenuItem
icon={<Icon icon="duplicate-16" />} icon={<Icon icon="duplicate-16" />}
text={intl.get('duplicate')} text={intl.get('duplicate')}
onClick={safeCallback(onDuplicate, original)} onClick={safeCallback(onDuplicate, original)}
/> />
</Can>
<Can I={Customer_Abilities.Edit} a={AbilitySubject.Customer}>
<If condition={original.active}> <If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_customer')} text={intl.get('inactivate_customer')}
@@ -54,12 +64,15 @@ export function ActionsMenu({
onClick={safeCallback(onActivate, original)} onClick={safeCallback(onActivate, original)}
/> />
</If> </If>
</Can>
<Can I={Customer_Abilities.Delete} a={AbilitySubject.Customer}>
<MenuItem <MenuItem
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_customer')} text={intl.get('delete_customer')}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)} onClick={safeCallback(onDelete, original)}
/> />
</Can>
</Menu> </Menu>
); );
} }

View File

@@ -21,8 +21,15 @@ import { useCustomerDetailsDrawerContext } from './CustomerDetailsDrawerProvider
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 { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import {
AbilitySubject,
Invoice_Abilities,
Estimate_Abilities,
Receipt_Abilities,
Payment_Receive_Abilities,
Customer_Abilities,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -74,22 +81,34 @@ function CustomerDetailsActionsBar({
<Popover <Popover
content={ content={
<Menu> <Menu>
<Can I={Invoice_Abilities.Create} a={AbilitySubject.Invoice}>
<MenuItem <MenuItem
text={<T id={'customer.drawer.action.new_invoice'} />} text={<T id={'customer.drawer.action.new_invoice'} />}
onClick={handleNewInvoiceClick} onClick={handleNewInvoiceClick}
/> />
</Can>
<Can I={Estimate_Abilities.Create} a={AbilitySubject.Estimate}>
<MenuItem <MenuItem
text={<T id={'customer.drawer.action.new_estimate'} />} text={<T id={'customer.drawer.action.new_estimate'} />}
onClick={handleNewEstimateClick} onClick={handleNewEstimateClick}
/> />
</Can>
<Can I={Receipt_Abilities.Create} a={AbilitySubject.Receipt}>
<MenuItem <MenuItem
text={<T id={'customer.drawer.action.new_receipt'} />} text={<T id={'customer.drawer.action.new_receipt'} />}
onClick={handleNewReceiptClick} onClick={handleNewReceiptClick}
/> />
</Can>
<Can
I={Payment_Receive_Abilities.Create}
a={AbilitySubject.PaymentReceive}
>
<MenuItem <MenuItem
text={<T id={'customer.drawer.action.new_payment'} />} text={<T id={'customer.drawer.action.new_payment'} />}
onClick={handleNewPaymentClick} onClick={handleNewPaymentClick}
/> />
</Can>
</Menu> </Menu>
} }
minimal={true} minimal={true}
@@ -104,7 +123,7 @@ function CustomerDetailsActionsBar({
</Popover> </Popover>
<NavbarDivider /> <NavbarDivider />
<Can I={Customer_Abilities.Edit} a={AbilitySubject.Customer}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
@@ -112,6 +131,8 @@ function CustomerDetailsActionsBar({
onClick={handleEditContact} onClick={handleEditContact}
/> />
<NavbarDivider /> <NavbarDivider />
</Can>
<Can I={Customer_Abilities.Delete} a={AbilitySubject.Customer}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />} icon={<Icon icon={'trash-16'} iconSize={16} />}
@@ -119,6 +140,7 @@ function CustomerDetailsActionsBar({
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={handleDeleteCustomer} onClick={handleDeleteCustomer}
/> />
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -20,8 +20,13 @@ import { useVendorDetailsDrawerContext } from './VendorDetailsDrawerProvider';
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 { Icon, FormattedMessage as T } from 'components'; import { Can, Icon, FormattedMessage as T } from 'components';
import {
AbilitySubject,
Invoice_Abilities,
Payment_Made_Abilities,
Vendor_Abilities,
} from '../../../common/abilityOption';
import { safeCallback, compose } from 'utils'; import { safeCallback, compose } from 'utils';
/** /**
@@ -64,14 +69,21 @@ function VendorDetailsActionsBar({
<Popover <Popover
content={ content={
<Menu> <Menu>
<Can I={Invoice_Abilities.Create} a={AbilitySubject.Invoice}>
<MenuItem <MenuItem
text={<T id={'vendor.drawer.action.new_invoice'} />} text={<T id={'vendor.drawer.action.new_invoice'} />}
onClick={handleNewInvoiceClick} onClick={handleNewInvoiceClick}
/> />
</Can>
<Can
I={Payment_Made_Abilities.Create}
a={AbilitySubject.PaymentMade}
>
<MenuItem <MenuItem
text={<T id={'vendor.drawer.action.new_payment'} />} text={<T id={'vendor.drawer.action.new_payment'} />}
onClick={handleNewPaymentClick} onClick={handleNewPaymentClick}
/> />
</Can>
</Menu> </Menu>
} }
minimal={true} minimal={true}
@@ -84,9 +96,8 @@ function VendorDetailsActionsBar({
icon={<Icon icon={'plus'} />} icon={<Icon icon={'plus'} />}
/> />
</Popover> </Popover>
<NavbarDivider /> <NavbarDivider />
<Can I={Vendor_Abilities.Edit} a={AbilitySubject.Vendor}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
@@ -94,6 +105,8 @@ function VendorDetailsActionsBar({
onClick={safeCallback(onEditContact)} onClick={safeCallback(onEditContact)}
/> />
<NavbarDivider /> <NavbarDivider />
</Can>
<Can I={Vendor_Abilities.Delete} a={AbilitySubject.Vendor}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon={'trash-16'} iconSize={16} />} icon={<Icon icon={'trash-16'} iconSize={16} />}
@@ -101,6 +114,7 @@ function VendorDetailsActionsBar({
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={safeCallback(onDeleteContact)} onClick={safeCallback(onDeleteContact)}
/> />
</Can>
</NavbarGroup> </NavbarGroup>
</DashboardActionsBar> </DashboardActionsBar>
); );

View File

@@ -110,7 +110,7 @@ export function ItemsActionMenuList({
onClick={safeCallback(onDuplicate, original)} onClick={safeCallback(onDuplicate, original)}
/> />
</Can> </Can>
<Can I={Item_Abilities.View} a={AbilitySubject.Item}> <Can I={Item_Abilities.Edit} a={AbilitySubject.Item}>
<If condition={original.active}> <If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_item')} text={intl.get('inactivate_item')}
@@ -118,8 +118,7 @@ export function ItemsActionMenuList({
onClick={safeCallback(onInactivateItem, original)} onClick={safeCallback(onInactivateItem, original)}
/> />
</If> </If>
</Can>
<Can I={Item_Abilities.Edit} a={AbilitySubject.Item}>
<If condition={!original.active}> <If condition={!original.active}>
<MenuItem <MenuItem
text={intl.get('activate_item')} text={intl.get('activate_item')}

View File

@@ -13,6 +13,7 @@ import DashboardActionsBar from 'components/Dashboard/DashboardActionsBar';
import Icon from 'components/Icon'; import Icon from 'components/Icon';
import { import {
If, If,
Can,
FormattedMessage as T, FormattedMessage as T,
DashboardActionViewsList, DashboardActionViewsList,
DashboardFilterButton, DashboardFilterButton,
@@ -29,7 +30,10 @@ import withVendors from './withVendors';
import withSettingsActions from '../../Settings/withSettingsActions'; import withSettingsActions from '../../Settings/withSettingsActions';
import withSettings from '../../Settings/withSettings'; import withSettings from '../../Settings/withSettings';
import {
Vendor_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { compose } from 'utils'; import { compose } from 'utils';
/** /**
@@ -90,6 +94,7 @@ function VendorActionsBar({
onChange={handleTabChange} onChange={handleTabChange}
/> />
<NavbarDivider /> <NavbarDivider />
<Can I={VendorActionsBar.Create} a={AbilitySubject.Vendor}>
<Button <Button
className={Classes.MINIMAL} className={Classes.MINIMAL}
icon={<Icon icon={'plus'} />} icon={<Icon icon={'plus'} />}
@@ -97,6 +102,7 @@ function VendorActionsBar({
onClick={onClickNewVendor} onClick={onClickNewVendor}
/> />
<NavbarDivider /> <NavbarDivider />
</Can>
<AdvancedFilterPopover <AdvancedFilterPopover
advancedFilterProps={{ advancedFilterProps={{
conditions: vendorsFilterConditions, conditions: vendorsFilterConditions,

View File

@@ -10,7 +10,11 @@ import {
} from '@blueprintjs/core'; } from '@blueprintjs/core';
import intl from 'react-intl-universal'; import intl from 'react-intl-universal';
import { Icon, Money, If, AvaterCell } from 'components'; import { Can, Icon, Money, If, AvaterCell } from 'components';
import {
Vendor_Abilities,
AbilitySubject,
} from '../../../common/abilityOption';
import { safeCallback, firstLettersArgs } from 'utils'; import { safeCallback, firstLettersArgs } from 'utils';
/** /**
@@ -34,17 +38,22 @@ export function ActionsMenu({
text={intl.get('view_details')} text={intl.get('view_details')}
onClick={safeCallback(onViewDetails, original)} onClick={safeCallback(onViewDetails, original)}
/> />
<Can I={Vendor_Abilities.Edit} a={AbilitySubject.Vendor}>
<MenuDivider /> <MenuDivider />
<MenuItem <MenuItem
icon={<Icon icon="pen-18" />} icon={<Icon icon="pen-18" />}
text={intl.get('edit_vendor')} text={intl.get('edit_vendor')}
onClick={safeCallback(onEdit, original)} onClick={safeCallback(onEdit, original)}
/> />
</Can>
<Can I={Vendor_Abilities.Create} a={AbilitySubject.Customer}>
<MenuItem <MenuItem
icon={<Icon icon="duplicate-16" />} icon={<Icon icon="duplicate-16" />}
text={intl.get('duplicate')} text={intl.get('duplicate')}
onClick={safeCallback(onDuplicate, original)} onClick={safeCallback(onDuplicate, original)}
/> />
</Can>
<Can I={Vendor_Abilities.Edit} a={AbilitySubject.Vendor}>
<If condition={original.active}> <If condition={original.active}>
<MenuItem <MenuItem
text={intl.get('inactivate_item')} text={intl.get('inactivate_item')}
@@ -59,12 +68,15 @@ export function ActionsMenu({
onClick={safeCallback(onActivate, original)} onClick={safeCallback(onActivate, original)}
/> />
</If> </If>
</Can>
<Can I={Vendor_Abilities.Delete} a={AbilitySubject.Vendor}>
<MenuItem <MenuItem
icon={<Icon icon="trash-16" iconSize={16} />} icon={<Icon icon="trash-16" iconSize={16} />}
text={intl.get('delete_vendor')} text={intl.get('delete_vendor')}
intent={Intent.DANGER} intent={Intent.DANGER}
onClick={safeCallback(onDelete, original)} onClick={safeCallback(onDelete, original)}
/> />
</Can>
</Menu> </Menu>
); );
} }