Publish

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

.all-contributorsrc

@@ -60,51 +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"
-      ]
     }
   ],
   "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
@@ -49,18 +49,4 @@ SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=
 
 # API rate limit (points,duration,block duration).
-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=
+API_RATE_LIMIT=120,60,600

.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

CHANGELOG.md

@@ -2,69 +2,11 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [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
+# [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
@@ -74,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
@@ -88,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
@@ -111,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**.
-  - `pnpm` packages manager, (from pnpm [guide](https://pnpm.io/installation) pick any installation method).
+ - 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)
 
 ## 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

@@ -37,37 +37,6 @@ 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.ly/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.ly/) - Learn how to use.
@@ -111,13 +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>
     </tr>
   </tbody>
 </table>

docker-compose.prod.yml

@@ -35,8 +35,6 @@ services:
   server:
     container_name: bigcapital-server
     image: ghcr.io/bigcapitalhq/server:latest
-    expose:
-      - '3000'
     links:
       - mysql
       - mongo
@@ -88,10 +86,6 @@ services:
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
       - SIGNUP_ALLOWED_EMAILS=${SIGNUP_ALLOWED_EMAILS}
 
-      # Gotenberg (Pdf generator)
-      - GOTENBERG_URL=${GOTENBERG_URL}
-      - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
-
   database_migration:
     container_name: bigcapital-database-migration
     build:
@@ -149,11 +143,6 @@ services:
     volumes:
       - redis:/data
 
-  gotenberg:
-    image: gotenberg/gotenberg:7
-    expose:
-      - '9000'
-
 # Volumes
 volumes:
   mysql:

docker-compose.yml

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

lerna.json

@@ -2,6 +2,5 @@
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "version": "independent",
   "npmClient": "pnpm",
-  "useWorkspaces": true,
   "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\"",
@@ -22,7 +23,7 @@
     "lerna": "^6.4.1"
   },
   "engines": {
-    "node": "16.x || 17.x || 18.x"
+    "node": "14.x"
   },
   "husky": {
     "hooks": {

packages/server/.gitignore

@@ -1,5 +1,6 @@
 /node_modules/
 /.env
+/storage
 stdout.log
 /dist
 /build

packages/server/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.16.0-alpine as build
+FROM node:14.20-alpine as build
 
 USER root
 
@@ -83,25 +83,15 @@ 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 ./pnpm-workspace.yaml ./pnpm-workspace.yaml
-COPY ./lerna.json ./lerna.json
 COPY ./packages/server/package*.json ./packages/server/
 
-# Install application dependencies
-RUN apk update
-RUN apk add python3 build-base chromium
+COPY ./lerna.json ./lerna.json
 
-# Set PYHTON env
-ENV PYTHON=/usr/bin/python3
-
-# Install packages dependencies for production.
-RUN pnpm install
+# Install app dependencies for production.
+RUN npm install
+RUN npm run bootstrap
 
 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": {
@@ -31,7 +31,7 @@
     "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",
@@ -43,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",
@@ -56,7 +56,6 @@
     "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",
@@ -96,14 +95,11 @@
     "rate-limiter-flexible": "^2.1.14",
     "reflect-metadata": "^0.1.13",
     "rtl-detect": "^1.0.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",
-    "xlsx": "^0.18.5"
+    "winston": "^3.2.1"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.158",

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",
 
@@ -588,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/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/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.invoiceAmount=entry.invoice.totalFormatted
-        td.paymentAmount=entry.invoice.paymentAmountFormatted
+        td.date=entry.invoice.formattedInvoiceDate
+        td.invoiceAmount=entry.invoice.formattedAmount
+        td.paymentAmount=entry.invoice.formattedPaymentAmount
 
   div.payment__table-after
     div.payment__table-total

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 { ExchangeRateApplication } from '@/services/ExchangeRates/ExchangeRateApplication';
+import ExchangeRatesService from '@/services/ExchangeRates/ExchangeRatesService';
+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',
-      [
-        oneOf([
-          query('to_currency').exists().isString().isISO4217(),
-          query('from_currency').exists().isString().isISO4217(),
-        ]),
-      ],
+      '/',
+      [...this.exchangeRatesListSchema],
       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(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async exchangeRates(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) {
-        return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-              code: 100,
-              message: 'The given base currency is invalid.',
-            },
-          ],
+      if (error.errorType === 'EXCHANGE_RATE_NOT_FOUND') {
+        return res.status(404).send({
+          errors: [{ type: 'EXCHANGE.RATE.NOT.FOUND', code: 200 }],
         });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'NOT_FOUND_EXCHANGE_RATES') {
         return res.status(400).send({
-          errors: [
-            {
-              type: EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-              code: 200,
-              message: 'The service is not allowed',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATES.IS.NOT.FOUND', code: 100 }],
         });
-      } else if (
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED === error.errorType
-      ) {
+      }
+      if (error.errorType === 'EXCHANGE_RATE_PERIOD_EXISTS') {
         return res.status(400).send({
-          errors: [
-            {
-              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',
-            },
-          ],
+          errors: [{ type: 'EXCHANGE.RATE.PERIOD.EXISTS', code: 300 }],
         });
       }
     }

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,58 +49,42 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
   }
 
   /**
-   * Retrieves payable aging summary report.
-   * @param {Request} req -
-   * @param {Response} res -
-   * @param {NextFunction} next -
+   * Retrieve payable aging summary report.
    */
-  private async payableAgingSummary(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async payableAgingSummary(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
     const filter = this.matchedQueryData(req);
 
     try {
       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,
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.APAgingSummaryApp.table(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const csv = await this.APAgingSummaryApp.csv(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.APAgingSummaryService.APAgingSummaryTable(
+            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');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(csv);
-        // Retrieves the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.APAgingSummaryApp.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 {
-        const sheet = await this.APAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            data: this.transfromToResponse(data),
+            columns: this.transfromToResponse(columns),
+            query: this.transfromToResponse(query),
+            meta: this.transfromToResponse(meta),
+          });
+          break;
       }
     } 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()
-  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,53 +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) {
-    const { tenantId } = req;
+  async receivableAgingSummary(req: Request, res: Response) {
+    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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-      ]);
-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.ARAgingSummaryApp.xlsx(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.ARAgingSummaryService.ARAgingSummaryTable(
+            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.ARAgingSummaryService.ARAgingSummary(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 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 json format.
-      } else {
-        const sheet = await this.ARAgingSummaryApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            data: this.transfromToResponse(data),
+            columns: this.transfromToResponse(columns),
+            query: this.transfromToResponse(query),
+            meta: this.transfromToResponse(meta),
+          });
+          break;
       }
     } 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 { ACCEPT_TYPE } from '@/interfaces/Http';
+import BalanceSheetTable from '@/services/FinancialStatements/BalanceSheet/BalanceSheetTable';
+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) {
-    const { tenantId } = req;
+  async balanceSheet(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
+    const i18n = this.tenancy.i18n(tenantId);
 
     let filter = this.matchedQueryData(req);
 
@@ -93,45 +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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-        ACCEPT_TYPE.APPLICATION_CSV,
-      ]);
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE == acceptType) {
-        const table = await this.balanceSheetApp.table(tenantId, filter);
+      const table = new BalanceSheetTable(data, query, i18n);
 
-        return res.status(200).send(table);
-        // Retrieves the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const buffer = await this.balanceSheetApp.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.balanceSheetApp.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);
-      } else {
-        const sheet = await this.balanceSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res.status(200).send({
+            table: {
+              rows: table.tableRows(),
+              columns: table.tableColumns(),
+            },
+            query,
+            meta,
+          });
+        case 'json':
+        default:
+          return res.status(200).send({ data, columns, query, meta });
       }
     } catch (error) {
       next(error);

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,52 +109,26 @@ export default class CashFlowController extends BaseFinancialReportController {
    * @param {NextFunction} next
    * @returns {Response}
    */
-  public async cashFlow(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async cashFlow(req: Request, res: Response, next: NextFunction) {
+    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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-      ]);
-      // Retrieves the json table format.
-      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 json format.
-      } else {
-        const cashflow = await this.cashflowSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(cashflow);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(cashFlow, tenantId));
+        case 'json':
+        default:
+          return res.status(200).send(this.transformJsonResponse(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 { CustomerBalanceSummaryApplication } from '@/services/FinancialStatements/CustomerBalanceSummary/CustomerBalanceSummaryApplication';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 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,67 +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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.customerBalanceSummaryApp.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 (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);
-      } else {
-        const sheet = await this.customerBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, customerBalanceSummary));
+        case 'application/json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToJsonResponse(customerBalanceSummary));
       }
     } catch (error) {
       next(error);

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

@@ -2,16 +2,15 @@ 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.
@@ -62,43 +61,20 @@ export default class GeneralLedgerReportController extends BaseFinancialReportCo
    * @param {Response} res -
    */
   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([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-    ]);
-    // Retrieves the table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.generalLedgerApplication.table(tenantId, filter);
+    try {
+      const { data, query, meta } =
+        await this.generalLedgetService.generalLedger(tenantId, filter);
 
-      return res.status(200).send(table);
-      // Retrieves the csv format.
-    } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-      const buffer = await this.generalLedgerApplication.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.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 json format.
-    } else {
-      const sheet = await this.generalLedgerApplication.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

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()
@@ -73,66 +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(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async inventoryDetails(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
     const filter = {
       ...this.matchedQueryData(req),
     };
 
     try {
+      const inventoryDetails =
+        await this.inventoryDetailsService.inventoryDetails(tenantId, filter);
+
       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,
-      ]);
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.inventoryItemDetailsApp.csv(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.inventoryItemDetailsApp.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 table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.inventoryItemDetailsApp.table(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(table);
-      } else {
-        const sheet = await this.inventoryItemDetailsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(inventoryDetails, tenantId));
+        case 'json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformJsonResponse(inventoryDetails));
       }
     } 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,45 +71,19 @@ export default class InventoryValuationReportController extends BaseFinancialRep
     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_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-    ]);
