Publish

- @bigcapital/server@0.10.1
 - @bigcapital/webapp@0.10.2

.all-contributorsrc

@@ -60,105 +60,6 @@
       "contributions": [
         "bug"
       ]
-    },
-    {
-      "login": "kochie",
-      "name": "Robert Koch",
-      "avatar_url": "https://avatars.githubusercontent.com/u/10809884?v=4",
-      "profile": "https://me.kochie.io",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "cschuijt",
-      "name": "Casper Schuijt",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5460015?v=4",
-      "profile": "http://cschuijt.nl",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "ANasouf",
-      "name": "ANasouf",
-      "avatar_url": "https://avatars.githubusercontent.com/u/19536487?v=4",
-      "profile": "https://github.com/ANasouf",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "xprnio",
-      "name": "Ragnar Laud",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3042904?v=4",
-      "profile": "https://ragnarlaud.dev",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "asenawritescode",
-      "name": "Asena",
-      "avatar_url": "https://avatars.githubusercontent.com/u/67445192?v=4",
-      "profile": "https://github.com/asenawritescode",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "benpsnyder",
-      "name": "Ben Snyder",
-      "avatar_url": "https://avatars.githubusercontent.com/u/707567?v=4",
-      "profile": "https://snyder.tech",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "cloudsbird",
-      "name": "Vederis Leunardus",
-      "avatar_url": "https://avatars.githubusercontent.com/u/13505006?v=4",
-      "profile": "http://vederis.id",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ccantrell72",
-      "name": "Chris Cantrell",
-      "avatar_url": "https://avatars.githubusercontent.com/u/104120598?v=4",
-      "profile": "http://www.pivoten.com",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "oleynikd",
-      "name": "Denis",
-      "avatar_url": "https://avatars.githubusercontent.com/u/3976868?v=4",
-      "profile": "https://github.com/oleynikd",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "mittalsam98",
-      "name": "Sachin Mittal",
-      "avatar_url": "https://avatars.githubusercontent.com/u/42431274?v=4",
-      "profile": "https://myself.vercel.app/",
-      "contributions": [
-        "bug"
-      ]
-    },
-    {
-      "login": "Champetaman",
-      "name": "Camilo Oviedo",
-      "avatar_url": "https://avatars.githubusercontent.com/u/64604272?v=4",
-      "profile": "https://www.camilooviedo.com/",
-      "contributions": [
-        "code"
-      ]
     }
   ],
   "contributorsPerLine": 7,

.env.example

@@ -8,7 +8,7 @@ MAIL_FROM_NAME=
 MAIL_FROM_ADDRESS=
 
 # Database
-DB_HOST=localhost
+DB_HOST=mysql
 DB_USER=bigcapital
 DB_PASSWORD=bigcapital
 DB_ROOT_PASSWORD=root
@@ -48,44 +48,5 @@ SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=
 
-# Sign-up Email Confirmation
-SIGNUP_EMAIL_CONFIRMATION=false
-
 # API rate limit (points,duration,block duration).
-API_RATE_LIMIT=120,60,600
+API_RATE_LIMIT=120,60,600
-
-# Gotenberg API for PDF printing - (production).
-GOTENBERG_URL=http://gotenberg:3000
-GOTENBERG_DOCS_URL=http://server:3000/public/
-
-# Gotenberg API - (development)
-# GOTENBERG_URL=http://localhost:9000
-# GOTENBERG_DOCS_URL=http://host.docker.internal:3000/public/
-
-# Exchange Rate Service
-EXCHANGE_RATE_SERVICE=open-exchange-rate
-
-# Open Exchange Rate
-OPEN_EXCHANGE_RATE_APP_ID=
-
-# The Plaid environment to use ('sandbox' or 'development').
-# https://plaid.com/docs/#api-host
-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_LINK_WEBHOOK=
-
-# 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-container.yml

@@ -6,66 +6,43 @@ on:
   workflow_dispatch:
 
 env:
-  WEBAPP_IMAGE_NAME: bigcapitalhq/webapp
+  REGISTRY: ghcr.io
-  SERVER_IMAGE_NAME: bigcapitalhq/server
+  WEBAPP_IMAGE_NAME: bigcapital/bigcapital-webapp
+  SERVER_IMAGE_NAME: bigcapital/bigcapital-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
+        uses: actions/checkout@v2
-
-      - 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
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+            registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+            username: ${{ github.actor }}
+            password: ${{ secrets.GH_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
         with:
-            images: ${{ env.WEBAPP_IMAGE_NAME }}
+            images: ${{ env.REGISTRY }}/${{ env.WEBAPP_IMAGE_NAME }}
 
       # Builds and push the Docker image.
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
-        id: build
         with:
-          context: ./
+            context: .
-          file: ./packages/webapp/Dockerfile
+            file: ./packages/webapp/Dockerfile
-          platforms: linux/amd64,linux/arm64
+            push: true
-          push: true
+            tags: ghcr.io/bigcapitalhq/webapp:latest
-          labels: ${{ steps.meta.outputs.labels }}
+            labels: ${{ steps.meta.outputs.labels }}
-          tags: bigcapitalhq/webapp:latest, bigcapitalhq/webapp:${{github.ref_name}}
 
-      - 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
@@ -76,52 +53,29 @@ jobs:
     name: Build and deploy server container
     runs-on: ubuntu-latest
     steps:
-      - name: Prepare
+      - name: Checkout code
-        run: |
+        uses: actions/checkout@v2
-          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
+        uses: docker/login-action@v1
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
+          registry: ${{ env.REGISTRY }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
 
       # Builds and push the Docker image.
       - name: Build and push Docker image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v2
-        id: build
         with:
           context: ./
           file: ./packages/server/Dockerfile
-          platforms: linux/amd64,linux/arm64
           push: true
-          tags: bigcapitalhq/server:latest, bigcapitalhq/server:${{github.ref_name}}
+          tags: ghcr.io/bigcapitalhq/server:latest
           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 }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}

.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 }}

.github/workflows/e2e.yml

@@ -8,14 +8,14 @@ on:
       - '**.ts'
       - '**.tsx'
       - '**/tsconfig.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
       - '.github/workflows/e2e.yml'
   pull_request:
     paths:
       - '**.ts'
       - '**.tsx'
       - '**/tsconfig.json'
-      - 'pnpm-lock.yaml'
+      - 'yarn.lock'
       - '.github/workflows/e2e.yml'
 
 defaults:

.gitpod.yml

@@ -1,22 +0,0 @@
-tasks:
-  - name: Init
-    init: |
-      pnpm install &&
-      cp .env.example .env &&
-      docker-compose up -d &&
-      pnpm run build:server &&
-      node packages/server/build/commands.js system:migrate:latest
-    command: | 
-      docker-compose up -d &&
-      pnpm run dev
-
-ports:
-  - port: 4000
-    visibility: public
-    onOpen: open-preview
-  - port: 3000
-    visibility: public
-    onOpen: ignore
-  - port: 3306
-    visibility: public
-    onOpen: ignore

.husky/commit-msg

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-pnpx commitlint --edit 
+yarn commitlint --edit 

CHANGELOG.md

