docs: update .all-contributorsrc [skip ci]

.env.example

@@ -89,7 +89,3 @@ S3_ACCESS_KEY_ID=
 S3_SECRET_ACCESS_KEY=
 S3_ENDPOINT=
 S3_BUCKET=
-
-# PostHog 
-POSTHOG_API_KEY=
-POSTHOG_HOST=

CHANGELOG.md

@@ -2,27 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.19.4] - 18-08-2024
-
-* fix: Allow multi-lines to statements transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/594
-* feat: Add amount comparators to amount bank rule field by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/595
-* fix: Transaction type and description do not show in general ledger. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/596
-* fix: Refresh accounts and account transactions. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/597
-* fix: Typo payments made by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/598
-* fix: Typo categories list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/600
-* fix: Autofill the quick created customer/vendor by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/601
-* fix: Remove views tabs from receipts list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/602
-* fix: Typo payment receive messages by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/599
-* fix: Enhance Dropzone visual of  accept and reject modes by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/603
-* fix:  Matching bank transactions should create associate payment transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/606
-* fix: Change Dropzone title and subtitle by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/607
-* fix: Inconsistance page size of paginated data tables by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/604
-* fix: Database connection lost error by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/611
-* fix: Language typos by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/613
-* Fix: Correctly display Date, Published At, and Created At in ExpenseDrawerHeader by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/612
-* fix: Delete bank account with uncategorized transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/614
-* feat: activate/inactivate account from drawer details by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/615
-
 ## [v0.18.0] - 10-08-2024
 
 * feat: Bank rules for automated categorization by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/511

packages/server/package.json

@@ -37,7 +37,6 @@
     "agendash": "^3.1.0",
     "app-root-path": "^3.0.0",
     "async": "^3.2.0",
-    "async-mutex": "^0.5.0",
     "axios": "^1.6.0",
     "babel-loader": "^9.1.2",
     "bcryptjs": "^2.4.3",
@@ -70,8 +69,9 @@
     "is-my-json-valid": "^2.20.5",
     "js-money": "^0.6.3",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^3.1.0",
+    "knex": "^0.95.15",
     "knex-cleaner": "^1.3.0",
+    "knex-db-manager": "^0.6.1",
     "libphonenumber-js": "^1.9.6",
     "lodash": "^4.17.15",
     "lru-cache": "^6.0.0",
@@ -99,7 +99,6 @@
     "objection-unique": "^1.2.2",
     "plaid": "^10.3.0",
     "pluralize": "^8.0.0",
-    "posthog-node": "^4.2.0",
     "pug": "^3.0.2",
     "puppeteer": "^10.2.0",
     "qim": "0.0.52",
@@ -109,7 +108,6 @@
     "rtl-detect": "^1.0.4",
     "socket.io": "^4.7.4",
     "source-map-loader": "^4.0.1",
-    "swagger-ui-express": "^5.0.1",
     "tmp-promise": "^3.0.3",
     "ts-transformer-keys": "^0.4.2",
     "tsyringe": "^4.3.0",

packages/server/src/api/controllers/Attachments/AttachmentsController.ts

@@ -5,14 +5,7 @@ import { body, param } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
 import { AttachmentUploadPipeline } from '@/services/Attachments/S3UploadPipeline';
-import {
-  ApiOperation,
-  ApiResponse,
-  ApiTags,
-  Route,
-} from '@/decorators/swagger-decorators';
 
