chore(deps): bump pug from 3.0.2 to 3.0.3

Bumps [pug](https://github.com/pugjs/pug) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/pugjs/pug/releases)
- [Commits](https://github.com/pugjs/pug/compare/pug@3.0.2...pug@3.0.3)

---
updated-dependencies:
- dependency-name: pug
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

.env.example

@@ -75,17 +75,31 @@ PLAID_ENV=sandbox
 # Your Plaid keys, which can be found in the Plaid Dashboard.
 # https://dashboard.plaid.com/account/keys
 PLAID_CLIENT_ID=
-PLAID_SECRET=
+PLAID_SECRET_DEVELOPMENT=
+PLAID_SECRET_SANDBOX=
+
 PLAID_LINK_WEBHOOK=
 
+# (Optional) Redirect URI settings section
+# Only required for OAuth redirect URI testing (not common on desktop):
+# Sandbox Mode:
+# Set the PLAID_SANDBOX_REDIRECT_URI below to 'http://localhost:3001/oauth-link'.
+# The OAuth redirect flow requires an endpoint on the developer's website
+# that the bank website should redirect to. You will also need to configure
+# this redirect URI for your client ID through the Plaid developer dashboard
+# at https://dashboard.plaid.com/team/api.
+# Development mode:
+# When running in development mode, you must use an https:// url.
+# You will need to configure this https:// redirect URI in the Plaid developer dashboard.
+# Instructions to create a self-signed certificate for localhost can be found at
+# https://github.com/plaid/pattern/blob/master/README.md#testing-oauth.
+# If your system is not set up to run localhost with https://, you will be unable to test
+# the OAuth in development and should leave the PLAID_DEVELOPMENT_REDIRECT_URI blank.
+
+PLAID_SANDBOX_REDIRECT_URI=
+PLAID_DEVELOPMENT_REDIRECT_URI=
+
 # https://docs.lemonsqueezy.com/guides/developer-guide/getting-started#create-an-api-key
 LEMONSQUEEZY_API_KEY=
 LEMONSQUEEZY_STORE_ID=
 LEMONSQUEEZY_WEBHOOK_SECRET=
-
-# S3 documents and attachments 
-S3_REGION=US
-S3_ACCESS_KEY_ID=
-S3_SECRET_ACCESS_KEY=
-S3_ENDPOINT=
-S3_BUCKET=

.github/workflows/build-deploy-develop-container.yaml

@@ -1,127 +0,0 @@
-# This workflow will build a docker container, publish it to Github Registry.
-name: Build and Deploy Develop Docker Container
-on:
-  push:
-    branches:
-      - develop
-
-env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
-  SERVER_IMAGE_NAME: bigcapitalhq/server
-
-jobs:
-  build-publish-webapp:
-    strategy:
-      fail-fast: false
-    name: Build and deploy webapp container
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
-        with:
-          images: ${{ env.WEBAPP_IMAGE_NAME }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64
-          push: true
-          labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:develop
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-webapp
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published webapp container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
-
-  build-publish-server:
-    name: Build and deploy server container
-    runs-on: ubuntu-latest
-    steps:
-      - name: Prepare
-        run: |
-          platform=${{ matrix.platform }}
-          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      # Login to Container registry.
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      # Builds and push the Docker image.
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        id: build
-        with:
-          context: ./
-          file: ./packages/server/Dockerfile
-          platforms: linux/amd64
-          push: true
-          tags: bigcapitalhq/server:develop
-          labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Export digest
-        run: |
-          mkdir -p /tmp/digests
-          digest="${{ steps.build.outputs.digest }}"
-          touch "/tmp/digests/${digest#sha256:}"
-
-      - name: Upload digest
-        uses: actions/upload-artifact@v4
-        with:
-          name: digests-server
-          path: /tmp/digests/*
-          if-no-files-found: error
-          retention-days: 1
-
-      # Send notification to Slack channel.
-      - name: Slack Notification built and published server container successfully.
-        uses: rtCamp/action-slack-notify@v2
-        env:
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

CHANGELOG.md

@@ -2,57 +2,6 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [v0.18.0] - 10-08-2024
-
-* feat: Bank rules for automated categorization by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/511
-* feat: Categorize & match bank transaction by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/511
-* feat: Reconcile match transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/522
-* fix: Issues in matching transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/523
-* fix: Cashflow transactions types by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/524
-
-## [v0.17.5] - 17-06-2024
-
-* fix: Balance sheet and P/L nested accounts by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/501
-* fix: add space between buttons on floating actions bar by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/508
-* feat: Migrating to Envoy proxy instead of Nginx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/509
-* fix: Disable email confirmation does not work with invited users by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/497
-* feat: Setting up the date format in the whole system dates by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/506
-
-## [0.17.0] - 04-06-2024
-
-### New
-
-* feat: Upload and attach documents by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/461
-* feat: Export resource tables to pdf by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/460
-* feat: Build and deploy develop Docker container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/476
-* feat: Internal docker virtual network by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/478
-
-### Fixes
-
-* fix: Skip send confirmation email if disabled by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/459
-* fix: Lemon Squeezy redirect to base url by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/479
-* fix: Organize Plaid env variables for development and sandbox envs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/480
-* fix: Plaid syncs deposit imports as withdrawals by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/481
-* fix: Validate the s3 configures exist by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/482
-* fix: Run migrations only for initialized tenants by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/484
-
-## [0.16.16] - 
-
-* feat: handle http exceptions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/456
-* feat: add the missing Newrelic env vars to docker-compose.prod file by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/457
-* fix: add the signup email confirmation env var by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/458
-
-## [0.16.14] - 
-
-* fix: Typo in setup wizard by @ccantrell72 in https://github.com/bigcapitalhq/bigcapital/pull/440
-* fix: Showing the real mail address on email confirmation view by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/445
-* fix: Auto-increment setting parsing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/453
-
-## [0.16.12] - 
-
-* feat: Create a manifest list for `webapp` Docker image and push it to DockerHub. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/436
-* feat: Combine arm64 and amd64 in one Github action runner by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/437
-
 ## [0.16.11] - 06-05-2024
 
 ### improvements

docker-compose.prod.yml

@@ -3,27 +3,30 @@
 version: '3.3'
 
 services:
-  proxy:
+  nginx:
-    image: envoyproxy/envoy:v1.30-latest
+    container_name: bigcapital-nginx-gateway
-    depends_on:
+    build:
-      - server
+      context: ./docker/nginx
-      - webapp
+      args:
+        - SERVER_PROXY_PORT=3000
+        - WEB_SSL=false
+        - SELF_SIGNED=false
+    volumes:
+      - ./data/logs/nginx/:/var/log/nginx
+      - ./docker/certbot/certs/:/var/certs
     ports:
       - '${PUBLIC_PROXY_PORT:-80}:80'
       - '${PUBLIC_PROXY_SSL_PORT:-443}:443'
     tty: true
-    volumes:
+    depends_on:
-      - ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
+      - server
+      - webapp
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   webapp:
     container_name: bigcapital-webapp
     image: bigcapitalhq/webapp:latest
     restart: on-failure
-    networks:
-      - bigcapital_network
 
   server:
     container_name: bigcapital-server
@@ -39,8 +42,6 @@ services:
       - mongo
       - redis
     restart: on-failure
-    networks:
-      - bigcapital_network
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -88,17 +89,14 @@ services:
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
-      # Exchange Rate
-      - EXCHANGE_RATE_SERVICE=${EXCHANGE_RATE_SERVICE}
-      - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
-
       # Bank Sync
       - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
       - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET=${PLAID_SECRET}
+      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
+      - PLAID_SECRET_SANDBOX=${b8cf42b441e110451e2f69ad7e1e9f}
       - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
 
       # Lemon Squeez
@@ -116,13 +114,6 @@ services:
       - NEW_RELIC_LICENSE_KEY=${NEW_RELIC_LICENSE_KEY}
       - NEW_RELIC_APP_NAME=${NEW_RELIC_APP_NAME}
 
-      # S3
-      - S3_REGION=${S3_REGION}
-      - S3_ACCESS_KEY_ID=${S3_ACCESS_KEY_ID}
-      - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
-      - S3_ENDPOINT=${S3_ENDPOINT}
-      - S3_BUCKET=${S3_BUCKET}
-
   database_migration:
     container_name: bigcapital-database-migration
     build:
@@ -139,8 +130,6 @@ services:
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
-    networks:
-      - bigcapital_network
 
   mysql:
     container_name: bigcapital-mysql
@@ -156,8 +145,6 @@ services:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
-    networks:
-      - bigcapital_network
 
   mongo:
     container_name: bigcapital-mongo
@@ -167,8 +154,6 @@ services:
       - '27017'
     volumes:
       - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
 
   redis:
     container_name: bigcapital-redis
@@ -179,15 +164,11 @@ services:
       - '6379'
     volumes:
       - redis:/data
-    networks:
-      - bigcapital_network
 
   gotenberg:
     image: gotenberg/gotenberg:7
     expose:
       - '9000'
-    networks:
-      - bigcapital_network
 
 # Volumes
 volumes:
@@ -202,8 +183,3 @@ volumes:
   redis:
     name: bigcapital_prod_redis
     driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge

docker/envoy/envoy.yaml

@@ -1,62 +0,0 @@
-static_resources:
-  listeners:
-    - name: listener_0
-      address:
-        socket_address:
-          address: 0.0.0.0
-          port_value: 80
-      filter_chains:
-        - filters:
-            - name: envoy.filters.network.http_connection_manager
-              typed_config:
-                '@type': type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
-                stat_prefix: ingress_http
-                route_config:
-                  name: local_route
-                  virtual_hosts:
-                    - name: backend
-                      domains: ['*']
-                      routes:
-                        - match:
-                            prefix: '/api'
-                          route:
-                            cluster: dynamic_server
-                        - match:
-                            prefix: '/'
-                          route:
-                            cluster: webapp
-                http_filters:
-                  - name: envoy.filters.http.router
-                    typed_config:
-                      "@type": type.googleapis.com/envoy.extensions.filters.http.router.v3.Router
-
-  clusters:
-    - name: dynamic_server
-      connect_timeout: 0.25s
-      type: STRICT_DNS
-      dns_lookup_family: V4_ONLY
-      lb_policy: ROUND_ROBIN
-      load_assignment:
-        cluster_name: dynamic_server
-        endpoints:
-          - lb_endpoints:
-              - endpoint:
-                  address:
-                    socket_address:
-                      address: server
-                      port_value: 3000
-
-    - name: webapp
-      connect_timeout: 0.25s
-      type: STRICT_DNS
-      dns_lookup_family: V4_ONLY
-      lb_policy: ROUND_ROBIN
-      load_assignment:
-        cluster_name: webapp
-        endpoints:
-          - lb_endpoints:
-              - endpoint:
-                  address:
-                    socket_address:
-                      address: webapp
-                      port_value: 80

docker/nginx/Dockerfile

@@ -0,0 +1,21 @@
+FROM nginx:1.11
+
+RUN mkdir /etc/nginx/sites-available && rm /etc/nginx/conf.d/default.conf
+ADD nginx.conf /etc/nginx/
+
+COPY scripts /root/scripts/
+COPY certs /etc/ssl/
+
+COPY sites /etc/nginx/templates
+
+ARG SERVER_PROXY_PORT=3000
+ARG WEB_SSL=false
+ARG SELF_SIGNED=false
+
+ENV SERVER_PROXY_PORT=$SERVER_PROXY_PORT
+ENV WEB_SSL=$WEB_SSL
+ENV SELF_SIGNED=$SELF_SIGNED
+
+RUN /bin/bash /root/scripts/build-nginx.sh
+
+CMD nginx

docker/nginx/nginx.conf

@@ -0,0 +1,33 @@
+user www-data;
+worker_processes auto;
+pid /run/nginx.pid;
+daemon off;
+
+events {
+  worker_connections  2048;
+  use epoll;
+}
+
+http {
+  server_tokens off;
+  sendfile on;
+  tcp_nopush on;
+  tcp_nodelay on;
+  keepalive_timeout 15;
+  types_hash_max_size 2048;
+  client_max_body_size 20M;
+  open_file_cache max=100;
+  gzip on;
+  gzip_disable "msie6";
+
+  ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:DES-CBC3-SHA:!DSS';
+
+  include /etc/nginx/mime.types;
+  default_type application/octet-stream;
+
+  include /etc/nginx/conf.d/*.conf;
+  include /etc/nginx/sites-available/*;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
+}

docker/nginx/scripts/build-nginx.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+for conf in /etc/nginx/templates/*.conf; do
+  mv $conf "/etc/nginx/sites-available/"$(basename $conf) > /dev/null
+done
+
+for template in /etc/nginx/templates/*.template; do
+  envsubst < $template > "/etc/nginx/sites-available/"$(basename $template)".conf"
+done

docker/nginx/sites/server.template

@@ -0,0 +1,16 @@
+server {
+  listen 80 default_server;
+
+  location /api {
+    proxy_pass http://server:${SERVER_PROXY_PORT};
+  }
+
+  location / {
+    proxy_pass http://webapp;
+  }
+
+  location /.well-known/acme-challenge/ {
+    root /var/www/letsencrypt/;
+    log_not_found off;
+  }
+}

packages/server/package.json

@@ -25,7 +25,6 @@
     "@casl/ability": "^5.4.3",
     "@hapi/boom": "^7.4.3",
     "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
-    "@supercharge/promise-pool": "^3.2.0",
     "@types/express": "^4.17.21",
     "@types/i18n": "^0.8.7",
     "@types/knex": "^0.16.1",

packages/server/resources/scss/modules/export-resource-table.scss

@@ -1,38 +0,0 @@
-@import "../base.scss";
-
-body {
-  font-family: system-ui,-apple-system,"Segoe UI",Roboto,"Helvetica Neue","Noto Sans","Liberation Sans",Arial,sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
-  font-size: 12px;
-  line-height: 1.4;
-  margin: 0;
-}
-.sheet__title{
-  margin-bottom: 18px;
-}
-.sheet__title h2{
-  line-height: 1;
-  margin-top: 0;
-  margin-bottom: 10px;
-  font-size: 16px;
-}
-.sheet__table {
-  font-size: inherit;
-  line-height: inherit;
-  width: 100%;
-}
-.sheet__table {
-  table-layout: auto;
-  border-collapse: collapse;  
-  width: 100%;
-}
-.sheet__table thead tr th {
-  border-top: 1px solid #000;
-  border-bottom: 1px solid #000;
-  background: #fff;
-  padding: 8px;
-  line-height: 1.2;
-}
-.sheet__table tbody tr td {
-  padding: 4px 8px;
-  border-bottom: 1px solid #CCC;    
-}

packages/server/resources/views/modules/export-resource-table.pug

@@ -1,24 +0,0 @@
-block head
-  style 
-    include ../../css/modules/export-resource-table.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet
-    .sheet__title 
-      h2.sheetTitle= sheetTitle
-      p.sheetDesc= sheetDescription
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.name
-      tbody
-        each row in table.rows
-          tr(class=row.classNames)
-            each cell in row.cells 
-              td(class='cell--' + cell.key)
-                span!= cell.value

packages/server/scripts/gulpConfig.js

@@ -70,10 +70,6 @@ module.exports = {
         src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
         dest: `${RESOURCES_PATH}/css/modules`,
       },
-      {
-        src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
     ],
     // RTL builds.
     rtl: [

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

@@ -4,16 +4,12 @@ import { Router, Response, NextFunction, Request } from 'express';
 import { body, param } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { AttachmentsApplication } from '@/services/Attachments/AttachmentsApplication';
-import { AttachmentUploadPipeline } from '@/services/Attachments/S3UploadPipeline';
 
 @Service()
 export class AttachmentsController extends BaseController {
   @Inject()
   private attachmentsApplication: AttachmentsApplication;
 
-  @Inject()
-  private uploadPipelineService: AttachmentUploadPipeline;
-
   /**
    * Router constructor.
    */
@@ -22,8 +18,7 @@ export class AttachmentsController extends BaseController {
 
     router.post(
       '/',
-      this.uploadPipelineService.validateS3Configured,
+      this.attachmentsApplication.uploadPipeline.single('file'),
-      this.uploadPipelineService.uploadPipeline().single('file'),
       this.validateUploadedFileExistance,
       this.uploadAttachment.bind(this)
     );

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

@@ -1,49 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
-
-@Service()
-export class BankAccountsController extends BaseController {
-  @Inject()
-  private getBankAccountSummaryService: GetBankAccountSummary;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
-
-    return router;
-  }
-
-  /**
-   * Retrieves the bank account meta summary.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getBankAccountSummary(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      const data =
-        await this.getBankAccountSummaryService.getBankAccountSummary(
-          tenantId,
-          bankAccountId
-        );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,103 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
-import { body, param } from 'express-validator';
-import {
-  GetMatchedTransactionsFilter,
-  IMatchTransactionsDTO,
-} from '@/services/Banking/Matching/types';
-
-@Service()
-export class BankTransactionsMatchingController extends BaseController {
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/:transactionId',
-      [
-        param('transactionId').exists(),
-        body('matchedTransactions').isArray({ min: 1 }),
-        body('matchedTransactions.*.reference_type').exists(),
-        body('matchedTransactions.*.reference_id').isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.matchBankTransaction.bind(this)
-    );
-    router.post(
-      '/unmatch/:transactionId',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unmatchMatchedBankTransaction.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Matches the given bank transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async matchBankTransaction(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-    const matchTransactionDTO = this.matchedBodyData(
-      req
-    ) as IMatchTransactionsDTO;
-
-    try {
-      await this.bankTransactionsMatchingApp.matchTransaction(
-        tenantId,
-        transactionId,
-        matchTransactionDTO
-      );
-      return res.status(200).send({
-        id: transactionId,
-        message: 'The bank transaction has been matched.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Unmatches the matched bank transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async unmatchMatchedBankTransaction(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.bankTransactionsMatchingApp.unmatchMatchedTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        id: transactionId,
-        message: 'The bank matched transaction has been unmatched.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -2,33 +2,17 @@ import Container, { Inject, Service } from 'typedi';
 import { Router } from 'express';
 import BaseController from '@/api/controllers/BaseController';
 import { PlaidBankingController } from './PlaidBankingController';
-import { BankingRulesController } from './BankingRulesController';
-import { BankTransactionsMatchingController } from './BankTransactionsMatchingController';
-import { RecognizedTransactionsController } from './RecognizedTransactionsController';
-import { BankAccountsController } from './BankAccountsController';
 
 @Service()
 export class BankingController extends BaseController {
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.use('/plaid', Container.get(PlaidBankingController).router());
-    router.use('/rules', Container.get(BankingRulesController).router());
+
-    router.use(
-      '/matches',
-      Container.get(BankTransactionsMatchingController).router()
-    );
-    router.use(
-      '/recognized',
-      Container.get(RecognizedTransactionsController).router()
-    );
-    router.use(
-      '/bank_accounts',
-      Container.get(BankAccountsController).router()
-    );
     return router;
   }
 }

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

@@ -1,206 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { BankRulesApplication } from '@/services/Banking/Rules/BankRulesApplication';
-import { body, param } from 'express-validator';
-import {
-  ICreateBankRuleDTO,
-  IEditBankRuleDTO,
-} from '@/services/Banking/Rules/types';
-
-@Service()
-export class BankingRulesController extends BaseController {
-  @Inject()
-  private bankRulesApplication: BankRulesApplication;
-
-  /**
-   * Bank rule DTO validation schema.
-   */
-  private get bankRuleValidationSchema() {
-    return [
-      body('name').isString().exists(),
-      body('order').isInt({ min: 0 }),
-
-      // Apply to if transaction is.
-      body('apply_if_account_id')
-        .isInt({ min: 0 })
-        .optional({ nullable: true }),
-      body('apply_if_transaction_type').isIn(['deposit', 'withdrawal']),
-
-      // Conditions
-      body('conditions_type').isString().isIn(['and', 'or']).default('and'),
-      body('conditions').isArray({ min: 1 }),
-      body('conditions.*.field').exists().isIn(['description', 'amount']),
-      body('conditions.*.comparator')
-        .exists()
-        .isIn(['equals', 'contains', 'not_contain'])
-        .default('contain'),
-      body('conditions.*.value').exists(),
-
-      // Assign
-      body('assign_category').isString(),
-      body('assign_account_id').isInt({ min: 0 }),
-      body('assign_payee').isString().optional({ nullable: true }),
-      body('assign_memo').isString().optional({ nullable: true }),
-
-      body('recognition').isBoolean().toBoolean().optional({ nullable: true }),
-    ];
-  }
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      [...this.bankRuleValidationSchema],
-      this.validationResult,
-      this.createBankRule.bind(this)
-    );
-    router.post(
-      '/:id',
-      [param('id').toInt().exists(), ...this.bankRuleValidationSchema],
-      this.validationResult,
-      this.editBankRule.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.deleteBankRule.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.getBankRule.bind(this)
-    );
-    router.get(
-      '/',
-      [param('id').toInt().exists()],
-      this.validationResult,
-      this.getBankRules.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Creates a new bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async createBankRule(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const createBankRuleDTO = this.matchedBodyData(req) as ICreateBankRuleDTO;
-
-    try {
-      const bankRule = await this.bankRulesApplication.createBankRule(
-        tenantId,
-        createBankRuleDTO
-      );
-      return res.status(200).send({
-        id: bankRule.id,
-        message: 'The bank rule has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Edits the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async editBankRule(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { id: ruleId } = req.params;
-    const editBankRuleDTO = this.matchedBodyData(req) as IEditBankRuleDTO;
-
-    try {
-      await this.bankRulesApplication.editBankRule(
-        tenantId,
-        ruleId,
-        editBankRuleDTO
-      );
-      return res.status(200).send({
-        id: ruleId,
-        message: 'The bank rule has been updated successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async deleteBankRule(
-    req: Request<{ id: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { id: ruleId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankRulesApplication.deleteBankRule(tenantId, ruleId);
-
-      return res
-        .status(200)
-        .send({ message: 'The bank rule has been deleted.', id: ruleId });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieve the given bank rule.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getBankRule(req: Request, res: Response, next: NextFunction) {
-    const { id: ruleId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      const bankRule = await this.bankRulesApplication.getBankRule(
-        tenantId,
-        ruleId
-      );
-
-      return res.status(200).send({ bankRule });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the bank rules.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getBankRules(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-
-    try {
-      const bankRules = await this.bankRulesApplication.getBankRules(tenantId);
-      return res.status(200).send({ bankRules });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,124 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { param } from 'express-validator';
-import { NextFunction, Request, Response, Router, query } from 'express';
-import BaseController from '../BaseController';
-import { ExcludeBankTransactionsApplication } from '@/services/Banking/Exclude/ExcludeBankTransactionsApplication';
-
-@Service()
-export class ExcludeBankTransactionsController extends BaseController {
-  @Inject()
-  private excludeBankTransactionApp: ExcludeBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.put(
-      '/transactions/:transactionId/exclude',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.excludeBankTransaction.bind(this)
-    );
-    router.put(
-      '/transactions/:transactionId/unexclude',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unexcludeBankTransaction.bind(this)
-    );
-    router.get(
-      '/excluded',
-      [],
-      this.validationResult,
-      this.getExcludedBankTransactions.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Marks a bank transaction as excluded.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns
-   */
-  private async excludeBankTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.excludeBankTransactionApp.excludeBankTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        message: 'The bank transaction has been excluded.',
-        id: transactionId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Marks a bank transaction as not excluded.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unexcludeBankTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-
-    try {
-      await this.excludeBankTransactionApp.unexcludeBankTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({
-        message: 'The bank transaction has been unexcluded.',
-        id: transactionId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the excluded uncategorized bank transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  private async getExcludedBankTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const filter = this.matchedBodyData(req);
-
-    console.log('123');
-    try {
-      const data =
-        await this.excludeBankTransactionApp.getExcludedBankTransactions(
-          tenantId,
-          filter
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,77 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-
-@Service()
-export class RecognizedTransactionsController extends BaseController {
-  @Inject()
-  private cashflowApplication: CashflowApplication;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get('/', this.getRecognizedTransactions.bind(this));
-    router.get(
-      '/transactions/:uncategorizedTransactionId',
-      this.getRecognizedTransaction.bind(this)
-    );
-
-    return router;
-  }
-
-  /**
-   * Retrieves the recognized bank transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getRecognizedTransactions(
-    req: Request<{ accountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const filter = this.matchedQueryData(req);
-    const { tenantId } = req;
-
-    try {
-      const data = await this.cashflowApplication.getRecognizedTransactions(
-        tenantId,
-        filter
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the recognized transaction of the ginen uncategorized transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async getRecognizedTransaction(
-    req: Request<{ uncategorizedTransactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { uncategorizedTransactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.getRecognizedTransaction(
-        tenantId,
-        uncategorizedTransactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -4,7 +4,6 @@ import CommandCashflowTransaction from './NewCashflowTransaction';
 import DeleteCashflowTransaction from './DeleteCashflowTransaction';
 import GetCashflowTransaction from './GetCashflowTransaction';
 import GetCashflowAccounts from './GetCashflowAccounts';
-import { ExcludeBankTransactionsController } from '../Banking/ExcludeBankTransactionsController';
 
 @Service()
 export default class CashflowController {
@@ -15,7 +14,6 @@ export default class CashflowController {
     const router = Router();
 
     router.use(Container.get(CommandCashflowTransaction).router());
-    router.use(Container.get(ExcludeBankTransactionsController).router());
     router.use(Container.get(GetCashflowTransaction).router());
     router.use(Container.get(GetCashflowAccounts).router());
     router.use(Container.get(DeleteCashflowTransaction).router());

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

@@ -31,6 +31,7 @@ export default class GetCashflowAccounts extends BaseController {
         query('search_keyword').optional({ nullable: true }).isString().trim(),
       ],
       this.asyncMiddleware(this.getCashflowAccounts),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -66,4 +67,22 @@ export default class GetCashflowAccounts extends BaseController {
       next(error);
     }
   };
+
+  /**
+   * Catches the service errors.
+   * @param {Error} error - Error.
+   * @param {Request} req - Request.
+   * @param {Response} res - Response.
+   * @param {NextFunction} next -
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+    }
+    next(error);
+  }
 }

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

@@ -6,27 +6,18 @@ import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { GetMatchedTransactionsFilter } from '@/services/Banking/Matching/types';
-import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
 
 @Service()
 export default class GetCashflowAccounts extends BaseController {
   @Inject()
   private cashflowApplication: CashflowApplication;
 
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
-
   /**
    * Controller router.
    */
   public router() {
     const router = Router();
 
-    router.get(
-      '/transactions/:transactionId/matches',
-      this.getMatchedTransactions.bind(this)
-    );
     router.get(
       '/transactions/:transactionId',
       CheckPolicies(CashflowAction.View, AbilitySubject.Cashflow),
@@ -56,6 +47,7 @@ export default class GetCashflowAccounts extends BaseController {
         tenantId,
         transactionId
       );
+
       return res.status(200).send({
         cashflow_transaction: this.transfromToResponse(cashflowTransaction),
       });
@@ -64,34 +56,6 @@ export default class GetCashflowAccounts extends BaseController {
     }
   };
 
-  /**
-   * Retrieves the matched transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getMatchedTransactions(
-    req: Request<{ transactionId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { transactionId } = req.params;
-    const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
-
-    try {
-      const data =
-        await this.bankTransactionsMatchingApp.getMatchedTransactions(
-          tenantId,
-          transactionId,
-          filter
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Catches the service errors.
    * @param {Error} error - Error.

packages/server/src/api/controllers/Dashboard/index.ts

@@ -5,7 +5,7 @@ import DashboardService from '@/services/Dashboard/DashboardService';
 @Service()
 export default class DashboardMetaController {
   @Inject()
-  private dashboardService: DashboardService;
+  dashboardService: DashboardService;
 
   /**
    * Constructor router.

packages/server/src/api/controllers/Export/ExportController.ts

@@ -5,7 +5,6 @@ import BaseController from '@/api/controllers/BaseController';
 import { ServiceError } from '@/exceptions';
 import { ExportApplication } from '@/services/Export/ExportApplication';
 import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { convertAcceptFormatToFormat } from './_utils';
 
 @Service()
 export class ExportController extends BaseController {
@@ -26,6 +25,7 @@ export class ExportController extends BaseController {
       ],
       this.validationResult,
       this.export.bind(this),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -48,12 +48,10 @@ export class ExportController extends BaseController {
         ACCEPT_TYPE.APPLICATION_CSV,
         ACCEPT_TYPE.APPLICATION_PDF,
       ]);
-      const applicationFormat = convertAcceptFormatToFormat(acceptType);
-
       const data = await this.exportResourceApp.export(
         tenantId,
         query.resource,
-        applicationFormat
+        acceptType === ACCEPT_TYPE.APPLICATION_XLSX ? 'xlsx' : 'csv'
       );
       // Retrieves the csv format.
       if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
@@ -72,16 +70,31 @@ export class ExportController extends BaseController {
           'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
         );
         return res.send(data);
-        //
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': data.length,
-        });
-        res.send(data);
       }
     } catch (error) {
       next(error);
     }
   }
+
+  /**
+   * Transforms service errors to response.
+   * @param {Error}
+   * @param {Request} req
+   * @param {Response} res
+   * @param {ServiceError} error
+   */
+  private catchServiceErrors(
+    error,
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    if (error instanceof ServiceError) {
+      return res.status(400).send({
+        errors: [{ type: error.errorType }],
+      });
+    }
+
+    next(error);
+  }
 }

packages/server/src/api/controllers/Export/_utils.ts

@@ -1,13 +0,0 @@
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { ExportFormat } from '@/services/Export/common';
-
-export const convertAcceptFormatToFormat = (accept: string): ExportFormat => {
-  switch (accept) {
-    case ACCEPT_TYPE.APPLICATION_CSV:
-      return ExportFormat.Csv;
-    case ACCEPT_TYPE.APPLICATION_PDF:
-      return ExportFormat.Pdf;
-    case ACCEPT_TYPE.APPLICATION_XLSX:
-      return ExportFormat.Xlsx;
-  }
-};

packages/server/src/api/controllers/Purchases/BillsPayments.ts

@@ -111,7 +111,6 @@ export default class BillsPayments extends BaseController {
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('amount').exists().isNumeric().toFloat(),
       check('payment_account_id').exists().isNumeric().toInt(),
       check('payment_number').optional({ nullable: true }).trim().escape(),
       check('payment_date').exists(),
@@ -119,15 +118,13 @@ export default class BillsPayments extends BaseController {
       check('reference').optional().trim().escape(),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('entries').exists().isArray(),
+      check('entries').exists().isArray({ min: 1 }),
       check('entries.*.index').optional().isNumeric().toInt(),
       check('entries.*.bill_id').exists().isNumeric().toInt(),
       check('entries.*.payment_amount').exists().isNumeric().toFloat(),
 
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),
-
-      check('prepard_expenses_account_id').optional().isNumeric().toInt(),
     ];
   }
 

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -151,8 +151,6 @@ export default class PaymentReceivesController extends BaseController {
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
       check('payment_date').exists(),
-      check('amount').exists().isNumeric().toFloat(),
-
       check('reference_no').optional(),
       check('deposit_account_id').exists().isNumeric().toInt(),
       check('payment_receive_no').optional({ nullable: true }).trim().escape(),
@@ -160,7 +158,7 @@ export default class PaymentReceivesController extends BaseController {
 
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('entries').isArray(),
+      check('entries').isArray({ min: 1 }),
 
       check('entries.*.id').optional({ nullable: true }).isNumeric().toInt(),
       check('entries.*.index').optional().isNumeric().toInt(),
@@ -169,11 +167,6 @@ export default class PaymentReceivesController extends BaseController {
 
       check('attachments').isArray().optional(),
       check('attachments.*.key').exists().isString(),
-
-      check('unearned_revenue_account_id')
-        .optional({ nullable: true })
-        .isNumeric()
-        .toInt(),
     ];
   }
 

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

@@ -1,6 +1,7 @@
-import { NextFunction, Router, Request, Response } from 'express';
+import { Router } from 'express';
-import { Inject, Service } from 'typedi';
 import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
+import { Request, Response } from 'express';
+import { Inject, Service } from 'typedi';
 import BaseController from '../BaseController';
 import { LemonSqueezyWebhooks } from '@/services/Subscription/LemonSqueezyWebhooks';
 import { PlaidWebhookTenantBootMiddleware } from '@/services/Banking/Plaid/PlaidWebhookTenantBootMiddleware';
@@ -33,7 +34,7 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async lemonWebhooks(req: Request, res: Response, next: any) {
     const data = req.body;
     const signature = req.headers['x-signature'] ?? '';
     const rawBody = req.rawBody;
@@ -56,25 +57,20 @@ export class Webhooks extends BaseController {
    * @param {Response} res
    * @returns {Response}
    */
-  public async plaidWebhooks(req: Request, res: Response, next: NextFunction) {
+  public async plaidWebhooks(req: Request, res: Response) {
     const { tenantId } = req;
+    const {
+      webhook_type: webhookType,
+      webhook_code: webhookCode,
+      item_id: plaidItemId,
+    } = req.body;
 
-    try {
+    await this.plaidApp.webhooks(
-      const {
+      tenantId,
-        webhook_type: webhookType,
+      plaidItemId,
-        webhook_code: webhookCode,
+      webhookType,
-        item_id: plaidItemId,
+      webhookCode
-      } = req.body;
+    );
-
+    return res.status(200).send({ code: 200, message: 'ok' });
-      await this.plaidApp.webhooks(
-        tenantId,
-        plaidItemId,
-        webhookType,
-        webhookCode
-      );
-      return res.status(200).send({ code: 200, message: 'ok' });
-    } catch (error) {
-      next(error);
-    }
   }
 }

packages/server/src/commands/bigcapital.ts

@@ -4,7 +4,6 @@ import color from 'colorette';
 import argv from 'getopts';
 import Knex from 'knex';
 import { knexSnakeCaseMappers } from 'objection';
-import { PromisePool } from '@supercharge/promise-pool';
 import '../before';
 import config from '../config';
 
@@ -29,7 +28,7 @@ function initSystemKnex() {
   });
 }
 
-function initTenantKnex(organizationId: string = '') {
+function initTenantKnex(organizationId) {
   return Knex({
     client: config.tenant.db_client,
     connection: {
@@ -72,12 +71,6 @@ function getAllSystemTenants(knex) {
   return knex('tenants');
 }
 
-function getAllInitializedTenants(knex) {
-  return knex('tenants').whereNotNull('initializedAt');
-}
-
-const MIGRATION_CONCURRENCY = 10;
-
 // module.exports = {
 //   log,
 //   success,
@@ -94,7 +87,6 @@ const MIGRATION_CONCURRENCY = 10;
 // - bigcapital tenants:migrate:make
 // - bigcapital system:migrate:make
 // - bigcapital tenants:list
-// - bigcapital tenants:list --all
 
 commander
   .command('system:migrate:rollback')
@@ -153,13 +145,10 @@ commander
 commander
   .command('tenants:list')
   .description('Retrieve a list of all system tenants databases.')
-  .option('-a, --all', 'All tenants even are not initialized.')
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = cmd?.all
+      const tenants = await getAllSystemTenants(sysKnex);
-        ? await getAllSystemTenants(sysKnex)
-        : await getAllInitializedTenants(sysKnex);
 
       tenants.forEach((tenant) => {
         const dbName = `${config.tenant.db_name_prefix}${tenant.organizationId}`;
@@ -190,20 +179,18 @@ commander
 commander
   .command('tenants:migrate:latest')
   .description('Migrate all tenants or the given tenant id.')
-  .option(
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
         exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
       }
       // Validate the tenant id exist first of all.
+      const migrateOpers = [];
       const migrateTenant = async (organizationId) => {
         try {
           const tenantKnex = await initTenantKnex(organizationId);
@@ -225,17 +212,18 @@ commander
         }
       };
       if (!cmd.tenant_id) {
-        await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
+        tenants.forEach((tenant) => {
-          .for(tenants)
+          const oper = migrateTenant(tenant.organizationId);
-          .process((tenant, index, pool) => {
+          migrateOpers.push(oper);
-            return migrateTenant(tenant.organizationId);
+        });
-          })
-          .then(() => {
-            success('All tenants are migrated.');
-          });
       } else {
-        await migrateTenant(cmd.tenant_id);
+        const oper = migrateTenant(cmd.tenant_id);
+        migrateOpers.push(oper);
       }
+
+      Promise.all(migrateOpers).then(() => {
+        success('All tenants are migrated.');
+      });
     } catch (error) {
       exit(error);
     }
@@ -244,21 +232,19 @@ commander
 commander
   .command('tenants:migrate:rollback')
   .description('Rollback the last batch of tenants migrations.')
-  .option(
+  .option('-t, --tenant_id [tenant_id]', 'Which tenant id do you migrate.')
-    '-t, --tenant_id [tenant_id]',
-    'Which organization id do you migrate.'
-  )
   .action(async (cmd) => {
     try {
       const sysKnex = await initSystemKnex();
-      const tenants = await getAllInitializedTenants(sysKnex);
+      const tenants = await getAllSystemTenants(sysKnex);
       const tenantsOrgsIds = tenants.map((tenant) => tenant.organizationId);
 
       if (cmd.tenant_id && tenantsOrgsIds.indexOf(cmd.tenant_id) === -1) {
         exit(`The given tenant id ${cmd.tenant_id} is not exists.`);
       }
 
-      const migrateTenant = async (organizationId: string) => {
+      const migrateOpers = [];
+      const migrateTenant = async (organizationId) => {
         try {
           const tenantKnex = await initTenantKnex(organizationId);
           const [batchNo, _log] = await tenantKnex.migrate.rollback();
@@ -279,18 +265,19 @@ commander
       };
 
       if (!cmd.tenant_id) {
-        await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
+        tenants.forEach((tenant) => {
-          .for(tenants)
+          const oper = migrateTenant(tenant.organizationId);
-          .process((tenant, index, pool) => {
+          migrateOpers.push(oper);
-            return migrateTenant(tenant.organizationId);
+        });
-          })
-          .then(() => {
-            success('All tenants are rollbacked.');
-          });
       } else {
-        await migrateTenant(cmd.tenant_id);
+        const oper = migrateTenant(cmd.tenant_id);
+        migrateOpers.push(oper);
       }
+      Promise.all(migrateOpers).then(() => {
+        success('All tenants are rollbacked.');
+      });
     } catch (error) {
       exit(error);
     }
   });
+

packages/server/src/config/index.ts

@@ -204,7 +204,10 @@ module.exports = {
   plaid: {
     env: process.env.PLAID_ENV || 'sandbox',
     clientId: process.env.PLAID_CLIENT_ID,
-    secret: process.env.PLAID_SECRET,
+    secretDevelopment: process.env.PLAID_SECRET_DEVELOPMENT,
+    secretSandbox: process.env.PLAID_SECRET_SANDBOX,
+    redirectSandBox: process.env.PLAID_SANDBOX_REDIRECT_URI,
+    redirectDevelopment: process.env.PLAID_DEVELOPMENT_REDIRECT_URI,
     linkWebhook: process.env.PLAID_LINK_WEBHOOK,
   },
 
@@ -215,7 +218,6 @@ module.exports = {
     key: process.env.LEMONSQUEEZY_API_KEY,
     storeId: process.env.LEMONSQUEEZY_STORE_ID,
     webhookSecret: process.env.LEMONSQUEEZY_WEBHOOK_SECRET,
-    redirectTo: `${process.env.BASE_URL}/setup`,
   },
 
   /**
@@ -231,10 +233,10 @@ module.exports = {
    * S3 for documents.
    */
   s3: {
-    region: process.env.S3_REGION,
+    region: process.env.AWS_REGION,
-    accessKeyId: process.env.S3_ACCESS_KEY_ID,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
-    secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
-    endpoint: process.env.S3_ENDPOINT,
+    endpoint: process.env.AWS_ENDPOINT,
-    bucket: process.env.S3_BUCKET || 'bigcapital-documents',
+    bucket: process.env.AWS_BUCKET,
   },
 };

packages/server/src/data/TransactionTypes.ts

@@ -1,16 +1,7 @@
-export const CashflowTransactionTypes = {
-  OtherIncome: 'Other income',
-  OtherExpense: 'Other expense',
-  OwnerDrawing: 'Owner drawing',
-  OwnerContribution: 'Owner contribution',
-  TransferToAccount: 'Transfer to account',
-  TransferFromAccount: 'Transfer from account',
-};
-
 export const TransactionTypes = {
   SaleInvoice: 'Sale invoice',
   SaleReceipt: 'Sale receipt',
-  PaymentReceive: 'Payment received',
+  PaymentReceive: 'Payment receive',
   Bill: 'Bill',
   BillPayment: 'Payment made',
   VendorOpeningBalance: 'Vendor opening balance',
@@ -26,10 +17,12 @@ export const TransactionTypes = {
   OtherExpense: 'Other expense',
   OwnerDrawing: 'Owner drawing',
   InvoiceWriteOff: 'Invoice write-off',
+
   CreditNote: 'transaction_type.credit_note',
   VendorCredit: 'transaction_type.vendor_credit',
+
   RefundCreditNote: 'transaction_type.refund_credit_note',
   RefundVendorCredit: 'transaction_type.refund_vendor_credit',
+
   LandedCost: 'transaction_type.landed_cost',
-  CashflowTransaction: CashflowTransactionTypes,
 };

packages/server/src/database/migrations/20231108170207_create_documents_table.js

@@ -3,7 +3,7 @@ exports.up = function (knex) {
     table.increments('id').primary();
     table.string('key').notNullable();
     table.string('mime_type').notNullable();
-    table.integer('size').unsigned();
+    table.integer('size').unsigned().notNullable();
     table.string('origin_name');
     table.timestamps();
   });

packages/server/src/database/migrations/20231108170207_create_storage_table.js

@@ -1,14 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('storage', (table) => {
-    table.increments('id').primary();
-    table.string('key').notNullable();
-    table.string('path').notNullable();
-    table.string('extension').notNullable();
-    table.integer('expire_in');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};

packages/server/src/database/migrations/20240604153938_drop_storage_table.js

@@ -1,5 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.dropTableIfExists('storage');
-};
-
-exports.down = function (knex) {};

packages/server/src/database/migrations/20240618100137_create_bank_rules_table.js

@@ -1,45 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema
-    .createTable('bank_rules', (table) => {
-      table.increments('id').primary();
-      table.string('name');
-      table.integer('order').unsigned();
-
-      table
-        .integer('apply_if_account_id')
-        .unsigned()
-        .references('id')
-        .inTable('accounts');
-      table.string('apply_if_transaction_type');
-
-      table.string('assign_category');
-      table
-        .integer('assign_account_id')
-        .unsigned()
-        .references('id')
-        .inTable('accounts');
-      table.string('assign_payee');
-      table.string('assign_memo');
-
-      table.string('conditions_type');
-
-      table.timestamps();
-    })
-    .createTable('bank_rule_conditions', (table) => {
-      table.increments('id').primary();
-      table
-        .integer('rule_id')
-        .unsigned()
-        .references('id')
-        .inTable('bank_rules');
-      table.string('field');
-      table.string('comparator');
-      table.string('value');
-    });
-};
-
-exports.down = function (knex) {
-  return knex.schema
-    .dropTableIfExists('bank_rules')
-    .dropTableIfExists('bank_rule_conditions');
-};

packages/server/src/database/migrations/20240618171553_create_recognized_bank_transactions_table.js

@@ -1,31 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('recognized_bank_transactions', (table) => {
-    table.increments('id');
-    table
-      .integer('uncategorized_transaction_id')
-      .unsigned()
-      .references('id')
-      .inTable('uncategorized_cashflow_transactions')
-      .withKeyName('recognizedBankTransactionsUncategorizedTransIdForeign');
-    table
-      .integer('bank_rule_id')
-      .unsigned()
-      .references('id')
-      .inTable('bank_rules');
-
-    table.string('assigned_category');
-    table
-      .integer('assigned_account_id')
-      .unsigned()
-      .references('id')
-      .inTable('accounts');
-    table.string('assigned_payee');
-    table.string('assigned_memo');
-
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('recognized_bank_transactions');
-};

packages/server/src/database/migrations/20240618175241_add_recognized_transaction_id_to_uncategorized_transactins_table.js

@@ -1,16 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table
-      .integer('recognized_transaction_id')
-      .unsigned()
-      .references('id')
-      .inTable('recognized_bank_transactions')
-      .withKeyName('uncategorizedCashflowTransRecognizedTranIdForeign');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.dropColumn('recognized_transaction_id');
-  });
-};

packages/server/src/database/migrations/20240619133733_create_matched_bank_transactions_table.js

@@ -1,18 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.createTable('matched_bank_transactions', (table) => {
-    table.increments('id');
-    table
-      .integer('uncategorized_transaction_id')
-      .unsigned()
-      .references('id')
-      .inTable('uncategorized_cashflow_transactions');
-    table.string('reference_type');
-    table.integer('reference_id').unsigned();
-    table.decimal('amount');
-    table.timestamps();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.dropTableIfExists('matched_bank_transactions');
-};

packages/server/src/database/migrations/20240620111308_add_excluded_column_to_uncategorized_cashflow_transactions_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.datetime('excluded_at');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.dropColumn('excluded_at');
-  });
-};

packages/server/src/database/migrations/20240623154149_add_batch_column_to_uncategorized_cashflow_transactions_table.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.string('batch');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
-    table.dropColumn('batch');
-  });
-};

packages/server/src/database/migrations/20240704064858_change_settings_value_to_text.js

@@ -1,11 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('settings', (table) => {
-    table.text('value').alter();
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.table('settings', (table) => {
-    table.string('value').alter();
-  });
-};

packages/server/src/database/migrations/20240709122347_move_cashflow_transaction_type_to_transaction_type_column.js

@@ -1,60 +0,0 @@
-exports.up = function (knex) {
-  return knex('accounts_transactions')
-    .whereIn('referenceType', [
-      'OtherIncome',
-      'OtherExpense',
-      'OwnerDrawing',
-      'OwnerContribution',
-      'TransferToAccount',
-      'TransferFromAccount',
-    ])
-    .update({
-      transactionType: knex.raw(`
-        CASE 
-          WHEN REFERENCE_TYPE = 'OtherIncome' THEN 'OtherIncome'
-          WHEN REFERENCE_TYPE = 'OtherExpense' THEN 'OtherExpense'
-          WHEN REFERENCE_TYPE = 'OwnerDrawing' THEN 'OwnerDrawing'
-          WHEN REFERENCE_TYPE = 'OwnerContribution' THEN 'OwnerContribution'
-          WHEN REFERENCE_TYPE = 'TransferToAccount' THEN 'TransferToAccount'
-          WHEN REFERENCE_TYPE = 'TransferFromAccount' THEN 'TransferFromAccount'
-        END
-      `),
-      referenceType: knex.raw(`
-        CASE 
-          WHEN REFERENCE_TYPE IN ('OtherIncome', 'OtherExpense', 'OwnerDrawing', 'OwnerContribution', 'TransferToAccount', 'TransferFromAccount') THEN 'CashflowTransaction'
-          ELSE REFERENCE_TYPE
-        END
-      `),
-    });
-};
-
-exports.down = function (knex) {
-  return knex('accounts_transactions')
-    .whereIn('transactionType', [
-      'OtherIncome',
-      'OtherExpense',
-      'OwnerDrawing',
-      'OwnerContribution',
-      'TransferToAccount',
-      'TransferFromAccount',
-    ])
-    .update({
-      referenceType: knex.raw(`
-      CASE 
-        WHEN TRANSACTION_TYPE = 'OtherIncome' THEN 'OtherIncome'
-        WHEN TRANSACTION_TYPE = 'OtherExpense' THEN 'OtherExpense'
-        WHEN TRANSACTION_TYPE = 'OwnerDrawing' THEN 'OwnerDrawing'
-        WHEN TRANSACTION_TYPE = 'OwnerContribution' THEN 'OwnerContribution'
-        WHEN TRANSACTION_TYPE = 'TransferToAccount' THEN 'TransferToAccount'
-        WHEN TRANSACTION_TYPE = 'TransferFromAccount' THEN 'TransferFromAccount'
-        ELSE REFERENCE_TYPE
-      END
-    `),
-      transactionType: knex.raw(`
-      CASE 
-        WHEN TRANSACTION_TYPE IN ('OtherIncome', 'OtherExpense', 'OwnerDrawing', 'OwnerContribution', 'TransferToAccount', 'TransferFromAccount') THEN NULL
-        ELSE TRANSACTION_TYPE
-      END
-    `),
-    });
-};

packages/server/src/database/migrations/20240722085204_amount_applied_column_to_payments_received_table.js

@@ -1,17 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('payment_receives', (table) => {
-    table.decimal('applied_amount', 13, 3).defaultTo(0);
-    table
-      .integer('unearned_revenue_account_id')
-      .unsigned()
-      .references('id')
-      .inTable('accounts');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('payment_receives', (table) => {
-    table.dropColumn('applied_amount');
-    table.dropColumn('unearned_revenue_account_id');
-  });
-};

packages/server/src/database/migrations/20240723231630_amount_applied_column_to_payments_made_table.js

@@ -1,17 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.table('bills_payments', (table) => {
-    table.decimal('applied_amount', 13, 3).defaultTo(0);
-    table
-      .integer('prepard_expenses_account_id')
-      .unsigned()
-      .references('id')
-      .inTable('accounts');
-  });
-};
-
-exports.down = function (knex) {
-  return knex.schema.table('bills_payments', (table) => {
-    table.dropColumn('applied_amount');
-    table.dropColumn('prepard_expenses_account_id');
-  });
-};

packages/server/src/database/seeds/core/20190423085242_seed_accounts.ts

@@ -12,7 +12,8 @@ export default class SeedAccounts extends TenantSeeder {
       description: this.i18n.__(account.description),
       currencyCode: this.tenant.metadata.baseCurrency,
       seededAt: new Date(),
-    }));
+    })
+);
     return knex('accounts').then(async () => {
       // Inserts seed entries.
       return knex('accounts').insert(data);

packages/server/src/database/seeds/data/accounts.js

@@ -9,28 +9,6 @@ export const TaxPayableAccount = {
   predefined: 1,
 };
 
-export const UnearnedRevenueAccount = {
-  name: 'Unearned Revenue',
-  slug: 'unearned-revenue',
-  account_type: 'other-current-liability',
-  parent_account_id: null,
-  code: '50005',
-  active: true,
-  index: 1,
-  predefined: true,
-};
-
-export const PrepardExpenses = {
-  name: 'Prepaid Expenses',
-  slug: 'prepaid-expenses',
-  account_type: 'other-current-asset',
-  parent_account_id: null,
-  code: '100010',
-  active: true,
-  index: 1,
-  predefined: true,
-};
-
 export default [
   {
     name: 'Bank Account',
@@ -345,6 +323,4 @@ export default [
     index: 1,
     predefined: 0,
   },
-  UnearnedRevenueAccount,
-  PrepardExpenses,
 ];

packages/server/src/interfaces/Account.ts

@@ -66,9 +66,7 @@ export interface IAccountTransaction {
   referenceId: number;
 
   referenceNumber?: string;
-
   transactionNumber?: string;
-  transactionType?: string;
 
   note?: string;
 
@@ -166,7 +164,3 @@ export enum TaxRateAction {
   DELETE = 'Delete',
   VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}

packages/server/src/interfaces/Bill.ts

@@ -166,10 +166,3 @@ export interface IBillOpenedPayload {
   oldBill: IBill;
   tenantId: number;
 }
-
-
-export interface IBillPrepardExpensesAppliedEventPayload {
-  tenantId: number;
-  billId: number;
-  trx?: Knex.Transaction;
-}

packages/server/src/interfaces/BillPayment.ts

@@ -29,9 +29,6 @@ export interface IBillPayment {
 
   localAmount?: number;
   branchId?: number;
-
-  prepardExpensesAccountId?: number;
-  isPrepardExpense: boolean;
 }
 
 export interface IBillPaymentEntryDTO {
@@ -41,7 +38,6 @@ export interface IBillPaymentEntryDTO {
 
 export interface IBillPaymentDTO {
   vendorId: number;
-  amount: number;
   paymentAccountId: number;
   paymentNumber?: string;
   paymentDate: Date;
@@ -51,7 +47,6 @@ export interface IBillPaymentDTO {
   entries: IBillPaymentEntryDTO[];
   branchId?: number;
   attachments?: AttachmentLinkDTO[];
-  prepardExpensesAccountId?: number;
 }
 
 export interface IBillReceivePageEntry {
@@ -124,11 +119,3 @@ export enum IPaymentMadeAction {
   Delete = 'Delete',
   View = 'View',
 }
-
-export interface IPaymentPrepardExpensesAppliedEventPayload {
-  tenantId: number;
-  billPaymentId: number;
-  billId: number;
-  appliedAmount: number;
-  trx?: Knex.Transaction;
-}

packages/server/src/interfaces/CashFlow.ts

@@ -1,4 +1,3 @@
-import { Knex } from 'knex';
 import {
   IFinancialSheetCommonMeta,
   INumberFormatQuery,
@@ -258,6 +257,7 @@ export interface IUncategorizedCashflowTransaction {
   categorized: boolean;
 }
 
+
 export interface CreateUncategorizedTransactionDTO {
   date: Date | string;
   accountId: number;
@@ -267,18 +267,4 @@ export interface CreateUncategorizedTransactionDTO {
   description?: string;
   referenceNo?: string | null;
   plaidTransactionId?: string | null;
-  batch?: string;
-}
-
-export interface IUncategorizedTransactionCreatingEventPayload {
-  tenantId: number;
-  createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO;
-  trx: Knex.Transaction;
-}
-
-export interface IUncategorizedTransactionCreatedEventPayload {
-  tenantId: number;
-  uncategorizedTransaction: any;
-  createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO;
-  trx: Knex.Transaction;
 }

packages/server/src/interfaces/CashflowService.ts

@@ -130,9 +130,8 @@ export interface ICommandCashflowDeletedPayload {
 
 export interface ICashflowTransactionCategorizedPayload {
   tenantId: number;
-  uncategorizedTransaction: any;
+  cashflowTransactionId: number;
   cashflowTransaction: ICashflowTransaction;
-  categorizeDTO: any;
   trx: Knex.Transaction;
 }
 export interface ICashflowTransactionUncategorizingPayload {
@@ -165,10 +164,3 @@ export interface IGetUncategorizedTransactionsQuery {
   page?: number;
   pageSize?: number;
 }
-
-
-export interface IGetRecognizedTransactionsQuery {
-  page?: number;
-  pageSize?: number;
-  accountId?: number;
-}

packages/server/src/interfaces/FinancialReports/CashflowAccountTransactions/index.ts

@@ -29,9 +29,4 @@ export interface ICashflowAccountTransaction {
 
   date: Date;
   formattedDate: string;
-
-  status: string;
-  formattedStatus: string;
-
-  uncategorizedTransactionId: number;
 }

packages/server/src/interfaces/GeneralLedgerSheet.ts

@@ -56,8 +56,6 @@ export interface IGeneralLedgerSheetAccount {
   transactions: IGeneralLedgerSheetAccountTransaction[];
   openingBalance: IGeneralLedgerSheetAccountBalance;
   closingBalance: IGeneralLedgerSheetAccountBalance;
-  closingBalanceSubaccounts?: IGeneralLedgerSheetAccountBalance;
-  children?: IGeneralLedgerSheetAccount[];
 }
 
 export type IGeneralLedgerSheetData = IGeneralLedgerSheetAccount[];

packages/server/src/interfaces/Import.ts

@@ -1,8 +0,0 @@
-import { ImportFilePreviewPOJO } from "@/services/Import/interfaces";
-
-
-export interface IImportFileCommitedEventPayload {
-  tenantId: number;
-  importId: number;
-  meta: ImportFilePreviewPOJO;
-}

packages/server/src/interfaces/Ledger.ts

@@ -40,8 +40,6 @@ export interface ILedgerEntry {
   date: Date | string;
 
   transactionType: string;
-  transactionSubType?: string;
-
   transactionId: number;
 
   transactionNumber?: string;

packages/server/src/interfaces/Model.ts

@@ -122,10 +122,6 @@ export type IModelMetaCollectionField = IModelMetaCollectionFieldCommon &
 export type IModelMetaRelationField = IModelMetaRelationFieldCommon &
   IModelMetaRelationEnumerationField;
 
-interface IModelPrintMeta{
-  pageTitle: string;
-}
-
 export interface IModelMeta {
   defaultFilterField: string;
   defaultSort: IModelMetaDefaultSort;
@@ -138,8 +134,6 @@ export interface IModelMeta {
   importAggregateOn?: string;
   importAggregateBy?: string;
 
-  print?: IModelPrintMeta;
-
   fields: { [key: string]: IModelMetaField };
   columns: { [key: string]: IModelMetaColumn };
 }

packages/server/src/interfaces/PaymentReceive.ts

@@ -25,13 +25,8 @@ export interface IPaymentReceive {
   updatedAt: Date;
   localAmount?: number;
   branchId?: number;
-  unearnedRevenueAccountId?: number;
 }
-
+export interface IPaymentReceiveCreateDTO {
-interface IPaymentReceivedCommonDTO {
-  unearnedRevenueAccountId?: number;
-}
-export interface IPaymentReceiveCreateDTO extends IPaymentReceivedCommonDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -46,7 +41,7 @@ export interface IPaymentReceiveCreateDTO extends IPaymentReceivedCommonDTO {
   attachments?: AttachmentLinkDTO[];
 }
 
-export interface IPaymentReceiveEditDTO extends IPaymentReceivedCommonDTO {
+export interface IPaymentReceiveEditDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -189,11 +184,3 @@ export interface PaymentReceiveMailPresendEvent {
   paymentReceiveId: number;
   messageOptions: PaymentReceiveMailOptsDTO;
 }
-
-export interface PaymentReceiveUnearnedRevenueAppliedEventPayload {
-  tenantId: number;
-  paymentReceiveId: number;
-  saleInvoiceId: number;
-  appliedAmount: number;
-  trx?: Knex.Transaction;
-}

packages/server/src/interfaces/Plaid.ts

@@ -1,5 +1,3 @@
-import { Knex } from "knex";
-
 export interface IPlaidItemCreatedEventPayload {
   tenantId: number;
   plaidAccessToken: string;
@@ -56,10 +54,3 @@ export interface SyncAccountsTransactionsTask {
   plaidAccountId: number;
   plaidTransactions: PlaidTransaction[];
 }
-
-export interface IPlaidTransactionsSyncedEventPayload {
-  tenantId: number;
-  plaidAccountId: number;
-  batch: string;
-  trx?: Knex.Transaction
-}

packages/server/src/interfaces/SaleInvoice.ts

@@ -216,9 +216,3 @@ export interface ISaleInvoiceMailSent {
   saleInvoiceId: number;
   messageOptions: SendInvoiceMailDTO;
 }
-
-export interface SaleInvoiceAppliedUnearnedRevenueOnCreatedEventPayload {
-  tenantId: number;
-  saleInvoiceId: number;
-  trx?: Knex.Transaction;
-}

packages/server/src/interfaces/User.ts

@@ -11,9 +11,6 @@ export interface ISystemUser extends Model {
   password: string;
   email: string;
 
-  verifyToken: string;
-  verified: boolean;
-
   roleId: number;
   tenantId: number;
 

packages/server/src/lib/Plaid/Plaid.ts

@@ -70,7 +70,10 @@ export class PlaidClientWrapper {
       baseOptions: {
         headers: {
           'PLAID-CLIENT-ID': config.plaid.clientId,
-          'PLAID-SECRET': config.plaid.secret,
+          'PLAID-SECRET':
+            config.plaid.env === 'development'
+              ? config.plaid.secretDevelopment
+              : config.plaid.secretSandbox,
           'Plaid-Version': '2020-09-14',
         },
       },

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

@@ -149,19 +149,13 @@ export class Transformer {
     return this.excludeAttributes().length > 0;
   };
 
-  private dateFormat = 'YYYY MMM DD';
-
-  setDateFormat(format: string) {
-    this.dateFormat = format;
-  }
-
   /**
    *
    * @param date
    * @returns
    */
   protected formatDate(date) {
-    return date ? moment(date).format(this.dateFormat) : '';
+    return date ? moment(date).format('YYYY/MM/DD') : '';
   }
 
   /**
@@ -169,8 +163,8 @@ export class Transformer {
    * @param number
    * @returns
    */
-  protected formatNumber(number, props?) {
+  protected formatNumber(number) {
-    return formatNumber(number, { money: false, ...props });
+    return formatNumber(number, { money: false });
   }
 
   /**
@@ -199,7 +193,6 @@ export class Transformer {
   ) {
     transformer.setOptions(options);
     transformer.setContext(this.context);
-    transformer.setDateFormat(this.dateFormat);
 
     return transformer.work(obj);
   }

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

@@ -24,17 +24,6 @@ export class TransformerInjectable {
     };
   }
 
-  /**
-   * Retrieves the given tenatn date format.
-   * @param {number} tenantId
-   * @returns {string}
-   */
-  async getTenantDateFormat(tenantId: number) {
-    const metadata = await TenantMetadata.query().findOne('tenantId', tenantId);
-
-    return metadata.dateFormat;
-  }
-
   /**
    * Transformes the given transformer after inject the tenant context.
    * @param   {number} tenantId
@@ -52,11 +41,7 @@ export class TransformerInjectable {
     if (!isNull(tenantId)) {
       const context = await this.getApplicationContext(tenantId);
       transformer.setContext(context);
-
-      const dateFormat = await this.getTenantDateFormat(tenantId);
-      transformer.setDateFormat(dateFormat);
     }
-
     transformer.setOptions(options);
 
     return transformer.work(object);

packages/server/src/loaders/eventEmitter.ts

@@ -102,19 +102,6 @@ import { AttachmentsOnVendorCredits } from '@/services/Attachments/events/Attach
 import { AttachmentsOnCreditNote } from '@/services/Attachments/events/AttachmentsOnCreditNote';
 import { AttachmentsOnBillPayments } from '@/services/Attachments/events/AttachmentsOnPaymentsMade';
 import { AttachmentsOnSaleEstimates } from '@/services/Attachments/events/AttachmentsOnSaleEstimates';
-import { TriggerRecognizedTransactions } from '@/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions';
-import { ValidateMatchingOnExpenseDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnExpenseDelete';
-import { ValidateMatchingOnManualJournalDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnManualJournalDelete';
-import { ValidateMatchingOnPaymentReceivedDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete';
-import { ValidateMatchingOnPaymentMadeDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete';
-import { ValidateMatchingOnCashflowDelete } from '@/services/Banking/Matching/events/ValidateMatchingOnCashflowDelete';
-import { RecognizeSyncedBankTranasctions } from '@/services/Banking/Plaid/subscribers/RecognizeSyncedBankTransactions';
-import { UnlinkBankRuleOnDeleteBankRule } from '@/services/Banking/Rules/events/UnlinkBankRuleOnDeleteBankRule';
-import { DecrementUncategorizedTransactionOnMatching } from '@/services/Banking/Matching/events/DecrementUncategorizedTransactionsOnMatch';
-import { DecrementUncategorizedTransactionOnExclude } from '@/services/Banking/Exclude/events/DecrementUncategorizedTransactionOnExclude';
-import { DecrementUncategorizedTransactionOnCategorize } from '@/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize';
-import { AutoApplyUnearnedRevenueOnInvoiceCreated } from '@/services/Sales/PaymentReceives/events/AutoApplyUnearnedRevenueOnInvoiceCreated';
-import { AutoApplyPrepardExpensesOnBillCreated } from '@/services/Purchases/Bills/events/AutoApplyPrepardExpensesOnBillCreated';
 
 export default () => {
   return new EventPublisher();
@@ -259,22 +246,5 @@ export const susbcribers = () => {
     AttachmentsOnBillPayments,
     AttachmentsOnManualJournals,
     AttachmentsOnExpenses,
-
-    // Bank Rules
-    TriggerRecognizedTransactions,
-    UnlinkBankRuleOnDeleteBankRule,
-    DecrementUncategorizedTransactionOnMatching,
-    DecrementUncategorizedTransactionOnExclude,
-    DecrementUncategorizedTransactionOnCategorize,
-
-    // Validate matching
-    ValidateMatchingOnCashflowDelete,
-    ValidateMatchingOnExpenseDelete,
-    ValidateMatchingOnManualJournalDelete,
-    ValidateMatchingOnPaymentReceivedDelete,
-    ValidateMatchingOnPaymentMadeDelete,
-
-    // Plaid
-    RecognizeSyncedBankTranasctions,
   ];
 };

packages/server/src/loaders/jobs.ts

@@ -13,7 +13,6 @@ import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentRecei
 import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
 import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
 import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob';
-import { RegonizeTransactionsJob } from '@/services/Banking/RegonizeTranasctions/RecognizeTransactionsJob';
 
 export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
@@ -30,7 +29,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new PlaidFetchTransactionsJob(agenda);
   new ImportDeleteExpiredFilesJobs(agenda);
   new SendVerifyMailJob(agenda);
-  new RegonizeTransactionsJob(agenda);
 
   agenda.start().then(() => {
     agenda.every('1 hours', 'delete-expired-imported-files', {});

packages/server/src/loaders/tenantModels.ts

@@ -64,10 +64,6 @@ import PlaidItem from 'models/PlaidItem';
 import UncategorizedCashflowTransaction from 'models/UncategorizedCashflowTransaction';
 import Document from '@/models/Document';
 import DocumentLink from '@/models/DocumentLink';
-import { BankRule } from '@/models/BankRule';
-import { BankRuleCondition } from '@/models/BankRuleCondition';
-import { RecognizedBankTransaction } from '@/models/RecognizedBankTransaction';
-import { MatchedBankTransaction } from '@/models/MatchedBankTransaction';
 
 export default (knex) => {
   const models = {
@@ -135,10 +131,6 @@ export default (knex) => {
     DocumentLink,
     PlaidItem,
     UncategorizedCashflowTransaction,
-    BankRule,
-    BankRuleCondition,
-    RecognizedBankTransaction,
-    MatchedBankTransaction,
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };

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

@@ -8,9 +8,6 @@ export default {
   },
   importable: true,
   exportable: true,
-  print: {
-    pageTitle: 'Chart of Accounts',
-  },
   fields: {
     name: {
       name: 'account.field.name',
@@ -124,7 +121,7 @@ export default {
     },
     balance: {
       name: 'account.field.balance',
-      accessor: 'formattedAmount',
+      accessor: 'amount',
     },
     description: {
       name: 'account.field.description',
@@ -136,7 +133,6 @@ export default {
     },
     createdAt: {
       name: 'account.field.created_at',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/AccountTransaction.ts

@@ -10,7 +10,6 @@ export default class AccountTransaction extends TenantModel {
   debit: number;
   exchangeRate: number;
   taxRate: number;
-  transactionType: string;
 
   /**
    * Table name
@@ -54,7 +53,7 @@ export default class AccountTransaction extends TenantModel {
    * @return {string}
    */
   get referenceTypeFormatted() {
-    return getTransactionTypeLabel(this.referenceType, this.transactionType);
+    return getTransactionTypeLabel(this.referenceType);
   }
 
   /**

packages/server/src/models/BankRule.ts

@@ -1,70 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class BankRule extends TenantModel {
-  id!: number;
-  name!: string;
-  order!: number;
-  applyIfAccountId!: number;
-  applyIfTransactionType!: string;
-  assignCategory!: string;
-  assignAccountId!: number;
-  assignPayee!: string;
-  assignMemo!: string;
-  conditionsType!: string;
-
-  /**
-   * Table name
-   */
-  static get tableName() {
-    return 'bank_rules';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['created_at', 'updated_at'];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const { BankRuleCondition } = require('models/BankRuleCondition');
-    const Account = require('models/Account');
-
-    return {
-      /**
-       * Sale invoice associated entries.
-       */
-      conditions: {
-        relation: Model.HasManyRelation,
-        modelClass: BankRuleCondition,
-        join: {
-          from: 'bank_rules.id',
-          to: 'bank_rule_conditions.ruleId',
-        },
-      },
-
-      /**
-       * Bank rule may associated to the assign account.
-       */
-      assignAccount: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Account.default,
-        join: {
-          from: 'bank_rules.assignAccountId',
-          to: 'accounts.id',
-        },
-      },
-    };
-  }
-}

packages/server/src/models/BankRuleCondition.ts

@@ -1,24 +0,0 @@
-import TenantModel from 'models/TenantModel';
-
-export class BankRuleCondition extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'bank_rule_conditions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return [];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-}

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

@@ -10,9 +10,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'billNumber',
-  print: {
-    pageTitle: 'Bills',
-  },
   fields: {
     vendor: {
       name: 'bill.field.vendor',
@@ -86,10 +83,6 @@ export default {
     },
   },
   columns: {
-    billDate: {
-      name: 'Date',
-      accessor: 'formattedBillDate',
-    },
     billNumber: {
       name: 'Bill No.',
       type: 'text',
@@ -98,10 +91,13 @@ export default {
       name: 'Reference No.',
       type: 'text',
     },
+    billDate: {
+      name: 'Date',
+      type: 'date',
+    },
     dueDate: {
       name: 'Due Date',
       type: 'date',
-      accessor: 'formattedDueDate',
     },
     vendorId: {
       name: 'Vendor',
@@ -115,12 +111,10 @@ export default {
     exchangeRate: {
       name: 'Exchange Rate',
       type: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'Currency Code',
       type: 'text',
-      printable: false,
     },
     dueAmount: {
       name: 'Due Amount',
@@ -133,12 +127,10 @@ export default {
     note: {
       name: 'Note',
       type: 'text',
-      printable: false,
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

packages/server/src/models/Bill.ts

@@ -404,7 +404,6 @@ export default class Bill extends mixin(TenantModel, [
     const Branch = require('models/Branch');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       vendor: {
@@ -486,21 +485,6 @@ export default class Bill extends mixin(TenantModel, [
           query.where('model_ref', 'Bill');
         },
       },
-
-      /**
-       * Bill may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'bills.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'Bill');
-        },
-      },
     };
   }
 
@@ -525,9 +509,9 @@ export default class Bill extends mixin(TenantModel, [
     return notFoundBillsIds;
   }
 
-  static changePaymentAmount(billId, amount, trx) {
+  static changePaymentAmount(billId, amount) {
     const changeMethod = amount > 0 ? 'increment' : 'decrement';
-    return this.query(trx)
+    return this.query()
       .where('id', billId)
       [changeMethod]('payment_amount', Math.abs(amount));
   }

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

@@ -77,7 +77,6 @@ export default {
     paymentDate: {
       name: 'bill_payment.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate'
     },
     paymentNumber: {
       name: 'bill_payment.field.payment_number',
@@ -95,17 +94,14 @@ export default {
     currencyCode: {
       name: 'Currency Code',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'bill_payment.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     statement: {
       name: 'bill_payment.field.note',
       type: 'text',
-      printable: false,
     },
     reference: {
       name: 'bill_payment.field.reference',

packages/server/src/models/BillPayment.ts

@@ -11,8 +11,6 @@ export default class BillPayment extends mixin(TenantModel, [
   CustomViewBaseModel,
   ModelSearchable,
 ]) {
-  prepardExpensesAccountId: number;
-
   /**
    * Table name
    */
@@ -49,14 +47,6 @@ export default class BillPayment extends mixin(TenantModel, [
     return BillPaymentSettings;
   }
 
-  /**
-   * Detarmines whether the payment is prepard expense.
-   * @returns {boolean}
-   */
-  get isPrepardExpense() {
-    return !!this.prepardExpensesAccountId;
-  }
-
   /**
    * Relationship mapping.
    */

packages/server/src/models/CashflowTransaction.ts

@@ -5,9 +5,9 @@ import {
   getCashflowAccountTransactionsTypes,
   getCashflowTransactionType,
 } from '@/services/Cashflow/utils';
+import AccountTransaction from './AccountTransaction';
 import { CASHFLOW_DIRECTION } from '@/services/Cashflow/constants';
-import { getCashflowTransactionFormattedType } from '@/utils/transactions-types';
+import { getTransactionTypeLabel } from '@/utils/transactions-types';
-
 export default class CashflowTransaction extends TenantModel {
   transactionType: string;
   amount: number;
@@ -64,7 +64,7 @@ export default class CashflowTransaction extends TenantModel {
    * @returns {string}
    */
   get transactionTypeFormatted() {
-    return getCashflowTransactionFormattedType(this.transactionType);
+    return getTransactionTypeLabel(this.transactionType);
   }
 
   get typeMeta() {
@@ -95,34 +95,6 @@ export default class CashflowTransaction extends TenantModel {
     return !!this.uncategorizedTransaction;
   }
 
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      /**
-       * Filter the published transactions.
-       */
-      published(query) {
-        query.whereNot('published_at', null);
-      },
-
-      /**
-       * Filter the not categorized transactions.
-       */
-      notCategorized(query) {
-        query.whereNull('cashflowTransactions.uncategorizedTransactionId');
-      },
-
-      /**
-       * Filter the categorized transactions.
-       */
-      categorized(query) {
-        query.whereNotNull('cashflowTransactions.uncategorizedTransactionId');
-      },
-    };
-  }
-
   /**
    * Relationship mapping.
    */
@@ -130,7 +102,6 @@ export default class CashflowTransaction extends TenantModel {
     const CashflowTransactionLine = require('models/CashflowTransactionLine');
     const AccountTransaction = require('models/AccountTransaction');
     const Account = require('models/Account');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -159,7 +130,8 @@ export default class CashflowTransaction extends TenantModel {
           to: 'accounts_transactions.referenceId',
         },
         filter(builder) {
-          builder.where('reference_type', 'CashflowTransaction');
+          const referenceTypes = getCashflowAccountTransactionsTypes();
+          builder.whereIn('reference_type', referenceTypes);
         },
       },
 
@@ -186,22 +158,6 @@ export default class CashflowTransaction extends TenantModel {
           to: 'accounts.id',
         },
       },
-
-      /**
-       * Cashflow transaction may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'cashflow_transactions.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter: (query) => {
-          const referenceTypes = getCashflowAccountTransactionsTypes();
-          query.whereIn('reference_type', referenceTypes);
-        },
-      },
     };
   }
 }

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

@@ -20,10 +20,6 @@ export default {
   importAggregateOn: 'entries',
   importAggregateBy: 'creditNoteNumber',
 
-  print: {
-    pageTitle: 'Credit Notes',
-  },
-
   fields: {
     customer: {
       name: 'credit_note.field.customer',
@@ -92,34 +88,36 @@ export default {
   columns: {
     customer: {
       name: 'Customer',
+      type: 'relation',
       accessor: 'customer.displayName',
     },
     exchangeRate: {
       name: 'Exchange Rate',
-      printable: false,
+      type: 'number',
     },
     creditNoteDate: {
       name: 'Credit Note Date',
-      accessor: 'formattedCreditNoteDate'
+      type: 'date',
     },
     referenceNo: {
       name: 'Reference No.',
+      type: 'text',
     },
     note: {
       name: 'Note',
+      type: 'text',
     },
     termsConditions: {
       name: 'Terms & Conditions',
-      printable: false,
+      type: 'text',
     },
     creditNoteNumber: {
       name: 'Credit Note Number',
-      printable: false,
+      type: 'text',
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

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

@@ -6,9 +6,6 @@ export default {
     sortOrder: 'DESC',
     sortField: 'created_at',
   },
-  print: {
-    pageTitle: 'Customers',
-  },
   fields: {
     first_name: {
       name: 'vendor.field.first_name',
@@ -130,121 +127,100 @@ export default {
     balance: {
       name: 'vendor.field.balance',
       type: 'number',
-      accessor: 'formattedBalance',
     },
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false
     },
     status: {
       name: 'vendor.field.status',
-      printable: false
     },
     note: {
       name: 'vendor.field.note',
-      printable: false
     },
     // Billing Address
     billingAddress1: {
       name: 'Billing Address 1',
       column: 'billing_address1',
       type: 'text',
-      printable: false
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
-      printable: false
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
-      printable: false
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
-      printable: false
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
-      printable: false
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
-      printable: false
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
-      printable: false
     },
     // Shipping Address
     shippingAddress1: {
       name: 'Shipping Address 1',
       column: 'shipping_address1',
       type: 'text',
-      printable: false
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
-      printable: false
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
-      printable: false
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
-      printable: false
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
-      printable: false
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
-      printable: false
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
-      printable: false
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
-      printable: false
     },
   },
   fields2: {

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

@@ -10,9 +10,6 @@ export default {
   importable: true,
   exportFlattenOn: 'categories',
   exportable: true,
-  print: {
-    pageTitle: 'Expenses',
-  },
   fields: {
     payment_date: {
       name: 'expense.field.payment_date',
@@ -70,7 +67,7 @@ export default {
     paymentReceive: {
       name: 'expense.field.payment_account',
       type: 'text',
-      accessor: 'paymentAccount.name',
+      accessor: 'paymentAccount.name'
     },
     referenceNo: {
       name: 'expense.field.reference_no',
@@ -78,18 +75,15 @@ export default {
     },
     paymentDate: {
       name: 'expense.field.payment_date',
-      accessor: 'formattedDate',
       type: 'date',
     },
     currencyCode: {
       name: 'expense.field.currency_code',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'expense.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     description: {
       name: 'expense.field.description',
@@ -117,7 +111,6 @@ export default {
     publish: {
       name: 'expense.field.publish',
       type: 'boolean',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/Expense.ts

@@ -182,7 +182,6 @@ export default class Expense extends mixin(TenantModel, [
     const ExpenseCategory = require('models/ExpenseCategory');
     const Document = require('models/Document');
     const Branch = require('models/Branch');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       paymentAccount: {
@@ -235,21 +234,6 @@ export default class Expense extends mixin(TenantModel, [
           query.where('model_ref', 'Expense');
         },
       },
-
-      /**
-       * Expense may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'expenses_transactions.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'Expense');
-        },
-      },
     };
   }
 

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

@@ -6,9 +6,6 @@ export default {
     sortField: 'name',
     sortOrder: 'DESC',
   },
-  print: {
-    pageTitle: 'Items',
-  },
   fields: {
     type: {
       name: 'item.field.type',
@@ -130,7 +127,6 @@ export default {
       name: 'item.field.type',
       type: 'text',
       exportable: true,
-      accessor: 'typeFormatted',
     },
     name: {
       name: 'item.field.name',
@@ -146,13 +142,11 @@ export default {
       name: 'item.field.sellable',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     purchasable: {
       name: 'item.field.purchasable',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     sellPrice: {
       name: 'item.field.cost_price',
@@ -169,14 +163,12 @@ export default {
       type: 'text',
       accessor: 'costAccount.name',
       exportable: true,
-      printable: false,
     },
     sellAccount: {
       name: 'item.field.sell_description',
       type: 'text',
       accessor: 'sellAccount.name',
       exportable: true,
-      printable: false,
     },
     inventoryAccount: {
       name: 'item.field.inventory_account',
@@ -188,13 +180,11 @@ export default {
       name: 'Sell description',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     purchaseDescription: {
       name: 'Purchase description',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     quantityOnHand: {
       name: 'item.field.quantity_on_hand',
@@ -216,13 +206,11 @@ export default {
       name: 'item.field.active',
       fieldType: 'boolean',
       exportable: true,
-      printable: false,
     },
     createdAt: {
       name: 'item.field.created_at',
       type: 'date',
       exportable: true,
-      printable: false,
     },
   },
   fields2: {

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

@@ -11,11 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'journalNumber',
-
-  print: {
-    pageTitle: 'Manual Journals',
-  },
-
   fields: {
     date: {
       name: 'manual_journal.field.date',
@@ -68,7 +63,6 @@ export default {
     date: {
       name: 'manual_journal.field.date',
       type: 'date',
-      accessor: 'formattedDate',
     },
     journalNumber: {
       name: 'manual_journal.field.journal_number',
@@ -89,12 +83,10 @@ export default {
     currencyCode: {
       name: 'manual_journal.field.currency',
       type: 'text',
-      printable: false,
     },
     exchangeRate: {
       name: 'manual_journal.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     description: {
       name: 'manual_journal.field.description',
@@ -128,17 +120,13 @@ export default {
       publish: {
         name: 'Publish',
         type: 'boolean',
-        printable: false,
       },
       publishedAt: {
         name: 'Published At',
-        printable: false,
       },
     },
     createdAt: {
       name: 'Created At',
-      accessor: 'formattedCreatedAt',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/ManualJournal.ts

@@ -97,7 +97,6 @@ export default class ManualJournal extends mixin(TenantModel, [
     const AccountTransaction = require('models/AccountTransaction');
     const ManualJournalEntry = require('models/ManualJournalEntry');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       entries: {
@@ -141,21 +140,6 @@ export default class ManualJournal extends mixin(TenantModel, [
           query.where('model_ref', 'ManualJournal');
         },
       },
-
-      /**
-       * Manual journal may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'manual_journals.id',
-          to: 'matched_bank_transactions.referenceId',
-        },
-        filter(query) {
-          query.where('reference_type', 'ManualJournal');
-        },
-      },
     };
   }
 

packages/server/src/models/MatchedBankTransaction.ts

@@ -1,32 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class MatchedBankTransaction extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'matched_bank_transactions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return ['createdAt', 'updatedAt'];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    return {};
-  }
-}

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

@@ -67,12 +67,10 @@ export default {
     paymentDate: {
       name: 'payment_receive.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate',
     },
     amount: {
       name: 'payment_receive.field.amount',
       type: 'number',
-      accessor: 'formattedAmount'
     },
     referenceNo: {
       name: 'payment_receive.field.reference_no',
@@ -90,12 +88,10 @@ export default {
     statement: {
       name: 'payment_receive.field.statement',
       type: 'text',
-      printable: false,
     },
     created_at: {
       name: 'payment_receive.field.created_at',
       type: 'date',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/RecognizedBankTransaction.ts

@@ -1,72 +0,0 @@
-import TenantModel from 'models/TenantModel';
-import { Model } from 'objection';
-
-export class RecognizedBankTransaction extends TenantModel {
-  /**
-   * Table name.
-   */
-  static get tableName() {
-    return 'recognized_bank_transactions';
-  }
-
-  /**
-   * Timestamps columns.
-   */
-  get timestamps() {
-    return [];
-  }
-
-  /**
-   * Virtual attributes.
-   */
-  static get virtualAttributes() {
-    return [];
-  }
-
-  /**
-   * Relationship mapping.
-   */
-  static get relationMappings() {
-    const UncategorizedCashflowTransaction = require('./UncategorizedCashflowTransaction');
-    const Account = require('./Account');
-    const { BankRule } = require('./BankRule');
-
-    return {
-      /**
-       * Recognized bank transaction may belongs to uncategorized transactions.
-       */
-      uncategorizedTransactions: {
-        relation: Model.HasManyRelation,
-        modelClass: UncategorizedCashflowTransaction.default,
-        join: {
-          from: 'recognized_bank_transactions.uncategorizedTransactionId',
-          to: 'uncategorized_cashflow_transactions.id',
-        },
-      },
-
-      /**
-       * Recognized bank transaction may belongs to assign account.
-       */
-      assignAccount: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: Account.default,
-        join: {
-          from: 'recognized_bank_transactions.assignedAccountId',
-          to: 'accounts.id',
-        },
-      },
-
-      /**
-       * Recognized bank transaction may belongs to bank rule.
-       */
-      bankRule: {
-        relation: Model.BelongsToOneRelation,
-        modelClass: BankRule,
-        join: {
-          from: 'recognized_bank_transactions.bankRuleId',
-          to: 'bank_rules.id',
-        },
-      },
-    };
-  }
-}

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

@@ -11,11 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'estimateNumber',
-
-  print: {
-    pageTitle: 'Sale Estimates'
-  },
-
   fields: {
     amount: {
       name: 'estimate.field.amount',
@@ -91,13 +86,11 @@ export default {
     estimateDate: {
       name: 'Estimate Date',
       type: 'date',
-      accessor: 'formattedEstimateDate',
       exportable: true,
     },
     expirationDate: {
       name: 'Expiration Date',
       type: 'date',
-      accessor: 'formattedExpirationDate',
       exportable: true,
     },
     estimateNumber: {
@@ -119,31 +112,26 @@ export default {
       name: 'Exchange Rate',
       type: 'number',
       exportable: true,
-      printable: false,
     },
     currencyCode: {
       name: 'Currency',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     note: {
       name: 'Note',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     termsConditions: {
       name: 'Terms & Conditions',
       type: 'text',
       exportable: true,
-      printable: false,
     },
     delivered: {
       name: 'Delivered',
       type: 'boolean',
       exportable: true,
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -165,7 +153,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',

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

@@ -11,10 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'invoiceNo',
-
-  print: {
-    pageTitle: 'Sale invoices',
-  },
   fields: {
     customer: {
       name: 'invoice.field.customer',
@@ -98,12 +94,10 @@ export default {
     invoiceDate: {
       name: 'invoice.field.invoice_date',
       type: 'date',
-      accessor: 'invoiceDateFormatted',
     },
     dueDate: {
       name: 'invoice.field.due_date',
       type: 'date',
-      accessor: 'dueDateFormatted',
     },
     referenceNo: {
       name: 'invoice.field.reference_no',
@@ -126,12 +120,10 @@ export default {
     exchangeRate: {
       name: 'invoice.field.exchange_rate',
       type: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'invoice.field.currency',
       type: 'text',
-      printable: false,
     },
     paidAmount: {
       name: 'Paid Amount',
@@ -144,17 +136,14 @@ export default {
     invoiceMessage: {
       name: 'invoice.field.invoice_message',
       type: 'text',
-      printable: false,
     },
     termsConditions: {
       name: 'invoice.field.terms_conditions',
       type: 'text',
-      printable: false,
     },
     delivered: {
       name: 'invoice.field.delivered',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -176,7 +165,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',
@@ -214,22 +202,18 @@ export default {
     exchangeRate: {
       name: 'invoice.field.exchange_rate',
       fieldType: 'number',
-      printable: false,
     },
     currencyCode: {
       name: 'invoice.field.currency',
       fieldType: 'text',
-      printable: false,
     },
     invoiceMessage: {
       name: 'invoice.field.invoice_message',
       fieldType: 'text',
-      printable: false,
     },
     termsConditions: {
       name: 'invoice.field.terms_conditions',
       fieldType: 'text',
-      printable: false,
     },
     entries: {
       name: 'invoice.field.entries',
@@ -265,7 +249,6 @@ export default {
     delivered: {
       name: 'invoice.field.delivered',
       fieldType: 'boolean',
-      printable: false,
     },
   },
 };

packages/server/src/models/SaleInvoice.ts

@@ -411,7 +411,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const Account = require('models/Account');
     const TaxRateTransaction = require('models/TaxRateTransaction');
     const Document = require('models/Document');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -544,21 +543,6 @@ export default class SaleInvoice extends mixin(TenantModel, [
           query.where('model_ref', 'SaleInvoice');
         },
       },
-
-      /**
-       * Sale invocie may belongs to matched bank transaction.
-       */
-      matchedBankTransaction: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'sales_invoices.id',
-          to: "matched_bank_transactions.referenceId",
-        },
-        filter(query) {
-          query.where('reference_type', 'SaleInvoice');
-        },
-      },
     };
   }
 

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

@@ -11,10 +11,6 @@ export default {
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'receiptNumber',
-
-  print: {
-    pageTitle: 'Sale Receipts',
-  },
   fields: {
     amount: {
       name: 'receipt.field.amount',
@@ -85,6 +81,11 @@ export default {
     },
   },
   columns: {
+    amount: {
+      name: 'receipt.field.amount',
+      column: 'amount',
+      type: 'number',
+    },
     depositAccount: {
       name: 'receipt.field.deposit_account',
       type: 'text',
@@ -97,7 +98,6 @@ export default {
     },
     receiptDate: {
       name: 'receipt.field.receipt_date',
-      accessor: 'formattedReceiptDate',
       type: 'date',
     },
     receiptNumber: {
@@ -114,17 +114,10 @@ export default {
       name: 'receipt.field.receipt_message',
       column: 'receipt_message',
       type: 'text',
-      printable: false,
-    },
-    amount: {
-      name: 'receipt.field.amount',
-      accessor: 'formattedAmount',
-      type: 'number',
     },
     statement: {
       name: 'receipt.field.statement',
       type: 'text',
-      printable: false,
     },
     status: {
       name: 'receipt.field.status',
@@ -134,7 +127,6 @@ export default {
         { key: 'closed', label: 'receipt.field.status.closed' },
       ],
       exportable: true,
-      printable: false,
     },
     entries: {
       name: 'Entries',
@@ -156,7 +148,6 @@ export default {
         },
         description: {
           name: 'Item Description',
-          printable: false,
         },
         amount: {
           name: 'Item Amount',
@@ -167,7 +158,6 @@ export default {
     createdAt: {
       name: 'receipt.field.created_at',
       type: 'date',
-      printable: false,
     },
   },
   fields2: {

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -11,15 +11,9 @@ export default class UncategorizedCashflowTransaction extends mixin(
   [ModelSettings]
 ) {
   id!: number;
-  date!: Date | string;
   amount!: number;
   categorized!: boolean;
   accountId!: number;
-  referenceNo!: string;
-  payee!: string;
-  description!: string;
-  plaidTransactionId!: string;
-  recognizedTransactionId!: number;
 
   /**
    * Table name.
@@ -44,7 +38,6 @@ export default class UncategorizedCashflowTransaction extends mixin(
       'deposit',
       'isDepositTransaction',
       'isWithdrawalTransaction',
-      'isRecognized',
     ];
   }
 
@@ -82,69 +75,11 @@ export default class UncategorizedCashflowTransaction extends mixin(
     return 0 < this.withdrawal;
   }
 
-  /**
-   * Detarmines whether the transaction is recognized.
-   */
-  public get isRecognized(): boolean {
-    return !!this.recognizedTransactionId;
-  }
-
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      /**
-       * Filters the not excluded transactions.
-       */
-      notExcluded(query) {
-        query.whereNull('excluded_at');
-      },
-
-      /**
-       * Filters the excluded transactions.
-       */
-      excluded(query) {
-        query.whereNotNull('excluded_at');
-      },
-
-      /**
-       * Filter out the recognized transactions.
-       * @param query
-       */
-      recognized(query) {
-        query.whereNotNull('recognizedTransactionId');
-      },
-
-      /**
-       * Filter out the not recognized transactions.
-       * @param query
-       */
-      notRecognized(query) {
-        query.whereNull('recognizedTransactionId');
-      },
-
-      categorized(query) {
-        query.whereNotNull('categorizeRefType');
-        query.whereNotNull('categorizeRefId');
-      },
-
-      notCategorized(query) {
-        query.whereNull('categorizeRefType');
-        query.whereNull('categorizeRefId');
-      },
-    };
-  }
-
   /**
    * Relationship mapping.
    */
   static get relationMappings() {
     const Account = require('models/Account');
-    const {
-      RecognizedBankTransaction,
-    } = require('models/RecognizedBankTransaction');
-    const { MatchedBankTransaction } = require('models/MatchedBankTransaction');
 
     return {
       /**
@@ -158,30 +93,58 @@ export default class UncategorizedCashflowTransaction extends mixin(
           to: 'accounts.id',
         },
       },
-
-      /**
-       * Transaction may has association to recognized transaction.
-       */
-      recognizedTransaction: {
-        relation: Model.HasOneRelation,
-        modelClass: RecognizedBankTransaction,
-        join: {
-          from: 'uncategorized_cashflow_transactions.recognizedTransactionId',
-          to: 'recognized_bank_transactions.id',
-        },
-      },
-
-      /**
-       * Uncategorized transaction may has association to matched transaction.
-       */
-      matchedBankTransactions: {
-        relation: Model.HasManyRelation,
-        modelClass: MatchedBankTransaction,
-        join: {
-          from: 'uncategorized_cashflow_transactions.id',
-          to: 'matched_bank_transactions.uncategorizedTransactionId',
-        },
-      },
     };
   }
+
+  /**
+   * Updates the count of uncategorized transactions for the associated account
+   * based on the specified operation.
+   * @param {QueryContext} queryContext - The query context for the transaction.
+   * @param {boolean} increment - Indicates whether to increment or decrement the count.
+   */
+  private async updateUncategorizedTransactionCount(
+    queryContext: QueryContext,
+    increment: boolean
+  ) {
+    const operation = increment ? 'increment' : 'decrement';
+    const amount = increment ? 1 : -1;
+
+    await Account.query(queryContext.transaction)
+      .findById(this.accountId)
+      [operation]('uncategorized_transactions', amount);
+  }
+
+  /**
+   * Runs after insert.
+   * @param {QueryContext} queryContext
+   */
+  public async $afterInsert(queryContext) {
+    await super.$afterInsert(queryContext);
+    await this.updateUncategorizedTransactionCount(queryContext, true);
+  }
+
+  /**
+   * Runs after update.
+   * @param {ModelOptions} opt
+   * @param {QueryContext} queryContext
+   */
+  public async $afterUpdate(
+    opt: ModelOptions,
+    queryContext: QueryContext
+  ): Promise<any> {
+    await super.$afterUpdate(opt, queryContext);
+
+    if (this.id && this.categorized) {
+      await this.updateUncategorizedTransactionCount(queryContext, false);
+    }
+  }
+
+  /**
+   * Runs after delete.
+   * @param {QueryContext} queryContext
+   */
+  public async $afterDelete(queryContext: QueryContext) {
+    await super.$afterDelete(queryContext);
+    await this.updateUncategorizedTransactionCount(queryContext, false);
+  }
 }

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

@@ -131,26 +131,21 @@ export default {
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false
     },
     status: {
       name: 'vendor.field.status',
-      printable: false
     },
     note: {
       name: 'vendor.field.note',
       type: 'text',
-      printable: false
     },
     // Billing Address
     billingAddress1: {
@@ -158,49 +153,42 @@ export default {
       column: 'billing_address1',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
       exportable: true,
-      printable: false
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
       exportable: true,
-      printable: false
     },
     // Shipping Address
     shippingAddress1: {
@@ -208,55 +196,47 @@ export default {
       column: 'shipping_address1',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
       exportable: true,
-      printable: false
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
       exportable: true,
-      printable: false
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
       exportable: true,
-      printable: false
     },
   },
   fields2: {

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

@@ -20,9 +20,6 @@ export default {
   importAggregateOn: 'entries',
   importAggregateBy: 'vendorCreditNumber',
 
-  print: {
-    pageTitle: 'Vendor Credits',
-  },
   fields: {
     vendor: {
       name: 'vendor_credit.field.vendor',
@@ -92,7 +89,6 @@ export default {
     exchangeRate: {
       name: 'Echange Rate',
       type: 'text',
-      printable: false,
     },
     vendorCreditNumber: {
       name: 'Vendor Credit No.',
@@ -104,7 +100,7 @@ export default {
     },
     vendorCreditDate: {
       name: 'Vendor Credit Date',
-      accessor: 'formattedVendorCreditDate',
+      type: 'date',
     },
     amount: {
       name: 'Amount',
@@ -113,12 +109,10 @@ export default {
     creditRemaining: {
       name: 'Credits Remaining',
       accessor: 'formattedCreditsRemaining',
-      printable: false,
     },
     refundedAmount: {
       name: 'Refunded Amount',
       accessor: 'refundedAmount',
-      printable: false,
     },
     invoicedAmount: {
       name: 'Invoiced Amount',
@@ -127,12 +121,10 @@ export default {
     note: {
       name: 'Note',
       type: 'text',
-      printable: false,
     },
     open: {
       name: 'Open',
       type: 'boolean',
-      printable: false,
     },
     entries: {
       name: 'Entries',

packages/server/src/repositories/AccountRepository.ts

@@ -2,12 +2,7 @@ import { Account } from 'models';
 import TenantRepository from '@/repositories/TenantRepository';
 import { IAccount } from '@/interfaces';
 import { Knex } from 'knex';
-import {
+import { TaxPayableAccount } from '@/database/seeds/data/accounts';
-  PrepardExpenses,
-  TaxPayableAccount,
-  UnearnedRevenueAccount,
-} from '@/database/seeds/data/accounts';
-import { TenantMetadata } from '@/system/models';
 
 export default class AccountRepository extends TenantRepository {
   /**
@@ -184,67 +179,4 @@ export default class AccountRepository extends TenantRepository {
     }
     return result;
   };
-
-  /**
-   * Finds or creates the unearned revenue.
-   * @param {Record<string, string>} extraAttrs 
-   * @param {Knex.Transaction} trx 
-   * @returns 
-   */
-  public async findOrCreateUnearnedRevenue(
-    extraAttrs: Record<string, string> = {},
-    trx?: Knex.Transaction
-  ) {
-    // Retrieves the given tenant metadata.
-    const tenantMeta = await TenantMetadata.query().findOne({
-      tenantId: this.tenantId,
-    });
-    const _extraAttrs = {
-      currencyCode: tenantMeta.baseCurrency,
-      ...extraAttrs,
-    };
-    let result = await this.model
-      .query(trx)
-      .findOne({ slug: UnearnedRevenueAccount.slug, ..._extraAttrs });
-
-    if (!result) {
-      result = await this.model.query(trx).insertAndFetch({
-        ...UnearnedRevenueAccount,
-        ..._extraAttrs,
-      });
-    }
-    return result;
-  }
-
-  /**
-   * Finds or creates the prepard expenses account.
-   * @param {Record<string, string>} extraAttrs 
-   * @param {Knex.Transaction} trx 
-   * @returns 
-   */
-  public async findOrCreatePrepardExpenses(
-    extraAttrs: Record<string, string> = {},
-    trx?: Knex.Transaction
-  ) {
-    // Retrieves the given tenant metadata.
-    const tenantMeta = await TenantMetadata.query().findOne({
-      tenantId: this.tenantId,
-    });
-    const _extraAttrs = {
-      currencyCode: tenantMeta.baseCurrency,
-      ...extraAttrs,
-    };
-
-    let result = await this.model
-      .query(trx)
-      .findOne({ slug: PrepardExpenses.slug, ..._extraAttrs });
-
-    if (!result) {
-      result = await this.model.query(trx).insertAndFetch({
-        ...PrepardExpenses,
-        ..._extraAttrs,
-      });
-    }
-    return result;
-  }
 }

packages/server/src/repositories/TenantRepository.ts

@@ -4,17 +4,12 @@ import CachableRepository from './CachableRepository';
 
 export default class TenantRepository extends CachableRepository {
   repositoryName: string;
-  tenantId: number;
+   
-
   /**
    * Constructor method.
-   * @param {number} tenantId
+   * @param {number} tenantId 
    */
   constructor(knex, cache, i18n) {
     super(knex, cache, i18n);
   }
-
+}
-  setTenantId(tenantId: number) {
-    this.tenantId = tenantId;
-  }
-}

packages/server/src/services/Accounting/Ledger.ts

@@ -51,7 +51,7 @@ export default class Ledger implements ILedger {
 
   /**
    * Filters entries by the given accounts ids then returns a new ledger.
-   * @param {number[]} accountIds
+   * @param {number[]} accountIds 
    * @returns {ILedger}
    */
   public whereAccountsIds(accountIds: number[]): ILedger {
@@ -274,14 +274,4 @@ export default class Ledger implements ILedger {
     const entries = Ledger.mappingTransactions(transactions);
     return new Ledger(entries);
   }
-
-  /**
-   * Retrieve the transaction amount.
-   * @param {number} credit - Credit amount.
-   * @param {number} debit - Debit amount.
-   * @param {string} normal - Credit or debit.
-   */
-  static getAmount(credit: number, debit: number, normal: string) {
-    return normal === 'credit' ? credit - debit : debit - credit;
-  }
 }

packages/server/src/services/Accounting/utils.ts

@@ -19,8 +19,6 @@ export const transformLedgerEntryToTransaction = (
     referenceId: entry.transactionId,
 
     transactionNumber: entry.transactionNumber,
-    transactionType: entry.transactionSubType,
-
     referenceNumber: entry.referenceNumber,
 
     note: entry.note,

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

@@ -7,7 +7,6 @@ import {
   IAccountEventCreatedPayload,
   IAccountEventCreatingPayload,
   IAccountCreateDTO,
-  CreateAccountParams,
 } from '@/interfaces';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -31,22 +30,19 @@ export class CreateAccount {
 
   /**
    * Authorize the account creation.
-   * @param {number} tenantId
+   * @param  {number} tenantId
-   * @param {IAccountCreateDTO} accountDTO
+   * @param  {IAccountCreateDTO} accountDTO
    */
   private authorize = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    baseCurrency: string,
+    baseCurrency: string
-    params?: CreateAccountParams
   ) => {
     // Validate account name uniquiness.
-    if (!params.ignoreUniqueName) {
+    await this.validator.validateAccountNameUniquiness(
-      await this.validator.validateAccountNameUniquiness(
+      tenantId,
-        tenantId,
+      accountDTO.name
-        accountDTO.name
+    );
-      );
-    }
     // Validate the account code uniquiness.
     if (accountDTO.code) {
       await this.validator.isAccountCodeUniqueOrThrowError(
@@ -86,7 +82,7 @@ export class CreateAccount {
 
   /**
    * Transformes the create account DTO to input model.
-   * @param {IAccountCreateDTO} createAccountDTO
+   * @param   {IAccountCreateDTO} createAccountDTO
    */
   private transformDTOToModel = (
     createAccountDTO: IAccountCreateDTO,
@@ -108,8 +104,7 @@ export class CreateAccount {
   public createAccount = async (
     tenantId: number,
     accountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction,
+    trx?: Knex.Transaction
-    params: CreateAccountParams = { ignoreUniqueName: false }
   ): Promise<IAccount> => {
     const { Account } = this.tenancy.models(tenantId);
 
@@ -117,12 +112,8 @@ export class CreateAccount {
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
     // Authorize the account creation.
-    await this.authorize(
+    await this.authorize(tenantId, accountDTO, tenantMeta.baseCurrency);
-      tenantId,
+
-      accountDTO,
-      tenantMeta.baseCurrency,
-      params
-    );
     // Transformes the DTO to model.
     const accountInputModel = this.transformDTOToModel(
       accountDTO,
@@ -157,4 +148,3 @@ export class CreateAccount {
     );
   };
 }
-