@@ -2,219 +2,11 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.19.4] - 18-08-2024
+# [0.10.1] - 25-09-2023
-
-* fix: Allow multi-lines to statements transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/594
-* feat: Add amount comparators to amount bank rule field by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/595
-* fix: Transaction type and description do not show in general ledger. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/596
-* fix: Refresh accounts and account transactions. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/597
-* fix: Typo payments made by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/598
-* fix: Typo categories list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/600
-* fix: Autofill the quick created customer/vendor by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/601
-* fix: Remove views tabs from receipts list by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/602
-* fix: Typo payment receive messages by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/599
-* fix: Enhance Dropzone visual of  accept and reject modes by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/603
-* fix:  Matching bank transactions should create associate payment transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/606
-* fix: Change Dropzone title and subtitle by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/607
-* fix: Inconsistance page size of paginated data tables by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/604
-* fix: Database connection lost error by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/611
-* fix: Language typos by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/613
-* Fix: Correctly display Date, Published At, and Created At in ExpenseDrawerHeader by @Champetaman in https://github.com/bigcapitalhq/bigcapital/pull/612
-* fix: Delete bank account with uncategorized transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/614
-* feat: activate/inactivate account from drawer details by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/615
-
-## [v0.18.0] - 10-08-2024
-
-* feat: Bank rules for automated categorization by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/511
-* 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
-
-* feat: Export resource data to csv, xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/430
-* feat: User email verification after signing-up. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/426
-
-### Fixes
-* feat(repo): upgrade to latest lerna v8 and pnpm v9 by @benpsnyder in https://github.com/bigcapitalhq/bigcapital/pull/414
-* feat: Update Docker Build-Push Action and Add ARM64 Support by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/412
-* feat: Pushing docker containers by version tag by @cloudsbird in https://github.com/bigcapitalhq/bigcapital/pull/421
-
-## [0.16.10]
-
-* fix: Running migration Docker container on Windows by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/432
-
-## [0.16.9]
-
-* feat: New Relic for tracking by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/429
-
-## [0.16.8]
-
-* feat: Ability to enable/disable the bank connect feature by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/423
-
-## [0.16.6]
-
-* hotfix: fix the subscription plan when subscribe on cloud by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/422
-
-## [0.16.5]
-
-IMPORTANT: If you upgraded to the v0.16 recently you should upgrade to v0.16.4 as soon as possible, because there're some breaking changes affected the sign-in and some users reported couldn't sign-in.
-
-* feat: Seed free subscription to tenants that have no subscription. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/410
-
-## [0.16.3]
-
-* feat: Integrate Lemon Squeezy payment by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/402
-* feat: optimize the onboarding subscription experience. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/404
-* feat: subscription page content by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/405
-* feat: auto subscribe to free plan once signup on community version. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/406
-* chore: add default value to env variable by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/407
-* fix: absolute storage imports path. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/408
-
-## [0.16.0]
-
-* feat: add convert to invoice button on estimate drawer toolbar by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/361
-* feat(webapp): add mark as delivered to action bar of invoice details … by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/360
-* feat(webapp): Dialog to choose the bank service provider by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/378
-* feat: Categorize the bank synced transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/377
-* feat: uncategorize the cashflow transaction by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/381
-* Import resources from csv/xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/382
-* feat(webapp): import resource UI by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/386
-* fix: import resources improvements by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/388
-* feat: add sample sheet to accounts and bank transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/389
-* fix: show the unique row value in the import preview by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/392
-* feat: advanced parser for numeric and boolean import values by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/394
-* feat: validate the given imported sheet whether is empty by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/395
-* feat: linking relation with id in importing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/393
-* feat: Aggregate rows import by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/396
-* feat: clean up the imported temp files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/400
-* feat: add hints to import fields by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/401
-
-## [0.15.0]
-
-* feat: Printing financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/363
-* feat: Convert invoice status after sending mail notification by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/332
-* feat: Bigcapital <> Plaid Integration by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/346
-* fix: Broken transactions by vendor report by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/369
-* fix: Optimize the print style some financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/370
-
-## [0.14.0] - 30-01-2024
-
-* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
-* fix: expense amounts should not be rounded by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/339
-* feat: get latest exchange rate from third party services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/340
-* fix(webapp): inconsistency in currency of universal search items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/335
-* hotfix: editing sales and expense transactions don't reflect GL entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/342
-
-## [0.13.3] - 22-01-2024
-
-* hotfix(server): Unhandled thrown errors of services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/329
-
-## [0.13.2] - 21-01-2024
-
-* feat: show customer / vendor balance. by @asenawritescode in https://github.com/bigcapitalhq/bigcapital/pull/311
-* feat: inventory valuation csv and xlsx export by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/308
-* feat: sales by items export csv & xlsx by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/310
-* fix(server): the invoice and payment receipt printing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/315
-* fix: get cashflow transaction broken cause transaction type by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/318
-* fix: `AccountActivateAlert` import by @xprnio in https://github.com/bigcapitalhq/bigcapital/pull/322
-
-## [0.13.1] - 15-01-2024
-
-* feat(webapp): add approve/reject to action bar of estimate details dr… by @ANasouf in https://github.com/bigcapitalhq/bigcapital/pull/304
-* docs: add ANasouf as a contributor for code by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/305
-* feat: Export general ledger & Journal to CSV and XLSX by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/303
-* feat: Auto re-calculate the items rate once changing the invoice exchange rate. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/270
-
-## [0.13.0] - 31-12-2023
-
-* feat: Send an invoice mail the customer email by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/292
-* fix: Allow non-numeric postal codes by @cschuijt in https://github.com/bigcapitalhq/bigcapital/pull/294
-* docs: add cschuijt as a contributor for bug by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/295
-
-## [0.12.1] - 17-11-2023
-
-* feat: Add default customer message and terms conditions to the transactions by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/291
-* fix: The currency code of transaction tax rate entry by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/293
-
-## [0.12.0] - 04-11-2023
-
-* feat: Export reports via CSV and XLSX by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/286
-* fix: Axios upgrade by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/288
-* fix(server): Allow decimal amount in sale/purchase transactions. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/289
-* feat: Optimize invoice documents printing by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/280
-* chore(deps): bump axios from 0.20.0 to 1.6.0 in /packages/server by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/284
-* chore(deps): bump axios from 0.20.0 to 1.6.0 by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/283
-
-## [0.11.0] - 28-10-2023
-
-* feat: Migrate to pnpm by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/253
-* feat: Integrate tax rates to bills by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/260
-* feat: Assign default sell/purchase tax rates to items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/261
-* chore(deps-dev): bump @babel/traverse from 7.23.0 to 7.23.2 in /packages/server by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/272
-* feat: Improve financial statements rows color by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/276
-* fix: Trial balance sheet adjusted balance by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/273
-* feat: Adds tax numbers to organization and customers by @kochie in https://github.com/bigcapitalhq/bigcapital/pull/269
-* docs: Add kochie as a contributor for code by @allcontributors in https://github.com/bigcapitalhq/bigcapital/pull/277
-* feat: Computed Net Income under Equity in Balance Sheet report. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/271
-* fix: Change Dockerfile files with new pnpm by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/278
-
-## [0.10.2] - 02-10-2023
-
-fix(webapp): Disable tax rates from item entries editor table services do not support tax rates (https://github.com/bigcapitalhq/bigcapital/commit/69afa07e3ba45495a4cab3490c15f2b0c40c4790) by @abouolia 
-fix(server): Add missing method in ItemEntry model (https://github.com/bigcapitalhq/bigcapital/commit/07628ddc37f46c98959ced0323f28752e0a98944) by @abouolia
-
-## [0.10.1] - 25-09-2023
 
 * Fix: Running tenants migration on Docker migration container by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/242
 
-## [0.10.0] - 24-09-2023
+# [0.10.0] - 24-09-2023
 
 * Added: Tax rates service by @abouolia @elforjani13  in https://github.com/bigcapitalhq/bigcapital/pull/204
 * Added: Sales Tax Liability Summary report by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/204
@@ -224,7 +16,7 @@ fix(server): Add missing method in ItemEntry model (https://github.com/bigcapita
 * chore(deps): bump word-wrap from 1.2.3 to 1.2.4 in /packages/webapp by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/199
 * chore(deps): bump mongoose from 5.13.15 to 5.13.20 by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/197
 
-## [0.9.12] - 29-08-2023
+# [0.9.12] - 29-08-2023
 
 * Refactor: split the services to multiple service classes. (by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/202)
 * Fix: create quick customer/vendor by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/206
@@ -238,18 +30,18 @@ fix(server): Add missing method in ItemEntry model (https://github.com/bigcapita
 * Fix: filter by customers, vendors and items in reports do not work by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/224
 https://github.com/bigcapitalhq/bigcapital/pull/225
 
-## [0.9.11] - 23-07-2023
+# [0.9.11] - 23-07-2023
 
 * added: Restart policy to docker compose files. by @suhaibaffan in https://github.com/bigcapitalhq/bigcapital/pull/198
 * fix: Expose and expand the rate limit to the env variables by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/195
 
-## [0.9.10] - 18-07-2023
+# [0.9.10] - 18-07-2023
 
 * feat(e2e): E2E onboarding process by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/176
 * fix(webapp): Show loading message of cost computing job on financial reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/196
 * fix(webapp): Change the currency code of sales and purchases transactions with foreign contacts. 
 
-## [0.9.9] - 28-06-2023
+# [0.9.9] - 28-06-2023
 
 * refactor: Customer and vendor select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/171
 * chore: Move auto-increment components in separate files by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/170
@@ -261,7 +53,7 @@ https://github.com/bigcapitalhq/bigcapital/pull/225
 * fix: No currency in amount field on money in/out dialogs by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/179
 * fix: No default branch for customer/vendor opening balance branch by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/182
 
-## [0.9.8] - 19-06-2023
+# [0.9.8] - 19-06-2023
 
 `bigcapitalhq/webapp`
 

CONTRIBUTING.md

@@ -33,8 +33,7 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 ---
 
 ## Local Setup Prerequisites
-  - The application currently supports **Node.js v18.x**.
+ - The application currently supports **Node.js v14.x**. Please ensure that you are using this version of Node.js when developing. (use [nvm](https://github.com/nvm-sh/nvm#installing-and-updating) to switch between node versions)
-  - `pnpm` packages manager, (from pnpm [guide](https://pnpm.io/installation) pick any installation method).
 
 ## Contribute to Backend
 
@@ -45,10 +44,11 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 cp .env.example .env
 ```
 
-- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit the command on root directory and it will install dependencies of all packages.
+- Install all npm dependencies of the monorepo, you don't have to change directory to the `backend` package. just hit these command on root directory and it will install dependencies of all packages.
 
 ```
-pnpm install
+npm install
+npm run bootstrap
 ```
 
 - Run all required docker containers in the development, we already configured all containers under `docker-compose.yml`.
@@ -69,7 +69,7 @@ cefa73fe2881   bigcapital-redis   "docker-entrypoint.s…"   7 seconds ago   Up
 - There're some CLI commands we should run before running the server like databaase migration, so we need to build the `server` app first.
 
 ```
-pnpm run build:server
+npm run build:server
 ```
 
 - Run the database migration for system database.
@@ -87,7 +87,7 @@ Batch 1 run: 6 migrations
 - Next, start the webapp application.
 
 ```
-pnpm run dev:server
+npm run dev:server
 ```
 
 **[`^top^`](#)**
@@ -105,13 +105,14 @@ git clone https://github.com/bigcapital/bigcapital.git && cd bigcaptial
 - Install all npm dependencies of the monorepo, you don't have to change directory to the `frontend` package. just hit that command and will install all packages across all application.
 
 ```
-pnpm install
+npm install
+npm run bootstrap
 ```
 
 - Next, start the webapp application.
 
 ```
-pnpm run dev:webapp
+npm run dev:webapp
 ```
 
 **[`^top^`](#)**

README.md

@@ -1,6 +1,6 @@
 <p align="center">
   <p align="center">
-    <a href="https://bigcapital.app" target="_blank">
+    <a href="https://bigcapital.ly" target="_blank">
       <img src="https://raw.githubusercontent.com/abouolia/blog/main/public/bigcapital.svg" alt="Bigcapital" width="280" height="75">
     </a>
   </p>
@@ -25,10 +25,6 @@
       <img src="https://img.shields.io/twitter/follow/bigcapitalhq?style=social" alt="twitter" />
     </a>
   </p>
-
-  <p align="center">
-    <a href="https://my.bigcapital.app">Bigcapital Cloud</a>
-  </p>
 </p>
 
 # What's Bigcapital?
@@ -41,40 +37,9 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
   <img src="https://raw.githubusercontent.com/abouolia/blog/main/public/screenshot-3.png" width="270">
 </p>
 
-# Getting Started
-
-We've got serveral options on dev and prod depending on your need to get started quickly with Bigcapital.
-
-## Self-hosted 
-
-Bigcapital is available open-source under AGPL license. You can host it on your own servers using Docker.
-
-### Docker
-
-To get started with self-hosted with Docker and Docker Compose, take a look at the [Docker guide](https://docs.bigcapital.app/deployment/docker).
-
-## Development
-
-### Local Setup
-
-To get started locally, we have a [guide to help you](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md).
-
-### Gitpod
-
-- Click the Gitpod button below to open this project in development mode.
-- This will open and configure the workspace in your browser with all the necessary dependencies.
-
-[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/new/#https://github.com/bigcapitalhq/bigcapital)
-
-## Headless Accounting
-
-You can integrate Bigcapital API with your system to organize your transactions in double-entry system to get the best financial reports.
-
-[![Run in Postman](https://run.pstmn.io/button.svg)](https://www.postman.com/bigcapital/workspace/bigcapital-api)
-
 # Resources
 
-- [Documentation](https://docs.bigcapital.app/) - Learn how to use.
+- [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
 - [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
 - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
 - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
@@ -115,21 +80,6 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://scheibling.se"><img src="https://avatars.githubusercontent.com/u/24367830?v=4?s=100" width="100px;" alt="Lars Scheibling"/><br /><sub><b>Lars Scheibling</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Ascheibling" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/suhaibaffan"><img src="https://avatars.githubusercontent.com/u/18115937?v=4?s=100" width="100px;" alt="Suhaib Affan"/><br /><sub><b>Suhaib Affan</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=suhaibaffan" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/KalliopiPliogka"><img src="https://avatars.githubusercontent.com/u/81677549?v=4?s=100" width="100px;" alt="Kalliopi Pliogka"/><br /><sub><b>Kalliopi Pliogka</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3AKalliopiPliogka" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://me.kochie.io"><img src="https://avatars.githubusercontent.com/u/10809884?v=4?s=100" width="100px;" alt="Robert Koch"/><br /><sub><b>Robert Koch</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=kochie" title="Code">💻</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="http://cschuijt.nl"><img src="https://avatars.githubusercontent.com/u/5460015?v=4?s=100" width="100px;" alt="Casper Schuijt"/><br /><sub><b>Casper Schuijt</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Acschuijt" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ANasouf"><img src="https://avatars.githubusercontent.com/u/19536487?v=4?s=100" width="100px;" alt="ANasouf"/><br /><sub><b>ANasouf</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=ANasouf" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://ragnarlaud.dev"><img src="https://avatars.githubusercontent.com/u/3042904?v=4?s=100" width="100px;" alt="Ragnar Laud"/><br /><sub><b>Ragnar Laud</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Axprnio" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/asenawritescode"><img src="https://avatars.githubusercontent.com/u/67445192?v=4?s=100" width="100px;" alt="Asena"/><br /><sub><b>Asena</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aasenawritescode" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://snyder.tech"><img src="https://avatars.githubusercontent.com/u/707567?v=4?s=100" width="100px;" alt="Ben Snyder"/><br /><sub><b>Ben Snyder</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=benpsnyder" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://vederis.id"><img src="https://avatars.githubusercontent.com/u/13505006?v=4?s=100" width="100px;" alt="Vederis Leunardus"/><br /><sub><b>Vederis Leunardus</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=cloudsbird" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://www.pivoten.com"><img src="https://avatars.githubusercontent.com/u/104120598?v=4?s=100" width="100px;" alt="Chris Cantrell"/><br /><sub><b>Chris Cantrell</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Accantrell72" title="Bug reports">🐛</a></td>
-    </tr>
-    <tr>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/oleynikd"><img src="https://avatars.githubusercontent.com/u/3976868?v=4?s=100" width="100px;" alt="Denis"/><br /><sub><b>Denis</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aoleynikd" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://myself.vercel.app/"><img src="https://avatars.githubusercontent.com/u/42431274?v=4?s=100" width="100px;" alt="Sachin Mittal"/><br /><sub><b>Sachin Mittal</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Amittalsam98" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://www.camilooviedo.com/"><img src="https://avatars.githubusercontent.com/u/64604272?v=4?s=100" width="100px;" alt="Camilo Oviedo"/><br /><sub><b>Camilo Oviedo</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=Champetaman" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

docker-compose.prod.yml

@@ -3,33 +3,38 @@
 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
-    restart: on-failure
+      - webapp
-    networks:
+    deploy:
-      - bigcapital_network
+      restart_policy:
+        condition: unless-stopped
 
   webapp:
     container_name: bigcapital-webapp
-    image: bigcapitalhq/webapp:latest
+    image: ghcr.io/bigcapitalhq/webapp:latest
-    restart: on-failure
+    deploy:
-    networks:
+      restart_policy:
-      - bigcapital_network
+        condition: unless-stopped
 
   server:
     container_name: bigcapital-server
-    image: bigcapitalhq/server:latest
+    image: ghcr.io/bigcapitalhq/server:latest
-    expose:
-      - '3000'
     links:
       - mysql
       - mongo
@@ -38,9 +43,9 @@ services:
       - mysql
       - mongo
       - redis
-    restart: on-failure
+    deploy:
-    networks:
+      restart_policy:
-      - bigcapital_network
+        condition: unless-stopped
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -81,48 +86,6 @@ services:
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
       - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
 
-      # Sign-up email confirmation
-      - SIGNUP_EMAIL_CONFIRMATION=${SIGNUP_EMAIL_CONFIRMATION}
-
-      # Gotenberg (Pdf generator)
-      - 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_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
-
-      # Lemon Squeez
-      - LEMONSQUEEZY_API_KEY=${LEMONSQUEEZY_API_KEY}
-      - LEMONSQUEEZY_STORE_ID=${LEMONSQUEEZY_STORE_ID}
-      - LEMONSQUEEZY_WEBHOOK_SECRET=${LEMONSQUEEZY_WEBHOOK_SECRET}
-      - HOSTED_ON_BIGCAPITAL_CLOUD=${HOSTED_ON_BIGCAPITAL_CLOUD}
-
-      # New Relic matrics tracking.
-      - NEW_RELIC_DISTRIBUTED_TRACING_ENABLED=${NEW_RELIC_DISTRIBUTED_TRACING_ENABLED}
-      - NEW_RELIC_LOG=${NEW_RELIC_LOG}
-      - NEW_RELIC_AI_MONITORING_ENABLED=${NEW_RELIC_AI_MONITORING_ENABLED}
-      - NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_CUSTOM_INSIGHTS_EVENTS_MAX_SAMPLES_STORED}
-      - NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED=${NEW_RELIC_SPAN_EVENTS_MAX_SAMPLES_STORED}
-      - 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,12 +102,12 @@ services:
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
-    networks:
-      - bigcapital_network
 
   mysql:
     container_name: bigcapital-mysql
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
       context: ./docker/mariadb
     environment:
@@ -156,38 +119,29 @@ services:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
-    networks:
-      - bigcapital_network
 
   mongo:
     container_name: bigcapital-mongo
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build: ./docker/mongo
     expose:
       - '27017'
     volumes:
       - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
 
   redis:
     container_name: bigcapital-redis
-    restart: on-failure
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
       context: ./docker/redis
     expose:
       - '6379'
     volumes:
       - redis:/data
-    networks:
-      - bigcapital_network
-
-  gotenberg:
-    image: gotenberg/gotenberg:7
-    expose:
-      - '9000'
-    networks:
-      - bigcapital_network
 
 # Volumes
 volumes:
@@ -202,8 +156,3 @@ volumes:
   redis:
     name: bigcapital_prod_redis
     driver: local
-
-# Networks
-networks:
-  bigcapital_network:
-    driver: bridge

docker-compose.yml

@@ -47,11 +47,6 @@ services:
       restart_policy:
         condition: unless-stopped
 
-  gotenberg:
-    image: gotenberg/gotenberg:7
-    ports:
-      - "9000:3000"
-
 # Volumes
 volumes:
   mysql:

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/migration/Dockerfile

@@ -1,4 +1,4 @@
-FROM bigcapitalhq/server:latest as build
+FROM ghcr.io/bigcapitalhq/server:latest as build
 
 ARG DB_HOST= \
   DB_USER= \
@@ -34,5 +34,7 @@ WORKDIR /app/packages/server
 
 RUN git clone https://github.com/vishnubob/wait-for-it.git
 
-# Once we listen the mysql port run the migration task.
+ADD docker/migration/start.sh /
-CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node ./build/commands.js system:migrate:latest && node ./build/commands.js tenants:migrate:latest"
+RUN chmod +x /start.sh
+
+CMD ["/start.sh"]

docker/migration/start.sh

@@ -0,0 +1,5 @@
+# Migrate the master system database.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js system:migrate:latest
+
+# Migrate all tenants.
+./wait-for-it/wait-for-it.sh mysql:3306 -- node ./build/commands.js tenants:migrate:latest

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;
+  }
+}

lerna.json

@@ -2,7 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "independent",
   "npmClient": "pnpm",
-  "packages": [
+  "packages": ["packages/*"]
-    "packages/*"
-  ]
 }

package.json

@@ -2,6 +2,7 @@
   "name": "bigcapital-monorepo",
   "private": true,
   "scripts": {
+    "bootstrap": "lerna exec pnpm install",
     "dev": "lerna run dev",
     "build": "lerna run build",
     "dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
@@ -19,11 +20,10 @@
     "@faker-js/faker": "^8.0.2",
     "@playwright/test": "^1.32.3",
     "husky": "^8.0.3",
-    "lerna": "^8.1.2",
+    "lerna": "^6.4.1"
-    "pnpm": "^9.0.5"
   },
   "engines": {
-    "node": "16.x || 17.x || 18.x"
+    "node": "14.x"
   },
   "husky": {
     "hooks": {

packages/server/.gitignore

@@ -1,8 +1,6 @@
 /node_modules/
 /.env
+/storage
 stdout.log
 /dist
 /build
-/public/imports
-
-dist

packages/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.16.0-alpine as build
+FROM node:14.20-alpine as build
 
 USER root
 
@@ -78,33 +78,20 @@ ENV MAIL_HOST=$MAIL_HOST \
   SIGNUP_ALLOWED_DOMAINS=$SIGNUP_ALLOWED_DOMAINS \
   SIGNUP_ALLOWED_EMAILS=$SIGNUP_ALLOWED_EMAILS
 
-# New Relic config file.
-ENV NEW_RELIC_NO_CONFIG_FILE=true
-
 # Create app directory.
 WORKDIR /app
 
 RUN chown node:node /
 
-# Install pnpm 
-RUN npm install -g pnpm
-
 # Copy application dependency manifests to the container image.
 COPY ./package*.json ./
-COPY ./pnpm-lock.yaml ./pnpm-lock.yaml
-COPY ./lerna.json ./lerna.json
-COPY ./pnpm-workspace.yaml ./pnpm-workspace.yaml
 COPY ./packages/server/package*.json ./packages/server/
 
-# Install application dependencies
+COPY ./lerna.json ./lerna.json
-RUN apk update
-RUN apk add python3 build-base chromium
 
-# Set PYHTON env
+# Install app dependencies for production.
-ENV PYTHON=/usr/bin/python3
+RUN npm install
-
+RUN npm run bootstrap
-# Install packages dependencies for production.
-RUN pnpm install
 
 COPY --chown=node:node ./packages/server ./packages/server
 

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcapital/server",
-  "version": "0.10.2",
+  "version": "0.10.1",
   "description": "",
   "main": "src/server.ts",
   "scripts": {
@@ -20,24 +20,18 @@
     "bigcapital": "./bin/bigcapital.js"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.576.0",
-    "@aws-sdk/s3-request-presigner": "^3.583.0",
     "@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",
     "@types/mathjs": "^6.0.12",
-    "@types/yup": "^0.29.13",
     "accepts": "^1.3.7",
     "accounting": "^0.4.1",
     "agenda": "^4.2.1",
     "agendash": "^3.1.0",
     "app-root-path": "^3.0.0",
     "async": "^3.2.0",
-    "axios": "^1.6.0",
+    "axios": "^0.20.0",
     "babel-loader": "^9.1.2",
     "bcryptjs": "^2.4.3",
     "bluebird": "^3.7.2",
@@ -49,7 +43,7 @@
     "crypto-random-string": "^3.2.0",
     "csurf": "^1.10.0",
     "deep-map": "^2.0.0",
-    "deepdash": "^5.3.9",
+    "deepdash": "^5.3.7",
     "dotenv": "^8.1.0",
     "errorhandler": "^1.5.1",
     "es6-weak-map": "^2.0.3",
@@ -59,9 +53,9 @@
     "express": "^4.17.1",
     "express-basic-auth": "^1.2.0",
     "express-boom": "^3.0.0",
+    "express-fileupload": "^1.1.7-alpha.3",
     "express-oauth-server": "^2.0.0",
     "express-validator": "^6.12.2",
-    "form-data": "^4.0.0",
     "gulp": "^4.0.2",
     "gulp-sass": "^5.0.0",
     "helmet": "^3.21.0",
@@ -69,25 +63,22 @@
     "is-my-json-valid": "^2.20.5",
     "js-money": "^0.6.3",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^3.1.0",
+    "knex": "^0.95.15",
     "knex-cleaner": "^1.3.0",
+    "knex-db-manager": "^0.6.1",
     "libphonenumber-js": "^1.9.6",
     "lodash": "^4.17.15",
     "lru-cache": "^6.0.0",
     "mathjs": "^9.4.0",
     "memory-cache": "^0.2.0",
-    "mime-types": "^2.1.35",
     "moment": "^2.24.0",
     "moment-range": "^4.0.2",
     "moment-timezone": "^0.5.43",
     "mongodb": "^6.1.0",
     "mongoose": "^5.10.0",
-    "multer": "1.4.5-lts.1",
-    "multer-s3": "^3.0.1",
     "mustache": "^3.0.3",
     "mysql": "^2.17.1",
     "mysql2": "^1.6.5",
-    "newrelic": "^11.15.0",
     "node-cache": "^4.2.1",
     "nodemailer": "^6.3.0",
     "nodemon": "^1.19.1",
@@ -96,7 +87,6 @@
     "objection-filter": "^4.0.1",
     "objection-soft-delete": "^1.0.7",
     "objection-unique": "^1.2.2",
-    "plaid": "^10.3.0",
     "pluralize": "^8.0.0",
     "pug": "^3.0.2",
     "puppeteer": "^10.2.0",
@@ -105,20 +95,14 @@
     "rate-limiter-flexible": "^2.1.14",
     "reflect-metadata": "^0.1.13",
     "rtl-detect": "^1.0.4",
-    "socket.io": "^4.7.4",
-    "source-map-loader": "^4.0.1",
-    "tmp-promise": "^3.0.3",
     "ts-transformer-keys": "^0.4.2",
     "tsyringe": "^4.3.0",
     "typedi": "^0.8.0",
     "uniqid": "^5.2.0",
-    "winston": "^3.2.1",
+    "winston": "^3.2.1"
-    "xlsx": "^0.18.5",
-    "yup": "^0.28.1"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.158",
-    "@types/multer": "^1.4.11",
     "@types/ramda": "^0.27.64",
     "@typescript-eslint/eslint-plugin": "^5.50.0",
     "@typescript-eslint/parser": "^5.50.0",

packages/server/resources/locales/ar.json

@@ -242,7 +242,7 @@
   "account.field.normal.credit": "دائن",
   "account.field.normal.debit": "مدين",
   "account.field.type": "نوع الحساب",
-  "account.field.active": "Active",
+  "account.field.active": "Activity",
   "account.field.balance": "الرصيد",
   "account.field.created_at": "أنشئت في",
   "item.field.type": "نوع الصنف",

packages/server/resources/locales/en.json

@@ -176,7 +176,6 @@
   "invoice.paper.conditions_title": "Conditions & terms",
   "invoice.paper.notes_title": "Notes",
   "invoice.paper.total": "Total",
-  "invoice.paper.subtotal": "Subtotal", 
   "invoice.paper.payment_amount": "Payment Amount",
   "invoice.paper.balance_due": "Balance Due",
 
@@ -241,32 +240,28 @@
   "account.field.normal.credit": "Credit",
   "account.field.normal.debit": "Debit",
   "account.field.type": "Type",
-  "account.field.active": "Active",
+  "account.field.active": "Activity",
-  "account.field.currency": "Currency",
   "account.field.balance": "Balance",
-  "account.field.bank_balance": "Bank Balance",
-  "account.field.parent_account": "Parent Account",
   "account.field.created_at": "Created at",
-  "item.field.type": "Item Type",
+  "item.field.type": "Item type",
   "item.field.type.inventory": "Inventory",
   "item.field.type.service": "Service",
-  "item.field.type.non-inventory": "Non Inventory",
+  "item.field.type.non-inventory": "Non inventory",
-  "item.field.name": "Item Name",
+  "item.field.name": "Name",
-  "item.field.code": "Item Code",
+  "item.field.code": "Code",
   "item.field.sellable": "Sellable",
   "item.field.purchasable": "Purchasable",
-  "item.field.cost_price": "Cost Price",
+  "item.field.cost_price": "Cost price",
-  "item.field.sell_price": "Sell Price",
+  "item.field.cost_account": "Cost account",
-  "item.field.cost_account": "Cost Account",
+  "item.field.sell_account": "Sell account",
-  "item.field.sell_account": "Sell Account",
+  "item.field.sell_description": "Sell description",
-  "item.field.sell_description": "Sell Description",
+  "item.field.inventory_account": "Inventory account",
-  "item.field.inventory_account": "Inventory Account",
+  "item.field.purchase_description": "Purchase description",
-  "item.field.purchase_description": "Purchase Description",
+  "item.field.quantity_on_hand": "Quantity on hand",
-  "item.field.quantity_on_hand": "Quantity on Hand",
   "item.field.note": "Note",
   "item.field.category": "Category",
   "item.field.active": "Active",
-  "item.field.created_at": "Created At",
+  "item.field.created_at": "Created at",
   "item_category.field.name": "Name",
   "item_category.field.description": "Description",
   "item_category.field.count": "Count",
@@ -279,14 +274,8 @@
   "invoice.field.invoice_message": "Invoice message",
   "invoice.field.terms_conditions": "Terms & conditions",
   "invoice.field.amount": "Amount",
-  "invoice.field.exchange_rate": "Exchange Rate",
   "invoice.field.payment_amount": "Payment amount",
   "invoice.field.due_amount": "Due amount",
-  "invoice.field.delivered": "Delivered",
-  "invoice.field.item_name": "Item Name",
-  "invoice.field.rate": "Rate",
-  "invoice.field.quantity": "Quantity",
-  "invoice.field.description": "Description",
   "invoice.field.status": "Status",
   "invoice.field.status.paid": "Paid",
   "invoice.field.status.partially-paid": "Partially paid",
@@ -295,8 +284,6 @@
   "invoice.field.status.delivered": "Delivered",
   "invoice.field.status.draft": "Draft",
   "invoice.field.created_at": "Created at",
-  "invoice.field.currency": "Currency",
-  "invoice.field.entries": "Entries",
   "estimate.field.amount": "Amount",
   "estimate.field.estimate_number": "Estimate number",
   "estimate.field.customer": "Customer",
@@ -311,31 +298,22 @@
   "estimate.field.status.approved": "Approved",
   "estimate.field.status.draft": "Draft",
   "estimate.field.created_at": "Created at",
+  "payment_receive.field.customer": "Customer",
+  "payment_receive.field.payment_date": "Payment date",
   "payment_receive.field.amount": "Amount",
+  "payment_receive.field.reference_no": "Reference No.",
+  "payment_receive.field.deposit_account": "Deposit account",
   "payment_receive.field.payment_receive_no": "Payment receive No.",
   "payment_receive.field.statement": "Statement",
   "payment_receive.field.created_at": "Created at",
-  "payment_receive.field.customer": "Customer",
-  "payment_receive.field.exchange_rate": "Exchange Rate",
-  "payment_receive.field.payment_date": "Payment Date",
-  "payment_receive.field.reference_no": "Reference No.",
-  "payment_receive.field.deposit_account": "Deposit Account",
-  "payment_receive.field.entries": "Entries",
-  "payment_receive.field.invoice": "Invoice",
-  "payment_receive.field.entries.payment_amount": "Payment Amount",
   "bill_payment.field.vendor": "Vendor",
   "bill_payment.field.amount": "Amount",
-  "bill_payment.field.due_amount": "Due Amount",
+  "bill_payment.field.due_amount": "Due amount",
-  "bill_payment.field.payment_account": "Payment Account",
+  "bill_payment.field.payment_account": "Payment account",
-  "bill_payment.field.payment_number": "Payment No.",
+  "bill_payment.field.payment_number": "Payment number",
-  "bill_payment.field.payment_date": "Payment Date",
+  "bill_payment.field.payment_date": "Payment date",
   "bill_payment.field.reference_no": "Reference No.",
   "bill_payment.field.description": "Description",
-  "bill_payment.field.exchange_rate": "Exchange Rate",
-  "bill_payment.field.note": "Note",
-  "bill_payment.field.entries.bill": "Bill No.",
-  "bill_payment.field.entries.payment_amount": "Payment Amount",
-  "bill_payment.field.reference": "Reference No.",
   "bill_payment.field.created_at": "Created at",
   "bill.field.vendor": "Vendor",
   "bill.field.bill_number": "Bill number",
@@ -363,30 +341,22 @@
   "inventory_adjustment.field.description": "Description",
   "inventory_adjustment.field.published_at": "Published at",
   "inventory_adjustment.field.created_at": "Created at",
-  "expense.field.payment_date": "Payment Date",
+  "expense.field.payment_date": "Payment date",
-  "expense.field.payment_account": "Payment Account",
+  "expense.field.payment_account": "Payment account",
   "expense.field.amount": "Amount",
-  "expense.field.currency_code": "Currency",
-  "expense.field.exchange_rate": "Exchange Rate", 
   "expense.field.reference_no": "Reference No.",
   "expense.field.description": "Description",
-  "expense.field.line_description": "Line Description",
   "expense.field.published": "Published",
-  "expense.field.categories": "Categories",
-  "expense.field.expense_account": "Expense Account",
-  "expense.field.publish": "Publish",
   "expense.field.status": "Status",
   "expense.field.status.draft": "Draft",
   "expense.field.status.published": "Published",
   "expense.field.created_at": "Created at",
   "manual_journal.field.date": "Date",
-  "manual_journal.field.journal_number": "Journal No.",
+  "manual_journal.field.journal_number": "Journal number",
   "manual_journal.field.reference": "Reference No.",
-  "manual_journal.field.journal_type": "Journal Type",
+  "manual_journal.field.journal_type": "Journal type",
   "manual_journal.field.amount": "Amount",
   "manual_journal.field.description": "Description",
-  "manual_journal.field.currency": "Currency",
-  "manual_journal.field.exchange_rate": "Exchange Rate",
   "manual_journal.field.status": "Status",
   "manual_journal.field.created_at": "Created at",
   "receipt.field.amount": "Amount",
@@ -405,8 +375,8 @@
   "customer.field.last_name": "Last name",
   "customer.field.display_name": "Display name",
   "customer.field.email": "Email",
-  "customer.field.work_phone": "Work Phone Number",
+  "customer.field.work_phone": "Work phone",
-  "customer.field.personal_phone": "Personal Phone Number",
+  "customer.field.personal_phone": "Personal phone",
   "customer.field.company_name": "Company name",
   "customer.field.website": "Website",
   "customer.field.opening_balance_at": "Opening balance at",
@@ -414,7 +384,7 @@
   "customer.field.created_at": "Created at",
   "customer.field.balance": "Balance",
   "customer.field.status": "Status",
-  "customer.field.currency": "Currency",
+  "customer.field.currency": "Curreny",
   "customer.field.status.active": "Active",
   "customer.field.status.inactive": "Inactive",
   "customer.field.status.overdue": "Overdue",
@@ -423,8 +393,8 @@
   "vendor.field.last_name": "Last name",
   "vendor.field.display_name": "Display name",
   "vendor.field.email": "Email",
-  "vendor.field.work_phone": "Work Phone Number",
+  "vendor.field.work_phone": "Work phone",
-  "vendor.field.personal_phone": "Personal Phone Number",
+  "vendor.field.personal_phone": "Personal phone",
   "vendor.field.company_name": "Company name",
   "vendor.field.website": "Website",
   "vendor.field.opening_balance_at": "Opening balance at",
@@ -432,16 +402,13 @@
   "vendor.field.created_at": "Created at",
   "vendor.field.balance": "Balance",
   "vendor.field.status": "Status",
-  "vendor.field.note": "Note",
+  "vendor.field.currency": "Curreny",
-  "vendor.field.currency": "Currency",
   "vendor.field.status.active": "Active",
   "vendor.field.status.inactive": "Inactive",
   "vendor.field.status.overdue": "Overdue",
   "vendor.field.status.unpaid": "Unpaid",
   "Invoice write-off": "Invoice write-off",
 
-  
-
   "transaction_type.credit_note": "Credit note",
   "transaction_type.refund_credit_note": "Refund credit note",
   "transaction_type.vendor_credit": "Vendor credit",
@@ -620,7 +587,6 @@
   "balance_sheet.long_term_liabilities": "Long-Term Liabilities",
   "balance_sheet.non_current_liabilities": "Non-Current Liabilities",
   "balance_sheet.equity": "Equity",
-  "balance_sheet.net_income": "Net Income",
 
   "balance_sheet.account_name": "Account name",
   "balance_sheet.total": "Total",

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/scss/modules/financial-sheet.scss

@@ -1,57 +0,0 @@
-@import "../base.scss";
-
-html,
-body {
-  font-size: 14px;
-}
-body{
-  font-weight: 400;
-  letter-spacing: 0;
-  line-height: 1.28581;
-  text-transform: none;
-  color: #000;
-  font-family: Segoe UI, Roboto, Oxygen, Ubuntu, Cantarell, Open Sans, Helvetica Neue, Icons16, sans-serif;
-}
-.sheet{
-  padding: 20px;
-}
-.sheet__company-name{
-  margin: 0;
-  font-size: 1.4rem;
-}
-.sheet__sheet-type {
-  margin: 0
-}
-.sheet__sheet-date {
-  margin-top: 0.35rem;
-}
-
-.sheet__header {
-  text-align: center;
-  margin-bottom: 1rem;
-}
-
-.sheet__table {
-  border-top: 1px solid #000;
-  table-layout: fixed;
-  border-spacing: 0;
-  text-align: left;
-  font-size: inherit;
-  width: 100%;
-}
-
-.sheet__table thead th {
-  color: #000;
-  border-bottom: 1px solid #000000;
-  padding: 0.5rem;
-}
-
-.sheet__table tbody td {
-  border-bottom: 0;
-  padding-top: 0.28rem;
-  padding-bottom: 0.28rem;
-  padding-left: 0.5rem;
-  padding-right: 0.5rem;
-  color: #252A31;
-  border-bottom: 1px solid transparent;
-}

packages/server/resources/scss/modules/invoice.scss

@@ -137,14 +137,10 @@
       tbody tr.payment-amount td:last-child {
         color: red
       }
-      tbody tr.blanace-due td{
+      tbody tr.blanace-due td {
         border-top: 3px double #666;
         font-weight: bold;
       }
-      tbody tr.total td {
-        border-top: 1px solid #666;
-        font-weight: bold;
-      }
     }
   }
 

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/resources/views/modules/financial-sheet.pug

@@ -1,25 +0,0 @@
-block head
-  style 
-    include ../../css/modules/financial-sheet.css
-
-style.
-  !{customCSS}
-
-block content 
-  .sheet 
-    .sheet__header 
-      .sheet__company-name=organizationName
-      .sheet__sheet-type=sheetName
-      .sheet__sheet-date=sheetDate
-
-    table.sheet__table
-      thead
-        tr
-          each column in table.columns
-            th(style=column.style class='column--' + column.key)= column.label
-      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/resources/views/modules/invoice-regular.pug

@@ -22,12 +22,12 @@ block content
 
   div.invoice__due-amount
     div.label #{__('invoice.paper.invoice_amount')}
-    div.amount #{saleInvoice.totalFormatted}
+    div.amount #{saleInvoice.formattedAmount}
 
   div.invoice__meta
    div.invoice__meta-item.invoice__meta-item--amount
     span.label #{__('invoice.paper.due_amount')}
-    span.value #{saleInvoice.dueAmountFormatted}
+    span.value #{saleInvoice.formattedDueAmount}
 
    div.invoice__meta-item.invoice__meta-item--billed-to
     span.label #{__("invoice.paper.billed_to")}
@@ -35,11 +35,11 @@ block content
 
    div.invoice__meta-item.invoice__meta-item--invoice-date
     span.label #{__("invoice.paper.invoice_date")}
-    span.value #{saleInvoice.invoiceDateFormatted}
+    span.value #{saleInvoice.formattedInvoiceDate}
 
    div.invoice__meta-item.invoice__meta-item--due-date
     span.label #{__("invoice.paper.due_date")}
-    span.value #{saleInvoice.dueDateFormatted}
+    span.value #{saleInvoice.formattedDueDate}
 
   div.invoice__table
    table 
@@ -63,22 +63,15 @@ block content
     div.invoice__table-total
       table 
         tbody
-          tr.subtotal
-            td #{__('invoice.paper.subtotal')}
-            td #{saleInvoice.subtotalFormatted}
-          each tax in saleInvoice.taxes
-            tr.tax_line 
-              td #{tax.name} [#{tax.taxRate}%]
-              td #{tax.taxRateAmountFormatted}
           tr.total
             td #{__('invoice.paper.total')}
-            td #{saleInvoice.totalFormatted}
+            td #{saleInvoice.formattedAmount}
           tr.payment-amount
             td #{__('invoice.paper.payment_amount')}
-            td #{saleInvoice.paymentAmountFormatted}
+            td #{saleInvoice.formattedPaymentAmount}
           tr.blanace-due
             td #{__('invoice.paper.balance_due')}
-            td #{saleInvoice.dueAmountFormatted}
+            td #{saleInvoice.formattedDueAmount}
 
   div.invoice__footer        
     if saleInvoice.termsConditions

packages/server/resources/views/modules/payment-receive-standard.pug

@@ -45,9 +45,9 @@ block content
       each entry in paymentReceive.entries
        tr
         td.item=entry.invoice.invoiceNo
-        td.date=entry.invoice.invoiceDateFormatted
+        td.date=entry.invoice.formattedInvoiceDate
-        td.invoiceAmount=entry.invoice.totalFormatted
+        td.invoiceAmount=entry.invoice.formattedAmount
-        td.paymentAmount=entry.invoice.paymentAmountFormatted
+        td.paymentAmount=entry.invoice.formattedPaymentAmount
 
   div.payment__table-after
     div.payment__table-total

packages/server/scripts/gulpConfig.js

@@ -66,14 +66,12 @@ module.exports = {
         // sourcemaps: true, // Allow to enable/disable sourcemaps or pass object to configure it.
         // minify: true, // Allow to enable/disable minify the source.
       },
-      {
+    //   {
-        src: `${RESOURCES_PATH}/scss/modules/financial-sheet.scss`,
+    //     src: './assets/sass/editor-style.scss',
-        dest: `${RESOURCES_PATH}/css/modules`,
+    //     dest: './assets/css',
-      },
+    //     sourcemaps: true,
-      {
+    //     minify: true,
-        src: `${RESOURCES_PATH}/scss/modules/export-resource-table.scss`,
+    //   },
-        dest: `${RESOURCES_PATH}/css/modules`,
-      },
     ],
     // RTL builds.
     rtl: [
@@ -116,7 +114,7 @@ module.exports = {
     // SASS Configuration for all builds.
     sass: {
       errLogToConsole: true,
-      //   outputStyle: 'compact',
+    //   outputStyle: 'compact',
     },
 
     // CSS MQ Packer configuration for all builds and style tasks.

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

@@ -27,7 +27,7 @@ export default class AccountsController extends BaseController {
   /**
    * Router constructor method.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -98,25 +98,29 @@ export default class AccountsController extends BaseController {
   /**
    * Create account DTO Schema validation.
    */
-  private get createAccountDTOSchema() {
+  get createAccountDTOSchema() {
     return [
       check('name')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('code')
         .optional({ nullable: true })
         .isLength({ min: 3, max: 6 })
-        .trim(),
+        .trim()
+        .escape(),
       check('currency_code').optional(),
       check('account_type')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ max: DATATYPES_LENGTH.TEXT })
-        .trim(),
+        .trim()
+        .escape(),
       check('parent_account_id')
         .optional({ nullable: true })
         .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })
@@ -127,24 +131,28 @@ export default class AccountsController extends BaseController {
   /**
    * Account DTO Schema validation.
    */
-  private get editAccountDTOSchema() {
+  get editAccountDTOSchema() {
     return [
       check('name')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('code')
         .optional({ nullable: true })
         .isLength({ min: 3, max: 6 })
-        .trim(),
+        .trim()
+        .escape(),
       check('account_type')
         .exists()
         .isLength({ min: 3, max: DATATYPES_LENGTH.STRING })
-        .trim(),
+        .trim()
+        .escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ max: DATATYPES_LENGTH.TEXT })
-        .trim(),
+        .trim()
+        .escape(),
       check('parent_account_id')
         .optional({ nullable: true })
         .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })
@@ -152,14 +160,14 @@ export default class AccountsController extends BaseController {
     ];
   }
 
-  private get accountParamSchema() {
+  get accountParamSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Accounts list validation schema.
    */
-  private get accountsListSchema() {
+  get accountsListSchema() {
     return [
       query('view_slug').optional({ nullable: true }).isString().trim(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -199,6 +207,7 @@ export default class AccountsController extends BaseController {
         tenantId,
         accountDTO
       );
+
       return res.status(200).send({
         id: account.id,
         message: 'The account has been created successfully.',

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

@@ -1,266 +0,0 @@
-import mime from 'mime-types';
-import { Service, Inject } from 'typedi';
-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.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/',
-      this.uploadPipelineService.validateS3Configured,
-      this.uploadPipelineService.uploadPipeline().single('file'),
-      this.validateUploadedFileExistance,
-      this.uploadAttachment.bind(this)
-    );
-    router.delete(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.deleteAttachment.bind(this)
-    );
-    router.get(
-      '/:id',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachment.bind(this)
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult
-    );
-    router.post(
-      '/:id/link',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.linkDocument.bind(this)
-    );
-    router.post(
-      '/:id/unlink',
-      [body('modelRef').exists(), body('modelId').exists()],
-      this.validationResult,
-      this.unlinkDocument.bind(this)
-    );
-    router.get(
-      '/:id/presigned-url',
-      [param('id').exists()],
-      this.validationResult,
-      this.getAttachmentPresignedUrl.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Validates the upload file existance.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private validateUploadedFileExistance(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    if (!req.file) {
-      return res.boom.badRequest(null, {
-        errorType: 'FILE_UPLOAD_FAILED',
-        message: 'Now file uploaded.',
-      });
-    }
-    next();
-  }
-
-  /**
-   * Uploads the attachments to S3 and store the file metadata to DB.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Response|void}
-   */
-  private async uploadAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const file = req.file;
-
-    try {
-      const data = await this.attachmentsApplication.upload(tenantId, file);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has uploaded successfully.',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id } = req.params;
-
-    try {
-      const data = await this.attachmentsApplication.get(tenantId, id);
-
-      const byte = await data.Body.transformToByteArray();
-      const extension = mime.extension(data.ContentType);
-      const buffer = Buffer.from(byte);
-
-      res.set(
-        'Content-Disposition',
-        `filename="${req.params.id}.${extension}"`
-      );
-      res.set('Content-Type', data.ContentType);
-      res.send(buffer);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Deletes the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async deleteAttachment(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-
-    try {
-      await this.attachmentsApplication.delete(tenantId, documentId);
-
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been delete successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async linkDocument(
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Links the given document key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async unlinkDocument(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentId } = req.params;
-    const { modelRef, modelId } = this.matchedBodyData(req);
-
-    try {
-      await this.attachmentsApplication.link(
-        tenantId,
-        documentId,
-        modelRef,
-        modelId
-      );
-      return res.status(200).send({
-        status: 200,
-        message: 'The document has been linked successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreives the presigned url of the given attachment key.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|void>}
-   */
-  private async getAttachmentPresignedUrl(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | void> {
-    const { tenantId } = req;
-    const { id: documentKey } = req.params;
-
-    try {
-      const presignedUrl = await this.attachmentsApplication.getPresignedUrl(
-        tenantId,
-        documentKey
-      );
-      return res.status(200).send({ presignedUrl });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -9,8 +9,6 @@ import { DATATYPES_LENGTH } from '@/data/DataTypes';
 import LoginThrottlerMiddleware from '@/api/middleware/LoginThrottlerMiddleware';
 import AuthenticationApplication from '@/services/Authentication/AuthApplication';
 
-import JWTAuth from '@/api/middleware/jwtAuth';
-import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 @Service()
 export default class AuthenticationController extends BaseController {
   @Inject()
@@ -30,20 +28,6 @@ export default class AuthenticationController extends BaseController {
       asyncMiddleware(this.login.bind(this)),
       this.handlerErrors
     );
-    router.use('/register/verify/resend', JWTAuth);
-    router.use('/register/verify/resend', AttachCurrentTenantUser);
-    router.post(
-      '/register/verify/resend',
-      asyncMiddleware(this.registerVerifyResendMail.bind(this)),
-      this.handlerErrors
-    );
-    router.post(
-      '/register/verify',
-      this.signupVerifySchema,
-      this.validationResult,
-      asyncMiddleware(this.registerVerify.bind(this)),
-      this.handlerErrors
-    );
     router.post(
       '/register',
       this.registerSchema,
@@ -90,38 +74,31 @@ export default class AuthenticationController extends BaseController {
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('last_name')
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('email')
         .exists()
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('password')
         .exists()
         .isString()
         .isLength({ min: 6 })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
     ];
   }
 
-  private get signupVerifySchema(): ValidationChain[] {
-    return [
-      check('email')
-        .exists()
-        .isString()
-        .isEmail()
-        .isLength({ max: DATATYPES_LENGTH.STRING }),
-      check('token').exists().isString(),
-    ];
-  }
-
   /**
    * Reset password schema.
    * @returns {ValidationChain[]}
@@ -146,7 +123,7 @@ export default class AuthenticationController extends BaseController {
    * @returns {ValidationChain[]}
    */
   private get sendResetPasswordSchema(): ValidationChain[] {
-    return [check('email').exists().isEmail().trim()];
+    return [check('email').exists().isEmail().trim().escape()];
   }
 
   /**
@@ -154,11 +131,7 @@ export default class AuthenticationController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  private async login(
+  private async login(req: Request, res: Response, next: Function): Response {
-    req: Request,
-    res: Response,
-    next: Function
-  ): Promise<Response | null> {
     const userDTO: ILoginDTO = this.matchedBodyData(req);
 
     try {
@@ -193,58 +166,6 @@ export default class AuthenticationController extends BaseController {
     }
   }
 
-  /**
-   * Verifies the provider user's email after signin-up.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   * @returns {Response|void}
-   */
-  private async registerVerify(req: Request, res: Response, next: Function) {
-    const signUpVerifyDTO: { email: string; token: string } =
-      this.matchedBodyData(req);
-
-    try {
-      const user = await this.authApplication.signUpConfirm(
-        signUpVerifyDTO.email,
-        signUpVerifyDTO.token
-      );
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        user,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resends the confirmation email to the user.
-   * @param {Request} req
-   * @param {Response}| res
-   * @param {Function} next
-   */
-  private async registerVerifyResendMail(
-    req: Request,
-    res: Response,
-    next: Function
-  ) {
-    const { user } = req;
-
-    try {
-      const data = await this.authApplication.signUpConfirmResend(user.id);
-
-      return res.status(200).send({
-        type: 'success',
-        message: 'The given user has verified successfully',
-        data,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Send reset password handler
    * @param {Request} req

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

@@ -1,218 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import { param, query } from 'express-validator';
-import BaseController from '@/api/controllers/BaseController';
-import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
-import { BankAccountsApplication } from '@/services/Banking/BankAccounts/BankAccountsApplication';
-import { GetPendingBankAccountTransactions } from '@/services/Cashflow/GetPendingBankAccountTransaction';
-
-@Service()
-export class BankAccountsController extends BaseController {
-  @Inject()
-  private getBankAccountSummaryService: GetBankAccountSummary;
-
-  @Inject()
-  private bankAccountsApp: BankAccountsApplication;
-
-  @Inject()
-  private getPendingTransactionsService: GetPendingBankAccountTransactions;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
-    router.get(
-      '/pending_transactions',
-      [
-        query('account_id').optional().isNumeric().toInt(),
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getBankAccountsPendingTransactions.bind(this)
-    );
-    router.post(
-      '/:bankAccountId/disconnect',
-      this.disconnectBankAccount.bind(this)
-    );
-    router.post('/:bankAccountId/update', this.refreshBankAccount.bind(this));
-    router.post(
-      '/:bankAccountId/pause_feeds',
-      [param('bankAccountId').exists().isNumeric().toInt()],
-      this.validationResult,
-      this.pauseBankAccountFeeds.bind(this)
-    );
-    router.post(
-      '/:bankAccountId/resume_feeds',
-      [param('bankAccountId').exists().isNumeric().toInt()],
-      this.validationResult,
-      this.resumeBankAccountFeeds.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);
-    }
-  }
-
-  /**
-   * Retrieves the bank account pending transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  async getBankAccountsPendingTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const data =
-        await this.getPendingTransactionsService.getPendingTransactions(
-          tenantId,
-          query
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Disonnect the given bank account.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async disconnectBankAccount(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.disconnectBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        id: bankAccountId,
-        message: 'The bank account has been disconnected.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Refresh the given bank account.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response|null>}
-   */
-  async refreshBankAccount(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.refreshBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        id: bankAccountId,
-        message: 'The bank account has been disconnected.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Resumes the bank account feeds sync.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | void>}
-   */
-  async resumeBankAccountFeeds(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.resumeBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        message: 'The bank account feeds syncing has been resumed.',
-        id: bankAccountId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Pauses the bank account feeds sync.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | void>}
-   */
-  async pauseBankAccountFeeds(
-    req: Request<{ bankAccountId: number }>,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { bankAccountId } = req.params;
-    const { tenantId } = req;
-
-    try {
-      await this.bankAccountsApp.pauseBankAccount(tenantId, bankAccountId);
-
-      return res.status(200).send({
-        message: 'The bank account feeds syncing has been paused.',
-        id: bankAccountId,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,101 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { body, param } from 'express-validator';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { MatchBankTransactionsApplication } from '@/services/Banking/Matching/MatchBankTransactionsApplication';
-
-@Service()
-export class BankTransactionsMatchingController extends BaseController {
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/unmatch/:transactionId',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unmatchMatchedBankTransaction.bind(this)
-    );
-    router.post(
-      '/match',
-      [
-        body('uncategorizedTransactions').exists().isArray({ min: 1 }),
-        body('uncategorizedTransactions.*').isNumeric().toInt(),
-
-        body('matchedTransactions').isArray({ min: 1 }),
-        body('matchedTransactions.*.reference_type').exists(),
-        body('matchedTransactions.*.reference_id').isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.matchBankTransaction.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
-  ): Promise<Response | null> {
-    const { tenantId } = req;
-    const bodyData = this.matchedBodyData(req);
-
-    const uncategorizedTransactions = bodyData?.uncategorizedTransactions;
-    const matchedTransactions = bodyData?.matchedTransactions;
-
-    try {
-      await this.bankTransactionsMatchingApp.matchTransaction(
-        tenantId,
-        uncategorizedTransactions,
-        matchedTransactions
-      );
-      return res.status(200).send({
-        ids: uncategorizedTransactions,
-        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

@@ -1,39 +0,0 @@
-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';
-import { BankingUncategorizedController } from './BankingUncategorizedController';
-
-@Service()
-export class BankingController extends BaseController {
-  /**
-   * Router constructor.
-   */
-  public 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()
-    );
-    router.use(
-      '/categorize',
-      Container.get(BankingUncategorizedController).router()
-    );
-    return router;
-  }
-}

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

@@ -1,214 +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',
-          'equal',
-          'contains',
-          'not_contain',
-          'bigger',
-          'bigger_or_equal',
-          'smaller',
-          'smaller_or_equal',
-        ])
-        .default('contain')
-        .trim(),
-      body('conditions.*.value').exists().trim(),
-
-      // 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 }),
-    ];
-  }
-
-  /**
-   * 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/BankingUncategorizedController.ts

@@ -1,57 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import { query } from 'express-validator';
-import BaseController from '../BaseController';
-import { GetAutofillCategorizeTransaction } from '@/services/Banking/RegonizeTranasctions/GetAutofillCategorizeTransaction';
-
-@Service()
-export class BankingUncategorizedController extends BaseController {
-  @Inject()
-  private getAutofillCategorizeTransactionService: GetAutofillCategorizeTransaction;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.get(
-      '/autofill',
-      [
-        query('uncategorizedTransactionIds').isArray({ min: 1 }),
-        query('uncategorizedTransactionIds.*').isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getAutofillCategorizeTransaction.bind(this)
-    );
-    return router;
-  }
-
-  /**
-   * Retrieves the autofill values of the categorize form of the given
-   * uncategorized transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  public async getAutofillCategorizeTransaction(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const uncategorizedTransactionIds = req.query.uncategorizedTransactionIds;
-
-    try {
-      const data =
-        await this.getAutofillCategorizeTransactionService.getAutofillCategorizeTransaction(
-          tenantId,
-          uncategorizedTransactionIds
-        );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-}

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

@@ -1,201 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { body, param, query } from 'express-validator';
-import { NextFunction, Request, Response, Router } from 'express';
-import BaseController from '../BaseController';
-import { ExcludeBankTransactionsApplication } from '@/services/Banking/Exclude/ExcludeBankTransactionsApplication';
-import { map, parseInt, trim } from 'lodash';
-
-@Service()
-export class ExcludeBankTransactionsController extends BaseController {
-  @Inject()
-  private excludeBankTransactionApp: ExcludeBankTransactionsApplication;
-
-  /**
-   * Router constructor.
-   */
-  public router() {
-    const router = Router();
-
-    router.put(
-      '/transactions/exclude',
-      [body('ids').exists()],
-      this.validationResult,
-      this.excludeBulkBankTransactions.bind(this)
-    );
-    router.put(
-      '/transactions/unexclude',
-      [body('ids').exists()],
-      this.validationResult,
-      this.unexcludeBulkBankTransactins.bind(this)
-    );
-    router.put(
-      '/transactions/:transactionId/exclude',
-      [param('transactionId').exists().toInt()],
-      this.validationResult,
-      this.excludeBankTransaction.bind(this)
-    );
-    router.put(
-      '/transactions/:transactionId/unexclude',
-      [param('transactionId').exists()],
-      this.validationResult,
-      this.unexcludeBankTransaction.bind(this)
-    );
-    router.get(
-      '/excluded',
-      [
-        query('account_id').optional().isNumeric().toInt(),
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-        query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
-      ],
-      this.validationResult,
-      this.getExcludedBankTransactions.bind(this)
-    );
-    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);
-    }
-  }
-
-  /**
-   * Exclude bank transactions in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async excludeBulkBankTransactions(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { ids } = this.matchedBodyData(req);
-
-    try {
-      await this.excludeBankTransactionApp.excludeBankTransactions(
-        tenantId,
-        ids
-      );
-      return res.status(200).send({
-        message: 'The given bank transactions have been excluded',
-        ids,
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Unexclude the given bank transactions in bulk.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  private async unexcludeBulkBankTransactins(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ): Promise<Response | null> {
-    const { tenantId } = req;
-    const { ids } = this.matchedBodyData(req);
-
-    try {
-      await this.excludeBankTransactionApp.unexcludeBankTransactions(
-        tenantId,
-        ids
-      );
-      return res.status(200).send({
-        message: 'The given bank transactions have been excluded',
-        ids,
-      });
-    } 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.matchedQueryData(req);
-
-    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/PlaidBankingController.ts

@@ -1,53 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response } from 'express';
-import BaseController from '@/api/controllers/BaseController';
-import { PlaidApplication } from '@/services/Banking/Plaid/PlaidApplication';
-
-@Service()
-export class PlaidBankingController extends BaseController {
-  @Inject()
-  private plaidApp: PlaidApplication;
-
-  /**
-   * Router constructor.
-   */
-  router() {
-    const router = Router();
-
-    router.post('/link-token', this.linkToken.bind(this));
-    router.post('/exchange-token', this.exchangeToken.bind(this));
-
-    return router;
-  }
-
-  /**
-   * Retrieves the Plaid link token.
-   * @param {Request} req
-   * @param {response} res
-   * @returns {Response}
-   */
-  private async linkToken(req: Request, res: Response) {
-    const { tenantId } = req;
-
-    const linkToken = await this.plaidApp.getLinkToken(tenantId);
-
-    return res.status(200).send(linkToken);
-  }
-
-  /**
-   * Exchanges the given public token.
-   * @param {Request} req
-   * @param {response} res
-   * @returns {Response}
-   */
-  public async exchangeToken(req: Request, res: Response) {
-    const { tenantId } = req;
-    const { public_token, institution_id } = req.body;
-
-    await this.plaidApp.exchangeToken(tenantId, {
-      institutionId: institution_id,
-      publicToken: public_token,
-    });
-    return res.status(200).send({});
-  }
-}

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

@@ -1,91 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { NextFunction, Request, Response, Router } from 'express';
-import { query } from 'express-validator';
-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(
-      '/',
-      [
-        query('page').optional().isNumeric().toInt(),
-        query('page_size').optional().isNumeric().toInt(),
-        query('account_id').optional().isNumeric().toInt(),
-        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-        query('max_amount').optional({ nullable: true }).isFloat().isFloat(),
-      ],
-      this.validationResult,
-      this.getRecognizedTransactions.bind(this)
-    );
-    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 {
@@ -14,10 +13,9 @@ export default class CashflowController {
   router() {
     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(CommandCashflowTransaction).router());
     router.use(Container.get(DeleteCashflowTransaction).router());
 
     return router;

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

@@ -3,15 +3,14 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { param } from 'express-validator';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
+import DeleteCashflowTransactionService from '../../../services/Cashflow/DeleteCashflowTransactionService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
 @Service()
-export default class DeleteCashflowTransactionController extends BaseController {
+export default class DeleteCashflowTransaction extends BaseController {
   @Inject()
-  private cashflowApplication: CashflowApplication;
+  deleteCashflowService: DeleteCashflowTransactionService;
 
   /**
    * Controller router.
@@ -45,7 +44,7 @@ export default class DeleteCashflowTransactionController extends BaseController
 
     try {
       const { oldCashflowTransaction } =
-        await this.cashflowApplication.deleteTransaction(
+        await this.deleteCashflowService.deleteCashflowTransaction(
           tenantId,
           transactionId
         );
@@ -93,19 +92,6 @@ export default class DeleteCashflowTransactionController extends BaseController
           ],
         });
       }
-      if (
-        error.errorType ===
-        'CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED'
-      ) {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED',
-              code: 4100,
-            },
-          ],
-        });
-      }
     }
     next(error);
   }

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

@@ -1,16 +1,20 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { query } from 'express-validator';
+import { param, query } from 'express-validator';
+import GetCashflowAccountsService from '@/services/Cashflow/GetCashflowAccountsService';
 import BaseController from '../BaseController';
+import GetCashflowTransactionsService from '@/services/Cashflow/GetCashflowTransactionsService';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, CashflowAction } from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
 @Service()
 export default class GetCashflowAccounts extends BaseController {
   @Inject()
-  private cashflowApplication: CashflowApplication;
+  getCashflowAccountsService: GetCashflowAccountsService;
+
+  @Inject()
+  getCashflowTransactionsService: GetCashflowTransactionsService;
 
   /**
    * Controller router.
@@ -31,6 +35,7 @@ export default class GetCashflowAccounts extends BaseController {
         query('search_keyword').optional({ nullable: true }).isString().trim(),
       ],
       this.asyncMiddleware(this.getCashflowAccounts),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -57,7 +62,10 @@ export default class GetCashflowAccounts extends BaseController {
 
     try {
       const cashflowAccounts =
-        await this.cashflowApplication.getCashflowAccounts(tenantId, filter);
+        await this.getCashflowAccountsService.getCashflowAccounts(
+          tenantId,
+          filter
+        );
 
       return res.status(200).send({
         cashflow_accounts: this.transfromToResponse(cashflowAccounts),
@@ -66,4 +74,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

@@ -1,21 +1,16 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { param, query } from 'express-validator';
+import { param } from 'express-validator';
 import BaseController from '../BaseController';
+import GetCashflowTransactionsService from '@/services/Cashflow/GetCashflowTransactionsService';
 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;
+  getCashflowTransactionsService: GetCashflowTransactionsService;
-
-  @Inject()
-  private bankTransactionsMatchingApp: MatchBankTransactionsApplication;
 
   /**
    * Controller router.
@@ -23,15 +18,6 @@ export default class GetCashflowAccounts extends BaseController {
   public router() {
     const router = Router();
 
-    router.get(
-      '/transactions/matches',
-      [
-        query('uncategorizeTransactionsIds').exists().isArray({ min: 1 }),
-        query('uncategorizeTransactionsIds.*').exists().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.getMatchedTransactions.bind(this)
-    );
     router.get(
       '/transactions/:transactionId',
       CheckPolicies(CashflowAction.View, AbilitySubject.Cashflow),
@@ -49,7 +35,7 @@ export default class GetCashflowAccounts extends BaseController {
    * @param {NextFunction} next
    */
   private getCashflowTransaction = async (
-    req: Request<{ transactionId: number }>,
+    req: Request,
     res: Response,
     next: NextFunction
   ) => {
@@ -57,10 +43,12 @@ export default class GetCashflowAccounts extends BaseController {
     const { transactionId } = req.params;
 
     try {
-      const cashflowTransaction = await this.cashflowApplication.getTransaction(
+      const cashflowTransaction =
-        tenantId,
+        await this.getCashflowTransactionsService.getCashflowTransaction(
-        transactionId
+          tenantId,
-      );
+          transactionId
+        );
+
       return res.status(200).send({
         cashflow_transaction: this.transfromToResponse(cashflowTransaction),
       });
@@ -69,39 +57,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 },
-      null,
-      null,
-      { uncategorizeTransactionsIds: Array<number> }
-    >,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const uncategorizeTransactionsIds = req.query.uncategorizeTransactionsIds;
-    const filter = this.matchedQueryData(req) as GetMatchedTransactionsFilter;
-
-    try {
-      const data =
-        await this.bankTransactionsMatchingApp.getMatchedTransactions(
-          tenantId,
-          uncategorizeTransactionsIds,
-          filter
-        );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Catches the service errors.
    * @param {Error} error - Error.

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

@@ -1,21 +1,16 @@
 import { Service, Inject } from 'typedi';
-import { ValidationChain, body, check, param, query } from 'express-validator';
+import { check } from 'express-validator';
 import { Router, Request, Response, NextFunction } from 'express';
-import { omit } from 'lodash';
 import BaseController from '../BaseController';
 import { ServiceError } from '@/exceptions';
+import NewCashflowTransactionService from '@/services/Cashflow/NewCashflowTransactionService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import {
+import { AbilitySubject, CashflowAction } from '@/interfaces';
-  AbilitySubject,
-  CashflowAction,
-  ICategorizeCashflowTransactioDTO,
-} from '@/interfaces';
-import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
 
 @Service()
 export default class NewCashflowTransactionController extends BaseController {
   @Inject()
-  private cashflowApplication: CashflowApplication;
+  private newCashflowTranscationService: NewCashflowTransactionService;
 
   /**
    * Router constructor.
@@ -23,18 +18,6 @@ export default class NewCashflowTransactionController extends BaseController {
   public router() {
     const router = Router();
 
-    router.get(
-      '/transactions/uncategorized/:id',
-      this.asyncMiddleware(this.getUncategorizedCashflowTransaction),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/transactions/:id/uncategorized',
-      this.getUncategorizedTransactionsValidationSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.getUncategorizedCashflowTransactions),
-      this.catchServiceErrors
-    );
     router.post(
       '/transactions',
       CheckPolicies(CashflowAction.Create, AbilitySubject.Cashflow),
@@ -43,94 +26,21 @@ export default class NewCashflowTransactionController extends BaseController {
       this.asyncMiddleware(this.newCashflowTransaction),
       this.catchServiceErrors
     );
-    router.post(
-      '/transactions/uncategorize/bulk',
-      [
-        body('ids').isArray({ min: 1 }),
-        body('ids.*').exists().isNumeric().toInt(),
-      ],
-      this.validationResult,
-      this.uncategorizeBulkTransactions.bind(this),
-      this.catchServiceErrors
-    );
-    router.post(
-      '/transactions/:id/uncategorize',
-      this.revertCategorizedCashflowTransaction,
-      this.catchServiceErrors
-    );
-    router.post(
-      '/transactions/categorize',
-      this.categorizeCashflowTransactionValidationSchema,
-      this.validationResult,
-      this.categorizeCashflowTransaction,
-      this.catchServiceErrors
-    );
-    router.post(
-      '/transaction/:id/categorize/expense',
-      this.categorizeAsExpenseValidationSchema,
-      this.validationResult,
-      this.categorizesCashflowTransactionAsExpense,
-      this.catchServiceErrors
-    );
     return router;
   }
 
-  /**
-   * Getting uncategorized transactions validation schema.
-   * @returns {ValidationChain}
-   */
-  public get getUncategorizedTransactionsValidationSchema() {
-    return [
-      param('id').exists().isNumeric().toInt(),
-      query('page').optional().isNumeric().toInt(),
-      query('page_size').optional().isNumeric().toInt(),
-      query('min_date').optional({ nullable: true }).isISO8601().toDate(),
-      query('max_date').optional({ nullable: true }).isISO8601().toDate(),
-      query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
-      query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
-    ];
-  }
-
-  /**
-   * Categorize as expense validation schema.
-   */
-  public get categorizeAsExpenseValidationSchema() {
-    return [
-      check('expense_account_id').exists(),
-      check('date').isISO8601().exists(),
-      check('reference_no').optional(),
-      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
-    ];
-  }
-
-  /**
-   * Categorize cashflow tranasction validation schema.
-   */
-  public get categorizeCashflowTransactionValidationSchema() {
-    return [
-      check('uncategorized_transaction_ids').exists().isArray({ min: 1 }),
-      check('date').exists().isISO8601().toDate(),
-      check('credit_account_id').exists().isInt().toInt(),
-      check('transaction_number').optional(),
-      check('transaction_type').exists(),
-      check('reference_no').optional(),
-      check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
-      check('description').optional(),
-      check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
-    ];
-  }
-
   /**
    * New cashflow transaction validation schema.
    */
-  public get newTransactionValidationSchema() {
+  get newTransactionValidationSchema() {
     return [
       check('date').exists().isISO8601().toDate(),
-      check('reference_no').optional({ nullable: true }).trim(),
+      check('reference_no').optional({ nullable: true }).trim().escape(),
       check('description')
         .optional({ nullable: true })
         .isLength({ min: 3 })
-        .trim(),
+        .trim()
+        .escape(),
       check('transaction_type').exists(),
 
       check('amount').exists().isFloat().toFloat(),
@@ -138,7 +48,9 @@ export default class NewCashflowTransactionController extends BaseController {
       check('credit_account_id').exists().isInt().toInt(),
 
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
+
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
+
       check('publish').default(false).isBoolean().toBoolean(),
     ];
   }
@@ -158,12 +70,13 @@ export default class NewCashflowTransactionController extends BaseController {
     const ownerContributionDTO = this.matchedBodyData(req);
 
     try {
-      const cashflowTransaction =
+      const { cashflowTransaction } =
-        await this.cashflowApplication.createTransaction(
+        await this.newCashflowTranscationService.newCashflowTransaction(
           tenantId,
           ownerContributionDTO,
           userId
         );
+
       return res.status(200).send({
         id: cashflowTransaction.id,
         message: 'New cashflow transaction has been created successfully.',
@@ -173,180 +86,11 @@ export default class NewCashflowTransactionController extends BaseController {
     }
   };
 
-  /**
-   * Revert the categorized cashflow transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private revertCategorizedCashflowTransaction = async (
-    req: Request<{ id: number }>,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: cashflowTransactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.uncategorizeTransaction(
-        tenantId,
-        cashflowTransactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Uncategorize the given transactions in bulk.
-   * @param {Request<{}>} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   * @returns {Promise<Response | null>}
-   */
-  private uncategorizeBulkTransactions = async (
-    req: Request<{}>,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { ids: uncategorizedTransactionIds } = this.matchedBodyData(req);
-
-    try {
-      await this.cashflowApplication.uncategorizeTransactions(
-        tenantId,
-        uncategorizedTransactionIds
-      );
-      return res.status(200).send({
-        message: 'The given transactions have been uncategorized successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Categorize the cashflow transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private categorizeCashflowTransaction = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const matchedObject = this.matchedBodyData(req);
-    const categorizeDTO = omit(matchedObject, [
-      'uncategorizedTransactionIds',
-    ]) as ICategorizeCashflowTransactioDTO;
-
-    const uncategorizedTransactionIds =
-      matchedObject.uncategorizedTransactionIds;
-
-    try {
-      await this.cashflowApplication.categorizeTransaction(
-        tenantId,
-        uncategorizedTransactionIds,
-        categorizeDTO
-      );
-      return res.status(200).send({
-        message: 'The cashflow transaction has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Categorize the transaction as expense transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private categorizesCashflowTransactionAsExpense = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: cashflowTransactionId } = req.params;
-    const cashflowTransaction = this.matchedBodyData(req);
-
-    try {
-      await this.cashflowApplication.categorizeAsExpense(
-        tenantId,
-        cashflowTransactionId,
-        cashflowTransaction
-      );
-      return res.status(200).send({
-        message: 'The cashflow transaction has been created successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the uncategorized cashflow transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getUncategorizedCashflowTransaction = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: transactionId } = req.params;
-
-    try {
-      const data = await this.cashflowApplication.getUncategorizedTransaction(
-        tenantId,
-        transactionId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the uncategorized cashflow transactions.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getUncategorizedCashflowTransactions = async (
-    req: Request<{ id: number }>,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: accountId } = req.params;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const data = await this.cashflowApplication.getUncategorizedTransactions(
-        tenantId,
-        accountId,
-        query
-      );
-
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  };
-
   /**
    * Handle the service errors.
    * @param error
-   * @param {Request} req
+   * @param req
-   * @param {res
+   * @param res
    * @param next
    * @returns
    */
@@ -396,16 +140,6 @@ export default class NewCashflowTransactionController extends BaseController {
           ],
         });
       }
-      if (error.errorType === 'UNCATEGORIZED_TRANSACTION_TYPE_INVALID') {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'UNCATEGORIZED_TRANSACTION_TYPE_INVALID',
-              code: 4100,
-            },
-          ],
-        });
-      }
     }
     next(error);
   }

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

@@ -26,27 +26,27 @@ export default class ContactsController extends BaseController {
       [...this.autocompleteQuerySchema],
       this.validationResult,
       this.asyncMiddleware(this.autocompleteContacts.bind(this)),
-      this.dynamicListService.handlerErrorsToResponse,
+      this.dynamicListService.handlerErrorsToResponse
     );
     router.get(
       '/:id',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
-      this.asyncMiddleware(this.getContact.bind(this)),
+      this.asyncMiddleware(this.getContact.bind(this))
     );
     router.post(
       '/:id/inactivate',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
       this.asyncMiddleware(this.inactivateContact.bind(this)),
-      this.handlerServiceErrors,
+      this.handlerServiceErrors
     );
     router.post(
       '/:id/activate',
       [param('id').exists().isNumeric().toInt()],
       this.validationResult,
       this.asyncMiddleware(this.activateContact.bind(this)),
-      this.handlerServiceErrors,
+      this.handlerServiceErrors
     );
     return router;
   }
@@ -56,7 +56,7 @@ export default class ContactsController extends BaseController {
    */
   get autocompleteQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('stringified_filter_roles').optional().isJSON(),
@@ -77,7 +77,7 @@ export default class ContactsController extends BaseController {
     try {
       const contact = await this.contactsService.getContact(
         tenantId,
-        contactId,
+        contactId
       );
       return res.status(200).send({
         customer: this.transfromToResponse(contact),
@@ -105,7 +105,7 @@ export default class ContactsController extends BaseController {
     try {
       const contacts = await this.contactsService.autocompleteContacts(
         tenantId,
-        filter,
+        filter
       );
       return res.status(200).send({ contacts });
     } catch (error) {
@@ -122,32 +122,38 @@ export default class ContactsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('first_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('last_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('company_name')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('display_name')
         .exists()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('email')
         .optional({ nullable: true })
         .isString()
+        .normalizeEmail()
         .isEmail()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('website')
@@ -160,101 +166,120 @@ export default class ContactsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('personal_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('billing_address_1')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_2')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_city')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_country')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_email')
         .optional({ nullable: true })
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_postcode')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('billing_address_state')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('shipping_address_1')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_2')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_city')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_country')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_email')
         .optional({ nullable: true })
         .isString()
         .isEmail()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_postcode')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_phone')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('shipping_address_state')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
 
       check('note')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('active').optional().isBoolean().toBoolean(),
     ];
@@ -355,7 +380,7 @@ export default class ContactsController extends BaseController {
     error: Error,
     req: Request,
     res: Response,
-    next: NextFunction,
+    next: NextFunction
   ) {
     if (error instanceof ServiceError) {
       if (error.errorType === 'contact_not_found') {

packages/server/src/api/controllers/Contacts/Customers.ts

@@ -106,7 +106,11 @@ export default class CustomersController extends ContactsController {
    */
   get customerDTOSchema() {
     return [
-      check('customer_type').exists().isIn(['business', 'individual']).trim(),
+      check('customer_type')
+        .exists()
+        .isIn(['business', 'individual'])
+        .trim()
+        .escape(),
     ];
   }
 
@@ -119,6 +123,7 @@ export default class CustomersController extends ContactsController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: 3 }),
     ];
   }
@@ -128,7 +133,7 @@ export default class CustomersController extends ContactsController {
    */
   get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),
@@ -155,8 +160,10 @@ export default class CustomersController extends ContactsController {
     try {
       const contact = await this.customersApplication.createCustomer(
         tenantId,
-        contactDTO
+        contactDTO,
+        user
       );
+
       return res.status(200).send({
         id: contact.id,
         message: 'The customer has been created successfully.',

packages/server/src/api/controllers/Contacts/Vendors.ts

@@ -106,6 +106,7 @@ export default class VendorsController extends ContactsController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ min: 3, max: 3 }),
     ];
   }
@@ -143,8 +144,10 @@ export default class VendorsController extends ContactsController {
     try {
       const vendor = await this.vendorsApplication.createVendor(
         tenantId,
-        contactDTO
+        contactDTO,
+        user
       );
+
       return res.status(200).send({
         id: vendor.id,
         message: 'The vendor has been created successfully.',

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

@@ -67,7 +67,7 @@ export default class CurrenciesController extends BaseController {
   }
 
   get currencyParamSchema(): ValidationChain[] {
-    return [param('currency_code').exists().trim()];
+    return [param('currency_code').exists().trim().escape()];
   }
 
   get listSchema(): ValidationChain[] {
@@ -187,13 +187,11 @@ export default class CurrenciesController extends BaseController {
       }
       if (error.errorType === 'currency_code_exists') {
         return res.boom.badRequest(null, {
-          errors: [
+          errors: [{
-            {
+            type: 'CURRENCY_CODE_EXISTS',
-              type: 'CURRENCY_CODE_EXISTS',
+            message: 'The given currency code is already exists.',
-              message: 'The given currency code is already exists.',
+            code: 200,
-              code: 200,
+           }],
-            },
-          ],
         });
       }
       if (error.errorType === 'CANNOT_DELETE_BASE_CURRENCY') {

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

@@ -5,13 +5,13 @@ import DashboardService from '@/services/Dashboard/DashboardService';
 @Service()
 export default class DashboardMetaController {
   @Inject()
-  private dashboardService: DashboardService;
+  dashboardService: DashboardService;
 
   /**
-   * Constructor router.
+   *
    * @returns
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get('/boot', this.getDashboardBoot);
@@ -25,7 +25,7 @@ export default class DashboardMetaController {
    * @param {Response} res - 
    * @param {NextFunction} next -
    */
-  private getDashboardBoot = async (
+  getDashboardBoot = async (
     req: Request,
     res: Response,
     next: NextFunction

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

@@ -1,16 +1,19 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { query, oneOf } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from './BaseController';
 import { ServiceError } from '@/exceptions';
-import { EchangeRateErrors } from '@/lib/ExchangeRate/types';
+import ExchangeRatesService from '@/services/ExchangeRates/ExchangeRatesService';
-import { ExchangeRateApplication } from '@/services/ExchangeRates/ExchangeRateApplication';
+import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 
 @Service()
 export default class ExchangeRatesController extends BaseController {
   @Inject()
-  private exchangeRatesApp: ExchangeRateApplication;
+  exchangeRatesService: ExchangeRatesService;
+
+  @Inject()
+  dynamicListService: DynamicListingService;
 
   /**
    * Constructor method.
@@ -19,40 +22,164 @@ export default class ExchangeRatesController extends BaseController {
     const router = Router();
 
     router.get(
-      '/latest',
+      '/',
-      [
+      [...this.exchangeRatesListSchema],
-        oneOf([
-          query('to_currency').exists().isString().isISO4217(),
-          query('from_currency').exists().isString().isISO4217(),
-        ]),
-      ],
       this.validationResult,
-      asyncMiddleware(this.latestExchangeRate.bind(this)),
+      asyncMiddleware(this.exchangeRates.bind(this)),
+      this.dynamicListService.handlerErrorsToResponse,
+      this.handleServiceError,
+    );
+    router.post(
+      '/',
+      [...this.exchangeRateDTOSchema],
+      this.validationResult,
+      asyncMiddleware(this.addExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.post(
+      '/:id',
+      [...this.exchangeRateEditDTOSchema, ...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.editExchangeRate.bind(this)),
+      this.handleServiceError
+    );
+    router.delete(
+      '/:id',
+      [...this.exchangeRateIdSchema],
+      this.validationResult,
+      asyncMiddleware(this.deleteExchangeRate.bind(this)),
       this.handleServiceError
     );
     return router;
   }
 
+  get exchangeRatesListSchema() {
+    return [
+      query('page').optional().isNumeric().toInt(),
+      query('page_size').optional().isNumeric().toInt(),
+
+      query('column_sort_by').optional(),
+      query('sort_order').optional().isIn(['desc', 'asc']),
+    ];
+  }
+
+  get exchangeRateDTOSchema() {
+    return [
+      check('exchange_rate').exists().isNumeric().toFloat(),
+      check('currency_code').exists().trim().escape(),
+      check('date').exists().isISO8601(),
+    ];
+  }
+
+  get exchangeRateEditDTOSchema() {
+    return [check('exchange_rate').exists().isNumeric().toFloat()];
+  }
+
+  get exchangeRateIdSchema() {
+    return [param('id').isNumeric().toInt()];
+  }
+
+  get exchangeRatesIdsSchema() {
+    return [
+      query('ids').isArray({ min: 2 }),
+      query('ids.*').isNumeric().toInt(),
+    ];
+  }
+
   /**
    * Retrieve exchange rates.
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async latestExchangeRate(
+  async exchangeRates(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId } = req;
-    const exchangeRateQuery = this.matchedQueryData(req);
+    const filter = {
+      page: 1,
+      pageSize: 12,
+      filterRoles: [],
+      columnSortBy: 'created_at',
+      sortOrder: 'asc',
+      ...this.matchedQueryData(req),
+    };
+    if (filter.stringifiedFilterRoles) {
+      filter.filterRoles = JSON.parse(filter.stringifiedFilterRoles);
+    }
+    try {
+      const exchangeRates = await this.exchangeRatesService.listExchangeRates(
+        tenantId,
+        filter
+      );
+      return res.status(200).send({ exchange_rates: exchangeRates });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Adds a new exchange rate on the given date.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async addExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const exchangeRateDTO = this.matchedBodyData(req);
 
     try {
-      const exchangeRate = await this.exchangeRatesApp.latest(
+      const exchangeRate = await this.exchangeRatesService.newExchangeRate(
         tenantId,
-        exchangeRateQuery
+        exchangeRateDTO
       );
-      return res.status(200).send(exchangeRate);
+      return res.status(200).send({ id: exchangeRate.id });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Edit the given exchange rate.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async editExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+    const exchangeRateDTO = this.matchedBodyData(req);
+
+    try {
+      const exchangeRate = await this.exchangeRatesService.editExchangeRate(
+        tenantId,
+        exchangeRateId,
+        exchangeRateDTO
+      );
+
+      return res.status(200).send({
+        id: exchangeRateId,
+        message: 'The exchange rate has been edited successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Delete the given exchange rate from the storage.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async deleteExchangeRate(req: Request, res: Response, next: NextFunction) {
+    const { tenantId } = req;
+    const { id: exchangeRateId } = req.params;
+
+    try {
+      await this.exchangeRatesService.deleteExchangeRate(
+        tenantId,
+        exchangeRateId
+      );
+      return res.status(200).send({ id: exchangeRateId });
     } catch (error) {
       next(error);
     }
@@ -65,56 +192,26 @@ export default class ExchangeRatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private handleServiceError(
+  handleServiceError(
     error: Error,
     req: Request,
     res: Response,
     next: NextFunction
   ) {
     if (error instanceof ServiceError) {
-      if (EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY === error.errorType) {
+      if (error.errorType === 'EXCHANGE_RATE_NOT_FOUND') {
-        return res.status(400).send({
+        return res.status(404).send({
-          errors: [
+          errors: [{ type: 'EXCHANGE.RATE.NOT.FOUND', code: 200 }],
-            {
-              type: EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-              code: 100,
-              message: 'The given base currency is invalid.',
-            },
-          ],
         });
-      } else if (
+      }
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED === error.errorType
+      if (error.errorType === 'NOT_FOUND_EXCHANGE_RATES') {
-      ) {
         return res.status(400).send({
-          errors: [
+          errors: [{ type: 'EXCHANGE.RATES.IS.NOT.FOUND', code: 100 }],
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-              code: 200,
-              message: 'The service is not allowed',
-            },
-          ],
         });
-      } else if (
+      }
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED === error.errorType
+      if (error.errorType === 'EXCHANGE_RATE_PERIOD_EXISTS') {
-      ) {
         return res.status(400).send({
-          errors: [
+          errors: [{ type: 'EXCHANGE.RATE.PERIOD.EXISTS', code: 300 }],
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-              code: 300,
-              message: 'The API key is required',
-            },
-          ],
-        });
-      } else if (EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED === error.errorType) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_LIMIT_EXCEEDED,
-              code: 400,
-              message: 'The API rate limit has been exceeded',
-            },
-          ],
         });
       }
     }

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

@@ -84,11 +84,12 @@ export class ExpensesController extends BaseController {
   /**
    * Expense DTO schema.
    */
-  private get expenseDTOSchema() {
+  get expenseDTOSchema() {
     return [
       check('reference_no')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('payment_date').exists().isISO8601().toDate(),
       check('payment_account_id')
@@ -122,15 +123,13 @@ export class ExpensesController extends BaseController {
       check('categories.*.description')
         .optional()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('categories.*.landed_cost').optional().isBoolean().toBoolean(),
       check('categories.*.project_id')
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -142,6 +141,7 @@ export class ExpensesController extends BaseController {
       check('reference_no')
         .optional({ nullable: true })
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('payment_date').exists().isISO8601().toDate(),
       check('payment_account_id')
@@ -176,15 +176,13 @@ export class ExpensesController extends BaseController {
       check('categories.*.description')
         .optional()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('categories.*.landed_cost').optional().isBoolean().toBoolean(),
       check('categories.*.project_id')
         .optional({ nullable: true })
         .isInt({ max: DATATYPES_LENGTH.INT_10 })
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -271,7 +269,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async deleteExpense(req: Request, res: Response, next: NextFunction) {
+  async deleteExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -293,11 +291,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async publishExpense(
+  async publishExpense(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId, user } = req;
     const { id: expenseId } = req.params;
 
@@ -319,11 +313,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpensesList(
+  async getExpensesList(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -353,7 +343,7 @@ export class ExpensesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private async getExpense(req: Request, res: Response, next: NextFunction) {
+  async getExpense(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { id: expenseId } = req.params;
 

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

@@ -1,87 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { query } from 'express-validator';
-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 {
-  @Inject()
-  private exportResourceApp: ExportApplication;
-
-  /**
-   * Router constructor method.
-   */
-  public router() {
-    const router = Router();
-
-    router.get(
-      '/',
-      [
-        query('resource').exists(),
-        query('format').isIn(['csv', 'xlsx']).optional(),
-      ],
-      this.validationResult,
-      this.export.bind(this),
-    );
-    return router;
-  }
-
-  /**
-   * Imports xlsx/csv to the given resource type.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async export(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const query = this.matchedQueryData(req);
-
-    try {
-      const accept = this.accepts(req);
-
-      const acceptType = accept.types([
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      const applicationFormat = convertAcceptFormatToFormat(acceptType);
-
-      const data = await this.exportResourceApp.export(
-        tenantId,
-        query.resource,
-        applicationFormat
-      );
-      // Retrieves the csv format.
-      if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(data);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          '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);
-    }
-  }
-}

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/FinancialStatements/APAgingSummary.ts

@@ -2,20 +2,19 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import APAgingSummaryReportService from '@/services/FinancialStatements/AgingSummary/APAgingSummaryService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { APAgingSummaryApplication } from '@/services/FinancialStatements/AgingSummary/APAgingSummaryApplication';
 
 export default class APAgingSummaryReportController extends BaseFinancialReportController {
   @Inject()
-  private APAgingSummaryApp: APAgingSummaryApplication;
+  APAgingSummaryService: APAgingSummaryReportService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -29,9 +28,8 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
 
   /**
    * Validation schema.
-   * @returns {ValidationChain[]}
    */
-  private get validationSchema() {
+  get validationSchema() {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('as_date').optional().isISO8601(),
@@ -51,68 +49,42 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
   }
 
   /**
-   * Retrieves payable aging summary report.
+   * Retrieve payable aging summary report.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
    */
-  private async payableAgingSummary(
+  async payableAgingSummary(req: Request, res: Response, next: NextFunction) {
-    req: Request,
+    const { tenantId, settings } = req;
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
     try {
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.APAgingSummaryApp.table(tenantId, filter);
 
-        return res.status(200).send(table);
+      switch (acceptType) {
-        // Retrieves the csv format.
+        case 'application/json+table':
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
+          const table = await this.APAgingSummaryService.APAgingSummaryTable(
-        const csv = await this.APAgingSummaryApp.csv(tenantId, filter);
+            tenantId,
+            filter
+          );
+          return res.status(200).send({
+            table: {
+              rows: table.rows,
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.APAgingSummaryService.APAgingSummary(tenantId, filter);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+          return res.status(200).send({
-        res.setHeader('Content-Type', 'text/csv');
+            data: this.transfromToResponse(data),
-
+            columns: this.transfromToResponse(columns),
-        return res.send(csv);
+            query: this.transfromToResponse(query),
-        // Retrieves the xlsx format.
+            meta: this.transfromToResponse(meta),
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+          });
-        const buffer = await this.APAgingSummaryApp.xlsx(tenantId, filter);
+          break;
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.APAgingSummaryApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.APAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/ARAgingSummary.ts

@@ -5,18 +5,16 @@ import ARAgingSummaryService from '@/services/FinancialStatements/AgingSummary/A
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ARAgingSummaryApplication } from '@/services/FinancialStatements/AgingSummary/ARAgingSummaryApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class ARAgingSummaryReportController extends BaseFinancialReportController {
   @Inject()
-  private ARAgingSummaryApp: ARAgingSummaryApplication;
+  ARAgingSummaryService: ARAgingSummaryService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -32,7 +30,7 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC
   /**
    * AR aging summary validation roles.
    */
-  private get validationSchema() {
+  get validationSchema() {
     return [
       ...this.sheetNumberFormatValidationSchema,
 
@@ -54,63 +52,41 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC
 
   /**
    * Retrieve AR aging summary report.
-   * @param {Request} req
-   * @param {Response} res
    */
-  private async receivableAgingSummary(req: Request, res: Response) {
+  async receivableAgingSummary(req: Request, res: Response) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     const filter = this.matchedQueryData(req);
 
     try {
       const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      const acceptType = accept.types([
+      switch (acceptType) {
-        ACCEPT_TYPE.APPLICATION_JSON,
+        case 'application/json+table':
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+          const table = await this.ARAgingSummaryService.ARAgingSummaryTable(
-        ACCEPT_TYPE.APPLICATION_CSV,
+            tenantId,
-        ACCEPT_TYPE.APPLICATION_XLSX,
+            filter
-        ACCEPT_TYPE.APPLICATION_PDF
+          );
-      ]);
+          return res.status(200).send({
-      // Retrieves the xlsx format.
+            table: {
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+              rows: table.rows,
-        const buffer = await this.ARAgingSummaryApp.xlsx(tenantId, filter);
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.ARAgingSummaryService.ARAgingSummary(tenantId, filter);
 
-        res.setHeader(
+          return res.status(200).send({
-          'Content-Disposition',
+            data: this.transfromToResponse(data),
-          'attachment; filename=output.xlsx'
+            columns: this.transfromToResponse(columns),
-        );
+            query: this.transfromToResponse(query),
-        res.setHeader(
+            meta: this.transfromToResponse(meta),
-          'Content-Type',
+          });
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+          break;
-        );
-        return res.send(buffer);
-        // Retrieves the table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.ARAgingSummaryApp.table(tenantId, filter);
-
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.ARAgingSummaryApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.ARAgingSummaryApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.ARAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       console.log(error);

packages/server/src/api/controllers/FinancialStatements/BalanceSheet.ts

@@ -3,21 +3,25 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { castArray } from 'lodash';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import BalanceSheetStatementService from '@/services/FinancialStatements/BalanceSheet/BalanceSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { BalanceSheetApplication } from '@/services/FinancialStatements/BalanceSheet/BalanceSheetApplication';
+import BalanceSheetTable from '@/services/FinancialStatements/BalanceSheet/BalanceSheetTable';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 @Service()
 export default class BalanceSheetStatementController extends BaseFinancialReportController {
   @Inject()
-  private balanceSheetApp: BalanceSheetApplication;
+  balanceSheetService: BalanceSheetStatementService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -34,7 +38,7 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
    * Balance sheet validation schecma.
    * @returns {ValidationChain[]}
    */
-  private get balanceSheetValidationSchema(): ValidationChain[] {
+  get balanceSheetValidationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('accounting_method').optional().isIn(['cash', 'accrual']),
@@ -80,12 +84,10 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
 
   /**
    * Retrieve the balance sheet.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
    */
-  private async balanceSheet(req: Request, res: Response, next: NextFunction) {
+  async balanceSheet(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
+    const i18n = this.tenancy.i18n(tenantId);
 
     let filter = this.matchedQueryData(req);
 
@@ -93,55 +95,29 @@ export default class BalanceSheetStatementController extends BaseFinancialReport
       ...filter,
       accountsIds: castArray(filter.accountsIds),
     };
+
     try {
+      const { data, columns, query, meta } =
+        await this.balanceSheetService.balanceSheet(tenantId, filter);
+
       const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      const acceptType = accept.types([
+      const table = new BalanceSheetTable(data, query, i18n);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE == acceptType) {
-        const table = await this.balanceSheetApp.table(tenantId, filter);
 
-        return res.status(200).send(table);
+      switch (acceptType) {
-        // Retrieves the csv format.
+        case 'application/json+table':
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
+          return res.status(200).send({
-        const buffer = await this.balanceSheetApp.csv(tenantId, filter);
+            table: {
-
+              rows: table.tableRows(),
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+              columns: table.tableColumns(),
-        res.setHeader('Content-Type', 'text/csv');
+            },
-
+            query,
-        return res.send(buffer);
+            meta,
-        // Retrieves the xlsx format.
+          });
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+        case 'json':
-        const buffer = await this.balanceSheetApp.xlsx(tenantId, filter);
+        default:
-
+          return res.status(200).send({ data, columns, query, meta });
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.balanceSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        res.send(pdfContent);
-      } else {
-        const sheet = await this.balanceSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/BaseFinancialReportController.ts

@@ -1,7 +1,9 @@
 import { query } from 'express-validator';
-import BaseController from '../BaseController';
+import BaseController from "../BaseController";
 
 export default class BaseFinancialReportController extends BaseController {
+
+
   get sheetNumberFormatValidationSchema() {
     return [
       query('number_format.precision')
@@ -17,7 +19,8 @@ export default class BaseFinancialReportController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
     ];
   }
-}
+}

packages/server/src/api/controllers/FinancialStatements/CashFlow/CashFlow.ts

@@ -8,20 +8,29 @@ import {
   ValidationChain,
 } from 'express';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import CashFlowStatementService from '@/services/FinancialStatements/CashFlow/CashFlowService';
+import {
+  ICashFlowStatementDOO,
+  ICashFlowStatement,
+  AbilitySubject,
+  ReportsAction,
+} from '@/interfaces';
+import CashFlowTable from '@/services/FinancialStatements/CashFlow/CashFlowTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { CashflowSheetApplication } from '@/services/FinancialStatements/CashFlow/CashflowSheetApplication';
 
 @Service()
 export default class CashFlowController extends BaseFinancialReportController {
   @Inject()
-  private cashflowSheetApp: CashflowSheetApplication;
+  cashFlowService: CashFlowStatementService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -38,7 +47,7 @@ export default class CashFlowController extends BaseFinancialReportController {
    * Balance sheet validation schecma.
    * @returns {ValidationChain[]}
    */
-  private get cashflowValidationSchema(): ValidationChain[] {
+  get cashflowValidationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('from_date').optional(),
@@ -58,6 +67,41 @@ export default class CashFlowController extends BaseFinancialReportController {
     ];
   }
 
+  /**
+   * Retrieve the cashflow statment to json response.
+   * @param {ICashFlowStatement} cashFlow -
+   */
+  private transformJsonResponse(cashFlowDOO: ICashFlowStatementDOO) {
+    const { data, query, meta } = cashFlowDOO;
+
+    return {
+      data: this.transfromToResponse(data),
+      query: this.transfromToResponse(query),
+      meta: this.transfromToResponse(meta),
+    };
+  }
+
+  /**
+   * Transformes the report statement to table rows.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToTableRows(
+    cashFlowDOO: ICashFlowStatementDOO,
+    tenantId: number
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const cashFlowTable = new CashFlowTable(cashFlowDOO, i18n);
+
+    return {
+      table: {
+        data: cashFlowTable.tableRows(),
+        columns: cashFlowTable.tableColumns(),
+      },
+      query: this.transfromToResponse(cashFlowDOO.query),
+      meta: this.transfromToResponse(cashFlowDOO.meta),
+    };
+  }
+
   /**
    * Retrieve the cash flow statment.
    * @param {Request} req
@@ -65,62 +109,26 @@ export default class CashFlowController extends BaseFinancialReportController {
    * @param {NextFunction} next
    * @returns {Response}
    */
-  public async cashFlow(req: Request, res: Response, next: NextFunction) {
+  async cashFlow(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     const filter = {
       ...this.matchedQueryData(req),
     };
 
     try {
+      const cashFlow = await this.cashFlowService.cashFlow(tenantId, filter);
+
       const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      const acceptType = accept.types([
+      switch (acceptType) {
-        ACCEPT_TYPE.APPLICATION_JSON,
+        case 'application/json+table':
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+          return res
-        ACCEPT_TYPE.APPLICATION_CSV,
+            .status(200)
-        ACCEPT_TYPE.APPLICATION_XLSX,
+            .send(this.transformToTableRows(cashFlow, tenantId));
-        ACCEPT_TYPE.APPLICATION_PDF
+        case 'json':
-      ]);
+        default:
-      // Retrieves the json table format.
+          return res.status(200).send(this.transformJsonResponse(cashFlow));
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.cashflowSheetApp.table(tenantId, filter);
-
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.cashflowSheetApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.status(200).send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.cashflowSheetApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.cashflowSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const cashflow = await this.cashflowSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(cashflow);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/CustomerBalanceSummary/index.ts

@@ -1,21 +1,29 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject } from 'typedi';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import {
+  AbilitySubject,
+  ICustomerBalanceSummaryStatement,
+  ReportsAction,
+} from '@/interfaces';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import CustomerBalanceSummary from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryService';
 import BaseFinancialReportController from '../BaseFinancialReportController';
+import CustomerBalanceSummaryTableRows from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryTableRows';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { CustomerBalanceSummaryApplication } from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryApplication';
 
 export default class CustomerBalanceSummaryReportController extends BaseFinancialReportController {
   @Inject()
-  private customerBalanceSummaryApp: CustomerBalanceSummaryApplication;
+  customerBalanceSummaryService: CustomerBalanceSummary;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -34,7 +42,7 @@ export default class CustomerBalanceSummaryReportController extends BaseFinancia
   /**
    * Validation schema.
    */
-  private get validationSchema() {
+  get validationSchema() {
     return [
       ...this.sheetNumberFormatValidationSchema,
 
@@ -54,81 +62,75 @@ export default class CustomerBalanceSummaryReportController extends BaseFinancia
     ];
   }
 
+  /**
+   * Transformes the balance summary statement to table rows.
+   * @param {ICustomerBalanceSummaryStatement} statement -
+   */
+  private transformToTableRows(
+    tenantId,
+    { data, query }: ICustomerBalanceSummaryStatement
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const tableRows = new CustomerBalanceSummaryTableRows(data, query, i18n);
+
+    return {
+      table: {
+        columns: tableRows.tableColumns(),
+        data: tableRows.tableRows(),
+      },
+      query: this.transfromToResponse(query),
+    };
+  }
+
+  /**
+   * Transformes the balance summary statement to raw json.
+   * @param {ICustomerBalanceSummaryStatement} customerBalance -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+    query,
+  }: ICustomerBalanceSummaryStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
   /**
    * Retrieve payable aging summary report.
    * @param {Request} req -
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  private async customerBalanceSummary(
+  async customerBalanceSummary(
     req: Request,
     res: Response,
     next: NextFunction
   ) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     const filter = this.matchedQueryData(req);
 
     try {
+      const customerBalanceSummary =
+        await this.customerBalanceSummaryService.customerBalanceSummary(
+          tenantId,
+          filter
+        );
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
 
-      // Retrieves the xlsx format.
+      switch (acceptType) {
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+        case 'application/json+table':
-        const buffer = await this.customerBalanceSummaryApp.xlsx(
+          return res
-          tenantId,
+            .status(200)
-          filter
+            .send(this.transformToTableRows(tenantId, customerBalanceSummary));
-        );
+        case 'application/json':
-        res.setHeader(
+        default:
-          'Content-Disposition',
+          return res
-          'attachment; filename=output.xlsx'
+            .status(200)
-        );
+            .send(this.transformToJsonResponse(customerBalanceSummary));
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.customerBalanceSummaryApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.pdf(
-          tenantId,
-          filter
-        );
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': buffer.length,
-        });
-        return res.send(buffer);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.customerBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/GeneralLedger.ts

@@ -2,21 +2,20 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import GeneralLedgerService from '@/services/FinancialStatements/GeneralLedger/GeneralLedgerService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { GeneralLedgerApplication } from '@/services/FinancialStatements/GeneralLedger/GeneralLedgerApplication';
 
 @Service()
 export default class GeneralLedgerReportController extends BaseFinancialReportController {
   @Inject()
-  private generalLedgerApplication: GeneralLedgerApplication;
+  generalLedgetService: GeneralLedgerService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -32,7 +31,7 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
   /**
    * Validation schema.
    */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
@@ -61,56 +60,21 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async generalLedger(req: Request, res: Response, next: NextFunction) {
+  async generalLedger(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     const filter = this.matchedQueryData(req);
-    const accept = this.accepts(req);
 
-    const acceptType = accept.types([
+    try {
-      ACCEPT_TYPE.APPLICATION_JSON,
+      const { data, query, meta } =
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+        await this.generalLedgetService.generalLedger(tenantId, filter);
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves the table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.generalLedgerApplication.table(tenantId, filter);
 
-      return res.status(200).send(table);
+      return res.status(200).send({
-      // Retrieves the csv format.
+        meta: this.transfromToResponse(meta),
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
+        data: this.transfromToResponse(data),
-      const buffer = await this.generalLedgerApplication.csv(tenantId, filter);
+        query: this.transfromToResponse(query),
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.generalLedgerApplication.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // Retrieves the pdf format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.generalLedgerApplication.pdf(
-        tenantId,
-        filter
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
       });
-      return res.send(pdfContent);
+    } catch (error) {
-      // Retrieves the json format.
+      next(error);
-    } else {
-      const sheet = await this.generalLedgerApplication.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
     }
   }
 }

packages/server/src/api/controllers/FinancialStatements/InventoryDetails/index.ts

@@ -8,20 +8,24 @@ import {
   ValidationChain,
 } from 'express';
 import BaseController from '@/api/controllers/BaseController';
+import InventoryDetailsService from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsService';
+import InventoryDetailsTable from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsTable';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
-import { InventortyDetailsApplication } from '@/services/FinancialStatements/InventoryDetails/InventoryDetailsApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class InventoryDetailsController extends BaseController {
   @Inject()
-  private inventoryItemDetailsApp: InventortyDetailsApplication;
+  inventoryDetailsService: InventoryDetailsService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -41,7 +45,7 @@ export default class InventoryDetailsController extends BaseController {
    * Balance sheet validation schecma.
    * @returns {ValidationChain[]}
    */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
     return [
       query('number_format.precision')
         .optional()
@@ -51,7 +55,8 @@ export default class InventoryDetailsController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
       query('from_date').optional(),
       query('to_date').optional(),
 
@@ -72,76 +77,69 @@ export default class InventoryDetailsController extends BaseController {
   }
 
   /**
-   * Retrieve the inventory item details sheet.
+   * Retrieve the cashflow statment to json response.
+   * @param {ICashFlowStatement} cashFlow -
+   */
+  private transformJsonResponse(inventoryDetails) {
+    const { data, query, meta } = inventoryDetails;
+
+    return {
+      data: this.transfromToResponse(data),
+      query: this.transfromToResponse(query),
+      meta: this.transfromToResponse(meta),
+    };
+  }
+
+  /**
+   * Transformes the report statement to table rows.
+   */
+  private transformToTableRows(inventoryDetails, tenantId: number) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const inventoryDetailsTable = new InventoryDetailsTable(
+      inventoryDetails,
+      i18n
+    );
+
+    return {
+      table: {
+        data: inventoryDetailsTable.tableData(),
+        columns: inventoryDetailsTable.tableColumns(),
+      },
+      query: this.transfromToResponse(inventoryDetails.query),
+      meta: this.transfromToResponse(inventoryDetails.meta),
+    };
+  }
+
+  /**
+   * Retrieve the cash flow statment.
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
    * @returns {Response}
    */
-  private async inventoryDetails(
+  async inventoryDetails(req: Request, res: Response, next: NextFunction) {
-    req: Request,
+    const { tenantId, settings } = req;
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
     const filter = {
       ...this.matchedQueryData(req),
     };
 
     try {
+      const inventoryDetails =
+        await this.inventoryDetailsService.inventoryDetails(tenantId, filter);
+
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.inventoryItemDetailsApp.csv(tenantId, filter);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+      switch (acceptType) {
-        res.setHeader('Content-Type', 'text/csv');
+        case 'application/json+table':
-
+          return res
-        return res.send(buffer);
+            .status(200)
-        // Retrieves the xlsx format.
+            .send(this.transformToTableRows(inventoryDetails, tenantId));
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
+        case 'json':
-        const buffer = await this.inventoryItemDetailsApp.xlsx(
+        default:
-          tenantId,
+          return res
-          filter
+            .status(200)
-        );
+            .send(this.transformJsonResponse(inventoryDetails));
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.inventoryItemDetailsApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const buffer = await this.inventoryItemDetailsApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': buffer.length,
-        });
-        return res.send(buffer);
-      } else {
-        const sheet = await this.inventoryItemDetailsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/InventoryValuationSheet.ts

@@ -3,15 +3,14 @@ import { query, ValidationChain } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import InventoryValuationService from '@/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { InventoryValuationSheetApplication } from '@/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class InventoryValuationReportController extends BaseFinancialReportController {
   @Inject()
-  private inventoryValuationApp: InventoryValuationSheetApplication;
+  inventoryValuationService: InventoryValuationService;
 
   /**
    * Router constructor.
@@ -72,55 +71,19 @@ export default class InventoryValuationReportController extends BaseFinancialRep
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    const accept = this.accepts(req);
+    try {
-
+      const { data, query, meta } =
-    const acceptType = accept.types([
+        await this.inventoryValuationService.inventoryValuationSheet(
-      ACCEPT_TYPE.APPLICATION_JSON,
+          tenantId,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+          filter
-      ACCEPT_TYPE.APPLICATION_XLSX,
+        );
-      ACCEPT_TYPE.APPLICATION_CSV,
+      return res.status(200).send({
-      ACCEPT_TYPE.APPLICATION_PDF,
+        meta: this.transfromToResponse(meta),
-    ]);
+        data: this.transfromToResponse(data),
-
+        query: this.transfromToResponse(query),
-    // Retrieves the json table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.inventoryValuationApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV == acceptType) {
-      const buffer = await this.inventoryValuationApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xslx buffer format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.inventoryValuationApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // Retrieves the pdf format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.inventoryValuationApp.pdf(tenantId, filter);
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
       });
-      return res.status(200).send(pdfContent);
+    } catch (error) {
-      // Retrieves the json format.
+      next(error);
-    } else {
-      const { data, query, meta } = await this.inventoryValuationApp.sheet(
-        tenantId,
-        filter
-      );
-      return res.status(200).send({ meta, data, query });
     }
   }
 }

packages/server/src/api/controllers/FinancialStatements/JournalSheet.ts

@@ -3,15 +3,14 @@ import { Request, Response, Router, NextFunction } from 'express';
 import { castArray } from 'lodash';
 import { query, oneOf } from 'express-validator';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import JournalSheetService from '@/services/FinancialStatements/JournalSheet/JournalSheetService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { JournalSheetApplication } from '@/services/FinancialStatements/JournalSheet/JournalSheetApplication';
 
 @Service()
 export default class JournalSheetController extends BaseFinancialReportController {
   @Inject()
-  private journalSheetApp: JournalSheetApplication;
+  journalService: JournalSheetService;
 
   /**
    * Router constructor.
@@ -36,7 +35,7 @@ export default class JournalSheetController extends BaseFinancialReportControlle
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
-      query('transaction_type').optional().trim(),
+      query('transaction_type').optional().trim().escape(),
       query('transaction_id').optional().isInt().toInt(),
       oneOf(
         [
@@ -58,58 +57,28 @@ export default class JournalSheetController extends BaseFinancialReportControlle
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async journal(req: Request, res: Response, next: NextFunction) {
+  async journal(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     let filter = this.matchedQueryData(req);
 
     filter = {
       ...filter,
       accountsIds: castArray(filter.accountsIds),
     };
-    const accept = this.accepts(req);
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
 
-    // Retrieves the json table format.
+    try {
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
+      const { data, query, meta } = await this.journalService.journalSheet(
-      const table = await this.journalSheetApp.table(tenantId, filter);
+        tenantId,
-      return res.status(200).send(table);
+        filter
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.journalSheetApp.csv(tenantId, filter);
-  
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.journalSheetApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       );
-      return res.send(buffer);
-      // Retrieves the json format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.journalSheetApp.pdf(tenantId, filter);
 
-      res.set({
+      return res.status(200).send({
-        'Content-Type': 'application/pdf',
+        data: this.transfromToResponse(data),
-        'Content-Length': pdfContent.length,
+        query: this.transfromToResponse(query),
+        meta: this.transfromToResponse(meta),
       });
-      res.send(pdfContent);
+    } catch (error) {
-    } else {
+      next(error);
-      const sheet = await this.journalSheetApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
     }
   }
 }

packages/server/src/api/controllers/FinancialStatements/ProfitLossSheet.ts

@@ -1,20 +1,24 @@
 import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
+import ProfitLossSheetService from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import { ProfitLossSheetTable } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable';
-import { ProfitLossSheetApplication } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetApplication';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 @Service()
 export default class ProfitLossSheetController extends BaseFinancialReportController {
   @Inject()
-  private profitLossSheetApp: ProfitLossSheetApplication;
+  profitLossSheetService: ProfitLossSheetService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -30,7 +34,7 @@ export default class ProfitLossSheetController extends BaseFinancialReportContro
   /**
    * Validation schema.
    */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('basis').optional(),
@@ -81,63 +85,37 @@ export default class ProfitLossSheetController extends BaseFinancialReportContro
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async profitLossSheet(
+  async profitLossSheet(req: Request, res: Response, next: NextFunction) {
-    req: Request,
+    const { tenantId, settings } = req;
-    res: Response,
+    const i18n = this.tenancy.i18n(tenantId);
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
     try {
-      // Retrieves the csv format.
+      const { data, query, meta } =
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
+        await this.profitLossSheetService.profitLossSheet(tenantId, filter);
-        const sheet = await this.profitLossSheetApp.csv(tenantId, filter);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+      const accept = this.accepts(req);
-        res.setHeader('Content-Type', 'text/csv');
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-        return res.send(sheet);
+      switch (acceptType) {
-        // Retrieves the json table format.
+        case 'application/json+table':
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
+          const table = new ProfitLossSheetTable(data, query, i18n);
-        const table = await this.profitLossSheetApp.table(tenantId, filter);
 
-        return res.status(200).send(table);
+          return res.status(200).send({
-        // Retrieves the xlsx format.
+            table: {
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
+              rows: table.tableRows(),
-        const sheet = await this.profitLossSheetApp.xlsx(tenantId, filter);
+              columns: table.tableColumns(),
-
+            },
-        res.setHeader(
+            query,
-          'Content-Disposition',
+            meta,
-          'attachment; filename=output.xlsx'
+          });
-        );
+        case 'json':
-        res.setHeader(
+        default:
-          'Content-Type',
+          return res.status(200).send({
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            data,
-        );
+            query,
-        return res.send(sheet);
+            meta,
-        // Retrieves the json format.
+          });
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.profitLossSheetApp.pdf(tenantId, filter);
-
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-      } else {
-        const sheet = await this.profitLossSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/PurchasesByItem.ts

@@ -1,18 +1,17 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
+import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
-import { PurchasesByItemsService } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
+import PurchasesByItemsService from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { PurcahsesByItemsApplication } from '@/services/FinancialStatements/PurchasesByItems/PurchasesByItemsApplication';
 
 @Service()
 export default class PurchasesByItemReportController extends BaseFinancialReportController {
   @Inject()
-  private purchasesByItemsApp: PurcahsesByItemsApplication;
+  purchasesByItemsService: PurchasesByItemsService;
 
   /**
    * Router constructor.
@@ -64,56 +63,20 @@ export default class PurchasesByItemReportController extends BaseFinancialReport
    * @param {Request} req -
    * @param {Response} res -
    */
-  public async purchasesByItems(req: Request, res: Response) {
+  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    const accept = this.accepts(req);
+    try {
-
+      const { data, query, meta } =
-    const acceptType = accept.types([
+        await this.purchasesByItemsService.purchasesByItems(tenantId, filter);
-      ACCEPT_TYPE.APPLICATION_JSON,
+      return res.status(200).send({
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+        meta: this.transfromToResponse(meta),
-      ACCEPT_TYPE.APPLICATION_XLSX,
+        data: this.transfromToResponse(data),
-      ACCEPT_TYPE.APPLICATION_CSV,
+        query: this.transfromToResponse(query),
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // JSON table response format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.purchasesByItemsApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // CSV response format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.purchasesByItemsApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Xlsx response format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = await this.purchasesByItemsApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-      );
-      return res.send(buffer);
-      // PDF response format.
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.purchasesByItemsApp.pdf(tenantId, filter);
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
       });
-      return res.send(pdfContent);
+    } catch (error) {
-      // Json response format.
+      next(error);
-    } else {
-      const sheet = await this.purchasesByItemsApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
     }
   }
 }

packages/server/src/api/controllers/FinancialStatements/SalesByItems.ts

@@ -1,39 +1,41 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { query, ValidationChain, ValidationSchema } from 'express-validator';
+import { query, ValidationChain } from 'express-validator';
+import moment from 'moment';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from './BaseFinancialReportController';
+import SalesByItemsReportService from '@/services/FinancialStatements/SalesByItems/SalesByItemsService';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { SalesByItemsApplication } from '@/services/FinancialStatements/SalesByItems/SalesByItemsApplication';
 
 @Service()
 export default class SalesByItemsReportController extends BaseFinancialReportController {
   @Inject()
-  private salesByItemsApp: SalesByItemsApplication;
+  salesByItemsService: SalesByItemsReportService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
       '/',
-      CheckPolicies(ReportsAction.READ_SALES_BY_ITEMS, AbilitySubject.Report),
+      CheckPolicies(
+        ReportsAction.READ_SALES_BY_ITEMS,
+        AbilitySubject.Report
+      ),
       this.validationSchema,
       this.validationResult,
-      asyncMiddleware(this.salesByItems.bind(this))
+      asyncMiddleware(this.purchasesByItems.bind(this))
     );
     return router;
   }
 
   /**
    * Validation schema.
-   * @returns {ValidationChain[]}
    */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
@@ -61,53 +63,22 @@ export default class SalesByItemsReportController extends BaseFinancialReportCon
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async salesByItems(req: Request, res: Response, next: NextFunction) {
+  async purchasesByItems(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
-    const accept = this.accepts(req);
 
-    const acceptType = accept.types([
+    try {
-      ACCEPT_TYPE.APPLICATION_JSON,
+      const { data, query, meta } = await this.salesByItemsService.salesByItems(
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+        tenantId,
-      ACCEPT_TYPE.APPLICATION_CSV,
+        filter
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves the csv format.
-    if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.salesByItemsApp.csv(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-      res.setHeader('Content-Type', 'text/csv');
-
-      return res.send(buffer);
-      // Retrieves the json table format.
-    } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.salesByItemsApp.table(tenantId, filter);
-
-      return res.status(200).send(table);
-      // Retrieves the xlsx format.
-    } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-      const buffer = this.salesByItemsApp.xlsx(tenantId, filter);
-
-      res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
-      res.setHeader(
-        'Content-Type',
-        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
       );
-      return res.send(buffer);
+      return res.status(200).send({
-      // Retrieves the json format.
+        meta: this.transfromToResponse(meta),
-    } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
+        data: this.transfromToResponse(data),
-      const pdfContent = await this.salesByItemsApp.pdf(tenantId, filter);
+        query: this.transfromToResponse(query),
-
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
       });
-      return res.send(pdfContent);
+    } catch (error) {
-    } else {
+      next(error);
-      const sheet = await this.salesByItemsApp.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
     }
   }
 }

packages/server/src/api/controllers/FinancialStatements/SalesTaxLiabilitySummary/index.ts

@@ -1,21 +1,20 @@
-import { Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
+import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { SalesTaxLiabilitySummaryApplication } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryApplication';
+import { SalesTaxLiabilitySummaryService } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryService';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 export default class SalesTaxLiabilitySummary extends BaseFinancialReportController {
   @Inject()
-  private salesTaxLiabilitySummaryApp: SalesTaxLiabilitySummaryApplication;
+  private salesTaxLiabilitySummaryService: SalesTaxLiabilitySummaryService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -32,9 +31,8 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl
 
   /**
    * Validation schema.
-   * @returns {ValidationChain[]}
    */
-  private get validationSchema() {
+  get validationSchema() {
     return [
       query('from_date').optional().isISO8601(),
       query('to_date').optional().isISO8601(),
@@ -47,7 +45,7 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  private async salesTaxLiabilitySummary(
+  async salesTaxLiabilitySummary(
     req: Request,
     res: Response,
     next: NextFunction
@@ -57,63 +55,33 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl
 
     try {
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
 
-      // Retrieves the json table format.
+      switch (acceptType) {
-      if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
+        case 'application/json+table':
-        const table = await this.salesTaxLiabilitySummaryApp.table(
+          const salesTaxLiabilityTable =
-          tenantId,
+            await this.salesTaxLiabilitySummaryService.salesTaxLiabilitySummaryTable(
-          filter
+              tenantId,
-        );
+              filter
-        return res.status(200).send(table);
+            );
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.salesTaxLiabilitySummaryApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
 
-        return res.send(buffer);
+          return res.status(200).send({
-        // Retrieves the json format.
+            table: salesTaxLiabilityTable.table,
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
+            query: salesTaxLiabilityTable.query,
-        const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(
+            meta: salesTaxLiabilityTable.meta,
-          tenantId,
+          });
-          filter
+        case 'json':
-        );
+        default:
-        res.set({
+          const salesTaxLiability =
-          'Content-Type': 'application/pdf',
+            await this.salesTaxLiabilitySummaryService.salesTaxLiability(
-          'Content-Length': pdfContent.length,
+              tenantId,
-        });
+              filter
-        return res.status(200).send(pdfContent);
+            );
-      } else {
+          return res.status(200).send({
-        const sheet = await this.salesTaxLiabilitySummaryApp.sheet(
+            data: salesTaxLiability.data,
-          tenantId,
+            query: salesTaxLiability.query,
-          filter
+            meta: salesTaxLiability.meta,
-        );
+          });
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/TransactionsByCustomers/index.ts

@@ -1,22 +1,30 @@
 import { Router, Request, Response, NextFunction } from 'express';
 import { query } from 'express-validator';
 import { Inject, Service } from 'typedi';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import {
+  AbilitySubject,
+  ITransactionsByCustomersStatement,
+  ReportsAction,
+} from '@/interfaces';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
+import TransactionsByCustomersService from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersService';
+import TransactionsByCustomersTableRows from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersTableRows';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { TransactionsByCustomerApplication } from '@/services/FinancialStatements/TransactionsByCustomer/TransactionsByCustomersApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class TransactionsByCustomersReportController extends BaseFinancialReportController {
   @Inject()
-  private transactionsByCustomersApp: TransactionsByCustomerApplication;
+  transactionsByCustomersService: TransactionsByCustomersService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -50,13 +58,45 @@ export default class TransactionsByCustomersReportController extends BaseFinanci
     ];
   }
 
+  /**
+   * Transformes the statement to table rows response.
+   * @param {ITransactionsByCustomersStatement} statement -
+   */
+  private transformToTableResponse(customersTransactions, tenantId) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const table = new TransactionsByCustomersTableRows(
+      customersTransactions,
+      i18n
+    );
+    return {
+      table: {
+        rows: table.tableRows(),
+      },
+    };
+  }
+
+  /**
+   * Transformes the statement to json response.
+   * @param {ITransactionsByCustomersStatement} statement -
+   */
+  private transfromToJsonResponse(
+    data,
+    columns
+  ): ITransactionsByCustomersStatement {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
   /**
    * Retrieve payable aging summary report.
    * @param {Request} req -
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  private async transactionsByCustomers(
+  async transactionsByCustomers(
     req: Request,
     res: Response,
     next: NextFunction
@@ -64,62 +104,25 @@ export default class TransactionsByCustomersReportController extends BaseFinanci
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
-    const accept = this.accepts(req);
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
     try {
-      // Retrieves the json table format.
+      const report =
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
+        await this.transactionsByCustomersService.transactionsByCustomers(
-        const table = await this.transactionsByCustomersApp.table(
           tenantId,
           filter
         );
-        return res.status(200).send(table);
+      const accept = this.accepts(req);
-        // Retrieve the csv format.
+      const acceptType = accept.types(['json', 'application/json+table']);
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const csv = await this.transactionsByCustomersApp.csv(tenantId, filter);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+      switch (acceptType) {
-        res.setHeader('Content-Type', 'text/csv');
+        case 'json':
-
+          return res
-        return res.send(csv);
+            .status(200)
-        // Retrieve the xlsx format.
+            .send(this.transfromToJsonResponse(report.data, report.columns));
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+        case 'application/json+table':
-        const buffer = await this.transactionsByCustomersApp.xlsx(
+        default:
-          tenantId,
+          return res
-          filter
+            .status(200)
-        );
+            .send(this.transformToTableResponse(report.data, tenantId));
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieve the json format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.transactionsByCustomersApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-      } else {
-        const sheet = await this.transactionsByCustomersApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/TransactionsByReference/index.ts

@@ -40,7 +40,8 @@ export default class TransactionsByReferenceController extends BaseController {
       query('number_format.negative_format')
         .optional()
         .isIn(['parentheses', 'mines'])
-        .trim(),
+        .trim()
+        .escape(),
     ];
   }
 

packages/server/src/api/controllers/FinancialStatements/TransactionsByVendors/index.ts

@@ -3,19 +3,27 @@ import { query, ValidationChain } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import TransactionsByVendorsTableRows from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorTableRows';
+import TransactionsByVendorsService from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorService';
+import {
+  AbilitySubject,
+  ITransactionsByVendorsStatement,
+  ReportsAction,
+} from '@/interfaces';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
-import { TransactionsByVendorApplication } from '@/services/FinancialStatements/TransactionsByVendor/TransactionsByVendorApplication';
 
 export default class TransactionsByVendorsReportController extends BaseFinancialReportController {
   @Inject()
-  private transactionsByVendorsApp: TransactionsByVendorApplication;
+  transactionsByVendorsService: TransactionsByVendorsService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -34,7 +42,7 @@ export default class TransactionsByVendorsReportController extends BaseFinancial
   /**
    * Validation schema.
    */
-  private get validationSchema(): ValidationChain[] {
+  get validationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
 
@@ -50,76 +58,64 @@ export default class TransactionsByVendorsReportController extends BaseFinancial
     ];
   }
 
+  /**
+   * Transformes the report statement to table rows.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToTableRows(tenantId: number, transactions: any[]) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const table = new TransactionsByVendorsTableRows(transactions, i18n);
+
+    return {
+      table: {
+        data: table.tableRows(),
+      },
+    };
+  }
+
+  /**
+   * Transformes the report statement to json response.
+   * @param {ITransactionsByVendorsStatement} statement -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+    query,
+  }: ITransactionsByVendorsStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
   /**
    * Retrieve payable aging summary report.
    * @param {Request} req -
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  private async transactionsByVendors(
+  async transactionsByVendors(req: Request, res: Response, next: NextFunction) {
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
     const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
     try {
+      const report =
+        await this.transactionsByVendorsService.transactionsByVendors(
+          tenantId,
+          filter
+        );
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
 
-      // Retrieves the xlsx format.
+      switch (acceptType) {
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
+        case 'application/json+table':
-        const buffer = await this.transactionsByVendorsApp.xlsx(
+          return res
-          tenantId,
+            .status(200)
-          filter
+            .send(this.transformToTableRows(tenantId, report.data));
-        );
+        case 'json':
-        res.setHeader('Content-Type', 'application/vnd.openxmlformats');
+        default:
-        res.setHeader(
+          return res.status(200).send(this.transformToJsonResponse(report));
-          'Content-Disposition',
-          'attachment; filename=report.xlsx'
-        );
-        return res.send(buffer);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.transactionsByVendorsApp.csv(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Type', 'text/csv');
-        res.setHeader('Content-Disposition', 'attachment; filename=report.csv');
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.transactionsByVendorsApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-        const pdfContent = await this.transactionsByVendorsApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.transactionsByVendorsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/FinancialStatements/TrialBalanceSheet.ts

@@ -3,21 +3,20 @@ import { Request, Response, Router, NextFunction } from 'express';
 import { query, ValidationChain } from 'express-validator';
 import { castArray } from 'lodash';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import TrialBalanceSheetService from '@/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetService';
 import BaseFinancialReportController from './BaseFinancialReportController';
 import { AbilitySubject, ReportsAction } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { TrialBalanceSheetApplication } from '@/services/FinancialStatements/TrialBalanceSheet/TrialBalanceSheetApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class TrialBalanceSheetController extends BaseFinancialReportController {
   @Inject()
-  private trialBalanceSheetApp: TrialBalanceSheetApplication;
+  trialBalanceSheetService: TrialBalanceSheetService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -37,7 +36,7 @@ export default class TrialBalanceSheetController extends BaseFinancialReportCont
    * Validation schema.
    * @return {ValidationChain[]}
    */
-  private get trialBalanceSheetValidationSchema(): ValidationChain[] {
+  get trialBalanceSheetValidationSchema(): ValidationChain[] {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('basis').optional(),
@@ -60,74 +59,28 @@ export default class TrialBalanceSheetController extends BaseFinancialReportCont
   /**
    * Retrieve the trial balance sheet.
    */
-  private async trialBalanceSheet(
+  public async trialBalanceSheet(
     req: Request,
     res: Response,
     next: NextFunction
   ) {
-    const { tenantId } = req;
+    const { tenantId, settings } = req;
     let filter = this.matchedQueryData(req);
 
     filter = {
       ...filter,
       accountsIds: castArray(filter.accountsIds),
     };
+
     try {
-      const accept = this.accepts(req);
+      const { data, query, meta } =
+        await this.trialBalanceSheetService.trialBalanceSheet(tenantId, filter);
 
-      const acceptType = accept.types([
+      return res.status(200).send({
-        ACCEPT_TYPE.APPLICATION_JSON,
+        data: this.transfromToResponse(data),
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
+        query: this.transfromToResponse(query),
-        ACCEPT_TYPE.APPLICATION_CSV,
+        meta: this.transfromToResponse(meta),
-        ACCEPT_TYPE.APPLICATION_XLSX,
+      });
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
-      // Retrieves in json table format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const { table, meta, query } = await this.trialBalanceSheetApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send({ table, meta, query });
-        // Retrieves in xlsx format
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.trialBalanceSheetApp.xlsx(tenantId, filter);
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(buffer);
-        // Retrieves in csv format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.trialBalanceSheetApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves in pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.trialBalanceSheetApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        res.send(pdfContent);
-        // Retrieves in json format.
-      } else {
-        const { data, query, meta } = await this.trialBalanceSheetApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send({ data, query, meta });
-      }
     } catch (error) {
       next(error);
     }

packages/server/src/api/controllers/FinancialStatements/VendorBalanceSummary/index.ts

@@ -3,19 +3,27 @@ import { query } from 'express-validator';
 import { Inject } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseFinancialReportController from '../BaseFinancialReportController';
-import { AbilitySubject, ReportsAction } from '@/interfaces';
+import VendorBalanceSummaryTableRows from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryTableRows';
+import VendorBalanceSummaryService from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryService';
+import {
+  AbilitySubject,
+  IVendorBalanceSummaryStatement,
+  ReportsAction,
+} from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { VendorBalanceSummaryApplication } from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryApplication';
 
 export default class VendorBalanceSummaryReportController extends BaseFinancialReportController {
   @Inject()
-  private vendorBalanceSummaryApp: VendorBalanceSummaryApplication;
+  vendorBalanceSummaryService: VendorBalanceSummaryService;
+
+  @Inject()
+  tenancy: HasTenancyService;
 
   /**
    * Router constructor.
    */
-  public router() {
+  router() {
     const router = Router();
 
     router.get(
@@ -33,7 +41,7 @@ export default class VendorBalanceSummaryReportController extends BaseFinancialR
   /**
    * Validation schema.
    */
-  private get validationSchema() {
+  get validationSchema() {
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('as_date').optional().isISO8601(),
@@ -51,74 +59,73 @@ export default class VendorBalanceSummaryReportController extends BaseFinancialR
     ];
   }
 
+  /**
+   * Transformes the report statement to table rows.
+   * @param {IVendorBalanceSummaryStatement} statement -
+   */
+  private transformToTableRows(
+    tenantId: number,
+    { data, query }: IVendorBalanceSummaryStatement
+  ) {
+    const i18n = this.tenancy.i18n(tenantId);
+    const tableData = new VendorBalanceSummaryTableRows(
+      data,
+      query,
+      i18n
+    );
+    return {
+      table: {
+        columns: tableData.tableColumns(),
+        data: tableData.tableRows(),
+      },
+      query,
+    };
+  }
+
+  /**
+   * Transformes the report statement to raw json.
+   * @param {IVendorBalanceSummaryStatement} statement -
+   */
+  private transformToJsonResponse({
+    data,
+    columns,
+  }: IVendorBalanceSummaryStatement) {
+    return {
+      data: this.transfromToResponse(data),
+      columns: this.transfromToResponse(columns),
+      query: this.transfromToResponse(query),
+    };
+  }
+
   /**
    * Retrieve vendors balance summary.
    * @param {Request} req -
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  public async vendorBalanceSummary(
+  async vendorBalanceSummary(req: Request, res: Response, next: NextFunction) {
-    req: Request,
+    const { tenantId, settings } = req;
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
     const filter = this.matchedQueryData(req);
 
     try {
+      const vendorBalanceSummary =
+        await this.vendorBalanceSummaryService.vendorBalanceSummary(
+          tenantId,
+          filter
+        );
       const accept = this.accepts(req);
-      const acceptType = accept.types([
+      const acceptType = accept.types(['json', 'application/json+table']);
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_PDF,
-      ]);
 
-      // Retrieves the csv format.
+      switch (acceptType) {
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
+        case 'application/json+table':
-        const buffer = await this.vendorBalanceSummaryApp.csv(tenantId, filter);
+          return res
-
+            .status(200)
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
+            .send(this.transformToTableRows(tenantId, vendorBalanceSummary));
-        res.setHeader('Content-Type', 'text/csv');
+        case 'json':
-
+        default:
-        return res.send(buffer);
+          return res
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
+            .status(200)
-        const buffer = await this.vendorBalanceSummaryApp.xlsx(
+            .send(this.transformToJsonResponse(vendorBalanceSummary));
-          tenantId,
-          filter
-        );
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-        return res.send(buffer);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.vendorBalanceSummaryApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-        // Retrieves the pdf format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_PDF) {
-        const pdfContent = await this.vendorBalanceSummaryApp.pdf(
-          tenantId,
-          filter
-        );
-        res.set({
-          'Content-Type': 'application/pdf',
-          'Content-Length': pdfContent.length,
-        });
-        return res.send(pdfContent);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.vendorBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
       }
     } catch (error) {
       next(error);

packages/server/src/api/controllers/Import/ImportController.ts

@@ -1,246 +0,0 @@
-import { Inject, Service } from 'typedi';
-import { Router, Request, Response, NextFunction } from 'express';
-import { body, param, query } from 'express-validator';
-import { defaultTo } from 'lodash';
-import BaseController from '@/api/controllers/BaseController';
-import { ServiceError } from '@/exceptions';
-import { ImportResourceApplication } from '@/services/Import/ImportResourceApplication';
-import { uploadImportFile } from './_utils';
-import { parseJsonSafe } from '@/utils/parse-json-safe';
-
-@Service()
-export class ImportController extends BaseController {
-  @Inject()
-  private importResourceApp: ImportResourceApplication;
-
-  /**
-   * Router constructor method.
-   */
-  public router() {
-    const router = Router();
-
-    router.post(
-      '/file',
-      uploadImportFile.single('file'),
-      this.importValidationSchema,
-      this.validationResult,
-      this.asyncMiddleware(this.fileUpload.bind(this)),
-      this.catchServiceErrors
-    );
-    router.post(
-      '/:import_id/import',
-      this.asyncMiddleware(this.import.bind(this)),
-      this.catchServiceErrors
-    );
-    router.post(
-      '/:import_id/mapping',
-      [
-        param('import_id').exists().isString(),
-        body('mapping').exists().isArray({ min: 1 }),
-        body('mapping.*.group').optional(),
-        body('mapping.*.from').exists(),
-        body('mapping.*.to').exists(),
-      ],
-      this.validationResult,
-      this.asyncMiddleware(this.mapping.bind(this)),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/sample',
-      [query('resource').exists(), query('format').optional()],
-      this.validationResult,
-      this.downloadImportSample.bind(this),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/:import_id',
-      this.asyncMiddleware(this.getImportFileMeta.bind(this)),
-      this.catchServiceErrors
-    );
-    router.get(
-      '/:import_id/preview',
-      this.asyncMiddleware(this.preview.bind(this)),
-      this.catchServiceErrors
-    );
-    return router;
-  }
-
-  /**
-   * Import validation schema.
-   * @returns {ValidationSchema[]}
-   */
-  private get importValidationSchema() {
-    return [body('resource').exists(), body('params').optional()];
-  }
-
-  /**
-   * Imports xlsx/csv to the given resource type.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
-   */
-  private async fileUpload(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const body = this.matchedBodyData(req);
-    const params = defaultTo(parseJsonSafe(body.params), {});
-
-    try {
-      const data = await this.importResourceApp.import(
-        tenantId,
-        body.resource,
-        req.file.filename,
-        params
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Maps the columns of the imported file.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async mapping(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-    const body = this.matchedBodyData(req);
-
-    try {
-      const mapping = await this.importResourceApp.mapping(
-        tenantId,
-        importId,
-        body?.mapping
-      );
-      return res.status(200).send(mapping);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Preview the imported file before actual importing.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async preview(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const preview = await this.importResourceApp.preview(tenantId, importId);
-
-      return res.status(200).send(preview);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Importing the imported file to the application storage.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async import(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const result = await this.importResourceApp.process(tenantId, importId);
-
-      return res.status(200).send(result);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the csv/xlsx sample sheet of the given resource name.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async downloadImportSample(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { format, resource } = this.matchedQueryData(req);
-
-    try {
-      const result = this.importResourceApp.sample(tenantId, resource, format);
-
-      return res.status(200).send(result);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the import file meta.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private async getImportFileMeta(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { import_id: importId } = req.params;
-
-    try {
-      const result = await this.importResourceApp.importMeta(
-        tenantId,
-        importId
-      );
-      return res.status(200).send(result);
-    } 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) {
-      if (error.errorType === 'INVALID_MAP_ATTRS') {
-        return res.status(400).send({
-          errors: [{ type: 'INVALID_MAP_ATTRS' }],
-        });
-      }
-      if (error.errorType === 'DUPLICATED_FROM_MAP_ATTR') {
-        return res.status(400).send({
-          errors: [{ type: 'DUPLICATED_FROM_MAP_ATTR' }],
-        });
-      }
-      if (error.errorType === 'DUPLICATED_TO_MAP_ATTR') {
-        return res.status(400).send({
-          errors: [{ type: 'DUPLICATED_TO_MAP_ATTR' }],
-        });
-      }
-      if (error.errorType === 'IMPORTED_FILE_EXTENSION_INVALID') {
-        return res.status(400).send({
-          errors: [{ type: 'IMPORTED_FILE_EXTENSION_INVALID' }],
-        });
-      }
-    }
-    next(error);
-  }
-}

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

@@ -1,34 +0,0 @@
-import Multer from 'multer';
-import { ServiceError } from '@/exceptions';
-import { getImportsStoragePath } from '@/services/Import/_utils';
-
-export function allowSheetExtensions(req, file, cb) {
-  if (
-    file.mimetype !== 'text/csv' &&
-    file.mimetype !== 'application/vnd.ms-excel' &&
-    file.mimetype !==
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-  ) {
-    cb(new ServiceError('IMPORTED_FILE_EXTENSION_INVALID'));
-    return;
-  }
-  cb(null, true);
-}
-
-const storage = Multer.diskStorage({
-  destination: function (req, file, cb) {
-    const path = getImportsStoragePath();
-    cb(null, path);
-  },
-  filename: function (req, file, cb) {
-    // Add the creation timestamp to clean up temp files later.
-    const uniqueSuffix = Date.now() + '-' + Math.round(Math.random() * 1e9);
-    cb(null, uniqueSuffix);
-  },
-});
-
-export const uploadImportFile = Multer({
-  storage,
-  limits: { fileSize: 5 * 1024 * 1024 },
-  fileFilter: allowSheetExtensions,
-});

packages/server/src/api/controllers/Inventory/InventoryAdjustments.ts

@@ -86,7 +86,7 @@ export default class InventoryAdjustmentsController extends BaseController {
    */
   get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),

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

@@ -25,7 +25,7 @@ export default class InviteUsersController extends BaseController {
     router.post(
       '/send',
       [
-        body('email').exists().trim(),
+        body('email').exists().trim().escape(),
         body('role_id').exists().isNumeric().toInt(),
       ],
       this.validationResult,
@@ -57,7 +57,7 @@ export default class InviteUsersController extends BaseController {
     );
     router.get(
       '/invited/:token',
-      [param('token').exists().trim()],
+      [param('token').exists().trim().escape()],
       this.validationResult,
       asyncMiddleware(this.invited.bind(this)),
       this.handleServicesError
@@ -72,10 +72,10 @@ export default class InviteUsersController extends BaseController {
    */
   private get inviteUserDTO() {
     return [
-      check('first_name').exists().trim(),
+      check('first_name').exists().trim().escape(),
-      check('last_name').exists().trim(),
+      check('last_name').exists().trim().escape(),
-      check('password').exists().trim().isLength({ min: 5 }),
+      check('password').exists().trim().escape().isLength({ min: 5 }),
-      param('token').exists().trim(),
+      param('token').exists().trim().escape(),
     ];
   }
 

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

@@ -73,11 +73,13 @@ export default class ItemsCategoriesController extends BaseController {
       check('name')
         .exists()
         .trim()
+        .escape()
         .isLength({ min: 0, max: DATATYPES_LENGTH.STRING }),
       check('description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('sell_account_id')
         .optional({ nullable: true })
@@ -99,8 +101,9 @@ export default class ItemsCategoriesController extends BaseController {
    */
   get categoriesListValidationSchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
-      query('sort_order').optional().trim().isIn(['desc', 'asc']),
+      query('sort_order').optional().trim().escape().isIn(['desc', 'asc']),
+
       query('stringified_filter_roles').optional().isJSON(),
     ];
   }
@@ -204,12 +207,14 @@ export default class ItemsCategoriesController extends BaseController {
     };
 
     try {
-      const { itemCategories, filterMeta } =
+      const {
-        await this.itemCategoriesService.getItemCategoriesList(
+        itemCategories,
-          tenantId,
+        filterMeta,
-          itemCategoriesFilter,
+      } = await this.itemCategoriesService.getItemCategoriesList(
-          user
+        tenantId,
-        );
+        itemCategoriesFilter,
+        user
+      );
       return res.status(200).send({
         item_categories: itemCategories,
         filter_meta: this.transfromToResponse(filterMeta),

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

@@ -96,11 +96,13 @@ export default class ItemsController extends BaseController {
         .exists()
         .isString()
         .trim()
+        .escape()
         .isIn(['service', 'non-inventory', 'inventory']),
       check('code')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       // Purchase attributes.
       check('purchasable').optional().isBoolean().toBoolean(),
@@ -139,17 +141,14 @@ export default class ItemsController extends BaseController {
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('purchase_description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
-      check('sell_tax_rate_id').optional({ nullable: true }).isInt().toInt(),
-      check('purchase_tax_rate_id')
-        .optional({ nullable: true })
-        .isInt()
-        .toInt(),
       check('category_id')
         .optional({ nullable: true })
         .isInt({ min: 0, max: DATATYPES_LENGTH.INT_10 })
@@ -158,6 +157,7 @@ export default class ItemsController extends BaseController {
         .optional()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('active').optional().isBoolean().toBoolean(),
 
@@ -179,7 +179,7 @@ export default class ItemsController extends BaseController {
    */
   private get validateListQuerySchema() {
     return [
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('page').optional().isNumeric().toInt(),
@@ -508,28 +508,6 @@ export default class ItemsController extends BaseController {
           ],
         });
       }
-      if (error.errorType === 'PURCHASE_TAX_RATE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'PURCHASE_TAX_RATE_NOT_FOUND',
-              message: 'Purchase tax rate has not found.',
-              code: 410,
-            },
-          ],
-        });
-      }
-      if (error.errorType === 'SELL_TAX_RATE_NOT_FOUND') {
-        return res.status(400).send({
-          errors: [
-            {
-              type: 'SELL_TAX_RATE_NOT_FOUND',
-              message: 'Sell tax rate is not found.',
-              code: 420,
-            },
-          ],
-        });
-      }
     }
     next(error);
   }

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

@@ -6,7 +6,7 @@ import ItemTransactionsController from './ItemsTransactions';
 
 @Service()
 export default class ItemsBaseController {
-  public router() {
+  router() {
     const router = Router();
 
     router.use('/', Container.get(ItemsController).router());

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

@@ -77,14 +77,14 @@ export default class ManualJournalsController extends BaseController {
   /**
    * Specific manual journal id param validation schema.
    */
-  private get manualJournalParamSchema() {
+  get manualJournalParamSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Manual journal DTO schema.
    */
-  private get manualJournalValidationSchema() {
+  get manualJournalValidationSchema() {
     return [
       check('date').exists().isISO8601(),
       check('currency_code').optional(),
@@ -94,21 +94,25 @@ export default class ManualJournalsController extends BaseController {
         .optional()
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('journal_type')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('reference')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
       check('description')
         .optional({ nullable: true })
         .isString()
         .trim()
+        .escape()
         .isLength({ max: DATATYPES_LENGTH.TEXT }),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('publish').optional().isBoolean().toBoolean(),
@@ -144,22 +148,19 @@ export default class ManualJournalsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
   /**
    * Manual journals list validation schema.
    */
-  private get manualJournalsListSchema() {
+  get manualJournalsListSchema() {
     return [
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
       query('custom_view_id').optional().isNumeric().toInt(),
 
-      query('column_sort_by').optional().trim(),
+      query('column_sort_by').optional().trim().escape(),
       query('sort_order').optional().isIn(['desc', 'asc']),
 
       query('stringified_filter_roles').optional().isJSON(),
@@ -319,7 +320,7 @@ export default class ManualJournalsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  private getManualJournalsList = async (
+  getManualJournalsList = async (
     req: Request,
     res: Response,
     next: NextFunction

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

@@ -61,14 +61,15 @@ export default class MediaController extends BaseController {
 
   get uploadValidationSchema() {
     return [
-      check('model_name').optional().trim(),
+      // check('attachment'),
-      check('model_id').optional().isNumeric(),
+      check('model_name').optional().trim().escape(),
+      check('model_id').optional().isNumeric().toInt(),
     ];
   }
 
   get linkValidationSchema() {
     return [
-      check('model_name').exists().trim(),
+      check('model_name').exists().trim().escape(),
       check('model_id').exists().isNumeric().toInt(),
     ]
   }

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

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

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

@@ -6,7 +6,6 @@ import { check, ValidationChain } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import JWTAuth from '@/api/middleware/jwtAuth';
 import TenancyMiddleware from '@/api/middleware/TenancyMiddleware';
-import SubscriptionMiddleware from '@/api/middleware/SubscriptionMiddleware';
 import AttachCurrentTenantUser from '@/api/middleware/AttachCurrentTenantUser';
 import OrganizationService from '@/services/Organization/OrganizationService';
 import { MONTHS, ACCEPTED_LOCALES } from '@/services/Organization/constants';
@@ -18,7 +17,7 @@ import BaseController from '@/api/controllers/BaseController';
 @Service()
 export default class OrganizationController extends BaseController {
   @Inject()
-  organizationService: OrganizationService;
+  private organizationService: OrganizationService;
 
   /**
    * Router constructor.
@@ -26,23 +25,20 @@ export default class OrganizationController extends BaseController {
   router() {
     const router = Router();
 
-    // Should before build tenant database the user be authorized and
-    // most important than that, should be subscribed to any plan.
     router.use(JWTAuth);
     router.use(AttachCurrentTenantUser);
     router.use(TenancyMiddleware);
 
-    router.use('/build', SubscriptionMiddleware('main'));
     router.post(
       '/build',
-      this.buildOrganizationValidationSchema,
+      this.organizationValidationSchema,
       this.validationResult,
       asyncMiddleware(this.build.bind(this)),
       this.handleServiceErrors.bind(this)
     );
     router.put(
       '/',
-      this.updateOrganizationValidationSchema,
+      this.organizationValidationSchema,
       this.validationResult,
       this.asyncMiddleware(this.updateOrganization.bind(this)),
       this.handleServiceErrors.bind(this)
@@ -59,10 +55,10 @@ export default class OrganizationController extends BaseController {
    * Organization setup schema.
    * @return {ValidationChain[]}
    */
-  private get commonOrganizationValidationSchema(): ValidationChain[] {
+  private get organizationValidationSchema(): ValidationChain[] {
     return [
       check('name').exists().trim(),
-      check('industry').optional({ nullable: true }).isString().trim(),
+      check('industry').optional({ nullable: true }).isString().trim().escape(),
       check('location').exists().isString().isISO31661Alpha2(),
       check('base_currency').exists().isISO4217(),
       check('timezone').exists().isIn(moment.tz.names()),
@@ -72,25 +68,6 @@ export default class OrganizationController extends BaseController {
     ];
   }
 
-  /**
-   * Build organization validation schema.
-   * @returns {ValidationChain[]}
-   */
-  private get buildOrganizationValidationSchema(): ValidationChain[] {
-    return [...this.commonOrganizationValidationSchema];
-  }
-
-  /**
-   * Update organization validation schema.
-   * @returns {ValidationChain[]}
-   */
-  private get updateOrganizationValidationSchema(): ValidationChain[] {
-    return [
-      ...this.commonOrganizationValidationSchema,
-      check('tax_number').optional({ nullable: true }).isString().trim(),
-    ];
-  }
-
   /**
    * Builds tenant database and migrate database schema.
    * @param {Request} req - Express request.

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

@@ -33,17 +33,17 @@ export default class OrganizationDashboardController extends BaseController {
   }
 
   /**
-   * Detarmines whether the current authed organization to able to change its currency/.
+   *
-   * @param {Request} req
+   * @param req
-   * @param {Response} res
+   * @param res
-   * @param {NextFunction} next
+   * @param next
-   * @returns {Response|void}
+   * @returns
    */
   private async baseCurrencyMutateAbility(
     req: Request,
     res: Response,
     next: Function
-  ): Promise<Response|void> {
+  ) {
     const { tenantId } = req;
 
     try {

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

@@ -29,7 +29,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.createProject.bind(this))
+      asyncMiddleware(this.createProject.bind(this)),
+      this.catchServiceErrors
     );
     router.post(
       '/:id',
@@ -42,7 +43,8 @@ export class ProjectsController extends BaseController {
         check('cost_estimate').exists().isDecimal(),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.patch(
       '/:projectId/status',
@@ -54,14 +56,16 @@ export class ProjectsController extends BaseController {
           .isIn([IProjectStatus.InProgress, IProjectStatus.Closed]),
       ],
       this.validationResult,
-      asyncMiddleware(this.editProject.bind(this))
+      asyncMiddleware(this.editProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:id',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.getProject.bind(this))
+      asyncMiddleware(this.getProject.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/:projectId/billable/entries',
@@ -72,21 +76,24 @@ export class ProjectsController extends BaseController {
         query('to_date').optional().isISO8601(),
       ],
       this.validationResult,
-      asyncMiddleware(this.projectBillableEntries.bind(this))
+      asyncMiddleware(this.projectBillableEntries.bind(this)),
+      this.catchServiceErrors
     );
     router.get(
       '/',
       CheckPolicies(ProjectAction.VIEW, AbilitySubject.Project),
       [],
       this.validationResult,
-      asyncMiddleware(this.getProjects.bind(this))
+      asyncMiddleware(this.getProjects.bind(this)),
+      this.catchServiceErrors
     );
     router.delete(
       '/:id',
       CheckPolicies(ProjectAction.DELETE, AbilitySubject.Project),
       [param('id').exists().isInt().toInt()],
       this.validationResult,
-      asyncMiddleware(this.deleteProject.bind(this))
+      asyncMiddleware(this.deleteProject.bind(this)),
+      this.catchServiceErrors
     );
     return router;
   }
@@ -245,4 +252,22 @@ export class ProjectsController extends BaseController {
       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) {
+    }
+    next(error);
+  }
 }

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

@@ -100,8 +100,8 @@ export default class BillsController extends BaseController {
    */
   private get billValidationSchema() {
     return [
-      check('bill_number').exists().trim(),
+      check('bill_number').exists().trim().escape(),
-      check('reference_no').optional().trim(),
+      check('reference_no').optional().trim().escape(),
       check('bill_date').exists().isISO8601(),
       check('due_date').optional().isISO8601(),
 
@@ -112,21 +112,23 @@ export default class BillsController extends BaseController {
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('project_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
-      check('is_inclusive_tax').default(false).isBoolean().toBoolean(),
-
       check('entries').isArray({ min: 1 }),
+
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.landed_cost')
         .optional({ nullable: true })
         .isBoolean()
@@ -135,17 +137,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-      check('entries.*.tax_code')
-        .optional({ nullable: true })
-        .trim()
-        .isString(),
-      check('entries.*.tax_rate_id')
-        .optional({ nullable: true })
-        .isNumeric()
-        .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -154,8 +145,8 @@ export default class BillsController extends BaseController {
    */
   private get billEditValidationSchema() {
     return [
-      check('bill_number').optional().trim(),
+      check('bill_number').optional().trim().escape(),
-      check('reference_no').optional().trim(),
+      check('reference_no').optional().trim().escape(),
       check('bill_date').exists().isISO8601(),
       check('due_date').optional().isISO8601(),
 
@@ -166,7 +157,7 @@ export default class BillsController extends BaseController {
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('project_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('entries').isArray({ min: 1 }),
@@ -180,14 +171,14 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.landed_cost')
         .optional({ nullable: true })
         .isBoolean()
         .toBoolean(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -215,8 +206,8 @@ export default class BillsController extends BaseController {
 
   private get dueBillsListingValidationSchema() {
     return [
-      query('vendor_id').optional().trim(),
+      query('vendor_id').optional().trim().escape(),
-      query('payment_made_id').optional().trim(),
+      query('payment_made_id').optional().trim().escape(),
     ];
   }
 
@@ -301,7 +292,7 @@ export default class BillsController extends BaseController {
     try {
       const bill = await this.billsApplication.getBill(tenantId, billId);
 
-      return res.status(200).send({ bill });
+      return res.status(200).send(this.transfromToResponse({ bill }));
     } catch (error) {
       next(error);
     }
@@ -346,11 +337,14 @@ export default class BillsController extends BaseController {
     };
 
     try {
-      const billsWithPagination = await this.billsApplication.getBills(
+      const { bills, pagination, filterMeta } =
-        tenantId,
+        await this.billsApplication.getBills(tenantId, filter);
-        filter
+
-      );
+      return res.status(200).send({
-      return res.status(200).send(billsWithPagination);
+        bills: this.transfromToResponse(bills),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -548,26 +542,6 @@ export default class BillsController extends BaseController {
           ],
         });
       }
-      if (error.errorType === 'ITEM_ENTRY_TAX_RATE_CODE_NOT_FOUND') {
-        return res.boom.badRequest(null, {
-          errors: [{ type: 'ITEM_ENTRY_TAX_RATE_CODE_NOT_FOUND', code: 1800 }],
-        });
-      }
-      if (error.errorType === 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND') {
-        return res.boom.badRequest(null, {
-          errors: [{ type: 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND', code: 1900 }],
-        });
-      }
-      if (error.errorType === 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT') {
-        return res.boom.badRequest(null, {
-          errors: [
-            {
-              type: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
-              code: 2000,
-            },
-          ],
-        });
-      }
     }
     next(error);
   }

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

@@ -111,21 +111,17 @@ 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(),
+      check('payment_number').optional({ nullable: true }).trim().escape(),
       check('payment_date').exists(),
-      check('statement').optional().trim(),
+      check('statement').optional().trim().escape(),
-      check('reference').optional().trim(),
+      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('entries.*.payment_amount').exists().isNumeric().toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -162,11 +158,15 @@ export default class BillsPayments extends BaseController {
     const { tenantId } = req;
     const { vendorId } = this.matchedQueryData(req);
 
-    const entries = await this.billPaymentsPages.getNewPageEntries(
+    try {
-      tenantId,
+      const entries = await this.billPaymentsPages.getNewPageEntries(
-      vendorId
+        tenantId,
-    );
+        vendorId
-    return res.status(200).send({ entries });
+      );
+      return res.status(200).send({
+        entries: this.transfromToResponse(entries),
+      });
+    } catch (error) {}
   }
 
   /**
@@ -183,12 +183,16 @@ export default class BillsPayments extends BaseController {
     const { id: paymentReceiveId } = req.params;
 
     try {
-      const billPaymentsWithEditEntries =
+      const { billPayment, entries } =
         await this.billPaymentsPages.getBillPaymentEditPage(
           tenantId,
           paymentReceiveId
         );
-      return res.status(200).send(billPaymentsWithEditEntries);
+
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+        entries: this.transfromToResponse(entries),
+      });
     } catch (error) {
       next(error);
     }
@@ -300,7 +304,9 @@ export default class BillsPayments extends BaseController {
         tenantId,
         billPaymentId
       );
-      return res.status(200).send({ billPayment });
+      return res.status(200).send({
+        bill_payment: this.transfromToResponse(billPayment),
+      });
     } catch (error) {
       next(error);
     }
@@ -353,12 +359,17 @@ export default class BillsPayments extends BaseController {
     };
 
     try {
-      const billPaymentsWithPagination =
+      const { billPayments, pagination, filterMeta } =
         await this.billPaymentsApplication.getBillPayments(
           tenantId,
           billPaymentsFilter
         );
-      return res.status(200).send(billPaymentsWithPagination);
+
+      return res.status(200).send({
+        bill_payments: this.transfromToResponse(billPayments),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }

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

@@ -156,10 +156,13 @@ export default class VendorCreditController extends BaseController {
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('vendor_credit_number').optional({ nullable: true }).trim(),
+      check('vendor_credit_number')
-      check('reference_no').optional().trim(),
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
+      check('reference_no').optional().trim().escape(),
       check('vendor_credit_date').exists().isISO8601().toDate(),
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -170,19 +173,19 @@ export default class VendorCreditController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -196,32 +199,36 @@ export default class VendorCreditController extends BaseController {
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('vendor_credit_number').optional({ nullable: true }).trim(),
+      check('vendor_credit_number')
-      check('reference_no').optional().trim(),
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
+      check('reference_no').optional().trim().escape(),
       check('vendor_credit_date').exists().isISO8601().toDate(),
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
 
       check('entries').isArray({ min: 1 }),
+
       check('entries.*.id').optional().isNumeric().toInt(),
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -291,7 +298,8 @@ export default class VendorCreditController extends BaseController {
     try {
       const vendorCredit = await this.createVendorCreditService.newVendorCredit(
         tenantId,
-        vendorCreditCreateDTO
+        vendorCreditCreateDTO,
+        user
       );
 
       return res.status(200).send({
@@ -313,19 +321,20 @@ export default class VendorCreditController extends BaseController {
     res: Response,
     next: NextFunction
   ) => {
-    const { id: vendorCreditId } = req.params;
+    const { id: billId } = req.params;
     const { tenantId, user } = req;
     const vendorCreditEditDTO: IVendorCreditEditDTO = this.matchedBodyData(req);
 
     try {
       await this.editVendorCreditService.editVendorCredit(
         tenantId,
-        vendorCreditId,
+        billId,
-        vendorCreditEditDTO
+        vendorCreditEditDTO,
+        user
       );
 
       return res.status(200).send({
-        id: vendorCreditId,
+        id: billId,
         message: 'The vendor credit has been edited successfully.',
       });
     } catch (error) {

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

@@ -18,7 +18,9 @@ export default class ResourceController extends BaseController {
 
     router.get(
       '/:resource_model/meta',
-      [param('resource_model').exists().trim()],
+      [
+        param('resource_model').exists().trim().escape()
+      ],
       this.asyncMiddleware(this.resourceMeta.bind(this)),
       this.handleServiceErrors
     );
@@ -46,7 +48,9 @@ export default class ResourceController extends BaseController {
         resourceModel
       );
       return res.status(200).send({
-        resource_meta: this.transfromToResponse(resourceMeta),
+        resource_meta: this.transfromToResponse(
+          resourceMeta,
+        ),
       });
     } catch (error) {
       next(error);

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

@@ -26,7 +26,6 @@ import GetCreditNoteAssociatedInvoicesToApply from '@/services/CreditNotes/GetCr
 import GetCreditNoteAssociatedAppliedInvoices from '@/services/CreditNotes/GetCreditNoteAssociatedAppliedInvoices';
 import GetRefundCreditTransaction from '@/services/CreditNotes/GetRefundCreditNoteTransaction';
 import GetCreditNotePdf from '../../../services/CreditNotes/GetCreditNotePdf';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 /**
  * Credit notes controller.
  * @service
@@ -210,9 +209,9 @@ export default class PaymentReceivesController extends BaseController {
 
       check('credit_note_date').exists().isISO8601().toDate(),
       check('reference_no').optional(),
-      check('credit_note_number').optional({ nullable: true }).trim(),
+      check('credit_note_number').optional({ nullable: true }).trim().escape(),
-      check('note').optional().trim(),
+      check('note').optional().trim().escape(),
-      check('terms_conditions').optional().trim(),
+      check('terms_conditions').optional().trim().escape(),
       check('open').default(false).isBoolean().toBoolean(),
 
       check('warehouse_id').optional({ nullable: true }).isNumeric().toInt(),
@@ -223,19 +222,19 @@ export default class PaymentReceivesController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
-      check('entries.*.quantity').exists().isNumeric().toInt(),
+      check('entries.*.quantity').exists().isNumeric().toFloat(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
         .toFloat(),
-      check('entries.*.description').optional({ nullable: true }).trim(),
+      check('entries.*.description')
+        .optional({ nullable: true })
+        .trim()
+        .escape(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -294,7 +293,7 @@ export default class PaymentReceivesController extends BaseController {
     return [
       check('from_account_id').exists().isNumeric().toInt(),
       check('description').optional(),
-
+      
       check('amount').exists().isNumeric().toFloat(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
@@ -338,7 +337,8 @@ export default class PaymentReceivesController extends BaseController {
     try {
       const creditNote = await this.createCreditNoteService.newCreditNote(
         tenantId,
-        creditNoteDTO
+        creditNoteDTO,
+        user
       );
       return res.status(200).send({
         id: creditNote.id,
@@ -438,7 +438,7 @@ export default class PaymentReceivesController extends BaseController {
   };
 
   /**
-   * Retrieve the credit note details.
+   * Retrieve the payment receive details.
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
@@ -451,28 +451,38 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: creditNoteId } = req.params;
 
-    const accept = this.accepts(req);
+    try {
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent = await this.creditNotePdf.getCreditNotePdf(
-        tenantId,
-        creditNoteId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-    } else {
       const creditNote = await this.getCreditNoteService.getCreditNote(
         tenantId,
         creditNoteId
       );
-      return res.status(200).send({ creditNote });
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      // Response formatter.
+      res.format({
+        // Json content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res
+            .status(200)
+            .send({ credit_note: this.transfromToResponse(creditNote) });
+        },
+        // Pdf content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent = await this.creditNotePdf.getCreditNotePdf(
+            tenantId,
+            creditNote
+          );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
     }
   };
 

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

@@ -1,20 +1,18 @@
 import { Inject, Service } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query, ValidationChain } from 'express-validator';
+import { check, param, query, ValidationChain } from 'express-validator';
 import {
   AbilitySubject,
   IPaymentReceiveDTO,
   PaymentReceiveAction,
-  PaymentReceiveMailOptsDTO,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import PaymentsReceivedPages from '@/services/Sales/PaymentReceived/PaymentsReceivedPages';
+import PaymentReceivesPages from '@/services/Sales/PaymentReceives/PaymentReceivesPages';
-import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceived/PaymentReceivedApplication';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
+import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { ServiceError } from '@/exceptions';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class PaymentReceivesController extends BaseController {
@@ -22,7 +20,7 @@ export default class PaymentReceivesController extends BaseController {
   private paymentReceiveApplication: PaymentReceivesApplication;
 
   @Inject()
-  private PaymentsReceivedPages: PaymentsReceivedPages;
+  private PaymentReceivesPages: PaymentReceivesPages;
 
   @Inject()
   private dynamicListService: DynamicListingService;
@@ -119,25 +117,6 @@ export default class PaymentReceivesController extends BaseController {
       asyncMiddleware(this.deletePaymentReceive.bind(this)),
       this.handleServiceErrors
     );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.paymentReceiveValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.sendPaymentReceiveByMail.bind(this),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.paymentReceiveValidation],
-      asyncMiddleware(this.getPaymentDefaultMail.bind(this)),
-      this.handleServiceErrors
-    );
     return router;
   }
 
@@ -150,23 +129,20 @@ export default class PaymentReceivesController extends BaseController {
       check('customer_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
 
-      check('amount').exists().isNumeric().toFloat(),
       check('payment_date').exists(),
       check('reference_no').optional(),
       check('deposit_account_id').exists().isNumeric().toInt(),
-      check('payment_receive_no').optional({ nullable: true }).trim(),
+      check('payment_receive_no').optional({ nullable: true }).trim().escape(),
-      check('statement').optional().trim(),
+      check('statement').optional().trim().escape(),
 
       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(),
       check('entries.*.invoice_id').exists().isNumeric().toInt(),
-      check('entries.*.payment_amount').exists().isNumeric().toFloat(),
+      check('entries.*.payment_amount').exists().isNumeric().toInt(),
-
-      check('attachments').isArray().optional(),
-      check('attachments.*.key').exists().isString(),
     ];
   }
 
@@ -176,6 +152,7 @@ export default class PaymentReceivesController extends BaseController {
   private get validatePaymentReceiveList(): ValidationChain[] {
     return [
       query('stringified_filter_roles').optional().isJSON(),
+
       query('view_slug').optional({ nullable: true }).isString().trim(),
 
       query('column_sort_by').optional(),
@@ -229,7 +206,7 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const storedPaymentReceive =
-        await this.paymentReceiveApplication.createPaymentReceived(
+        await this.paymentReceiveApplication.createPaymentReceive(
           tenantId,
           paymentReceive,
           user
@@ -351,12 +328,17 @@ export default class PaymentReceivesController extends BaseController {
     };
 
     try {
-      const paymentsReceivedWithPagination =
+      const { paymentReceives, pagination, filterMeta } =
         await this.paymentReceiveApplication.getPaymentReceives(
           tenantId,
           filter
         );
-      return res.status(200).send(paymentsReceivedWithPagination);
+
+      return res.status(200).send({
+        payment_receives: this.transfromToResponse(paymentReceives),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -376,7 +358,7 @@ export default class PaymentReceivesController extends BaseController {
     const { customerId } = this.matchedQueryData(req);
 
     try {
-      const entries = await this.PaymentsReceivedPages.getNewPageEntries(
+      const entries = await this.PaymentReceivesPages.getNewPageEntries(
         tenantId,
         customerId
       );
@@ -404,7 +386,7 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const { paymentReceive, entries } =
-        await this.PaymentsReceivedPages.getPaymentReceiveEditPage(
+        await this.PaymentReceivesPages.getPaymentReceiveEditPage(
           tenantId,
           paymentReceiveId,
           user
@@ -433,34 +415,38 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: paymentReceiveId } = req.params;
 
-    const accept = this.accepts(req);
+    try {
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Response in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF === acceptType) {
-      const pdfContent =
-        await this.paymentReceiveApplication.getPaymentReceivePdf(
-          tenantId,
-          paymentReceiveId
-        );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Response in json format.
-    } else {
       const paymentReceive =
         await this.paymentReceiveApplication.getPaymentReceive(
           tenantId,
           paymentReceiveId
         );
-      return res.status(200).send({
+
-        payment_receive: paymentReceive,
+      const ACCEPT_TYPE = {
+        APPLICATION_PDF: 'application/pdf',
+        APPLICATION_JSON: 'application/json',
+      };
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send({
+            payment_receive: this.transfromToResponse(paymentReceive),
+          });
+        },
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.paymentReceiveApplication.getPaymentReceivePdf(
+              tenantId,
+              paymentReceive
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
       });
+    } catch (error) {
+      next(error);
     }
   }
 
@@ -494,7 +480,7 @@ export default class PaymentReceivesController extends BaseController {
   };
 
   /**
-   * Retrieves the sms details of the given payment receive.
+   *
    * @param {Request} req
    * @param {Response} res
    * @param {NextFunction} next
@@ -521,74 +507,14 @@ export default class PaymentReceivesController extends BaseController {
     }
   };
 
-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public sendPaymentReceiveByMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: paymentReceiveId } = req.params;
-    const paymentMailDTO: PaymentReceiveMailOptsDTO = this.matchedBodyData(
-      req,
-      {
-        includeOptionals: false,
-      }
-    );
-
-    try {
-      await this.paymentReceiveApplication.notifyPaymentByMail(
-        tenantId,
-        paymentReceiveId,
-        paymentMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The payment notification has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given payment transaction.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getPaymentDefaultMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: paymentReceiveId } = req.params;
-
-    try {
-      const data = await this.paymentReceiveApplication.getPaymentMailOptions(
-        tenantId,
-        paymentReceiveId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
   /**
    * Handles service errors.
-   * @param {Error} error
+   * @param error
-   * @param {Request} req
+   * @param req
-   * @param {Response} res
+   * @param res
-   * @param {NextFunction} next
+   * @param next
    */
-  private handleServiceErrors(
+  handleServiceErrors(
     error: Error,
     req: Request,
     res: Response,