-@ApiTags('Attachments')
 @Service()
 export class AttachmentsController extends BaseController {
   @Inject()
@@ -128,26 +121,6 @@ export class AttachmentsController extends BaseController {
    * @param {NextFunction} next
    * @returns {Promise<Response|void>}
    */
-  @ApiResponse({
-    status: 200,
-    description: 'Details of the given attachement',
-    schema: {
-      type: 'array',
-      items: {
-        type: 'object',
-        properties: {
-          id: { type: 'string' },
-          name: { type: 'string' },
-          email: { type: 'string' },
-        },
-      },
-    },
-  })
-  @ApiOperation({
-    summary: 'Retrieve a specific details of attachment',
-    description: 'Get all registered users',
-  })
-  @Route('/attachments/:id')
   private async getAttachment(
     req: Request,
     res: Response,

packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts

@@ -46,10 +46,6 @@ export class ExcludeBankTransactionsController extends BaseController {
         query('account_id').optional().isNumeric().toInt(),
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
-        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-        query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
       ],
       this.validationResult,
       this.getExcludedBankTransactions.bind(this)

packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts

@@ -21,10 +21,6 @@ export class RecognizedTransactionsController extends BaseController {
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
         query('account_id').optional().isNumeric().toInt(),
-        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-        query('max_amount').optional({ nullable: true }).isFloat().isFloat(),
       ],
       this.validationResult,
       this.getRecognizedTransactions.bind(this)

packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts

@@ -84,10 +84,6 @@ export default class NewCashflowTransactionController extends BaseController {
       param('id').exists().isNumeric().toInt(),
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
-      query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-      query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-      query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-      query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
     ];
   }
 

packages/server/src/api/controllers/Items/Items.ts

@@ -8,11 +8,6 @@ import { IItemDTO, ItemAction, AbilitySubject } from '@/interfaces';
 import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import CheckAbilities from '@/api/middleware/CheckPolicies';
 import { ItemsApplication } from '@/services/Items/ItemsApplication';
-import {
-  ApiOperation,
-  ApiResponse,
-  Route,
-} from '@/decorators/swagger-decorators';
 
 @Service()
 export default class ItemsController extends BaseController {
@@ -203,22 +198,6 @@ export default class ItemsController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  @ApiResponse({
-    status: 200,
-    description: 'Details of the given attachement',
-    schema: {
-      type: 'object',
-      properties: {
-        id: { type: 'string' },
-        name: { type: 'string' },
-      },
-    },
-  })
-  @ApiOperation({
-    summary: 'Creates a new item (inventory or service)',
-    description: 'Get all registered users',
-  })
-  @Route('/items')
   private async newItem(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const itemDTO: IItemDTO = this.matchedBodyData(req);

packages/server/src/api/controllers/OneClickDemo/OneClickDemoController.ts

@@ -1,87 +0,0 @@
-import { Router, Request, Response, NextFunction } from 'express';
-import { Service, Inject } from 'typedi';
-import { body } from 'express-validator';
-import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import BaseController from '@/api/controllers/BaseController';
-import { OneClickDemoApplication } from '@/services/OneClickDemo/OneClickDemoApplication';
-import config from '@/config';
-@Service()
-export class OneClickDemoController extends BaseController {
-  @Inject()
-  private oneClickDemoApp: OneClickDemoApplication;
-
-  /**
-   * Router constructor method.
-   */
-  router() {
-    const router = Router();
-
-    // Protects the endpoints if the feature is not enabled.
-    const protectMiddleware = (
-      req: Request,
-      res: Response,
-      next: NextFunction
-    ) => {
-      // Add your protection logic here
-      if (config.oneClickDemoAccounts) {
-        next();
-      } else {
-        res.status(403).send({ message: 'Forbidden' });
-      }
-    };
-    router.post(
-      '/one_click',
-      protectMiddleware,
-      asyncMiddleware(this.oneClickDemo.bind(this))
-    );
-    router.post(
-      '/one_click_signin',
-      [body('demo_id').exists()],
-      this.validationResult,
-      protectMiddleware,
-      asyncMiddleware(this.oneClickSignIn.bind(this))
-    );
-    return router;
-  }
-
-  /**
-   * One-click demo application.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async oneClickDemo(req: Request, res: Response, next: NextFunction) {
-    try {
-      const data = await this.oneClickDemoApp.createOneClick();
-
-      return res.status(200).send({
-        data,
-        message: 'The one-click demo has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Sign-in to one-click demo account.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async oneClickSignIn(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { demoId } = this.matchedBodyData(req);
-
-    try {
-      const data = await this.oneClickDemoApp.autoSignIn(demoId);
-
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-}

packages/server/src/api/controllers/Subscription/SubscriptionController.ts

@@ -113,7 +113,7 @@ export class SubscriptionController extends BaseController {
     const { tenantId } = req;
 
     try {
-      await this.subscriptionApp.cancelSubscription(tenantId);
+      await this.subscriptionApp.cancelSubscription(tenantId, '455610');
 
       return res.status(200).send({
         status: 200,

packages/server/src/api/controllers/Webhooks/Webhooks.ts

@@ -35,7 +35,7 @@ export class Webhooks extends BaseController {
    */
   public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
     const data = req.body;
-    const signature = req.headers['x-signature'] as string ?? '';
+    const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
 
     try {

packages/server/src/api/index.ts

@@ -63,7 +63,6 @@ import { BankingController } from './controllers/Banking/BankingController';
 import { Webhooks } from './controllers/Webhooks/Webhooks';
 import { ExportController } from './controllers/Export/ExportController';
 import { AttachmentsController } from './controllers/Attachments/AttachmentsController';
-import { OneClickDemoController } from './controllers/OneClickDemo/OneClickDemoController';
 
 export default () => {
   const app = Router();
@@ -81,7 +80,6 @@ export default () => {
   app.use('/jobs', Container.get(Jobs).router());
   app.use('/account', Container.get(Account).router());
   app.use('/webhooks', Container.get(Webhooks).router());
-  app.use('/demo', Container.get(OneClickDemoController).router())
 
   // - Dashboard routes.
   // ---------------------------

packages/server/src/api/middleware/SettingsMiddleware.ts

@@ -1,21 +1,11 @@
-import { Container } from 'typedi';
 import { Request, Response, NextFunction } from 'express';
+import { Container } from 'typedi';
 import SettingsStore from '@/services/Settings/SettingsStore';
-
+ 
 export default async (req: Request, res: Response, next: NextFunction) => {
   const { tenantId } = req.user;
 
-  const settings = await initializeTenantSettings(tenantId);
-  req.settings = settings;
-
-  res.on('finish', async () => {
-    await settings.save();
-  });
-  next();
-}
-
-
-export const initializeTenantSettings = async (tenantId: number) => {
+  const Logger = Container.get('logger');
   const tenantContainer = Container.of(`tenant-${tenantId}`);
 
   if (tenantContainer && !tenantContainer.has('settings')) {
@@ -28,5 +18,10 @@ export const initializeTenantSettings = async (tenantId: number) => {
 
   await settings.load();
 
-  return settings;
+  req.settings = settings;
+
+  res.on('finish', async () => {
+    await settings.save();
+  });
+  next();
 }

packages/server/src/api/middleware/SubscriptionMiddleware.ts

@@ -1,8 +1,6 @@
 import { Container } from 'typedi';
 import { Request, Response, NextFunction } from 'express';
 
-const SupportedMethods = ['POST', 'PUT'];
-
 export default (subscriptionSlug = 'main') =>
   async (req: Request, res: Response, next: NextFunction) => {
     const { tenant, tenantId } = req;
@@ -21,10 +19,8 @@ export default (subscriptionSlug = 'main') =>
         errors: [{ type: 'TENANT.HAS.NO.SUBSCRIPTION' }],
       });
     }
-    const isMethodSupported = SupportedMethods.includes(req.method);
-    const isSubscriptionInactive = subscription.inactive();
-
-    if (isMethodSupported && isSubscriptionInactive) {
+    // Validate in case the subscription is inactive.
+    else if (subscription.inactive()) {
       return res.boom.badRequest(null, {
         errors: [{ type: 'ORGANIZATION.SUBSCRIPTION.INACTIVE' }],
       });

packages/server/src/api/middleware/TenantDependencyInjection.ts

@@ -4,7 +4,6 @@ import { Request } from 'express';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import TenantsManagerService from '@/services/Tenancy/TenantsManager';
 import rtlDetect from 'rtl-detect';
-import { Tenant } from '@/system/models';
 
 export default (req: Request, tenant: ITenant) => {
   const { id: tenantId, organizationId } = tenant;
@@ -17,7 +16,7 @@ export default (req: Request, tenant: ITenant) => {
 
   const tenantContainer = tenantServices.tenantContainer(tenantId);
 
-  tenantContainer.set('i18n', injectI18nUtils());
+  tenantContainer.set('i18n', injectI18nUtils(req));
 
   const knexInstance = tenantServices.knex(tenantId);
   const models = tenantServices.models(tenantId);
@@ -34,35 +33,14 @@ export default (req: Request, tenant: ITenant) => {
 };
 
 export const injectI18nUtils = (req) => {
-  const globalI18n = Container.get('i18n');
-  const locale = globalI18n.getLocale();
+  const locale = req.getLocale();
   const direction = rtlDetect.getLangDir(locale);
 
   return {
     locale,
-    __: globalI18n.__,
+    __: req.__,
     direction,
     isRtl: direction === 'rtl',
     isLtr: direction === 'ltr',
   };
 };
-
-export const initalizeTenantServices = async (tenantId: number) => {
-  const tenant = await Tenant.query()
-    .findById(tenantId)
-    .withGraphFetched('metadata');
-
-  const tenantServices = Container.get(TenancyService);
-  const tenantsManager = Container.get(TenantsManagerService);
-
-  // Initialize the knex instance.
-  tenantsManager.setupKnexInstance(tenant);
-
-  const tenantContainer = tenantServices.tenantContainer(tenantId);
-  tenantContainer.set('i18n', injectI18nUtils());
-
-  tenantServices.knex(tenantId);
-  tenantServices.models(tenantId);
-  tenantServices.repositories(tenantId);
-  tenantServices.cache(tenantId);
-};

packages/server/src/config/index.ts

@@ -32,7 +32,7 @@ module.exports = {
    */
   tenant: {
     db_client: process.env.TENANT_DB_CLIENT || process.env.DB_CLIENT || 'mysql',
-    db_name_prefix: process.env.TENANT_DB_NAME_PERFIX || 'bigcapital_tenant_',
+    db_name_prefix: process.env.TENANT_DB_NAME_PERFIX,
     db_host: process.env.TENANT_DB_HOST || process.env.DB_HOST,
     db_user: process.env.TENANT_DB_USER || process.env.DB_USER,
     db_password: process.env.TENANT_DB_PASSWORD || process.env.DB_PASSWORD,
@@ -245,20 +245,4 @@ module.exports = {
   loops: {
     apiKey: process.env.LOOPS_API_KEY,
   },
-
-  /**
-   * One-click demo accounts.
-   */
-  oneClickDemoAccounts: {
-    enable: parseBoolean(process.env.ONE_CLICK_DEMO_ACCOUNTS, false),
-    demoUrl: process.env.ONE_CLICK_DEMO_ACCOUNTS_URL || '',
-  },
-
-  /**
-   * PostHog
-   */
-  posthog: {
-    apiKey: process.env.POSTHOG_API_KEY,
-    host: process.env.POSTHOG_HOST
-  }
 };

packages/server/src/constants/event-tracker.ts

@@ -1,79 +0,0 @@
-export const SALE_INVOICE_CREATED = 'Sale invoice created';
-export const SALE_INVOICE_EDITED = 'Sale invoice d';
-export const SALE_INVOICE_DELETED = 'Sale invoice deleted';
-export const SALE_INVOICE_MAIL_DELIVERED = 'Sale invoice mail delivered';
-
-export const SALE_ESTIMATE_CREATED = 'Sale estimate created';
-export const SALE_ESTIMATE_EDITED = 'Sale estimate edited';
-export const SALE_ESTIMATE_DELETED = 'Sale estimate deleted';
-
-export const PAYMENT_RECEIVED_CREATED = 'Payment received created';
-export const PAYMENT_RECEIVED_EDITED = 'payment received edited';
-export const PAYMENT_RECEIVED_DELETED = 'Payment received deleted';
-
-export const BILL_CREATED = 'Bill created';
-export const BILL_EDITED = 'Bill edited';
-export const BILL_DELETED = 'Bill deleted';
-
-export const PAYMENT_MADE_CREATED = 'Payment made created';
-export const PAYMENT_MADE_EDITED = 'Payment made edited';
-export const PAYMENT_MADE_DELETED = 'Payment made deleted';
-
-export const EXPENSE_CREATED = 'Expense created';
-export const EXPENSE_EDITED = 'Expense edited';
-export const EXPENSE_DELETED = 'Expense deleted';
-
-export const ACCOUNT_CREATED = 'Account created';
-export const ACCOUNT_EDITED = 'Account Edited';
-export const ACCOUNT_DELETED = 'Account deleted';
-
-export const ITEM_EVENT_CREATED = 'Item created';
-export const ITEM_EVENT_EDITED = 'Item edited';
-export const ITEM_EVENT_DELETED = 'Item deleted';
-
-export const AUTH_SIGNED_UP = 'Auth Signed-up';
-export const AUTH_RESET_PASSWORD = 'Auth reset password';
-
-export const SUBSCRIPTION_CANCELLED = 'Subscription cancelled';
-export const SUBSCRIPTION_RESUMED = 'Subscription resumed';
-export const SUBSCRIPTION_PLAN_CHANGED = 'Subscription plan changed';
-
-export const CUSTOMER_CREATED = 'Customer created';
-export const CUSTOMER_EDITED = 'Customer edited';
-export const CUSTOMER_DELETED = 'Customer deleted';
-
-export const VENDOR_CREATED = 'Vendor created';
-export const VENDOR_EDITED = 'Vendor edited';
-export const VENDOR_DELETED = 'Vendor deleted';
-
-export const TRANSACTIONS_LOCKING_LOCKED = 'Transactions locking locked';
-export const TRANSACTIONS_LOCKING_LOCKING_CANCELLED =
-  'Transactions locking cancelled';
-export const TRANSACTIONS_LOCKING_PARTIALLY_UNLOCKED =
-  'Transactions locking partially unlocked';
-export const TRANSACTIONS_LOCKING_PARTIALLY_UNLOCK_CANCELLED =
-  'Transactions locking partially unlock cancelled';
-
-export const BANK_TRANSACTION_MATCHED = 'Bank transaction matching deleted';
-export const BANK_TRANSACTION_EXCLUDED = 'Bank transaction excluded';
-export const BANK_TRANSACTION_CATEGORIZED = 'Bank transaction categorized';
-export const BANK_TRANSACTION_UNCATEGORIZED = 'Bank transaction uncategorized';
-export const BANK_ACCOUNT_DISCONNECTED = 'Bank account disconnected';
-
-export const MANUAL_JOURNAL_CREATED = 'Manual journal created';
-export const MANUAL_JOURNAL_EDITED = 'Manual journal edited';
-export const MANUAL_JOURNAL_DELETED = 'Manual journal deleted';
-export const MANUAL_JOURNAL_PUBLISHED = 'Manual journal published';
-
-export const BANK_RULE_CREATED = 'Bank rule created';
-export const BANK_RULE_EDITED = 'Bank rule edited';
-export const BANK_RULE_DELETED = 'Bank rule deleted';
-
-// # Event Groups
-export const ACCOUNT_GROUP = 'Account';
-export const ITEM_GROUP = 'Item';
-export const AUTH_GROUP = 'Auth';
-export const SALE_GROUP = 'Sale';
-export const PAYMENT_GROUP = 'Payment';
-export const BILL_GROUP = 'Bill';
-export const EXPENSE_GROUP = 'Expense';

packages/server/src/database/seeds/core/20200810121809_seed_settings.ts

@@ -15,7 +15,6 @@ export default class SeedSettings extends TenantSeeder {
 
       // Manual journals settings.
       { group: 'manual_journals', key: 'next_number', value: '00001' },
-      { group: 'manual_journals', key: 'number_prefix', value: 'J-' },
       { group: 'manual_journals', key: 'auto_increment', value: true },
 
       // Sale invoices settings.

packages/server/src/decorators/swagger-decorators.ts

@@ -1,63 +0,0 @@
-export const swaggerDocs = {
-  tags: {},
-  paths: {},
-};
-
-// Decorator to set a tag for a route
-export function ApiTags(tag) {
-  return function (target) {
-    if (!swaggerDocs.tags[tag]) {
-      swaggerDocs.tags[tag] = { name: tag };
-    }
-  };
-}
-
-// Decorator to add an operation for a specific route
-export function ApiOperation(options) {
-  return function (target, propertyKey, descriptor) {
-    const routePath = Reflect.getMetadata('path', target, propertyKey);
-
-    swaggerDocs.paths[routePath] = swaggerDocs.paths[routePath] || {};
-    swaggerDocs.paths[routePath].get = {
-      summary: options.summary,
-      description: options.description || '',
-      responses: options.responses || {
-        200: {
-          description: 'Successful Response',
-        },
-      },
-    };
-
-    
-  };
-}
-
-// Decorator to define the route path
-export function Route(path) {
-  return function (target, propertyKey, descriptor) {
-    Reflect.defineMetadata('path', path, target, propertyKey);
-  };
-}
-
-// Decorator to add a response schema for a specific route
-export function ApiResponse(options) {
-  return function (target, propertyKey, descriptor) {
-    const routePath = Reflect.getMetadata('path', target, propertyKey);
-    
-    if (!swaggerDocs.paths[routePath]) {
-      swaggerDocs.paths[routePath] = { get: {} };
-    }
-
-    swaggerDocs.paths[routePath].get.responses =
-      swaggerDocs.paths[routePath].get.responses || {};
-
-    swaggerDocs.paths[routePath].get.responses[options.status] = {
-      description: options.description || 'No description provided',
-      content: {
-        'application/json': {
-          schema: options.schema || {},
-        },
-      },
-    };
-  };
-}

packages/server/src/interfaces/Authentication.ts

@@ -7,6 +7,7 @@ export interface IRegisterDTO {
   lastName: string;
   email: string;
   password: string;
+  organizationName: string;
 }
 
 export interface ILoginDTO {
@@ -76,10 +77,6 @@ export interface IAuthSendedResetPassword {
 
 export interface IAuthGetMetaPOJO {
   signupDisabled: boolean;
-  oneClickDemo: {
-    enable: boolean;
-    demoUrl: string;
-  };
 }
 
 export interface IAuthSignUpVerifingEventPayload {

packages/server/src/interfaces/Bill.ts

@@ -99,7 +99,6 @@ export interface IBillsFilter extends IDynamicListFilterDTO {
   stringifiedFilterRoles?: string;
   page: number;
   pageSize: number;
-  filterQuery?: (q: any) => void;
 }
 
 export interface IBillsService {

packages/server/src/interfaces/CashflowService.ts

@@ -167,18 +167,11 @@ export interface CategorizeTransactionAsExpenseDTO {
 export interface IGetUncategorizedTransactionsQuery {
   page?: number;
   pageSize?: number;
-  minDate?: Date;
-  maxDate?: Date;
-  minAmount?: number;
-  maxAmount?: number;
 }
 
+
 export interface IGetRecognizedTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
-  minDate?: Date;
-  maxDate?: Date;
-  minAmount?: number;
-  maxAmount?: number;
-}
+}

packages/server/src/interfaces/Contact.ts

@@ -241,7 +241,6 @@ export interface ICustomerEventCreatingPayload {
   trx: Knex.Transaction;
 }
 export interface ICustomerEventEditedPayload {
-  tenantId: number
   customerId: number;
   customer: ICustomer;
   trx: Knex.Transaction;

packages/server/src/interfaces/CreditNote.ts

@@ -1,10 +1,10 @@
 import { Knex } from 'knex';
-import { IDynamicListFilter, IItemEntry } from '@/interfaces';
+import { IDynamicListFilter, IItemEntry, IVendorCredit } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
 import { AttachmentLinkDTO } from './Attachments';
 
 export interface ICreditNoteEntryNewDTO {
-  index?: number;
+  index: number;
   itemId: number;
   rate: number;
   quantity: number;
@@ -22,7 +22,7 @@ export interface ICreditNoteNewDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
+  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEditDTO {
@@ -35,7 +35,7 @@ export interface ICreditNoteEditDTO {
   entries: ICreditNoteEntryNewDTO[];
   branchId?: number;
   warehouseId?: number;
-  attachments?: AttachmentLinkDTO[];
+  attachments?: AttachmentLinkDTO[]
 }
 
 export interface ICreditNoteEntry extends IItemEntry {}
@@ -61,7 +61,7 @@ export interface ICreditNote {
   localAmount?: number;
   branchId?: number;
   warehouseId: number;
-  createdAt?: Date;
+  createdAt?: Date,
 }
 
 export enum CreditNoteAction {
@@ -130,9 +130,7 @@ export interface ICreditNoteOpenedPayload {
   trx: Knex.Transaction;
 }
 
-export interface ICreditNotesQueryDTO {
-  filterQuery?: (query: any) => void;
-}
+export interface ICreditNotesQueryDTO {}
 
 export interface ICreditNotesQueryDTO extends IDynamicListFilter {
   page: number;

packages/server/src/interfaces/Expenses.ts

@@ -17,7 +17,6 @@ export interface IExpensesFilter {
   columnSortBy: string;
   sortOrder: string;
   viewSlug?: string;
-  filterQuery?: (query: any) => void;
 }
 
 export interface IExpense {

packages/server/src/interfaces/Import.ts

@@ -3,6 +3,6 @@ import { ImportFilePreviewPOJO } from "@/services/Import/interfaces";
 
 export interface IImportFileCommitedEventPayload {
   tenantId: number;
-  importId: string;
+  importId: number;
   meta: ImportFilePreviewPOJO;
 }

packages/server/src/interfaces/ItemEntry.ts

@@ -48,7 +48,6 @@ export interface IItemEntry {
 
 export interface IItemEntryDTO {
   id?: number;
-  index?: number;
   itemId: number;
   landedCost?: boolean;
   warehouseId?: number;

packages/server/src/interfaces/Model.ts

@@ -151,7 +151,6 @@ export interface IModelMetaFieldCommon2 {
   importHint?: string;
   order?: number;
   unique?: number;
-  features?: Array<any>
 }
 
 export interface IModelMetaRelationField2 {

packages/server/src/interfaces/PaymentReceive.ts

@@ -66,15 +66,14 @@ export interface IPaymentReceivedEntry {
 
 export interface IPaymentReceivedEntryDTO {
   id?: number;
-  index?: number;
-  paymentReceiveId?: number;
+  index: number;
+  paymentReceiveId: number;
   invoiceId: number;
   paymentAmount: number;
 }
 
 export interface IPaymentsReceivedFilter extends IDynamicListFilterDTO {
   stringifiedFilterRoles?: string;
-  filterQuery?: (trx: Knex.Transaction) => void;
 }
 
 export interface IPaymentReceivePageEntry {

packages/server/src/interfaces/SaleEstimate.ts

@@ -44,7 +44,6 @@ export interface ISaleEstimateDTO {
 
 export interface ISalesEstimatesFilter extends IDynamicListFilterDTO {
   stringifiedFilterRoles?: string;
-  filterQuery?: (q: any) => void;
 }
 
 export interface ISalesEstimatesService {

packages/server/src/interfaces/SaleInvoice.ts

@@ -79,7 +79,6 @@ export interface ISalesInvoicesFilter extends IDynamicListFilter {
   page: number;
   pageSize: number;
   searchKeyword?: string;
-  filterQuery?: (q: Knex.QueryBuilder) => void;
 }
 
 export interface ISalesInvoicesService {

packages/server/src/interfaces/SaleReceipt.ts

@@ -29,9 +29,7 @@ export interface ISaleReceipt {
   entries?: IItemEntry[];
 }
 
-export interface ISalesReceiptsFilter {
-  filterQuery?: (query: any) => void;
-}
+export interface ISalesReceiptsFilter {}
 
 export interface ISaleReceiptDTO {
   customerId: number;

packages/server/src/interfaces/Setup.ts

@@ -33,7 +33,3 @@ export interface IOrganizationBuildEventPayload {
   buildDTO: IOrganizationBuildDTO;
   systemUser: ISystemUser;
 }
-
-export interface IOrganizationBuiltEventPayload {
-  tenantId: number;
-}

packages/server/src/interfaces/Subscription.ts

@@ -1,8 +0,0 @@
-export interface SubscriptionPayload {
-  lemonSqueezyId?: string;
-}
-
-export enum SubscriptionPaymentStatus {
-  Succeed = 'succeed',
-  Failed = 'failed',
-}

packages/server/src/interfaces/Tenancy.ts

@@ -51,4 +51,5 @@ export interface ISystemService {
   cache();
   repositories();
   knex();
+  dbManager();
 }

packages/server/src/interfaces/VendorCredit.ts

@@ -106,7 +106,6 @@ export interface IVendorCreditsQueryDTO extends IDynamicListFilter {
   page: number;
   pageSize: number;
   searchKeyword?: string;
-  filterQuery?: (q: any) => void;
 }
 
 export interface IVendorCreditEditingPayload {

packages/server/src/interfaces/index.ts

@@ -75,7 +75,6 @@ export * from './Times';
 export * from './ProjectProfitabilitySummary';
 export * from './TaxRate';
 export * from './Plaid';
-export * from './Subscription';
 
 export interface I18nService {
   __: (input: string) => string;

packages/server/src/jobs/ComputeItemCost.ts

@@ -21,7 +21,7 @@ export default class ComputeItemCostJob {
 
     agenda.define(
       'compute-item-cost',
-      { priority: 'high', concurrency: 20 },
+      { priority: 'high', concurrency: 1 },
       this.handler.bind(this)
     );
     this.agenda.on('start:compute-item-cost', this.onJobStart.bind(this));

packages/server/src/jobs/OrganizationSetup.ts

@@ -8,7 +8,7 @@ export default class OrganizationSetupJob {
   constructor(agenda) {
     agenda.define(
       'organization-setup',
-      { priority: 'high', concurrency: 20 },
+      { priority: 'high', concurrency: 1 },
       this.handler
     );
   }

packages/server/src/jobs/WriteInvoicesJEntries.ts

@@ -15,7 +15,7 @@ export default class WriteInvoicesJournalEntries {
 
     agenda.define(
       eventName,
-      { priority: 'normal', concurrency: 20 },
+      { priority: 'normal', concurrency: 1 },
       this.handler.bind(this)
     );
     agenda.on(`complete:${eventName}`, this.onJobCompleted.bind(this));

packages/server/src/lib/Transformer/Transformer.ts

@@ -2,7 +2,6 @@ import moment from 'moment';
 import * as R from 'ramda';
 import { includes, isFunction, isObject, isUndefined, omit } from 'lodash';
 import { formatNumber, sortObjectKeysAlphabetically } from 'utils';
-import { EXPORT_DTE_FORMAT } from '@/services/Export/constants';
 
 export class Transformer {
   public context: any;
@@ -156,35 +155,19 @@ export class Transformer {
     this.dateFormat = format;
   }
 
-  /**
-   * Format date.
-   * @param {} date
-   * @param {string} format -
-   * @returns {}
-   */
-  protected formatDate(date, format?: string) {
-    // Use the export date format if the async operation is in exporting,
-    // otherwise use the given or default format.
-    const _format = this.context.exportAls.isExport
-      ? EXPORT_DTE_FORMAT
-      : format || this.dateFormat;
-
-    return date ? moment(date).format(_format) : '';
-  }
-
   /**
    *
    * @param date
-   * @returns {}
+   * @returns
    */
-  protected formatDateFromNow(date) {
-    return date ? moment(date).fromNow(true) : '';
+  protected formatDate(date) {
+    return date ? moment(date).format(this.dateFormat) : '';
   }
 
   /**
    *
    * @param number
-   * @returns {}
+   * @returns
    */
   protected formatNumber(number, props?) {
     return formatNumber(number, { money: false, ...props });
@@ -194,7 +177,7 @@ export class Transformer {
    *
    * @param money
    * @param options
-   * @returns {}
+   * @returns
    */
   protected formatMoney(money, options?) {
     return formatNumber(money, {

packages/server/src/lib/Transformer/TransformerInjectable.ts

@@ -3,17 +3,12 @@ import { isNull } from 'lodash';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { TenantMetadata } from '@/system/models';
 import { Transformer } from './Transformer';
-import { ImportAls } from '@/services/Import/ImportALS';
-import { ExportAls } from '@/services/Export/ExportAls';
 
 @Service()
 export class TransformerInjectable {
   @Inject()
   private tenancy: HasTenancyService;
 
-  @Inject()
-  private exportAls: ExportAls;
-
   /**
    * Retrieves the application context of all tenant transformers.
    * @param   {number} tenantId
@@ -22,12 +17,10 @@ export class TransformerInjectable {
   async getApplicationContext(tenantId: number) {
     const i18n = this.tenancy.i18n(tenantId);
     const organization = await TenantMetadata.query().findOne({ tenantId });
-    const exportAls = this.exportAls;
 
     return {
       organization,
       i18n,
-      exportAls,
     };
   }
 

packages/server/src/loaders/dbManager.ts

@@ -0,0 +1,7 @@
+import knexManager from 'knex-db-manager';
+import { systemKnexConfig, systemDbManager } from 'config/knexConfig';
+
+export default () => knexManager.databaseManagerFactory({
+  knex: systemKnexConfig,
+  dbManager: systemDbManager,
+});

packages/server/src/loaders/dependencyInjector.ts

@@ -3,6 +3,7 @@ import LoggerInstance from '@/loaders/logger';
 import agendaFactory from '@/loaders/agenda';
 import SmsClientLoader from '@/loaders/smsClient';
 import mailInstance from '@/loaders/mail';
+import dbManagerFactory from '@/loaders/dbManager';
 import i18n from '@/loaders/i18n';
 import repositoriesLoader from '@/loaders/systemRepositories';
 import Cache from '@/services/Cache';
@@ -15,6 +16,7 @@ export default ({ mongoConnection, knex }) => {
   try {
     const agendaInstance = agendaFactory({ mongoConnection });
     const smsClientInstance = SmsClientLoader(config.easySMSGateway.api_key);
+    const dbManager = dbManagerFactory(knex);
     const cacheInstance = new Cache();
 
     Container.set('logger', LoggerInstance);
@@ -22,6 +24,7 @@ export default ({ mongoConnection, knex }) => {
     Container.set('SMSClient', smsClientInstance);
     Container.set('mail', mailInstance);
   
+    Container.set('dbManager', dbManager);
     LoggerInstance.info(
       '[DI] Database manager has been injected into container.'
     );

packages/server/src/loaders/eventEmitter.ts

@@ -115,10 +115,6 @@ import { DecrementUncategorizedTransactionOnExclude } from '@/services/Banking/E
 import { DecrementUncategorizedTransactionOnCategorize } from '@/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize';
 import { DisconnectPlaidItemOnAccountDeleted } from '@/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted';
 import { LoopsEventsSubscriber } from '@/services/Loops/LoopsEventsSubscriber';
-import { DeleteUncategorizedTransactionsOnAccountDeleting } from '@/services/Banking/BankAccounts/events/DeleteUncategorizedTransactionsOnAccountDeleting';
-import { SeedInitialDemoAccountDataOnOrgBuild } from '@/services/OneClickDemo/events/SeedInitialDemoAccountData';
-import { TriggerInvalidateCacheOnSubscriptionChange } from '@/services/Subscription/events/TriggerInvalidateCacheOnSubscriptionChange';
-import { EventsTrackerListeners } from '@/services/EventsTracker/events/events';
 
 export default () => {
   return new EventPublisher();
@@ -249,10 +245,8 @@ export const susbcribers = () => {
     DeleteCashflowTransactionOnUncategorize,
     PreventDeleteTransactionOnDelete,
 
-    // Subscription
     SubscribeFreeOnSignupCommunity,
     SendVerfiyMailOnSignUp,
-    TriggerInvalidateCacheOnSubscriptionChange,
 
     // Attachments
     AttachmentsOnSaleInvoiceCreated,
@@ -283,14 +277,8 @@ export const susbcribers = () => {
     // Plaid
     RecognizeSyncedBankTranasctions,
     DisconnectPlaidItemOnAccountDeleted,
-    DeleteUncategorizedTransactionsOnAccountDeleting,
 
     // Loops
-    LoopsEventsSubscriber,
-
-    // Demo Account
-    SeedInitialDemoAccountDataOnOrgBuild,
-
-    ...EventsTrackerListeners
+    LoopsEventsSubscriber
   ];
 };

packages/server/src/loaders/i18n.ts

@@ -2,7 +2,6 @@ import { I18n } from 'i18n';
 
 export default () => new I18n({
   locales: ['en', 'ar'],
-  defaultLocale: 'en',
   register: global,
   directory: global.__locales_dir,
   updateFiles: false,

packages/server/src/models/Bill.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 export default {
   defaultFilterField: 'vendor',
   defaultSort: {
@@ -169,18 +167,6 @@ export default {
         },
       },
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     billNumber: {
@@ -252,22 +238,6 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true,
-    },
   },
 };
 

packages/server/src/models/Bill.ts

@@ -402,7 +402,6 @@ export default class Bill extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const BillLandedCost = require('models/BillLandedCost');
     const Branch = require('models/Branch');
-    const Warehouse = require('models/Warehouse');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
     const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
@@ -454,18 +453,6 @@ export default class Bill extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Bill may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'bills.warehouseId',
-          to: 'warehouses.id',
-        },
-      },
-
       /**
        * Bill may has associated tax rate transactions.
        */

packages/server/src/models/BillPayment.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 export default {
   defaultFilterField: 'vendor',
   defaultSort: {
@@ -7,8 +5,6 @@ export default {
     sortField: 'bill_date',
   },
   exportable: true,
-  exportFlattenOn: 'entries',
-
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
@@ -81,7 +77,7 @@ export default {
     paymentDate: {
       name: 'bill_payment.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate',
+      accessor: 'formattedPaymentDate'
     },
     paymentNumber: {
       name: 'bill_payment.field.payment_number',
@@ -115,40 +111,6 @@ export default {
       name: 'bill_payment.field.reference',
       type: 'text',
     },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        date: {
-          name: 'Bill date',
-          accessor: 'bill.formattedBillDate',
-        },
-        billNo: {
-          name: 'Bill No.',
-          accessor: 'bill.billNo',
-        },
-        billRefNo: {
-          name: 'Bill Reference No.',
-          accessor: 'bill.referenceNo',
-        },
-        billAmount: {
-          name: 'Bill Amount',
-          accessor: 'bill.totalFormatted',
-        },
-        paidAmount: {
-          name: 'Paid Amount',
-          accessor: 'paymentAmountFormatted',
-        },
-      },
-    },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     vendorId: {
@@ -212,13 +174,5 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
   },
 };

packages/server/src/models/Branch.settings.ts

@@ -1,11 +0,0 @@
-export default {
-  fields2: {
-    name: {
-      name: 'Name',
-      fieldType: 'text',
-      required: true,
-    },
-  },
-  columns: {},
-  fields: {}
-};

packages/server/src/models/Branch.ts

@@ -1,9 +1,7 @@
-import { Model, mixin } from 'objection';
+import { Model } from 'objection';
 import TenantModel from 'models/TenantModel';
-import BranchMetadata from './Branch.settings';
-import ModelSetting from './ModelSetting';
 
-export default class Branch extends mixin(TenantModel, [ModelSetting]) {
+export default class Branch extends TenantModel {
   /**
    * Table name.
    */
@@ -171,11 +169,4 @@ export default class Branch extends mixin(TenantModel, [ModelSetting]) {
       },
     };
   }
-
-  /**
-   * Model settings.
-   */
-  static get meta() {
-    return BranchMetadata;
-  }
 }

packages/server/src/models/CreditNote.Meta.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 function StatusFieldFilterQuery(query, role) {
   query.modify('filterByStatus', role.value);
 }
@@ -102,7 +100,7 @@ export default {
     },
     creditNoteDate: {
       name: 'Credit Note Date',
-      accessor: 'formattedCreditNoteDate',
+      accessor: 'formattedCreditNoteDate'
     },
     referenceNo: {
       name: 'Reference No.',
@@ -149,18 +147,6 @@ export default {
         },
       },
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     customerId: {
@@ -229,21 +215,5 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true,
-    },
   },
 };

packages/server/src/models/CreditNote.ts

@@ -175,7 +175,6 @@ export default class CreditNote extends mixin(TenantModel, [
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
     const Document = require('models/Document');
-    const Warehouse = require('models/Warehouse');
 
     return {
       /**
@@ -236,18 +235,6 @@ export default class CreditNote extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Credit note may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'credit_notes.warehouseId',
-          to: 'warehouses.id',
-        },
-      },
-
       /**
        * Credit note may has many attached attachments.
        */

packages/server/src/models/Customer.Settings.ts

@@ -95,11 +95,6 @@ export default {
     },
   },
   columns: {
-    customerType: {
-      name: 'Customer Type',
-      type: 'text',
-      accessor: 'formattedCustomerType',
-    },
     firstName: {
       name: 'vendor.field.first_name',
       type: 'text',
@@ -140,117 +135,116 @@ export default {
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false,
+      printable: false
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false,
-      accessor: 'formattedOpeningBalanceAt'
+      printable: false
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false,
+      printable: false
     },
     status: {
       name: 'vendor.field.status',
-      printable: false,
+      printable: false
     },
     note: {
       name: 'vendor.field.note',
-      printable: false,
+      printable: false
     },
     // Billing Address
     billingAddress1: {
       name: 'Billing Address 1',
       column: 'billing_address1',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
-      printable: false,
+      printable: false
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
-      printable: false,
+      printable: false
     },
     // Shipping Address
     shippingAddress1: {
       name: 'Shipping Address 1',
       column: 'shipping_address1',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
-      printable: false,
+      printable: false
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
-      printable: false,
+      printable: false
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
-      printable: false,
+      printable: false
     },
   },
   fields2: {

packages/server/src/models/Expense.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 /**
  * Expense - Settings.
  */
@@ -121,12 +119,6 @@ export default {
       type: 'boolean',
       printable: false,
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     paymentAccountId: {
@@ -186,14 +178,6 @@ export default {
       name: 'expense.field.publish',
       fieldType: 'boolean',
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
   },
 };
 

packages/server/src/models/Item.Settings.ts

@@ -41,17 +41,17 @@ export default {
       fieldType: 'boolean',
     },
     sell_price: {
-      name: 'item.field.sell_price',
+      name: 'item.field.cost_price',
       column: 'sell_price',
       fieldType: 'number',
     },
     cost_price: {
-      name: 'item.field.cost_price',
+      name: 'item.field.cost_account',
       column: 'cost_price',
       fieldType: 'number',
     },
     cost_account: {
-      name: 'item.field.cost_account',
+      name: 'item.field.sell_account',
       column: 'cost_account_id',
       fieldType: 'relation',
 
@@ -62,7 +62,7 @@ export default {
       relationEntityKey: 'slug',
     },
     sell_account: {
-      name: 'item.field.sell_account',
+      name: 'item.field.sell_description',
       column: 'sell_account_id',
       fieldType: 'relation',
 
@@ -155,24 +155,24 @@ export default {
       printable: false,
     },
     sellPrice: {
-      name: 'item.field.sell_price',
-      type: 'number',
-      exportable: true,
-    },
-    costPrice: {
       name: 'item.field.cost_price',
       type: 'number',
       exportable: true,
     },
-    costAccount: {
+    costPrice: {
       name: 'item.field.cost_account',
+      type: 'number',
+      exportable: true,
+    },
+    costAccount: {
+      name: 'item.field.sell_account',
       type: 'text',
       accessor: 'costAccount.name',
       exportable: true,
       printable: false,
     },
     sellAccount: {
-      name: 'item.field.sell_account',
+      name: 'item.field.sell_description',
       type: 'text',
       accessor: 'sellAccount.name',
       exportable: true,
@@ -257,25 +257,25 @@ export default {
       name: 'item.field.sell_price',
       fieldType: 'number',
     },
-    costPrice: {
+    cost_price: {
       name: 'item.field.cost_price',
       fieldType: 'number',
     },
-    costAccountId: {
+    costAccount: {
       name: 'item.field.cost_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       importHint: 'Matches the account name or code.',
     },
-    sellAccountId: {
+    sellAccount: {
       name: 'item.field.sell_account',
       fieldType: 'relation',
       relationModel: 'Account',
       relationImportMatch: ['name', 'code'],
       importHint: 'Matches the account name or code.',
     },
-    inventoryAccountId: {
+    inventoryAccount: {
       name: 'item.field.inventory_account',
       fieldType: 'relation',
       relationModel: 'Account',

packages/server/src/models/Pagination.ts

@@ -1,5 +1,4 @@
 import { Model } from 'objection';
-import { castArray, omit, pick } from 'lodash';
 import { isEmpty } from 'lodash';
 import { ServiceError } from '@/exceptions';
 
@@ -17,15 +16,7 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
     });
   }
 
-  queryAndThrowIfHasRelations = ({
-    type,
-    message,
-    excludeRelations = [],
-    includedRelations = [],
-  }) => {
-    const _excludeRelations = castArray(excludeRelations);
-    const _includedRelations = castArray(includedRelations);
-
+  queryAndThrowIfHasRelations = ({ type, message }) => {
     const model = this.modelClass();
     const modelRelations = Object.keys(model.relationMappings).filter(
       (relation) =>
@@ -34,20 +25,9 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
         ) !== -1
     );
     const relations = model.secureDeleteRelations || modelRelations;
-    const filteredByIncluded = relations.filter((r) =>
-      _includedRelations.includes(r)
-    );
-    const filteredByExcluded = relations.filter(
-      (r) => !excludeRelations.includes(r)
-    );
-    const filteredRelations = !isEmpty(_includedRelations)
-      ? filteredByIncluded
-      : !isEmpty(_excludeRelations)
-      ? filteredByExcluded
-      : relations;
 
     this.runAfter((model, query) => {
-      const nonEmptyRelations = filteredRelations.filter(
+      const nonEmptyRelations = relations.filter(
         (relation) => !isEmpty(model[relation])
       );
       if (nonEmptyRelations.length > 0) {
@@ -56,7 +36,7 @@ export default class PaginationQueryBuilder extends Model.QueryBuilder {
       return model;
     });
     return this.onBuild((query) => {
-      filteredRelations.forEach((relation) => {
+      relations.forEach((relation) => {
         query.withGraphFetched(`${relation}(selectId)`).modifiers({
           selectId(builder) {
             builder.select('id');

packages/server/src/models/PaymentReceive.Settings.ts

@@ -1,11 +1,6 @@
-import { Features } from '@/interfaces';
-
 export default {
   importable: true,
-
   exportable: true,
-  exportFlattenOn: 'entries',
-
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'paymentReceiveNo',
@@ -77,7 +72,7 @@ export default {
     amount: {
       name: 'payment_receive.field.amount',
       type: 'number',
-      accessor: 'formattedAmount',
+      accessor: 'formattedAmount'
     },
     referenceNo: {
       name: 'payment_receive.field.reference_no',
@@ -97,45 +92,11 @@ export default {
       type: 'text',
       printable: false,
     },
-    entries: {
-      name: 'Entries',
-      accessor: 'entries',
-      type: 'collection',
-      collectionOf: 'object',
-      columns: {
-        date: {
-          name: 'Invoice date',
-          accessor: 'invoice.invoiceDateFormatted',
-        },
-        invoiceNo: {
-          name: 'Invoice No.',
-          accessor: 'invoice.invoiceNo',
-        },
-        invoiceRefNo: {
-          name: 'Invoice Reference No.',
-          accessor: 'invoice.referenceNo',
-        },
-        invoiceAmount: {
-          name: 'Invoice Amount',
-          accessor: 'invoice.totalFormatted',
-        },
-        paidAmount: {
-          name: 'Paid Amount',
-          accessor: 'paymentAmountFormatted',
-        },
-      },
-    },
     created_at: {
       name: 'payment_receive.field.created_at',
       type: 'date',
       printable: false,
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     customerId: {
@@ -197,13 +158,5 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
   },
 };

packages/server/src/models/SaleEstimate.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 export default {
   defaultFilterField: 'estimate_date',
   defaultSort: {
@@ -15,7 +13,7 @@ export default {
   importAggregateBy: 'estimateNumber',
 
   print: {
-    pageTitle: 'Sale Estimates',
+    pageTitle: 'Sale Estimates'
   },
 
   fields: {
@@ -144,7 +142,6 @@ export default {
     delivered: {
       name: 'Delivered',
       type: 'boolean',
-      accessor: 'isDelivered',
       exportable: true,
       printable: false,
     },
@@ -176,18 +173,6 @@ export default {
         },
       },
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     customerId: {
@@ -266,22 +251,6 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true,
-    },
   },
 };
 

packages/server/src/models/SaleEstimate.ts

@@ -182,7 +182,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Customer = require('models/Customer');
     const Branch = require('models/Branch');
-    const Warehouse = require('models/Warehouse');
     const Document = require('models/Document');
 
     return {
@@ -222,18 +221,6 @@ export default class SaleEstimate extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Sale estimate may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'sales_estimates.warehouseId',
-          to: 'warehouses.id',
-        },
-      },
-
       /**
        * Sale estimate transaction may has many attached attachments.
        */

packages/server/src/models/SaleInvoice.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 export default {
   defaultFilterField: 'customer',
   defaultSort: {
@@ -157,7 +155,6 @@ export default {
       name: 'invoice.field.delivered',
       type: 'boolean',
       printable: false,
-      accessor: 'isDelivered',
     },
     entries: {
       name: 'Entries',
@@ -187,18 +184,6 @@ export default {
         },
       },
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     invoiceDate: {
@@ -282,22 +267,6 @@ export default {
       fieldType: 'boolean',
       printable: false,
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true,
-    },
   },
 };
 

packages/server/src/models/SaleInvoice.ts

@@ -408,7 +408,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const InventoryCostLotTracker = require('models/InventoryCostLotTracker');
     const PaymentReceiveEntry = require('models/PaymentReceiveEntry');
     const Branch = require('models/Branch');
-    const Warehouse = require('models/Warehouse');
     const Account = require('models/Account');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
@@ -500,18 +499,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Invoice may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'sales_invoices.warehouseId',
-          to: 'warehouses.id',
-        }
-      },
-
       /**
        * Invoice may has associated written-off expense account.
        */

packages/server/src/models/SaleReceipt.Settings.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 export default {
   defaultFilterField: 'receipt_date',
   defaultSort: {
@@ -171,18 +169,6 @@ export default {
       type: 'date',
       printable: false,
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     receiptDate: {
@@ -259,22 +245,6 @@ export default {
       name: 'Receipt Message',
       fieldType: 'text',
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true,
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true,
-    },
   },
 };
 

packages/server/src/models/SaleReceipt.ts

@@ -109,7 +109,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
     const Document = require('models/Document');
-    const Warehouse = require('models/Warehouse');
 
     return {
       customer: {
@@ -170,18 +169,6 @@ export default class SaleReceipt extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Sale receipt may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'sales_receipts.warehouseId',
-          to: 'warehouses.id',
-        },
-      },
-
       /**
        * Sale receipt transaction may has many attached attachments.
        */

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -1,8 +1,9 @@
 /* eslint-disable global-require */
-import moment from 'moment';
-import { Model, mixin } from 'objection';
+import * as R from 'ramda';
+import { Model, ModelOptions, QueryContext, mixin } from 'objection';
 import TenantModel from 'models/TenantModel';
 import ModelSettings from './ModelSetting';
+import Account from './Account';
 import UncategorizedCashflowTransactionMeta from './UncategorizedCashflowTransaction.meta';
 
 export default class UncategorizedCashflowTransaction extends mixin(
@@ -166,28 +167,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
       pending(query) {
         query.where('pending', true);
       },
-
-      minAmount(query, minAmount) {
-        query.where('amount', '>=', minAmount);
-      },
-
-      maxAmount(query, maxAmount) {
-        query.where('amount', '<=', maxAmount);
-      },
-
-      toDate(query, toDate) {
-        const dateFormat = 'YYYY-MM-DD';
-        const _toDate = moment(toDate).endOf('day').format(dateFormat);
-
-        query.where('date', '<=', _toDate);
-      },
-
-      fromDate(query, fromDate) {
-        const dateFormat = 'YYYY-MM-DD';
-        const _fromDate = moment(fromDate).startOf('day').format(dateFormat);
-
-        query.where('date', '>=', _fromDate);
-      },
     };
   }
 

packages/server/src/models/VendorCredit.Meta.ts

@@ -1,5 +1,3 @@
-import { Features } from '@/interfaces';
-
 function StatusFieldFilterQuery(query, role) {
   query.modify('filterByStatus', role.value);
 }
@@ -162,18 +160,6 @@ export default {
         },
       },
     },
-    branch: {
-      name: 'Branch',
-      type: 'text',
-      accessor: 'branch.name',
-      features: [Features.BRANCHES],
-    },
-    warehouse: {
-      name: 'Warehouse',
-      type: 'text',
-      accessor: 'warehouse.name',
-      features: [Features.BRANCHES],
-    },
   },
   fields2: {
     vendorId: {
@@ -239,21 +225,5 @@ export default {
         },
       },
     },
-    branchId: {
-      name: 'Branch',
-      fieldType: 'relation',
-      relationModel: 'Branch',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.BRANCHES],
-      required: true
-    },
-    warehouseId: {
-      name: 'Warehouse',
-      fieldType: 'relation',
-      relationModel: 'Warehouse',
-      relationImportMatch: ['name', 'code'],
-      features: [Features.WAREHOUSES],
-      required: true
-    },
   },
 };

packages/server/src/models/VendorCredit.ts

@@ -178,7 +178,6 @@ export default class VendorCredit extends mixin(TenantModel, [
     const ItemEntry = require('models/ItemEntry');
     const Branch = require('models/Branch');
     const Document = require('models/Document');
-    const Warehouse = require('models/Warehouse');
 
     return {
       vendor: {
@@ -218,18 +217,6 @@ export default class VendorCredit extends mixin(TenantModel, [
         },
       },
 
-      /**
-       * Vendor credit may has associated warehouse.
-       */
-      warehouse: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Warehouse.default,
-        join: {
-          from: 'vendor_credits.warehouseId',
-          to: 'warehouses.id',
-        },
-      },
-
       /**
        * Vendor credit may has many attached attachments.
        */

packages/server/src/models/Warehouse.settings.ts

@@ -1,11 +0,0 @@
-export default {
-  fields2: {
-    name: {
-      name: 'Name',
-      fieldType: 'text',
-      required: true,
-    },
-  },
-  columns: {},
-  fields: {}
-};

packages/server/src/services/Accounts/AccountsApplication.ts

@@ -43,8 +43,8 @@ export class AccountsApplication {
 
   /**
    * Creates a new account.
-   * @param {number} tenantId
-   * @param {IAccountCreateDTO} accountDTO
+   * @param   {number} tenantId
+   * @param   {IAccountCreateDTO} accountDTO
    * @returns {Promise<IAccount>}
    */
   public createAccount = (
@@ -108,8 +108,8 @@ export class AccountsApplication {
 
   /**
    * Retrieves the account details.
-   * @param {number} tenantId
-   * @param {number} accountId
+   * @param   {number} tenantId
+   * @param   {number} accountId
    * @returns {Promise<IAccount>}
    */
   public getAccount = (tenantId: number, accountId: number) => {

packages/server/src/services/Accounts/AccountsExportable.ts

@@ -2,7 +2,6 @@ import { Inject, Service } from 'typedi';
 import { AccountsApplication } from './AccountsApplication';
 import { Exportable } from '../Export/Exportable';
 import { IAccountsFilter, IAccountsStructureType } from '@/interfaces';
-import { EXPORT_SIZE_LIMIT } from '../Export/constants';
 
 @Service()
 export class AccountsExportable extends Exportable {
@@ -21,7 +20,7 @@ export class AccountsExportable extends Exportable {
       inactiveMode: false,
       ...query,
       structure: IAccountsStructureType.Flat,
-      pageSize: EXPORT_SIZE_LIMIT,
+      pageSize: 12000,
       page: 1,
     } as IAccountsFilter;
 

packages/server/src/services/Accounts/DeleteAccount.ts

@@ -73,7 +73,6 @@ export class DeleteAccount {
       .throwIfNotFound()
       .queryAndThrowIfHasRelations({
         type: ERRORS.ACCOUNT_HAS_ASSOCIATED_TRANSACTIONS,
-        excludeRelations: ['uncategorizedTransactions', 'plaidItem']
       });
     // Authorize before delete account.
     await this.authorize(tenantId, accountId, oldAccount);

packages/server/src/services/Authentication/GetAuthMeta.ts

@@ -11,10 +11,6 @@ export class GetAuthMeta {
   public async getAuthMeta(): Promise<IAuthGetMetaPOJO> {
     return {
       signupDisabled: config.signupRestrictions.disabled,
-      oneClickDemo: {
-        enable: config.oneClickDemoAccounts.enable,
-        demoUrl: config.oneClickDemoAccounts.demoUrl,
-      },
     };
   }
 }

packages/server/src/services/Banking/BankAccounts/events/DeleteUncategorizedTransactionsOnAccountDeleting.ts

@@ -1,78 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { initialize } from 'objection';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-import events from '@/subscribers/events';
-import { IAccountEventDeletePayload } from '@/interfaces';
-import { DeleteBankRulesService } from '../../Rules/DeleteBankRules';
-import { RevertRecognizedTransactions } from '../../RegonizeTranasctions/RevertRecognizedTransactions';
-
-@Service()
-export class DeleteUncategorizedTransactionsOnAccountDeleting {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-  @Inject()
-  private deleteBankRules: DeleteBankRulesService;
-
-  @Inject()
-  private revertRecognizedTransactins: RevertRecognizedTransactions;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.accounts.onDelete,
-      this.handleDeleteBankRulesOnAccountDeleting.bind(this)
-    );
-  }
-
-  /**
-   * Handles revert the recognized transactions and delete all the bank rules
-   * associated to the deleted bank account.
-   * @param {IAccountEventDeletePayload}
-   */
-  private async handleDeleteBankRulesOnAccountDeleting({
-    tenantId,
-    oldAccount,
-    trx,
-  }: IAccountEventDeletePayload) {
-    const knex = this.tenancy.knex(tenantId);
-    const {
-      BankRule,
-      UncategorizedCashflowTransaction,
-      MatchedBankTransaction,
-      RecognizedBankTransaction,
-    } = this.tenancy.models(tenantId);
-
-    const foundAssociatedRules = await BankRule.query(trx).where(
-      'applyIfAccountId',
-      oldAccount.id
-    );
-    const foundAssociatedRulesIds = foundAssociatedRules.map((rule) => rule.id);
-
-    await initialize(knex, [
-      UncategorizedCashflowTransaction,
-      RecognizedBankTransaction,
-      MatchedBankTransaction,
-    ]);
-    // Revert the recognized transactions of the given bank rules.
-    await this.revertRecognizedTransactins.revertRecognizedTransactions(
-      tenantId,
-      foundAssociatedRulesIds,
-      null,
-      trx
-    );
-    // Delete the associated uncategorized transactions.
-    await UncategorizedCashflowTransaction.query(trx)
-      .where('accountId', oldAccount.id)
-      .delete();
-
-    // Delete the given bank rules.
-    await this.deleteBankRules.deleteBankRules(
-      tenantId,
-      foundAssociatedRulesIds,
-      trx
-    );
-  }
-}

packages/server/src/services/Banking/BankAccounts/events/DisconnectPlaidItemOnAccountDeleted.ts

@@ -51,7 +51,6 @@ export class DisconnectPlaidItemOnAccountDeleted {
       .findOne('plaidItemId', oldAccount.plaidItemId)
       .delete();
 
-    // Remove Plaid item once the transaction resolve.
     if (oldPlaidItem) {
       const plaidInstance = PlaidClientWrapper.getClient();
 

packages/server/src/services/Banking/Exclude/GetExcludedBankTransactions.ts

@@ -1,6 +1,5 @@
-import { Inject, Service } from 'typedi';
-import moment from 'moment';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { Inject, Service } from 'typedi';
 import { ExcludedBankTransactionsQuery } from './_types';
 import { UncategorizedTransactionTransformer } from '@/services/Cashflow/UncategorizedTransactionTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
@@ -40,18 +39,6 @@ export class GetExcludedBankTransactionsService {
           if (_query.accountId) {
             q.where('account_id', _query.accountId);
           }
-          if (_query.minDate) {
-            q.modify('fromDate', _query.minDate);
-          }
-          if (_query.maxDate) {
-            q.modify('toDate', _query.maxDate);
-          }
-          if (_query.minAmount) {
-            q.modify('minAmount', _query.minAmount);
-          }
-          if (_query.maxAmount) {
-            q.modify('maxAmount', _query.maxAmount);
-          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Banking/Exclude/_types.ts

@@ -4,10 +4,6 @@ export interface ExcludedBankTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
-  minDate?: Date;
-  maxDate?: Date;
-  minAmount?: number;
-  maxAmount?: number;
 }
 
 export interface IBankTransactionUnexcludingEventPayload {

packages/server/src/services/Banking/Matching/GetMatchedTransactionsByBills.ts

@@ -1,25 +1,18 @@
 import { Inject, Service } from 'typedi';
 import { initialize } from 'objection';
-import { Knex } from 'knex';
-import { first } from 'lodash';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 import { GetMatchedTransactionBillsTransformer } from './GetMatchedTransactionBillsTransformer';
-import {
-  GetMatchedTransactionsFilter,
-  IMatchTransactionDTO,
-  MatchedTransactionPOJO,
-} from './types';
+import { GetMatchedTransactionsFilter, MatchedTransactionPOJO } from './types';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-import { CreateBillPayment } from '@/services/Purchases/BillPayments/CreateBillPayment';
-import { IBillPaymentDTO } from '@/interfaces';
 
 @Service()
 export class GetMatchedTransactionsByBills extends GetMatchedTransactionsByType {
   @Inject()
-  private transformer: TransformerInjectable;
+  private tenancy: HasTenancyService;
 
   @Inject()
-  private createPaymentMadeService: CreateBillPayment;
+  private transformer: TransformerInjectable;
 
   /**
    * Retrieves the matched transactions.
@@ -78,62 +71,4 @@ export class GetMatchedTransactionsByBills extends GetMatchedTransactionsByType
       new GetMatchedTransactionBillsTransformer()
     );
   }
-
-  /**
-   * Creates the common matched transaction.
-   * @param {number} tenantId
-   * @param {Array<number>} uncategorizedTransactionIds
-   * @param {IMatchTransactionDTO} matchTransactionDTO
-   * @param {Knex.Transaction} trx
-   */
-  public async createMatchedTransaction(
-    tenantId: number,
-    uncategorizedTransactionIds: Array<number>,
-    matchTransactionDTO: IMatchTransactionDTO,
-    trx?: Knex.Transaction
-  ): Promise<void> {
-    await super.createMatchedTransaction(
-      tenantId,
-      uncategorizedTransactionIds,
-      matchTransactionDTO,
-      trx
-    );
-    const { Bill, UncategorizedCashflowTransaction, MatchedBankTransaction } =
-      this.tenancy.models(tenantId);
-
-    const uncategorizedTransactionId = first(uncategorizedTransactionIds);
-    const uncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query(trx)
-        .findById(uncategorizedTransactionId)
-        .throwIfNotFound();
-
-    const bill = await Bill.query(trx)
-      .findById(matchTransactionDTO.referenceId)
-      .throwIfNotFound();
-
-    const createPaymentMadeDTO: IBillPaymentDTO = {
-      vendorId: bill.vendorId,
-      paymentAccountId: uncategorizedTransaction.accountId,
-      paymentDate: uncategorizedTransaction.date,
-      exchangeRate: 1,
-      entries: [
-        {
-          paymentAmount: bill.dueAmount,
-          billId: bill.id,
-        },
-      ],
-      branchId: bill.branchId,
-    };
-    // Create a new bill payment associated to the matched bill.
-    const billPayment = await this.createPaymentMadeService.createBillPayment(
-      tenantId,
-      createPaymentMadeDTO,
-      trx
-    );
-    // Link the create bill payment with matched transaction.
-    await super.createMatchedTransaction(tenantId, uncategorizedTransactionIds, {
-      referenceType: 'BillPayment',
-      referenceId: billPayment.id,
-    }, trx);
-  }
 }

packages/server/src/services/Banking/Matching/GetMatchedTransactionsByInvoices.ts

@@ -1,26 +1,22 @@
 import { Inject, Service } from 'typedi';
 import { initialize } from 'objection';
-import { Knex } from 'knex';
-import { first } from 'lodash';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 import { GetMatchedTransactionInvoicesTransformer } from './GetMatchedTransactionInvoicesTransformer';
 import {
   GetMatchedTransactionsFilter,
-  IMatchTransactionDTO,
   MatchedTransactionPOJO,
   MatchedTransactionsPOJO,
 } from './types';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { GetMatchedTransactionsByType } from './GetMatchedTransactionsByType';
-import { CreatePaymentReceived } from '@/services/Sales/PaymentReceived/CreatePaymentReceived';
-import { IPaymentReceivedCreateDTO } from '@/interfaces';
 
 @Service()
 export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByType {
   @Inject()
-  protected transformer: TransformerInjectable;
+  protected tenancy: HasTenancyService;
 
   @Inject()
-  protected createPaymentReceivedService: CreatePaymentReceived;
+  protected transformer: TransformerInjectable;
 
   /**
    * Retrieves the matched transactions.
@@ -82,64 +78,4 @@ export class GetMatchedTransactionsByInvoices extends GetMatchedTransactionsByTy
       new GetMatchedTransactionInvoicesTransformer()
     );
   }
-
-  /**
-   * Creates the common matched transaction.
-   * @param {number} tenantId
-   * @param {Array<number>} uncategorizedTransactionIds
-   * @param {IMatchTransactionDTO} matchTransactionDTO
-   * @param {Knex.Transaction} trx
-   */
-  public async createMatchedTransaction(
-    tenantId: number,
-    uncategorizedTransactionIds: Array<number>,
-    matchTransactionDTO: IMatchTransactionDTO,
-    trx?: Knex.Transaction
-  ) {
-    await super.createMatchedTransaction(
-      tenantId,
-      uncategorizedTransactionIds,
-      matchTransactionDTO,
-      trx
-    );
-    const { SaleInvoice, UncategorizedCashflowTransaction, MatchedBankTransaction } =
-      this.tenancy.models(tenantId);
-
-    const uncategorizedTransactionId = first(uncategorizedTransactionIds);
-    const uncategorizedTransaction =
-      await UncategorizedCashflowTransaction.query(trx)
-        .findById(uncategorizedTransactionId)
-        .throwIfNotFound();
-
-    const invoice = await SaleInvoice.query(trx)
-      .findById(matchTransactionDTO.referenceId)
-      .throwIfNotFound();
-
-    const createPaymentReceivedDTO: IPaymentReceivedCreateDTO = {
-      customerId: invoice.customerId,
-      paymentDate: uncategorizedTransaction.date,
-      amount: invoice.dueAmount,
-      depositAccountId: uncategorizedTransaction.accountId,
-      entries: [
-        {
-          index: 1,
-          invoiceId: invoice.id,
-          paymentAmount: invoice.dueAmount,
-        },
-      ],
-      branchId: invoice.branchId,
-    };
-    // Create a payment received associated to the matched invoice.
-    const paymentReceived = await this.createPaymentReceivedService.createPaymentReceived(
-      tenantId,
-      createPaymentReceivedDTO,
-      {},
-      trx
-    );
-    // Link the create payment received with matched invoice transaction.
-    await super.createMatchedTransaction(tenantId, uncategorizedTransactionIds, {
-      referenceType: 'PaymentReceive',
-      referenceId: paymentReceived.id,
-    }, trx)
-  }
 }

packages/server/src/services/Banking/Plaid/PlaidUpdateTransactions.ts

@@ -1,10 +1,10 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
+import { Inject, Service } from 'typedi';
 import { PlaidClientWrapper } from '@/lib/Plaid/Plaid';
 import { PlaidSyncDb } from './PlaidSyncDB';
 import { PlaidFetchedTransactionsUpdates } from '@/interfaces';
 import UnitOfWork from '@/services/UnitOfWork';
+import { Knex } from 'knex';
 
 @Service()
 export class PlaidUpdateTransactions {
@@ -19,9 +19,9 @@ export class PlaidUpdateTransactions {
 
   /**
    * Handles sync the Plaid item to Bigcaptial under UOW.
-   * @param {number} tenantId - Tenant id.
-   * @param {number} plaidItemId - Plaid item id.
-   * @returns {Promise<{ addedCount: number; modifiedCount: number; removedCount: number; }>}
+   * @param {number} tenantId
+   * @param {number} plaidItemId
+   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
    */
   public async updateTransactions(tenantId: number, plaidItemId: string) {
     return this.uow.withTransaction(tenantId, (trx: Knex.Transaction) => {

packages/server/src/services/Banking/RegonizeTranasctions/RecognizeTranasctionsService.ts

@@ -78,9 +78,9 @@ export class RecognizeTranasctionsService {
       });
 
     const bankRules = await BankRule.query(trx).onBuild((q) => {
-      const rulesIds = !isEmpty(ruleId) ? castArray(ruleId) : [];
+      const rulesIds = castArray(ruleId);
 
-      if (rulesIds?.length > 0) {
+      if (!isEmpty(rulesIds)) {
         q.whereIn('id', rulesIds);
       }
       q.withGraphFetched('conditions');

packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts

@@ -100,14 +100,12 @@ export class TriggerRecognizedTransactions {
   private async triggerRecognizeTransactionsOnImportCommitted({
     tenantId,
     importId,
+    meta,
   }: IImportFileCommitedEventPayload) {
     const importFile = await Import.query().findOne({ importId });
     const batch = importFile.paramsParsed.batch;
     const payload = { tenantId, transactionsCriteria: { batch } };
 
-    // Cannot continue if the imported resource is not bank account transactions.
-    if (importFile.resource !== 'UncategorizedCashflowTransaction') return;
-
     await this.agenda.now('recognize-uncategorized-transactions-job', payload);
   }
 }

packages/server/src/services/Banking/Rules/DeleteBankRule.ts

@@ -26,39 +26,31 @@ export class DeleteBankRuleSerivce {
    * @param {number} ruleId
    * @returns {Promise<void>}
    */
-  public async deleteBankRule(
-    tenantId: number,
-    ruleId: number,
-    trx?: Knex.Transaction
-  ): Promise<void> {
+  public async deleteBankRule(tenantId: number, ruleId: number): Promise<void> {
     const { BankRule, BankRuleCondition } = this.tenancy.models(tenantId);
 
     const oldBankRule = await BankRule.query()
       .findById(ruleId)
       .throwIfNotFound();
 
-    return this.uow.withTransaction(
-      tenantId,
-      async (trx: Knex.Transaction) => {
-        // Triggers `onBankRuleDeleting` event.
-        await this.eventPublisher.emitAsync(events.bankRules.onDeleting, {
-          tenantId,
-          oldBankRule,
-          ruleId,
-          trx,
-        } as IBankRuleEventDeletingPayload);
+    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+      // Triggers `onBankRuleDeleting` event.
+      await this.eventPublisher.emitAsync(events.bankRules.onDeleting, {
+        tenantId,
+        oldBankRule,
+        ruleId,
+        trx,
+      } as IBankRuleEventDeletingPayload);
 
-        await BankRuleCondition.query(trx).where('ruleId', ruleId).delete()
-        await BankRule.query(trx).findById(ruleId).delete();
+      await BankRuleCondition.query(trx).where('ruleId', ruleId).delete();
+      await BankRule.query(trx).findById(ruleId).delete();
 
-        // Triggers `onBankRuleDeleted` event.
-        await await this.eventPublisher.emitAsync(events.bankRules.onDeleted, {
-          tenantId,
-          ruleId,
-          trx,
-        } as IBankRuleEventDeletedPayload);
-      },
-      trx
-    );
+      // Triggers `onBankRuleDeleted` event.
+      await await this.eventPublisher.emitAsync(events.bankRules.onDeleted, {
+        tenantId,
+        ruleId,
+        trx,
+      } as IBankRuleEventDeletedPayload);
+    });
   }
 }

packages/server/src/services/Banking/Rules/DeleteBankRules.ts

@@ -1,34 +0,0 @@
-import { Knex } from 'knex';
-import { Inject, Service } from 'typedi';
-import PromisePool from '@supercharge/promise-pool';
-import { castArray, uniq } from 'lodash';
-import { DeleteBankRuleSerivce } from './DeleteBankRule';
-
-@Service()
-export class DeleteBankRulesService {
-  @Inject()
-  private deleteBankRuleService: DeleteBankRuleSerivce;
-
-  /**
-   * Delete bank rules.
-   * @param {number} tenantId
-   * @param {number | Array<number>} bankRuleId
-   */
-  async deleteBankRules(
-    tenantId: number,
-    bankRuleId: number | Array<number>,
-    trx?: Knex.Transaction
-  ) {
-    const bankRulesIds = uniq(castArray(bankRuleId));
-
-    const results = await PromisePool.withConcurrency(1)
-      .for(bankRulesIds)
-      .process(async (bankRuleId: number) => {
-        await this.deleteBankRuleService.deleteBankRule(
-          tenantId,
-          bankRuleId,
-          trx
-        );
-      });
-  }
-}

packages/server/src/services/Cashflow/CashflowAccountTransformer.ts

@@ -8,12 +8,7 @@ export class CashflowAccountTransformer extends Transformer {
    * @returns {string[]}
    */
   public includeAttributes = (): string[] => {
-    return [
-      'formattedAmount',
-      'lastFeedsUpdatedAt',
-      'lastFeedsUpdatedAtFormatted',
-      'lastFeedsUpdatedFromNow',
-    ];
+    return ['formattedAmount'];
   };
 
   /**
@@ -34,7 +29,7 @@ export class CashflowAccountTransformer extends Transformer {
 
   /**
    * Retrieve formatted account amount.
-   * @param {IAccount} invoice
+   * @param   {IAccount} invoice
    * @returns {string}
    */
   protected formattedAmount = (account: IAccount): string => {
@@ -42,22 +37,4 @@ export class CashflowAccountTransformer extends Transformer {
       currencyCode: account.currencyCode,
     });
   };
-
-  /**
-   * Retrieves the last feeds update at formatted date.
-   * @param {IAccount} account
-   * @returns {string}
-   */
-  protected lastFeedsUpdatedAtFormatted(account: IAccount): string {
-    return this.formatDate(account.lastFeedsUpdatedAt);
-  }
-
-  /**
-   * Retrieves the last feeds updated from now.
-   * @param {IAccount} account
-   * @returns {string}
-   */
-  protected lastFeedsUpdatedFromNow(account: IAccount): string {
-    return this.formatDateFromNow(account.lastFeedsUpdatedAt);
-  }
 }

packages/server/src/services/Cashflow/GetRecongizedTransactions.ts

@@ -23,7 +23,7 @@ export class GetRecognizedTransactionsService {
   ) {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const _query = {
+    const _filter = {
       page: 1,
       pageSize: 20,
       ...filter,
@@ -41,26 +41,11 @@ export class GetRecognizedTransactionsService {
           // Exclude the pending transactions.
           q.modify('notPending');
 
-          if (_query.accountId) {
-            q.where('accountId', _query.accountId);
-          }
-          if (_query.minDate) {
-            q.modify('fromDate', _query.minDate);
-          }
-          if (_query.maxDate) {
-            q.modify('toDate', _query.maxDate);
-          }
-          if (_query.minAmount) {
-            q.modify('minAmount', _query.minAmount);
-          }
-          if (_query.maxAmount) {
-            q.modify('maxAmount', _query.maxAmount);
-          }
-          if (_query.accountId) {
-            q.where('accountId', _query.accountId);
+          if (_filter.accountId) {
+            q.where('accountId', _filter.accountId);
           }
         })
-        .pagination(_query.page - 1, _query.pageSize);
+        .pagination(_filter.page - 1, _filter.pageSize);
 
     const data = await this.transformer.transform(
       tenantId,

packages/server/src/services/Cashflow/GetUncategorizedTransactions.ts

@@ -62,19 +62,6 @@ export class GetUncategorizedTransactions {
 
           q.whereNull('matchedBankTransactions.id');
           q.orderBy('date', 'DESC');
-
-          if (_query.minDate) {
-            q.modify('fromDate', _query.minDate);
-          }
-          if (_query.maxDate) {
-            q.modify('toDate', _query.maxDate);
-          }
-          if (_query.minAmount) {
-            q.modify('minAmount', _query.minAmount);
-          }
-          if (_query.maxAmount) {
-            q.modify('maxAmount', _query.maxAmount);
-          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Cashflow/UncategorizedTransactionsImportable.ts

@@ -87,7 +87,7 @@ export class UncategorizedTransactionsImportable extends Importable {
   }
 
   /**
-   * Transforms the import params before storing them.
+   * Transformes the import params before storing them.
    * @param {Record<string, any>} parmas
    */
   public transformParams(parmas: Record<string, any>) {

packages/server/src/services/Contacts/Customers/CRUD/EditCustomer.ts

@@ -65,7 +65,6 @@ export class EditCustomer {
       });
       // Triggers `onCustomerEdited` event.
       await this.eventPublisher.emitAsync(events.customers.onEdited, {
-        tenantId,
         customerId,
         customer,
         trx,

packages/server/src/services/Contacts/Customers/CustomersExportable.ts

@@ -2,7 +2,6 @@ import { Inject, Service } from 'typedi';
 import { IItemsFilter } from '@/interfaces';
 import { CustomersApplication } from './CustomersApplication';
 import { Exportable } from '@/services/Export/Exportable';
-import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class CustomersExportable extends Exportable {
@@ -18,9 +17,9 @@ export class CustomersExportable extends Exportable {
     const parsedQuery = {
       sortOrder: 'DESC',
       columnSortBy: 'created_at',
-      ...query,
       page: 1,
-      pageSize: EXPORT_SIZE_LIMIT,
+      ...query,
+      pageSize: 12,
     } as IItemsFilter;
 
     return this.customersApplication

packages/server/src/services/Contacts/Vendors/VendorsExportable.ts

@@ -2,7 +2,6 @@ import { Inject, Service } from 'typedi';
 import { IItemsFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { VendorsApplication } from './VendorsApplication';
-import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class VendorsExportable extends Exportable {
@@ -18,9 +17,9 @@ export class VendorsExportable extends Exportable {
     const parsedQuery = {
       sortOrder: 'DESC',
       columnSortBy: 'created_at',
-      ...query,
       page: 1,
-      pageSize: EXPORT_SIZE_LIMIT,
+      ...query,
+      pageSize: 12,
     } as IItemsFilter;
 
     return this.vendorsApplication

packages/server/src/services/CreditNotes/CreditNotes.ts

@@ -5,17 +5,11 @@ import * as R from 'ramda';
 import { ServiceError } from '@/exceptions';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { ERRORS } from './constants';
-import {
-  ICreditNote,
-  ICreditNoteEditDTO,
-  ICreditNoteEntryNewDTO,
-  ICreditNoteNewDTO,
-} from '@/interfaces';
+import { ICreditNote, ICreditNoteEditDTO, ICreditNoteNewDTO } from '@/interfaces';
 import ItemsEntriesService from '@/services/Items/ItemsEntriesService';
 import AutoIncrementOrdersService from '@/services/Sales/AutoIncrementOrdersService';
 import { WarehouseTransactionDTOTransform } from '@/services/Warehouses/Integrations/WarehouseTransactionDTOTransform';
 import { BranchTransactionDTOTransform } from '@/services/Branches/Integrations/BranchTransactionDTOTransform';
-import { assocItemEntriesDefaultIndex } from '../Items/utils';
 
 @Service()
 export default class BaseCreditNotes {
@@ -49,17 +43,10 @@ export default class BaseCreditNotes {
     const amount = this.itemsEntriesService.getTotalItemsEntries(
       creditNoteDTO.entries
     );
-    const entries = R.compose(
-      // Associate the default index to each item entry.
-      assocItemEntriesDefaultIndex,
-
-      // Associate the reference type to credit note entries.
-      R.map((entry: ICreditNoteEntryNewDTO) => ({
-        ...entry,
-        referenceType: 'CreditNote',
-      }))
-    )(creditNoteDTO.entries);
-
+    const entries = creditNoteDTO.entries.map((entry) => ({
+      ...entry,
+      referenceType: 'CreditNote',
+    }));
     // Retreive the next credit note number.
     const autoNextNumber = this.getNextCreditNumber(tenantId);
 

packages/server/src/services/CreditNotes/CreditNotesExportable.ts

@@ -15,17 +15,12 @@ export class CreditNotesExportable extends Exportable {
    * @returns {}
    */
   public exportable(tenantId: number, query: ICreditNotesQueryDTO) {
-    const filterQuery = (query) => {
-      query.withGraphFetched('branch');
-      query.withGraphFetched('warehouse');
-    };
     const parsedQuery = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
       ...query,
       page: 1,
       pageSize: 12000,
-      filterQuery,
     } as ICreditNotesQueryDTO;
 
     return this.getCreditNotes

packages/server/src/services/CreditNotes/ListCreditNotes.ts

@@ -48,7 +48,6 @@ export default class ListCreditNotes extends BaseCreditNotes {
         builder.withGraphFetched('entries.item');
         builder.withGraphFetched('customer');
         dynamicFilter.buildQuery()(builder);
-        creditNotesQuery?.filterQuery && creditNotesQuery?.filterQuery(builder);
       })
       .pagination(filter.page - 1, filter.pageSize);
 

packages/server/src/services/EventsTracker/PostHog.ts

@@ -1,24 +0,0 @@
-import { PostHog } from 'posthog-node';
-import { Service } from 'typedi';
-import { EventMessage } from 'posthog-node/src/types';
-import config from '@/config';
-
-@Service()
-export class PosthogService {
-  public posthog: PostHog;
-
-  constructor() {
-    if (config.posthog.apiKey && config.posthog.host) {
-      this.posthog = new PostHog(config.posthog.apiKey, {
-        host: config.posthog.host,
-      });
-    }
-  }
-
-  public trackEvent(event: EventMessage) {
-    // Cannot continue if the Posthog not configured.
-    if (!this.posthog) return;
-
-    this.posthog.capture(event);
-  }
-}

packages/server/src/services/EventsTracker/events/AccountEventsTracker.ts

@@ -1,65 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import {
-  IAccountEventCreatedPayload,
-  IAccountEventEditedPayload,
-  IAccountEventDeletedPayload,
-} from '@/interfaces';
-import { PosthogService } from '../PostHog';
-import events from '@/subscribers/events';
-import {
-  ACCOUNT_CREATED,
-  ACCOUNT_EDITED,
-  ACCOUNT_DELETED,
-} from '@/constants/event-tracker';
-
-@Service()
-export class AccountEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.accounts.onCreated,
-      this.handleTrackAccountCreatedEvent
-    );
-    bus.subscribe(events.accounts.onEdited, this.handleTrackEditedAccountEvent);
-    bus.subscribe(
-      events.accounts.onDeleted,
-      this.handleTrackDeletedAccountEvent
-    );
-  }
-
-  private handleTrackAccountCreatedEvent = ({
-    tenantId,
-  }: IAccountEventCreatedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: ACCOUNT_CREATED,
-      properties: {},
-    });
-  };
-
-  private handleTrackEditedAccountEvent = ({
-    tenantId,
-  }: IAccountEventEditedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: ACCOUNT_EDITED,
-      properties: {},
-    });
-  };
-
-  private handleTrackDeletedAccountEvent = ({
-    tenantId,
-  }: IAccountEventDeletedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: ACCOUNT_DELETED,
-      properties: {},
-    });
-  };
-}

packages/server/src/services/EventsTracker/events/AuthenticationEventsTracker.ts

@@ -1,35 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import { IAuthSignedUpEventPayload } from '@/interfaces';
-import { PosthogService } from '../PostHog';
-import { AUTH_SIGNED_UP } from '@/constants/event-tracker';
-import events from '@/subscribers/events';
-
-@Service()
-export class AuthenticationEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(events.auth.signUp, this.handleTrackSignUpEvent);
-  }
-
-  private handleTrackSignUpEvent = ({
-    signupDTO,
-    user,
-    tenant,
-  }: IAuthSignedUpEventPayload) => {
-    this.posthog.trackEvent({
-      distinctId: user.email,
-      event: AUTH_SIGNED_UP,
-      properties: {
-        firstName: user.firstName,
-        lastName: user.lastName,
-        email: user.email,
-      },
-    });
-  };
-}

packages/server/src/services/EventsTracker/events/BankRuleEventsTracker.ts

@@ -1,68 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import {
-  IBankRuleEventCreatedPayload,
-  IBankRuleEventEditedPayload,
-  IBankRuleEventDeletedPayload,
-} from '@/services/Banking/Rules/types'; // Updated import path for interfaces
-import { PosthogService } from '../PostHog';
-import events from '@/subscribers/events';
-import {
-  BANK_RULE_CREATED,
-  BANK_RULE_EDITED,
-  BANK_RULE_DELETED,
-} from '@/constants/event-tracker';
-
-@Service()
-export class BankRuleEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(
-      events.bankRules.onCreated,
-      this.handleTrackBankRuleCreatedEvent
-    );
-    bus.subscribe(
-      events.bankRules.onEdited,
-      this.handleTrackEditedBankRuleEvent
-    );
-    bus.subscribe(
-      events.bankRules.onDeleted,
-      this.handleTrackDeletedBankRuleEvent
-    );
-  }
-
-  private handleTrackBankRuleCreatedEvent = ({
-    tenantId,
-  }: IBankRuleEventCreatedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_RULE_CREATED,
-      properties: {},
-    });
-  };
-
-  private handleTrackEditedBankRuleEvent = ({
-    tenantId,
-  }: IBankRuleEventEditedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_RULE_EDITED,
-      properties: {},
-    });
-  };
-
-  private handleTrackDeletedBankRuleEvent = ({
-    tenantId,
-  }: IBankRuleEventDeletedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_RULE_DELETED,
-      properties: {},
-    });
-  };
-}

packages/server/src/services/EventsTracker/events/BankTransactionEventsTracker.ts

@@ -1,97 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import { PosthogService } from '../PostHog';
-import events from '@/subscribers/events';
-import {
-  BANK_TRANSACTION_MATCHED,
-  BANK_TRANSACTION_EXCLUDED,
-  BANK_TRANSACTION_CATEGORIZED,
-  BANK_TRANSACTION_UNCATEGORIZED,
-  BANK_ACCOUNT_DISCONNECTED,
-} from '@/constants/event-tracker';
-import { IBankTransactionMatchedEventPayload } from '@/services/Banking/Matching/types';
-import { IBankAccountDisconnectedEventPayload } from '@/services/Banking/BankAccounts/types';
-import {
-  ICashflowTransactionCategorizedPayload,
-  ICashflowTransactionUncategorizedPayload,
-} from '@/interfaces';
-import { IBankTransactionExcludedEventPayload } from '@/services/Banking/Exclude/_types';
-
-@Service()
-export class BankTransactionEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  public attach(bus) {
-    bus.subscribe(
-      events.bankMatch.onMatched,
-      this.handleTrackBankTransactionMatchedEvent
-    );
-    bus.subscribe(
-      events.bankTransactions.onExcluded,
-      this.handleTrackBankTransactionExcludedEvent
-    );
-    bus.subscribe(
-      events.cashflow.onTransactionCategorized,
-      this.handleTrackBankTransactionCategorizedEvent
-    );
-    bus.subscribe(
-      events.cashflow.onTransactionUncategorized,
-      this.handleTrackBankTransactionUncategorizedEvent
-    );
-    bus.subscribe(
-      events.bankAccount.onDisconnected,
-      this.handleTrackBankAccountDisconnectedEvent
-    );
-  }
-
-  private handleTrackBankTransactionMatchedEvent = ({
-    tenantId,
-  }: IBankTransactionMatchedEventPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_TRANSACTION_MATCHED,
-      properties: {},
-    });
-  };
-
-  private handleTrackBankTransactionExcludedEvent = ({
-    tenantId,
-  }: IBankTransactionExcludedEventPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_TRANSACTION_EXCLUDED,
-      properties: {},
-    });
-  };
-
-  private handleTrackBankTransactionCategorizedEvent = ({
-    tenantId,
-  }: ICashflowTransactionCategorizedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_TRANSACTION_CATEGORIZED,
-      properties: {},
-    });
-  };
-
-  private handleTrackBankTransactionUncategorizedEvent = ({
-    tenantId,
-  }: ICashflowTransactionUncategorizedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_TRANSACTION_UNCATEGORIZED,
-      properties: {},
-    });
-  };
-
-  private handleTrackBankAccountDisconnectedEvent = ({
-    tenantId,
-  }: IBankAccountDisconnectedEventPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BANK_ACCOUNT_DISCONNECTED,
-      properties: {},
-    });
-  };
-}

packages/server/src/services/EventsTracker/events/BillEventsTracker.ts

@@ -1,59 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import {
-  IBillPaymentEventCreatedPayload,
-  IBillPaymentEventEditedPayload,
-  IBillPaymentEventDeletedPayload,
-} from '@/interfaces';
-import { PosthogService } from '../PostHog';
-import events from '@/subscribers/events';
-import {
-  BILL_CREATED,
-  BILL_EDITED,
-  BILL_DELETED,
-} from '@/constants/event-tracker';
-
-@Service()
-export class BillEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  /**
-   * Constructor method.
-   */
-  public attach(bus) {
-    bus.subscribe(events.bill.onCreated, this.handleTrackBillCreatedEvent);
-    bus.subscribe(events.bill.onEdited, this.handleTrackEditedBillEvent);
-    bus.subscribe(events.bill.onDeleted, this.handleTrackDeletedBillEvent);
-  }
-
-  private handleTrackBillCreatedEvent = ({
-    tenantId,
-  }: IBillPaymentEventCreatedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BILL_CREATED,
-      properties: {},
-    });
-  };
-
-  private handleTrackEditedBillEvent = ({
-    tenantId,
-  }: IBillPaymentEventEditedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BILL_EDITED,
-      properties: {},
-    });
-  };
-
-  private handleTrackDeletedBillEvent = ({
-    tenantId,
-  }: IBillPaymentEventDeletedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: BILL_DELETED,
-      properties: {},
-    });
-  };
-}

packages/server/src/services/EventsTracker/events/CustomerEventsTracker.ts

@@ -1,65 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import {
-  ICustomerEventCreatedPayload,
-  ICustomerEventEditedPayload,
-  ICustomerEventDeletedPayload,
-} from '@/interfaces';
-import { PosthogService } from '../PostHog';
-import events from '@/subscribers/events';
-import {
-  CUSTOMER_CREATED,
-  CUSTOMER_EDITED,
-  CUSTOMER_DELETED,
-} from '@/constants/event-tracker';
-
-@Service()
-export class CustomerEventsTracker extends EventSubscriber {
-  @Inject()
-  private posthog: PosthogService;
-
-  public attach(bus) {
-    bus.subscribe(
-      events.customers.onCreated,
-      this.handleTrackCustomerCreatedEvent
-    );
-    bus.subscribe(
-      events.customers.onEdited,
-      this.handleTrackEditedCustomerEvent
-    );
-    bus.subscribe(
-      events.customers.onDeleted,
-      this.handleTrackDeletedCustomerEvent
-    );
-  }
-
-  private handleTrackCustomerCreatedEvent = ({
-    tenantId,
-  }: ICustomerEventCreatedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: CUSTOMER_CREATED,
-      properties: {},
-    });
-  };
-
-  private handleTrackEditedCustomerEvent = ({
-    tenantId,
-  }: ICustomerEventEditedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: CUSTOMER_EDITED,
-      properties: {},
-    });
-  };
-
-  private handleTrackDeletedCustomerEvent = ({
-    tenantId,
-  }: ICustomerEventDeletedPayload) => {
-    this.posthog.trackEvent({
-      distinctId: `tenant-${tenantId}`,
-      event: CUSTOMER_DELETED,
-      properties: {},
-    });
-  };
-}