diff --git a/src/common/abilityOption.js b/src/common/abilityOption.js index 4d2bbac39..1a5625ca3 100644 --- a/src/common/abilityOption.js +++ b/src/common/abilityOption.js @@ -1,6 +1,6 @@ export const AbilitySubject = { Item: 'Item', - Inventory_Adjustment: 'InventoryAdjustment', + InventoryAdjustment: 'InventoryAdjustment', Estimate: 'SaleEstimate', Invoice: 'SaleInvoice', Receipt: 'SaleReceipt', @@ -16,110 +16,116 @@ export const AbilitySubject = { Report: 'Report', Preferences: 'Preferences', ExchangeRate: 'ExchangeRate', - SubscriptionBilling: 'SubscriptionBilling' + SubscriptionBilling: 'SubscriptionBilling', }; -export const Item_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const ItemAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', }; -export const Inventory_Adjustment_Abilities = { - Create: 'create', - View: 'view', - Delete: 'delete', +export const InventoryAdjustmentAction = { + Create: 'Create', + Edit: 'Edit', + View: 'View', + Delete: 'Delete', }; -export const Estimate_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const SaleEstimateAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + NotifyBySms: 'NotifyBySms', }; -export const Invoice_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', - BadDebt: 'bad-debt', +export const SaleInvoiceAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + Writeoff: 'Writeoff', + NotifyBySms: 'NotifyBySms', }; -export const Receipt_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const SaleReceiptAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + NotifyBySms: 'NotifyBySms', }; -export const Payment_Receive_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const PaymentReceiveAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + NotifyBySms: 'NotifyBySms', }; -export const Bill_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const BillAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + NotifyBySms: 'NotifyBySms', }; -export const Payment_Made_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const PaymentMadeAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', }; -export const Customer_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const CustomerAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', }; -export const Vendor_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const VendorAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', }; -export const Account_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', - Transactions_Locking: 'TransactionsLocking', +export const AccountAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + TransactionsLocking: 'TransactionsLocking', }; -export const Manual_Journal_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', - TransactionLocking: 'TransactionLocking' +export const ManualJournalAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', + TransactionLocking: 'TransactionLocking', }; -export const Expense_Abilities = { - View: 'view', - Create: 'create', - Edit: 'edit', - Delete: 'delete', +export const ExpenseAction = { + View: 'View', + Create: 'Create', + Edit: 'Edit', + Delete: 'Delete', }; -export const Cashflow_Abilities = { - View: 'view', - Create: 'create', - Delete: 'delete', +export const CashflowAction = { + View: 'View', + Create: 'Create', + Delete: 'Delete', }; -export const Report_Abilities = { - ALL:'all', +export const ReportsAction = { + ALL: 'all', READ_BALANCE_SHEET: 'read-balance-sheet', READ_TRIAL_BALANCE_SHEET: 'read-trial-balance-sheet', READ_PROFIT_LOSS: 'read-profit-loss', @@ -140,16 +146,16 @@ export const Report_Abilities = { }; export const PreferencesAbility = { - Mutate: 'Mutate' -} + Mutate: 'Mutate', +}; -export const ExchangeRateAbility ={ +export const ExchangeRateAbility = { View: 'view', Create: 'create', - Delete: 'delete', -} + Delete: 'delete', +}; export const SubscriptionBillingAbility = { View: 'view', - Payment: 'payment' -} \ No newline at end of file + Payment: 'payment', +}; diff --git a/src/common/homepageOptions.js b/src/common/homepageOptions.js index 1a6c5440f..beb9ab623 100644 --- a/src/common/homepageOptions.js +++ b/src/common/homepageOptions.js @@ -1,20 +1,20 @@ import React from 'react'; import { FormattedMessage as T } from 'components'; import { - Invoice_Abilities, - Estimate_Abilities, + SaleInvoiceAction, + SaleEstimateAction, AbilitySubject, - Receipt_Abilities, - Customer_Abilities, - Payment_Receive_Abilities, - Bill_Abilities, - Vendor_Abilities, - Payment_Made_Abilities, - Account_Abilities, - Manual_Journal_Abilities, - Expense_Abilities, - Item_Abilities, - Report_Abilities, + SaleReceiptAction, + CustomerAction, + PaymentReceiveAction, + BillAction, + VendorAction, + PaymentMadeAction, + AccountAction, + ManualJournalAction, + ExpenseAction, + ItemAction, + ReportsAction, } from '../common/abilityOption'; export const accountsReceivable = [ @@ -26,28 +26,28 @@ export const accountsReceivable = [ description: , link: '/invoices', subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.View, + ability: SaleInvoiceAction.View, }, { title: , description: , link: '/estimates', subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.View, + ability: SaleEstimateAction.View, }, { title: , description: , link: '/receipts', subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.View, + ability: SaleReceiptAction.View, }, { title: , description: , link: '/customers', subject: AbilitySubject.Customer, - ability: Customer_Abilities.View, + ability: CustomerAction.View, }, { title: , @@ -56,7 +56,7 @@ export const accountsReceivable = [ ), link: '/payment-receives', subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.View, + ability: PaymentReceiveAction.View, }, ], }, @@ -73,7 +73,7 @@ export const accountsPayable = [ ), link: '/bills', subject: AbilitySubject.Bill, - ability: Bill_Abilities.View, + ability: BillAction.View, }, { title: , @@ -82,14 +82,14 @@ export const accountsPayable = [ ), link: '/vendors', subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.View, + ability: VendorAction.View, }, { title: , description: , link: '/payment-mades', subject: AbilitySubject.PaymentMade, - ability: Payment_Made_Abilities.View, + ability: PaymentMadeAction.View, }, ], }, @@ -110,7 +110,7 @@ export const financialAccounting = [ ), link: '/accounts', subject: AbilitySubject.Account, - ability: Account_Abilities.View, + ability: AccountAction.View, }, { title: , @@ -119,7 +119,7 @@ export const financialAccounting = [ ), link: '/manual-journals', subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.View, + ability: ManualJournalAction.View, }, { title: , @@ -128,7 +128,7 @@ export const financialAccounting = [ ), link: '/expenses', subject: AbilitySubject.Expense, - ability: Expense_Abilities.View, + ability: ExpenseAction.View, }, { title: , @@ -137,7 +137,7 @@ export const financialAccounting = [ ), link: '/financial-reports', subject: AbilitySubject.Report, - ability: Report_Abilities.ALL, + ability: ReportsAction.ALL, }, ], }, @@ -154,7 +154,7 @@ export const productsServices = [ ), link: '/items', subject: AbilitySubject.Item, - ability: Item_Abilities.View, + ability: ItemAction.View, }, { title: , @@ -167,8 +167,8 @@ export const productsServices = [ ), link: '/inventory-adjustments', - subject: AbilitySubject.Inventory_Adjustment, - ability: Invoice_Abilities.View, + subject: AbilitySubject.InventoryAdjustment, + ability: SaleInvoiceAction.View, }, ], }, diff --git a/src/common/quickNewOptions.js b/src/common/quickNewOptions.js index 09572523e..ba4f9604b 100644 --- a/src/common/quickNewOptions.js +++ b/src/common/quickNewOptions.js @@ -1,11 +1,11 @@ import intl from 'react-intl-universal'; import { AbilitySubject, - Invoice_Abilities, - Customer_Abilities, - Vendor_Abilities, - Manual_Journal_Abilities, - Expense_Abilities, + SaleInvoiceAction, + CustomerAction, + VendorAction, + ManualJournalAction, + ExpenseAction, } from '../common/abilityOption'; import { useAbilitiesFilter } from '../hooks'; @@ -15,7 +15,7 @@ export const getQuickNewActions = () => [ name: intl.get('sale_invoice'), permission: { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.Create, + ability: SaleInvoiceAction.Create, }, }, { @@ -23,7 +23,7 @@ export const getQuickNewActions = () => [ name: intl.get('purchase_invoice'), permission: { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.Create, + ability: SaleInvoiceAction.Create, }, }, { @@ -31,7 +31,7 @@ export const getQuickNewActions = () => [ name: intl.get('manual_journal'), permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.Create, + ability: ManualJournalAction.Create, }, }, { @@ -39,7 +39,7 @@ export const getQuickNewActions = () => [ name: intl.get('expense'), permission: { subject: AbilitySubject.Expense, - ability: Expense_Abilities.Create, + ability: ExpenseAction.Create, }, }, { @@ -47,7 +47,7 @@ export const getQuickNewActions = () => [ name: intl.get('customer'), permission: { subject: AbilitySubject.Customer, - ability: Customer_Abilities.Create, + ability: CustomerAction.Create, }, }, { @@ -55,7 +55,7 @@ export const getQuickNewActions = () => [ name: intl.get('vendor'), permission: { subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.Vendor, + ability: VendorAction.Vendor, }, }, ]; diff --git a/src/config/financialReportsMenu.js b/src/config/financialReportsMenu.js index 714049581..83e6ffd25 100644 --- a/src/config/financialReportsMenu.js +++ b/src/config/financialReportsMenu.js @@ -1,6 +1,6 @@ import React from 'react'; import { FormattedMessage as T } from 'components'; -import { Report_Abilities, AbilitySubject } from '../common/abilityOption'; +import { ReportsAction, AbilitySubject } from '../common/abilityOption'; export const financialReportMenus = [ { @@ -13,7 +13,7 @@ export const financialReportMenus = [ ), link: '/financial-reports/balance-sheet', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_BALANCE_SHEET, + ability: ReportsAction.READ_BALANCE_SHEET, }, { title: , @@ -22,14 +22,14 @@ export const financialReportMenus = [ ), link: '/financial-reports/trial-balance-sheet', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_TRIAL_BALANCE_SHEET, + ability: ReportsAction.READ_TRIAL_BALANCE_SHEET, }, { title: , desc: , link: '/financial-reports/profit-loss-sheet', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PROFIT_LOSS, + ability: ReportsAction.READ_PROFIT_LOSS, }, { title: , @@ -38,21 +38,21 @@ export const financialReportMenus = [ ), link: '/financial-reports/cash-flow', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CASHFLOW, + ability: ReportsAction.READ_CASHFLOW, }, { title: , desc: , link: '/financial-reports/journal-sheet', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_JOURNAL, + ability: ReportsAction.READ_JOURNAL, }, { title: , desc: , link: '/financial-reports/general-ledger', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_GENERAL_LEDGET, + ability: ReportsAction.READ_GENERAL_LEDGET, }, { title: , @@ -61,14 +61,14 @@ export const financialReportMenus = [ ), link: '/financial-reports/receivable-aging-summary', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_AR_AGING_SUMMARY, + ability: ReportsAction.READ_AR_AGING_SUMMARY, }, { title: , desc: , link: '/financial-reports/payable-aging-summary', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_AP_AGING_SUMMARY, + ability: ReportsAction.READ_AP_AGING_SUMMARY, }, ], }, @@ -89,7 +89,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/purchases-by-items', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PURCHASES_BY_ITEMS, + ability: ReportsAction.READ_PURCHASES_BY_ITEMS, }, { title: , @@ -102,7 +102,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/sales-by-items', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_SALES_BY_ITEMS, + ability: ReportsAction.READ_SALES_BY_ITEMS, }, { title: , @@ -115,7 +115,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/inventory-valuation', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_VALUATION_SUMMARY, + ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY, }, { title: , @@ -128,7 +128,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/customers-balance-summary', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_SUMMARY_BALANCE, + ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE, }, { title: , @@ -137,7 +137,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/vendors-balance-summary', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_SUMMARY_BALANCE, + ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE, }, { title: , @@ -148,7 +148,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/transactions-by-customers', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_TRANSACTIONS, + ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS, }, { title: , @@ -161,7 +161,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/transactions-by-vendors', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_TRANSACTIONS, + ability: ReportsAction.READ_VENDORS_TRANSACTIONS, }, { title: , @@ -170,7 +170,7 @@ export const SalesAndPurchasesReportMenus = [ ), link: '/financial-reports/inventory-item-details', subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_ITEM_DETAILS, + ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS, }, ], }, diff --git a/src/config/sidebarMenu.js b/src/config/sidebarMenu.js index 0c5d34abb..a847f8e52 100644 --- a/src/config/sidebarMenu.js +++ b/src/config/sidebarMenu.js @@ -1,22 +1,22 @@ import React from 'react'; import { FormattedMessage as T } from 'components'; import { - Report_Abilities, + ReportsAction, AbilitySubject, - Item_Abilities, - Inventory_Adjustment_Abilities, - Estimate_Abilities, - Invoice_Abilities, - Receipt_Abilities, - Payment_Receive_Abilities, - Bill_Abilities, - Payment_Made_Abilities, - Customer_Abilities, - Vendor_Abilities, - Account_Abilities, - Manual_Journal_Abilities, - Expense_Abilities, - Cashflow_Abilities, + ItemAction, + InventoryAdjustmentAction, + SaleEstimateAction, + SaleInvoiceAction, + SaleReceiptAction, + PaymentReceiveAction, + BillAction, + PaymentMadeAction, + CustomerAction, + VendorAction, + AccountAction, + ManualJournalAction, + ExpenseAction, + CashflowAction, PreferencesAbility, ExchangeRateAbility, SubscriptionBillingAbility, @@ -35,28 +35,28 @@ export default [ permission: [ { subject: AbilitySubject.Item, - ability: Item_Abilities.View, + ability: ItemAction.View, }, { - subject: AbilitySubject.Inventory_Adjustment, - ability: Inventory_Adjustment_Abilities.View, + subject: AbilitySubject.InventoryAdjustment, + ability: InventoryAdjustmentAction.View, }, { subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.View, + ability: SaleEstimateAction.View, }, { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.View, + ability: SaleInvoiceAction.View, }, { subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.View, + ability: SaleReceiptAction.View, }, { subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.View, - } + ability: PaymentReceiveAction.View, + }, ], }, { @@ -67,15 +67,15 @@ export default [ href: '/items', permission: { subject: AbilitySubject.Item, - ability: Item_Abilities.View, + ability: ItemAction.View, }, }, { text: , href: '/inventory-adjustments', permission: { - subject: AbilitySubject.Inventory_Adjustment, - ability: Inventory_Adjustment_Abilities.View, + subject: AbilitySubject.InventoryAdjustment, + ability: InventoryAdjustmentAction.View, }, }, { @@ -83,7 +83,7 @@ export default [ href: '/items/categories', permission: { subject: AbilitySubject.Item, - ability: Item_Abilities.View, + ability: ItemAction.View, }, }, { @@ -92,7 +92,7 @@ export default [ permission: [ { subject: AbilitySubject.Item, - ability: Item_Abilities.Create, + ability: ItemAction.Create, }, ], }, @@ -101,7 +101,7 @@ export default [ permission: [ { subject: AbilitySubject.Item, - ability: Item_Abilities.Create, + ability: ItemAction.Create, }, ], }, @@ -110,7 +110,7 @@ export default [ href: '/items/new', permission: { subject: AbilitySubject.Item, - ability: Item_Abilities.Create, + ability: ItemAction.Create, }, }, { @@ -118,7 +118,7 @@ export default [ href: '/items/new', permission: { subject: AbilitySubject.Item, - ability: Item_Abilities.Create, + ability: ItemAction.Create, }, }, { @@ -126,7 +126,7 @@ export default [ href: '/items/categories/new', permission: { subject: AbilitySubject.Item, - ability: Item_Abilities.Create, + ability: ItemAction.Create, }, }, ], @@ -139,7 +139,7 @@ export default [ href: '/estimates', permission: { subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.View, + ability: SaleEstimateAction.View, }, }, { @@ -147,7 +147,7 @@ export default [ href: '/invoices', permission: { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.View, + ability: SaleInvoiceAction.View, }, }, { @@ -155,7 +155,7 @@ export default [ href: '/receipts', permission: { subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.View, + ability: SaleReceiptAction.View, }, }, { @@ -163,7 +163,7 @@ export default [ href: '/payment-receives', permission: { subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.View, + ability: PaymentReceiveAction.View, }, }, { @@ -172,19 +172,19 @@ export default [ permission: [ { subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.Create, + ability: SaleEstimateAction.Create, }, { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.Create, + ability: SaleInvoiceAction.Create, }, { subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.Create, + ability: SaleReceiptAction.Create, }, { subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.Create, + ability: PaymentReceiveAction.Create, }, ], }, @@ -193,19 +193,19 @@ export default [ permission: [ { subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.Create, + ability: SaleEstimateAction.Create, }, { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.Create, + ability: SaleInvoiceAction.Create, }, { subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.Create, + ability: SaleReceiptAction.Create, }, { subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.Create, + ability: PaymentReceiveAction.Create, }, ], }, @@ -214,7 +214,7 @@ export default [ href: '/estimates/new', permission: { subject: AbilitySubject.Estimate, - ability: Estimate_Abilities.Create, + ability: SaleEstimateAction.Create, }, }, { @@ -222,7 +222,7 @@ export default [ href: '/invoices/new', permission: { subject: AbilitySubject.Invoice, - ability: Invoice_Abilities.Create, + ability: SaleInvoiceAction.Create, }, }, { @@ -230,7 +230,7 @@ export default [ href: '/receipts/new', permission: { subject: AbilitySubject.Receipt, - ability: Receipt_Abilities.Create, + ability: SaleReceiptAction.Create, }, }, { @@ -238,7 +238,7 @@ export default [ href: '/payment-receives/new', permission: { subject: AbilitySubject.PaymentReceive, - ability: Payment_Receive_Abilities.Create, + ability: PaymentReceiveAction.Create, }, }, ], @@ -251,7 +251,7 @@ export default [ href: '/bills', permission: { subject: AbilitySubject.Bill, - ability: Bill_Abilities.View, + ability: BillAction.View, }, }, { @@ -260,7 +260,7 @@ export default [ newTabHref: '/payment-mades/new', permission: { subject: AbilitySubject.PaymentMade, - ability: Payment_Made_Abilities.View, + ability: PaymentMadeAction.View, }, }, { @@ -269,11 +269,11 @@ export default [ permission: [ { subject: AbilitySubject.Bill, - ability: Bill_Abilities.Create, + ability: BillAction.Create, }, { subject: AbilitySubject.PaymentMade, - ability: Payment_Made_Abilities.Create, + ability: PaymentMadeAction.Create, }, ], }, @@ -282,11 +282,11 @@ export default [ permission: [ { subject: AbilitySubject.Bill, - ability: Bill_Abilities.Create, + ability: BillAction.Create, }, { subject: AbilitySubject.PaymentMade, - ability: Payment_Made_Abilities.Create, + ability: PaymentMadeAction.Create, }, ], }, @@ -295,7 +295,7 @@ export default [ href: '/bills/new', permission: { subject: AbilitySubject.Bill, - ability: Bill_Abilities.Create, + ability: BillAction.Create, }, }, { @@ -303,7 +303,7 @@ export default [ href: '/payment-mades/new', permission: { subject: AbilitySubject.PaymentMade, - ability: Payment_Made_Abilities.Create, + ability: PaymentMadeAction.Create, }, }, ], @@ -316,7 +316,7 @@ export default [ href: '/customers', permission: { subject: AbilitySubject.Customer, - ability: Customer_Abilities.View, + ability: CustomerAction.View, }, }, { @@ -324,7 +324,7 @@ export default [ href: '/vendors', permission: { subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.Create, + ability: VendorAction.Create, }, }, { @@ -333,11 +333,11 @@ export default [ permission: [ { subject: AbilitySubject.Customer, - ability: Customer_Abilities.View, + ability: CustomerAction.View, }, { subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.View, + ability: VendorAction.View, }, ], }, @@ -346,11 +346,11 @@ export default [ permission: [ { subject: AbilitySubject.Customer, - ability: Customer_Abilities.View, + ability: CustomerAction.View, }, { subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.View, + ability: VendorAction.View, }, ], }, @@ -359,7 +359,7 @@ export default [ href: '/customers/new', permission: { subject: AbilitySubject.Customer, - ability: Customer_Abilities.View, + ability: CustomerAction.View, }, }, { @@ -367,7 +367,7 @@ export default [ href: '/vendors/new', permission: { subject: AbilitySubject.Vendor, - ability: Vendor_Abilities.View, + ability: VendorAction.View, }, }, ], @@ -378,11 +378,11 @@ export default [ permission: [ { subject: AbilitySubject.Account, - ability: Account_Abilities.View, + ability: AccountAction.View, }, { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.View, + ability: ManualJournalAction.View, }, ], }, @@ -394,7 +394,7 @@ export default [ href: '/accounts', permission: { subject: AbilitySubject.Account, - ability: Account_Abilities.View, + ability: AccountAction.View, }, }, { @@ -402,7 +402,7 @@ export default [ href: '/manual-journals', permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.View, + ability: ManualJournalAction.View, }, }, { @@ -410,7 +410,7 @@ export default [ href: '/transactions-locking', permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.TransactionLocking, + ability: ManualJournalAction.TransactionLocking, }, }, { @@ -426,14 +426,14 @@ export default [ label: true, permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.Create, + ability: ManualJournalAction.Create, }, }, { divider: true, permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.Create, + ability: ManualJournalAction.Create, }, }, { @@ -441,7 +441,7 @@ export default [ href: '/make-journal-entry', permission: { subject: AbilitySubject.ManualJournal, - ability: Manual_Journal_Abilities.Create, + ability: ManualJournalAction.Create, }, }, ], @@ -454,7 +454,7 @@ export default [ href: '/cashflow-accounts', permission: { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.View, + ability: CashflowAction.View, }, }, { @@ -463,7 +463,7 @@ export default [ permission: [ { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, ], }, @@ -472,7 +472,7 @@ export default [ permission: [ { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, ], }, @@ -481,7 +481,7 @@ export default [ href: '/cashflow-accounts', permission: { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, }, { @@ -489,7 +489,7 @@ export default [ href: '/cashflow-accounts', permission: { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, }, { @@ -497,7 +497,7 @@ export default [ href: '/cashflow-accounts', permission: { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, }, { @@ -505,7 +505,7 @@ export default [ href: '/cashflow-accounts', permission: { subject: AbilitySubject.Cashflow, - ability: Cashflow_Abilities.Create, + ability: CashflowAction.Create, }, }, ], @@ -518,7 +518,7 @@ export default [ href: '/expenses', permission: { subject: AbilitySubject.Expense, - ability: Expense_Abilities.View, + ability: ExpenseAction.View, }, }, { @@ -526,14 +526,14 @@ export default [ label: true, permission: { subject: AbilitySubject.Expense, - ability: Expense_Abilities.Create, + ability: ExpenseAction.Create, }, }, { divider: true, permission: { subject: AbilitySubject.Expense, - ability: Expense_Abilities.Create, + ability: ExpenseAction.Create, }, }, { @@ -541,7 +541,7 @@ export default [ href: '/expenses/new', permission: { subject: AbilitySubject.Expense, - ability: Expense_Abilities.Create, + ability: ExpenseAction.Create, }, }, ], @@ -554,7 +554,7 @@ export default [ href: '/financial-reports/balance-sheet', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_BALANCE_SHEET, + ability: ReportsAction.READ_BALANCE_SHEET, }, }, { @@ -562,7 +562,7 @@ export default [ href: '/financial-reports/trial-balance-sheet', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_TRIAL_BALANCE_SHEET, + ability: ReportsAction.READ_TRIAL_BALANCE_SHEET, }, }, { @@ -570,7 +570,7 @@ export default [ href: '/financial-reports/journal-sheet', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_JOURNAL, + ability: ReportsAction.READ_JOURNAL, }, }, { @@ -578,7 +578,7 @@ export default [ href: '/financial-reports/general-ledger', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_GENERAL_LEDGET, + ability: ReportsAction.READ_GENERAL_LEDGET, }, }, { @@ -586,7 +586,7 @@ export default [ href: '/financial-reports/profit-loss-sheet', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PROFIT_LOSS, + ability: ReportsAction.READ_PROFIT_LOSS, }, }, { @@ -594,7 +594,7 @@ export default [ href: '/financial-reports/cash-flow', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CASHFLOW_ACCOUNT_TRANSACTION, + ability: ReportsAction.READ_CASHFLOW_ACCOUNT_TRANSACTION, }, }, { @@ -602,7 +602,7 @@ export default [ href: '/financial-reports/receivable-aging-summary', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_AR_AGING_SUMMARY, + ability: ReportsAction.READ_AR_AGING_SUMMARY, }, }, { @@ -610,7 +610,7 @@ export default [ href: '/financial-reports/payable-aging-summary', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_AP_AGING_SUMMARY, + ability: ReportsAction.READ_AP_AGING_SUMMARY, }, }, { @@ -619,27 +619,27 @@ export default [ permission: [ { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PURCHASES_BY_ITEMS, + ability: ReportsAction.READ_PURCHASES_BY_ITEMS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_SALES_BY_ITEMS, + ability: ReportsAction.READ_SALES_BY_ITEMS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_TRANSACTIONS, + ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_TRANSACTIONS, + ability: ReportsAction.READ_VENDORS_TRANSACTIONS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_SUMMARY_BALANCE, + ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_SUMMARY_BALANCE, + ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE, }, ], }, @@ -648,27 +648,27 @@ export default [ permission: [ { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PURCHASES_BY_ITEMS, + ability: ReportsAction.READ_PURCHASES_BY_ITEMS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_SALES_BY_ITEMS, + ability: ReportsAction.READ_SALES_BY_ITEMS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_TRANSACTIONS, + ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_TRANSACTIONS, + ability: ReportsAction.READ_VENDORS_TRANSACTIONS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_SUMMARY_BALANCE, + ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_SUMMARY_BALANCE, + ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE, }, ], }, @@ -677,7 +677,7 @@ export default [ href: '/financial-reports/purchases-by-items', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_PURCHASES_BY_ITEMS, + ability: ReportsAction.READ_PURCHASES_BY_ITEMS, }, }, { @@ -685,7 +685,7 @@ export default [ href: '/financial-reports/sales-by-items', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_SALES_BY_ITEMS, + ability: ReportsAction.READ_SALES_BY_ITEMS, }, }, { @@ -693,7 +693,7 @@ export default [ href: '/financial-reports/transactions-by-customers', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_TRANSACTIONS, + ability: ReportsAction.READ_CUSTOMERS_TRANSACTIONS, }, }, { @@ -701,7 +701,7 @@ export default [ href: '/financial-reports/transactions-by-vendors', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_TRANSACTIONS, + ability: ReportsAction.READ_VENDORS_TRANSACTIONS, }, }, { @@ -709,7 +709,7 @@ export default [ href: '/financial-reports/customers-balance-summary', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_CUSTOMERS_SUMMARY_BALANCE, + ability: ReportsAction.READ_CUSTOMERS_SUMMARY_BALANCE, }, }, { @@ -717,7 +717,7 @@ export default [ href: '/financial-reports/vendors-balance-summary', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_VENDORS_SUMMARY_BALANCE, + ability: ReportsAction.READ_VENDORS_SUMMARY_BALANCE, }, }, { @@ -726,11 +726,11 @@ export default [ permission: [ { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_ITEM_DETAILS, + ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_VALUATION_SUMMARY, + ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY, }, ], }, @@ -739,11 +739,11 @@ export default [ permission: [ { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_ITEM_DETAILS, + ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS, }, { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_VALUATION_SUMMARY, + ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY, }, ], }, @@ -752,7 +752,7 @@ export default [ href: '/financial-reports/inventory-item-details', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_ITEM_DETAILS, + ability: ReportsAction.READ_INVENTORY_ITEM_DETAILS, }, }, { @@ -760,7 +760,7 @@ export default [ href: '/financial-reports/inventory-valuation', permission: { subject: AbilitySubject.Report, - ability: Report_Abilities.READ_INVENTORY_VALUATION_SUMMARY, + ability: ReportsAction.READ_INVENTORY_VALUATION_SUMMARY, }, }, ], diff --git a/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js b/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js index 483c0457c..b90238018 100644 --- a/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js +++ b/src/containers/Accounting/JournalsLanding/ManualJournalActionsBar.js @@ -28,7 +28,7 @@ import withSettings from '../../Settings/withSettings'; import { Can, If, DashboardActionViewsList } from 'components'; import { - Manual_Journal_Abilities, + ManualJournalAction, AbilitySubject, } from '../../../common/abilityOption'; import { compose } from 'utils'; @@ -89,10 +89,7 @@ function ManualJournalActionsBar({ onChange={handleTabChange} /> - +