diff --git a/server/src/api/controllers/Purchases/index.ts b/server/src/api/controllers/Purchases/index.ts index 5333b2f84..622c575e7 100644 --- a/server/src/api/controllers/Purchases/index.ts +++ b/server/src/api/controllers/Purchases/index.ts @@ -1,9 +1,10 @@ import express from 'express'; -import { Container } from 'typedi'; +import { Container, Service } from 'typedi'; import Bills from 'api/controllers/Purchases/Bills' import BillPayments from 'api/controllers/Purchases/BillsPayments'; -export default { +@Service() +export default class PurchasesController { router() { const router = express.Router(); diff --git a/server/src/api/controllers/Sales/index.ts b/server/src/api/controllers/Sales/index.ts index 146c8dddf..af92ee890 100644 --- a/server/src/api/controllers/Sales/index.ts +++ b/server/src/api/controllers/Sales/index.ts @@ -1,11 +1,12 @@ import express from 'express'; -import { Container } from 'typedi'; +import { Container, Service } from 'typedi'; import SalesEstimates from './SalesEstimates'; import SalesReceipts from './SalesReceipts'; import SalesInvoices from './SalesInvoices' import PaymentReceives from './PaymentReceives'; -export default { +@Service() +export default class SalesController { /** * Router constructor. */ diff --git a/server/src/api/index.ts b/server/src/api/index.ts index 3d574ca2d..3cfa75f3e 100644 --- a/server/src/api/index.ts +++ b/server/src/api/index.ts @@ -92,10 +92,10 @@ export default () => { dashboard.use('/item_categories', Container.get(ItemCategories).router()); dashboard.use('/expenses', Container.get(Expenses).router()); dashboard.use('/financial_statements', FinancialStatements.router()); - dashboard.use('/sales', Sales.router()); + dashboard.use('/sales', Container.get(Sales).router()); dashboard.use('/customers', Container.get(Customers).router()); dashboard.use('/vendors', Container.get(Vendors).router()); - dashboard.use('/purchases', Purchases.router()); + dashboard.use('/purchases', Container.get(Purchases).router()); dashboard.use('/resources', Resources.router()); dashboard.use('/exchange_rates', Container.get(ExchangeRates).router()); dashboard.use('/media', Media.router()); diff --git a/server/src/services/DynamicListing/DynamicListService.ts b/server/src/services/DynamicListing/DynamicListService.ts index 80998d161..54ee80db5 100644 --- a/server/src/services/DynamicListing/DynamicListService.ts +++ b/server/src/services/DynamicListing/DynamicListService.ts @@ -12,7 +12,6 @@ import { validateFieldKeyExistance, validateFilterRolesFieldsExistance, } from 'lib/ViewRolesBuilder'; - import TenancyService from 'services/Tenancy/TenancyService'; import { IDynamicListFilterDTO, IFilterRole, IDynamicListService } from 'interfaces';