-
-    // 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 json format.
-    } else {
-      const { data, query, meta } = await this.inventoryValuationApp.sheet(
-        tenantId,
-        filter
-      );
-      return res.status(200).send({ meta, data, query });
+    try {
+      const { data, query, meta } =
+        await this.inventoryValuationService.inventoryValuationSheet(
+          tenantId,
+          filter
+        );
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

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.
@@ -58,49 +57,28 @@ export default class JournalSheetController extends BaseFinancialReportControlle
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async journal(req: Request, res: Response, next: NextFunction) {
-    const { tenantId } = req;
+  async journal(req: Request, res: Response, next: NextFunction) {
+    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,
-    ]);
 
-    // Retrieves the json table format.
-    if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-      const table = await this.journalSheetApp.table(tenantId, filter);
-      return res.status(200).send(table);
-      // 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'
+    try {
+      const { data, query, meta } = await this.journalService.journalSheet(
+        tenantId,
+        filter
       );
-      return res.send(buffer);
-      // Retrieves the json format.
-    } else {
-      const sheet = await this.journalSheetApp.sheet(tenantId, filter);
 
-      return res.status(200).send(sheet);
+      return res.status(200).send({
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+        meta: this.transfromToResponse(meta),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

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 { ProfitLossSheetApplication } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetApplication';
+import { ProfitLossSheetTable } from '@/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetTable';
+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,54 +85,37 @@ export default class ProfitLossSheetController extends BaseFinancialReportContro
    * @param {Request} req -
    * @param {Response} res -
    */
-  private async profitLossSheet(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async profitLossSheet(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
+    const i18n = this.tenancy.i18n(tenantId);
     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,
-    ]);
     try {
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const sheet = await this.profitLossSheetApp.csv(tenantId, filter);
+      const { data, query, meta } =
+        await this.profitLossSheetService.profitLossSheet(tenantId, filter);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-        return res.send(sheet);
-        // Retrieves the json table format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.profitLossSheetApp.table(tenantId, filter);
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = new ProfitLossSheetTable(data, query, i18n);
 
-        return res.status(200).send(table);
-        // Retrieves the xlsx format.
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const sheet = await this.profitLossSheetApp.xlsx(tenantId, filter);
-
-        res.setHeader(
-          'Content-Disposition',
-          'attachment; filename=output.xlsx'
-        );
-        res.setHeader(
-          'Content-Type',
-          'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        );
-        return res.send(sheet);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.profitLossSheetApp.sheet(tenantId, filter);
-
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            table: {
+              rows: table.tableRows(),
+              columns: table.tableColumns(),
+            },
+            query,
+            meta,
+          });
+        case 'json':
+        default:
+          return res.status(200).send({
+            data,
+            query,
+            meta,
+          });
       }
     } 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,47 +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);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-      ACCEPT_TYPE.APPLICATION_CSV,
-    ]);
-
-    // 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);
-      // Json response format.
-    } else {
-      const sheet = await this.purchasesByItemsApp.sheet(tenantId, filter);
-
-      return res.status(200).send(sheet);
+    try {
+      const { data, query, meta } =
+        await this.purchasesByItemsService.purchasesByItems(tenantId, filter);
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

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()
-  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,44 +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([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-      ACCEPT_TYPE.APPLICATION_CSV,
-      ACCEPT_TYPE.APPLICATION_XLSX,
-    ]);
-    // 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'
+    try {
+      const { data, query, meta } = await this.salesByItemsService.salesByItems(
+        tenantId,
+        filter
       );
-      return res.send(buffer);
-      // Retrieves the json format.
-    } else {
-      const sheet = await this.salesByItemsApp.sheet(tenantId, filter);
-      return res.status(200).send(sheet);
+      return res.status(200).send({
+        meta: this.transfromToResponse(meta),
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+      });
+    } catch (error) {
+      next(error);
     }
   }
 }

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 { ACCEPT_TYPE } from '@/interfaces/Http';
+import { SalesTaxLiabilitySummaryService } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryService';
 
 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,52 +55,33 @@ export default class SalesTaxLiabilitySummary extends BaseFinancialReportControl
 
     try {
       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,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      // Retrieves the json table format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_JSON_TABLE) {
-        const table = await this.salesTaxLiabilitySummaryApp.table(
-          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');
+      switch (acceptType) {
+        case 'application/json+table':
+          const salesTaxLiabilityTable =
+            await this.salesTaxLiabilitySummaryService.salesTaxLiabilitySummaryTable(
+              tenantId,
+              filter
+            );
 
-        return res.send(buffer);
-        // Retrieves the json format.
-      } else {
-        const sheet = await this.salesTaxLiabilitySummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+          return res.status(200).send({
+            table: salesTaxLiabilityTable.table,
+            query: salesTaxLiabilityTable.query,
+            meta: salesTaxLiabilityTable.meta,
+          });
+        case 'json':
+        default:
+          const salesTaxLiability =
+            await this.salesTaxLiabilitySummaryService.salesTaxLiability(
+              tenantId,
+              filter
+            );
+          return res.status(200).send({
+            data: salesTaxLiability.data,
+            query: salesTaxLiability.query,
+            meta: salesTaxLiability.meta,
+          });
       }
     } 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,51 +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,
-    ]);
     try {
-      // Retrieves the json table format.
-      if (ACCEPT_TYPE.APPLICATION_JSON_TABLE === acceptType) {
-        const table = await this.transactionsByCustomersApp.table(
+      const report =
+        await this.transactionsByCustomersService.transactionsByCustomers(
           tenantId,
           filter
         );
-        return res.status(200).send(table);
-        // Retrieve the csv format.
-      } else if (ACCEPT_TYPE.APPLICATION_CSV === acceptType) {
-        const csv = await this.transactionsByCustomersApp.csv(tenantId, filter);
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(csv);
-        // Retrieve the xlsx format.
-      } else if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.transactionsByCustomersApp.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);
-        // Retrieve the json format.
-      } else {
-        const sheet = await this.transactionsByCustomersApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'json':
+          return res
+            .status(200)
+            .send(this.transfromToJsonResponse(report.data, report.columns));
+        case 'application/json+table':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToTableResponse(report.data, tenantId));
       }
     } catch (error) {
       next(error);

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,64 +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(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
+  async transactionsByVendors(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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      // Retrieves the xlsx format.
-      if (ACCEPT_TYPE.APPLICATION_XLSX === acceptType) {
-        const buffer = await this.transactionsByVendorsApp.xlsx(
-          tenantId,
-          filter
-        );
-        res.setHeader('Content-Type', 'application/vnd.openxmlformats');
-        res.setHeader(
-          '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 json format.
-      } else {
-        const sheet = await this.transactionsByVendorsApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, report.data));
+        case 'json':
+        default:
+          return res.status(200).send(this.transformToJsonResponse(report));
       }
     } catch (error) {
       next(error);

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

@@ -3,22 +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/TrialBalanceSheetInjectable';
+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(
@@ -38,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(),
@@ -61,62 +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([
-        ACCEPT_TYPE.APPLICATION_JSON,
-        ACCEPT_TYPE.APPLICATION_JSON_TABLE,
-        ACCEPT_TYPE.APPLICATION_CSV,
-        ACCEPT_TYPE.APPLICATION_XLSX,
-      ]);
-      // 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 json format.
-      } else {
-        const { data, query, meta } = await this.trialBalanceSheetApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send({ data, query, meta });
-      }
+      return res.status(200).send({
+        data: this.transfromToResponse(data),
+        query: this.transfromToResponse(query),
+        meta: this.transfromToResponse(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 { VendorBalanceSummaryApplication } from '@/services/FinancialStatements/VendorBalanceSummary/VendorBalanceSummaryApplication';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 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,62 +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(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
+  async vendorBalanceSummary(req: Request, res: Response, next: NextFunction) {
+    const { tenantId, settings } = req;
     const filter = this.matchedQueryData(req);
 
     try {
+      const vendorBalanceSummary =
+        await this.vendorBalanceSummaryService.vendorBalanceSummary(
+          tenantId,
+          filter
+        );
       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,
-      ]);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      // Retrieves the csv format.
-      if (acceptType === ACCEPT_TYPE.APPLICATION_CSV) {
-        const buffer = await this.vendorBalanceSummaryApp.csv(tenantId, filter);
-
-        res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
-        res.setHeader('Content-Type', 'text/csv');
-
-        return res.send(buffer);
-      } else if (acceptType === ACCEPT_TYPE.APPLICATION_XLSX) {
-        const buffer = await this.vendorBalanceSummaryApp.xlsx(
-          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 json format.
-      } else {
-        const sheet = await this.vendorBalanceSummaryApp.sheet(
-          tenantId,
-          filter
-        );
-        return res.status(200).send(sheet);
+      switch (acceptType) {
+        case 'application/json+table':
+          return res
+            .status(200)
+            .send(this.transformToTableRows(tenantId, vendorBalanceSummary));
+        case 'json':
+        default:
+          return res
+            .status(200)
+            .send(this.transformToJsonResponse(vendorBalanceSummary));
       }
     } catch (error) {
       next(error);

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

@@ -149,11 +149,6 @@ export default class ItemsController extends BaseController {
         .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 })
@@ -513,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/Organization.ts

@@ -31,14 +31,14 @@ export default class OrganizationController extends BaseController {
 
     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)
@@ -55,7 +55,7 @@ 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().escape(),
@@ -68,29 +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()
-        .escape(),
-    ];
-  }
-
   /**
    * Builds tenant database and migrate database schema.
    * @param {Request} req - Express request.

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

@@ -115,14 +115,12 @@ export default class BillsController extends BaseController {
       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()
@@ -139,15 +137,6 @@ export default class BillsController extends BaseController {
         .optional({ nullable: true })
         .isNumeric()
         .toInt(),
-      check('entries.*.tax_code')
-        .optional({ nullable: true })
-        .trim()
-        .escape()
-        .isString(),
-      check('entries.*.tax_rate_id')
-        .optional({ nullable: true })
-        .isNumeric()
-        .toInt(),
     ];
   }
 
@@ -303,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);
     }
@@ -348,11 +337,14 @@ export default class BillsController extends BaseController {
     };
 
     try {
-      const billsWithPagination = await this.billsApplication.getBills(
-        tenantId,
-        filter
-      );
-      return res.status(200).send(billsWithPagination);
+      const { bills, pagination, filterMeta } =
+        await this.billsApplication.getBills(tenantId, filter);
+
+      return res.status(200).send({
+        bills: this.transfromToResponse(bills),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -550,16 +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 }],
-        });
-      }
     }
     next(error);
   }

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

@@ -121,7 +121,7 @@ export default class BillsPayments extends BaseController {
       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(),
     ];
   }
 
@@ -158,11 +158,15 @@ export default class BillsPayments extends BaseController {
     const { tenantId } = req;
     const { vendorId } = this.matchedQueryData(req);
 
-    const entries = await this.billPaymentsPages.getNewPageEntries(
-      tenantId,
-      vendorId
-    );
-    return res.status(200).send({ entries });
+    try {
+      const entries = await this.billPaymentsPages.getNewPageEntries(
+        tenantId,
+        vendorId
+      );
+      return res.status(200).send({
+        entries: this.transfromToResponse(entries),
+      });
+    } catch (error) {}
   }
 
   /**
@@ -179,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);
     }
@@ -296,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);
     }
@@ -349,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

@@ -173,7 +173,7 @@ 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()
@@ -211,11 +211,12 @@ export default class VendorCreditController extends BaseController {
       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()
@@ -320,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,
-        vendorCreditEditDTO
+        billId,
+        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/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
@@ -223,7 +222,7 @@ 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()
@@ -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(),
 
@@ -439,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
@@ -452,28 +451,38 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: creditNoteId } = req.params;
 
-    const accept = this.accepts(req);
-
-    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 {
+    try {
       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,11 +1,10 @@
 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';
@@ -14,7 +13,6 @@ 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 {
@@ -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;
   }
 
@@ -163,7 +142,7 @@ export default class PaymentReceivesController extends BaseController {
       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(),
     ];
   }
 
@@ -349,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);
     }
@@ -431,34 +415,38 @@ export default class PaymentReceivesController extends BaseController {
     const { tenantId } = req;
     const { id: paymentReceiveId } = req.params;
 
-    const accept = this.accepts(req);
-
-    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 {
+    try {
       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);
     }
   }
 
@@ -492,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
@@ -519,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 {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
+   * @param error
+   * @param req
+   * @param res
+   * @param next
    */
-  private handleServiceErrors(
+  handleServiceErrors(
     error: Error,
     req: Request,
     res: Response,

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

@@ -1,11 +1,10 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import {
   AbilitySubject,
   ISaleEstimateDTO,
   SaleEstimateAction,
-  SaleEstimateMailOptionsDTO,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
@@ -122,27 +121,6 @@ export default class SalesEstimatesController extends BaseController {
       this.handleServiceErrors,
       this.dynamicListService.handlerErrorsToResponse
     );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.validateSpecificEstimateSchema,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleEstimateMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.validateSpecificEstimateSchema],
-      this.validationResult,
-      asyncMiddleware(this.getSaleEstimateMail.bind(this)),
-      this.handleServiceErrors
-    );
     return router;
   }
 
@@ -334,6 +312,7 @@ export default class SalesEstimatesController extends BaseController {
         tenantId,
         estimateId
       );
+
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been approved successfully.',
@@ -362,6 +341,7 @@ export default class SalesEstimatesController extends BaseController {
         tenantId,
         estimateId
       );
+
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been rejected successfully.',
@@ -381,30 +361,33 @@ export default class SalesEstimatesController extends BaseController {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves estimate in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleEstimatesApplication.getSaleEstimatePdf(
-        tenantId,
-        estimateId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves estimates in json format.
-    } else {
+    try {
       const estimate = await this.saleEstimatesApplication.getSaleEstimate(
         tenantId,
         estimateId
       );
-      return res.status(200).send({ estimate });
+      // Response formatter.
+      res.format({
+        // JSON content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send(this.transfromToResponse({ estimate }));
+        },
+        // PDF content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent =
+            await this.saleEstimatesApplication.getSaleEstimatePdf(
+              tenantId,
+              estimate
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
     }
   }
 
@@ -422,11 +405,22 @@ export default class SalesEstimatesController extends BaseController {
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
+
     try {
-      const salesEstimatesWithPagination =
+      const { salesEstimates, pagination, filterMeta } =
         await this.saleEstimatesApplication.getSaleEstimates(tenantId, filter);
 
-      return res.status(200).send(salesEstimatesWithPagination);
+      res.format({
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res.status(200).send(
+            this.transfromToResponse({
+              salesEstimates,
+              pagination,
+              filterMeta,
+            })
+          );
+        },
+      });
     } catch (error) {
       next(error);
     }
@@ -484,65 +478,6 @@ export default class SalesEstimatesController extends BaseController {
     }
   };
 
-  /**
-   * Send the sale estimate mail.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private sendSaleEstimateMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const saleEstimateDTO: SaleEstimateMailOptionsDTO = this.matchedBodyData(
-      req,
-      {
-        includeOptionals: false,
-      }
-    );
-    try {
-      await this.saleEstimatesApplication.sendSaleEstimateMail(
-        tenantId,
-        invoiceId,
-        saleEstimateDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale estimate mail has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given sale estimate.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  private getSaleEstimateMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleEstimatesApplication.getSaleEstimateMail(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
   /**
    * Handles service errors.
    * @param {Error} error

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

@@ -1,5 +1,5 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Service, Inject } from 'typedi';
 import BaseController from '../BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
@@ -10,12 +10,14 @@ import {
   ISaleInvoiceCreateDTO,
   SaleInvoiceAction,
   AbilitySubject,
-  SendInvoiceMailDTO,
 } from '@/interfaces';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { SaleInvoiceApplication } from '@/services/Sales/Invoices/SaleInvoicesApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
+const ACCEPT_TYPE = {
+  APPLICATION_PDF: 'application/pdf',
+  APPLICATION_JSON: 'application/json',
+};
 @Service()
 export default class SaleInvoicesController extends BaseController {
   @Inject()
@@ -143,48 +145,6 @@ export default class SaleInvoicesController extends BaseController {
       this.handleServiceErrors,
       this.dynamicListService.handlerErrorsToResponse
     );
-    router.get(
-      '/:id/mail-reminder',
-      this.specificSaleInvoiceValidation,
-      this.validationResult,
-      asyncMiddleware(this.getSaleInvoiceMailReminder.bind(this)),
-      this.handleServiceErrors
-    );
-    router.post(
-      '/:id/mail-reminder',
-      [
-        ...this.specificSaleInvoiceValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleInvoiceMailReminder.bind(this)),
-      this.handleServiceErrors
-    );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.specificSaleInvoiceValidation,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_invoice').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleInvoiceMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.specificSaleInvoiceValidation],
-      this.validationResult,
-      asyncMiddleware(this.getSaleInvoiceMail.bind(this)),
-      this.handleServiceErrors
-    );
     return router;
   }
 
@@ -400,6 +360,7 @@ export default class SaleInvoicesController extends BaseController {
         saleInvoiceId,
         user
       );
+
       return res.status(200).send({
         id: saleInvoiceId,
         message: 'The sale invoice has been deleted successfully.',
@@ -414,35 +375,43 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Request} req - Request object.
    * @param {Response} res - Response object.
    */
-  private async getSaleInvoice(req: Request, res: Response) {
+  private async getSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: saleInvoiceId } = req.params;
     const { tenantId, user } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves invoice in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
-        tenantId,
-        saleInvoiceId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves invoice in json format.
-    } else {
+    try {
       const saleInvoice = await this.saleInvoiceApplication.getSaleInvoice(
         tenantId,
         saleInvoiceId,
         user
       );
-      return res.status(200).send({ saleInvoice });
+      // Response formatter.
+      res.format({
+        // JSON content type.
+        [ACCEPT_TYPE.APPLICATION_JSON]: () => {
+          return res
+            .status(200)
+            .send(this.transfromToResponse({ saleInvoice }));
+        },
+        // PDF content type.
+        [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
+          const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
+            tenantId,
+            saleInvoice
+          );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
     }
   }
   /**
@@ -465,10 +434,14 @@ export default class SaleInvoicesController extends BaseController {
       ...this.matchedQueryData(req),
     };
     try {
-      const salesInvoicesWithPagination =
+      const { salesInvoices, filterMeta, pagination } =
         await this.saleInvoiceApplication.getSaleInvoices(tenantId, filter);
 
-      return res.status(200).send(salesInvoicesWithPagination);
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+        pagination: this.transfromToResponse(pagination),
+        filter_meta: this.transfromToResponse(filterMeta),
+      });
     } catch (error) {
       next(error);
     }
@@ -495,7 +468,9 @@ export default class SaleInvoicesController extends BaseController {
           tenantId,
           customerId
         );
-      return res.status(200).send({ salesInvoices });
+      return res.status(200).send({
+        sales_invoices: this.transfromToResponse(salesInvoices),
+      });
     } catch (error) {
       next(error);
     }
@@ -523,6 +498,7 @@ export default class SaleInvoicesController extends BaseController {
         invoiceId,
         writeoffDTO
       );
+
       return res.status(200).send({
         id: saleInvoice.id,
         message: 'The given sale invoice has been written-off successfully.',
@@ -654,119 +630,6 @@ export default class SaleInvoicesController extends BaseController {
     }
   };
 
-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async sendSaleInvoiceMail(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const invoiceMailDTO: SendInvoiceMailDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-
-    try {
-      await this.saleInvoiceApplication.sendSaleInvoiceMail(
-        tenantId,
-        invoiceId,
-        invoiceMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale invoice mail has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retreivers the sale invoice reminder options.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async getSaleInvoiceMailReminder(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleInvoiceApplication.getSaleInvoiceMailReminder(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send(data);
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Sends mail invoice of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async sendSaleInvoiceMailReminder(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-    const invoiceMailDTO: SendInvoiceMailDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-    try {
-      await this.saleInvoiceApplication.sendSaleInvoiceMailReminder(
-        tenantId,
-        invoiceId,
-        invoiceMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message: 'The sale invoice mail reminder has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  }
-
-  /**
-   * Retrieves the default mail options of the given sale invoice.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public async getSaleInvoiceMail(
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) {
-    const { tenantId } = req;
-    const { id: invoiceId } = req.params;
-
-    try {
-      const data = await this.saleInvoiceApplication.getSaleInvoiceMail(
-        tenantId,
-        invoiceId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  }
-
   /**
    * Handles service errors.
    * @param {Error} error

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

@@ -1,19 +1,14 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { body, check, param, query } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import BaseController from '../BaseController';
-import {
-  ISaleReceiptDTO,
-  SaleReceiptMailOpts,
-  SaleReceiptMailOptsDTO,
-} from '@/interfaces/SaleReceipt';
+import { ISaleReceiptDTO } from '@/interfaces/SaleReceipt';
 import { ServiceError } from '@/exceptions';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, SaleReceiptAction } from '@/interfaces';
 import { SaleReceiptApplication } from '@/services/Sales/Receipts/SaleReceiptApplication';
-import { ACCEPT_TYPE } from '@/interfaces/Http';
 
 @Service()
 export default class SalesReceiptsController extends BaseController {
@@ -51,27 +46,6 @@ export default class SalesReceiptsController extends BaseController {
       this.saleReceiptSmsDetails,
       this.handleServiceErrors
     );
-    router.post(
-      '/:id/mail',
-      [
-        ...this.specificReceiptValidationSchema,
-        body('subject').isString().optional(),
-        body('from').isString().optional(),
-        body('to').isString().optional(),
-        body('body').isString().optional(),
-        body('attach_receipt').optional().isBoolean().toBoolean(),
-      ],
-      this.validationResult,
-      asyncMiddleware(this.sendSaleReceiptMail.bind(this)),
-      this.handleServiceErrors
-    );
-    router.get(
-      '/:id/mail',
-      [...this.specificReceiptValidationSchema],
-      this.validationResult,
-      asyncMiddleware(this.getSaleReceiptMail.bind(this)),
-      this.handleServiceErrors
-    );
     router.post(
       '/:id',
       CheckPolicies(SaleReceiptAction.Edit, AbilitySubject.SaleReceipt),
@@ -143,7 +117,7 @@ export default class SalesReceiptsController extends BaseController {
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.quantity').exists().isNumeric().toInt(),
-      check('entries.*.rate').exists().isNumeric().toFloat(),
+      check('entries.*.rate').exists().isNumeric().toInt(),
       check('entries.*.discount')
         .optional({ nullable: true })
         .isNumeric()
@@ -231,6 +205,7 @@ export default class SalesReceiptsController extends BaseController {
         tenantId,
         saleReceiptId
       );
+
       return res.status(200).send({
         id: saleReceiptId,
         message: 'Sale receipt has been deleted successfully.',
@@ -319,10 +294,15 @@ export default class SalesReceiptsController extends BaseController {
       ...this.matchedQueryData(req),
     };
     try {
-      const salesReceiptsWithPagination =
+      const { data, pagination, filterMeta } =
         await this.saleReceiptsApplication.getSaleReceipts(tenantId, filter);
 
-      return res.status(200).send(salesReceiptsWithPagination);
+      const response = this.transfromToResponse({
+        data,
+        pagination,
+        filterMeta,
+      });
+      return res.status(200).send(response);
     } catch (error) {
       next(error);
     }
@@ -334,34 +314,36 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  public async getSaleReceipt(req: Request, res: Response) {
+  async getSaleReceipt(req: Request, res: Response, next: NextFunction) {
     const { id: saleReceiptId } = req.params;
     const { tenantId } = req;
 
-    const accept = this.accepts(req);
-
-    const acceptType = accept.types([
-      ACCEPT_TYPE.APPLICATION_JSON,
-      ACCEPT_TYPE.APPLICATION_PDF,
-    ]);
-    // Retrieves receipt in pdf format.
-    if (ACCEPT_TYPE.APPLICATION_PDF == acceptType) {
-      const pdfContent = await this.saleReceiptsApplication.getSaleReceiptPdf(
-        tenantId,
-        saleReceiptId
-      );
-      res.set({
-        'Content-Type': 'application/pdf',
-        'Content-Length': pdfContent.length,
-      });
-      res.send(pdfContent);
-      // Retrieves receipt in json format.
-    } else {
+    try {
       const saleReceipt = await this.saleReceiptsApplication.getSaleReceipt(
         tenantId,
         saleReceiptId
       );
-      return res.status(200).send({ saleReceipt });
+      res.format({
+        'application/json': () => {
+          return res
+            .status(200)
+            .send(this.transfromToResponse({ saleReceipt }));
+        },
+        'application/pdf': async () => {
+          const pdfContent =
+            await this.saleReceiptsApplication.getSaleReceiptPdf(
+              tenantId,
+              saleReceipt
+            );
+          res.set({
+            'Content-Type': 'application/pdf',
+            'Content-Length': pdfContent.length,
+          });
+          res.send(pdfContent);
+        },
+      });
+    } catch (error) {
+      next(error);
     }
   }
 
@@ -423,64 +405,6 @@ export default class SalesReceiptsController extends BaseController {
     }
   };
 
-  /**
-   * Sends mail notification of the given sale receipt.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public sendSaleReceiptMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: receiptId } = req.params;
-    const receiptMailDTO: SaleReceiptMailOptsDTO = this.matchedBodyData(req, {
-      includeOptionals: false,
-    });
-
-    try {
-      await this.saleReceiptsApplication.sendSaleReceiptMail(
-        tenantId,
-        receiptId,
-        receiptMailDTO
-      );
-      return res.status(200).send({
-        code: 200,
-        message:
-          'The sale receipt notification via sms has been sent successfully.',
-      });
-    } catch (error) {
-      next(error);
-    }
-  };
-
-  /**
-   * Retrieves the default mail options of the given sale receipt.
-   * @param {Request} req
-   * @param {Response} res
-   * @param {NextFunction} next
-   */
-  public getSaleReceiptMail = async (
-    req: Request,
-    res: Response,
-    next: NextFunction
-  ) => {
-    const { tenantId } = req;
-    const { id: receiptId } = req.params;
-
-    try {
-      const data = await this.saleReceiptsApplication.getSaleReceiptMail(
-        tenantId,
-        receiptId
-      );
-      return res.status(200).send({ data });
-    } catch (error) {
-      next(error);
-    }
-  };
-
   /**
    * Handles service errors.
    * @param {Error} error

packages/server/src/before.ts

@@ -5,7 +5,6 @@ global.__root_dir = path.join(__dirname, '..');
 global.__resources_dir = path.join(global.__root_dir, 'resources');
 global.__locales_dir = path.join(global.__resources_dir, 'locales');
 global.__views_dir = path.join(global.__root_dir, 'views');
-global.__storage_dir = path.join(global.__root_dir, 'storage');
 
 moment.prototype.toMySqlDateTime = function () {
   return this.format('YYYY-MM-DD HH:mm:ss');

packages/server/src/config/index.ts

@@ -58,7 +58,6 @@ module.exports = {
     secure: !!parseInt(process.env.MAIL_SECURE, 10),
     username: process.env.MAIL_USERNAME,
     password: process.env.MAIL_PASSWORD,
-    from: process.env.MAIL_FROM_ADDRESS,
   },
 
   /**
@@ -169,14 +168,4 @@ module.exports = {
    * to application detarmines to upgrade.
    */
   databaseBatch: 4,
-
-  /**
-   * Exchange rate.
-   */
-  exchangeRate: {
-    service: 'open-exchange-rate',
-    openExchangeRate: {
-      appId: process.env.OPEN_EXCHANGE_RATE_APP_ID,
-    }
-  }
 };

packages/server/src/data/options.ts

@@ -59,12 +59,6 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
   },
   sales_receipts: {
     next_number: {
@@ -79,12 +73,6 @@ export default {
     preferred_deposit_account: {
       type: 'number',
     },
-    receipt_message: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
   },
   sales_invoices: {
     next_number: {
@@ -96,12 +84,6 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
   },
   payment_receives: {
     next_number: {
@@ -165,12 +147,6 @@ export default {
     auto_increment: {
       type: 'boolean',
     },
-    customer_notes: {
-      type: 'string',
-    },
-    terms_conditions: {
-      type: 'string',
-    },
   },
   vendor_credit: {
     next_number: {

packages/server/src/database/migrations/20231004012644_add_tax_amount_withheld_to_bills_table.js

@@ -1,10 +0,0 @@
-exports.up = (knex) => {
-  return knex.schema.table('bills', (table) => {
-    table.boolean('is_inclusive_tax').defaultTo(false);
-    table.decimal('tax_amount_withheld');
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.table('bills', () => {});
-};

packages/server/src/database/migrations/20231004020636_add_sell_purchase_tax_to_items_table.js

@@ -1,18 +0,0 @@
-exports.up = (knex) => {
-  return knex.schema.table('items', (table) => {
-    table
-      .integer('sell_tax_rate_id')
-      .unsigned()
-      .references('id')
-      .inTable('tax_rates');
-    table
-      .integer('purchase_tax_rate_id')
-      .unsigned()
-      .references('id')
-      .inTable('tax_rates');
-  });
-};
-
-exports.down = (knex) => {
-  return knex.schema.dropTableIfExists('tax_rates');
-};

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

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

packages/server/src/database/migrations/20231202124014_change_item_entries_rate_to_float.js

@@ -1,9 +0,0 @@
-exports.up = function (knex) {
-  return knex.schema.alterTable('items_entries', (table) => {
-    table.decimal('rate', 15, 5).alter();
-  });
-};
-
-exports.down = function (knex) {
-  return knex.table('items_entries', (table) => {});
-};

packages/server/src/interfaces/APAgingSummaryReport.ts

@@ -1,11 +1,13 @@
 import {
   IAgingPeriod,
+  IAgingPeriodTotal,
+  IAgingAmount,
   IAgingSummaryQuery,
   IAgingSummaryTotal,
   IAgingSummaryContact,
   IAgingSummaryData,
 } from './AgingReport';
-import { IFinancialTable } from './Table';
+import { INumberFormatQuery } from './FinancialStatements';
 
 export interface IAPAgingSummaryQuery extends IAgingSummaryQuery {
   vendorsIds: number[];
@@ -32,8 +34,3 @@ export interface IAPAgingSummaryMeta {
   baseCurrency: string;
   organizationName: string;
 }
-
-export interface IAPAgingSummaryTable extends IFinancialTable {
-  query: IAPAgingSummaryQuery;
-  meta: IAPAgingSummaryMeta;
-}

packages/server/src/interfaces/ARAgingSummaryReport.ts

@@ -5,7 +5,6 @@ import {
   IAgingSummaryContact,
   IAgingSummaryData,
 } from './AgingReport';
-import { IFinancialTable } from './Table';
 
 export interface IARAgingSummaryQuery extends IAgingSummaryQuery {
   customersIds: number[];
@@ -27,8 +26,3 @@ export interface IARAgingSummaryMeta {
   organizationName: string;
   baseCurrency: string;
 }
-
-export interface IARAgingSummaryTable extends IFinancialTable {
-  meta: IARAgingSummaryMeta;
-  query: IARAgingSummaryQuery;
-}

packages/server/src/interfaces/BalanceSheet.ts

@@ -3,14 +3,12 @@ import {
   IFormatNumberSettings,
   IFinancialSheetBranchesQuery,
 } from './FinancialStatements';
-import { IFinancialTable } from './Table';
 
 // Balance sheet schema nodes types.
 export enum BALANCE_SHEET_SCHEMA_NODE_TYPE {
   AGGREGATE = 'AGGREGATE',
   ACCOUNTS = 'ACCOUNTS',
   ACCOUNT = 'ACCOUNT',
-  NET_INCOME = 'NET_INCOME',
 }
 
 export enum BALANCE_SHEET_NODE_TYPE {
@@ -35,7 +33,6 @@ export enum BALANCE_SHEET_SCHEMA_NODE_ID {
   LOGN_TERM_LIABILITY = 'LOGN_TERM_LIABILITY',
   NON_CURRENT_LIABILITY = 'NON_CURRENT_LIABILITY',
   EQUITY = 'EQUITY',
-  NET_INCOME = 'NET_INCOME',
 }
 
 // Balance sheet query.
@@ -90,6 +87,7 @@ export interface IBalanceSheetDOO {
   meta: IBalanceSheetMeta;
 }
 
+
 export interface IBalanceSheetCommonNode {
   total: IBalanceSheetTotal;
   horizontalTotals?: IBalanceSheetTotal[];
@@ -110,7 +108,7 @@ export interface IBalanceSheetAggregateNode extends IBalanceSheetCommonNode {
   id: string;
   name: string;
   nodeType: BALANCE_SHEET_SCHEMA_NODE_TYPE.AGGREGATE;
-  children?: IBalanceSheetDataNode[];
+  children?: (IBalanceSheetAggregateNode | IBalanceSheetAccountNode)[];
 }
 
 export interface IBalanceSheetTotal {
@@ -120,13 +118,6 @@ export interface IBalanceSheetTotal {
   date?: string | Date;
 }
 
-export interface IBalanceSheetAccountsNode extends IBalanceSheetCommonNode {
-  id: number | string;
-  name: string;
-  nodeType: BALANCE_SHEET_SCHEMA_NODE_TYPE.ACCOUNTS;
-  children: IBalanceSheetAccountNode[];
-}
-
 export interface IBalanceSheetAccountNode extends IBalanceSheetCommonNode {
   id: number;
   index: number;
@@ -137,17 +128,7 @@ export interface IBalanceSheetAccountNode extends IBalanceSheetCommonNode {
   children?: IBalanceSheetAccountNode[];
 }
 
-export interface IBalanceSheetNetIncomeNode extends IBalanceSheetCommonNode {
-  id: number;
-  name: string;
-  nodeType: BALANCE_SHEET_SCHEMA_NODE_TYPE.NET_INCOME;
-}
-
-export type IBalanceSheetDataNode =
-  | IBalanceSheetAggregateNode
-  | IBalanceSheetAccountNode
-  | IBalanceSheetAccountsNode
-  | IBalanceSheetNetIncomeNode;
+export type IBalanceSheetDataNode = IBalanceSheetAggregateNode;
 
 export interface IBalanceSheetPercentageAmount {
   amount: number;
@@ -169,16 +150,9 @@ export interface IBalanceSheetSchemaAccountNode {
   accountsTypes: string[];
 }
 
-export interface IBalanceSheetSchemaNetIncomeNode {
-  id: string;
-  name: string;
-  type: BALANCE_SHEET_SCHEMA_NODE_TYPE;
-}
-
 export type IBalanceSheetSchemaNode =
   | IBalanceSheetSchemaAccountNode
-  | IBalanceSheetSchemaAggregateNode
-  | IBalanceSheetSchemaNetIncomeNode;
+  | IBalanceSheetSchemaAggregateNode;
 
 export interface IBalanceSheetDatePeriods {
   assocAccountNodeDatePeriods(node): any;
@@ -216,8 +190,3 @@ export enum IAccountTransactionsGroupBy {
   Month = 'month',
   Week = 'week',
 }
-
-export interface IBalanceSheetTable extends IFinancialTable {
-  meta: IBalanceSheetMeta;
-  query: IBalanceSheetQuery;
-}

packages/server/src/interfaces/Bill.ts

@@ -2,7 +2,6 @@ import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IBillLandedCost } from './LandedCost';
-
 export interface IBillDTO {
   vendorId: number;
   billNumber: string;
@@ -16,10 +15,10 @@ export interface IBillDTO {
   exchangeRate?: number;
   open: boolean;
   entries: IItemEntryDTO[];
+
   branchId?: number;
   warehouseId?: number;
   projectId?: number;
-  isInclusiveTax?: boolean;
 }
 
 export interface IBillEditDTO {
@@ -81,15 +80,6 @@ export interface IBill {
 
   localAmount?: number;
   locatedLandedCosts?: IBillLandedCost[];
-
-  amountLocal: number;
-  subtotal: number;
-  subtotalLocal: number;
-  subtotalExcludingTax: number;
-  taxAmountWithheld: number;
-  taxAmountWithheldLocal: number;
-  total: number;
-  totalLocal: number;
 }
 
 export interface IBillsFilter extends IDynamicListFilterDTO {

packages/server/src/interfaces/CashFlow.ts

@@ -1,7 +1,7 @@
 import { INumberFormatQuery } from './FinancialStatements';
 import { IAccount } from './Account';
 import { ILedger } from './Ledger';
-import { IFinancialTable, ITableRow } from './Table';
+import { ITableRow } from './Table';
 
 export interface ICashFlowStatementQuery {
   fromDate: Date | string;
@@ -101,11 +101,6 @@ export interface ICashFlowStatementDOO {
   query: ICashFlowStatementQuery;
 }
 
-export interface ICashFlowStatementTable extends IFinancialTable {
-  meta: ICashFlowStatementMeta;
-  query: ICashFlowStatementQuery;
-}
-
 export interface ICashFlowStatementService {
   cashFlow(
     tenantId: number,

packages/server/src/interfaces/CustomerBalanceSummary.ts

@@ -1,10 +1,11 @@
+import { INumberFormatQuery } from './FinancialStatements';
+
 import {
   IContactBalanceSummaryQuery,
   IContactBalanceSummaryAmount,
   IContactBalanceSummaryPercentage,
   IContactBalanceSummaryTotal,
 } from './ContactBalanceSummary';
-import { IFinancialTable } from './Table';
 
 export interface ICustomerBalanceSummaryQuery
   extends IContactBalanceSummaryQuery {
@@ -18,7 +19,7 @@ export interface ICustomerBalanceSummaryPercentage
   extends IContactBalanceSummaryPercentage {}
 
 export interface ICustomerBalanceSummaryCustomer {
-  id: number;
+  id: number,
   customerName: string;
   total: ICustomerBalanceSummaryAmount;
   percentageOfColumn?: ICustomerBalanceSummaryPercentage;
@@ -46,7 +47,3 @@ export interface ICustomerBalanceSummaryService {
     query: ICustomerBalanceSummaryQuery
   ): Promise<ICustomerBalanceSummaryStatement>;
 }
-
-export interface ICustomerBalanceSummaryTable extends IFinancialTable {
-  query: ICustomerBalanceSummaryQuery;
-}

packages/server/src/interfaces/ExchangeRate.ts

@@ -1,10 +1,36 @@
-export interface ExchangeRateLatestDTO {
-  toCurrency: string;
-  fromCurrency: string;
-}
+import { IFilterRole } from './DynamicFilter';
 
-export interface EchangeRateLatestPOJO {
-  baseCurrency: string;
-  toCurrency: string;
-  exchangeRate: number;
-}
+export interface IExchangeRate {
+  id: number,
+  currencyCode: string,
+  exchangeRate: number,
+  date: Date,
+  createdAt: Date,
+  updatedAt: Date,
+};
+
+export interface IExchangeRateDTO {
+  currencyCode: string,
+  exchangeRate: number,
+  date: Date,
+};
+
+export interface IExchangeRateEditDTO {
+  exchangeRate: number,
+};
+
+export interface IExchangeRateFilter {
+  page: number,
+  pageSize: number,
+  filterRoles?: IFilterRole[];
+  columnSortBy: string;
+  sortOrder: string;
+};
+
+export interface IExchangeRatesService {
+  newExchangeRate(tenantId: number, exchangeRateDTO: IExchangeRateDTO): Promise<IExchangeRate>;
+  editExchangeRate(tenantId: number, exchangeRateId: number, editExRateDTO: IExchangeRateEditDTO): Promise<void>;
+
+  deleteExchangeRate(tenantId: number, exchangeRateId: number): Promise<void>;
+  listExchangeRates(tenantId: number, exchangeRateFilter: IExchangeRateFilter): Promise<void>;
+};

packages/server/src/interfaces/GeneralLedgerSheet.ts

@@ -1,4 +1,3 @@
-import { IFinancialTable } from "./Table";
 
 
 export interface IGeneralLedgerSheetQuery {
@@ -37,7 +36,6 @@ export interface IGeneralLedgerSheetAccountTransaction {
   referenceType?: string,
 
   date: Date|string,
-  dateFormatted: string;
 };
 
 export interface IGeneralLedgerSheetAccountBalance {
@@ -58,8 +56,6 @@ export interface IGeneralLedgerSheetAccount {
   closingBalance: IGeneralLedgerSheetAccountBalance,
 }
 
-export type IGeneralLedgerSheetData = IGeneralLedgerSheetAccount[];
-
 export interface IAccountTransaction {
   id: number,
   index: number,
@@ -82,11 +78,4 @@ export interface IGeneralLedgerMeta {
   isCostComputeRunning: boolean,
   organizationName: string,
   baseCurrency: string,
-  fromDate: string;
-  toDate: string;
-};
-
-export interface IGeneralLedgerTableData extends IFinancialTable {
-  meta: IGeneralLedgerMeta;
-  query: IGeneralLedgerSheetQuery;
-}
+};

packages/server/src/interfaces/Http.ts

@@ -1,7 +0,0 @@
-export const ACCEPT_TYPE = {
-  APPLICATION_PDF: 'application/pdf',
-  APPLICATION_JSON: 'application/json',
-  APPLICATION_JSON_TABLE: 'application/json+table',
-  APPLICATION_XLSX: 'application/xlsx',
-  APPLICATION_CSV: 'application/csv',
-};

packages/server/src/interfaces/IInventoryValuationSheet.ts

@@ -1,5 +1,4 @@
 import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
 
 export interface IInventoryValuationReportQuery {
   asDate: Date | string;
@@ -40,19 +39,9 @@ export interface IInventoryValuationTotal {
   quantityFormatted: string;
 }
 
-export type IInventoryValuationStatement = {
-  items: IInventoryValuationItem[];
-  total: IInventoryValuationTotal;
-};
-export type IInventoryValuationSheetData = IInventoryValuationStatement;
-
-export interface IInventoryValuationSheet {
-  data: IInventoryValuationStatement;
-  meta: IInventoryValuationSheetMeta;
-  query: IInventoryValuationReportQuery;
-}
-
-export interface IInventoryValuationTable extends IFinancialTable {
-  meta: IInventoryValuationSheetMeta;
-  query: IInventoryValuationReportQuery;
-}
+export type IInventoryValuationStatement =
+  | {
+      items: IInventoryValuationItem[];
+      total: IInventoryValuationTotal;
+    }
+  | {};

packages/server/src/interfaces/InventoryDetails.ts

@@ -1,12 +1,13 @@
-import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
+import {
+  INumberFormatQuery,
+} from './FinancialStatements';
 
 export interface IInventoryDetailsQuery {
   fromDate: Date | string;
   toDate: Date | string;
   numberFormat: INumberFormatQuery;
   noneTransactions: boolean;
-  itemsIds: number[];
+  itemsIds: number[]
 
   warehousesIds?: number[];
   branchesIds?: number[];
@@ -65,7 +66,7 @@ export interface IInventoryDetailsItemTransaction {
   cost: IInventoryDetailsNumber;
   value: IInventoryDetailsNumber;
   profitMargin: IInventoryDetailsNumber;
-
+  
   rate: IInventoryDetailsNumber;
 
   runningQuantity: IInventoryDetailsNumber;
@@ -79,6 +80,7 @@ export type IInventoryDetailsNode =
   | IInventoryDetailsItemTransaction;
 export type IInventoryDetailsData = IInventoryDetailsItem[];
 
+
 export interface IInventoryItemDetailMeta {
   isCostComputeRunning: boolean;
   organizationName: string;
@@ -89,9 +91,4 @@ export interface IInvetoryItemDetailDOO {
   data: IInventoryDetailsData;
   query: IInventoryDetailsQuery;
   meta: IInventoryItemDetailMeta;
-}
-
-export interface IInvetoryItemDetailsTable extends IFinancialTable {
-  query: IInventoryDetailsQuery;
-  meta: IInventoryItemDetailMeta;
-}
+}

packages/server/src/interfaces/Item.ts

@@ -22,9 +22,6 @@ export interface IItem {
   sellDescription: string;
   purchaseDescription: string;
 
-  sellTaxRateId: number;
-  purchaseTaxRateId: number;
-
   quantityOnHand: number;
 
   note: string;
@@ -57,9 +54,6 @@ export interface IItemDTO {
   sellDescription: string;
   purchaseDescription: string;
 
-  sellTaxRateId: number;
-  purchaseTaxRateId: number;
-
   quantityOnHand: number;
 
   note: string;

packages/server/src/interfaces/JournalReport.ts

@@ -1,52 +1,36 @@
 import { IJournalEntry } from './Journal';
-import { IFinancialTable } from './Table';
 
 export interface IJournalReportQuery {
-  fromDate: Date | string;
-  toDate: Date | string;
+  fromDate: Date | string,
+  toDate: Date | string,
   numberFormat: {
-    noCents: boolean;
-    divideOn1000: boolean;
-  };
-  transactionType: string;
-  transactionId: string;
+    noCents: boolean,
+    divideOn1000: boolean,
+  },
+  transactionType: string,
+  transactionId: string,
 
-  accountsIds: number | number[];
-  fromRange: number;
-  toRange: number;
+  accountsIds: number | number[],
+  fromRange: number,
+  toRange: number,
 }
 
 export interface IJournalReportEntriesGroup {
-  id: string;
-  date: Date;
-  dateFormatted: string;
-  entries: IJournalEntry[];
-  currencyCode: string;
-  credit: number;
-  debit: number;
-  formattedCredit: string;
-  formattedDebit: string;
+  id: string,
+  entries: IJournalEntry[],
+  currencyCode: string,
+  credit: number,
+  debit: number,
+  formattedCredit: string,
+  formattedDebit: string,
 }
 
 export interface IJournalReport {
-  entries: IJournalReportEntriesGroup[];
+  entries: IJournalReportEntriesGroup[],
 }
 
 export interface IJournalSheetMeta {
-  isCostComputeRunning: boolean;
-  organizationName: string;
-  baseCurrency: string;
-}
-
-export interface IJournalTable extends IFinancialTable {
-  query: IJournalReportQuery;
-  meta: IJournalSheetMeta;
-}
-
-export type IJournalTableData = IJournalReportEntriesGroup[];
-
-export interface IJournalSheet {
-  data: IJournalTableData;
-  query: IJournalReportQuery;
-  meta: IJournalSheetMeta;
-}
+  isCostComputeRunning: boolean,
+  organizationName: string,
+  baseCurrency: string,
+}

packages/server/src/interfaces/Ledger.ts

@@ -7,25 +7,18 @@ export interface ILedger {
   filter(cb: (entry: ILedgerEntry) => boolean): ILedger;
 
   whereAccountId(accountId: number): ILedger;
-  whereAccountsIds(accountsIds: number[]): ILedger;
   whereContactId(contactId: number): ILedger;
   whereFromDate(fromDate: Date | string): ILedger;
   whereToDate(toDate: Date | string): ILedger;
   whereCurrencyCode(currencyCode: string): ILedger;
   whereBranch(branchId: number): ILedger;
   whereItem(itemId: number): ILedger;
-  whereProject(projectId: number): ILedger;
 
   getClosingBalance(): number;
   getForeignClosingBalance(): number;
-  getClosingDebit(): number;
-  getClosingCredit(): number;
 
   getContactsIds(): number[];
   getAccountsIds(): number[];
-
-  reverse(): ILedger;
-  isEmpty(): boolean;
 }
 
 export interface ILedgerEntry {

packages/server/src/interfaces/Mailable.ts

@@ -1,17 +1,9 @@
-export type IMailAttachment = MailAttachmentPath | MailAttachmentContent;
-
-export interface MailAttachmentPath {
-  filename: string;
-  path: string;
-  cid: string;
-}
-export interface MailAttachmentContent {
-  filename: string;
-  content: Buffer;
-}
 
 export interface IMailable {
-  constructor(view: string, data?: { [key: string]: string | number });
+  constructor(
+    view: string,
+    data?: { [key: string]: string | number },
+  );
   send(): Promise<any>;
   build(): void;
   setData(data: { [key: string]: string | number }): IMailable;
@@ -21,27 +13,4 @@ export interface IMailable {
   setView(view: string): IMailable;
   render(data?: { [key: string]: string | number }): string;
   getViewContent(): string;
-}
-
-export interface AddressItem {
-  label: string;
-  mail: string;
-  primary?: boolean;
-}
-
-export interface CommonMailOptions {
-  toAddresses: AddressItem[];
-  fromAddresses: AddressItem[];
-  from: string;
-  to: string | string[];
-  subject: string;
-  body: string;
-  data?: Record<string, any>;
-}
-
-export interface CommonMailOptionsDTO {
-  to?: string | string[];
-  from?: string;
-  subject?: string;
-  body?: string;
-}
+}

packages/server/src/interfaces/PaymentReceive.ts

@@ -1,9 +1,5 @@
 import { Knex } from 'knex';
-import {
-  CommonMailOptions,
-  CommonMailOptionsDTO,
-  ISystemUser,
-} from '@/interfaces';
+import { ISystemUser } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
 import { ISaleInvoice } from './SaleInvoice';
 
@@ -23,7 +19,7 @@ export interface IPaymentReceive {
   createdAt: Date;
   updatedAt: Date;
   localAmount?: number;
-  branchId?: number;
+  branchId?: number
 }
 export interface IPaymentReceiveCreateDTO {
   customerId: number;
@@ -169,7 +165,3 @@ export type IPaymentReceiveGLCommonEntry = Pick<
   | 'createdAt'
   | 'branchId'
 >;
-
-export interface PaymentReceiveMailOpts extends CommonMailOptions {}
-
-export interface PaymentReceiveMailOptsDTO extends CommonMailOptionsDTO {}

packages/server/src/interfaces/ProfitLossSheet.ts

@@ -2,7 +2,6 @@ import {
   IFinancialSheetBranchesQuery,
   INumberFormatQuery,
 } from './FinancialStatements';
-import { IFinancialTable } from './Table';
 
 export enum ProfitLossAggregateNodeId {
   INCOME = 'INCOME',
@@ -178,9 +177,3 @@ export enum ProfitLossSheetRowType {
   ACCOUNT = 'ACCOUNT',
   TOTAL = 'TOTAL',
 }
-
-
-export interface IProfitLossSheetTable extends IFinancialTable{
-  meta: IProfitLossSheetMeta;
-  query: IProfitLossSheetQuery;
-}

packages/server/src/interfaces/PurchasesByItemsSheet.ts

@@ -1,54 +0,0 @@
-import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
-
-export interface IPurchasesByItemsReportQuery {
-  fromDate: Date | string;
-  toDate: Date | string;
-  itemsIds: number[];
-  numberFormat: INumberFormatQuery;
-  noneTransactions: boolean;
-  onlyActive: boolean;
-}
-
-export interface IPurchasesByItemsSheetMeta {
-  organizationName: string;
-  baseCurrency: string;
-}
-
-export interface IPurchasesByItemsItem {
-  id: number;
-  name: string;
-  code: string;
-  quantitySold: number;
-  soldCost: number;
-  averageSellPrice: number;
-
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  averageSellPriceFormatted: string;
-  currencyCode: string;
-}
-
-export interface IPurchasesByItemsTotal {
-  quantitySold: number;
-  soldCost: number;
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  currencyCode: string;
-}
-
-export type IPurchasesByItemsSheetData = {
-  items: IPurchasesByItemsItem[];
-  total: IPurchasesByItemsTotal;
-};
-
-export interface IPurchasesByItemsSheet {
-  data: IPurchasesByItemsSheetData;
-  query: IPurchasesByItemsReportQuery;
-  meta: IPurchasesByItemsSheetMeta;
-}
-
-export interface IPurchasesByItemsTable extends IFinancialTable {
-  query: IPurchasesByItemsReportQuery;
-  meta: IPurchasesByItemsSheetMeta;
-}

packages/server/src/interfaces/Roles.ts

@@ -1,5 +1,5 @@
-import { Knex } from 'knex';
 import { Ability, RawRuleOf, ForcedSubject } from '@casl/ability';
+import Knex from 'knex';
 
 export const actions = [
   'manage',
@@ -96,8 +96,7 @@ export enum AbilitySubject {
   Preferences = 'Preferences',
   CreditNote = 'CreditNode',
   VendorCredit = 'VendorCredit',
-  Project = 'Project',
-  TaxRate = 'TaxRate'
+  Project = 'Project'
 }
 
 export interface IRoleCreatedPayload {

packages/server/src/interfaces/SaleEstimate.ts

@@ -1,7 +1,6 @@
 import { Knex } from 'knex';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
-import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
 
 export interface ISaleEstimate {
   id?: number;
@@ -125,11 +124,3 @@ export interface ISaleEstimateApprovedEvent {
   saleEstimate: ISaleEstimate;
   trx: Knex.Transaction;
 }
-
-export interface SaleEstimateMailOptions extends CommonMailOptions {
-  attachEstimate?: boolean;
-}
-
-export interface SaleEstimateMailOptionsDTO extends CommonMailOptionsDTO {
-  attachEstimate?: boolean;
-}

packages/server/src/interfaces/SaleInvoice.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import { ISystemUser, IAccount, ITaxTransaction } from '@/interfaces';
-import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
 import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 
@@ -187,17 +186,3 @@ export enum SaleInvoiceAction {
   Writeoff = 'Writeoff',
   NotifyBySms = 'NotifyBySms',
 }
-
-export interface SaleInvoiceMailOptions extends CommonMailOptions {
-  attachInvoice: boolean;
-}
-
-export interface SendInvoiceMailDTO extends CommonMailOptionsDTO {
-  attachInvoice?: boolean;
-}
-
-export interface ISaleInvoiceNotifyPayload {
-  tenantId: number;
-  saleInvoiceId: number;
-  messageDTO: SendInvoiceMailDTO;
-}

packages/server/src/interfaces/SaleReceipt.ts

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import { IItemEntry } from './ItemEntry';
-import { CommonMailOptions, CommonMailOptionsDTO } from './Mailable';
 
 export interface ISaleReceipt {
   id?: number;
@@ -135,11 +134,3 @@ export interface ISaleReceiptDeletingPayload {
   oldSaleReceipt: ISaleReceipt;
   trx: Knex.Transaction;
 }
-
-export interface SaleReceiptMailOpts extends CommonMailOptions {
-  attachReceipt: boolean;
-}
-
-export interface SaleReceiptMailOptsDTO extends CommonMailOptionsDTO {
-  attachReceipt?: boolean;
-}

packages/server/src/interfaces/SalesByItemsSheet.ts

@@ -1,54 +1,45 @@
-import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
+import {
+  INumberFormatQuery,
+} from './FinancialStatements';
 
 export interface ISalesByItemsReportQuery {
   fromDate: Date | string;
   toDate: Date | string;
-  itemsIds: number[];
+  itemsIds: number[],
   numberFormat: INumberFormatQuery;
   noneTransactions: boolean;
-  onlyActive: boolean;
-}
-
-export interface ISalesByItemsSheetMeta {
-  organizationName: string;
-  baseCurrency: string;
-}
-
-export interface ISalesByItemsItem {
-  id: number;
-  name: string;
-  code: string;
-  quantitySold: number;
-  soldCost: number;
-  averageSellPrice: number;
-
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  averageSellPriceFormatted: string;
-  currencyCode: string;
-}
-
-export interface ISalesByItemsTotal {
-  quantitySold: number;
-  soldCost: number;
-  quantitySoldFormatted: string;
-  soldCostFormatted: string;
-  currencyCode: string;
-}
-
-export type ISalesByItemsSheetData = {
-  items: ISalesByItemsItem[];
-  total: ISalesByItemsTotal;
+  onlyActive: boolean; 
 };
 
-export interface ISalesByItemsSheet {
-  data: ISalesByItemsSheetData;
-  query: ISalesByItemsReportQuery;
-  meta: ISalesByItemsSheetMeta;
-}
+export interface ISalesByItemsSheetMeta {
+  organizationName: string,
+  baseCurrency: string,
+};
+
+export interface ISalesByItemsItem {
+  id: number,
+  name: string,
+  code: string,
+  quantitySold: number,
+  soldCost: number,
+  averageSellPrice: number,
+
+  quantitySoldFormatted: string,
+  soldCostFormatted: string,
+  averageSellPriceFormatted: string,
+  currencyCode: string,
+};
+
+export interface ISalesByItemsTotal {
+  quantitySold: number,
+  soldCost: number,
+  quantitySoldFormatted: string,
+  soldCostFormatted: string,
+  currencyCode: string,
+};
+
+export type ISalesByItemsSheetStatement = {
+  items: ISalesByItemsItem[],
+  total: ISalesByItemsTotal
+} | {};
 
-export interface ISalesByItemsTable extends IFinancialTable {
-  query: ISalesByItemsReportQuery;
-  meta: ISalesByItemsSheetMeta;
-}

packages/server/src/interfaces/SalesTaxLiabilitySummary.ts

@@ -1,5 +1,3 @@
-import { IFinancialTable } from "./Table";
-
 export interface SalesTaxLiabilitySummaryQuery {
   fromDate: Date;
   toDate: Date;
@@ -51,8 +49,3 @@ export interface SalesTaxLiabilitySummaryMeta  {
   organizationName: string;
   baseCurrency: string;
 }
-
-export interface ISalesTaxLiabilitySummaryTable extends IFinancialTable {
-  query: SalesTaxLiabilitySummaryQuery;
-  meta: SalesTaxLiabilitySummaryMeta;
-}

packages/server/src/interfaces/Setup.ts

@@ -25,7 +25,6 @@ export interface IOrganizationUpdateDTO {
   timezone: string;
   fiscalYear: string;
   industry: string;
-  taxNumber: string;
 }
 
 export interface IOrganizationBuildEventPayload {

packages/server/src/interfaces/Table.ts

@@ -10,7 +10,7 @@ export interface ITableCell {
 }
 
 export type ITableRow = {
-  cells: ITableCell[];
+  rows: ITableCell[];
 };
 
 export interface ITableColumn {
@@ -28,13 +28,4 @@ export interface ITable {
 export interface ITableColumnAccessor {
   key: string;
   accessor: string;
-}
-
-export interface ITableData {
-  columns: ITableColumn[];
-  rows: ITableRow[];
-}
-
-export interface IFinancialTable {
-  table: ITableData;
-}
+}

packages/server/src/interfaces/TaxRate.ts

@@ -36,7 +36,6 @@ export interface ITaxRateCreatedPayload {
 }
 
 export interface ITaxRateEditingPayload {
-  oldTaxRate: ITaxRate;
   editTaxRateDTO: IEditTaxRateDTO;
   tenantId: number;
   trx: Knex.Transaction;

packages/server/src/interfaces/TransactionsByCustomers.ts

@@ -1,4 +1,3 @@
-import { IFinancialTable, ITableData } from './Table';
 import {
   ITransactionsByContactsAmount,
   ITransactionsByContactsTransaction,
@@ -27,11 +26,6 @@ export type ITransactionsByCustomersData = ITransactionsByCustomersCustomer[];
 
 export interface ITransactionsByCustomersStatement {
   data: ITransactionsByCustomersData;
-  query: ITransactionsByCustomersFilter;
-}
-
-export interface ITransactionsByCustomersTable extends IFinancialTable {
-  query: ITransactionsByCustomersFilter;
 }
 
 export interface ITransactionsByCustomersService {

packages/server/src/interfaces/TransactionsByVendors.ts

@@ -1,4 +1,3 @@
-import { IFinancialTable } from './Table';
 import {
   ITransactionsByContactsAmount,
   ITransactionsByContactsTransaction,
@@ -35,7 +34,3 @@ export interface ITransactionsByVendorsService {
     filter: ITransactionsByVendorsFilter
   ): Promise<ITransactionsByVendorsStatement>;
 }
-
-export interface ITransactionsByVendorTable extends IFinancialTable {
-  query: ITransactionsByVendorsFilter;
-}

packages/server/src/interfaces/TrialBalanceSheet.ts

@@ -1,5 +1,4 @@
 import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
 
 export interface ITrialBalanceSheetQuery {
   fromDate: Date | string;
@@ -34,7 +33,6 @@ export interface ITrialBalanceAccount extends ITrialBalanceTotal {
   id: number;
   parentAccountId: number;
   name: string;
-  formattedName: string;
   code: string;
   accountNormal: string;
 }
@@ -49,8 +47,3 @@ export interface ITrialBalanceStatement {
   query: ITrialBalanceSheetQuery;
   meta: ITrialBalanceSheetMeta;
 }
-
-export interface ITrialBalanceSheetTable extends IFinancialTable {
-  meta: ITrialBalanceSheetMeta;
-  query: ITrialBalanceSheetQuery;
-}

packages/server/src/interfaces/VendorBalanceSummary.ts

@@ -1,9 +1,8 @@
 import { INumberFormatQuery } from './FinancialStatements';
-import { IFinancialTable } from './Table';
 
 export interface IVendorBalanceSummaryQuery {
   asDate: Date;
-  vendorsIds: number[];
+  vendorsIds: number[],
   numberFormat: INumberFormatQuery;
   percentageColumn: boolean;
   noneTransactions: boolean;
@@ -46,10 +45,6 @@ export interface IVendorBalanceSummaryStatement {
 export interface IVendorBalanceSummaryService {
   vendorBalanceSummary(
     tenantId: number,
-    query: IVendorBalanceSummaryQuery
+    query: IVendorBalanceSummaryQuery,
   ): Promise<IVendorBalanceSummaryStatement>;
 }
-
-export interface IVendorBalanceSummaryTable extends IFinancialTable {
-  query: IVendorBalanceSummaryQuery;
-}

packages/server/src/lib/Chromiumly/Chromiumly.ts

@@ -1,26 +0,0 @@
-import { ChromiumRoute, LibreOfficeRoute, PdfEngineRoute } from './_types';
-
-export class Chromiumly {
-  public static readonly GOTENBERG_ENDPOINT = process.env.GOTENBERG_URL || '';
-
-  public static readonly CHROMIUM_PATH = 'forms/chromium/convert';
-  public static readonly PDF_ENGINES_PATH = 'forms/pdfengines';
-  public static readonly LIBRE_OFFICE_PATH = 'forms/libreoffice';
-
-  public static readonly GOTENBERG_DOCS_ENDPOINT =
-    process.env.GOTENBERG_DOCS_URL || '';
-
-  public static readonly CHROMIUM_ROUTES = {
-    url: ChromiumRoute.URL,
-    html: ChromiumRoute.HTML,
-    markdown: ChromiumRoute.MARKDOWN,
-  };
-
-  public static readonly PDF_ENGINE_ROUTES = {
-    merge: PdfEngineRoute.MERGE,
-  };
-
-  public static readonly LIBRE_OFFICE_ROUTES = {
-    convert: LibreOfficeRoute.CONVERT,
-  };
-}

packages/server/src/lib/Chromiumly/ConvertUtils.ts

@@ -1,66 +0,0 @@
-import FormData from 'form-data';
-import { GotenbergUtils } from './GotenbergUtils';
-import { PageProperties } from './_types';
-
-export class ConverterUtils {
-  public static injectPageProperties(
-    data: FormData,
-    pageProperties: PageProperties
-  ): void {
-    if (pageProperties.size) {
-      GotenbergUtils.assert(
-        pageProperties.size.width >= 1.0 && pageProperties.size.height >= 1.5,
-        'size is smaller than the minimum printing requirements (i.e. 1.0 x 1.5 in)'
-      );
-
-      data.append('paperWidth', pageProperties.size.width);
-      data.append('paperHeight', pageProperties.size.height);
-    }
-    if (pageProperties.margins) {
-      GotenbergUtils.assert(
-        pageProperties.margins.top >= 0 &&
-          pageProperties.margins.bottom >= 0 &&
-          pageProperties.margins.left >= 0 &&
-          pageProperties.margins.left >= 0,
-        'negative margins are not allowed'
-      );
-      data.append('marginTop', pageProperties.margins.top);
-      data.append('marginBottom', pageProperties.margins.bottom);
-      data.append('marginLeft', pageProperties.margins.left);
-      data.append('marginRight', pageProperties.margins.right);
-    }
-    if (pageProperties.preferCssPageSize) {
-      data.append(
-        'preferCssPageSize',
-        String(pageProperties.preferCssPageSize)
-      );
-    }
-    if (pageProperties.printBackground) {
-      data.append('printBackground', String(pageProperties.printBackground));
-    }
-    if (pageProperties.landscape) {
-      data.append('landscape', String(pageProperties.landscape));
-    }
-    if (pageProperties.scale) {
-      GotenbergUtils.assert(
-        pageProperties.scale >= 0.1 && pageProperties.scale <= 2.0,
-        'scale is outside of [0.1 - 2] range'
-      );
-      data.append('scale', pageProperties.scale);
-    }
-
-    if (pageProperties.nativePageRanges) {
-      GotenbergUtils.assert(
-        pageProperties.nativePageRanges.from > 0 &&
-          pageProperties.nativePageRanges.to > 0 &&
-          pageProperties.nativePageRanges.to >=
-            pageProperties.nativePageRanges.from,
-        'page ranges syntax error'
-      );
-      data.append(
-        'nativePageRanges',
-        `${pageProperties.nativePageRanges.from}-${pageProperties.nativePageRanges.to}`
-      );
-    }
-  }
-}

packages/server/src/lib/Chromiumly/Converter.ts

@@ -1,10 +0,0 @@
-import { Chromiumly } from './Chromiumly';
-import { ChromiumRoute } from './_types';
-
-export abstract class Converter {
-  readonly endpoint: string;
-
-  constructor(route: ChromiumRoute) {
-    this.endpoint = `${Chromiumly.GOTENBERG_ENDPOINT}/${Chromiumly.CHROMIUM_PATH}/${Chromiumly.CHROMIUM_ROUTES[route]}`;
-  }
-}

packages/server/src/lib/Chromiumly/GotenbergUtils.ts

@@ -1,24 +0,0 @@
-import FormData from 'form-data';
-import Axios from 'axios';
-
-export class GotenbergUtils {
-  public static assert(condition: boolean, message: string): asserts condition {
-    if (!condition) {
-      throw new Error(message);
-    }
-  }
-
-  public static async fetch(endpoint: string, data: FormData): Promise<Buffer> {
-    try {
-      const response = await Axios.post(endpoint, data, {
-        headers: {
-          ...data.getHeaders(),
-        },
-        responseType: 'arraybuffer', // This ensures you get a Buffer bac
-      });
-      return response.data;
-    } catch (error) {
-      console.error(error);
-    }
-  }
-}

packages/server/src/lib/Chromiumly/HTMLConvert.ts

@@ -1,38 +0,0 @@
-import { constants, createReadStream, PathLike, promises } from 'fs';
-import FormData from 'form-data';
-import { GotenbergUtils } from './GotenbergUtils';
-import { IConverter, PageProperties } from './_types';
-import { PdfFormat, ChromiumRoute } from './_types';
-import { ConverterUtils } from './ConvertUtils';
-import { Converter } from './Converter';
-
-export class HtmlConverter extends Converter implements IConverter {
-  constructor() {
-    super(ChromiumRoute.HTML);
-  }
-
-  async convert({
-    html,
-    properties,
-    pdfFormat,
-  }: {
-    html: PathLike;
-    properties?: PageProperties;
-    pdfFormat?: PdfFormat;
-  }): Promise<Buffer> {
-    try {
-      await promises.access(html, constants.R_OK);
-      const data = new FormData();
-      if (pdfFormat) {
-        data.append('pdfFormat', pdfFormat);
-      }
-      data.append('index.html', createReadStream(html));
-      if (properties) {
-        ConverterUtils.injectPageProperties(data, properties);
-      }
-      return GotenbergUtils.fetch(this.endpoint, data);
-    } catch (error) {
-      throw error;
-    }
-  }
-}

packages/server/src/lib/Chromiumly/UrlConvert.ts

@@ -1,38 +0,0 @@
-import FormData from 'form-data';
-import { IConverter, PageProperties, PdfFormat, ChromiumRoute } from './_types';
-import { ConverterUtils } from './ConvertUtils';
-import { Converter } from './Converter';
-import { GotenbergUtils } from './GotenbergUtils';
-
-export class UrlConverter extends Converter implements IConverter {
-  constructor() {
-    super(ChromiumRoute.URL);
-  }
-
-  async convert({
-    url,
-    properties,
-    pdfFormat,
-  }: {
-    url: string;
-    properties?: PageProperties;
-    pdfFormat?: PdfFormat;
-  }): Promise<Buffer> {
-    try {
-      const _url = new URL(url);
-      const data = new FormData();
-
-      if (pdfFormat) {
-        data.append('pdfFormat', pdfFormat);
-      }
-      data.append('url', _url.href);
-
-      if (properties) {
-        ConverterUtils.injectPageProperties(data, properties);
-      }
-      return GotenbergUtils.fetch(this.endpoint, data);
-    } catch (error) {
-      throw error;
-    }
-  }
-}

packages/server/src/lib/Chromiumly/_types.ts

@@ -1,51 +0,0 @@
-import { PathLike } from 'fs';
-
-export type PageSize = {
-  width: number; // Paper width, in inches (default 8.5)
-  height: number; //Paper height, in inches (default 11)
-};
-
-export type PageMargins = {
-  top: number; // Top margin, in inches (default 0.39)
-  bottom: number; // Bottom margin, in inches (default 0.39)
-  left: number; // Left margin, in inches (default 0.39)
-  right: number; // Right margin, in inches (default 0.39)
-};
-
-export type PageProperties = {
-  size?: PageSize;
-  margins?: PageMargins;
-  preferCssPageSize?: boolean; // Define whether to prefer page size as defined by CSS (default false)
-  printBackground?: boolean; // Print the background graphics (default false)
-  landscape?: boolean; // Set the paper orientation to landscape (default false)
-  scale?: number; // The scale of the page rendering (default 1.0)
-  nativePageRanges?: { from: number; to: number }; // Page ranges to print
-};
-
-export interface IConverter {
-  convert({
-    ...args
-  }: {
-    [x: string]: string | PathLike | PageProperties | PdfFormat;
-  }): Promise<Buffer>;
-}
-
-export enum PdfFormat {
-  A_1a = 'PDF/A-1a',
-  A_2b = 'PDF/A-2b',
-  A_3b = 'PDF/A-3b',
-}
-
-export enum ChromiumRoute {
-  URL = 'url',
-  HTML = 'html',
-  MARKDOWN = 'markdown',
-}
-
-export enum PdfEngineRoute {
-  MERGE = 'merge',
-}
-
-export enum LibreOfficeRoute {
-  CONVERT = 'convert',
-}

packages/server/src/lib/ExchangeRate/ExchangeRate.ts

@@ -1,45 +0,0 @@
-import { OpenExchangeRate } from './OpenExchangeRate';
-import { ExchangeRateServiceType, IExchangeRateService } from './types';
-
-export class ExchangeRate {
-  private exchangeRateService: IExchangeRateService;
-  private exchangeRateServiceType: ExchangeRateServiceType;
-
-  /**
-   * Constructor method.
-   * @param {ExchangeRateServiceType} service
-   */
-  constructor(service: ExchangeRateServiceType) {
-    this.exchangeRateServiceType = service;
-    this.initService();
-  }
-
-  /**
-   * Initialize the exchange rate service based on the service type.
-   */
-  private initService() {
-    if (
-      this.exchangeRateServiceType === ExchangeRateServiceType.OpenExchangeRate
-    ) {
-      this.setExchangeRateService(new OpenExchangeRate());
-    }
-  }
-
-  /**
-   * Sets the exchange rate service.
-   * @param {IExchangeRateService} service
-   */
-  private setExchangeRateService(service: IExchangeRateService) {
-    this.exchangeRateService = service;
-  }
-
-  /**
-   * Gets the latest exchange rate.
-   * @param {string} baseCurrency
-   * @param {string} toCurrency
-   * @returns {number}
-   */
-  public latest(baseCurrency: string, toCurrency: string): Promise<number> {
-    return this.exchangeRateService.latest(baseCurrency, toCurrency);
-  }
-}

packages/server/src/lib/ExchangeRate/OpenExchangeRate.ts

@@ -1,81 +0,0 @@
-import Axios, { AxiosError } from 'axios';
-import {
-  EchangeRateErrors,
-  IExchangeRateService,
-  OPEN_EXCHANGE_RATE_LATEST_URL,
-} from './types';
-import config from '@/config';
-import { ServiceError } from '@/exceptions';
-
-export class OpenExchangeRate implements IExchangeRateService {
-  /**
-   * Gets the latest exchange rate.
-   * @param {string} baseCurrency
-   * @param {string} toCurrency
-   * @returns {Promise<number}
-   */
-  public async latest(
-    baseCurrency: string,
-    toCurrency: string
-  ): Promise<number> {
-    // Vaclidates the Open Exchange Rate api id early.
-    this.validateApiIdExistance();
-
-    try {
-      const result = await Axios.get(OPEN_EXCHANGE_RATE_LATEST_URL, {
-        params: {
-          app_id: config.exchangeRate.openExchangeRate.appId,
-          base: baseCurrency,
-          symbols: toCurrency,
-        },
-      });
-      return result.data.rates[toCurrency] || (1 as number);
-    } catch (error) {
-      this.handleLatestErrors(error);
-    }
-  }
-
-  /**
-   * Validates the Open Exchange Rate api id.
-   * @throws {ServiceError}
-   */
-  private validateApiIdExistance() {
-    const apiId = config.exchangeRate.openExchangeRate.appId;
-
-    if (!apiId) {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    }
-  }
-
-  /**
-   * Handles the latest errors.
-   * @param {any} error
-   * @throws {ServiceError}
-   */
-  private handleLatestErrors(error: any) {
-    if (error.response.data?.message === 'missing_app_id') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    } else if (error.response.data?.message === 'invalid_app_id') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_API_KEY_REQUIRED,
-        'Invalid App ID provided. Please sign up at https://openexchangerates.org/signup, or contact support@openexchangerates.org.'
-      );
-    } else if (error.response.data?.message === 'not_allowed') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_SERVICE_NOT_ALLOWED,
-        'Getting the exchange rate from the given base currency to the given currency is not allowed.'
-      );
-    } else if (error.response.data?.message === 'invalid_base') {
-      throw new ServiceError(
-        EchangeRateErrors.EX_RATE_INVALID_BASE_CURRENCY,
-        'The given base currency is invalid.'
-      );
-    }
-  }
-}

packages/server/src/lib/ExchangeRate/types.ts

@@ -1,17 +0,0 @@
-export interface IExchangeRateService {
-  latest(baseCurrency: string, toCurrency: string): Promise<number>;
-}
-
-export enum ExchangeRateServiceType {
-  OpenExchangeRate = 'OpenExchangeRate',
-}
-
-export enum EchangeRateErrors {
-  EX_RATE_SERVICE_NOT_ALLOWED = 'EX_RATE_SERVICE_NOT_ALLOWED',
-  EX_RATE_LIMIT_EXCEEDED = 'EX_RATE_LIMIT_EXCEEDED',
-  EX_RATE_SERVICE_API_KEY_REQUIRED = 'EX_RATE_SERVICE_API_KEY_REQUIRED',
-  EX_RATE_INVALID_BASE_CURRENCY = 'EX_RATE_INVALID_BASE_CURRENCY',
-}
-
-export const OPEN_EXCHANGE_RATE_LATEST_URL =
-  'https://openexchangerates.org/api/latest.json';

packages/server/src/lib/Mail/index.ts

@@ -2,13 +2,18 @@ import fs from 'fs';
 import Mustache from 'mustache';
 import { Container } from 'typedi';
 import path from 'path';
-import { IMailAttachment } from '@/interfaces';
+import { IMailable } from '@/interfaces';
+
+interface IMailAttachment {
+  filename: string;
+  path: string;
+  cid: string;
+}
 
 export default class Mail {
   view: string;
-  subject: string = '';
-  content: string = '';
-  to: string | string[];
+  subject: string;
+  to: string;
   from: string = `${process.env.MAIL_FROM_NAME} ${process.env.MAIL_FROM_ADDRESS}`;
   data: { [key: string]: string | number };
   attachments: IMailAttachment[];
@@ -16,24 +21,16 @@ export default class Mail {
   /**
    * Mail options.
    */
-  public get mailOptions() {
+  private get mailOptions() {
     return {
       to: this.to,
       from: this.from,
       subject: this.subject,
-      html: this.html,
+      html: this.render(this.data),
       attachments: this.attachments,
     };
   }
 
-  /**
-   * Retrieves the html content of the mail.
-   * @returns {string}
-   */
-  public get html() {
-    return this.view ? Mail.render(this.view, this.data) : this.content;
-  }
-
   /**
    * Sends the given mail to the target address.
    */
@@ -55,7 +52,7 @@ export default class Mail {
    * Set send mail to address.
    * @param {string} to -
    */
-  setTo(to: string | string[]) {
+  setTo(to: string) {
     this.to = to;
     return this;
   }
@@ -65,16 +62,11 @@ export default class Mail {
    * @param {string} from
    * @return {}
    */
-  setFrom(from: string) {
+  private setFrom(from: string) {
     this.from = from;
     return this;
   }
 
-  /**
-   * Set attachments to the mail.
-   * @param {IMailAttachment[]} attachments 
-   * @returns {Mail}
-   */
   setAttachments(attachments: IMailAttachment[]) {
     this.attachments = attachments;
     return this;
@@ -103,26 +95,21 @@ export default class Mail {
     return this;
   }
 
-  setContent(content: string) {
-    this.content = content;
-    return this;
-  }
-
   /**
    * Renders the view template with the given data.
    * @param  {object} data
    * @return {string}
    */
-  static render(view: string, data: Record<string, any>): string {
-    const viewContent = Mail.getViewContent(view);
+  render(data): string {
+    const viewContent = this.getViewContent();
     return Mustache.render(viewContent, data);
   }
 
   /**
    * Retrieve view content from the view directory.
    */
-  static getViewContent(view: string): string {
-    const filePath = path.join(global.__views_dir, `/${view}`);
+  private getViewContent(): string {
+    const filePath = path.join(global.__views_dir, `/${this.view}`);
     return fs.readFileSync(filePath, 'utf8');
   }
 }

packages/server/src/lib/Xlsx/TableSheet.ts

@@ -1,134 +0,0 @@
-import xlsx, { WorkBook } from 'xlsx';
-import { IFinancialTable, ITableData } from '@/interfaces';
-import { FinancialTableStructure } from '@/services/FinancialStatements/FinancialTableStructure';
-
-interface ITableSheet {
-  convertToXLSX(): WorkBook;
-  convertToCSV(): string;
-  convertToBuffer(workbook: WorkBook, fileType: string): Buffer;
-}
-
-export class TableSheet implements ITableSheet {
-  private table: ITableData;
-
-  constructor(table: ITableData) {
-    this.table = table;
-  }
-
-  /**
-   * Retrieves the columns labels.
-   * @returns {string[]}
-   */
-  private get columns() {
-    return this.table.columns.map((col) => col.label);
-  }
-
-  /**
-   * Retrieves the columns accessors.
-   * @returns {string[]}
-   */
-  private get columnsAccessors() {
-    return this.table.columns.map((col, index) => {
-      return `${index}`;
-    });
-  }
-
-  /**
-   * Retrieves the rows data cellIndex/Value.
-   * @returns {Record<string, string>}
-   */
-  private get rows() {
-    const computedRows = FinancialTableStructure.flatNestedTree(
-      this.table.rows
-    );
-    return computedRows.map((row) => {
-      const entries = row.cells.map((cell, index) => {
-        return [`${index}`, cell.value];
-      });
-      return Object.fromEntries(entries);
-    });
-  }
-
-  /**
-   * Converts the table to a CSV string.
-   * @returns {string}
-   */
-  public convertToCSV(): string {
-    // Define custom headers
-    const headers = this.columns;
-
-    // Convert data to worksheet with headers
-    const worksheet = xlsx.utils.json_to_sheet(this.rows, {
-      header: this.columnsAccessors,
-    });
-    // Add custom headers to the worksheet
-    xlsx.utils.sheet_add_aoa(worksheet, [headers], { origin: 'A1' });
-
-    // Convert worksheet to CSV format
-    const csvOutput = xlsx.utils.sheet_to_csv(worksheet);
-
-    return csvOutput;
-  }
-
-  /**
-   * Convert the array of objects to an XLSX file with styled headers
-   * @returns {Workbook}
-   */
-  public convertToXLSX(): WorkBook {
-    // Create a new workbook and a worksheet
-    const workbook = xlsx.utils.book_new();
-    const worksheet = xlsx.utils.json_to_sheet(this.rows, {
-      header: this.columnsAccessors,
-    });
-    // Add custom headers to the worksheet
-    xlsx.utils.sheet_add_aoa(worksheet, [this.columns], {
-      origin: 'A1',
-    });
-    // Adjust column width.
-    worksheet['!cols'] = this.computeXlsxColumnsWidths(this.rows);
-
-    // Append the worksheet to the workbook
-    xlsx.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
-
-    return workbook;
-  }
-
-  /**
-   * Converts the given workbook to buffer of the given file type
-   * @param {WorkBook} workbook
-   * @param {string} fileType
-   * @returns {Promise<Buffer>}
-   */
-  public convertToBuffer(workbook: WorkBook, fileType: 'xlsx' | 'csv'): Buffer {
-    return xlsx.write(workbook, {
-      type: 'buffer',
-      bookType: fileType,
-      cellStyles: true,
-    });
-  }
-
-  /**
-   * Adjusts and computes the columns width.
-   * @param {} rows
-   * @returns {{wch: number}[]}
-   */
-  private computeXlsxColumnsWidths = (rows): { wch: number }[] => {
-    const cols = [{ wch: 60 }];
-
-    this.columns.map((column) => {
-      cols.push({ wch: column.length });
-    });
-    rows.forEach((row) => {
-      const entries = Object.entries(row);
-
-      entries.forEach(([key, value]) => {
-        if (cols[key]) {
-          cols[key].wch = Math.max(cols[key].wch, String(value).length);
-        } else {
-          cols[key] = { wch: String(value).length };
-        }
-      });
-    });
-    return cols;
-  };
-}

packages/server/src/loaders/eventEmitter.ts

@@ -81,9 +81,6 @@ import { ProjectBillableBillSubscriber } from '@/services/Projects/Projects/Proj
 import { SyncActualTimeTaskSubscriber } from '@/services/Projects/Times/SyncActualTimeTaskSubscriber';
 import { SaleInvoiceTaxRateValidateSubscriber } from '@/services/TaxRates/subscribers/SaleInvoiceTaxRateValidateSubscriber';
 import { WriteInvoiceTaxTransactionsSubscriber } from '@/services/TaxRates/subscribers/WriteInvoiceTaxTransactionsSubscriber';
-import { BillTaxRateValidateSubscriber } from '@/services/TaxRates/subscribers/BillTaxRateValidateSubscriber';
-import { WriteBillTaxTransactionsSubscriber } from '@/services/TaxRates/subscribers/WriteBillTaxTransactionsSubscriber';
-import { SyncItemTaxRateOnEditTaxSubscriber } from '@/services/TaxRates/SyncItemTaxRateOnEditTaxSubscriber';
 
 export default () => {
   return new EventPublisher();
@@ -191,14 +188,8 @@ export const susbcribers = () => {
     ProjectBillableExpensesSubscriber,
     ProjectBillableBillSubscriber,
 
-    // Tax Rates - Sale Invoice
+    // Tax Rates
     SaleInvoiceTaxRateValidateSubscriber,
     WriteInvoiceTaxTransactionsSubscriber,
-
-    // Tax Rates - Bills
-    BillTaxRateValidateSubscriber,
-    WriteBillTaxTransactionsSubscriber,
-
-    SyncItemTaxRateOnEditTaxSubscriber
   ];
 };

packages/server/src/loaders/express.ts

@@ -1,5 +1,4 @@
 import { json, Request, Response, NextFunction } from 'express';
-import express from 'express';
 import helmet from 'helmet';
 import boom from 'express-boom';
 import errorHandler from 'errorhandler';
@@ -43,8 +42,6 @@ export default ({ app }) => {
   // Middleware for intercepting and transforming json responses.
   app.use(JSONResponseTransformer(snakecaseResponseTransformer));
 
-  app.use('/public', express.static(path.join(global.__storage_dir)));
-
   // Handle multi-media requests.
   app.use(
     fileUpload({

packages/server/src/loaders/jobs.ts

@@ -5,11 +5,6 @@ import RewriteInvoicesJournalEntries from 'jobs/WriteInvoicesJEntries';
 import UserInviteMailJob from 'jobs/UserInviteMail';
 import OrganizationSetupJob from 'jobs/OrganizationSetup';
 import OrganizationUpgrade from 'jobs/OrganizationUpgrade';
-import { SendSaleInvoiceMailJob } from '@/services/Sales/Invoices/SendSaleInvoiceMailJob';
-import { SendSaleInvoiceReminderMailJob } from '@/services/Sales/Invoices/SendSaleInvoiceMailReminderJob';
-import { SendSaleEstimateMailJob } from '@/services/Sales/Estimates/SendSaleEstimateMailJob';
-import { SaleReceiptMailNotificationJob } from '@/services/Sales/Receipts/SaleReceiptMailNotificationJob';
-import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob';
 
 export default ({ agenda }: { agenda: Agenda }) => {
   new ResetPasswordMailJob(agenda);
@@ -18,11 +13,6 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new RewriteInvoicesJournalEntries(agenda);
   new OrganizationSetupJob(agenda);
   new OrganizationUpgrade(agenda);
-  new SendSaleInvoiceMailJob(agenda);
-  new SendSaleInvoiceReminderMailJob(agenda);
-  new SendSaleEstimateMailJob(agenda);
-  new SaleReceiptMailNotificationJob(agenda);
-  new PaymentReceiveMailNotificationJob(agenda);
 
   agenda.start();
 };

packages/server/src/loaders/tenantModels.ts

@@ -60,7 +60,6 @@ import Time from 'models/Time';
 import Task from 'models/Task';
 import TaxRate from 'models/TaxRate';
 import TaxRateTransaction from 'models/TaxRateTransaction';
-import Attachment from 'models/Attachment';
 
 export default (knex) => {
   const models = {
@@ -124,7 +123,6 @@ export default (knex) => {
     Task,
     TaxRate,
     TaxRateTransaction,
-    Attachment
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };