Publish

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

.all-contributorsrc

@@ -0,0 +1,71 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "commitType": "docs",
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "abouolia",
+      "name": "Ahmed Bouhuolia",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2197422?v=4",
+      "profile": "https://github.com/abouolia",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ameir",
+      "name": "Ameir Abdeldayem",
+      "avatar_url": "https://avatars.githubusercontent.com/u/374330?v=4",
+      "profile": "http://ameir.net",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "elforjani13",
+      "name": "ElforJani13",
+      "avatar_url": "https://avatars.githubusercontent.com/u/39470382?v=4",
+      "profile": "https://github.com/elforjani13",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "scheibling",
+      "name": "Lars Scheibling",
+      "avatar_url": "https://avatars.githubusercontent.com/u/24367830?v=4",
+      "profile": "https://scheibling.se",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "suhaibaffan",
+      "name": "Suhaib Affan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18115937?v=4",
+      "profile": "https://github.com/suhaibaffan",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "KalliopiPliogka",
+      "name": "Kalliopi Pliogka",
+      "avatar_url": "https://avatars.githubusercontent.com/u/81677549?v=4",
+      "profile": "https://github.com/KalliopiPliogka",
+      "contributions": [
+        "bug"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "skipCi": true,
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "projectName": "bigcapital",
+  "projectOwner": "bigcapitalhq"
+}

.env.example

@@ -8,32 +8,45 @@ MAIL_FROM_NAME=
 MAIL_FROM_ADDRESS=
 
 # Database
-DB_USER=
+DB_HOST=mysql
-DB_HOST=
+DB_USER=bigcapital
-DB_PASSWORD=
+DB_PASSWORD=bigcapital
-DB_CHARSET=
+DB_ROOT_PASSWORD=root
+DB_CHARSET=utf8
 
 # System database
 SYSTEM_DB_NAME=bigcapital_system
+# SYSTEM_DB_USER=
+# SYSTEM_DB_PASSWORD=
+# SYSTEM_DB_NAME=
+# SYSTEM_DB_CHARSET=
 
-# Tenants databases
+# Tenant databases
 TENANT_DB_NAME_PERFIX=bigcapital_tenant_
-
+# TENANT_DB_HOST=
-# MongoDB
+# TENANT_DB_USER=
-MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+# TENANT_DB_PASSWORD=
-
+# TENANT_DB_CHARSET=
-# Authentication
-JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
 # Application
-BASE_URL=https://bigcapital.ly
+BASE_URL=http://example.com
-CONTACT_US_MAIL=support@bigcapital.ly
+JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
+
+# Jobs MongoDB
+MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
+
+# App proxy
+PUBLIC_PROXY_PORT=80
+PUBLIC_PROXY_SSL_PORT=443
 
 # Agendash
 AGENDASH_AUTH_USER=agendash
 AGENDASH_AUTH_PASSWORD=123123
 
 # Sign-up restrictions
-SIGNUP_DISABLED=true
+SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=
+
+# API rate limit (points,duration,block duration).
+API_RATE_LIMIT=120,60,600

.gitattributes

@@ -0,0 +1,2 @@
+docker/nginx/scripts/build-nginx.sh text eol=lf
+docker/mariadb/docker-entrypoint.sh text eol=lf

.github/FUNDING.yml

@@ -0,0 +1,13 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: Bigcapital # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.gitignore

@@ -1,4 +1,9 @@
 node_modules/
-data
+
+# Docker volumes data directory
+/data
+
+# Production env file 
 .env
+
 test-results/

CHANGELOG.md

@@ -2,7 +2,122 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
-## [0.9.1] - 28-06-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
+
+* 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
+* Added: Tax rates tracking with sale invoices by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/204
+* fix(webapp): Table headers sticky for all reports. by @elforjani13 in https://github.com/bigcapitalhq/bigcapital/pull/240
+* chore(deps): bump word-wrap from 1.2.3 to 1.2.4 by @dependabot in https://github.com/bigcapitalhq/bigcapital/pull/200
+* 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
+
+* 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
+* Fix: typo in bill success message without bill number by @KalliopiPliogka in https://github.com/bigcapitalhq/bigcapital/pull/219
+* Fix: AP/AR aging summary issue by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/229
+* Fix: shouldn't write GL entries when save transaction as draft. by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/221
+* Fix: Transaction type of credit note and vendor credit are not defined on account transactions by @abouolia in 
+* Fix: date format of filtering transactions by date range by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/231
+* Fix: change the default from/date date value of reports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/230
+* Fix: typos in words start with `A` letter by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/227
+* 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
+
+* 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
+
+* 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
+
+* 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
+* fix: Style of quick item drawer by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/173
+* fix: Should not show the form before loading account by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/172
+* fix: Payment made form does not handle not unique number an e… by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/177
+* fix: Internal note of invoice/bill payment does not saving by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/181
+* fix: Storing cash flow transaction description by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/180
+* 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
+
+`bigcapitalhq/webapp`
+
+* add: Inventory Adjustment option to the item drawer by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/158
+* fix: use all drawers names from common enum object by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/157
+* fix: adjustment type options do not show up by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/159
+* fix: change the remove line text to be red to intent as a danger action by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/162
+* fix: rename sidebar localization keys names to be keyword path by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/161
+* fix: manual journal placeholder text by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/160
+* fix: warehouses select component by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/168
+
+`bigcapitalhq/server`
+
+* fix: sending emails on reset password and registration by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/167
+
+## [0.9.7] - 14-06-2023
+
+`@bigcapital/webapp`
+* fix: change the footer links of onboarding pages by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/139
+
+`@bigcapital/server`
+* fix: expense transaction journal entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/155
+
+## [0.9.6] - 12-06-2023
+
+`@bigcapital/webapp`
+
+* fix: remove duplicated form submitting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/138
+* feat: add monorepo version on the application sidebar by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/136
+
+## [0.9.5] - 11-06-2023
+
+`@bigcapital/server`
+
+* fix: filter ledger entries that effect contact balance to AR/AP accounts only by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/132
+
+`@bigcapital/webapp`
+
+* fix: catch journal error when create a journal with accounts have different currency by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/135
+* fix: add duplicate icon to context menu of customers and vendors table by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/133
+* fix: customer/vendor opening balance with exchange rate by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/134
+
+## [0.9.4] - 08-06-2023
+
+`@bigcapital/monorepo`
+- fixed: docker-compose line-ending issue on Windows by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/130
+
+`@bigcapital/server`
+- fixed: Disable Webpack minification for JS class name reading.
+
+## [0.9.3] -04-06-2023
+
+`@bigcapital/monorepo`
+* Added: Add env variable to customize the proxy public ports by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/125
+* Added: Migrate the server database to MariaDB by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/128
+
+## [0.9.2] - 31-05-2023
+
+`@bigcapital/webapp`
+
+- fixed: move `packaeg-lock.json` inside docker container.
+- fixed: remove Sentry from the web client.
+
+## [0.9.1] - 28-05-2023
 
 `@bigcapital/server`
 - fix: deleting ledger entries of manual journal.
@@ -10,11 +125,11 @@ All notable changes to Bigcapital server-side will be in this file.
 - fix: delete invoice transaction issue.
 
 `@bigcapital/webapp`
-- fix: general, accoutant and items preferences.
+- fix: general, accountant and items preferences.
 - fix: auto-increment sale invoices, estiamtes, credit notes, payments and manual journals.
 - refactor: the setup organization form to use binded Formik components.
 
-## [0.9.0] - 06-06-2023
+## [0.9.0] - 06-05-2023
 
 `@bigcapital/server`
 

CONTRIBUTING.md

@@ -7,6 +7,7 @@ Please read through this document before submitting any issues or pull requests
 ## Sections
 
 - [General Instructions](#general-instructions)
+- [Local Setup Prerequisites](#local-setup-prerequisites)
 - [Contribute to Backend](#contribute-to-backend)
 - [Contribute to Frontend](#contribute-to-frontend)
 - [Other Ways to Contribute](#other-ways-to-contribute)
@@ -31,9 +32,18 @@ Contributions via pull requests are much appreciated. Once the approach is agree
 
 ---
 
+## Local Setup Prerequisites
+ - 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
 
 - Clone the `bigcapital` repository and `cd` into `bigcapital` directory.
+- Create `.env` file by copying `.env.example` file to `.env`. (The ``.env.example`` file has all the necessary values of variables to start development directly).
+
+```
+cp .env.example .env
+```
+
 - 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.
 
 ```

README.md

@@ -7,6 +7,24 @@
   <p align="center">
     Simple, smart online accounting software for small and medium businesses.
   </p>
+
+  <p align="center">
+    <a href="https://github.com/bigcapitalhq/bigcapital/commits/develop">
+      <img src="https://img.shields.io/github/commit-activity/m/bigcapitalhq/bigcapital/develop" />
+    </a>
+    <a href="https://discord.com/invite/c8nPBJafeb">
+      <img src="https://img.shields.io/discord/1066514716752625725?label=Discord" alt="" />
+    </a>
+    <a href="https://github.com/bigcapitalhq/bigcapital/graphs/contributors">
+      <img src="https://img.shields.io/github/contributors/bigcapitalhq/bigcapital" alt="" />
+    </a>
+    <a href="https://github.com/bigcapitalhq/bigcapital/blob/develop/LICENSE">
+      <img src="https://img.shields.io/github/license/bigcapitalhq/bigcapital" alt="" />
+    </a>
+    <a href="https://twitter.com/bigcapitalhq"> 
+      <img src="https://img.shields.io/twitter/follow/bigcapitalhq?style=social" alt="twitter" />
+    </a>
+  </p>
 </p>
 
 # What's Bigcapital?
@@ -22,10 +40,53 @@ Bigcapital is a smart and open-source accounting and inventory software, Bigcapi
 # Resources
 
 - [Documentation](https://docs.bigcapital.ly/) - Learn how to use.
+- [Contribution](https://github.com/bigcapitalhq/bigcapital/blob/develop/CONTRIBUTING.md) - Welcome to any contributions.
 - [Discord](https://discord.com/invite/c8nPBJafeb) - Ask for help.
 - [Bug Tracker](https://github.com/bigcapitalhq/bigcapital/issues) - Notify us new bugs.
-- [Source Code](https://github.com/bigcapitalhq/bigcapital) - Github repo.
 
-# Changlog
+# Changelog
 
 Please see [Releases](https://github.com/bigcapitalhq/bigcapital/releases) for more information what has changed recently.
+
+# Contact us
+
+Meet our sales team for any commercial inquiries.
+
+<a target="_blank" href="https://cal.com/ahmed-bouhuolia-ekk3ph/30min"><img src="https://cal.com/book-with-cal-dark.svg" alt="Book us with Cal.com"></a>
+
+# Recognition
+
+<a href="https://news.ycombinator.com/item?id=36118990">
+  <img
+    style="width: 250px; height: 54px;" width="250" height="54"
+    alt="Featured on Hacker News"
+    src="https://hackernews-badge.vercel.app/api?id=36118990"
+  />
+</a>
+
+# Contributors
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/abouolia"><img src="https://avatars.githubusercontent.com/u/2197422?v=4?s=100" width="100px;" alt="Ahmed Bouhuolia"/><br /><sub><b>Ahmed Bouhuolia</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=abouolia" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://ameir.net"><img src="https://avatars.githubusercontent.com/u/374330?v=4?s=100" width="100px;" alt="Ameir Abdeldayem"/><br /><sub><b>Ameir Abdeldayem</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aameir" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/elforjani13"><img src="https://avatars.githubusercontent.com/u/39470382?v=4?s=100" width="100px;" alt="ElforJani13"/><br /><sub><b>ElforJani13</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=elforjani13" title="Code">💻</a></td>
+      <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>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

docker-compose.prod.yml

@@ -15,16 +15,22 @@ services:
       - ./data/logs/nginx/:/var/log/nginx
       - ./docker/certbot/certs/:/var/certs
     ports:
-      - "80:80"
+      - '${PUBLIC_PROXY_PORT:-80}:80'
-      - "443:443"
+      - '${PUBLIC_PROXY_SSL_PORT:-443}:443'
     tty: true
     depends_on:
       - server
       - webapp
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   webapp:
     container_name: bigcapital-webapp
     image: ghcr.io/bigcapitalhq/webapp:latest
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   server:
     container_name: bigcapital-server
@@ -37,6 +43,9 @@ services:
       - mysql
       - mongo
       - redis
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -83,23 +92,29 @@ services:
       context: ./
       dockerfile: docker/migration/Dockerfile
     environment:
+      # Database
       - DB_HOST=mysql
       - DB_USER=${DB_USER}
       - DB_PASSWORD=${DB_PASSWORD}
       - DB_CHARSET=${DB_CHARSET}
       - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
+      # Tenants databases
+      - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
     depends_on:
       - mysql
 
   mysql:
     container_name: bigcapital-mysql
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
-      context: ./docker/mysql
+      context: ./docker/mariadb
     environment:
       - MYSQL_DATABASE=${SYSTEM_DB_NAME}
       - MYSQL_USER=${DB_USER}
       - MYSQL_PASSWORD=${DB_PASSWORD}
-      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
     volumes:
       - mysql:/var/lib/mysql
     expose:
@@ -107,6 +122,9 @@ services:
 
   mongo:
     container_name: bigcapital-mongo
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build: ./docker/mongo
     expose:
       - '27017'
@@ -115,10 +133,13 @@ services:
 
   redis:
     container_name: bigcapital-redis
+    deploy:
+      restart_policy:
+        condition: unless-stopped
     build:
       context: ./docker/redis
     expose:
-      - "6379"
+      - '6379'
     volumes:
       - redis:/data
 

docker-compose.yml

@@ -6,20 +6,23 @@
 version: '3.3'
 
 services:
-  mysql:
+  mariadb:
     build:
-      context: ./docker/mysql
+      context: ./docker/mariadb
     environment:
       - MYSQL_DATABASE=${SYSTEM_DB_NAME}
       - MYSQL_USER=${DB_USER}
       - MYSQL_PASSWORD=${DB_PASSWORD}
-      - MYSQL_ROOT_PASSWORD=${DB_PASSWORD}
+      - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
     volumes:
       - mysql:/var/lib/mysql
     expose:
       - '3306'
     ports:
       - '3306:3306'
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   mongo:
     build: ./docker/mongo
@@ -29,6 +32,9 @@ services:
       - mongo:/var/lib/mongodb
     ports:
       - '27017:27017'
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
   redis:
     build:
@@ -37,6 +43,9 @@ services:
       - "6379"
     volumes:
       - redis:/data
+    deploy:
+      restart_policy:
+        condition: unless-stopped
 
 # Volumes
 volumes:

docker/mariadb/Dockerfile

@@ -1,4 +1,4 @@
-FROM mysql:5.7
+FROM mariadb:10.2
 
 USER root
 ADD my.cnf /etc/mysql/conf.d/my.cnf
@@ -17,7 +17,7 @@ ENV MYSQL_ROOT_PASSWORD=$MYSQL_ROOT_PASSWORD
 COPY ./init.sql /scripts/init.template.sql
 COPY ./docker-entrypoint.sh /docker-entrypoint-initdb.d/docker-initialize.sh
 
-# The scripts in the docker-entrypoint-initdb.d/ directory are executed as
+# The scripts in the `docker-entrypoint-initdb.d/` directory are executed as
 # the mysql user inside the MySQL Docker container.
 RUN chown -R mysql:root /docker-entrypoint-initdb.d
 RUN chown -R mysql:root /scripts

docker/mariadb/init.sql

@@ -1,2 +1,3 @@
 GRANT ALL PRIVILEGES ON *.* TO '{MYSQL_USER}'@'%' IDENTIFIED BY '{MYSQL_PASSWORD}' WITH GRANT OPTION;
+
 FLUSH PRIVILEGES;

docker/migration/Dockerfile

@@ -34,5 +34,7 @@ WORKDIR /app/packages/server
 
 RUN git clone https://github.com/vishnubob/wait-for-it.git
 
-# Once we listen the mysql port run the migration task.
+ADD docker/migration/start.sh /
-CMD ["./wait-for-it/wait-for-it.sh", "mysql:3306", "--", "node", "./build/commands.js", "system:migrate:latest"]
+RUN chmod +x /start.sh
+
+CMD ["/start.sh"]

docker/migration/start.sh

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

e2e/_utils.ts

@@ -0,0 +1,13 @@
+import { Page } from '@playwright/test';
+
+export const clearLocalStorage = (page: Page) => {
+  return page.evaluate(`window.localStorage.clear()`);
+};
+
+export const defaultPageConfig = () => {
+  return {
+    extraHTTPHeaders: {
+      'ngrok-skip-browser-warning': 'any-value',
+    },
+  };
+};

e2e/authentication.spec.ts

@@ -1,14 +1,23 @@
 import { test, expect, Page } from '@playwright/test';
+import { faker } from '@faker-js/faker';
+import { clearLocalStorage, defaultPageConfig } from './_utils';
 
 let authPage: Page;
 
 test.describe('authentication', () => {
   test.beforeAll(async ({ browser }) => {
-    authPage = await browser.newPage();
+    authPage = await browser.newPage({ ...defaultPageConfig() });
+  });
+  test.afterAll(async () => {
+    await authPage.close();
+  });
+  test.afterEach(async ({ context }) => {
+    context.clearCookies();
+    await clearLocalStorage(authPage);
   });
 
   test.describe('login', () => {
-    test.beforeAll(async () => {
+    test.beforeEach(async () => {
       await authPage.goto('/auth/login');
     });
     test('should show the login page.', async () => {
@@ -30,10 +39,23 @@ test.describe('authentication', () => {
       await authPage.getByRole('link', { name: 'Sign up' }).click();
       await expect(authPage.url()).toContain('/auth/register');
     });
+    test('should the email or password is not correct.', async () => {
+      await authPage.getByLabel('Email Address').click();
+      await authPage.getByLabel('Email Address').fill(faker.internet.email());
+
+      await authPage.getByLabel('Password').click();
+      await authPage.getByLabel('Password').fill(faker.internet.password());
+
+      await authPage.getByRole('button', { name: 'Log in' }).click();
+
+      await expect(authPage.locator('body')).toContainText(
+        'The email and password you entered did not match our records.'
+      );
+    });
   });
 
   test.describe('register', () => {
-    test.beforeAll(async () => {
+    test.beforeEach(async () => {
       await authPage.goto('/auth/register');
     });
     test('should first name, last name, email and password be required.', async () => {
@@ -52,10 +74,36 @@ test.describe('authentication', () => {
         'Password is a required field'
       );
     });
+    test('should signup successfully.', async () => {
+      const form = authPage.locator('form');
+      await form.getByLabel('First Name').click();
+      await form.getByLabel('First Name').fill(faker.person.firstName());
+
+      await form.getByLabel('Email').click();
+      await form.getByLabel('Email').fill(faker.internet.email());
+
+      await form.getByLabel('Last Name').click();
+      await form.getByLabel('Last Name').fill(faker.person.lastName());
+
+      await form.getByLabel('Password').click();
+      await form.getByLabel('Password').fill(faker.internet.password());
+
+      await authPage.getByRole('button', { name: 'Register' }).click();
+
+      await expect(authPage.locator('h1')).toContainText(
+        'Register a New Organization now!'
+      );
+    });
   });
 
   test.describe('reset password', () => {
-    test.beforeAll(async () => {
+    test.beforeAll(async ({ browser }) => {
+      authPage = await browser.newPage({ ...defaultPageConfig() });
+    });
+    test.afterAll(async () => {
+      await authPage.close();
+    });
+    test.beforeEach(async () => {
       await authPage.goto('/auth/send_reset_password');
     });
     test('should email be required.', async () => {

e2e/items.spec.ts

@@ -0,0 +1,7 @@
+import { test, expect, Page } from '@playwright/test';
+
+test.describe('item', () => {
+  test('should validate all required fields.', () => {});
+  test('should save the item successfully.', () => {});
+  test('should item code be unqiue.', () => {});
+});

e2e/onboarding.spec.ts

@@ -0,0 +1,86 @@
+import { test, expect, Page } from '@playwright/test';
+import { faker } from '@faker-js/faker';
+import { defaultPageConfig } from './_utils';
+
+let authPage: Page;
+let businessLegalName: string = faker.company.name();
+
+test.describe('onboarding', () => {
+  test.beforeAll(async ({ browser }) => {
+    authPage = await browser.newPage({ ...defaultPageConfig() });
+    await authPage.goto('/auth/register');
+
+    const form = authPage.locator('form');
+
+    await form.getByLabel('First Name').fill(faker.person.firstName());
+    await form.getByLabel('Email').fill(faker.internet.email());
+    await form.getByLabel('Last Name').fill(faker.person.lastName());
+    await form.getByLabel('Password').fill(faker.internet.password());
+
+    await authPage.getByRole('button', { name: 'Register' }).click();
+  });
+  test('should validation catch all required fields', async () => {
+    const form = authPage.locator('form');
+
+    await authPage.getByRole('button', { name: 'Save & Continue' }).click();
+
+    await expect(form).toContainText('Organization name is a required field');
+    await expect(form).toContainText('Location is a required field');
+    await expect(form).toContainText('Base currency is a required field');
+    await expect(form).toContainText('Fiscal year is a required field');
+    await expect(form).toContainText('Time zone is a required field');
+  });
+  test.describe('after onboarding', () => {
+    test.beforeAll(async () => {
+      await authPage.getByLabel('Legal Organization Name').click();
+      await authPage
+        .getByLabel('Legal Organization Name')
+        .fill(businessLegalName);
+
+      // Fill Business Location.
+      await authPage
+        .getByRole('button', { name: 'Select Business Location...' })
+        .click();
+      await authPage.locator('a').filter({ hasText: 'Albania' }).click();
+
+      // Fill Base Currency.
+      await authPage
+        .getByRole('button', { name: 'Select Base Currency...' })
+        .click();
+      await authPage
+        .locator('a')
+        .filter({ hasText: 'AED - United Arab Emirates Dirham' })
+        .click();
+
+      // Fill Fasical Year.
+      await authPage
+        .getByRole('button', { name: 'Select Fiscal Year...' })
+        .click();
+      await authPage.locator('a').filter({ hasText: 'June - May' }).click();
+
+      // Fill Timezone.
+      await authPage
+        .getByRole('button', { name: 'Select Time Zone...' })
+        .click();
+      await authPage.getByText('Pacific/Marquesas-09:30').click();
+
+      // Click on Submit button
+      await authPage.getByRole('button', { name: 'Save & Continue' }).click();
+    });
+    test('should onboarding process success', async () => {
+      await expect(authPage.locator('body')).toContainText(
+        'Congrats! You are ready to go',
+        {
+          timeout: 30000,
+        }
+      );
+    });
+    test('should go to the dashboard after clicking on "Go to dashboard" button.', async () => {
+      await authPage.getByRole('button', { name: 'Go to dashboard' }).click();
+
+      await expect(
+        authPage.locator('[data-testId="dashboard-topbar"] h1')
+      ).toContainText(businessLegalName);
+    });
+  });
+});

lerna.json

@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "useWorkspaces": true,
+  "version": "independent",
-  "version": "0.0.0",
+  "npmClient": "pnpm",
-  "npmClient": "npm"
+  "packages": ["packages/*"]
 }

package.json

@@ -2,7 +2,7 @@
   "name": "bigcapital-monorepo",
   "private": true,
   "scripts": {
-    "bootstrap": "lerna exec npm install",
+    "bootstrap": "lerna exec pnpm install",
     "dev": "lerna run dev",
     "build": "lerna run build",
     "dev:webapp": "lerna run dev --scope \"@bigcapital/webapp\"",
@@ -13,17 +13,14 @@
     "test:e2e": "playwright test",
     "prepare": "husky install"
   },
-  "workspaces": [
-    "packages/*",
-    "shared/*"
-  ],
   "devDependencies": {
+    "@commitlint/cli": "^17.4.2",
     "@commitlint/config-conventional": "^17.4.2",
     "@commitlint/config-lerna-scopes": "^17.4.2",
+    "@faker-js/faker": "^8.0.2",
+    "@playwright/test": "^1.32.3",
     "husky": "^8.0.3",
-    "lerna": "^6.4.1",
+    "lerna": "^6.4.1"
-    "@commitlint/cli": "^17.4.2",
-    "@playwright/test": "^1.32.3"
   },
   "engines": {
     "node": "14.x"

packages/server/.gitignore

@@ -1,7 +1,6 @@
 /node_modules/
 /.env
 /storage
-package-lock.json
 stdout.log
 /dist
 /build

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigcapital/server",
-  "version": "1.7.1",
+  "version": "0.10.1",
   "description": "",
   "main": "src/server.ts",
   "scripts": {
@@ -35,6 +35,7 @@
     "babel-loader": "^9.1.2",
     "bcryptjs": "^2.4.3",
     "bluebird": "^3.7.2",
+    "body-parser": "^1.20.2",
     "compression": "^1.7.4",
     "country-codes-list": "^1.6.8",
     "cpy": "^8.1.2",
@@ -72,6 +73,8 @@
     "memory-cache": "^0.2.0",
     "moment": "^2.24.0",
     "moment-range": "^4.0.2",
+    "moment-timezone": "^0.5.43",
+    "mongodb": "^6.1.0",
     "mongoose": "^5.10.0",
     "mustache": "^3.0.3",
     "mysql": "^2.17.1",
@@ -131,7 +134,7 @@
     "rimraf": "^3.0.2",
     "rtlcss": "^3.3.0",
     "run-script-webpack-plugin": "^0.1.1",
-    "sass": "^1.37.5",
+    "sass": "^1.58.0",
     "sinon": "^7.4.2",
     "start-server-webpack-plugin": "^2.2.5",
     "ts-loader": "^9.4.2",

packages/server/resources/locales/ar.json

@@ -152,7 +152,7 @@
   "Opening Balance Liabilities": "رصيد الالتزامات الافتتاحي",
   "Loan": "اقراض",
   "Owner A Drawings": "مسحوبات المالك",
-  "An account that holds valuation of products or goods that availiable for sale.": "حساب يحمل قيم مخزون البضاعة أو السلع المتاحة للبيع.",
+  "An account that holds valuation of products or goods that available for sale.": "حساب يحمل قيم مخزون البضاعة أو السلع المتاحة للبيع.",
   "Tracks the gain and losses of the exchange differences.": "يسجل مكاسب وخسائر فروق الصرف.",
   "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.": "يتم تسجيل أي رسوم مصرفية يتم فرضها في حساب الرسوم والمصروفات البنكية. ومن الأمثلة على ذلك رسوم صيانة الحساب المصرفي ورسوم المعاملات ورسوم الدفع المتأخر.",
   "The income activities are not associated to the core business.": "لا ترتبط انشطة الدخل إلى الأعمال الأساسية.",

packages/server/resources/locales/en.json

@@ -151,7 +151,7 @@
   "Opening Balance Liabilities": "Opening Balance Liabilities",
   "Loan": "Loan",
   "Owner A Drawings": "Owner A Drawings",
-  "An account that holds valuation of products or goods that availiable for sale.": "An account that holds valuation of products or goods that availiable for sale.",
+  "An account that holds valuation of products or goods that available for sale.": "An account that holds valuation of products or goods that available for sale.",
   "Tracks the gain and losses of the exchange differences.": "Tracks the gain and losses of the exchange differences.",
   "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.": "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.",
   "The income activities are not associated to the core business.": "The income activities are not associated to the core business.",

packages/server/scripts/webpack.common.js

@@ -65,6 +65,9 @@ exports.getCommonWebpackOptions = ({
         },
       ],
     },
+    optimization: {
+      minimize: false,
+    },
   };
 
   if (isDev) {

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

@@ -92,6 +92,7 @@ export default class AuthenticationController extends BaseController {
       check('password')
         .exists()
         .isString()
+        .isLength({ min: 6 })
         .trim()
         .escape()
         .isLength({ max: DATATYPES_LENGTH.STRING }),
@@ -106,7 +107,7 @@ export default class AuthenticationController extends BaseController {
     return [
       check('password')
         .exists()
-        .isLength({ min: 5 })
+        .isLength({ min: 6 })
         .custom((value, { req }) => {
           if (value !== req.body.confirm_password) {
             throw new Error("Passwords don't match");

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

@@ -20,6 +20,7 @@ import InventoryDetailsController from './FinancialStatements/InventoryDetails';
 import TransactionsByReferenceController from './FinancialStatements/TransactionsByReference';
 import CashflowAccountTransactions from './FinancialStatements/CashflowAccountTransactions';
 import ProjectProfitabilityController from './FinancialStatements/ProjectProfitabilitySummary';
+import SalesTaxLiabilitySummary from './FinancialStatements/SalesTaxLiabilitySummary';
 
 @Service()
 export default class FinancialStatementsService {
@@ -68,40 +69,44 @@ export default class FinancialStatementsService {
     );
     router.use(
       '/customer-balance-summary',
-      Container.get(CustomerBalanceSummaryController).router(),
+      Container.get(CustomerBalanceSummaryController).router()
     );
     router.use(
       '/vendor-balance-summary',
-      Container.get(VendorBalanceSummaryController).router(),
+      Container.get(VendorBalanceSummaryController).router()
     );
     router.use(
       '/transactions-by-customers',
-      Container.get(TransactionsByCustomers).router(),
+      Container.get(TransactionsByCustomers).router()
     );
     router.use(
       '/transactions-by-vendors',
-      Container.get(TransactionsByVendors).router(),
+      Container.get(TransactionsByVendors).router()
     );
     router.use(
       '/cash-flow',
-      Container.get(CashFlowStatementController).router(),
+      Container.get(CashFlowStatementController).router()
     );
     router.use(
       '/inventory-item-details',
-      Container.get(InventoryDetailsController).router(),
+      Container.get(InventoryDetailsController).router()
     );
     router.use(
       '/transactions-by-reference',
-      Container.get(TransactionsByReferenceController).router(),
+      Container.get(TransactionsByReferenceController).router()
     );
     router.use(
       '/cashflow-account-transactions',
-      Container.get(CashflowAccountTransactions).router(),
+      Container.get(CashflowAccountTransactions).router()
     );
     router.use(
       '/project-profitability-summary',
-      Container.get(ProjectProfitabilityController).router(),
+      Container.get(ProjectProfitabilityController).router()
-    )
+    );
+    router.use(
+      '/sales-tax-liability-summary',
+      Container.get(SalesTaxLiabilitySummary).router()
+    );
     return router;
   }
 }

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

@@ -33,10 +33,13 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
     return [
       ...this.sheetNumberFormatValidationSchema,
       query('as_date').optional().isISO8601(),
-      query('aging_days_before').optional().isNumeric().toInt(),
+
-      query('aging_periods').optional().isNumeric().toInt(),
+      query('aging_days_before').default(30).isInt({ max: 500 }).toInt(),
+      query('aging_periods').default(3).isInt({ max: 12 }).toInt(),
+
       query('vendors_ids').optional().isArray({ min: 1 }),
       query('vendors_ids.*').isInt({ min: 1 }).toInt(),
+
       query('none_zero').default(true).isBoolean().toBoolean(),
 
       // Filtering by branches.
@@ -53,15 +56,36 @@ export default class APAgingSummaryReportController extends BaseFinancialReportC
     const filter = this.matchedQueryData(req);
 
     try {
-      const { data, columns, query, meta } =
+      const accept = this.accepts(req);
-        await this.APAgingSummaryService.APAgingSummary(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      return res.status(200).send({
+      switch (acceptType) {
-        data: this.transfromToResponse(data),
+        case 'application/json+table':
-        columns: this.transfromToResponse(columns),
+          const table = await this.APAgingSummaryService.APAgingSummaryTable(
-        query: this.transfromToResponse(query),
+            tenantId,
-        meta: this.transfromToResponse(meta),
+            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);
+
+          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

@@ -36,8 +36,8 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC
 
       query('as_date').optional().isISO8601(),
 
-      query('aging_days_before').optional().isInt({ max: 500 }).toInt(),
+      query('aging_days_before').default(30).isInt({ max: 500 }).toInt(),
-      query('aging_periods').optional().isInt({ max: 12 }).toInt(),
+      query('aging_periods').default(3).isInt({ max: 12 }).toInt(),
 
       query('customers_ids').optional().isArray({ min: 1 }),
       query('customers_ids.*').isInt({ min: 1 }).toInt(),
@@ -58,15 +58,36 @@ export default class ARAgingSummaryReportController extends BaseFinancialReportC
     const filter = this.matchedQueryData(req);
 
     try {
-      const { data, columns, query, meta } =
+      const accept = this.accepts(req);
-        await this.ARAgingSummaryService.ARAgingSummary(tenantId, filter);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      return res.status(200).send({
+      switch (acceptType) {
-        data: this.transfromToResponse(data),
+        case 'application/json+table':
-        columns: this.transfromToResponse(columns),
+          const table = await this.ARAgingSummaryService.ARAgingSummaryTable(
-        query: this.transfromToResponse(query),
+            tenantId,
-        meta: this.transfromToResponse(meta),
+            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);
+
+          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/SalesTaxLiabilitySummary/index.ts

@@ -0,0 +1,90 @@
+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 { SalesTaxLiabilitySummaryService } from '@/services/FinancialStatements/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryService';
+
+export default class SalesTaxLiabilitySummary extends BaseFinancialReportController {
+  @Inject()
+  private salesTaxLiabilitySummaryService: SalesTaxLiabilitySummaryService;
+
+  /**
+   * Router constructor.
+   */
+  router() {
+    const router = Router();
+
+    router.get(
+      '/',
+      CheckPolicies(
+        ReportsAction.READ_SALES_TAX_LIABILITY_SUMMARY,
+        AbilitySubject.Report
+      ),
+      this.validationSchema,
+      asyncMiddleware(this.salesTaxLiabilitySummary.bind(this))
+    );
+    return router;
+  }
+
+  /**
+   * Validation schema.
+   */
+  get validationSchema() {
+    return [
+      query('from_date').optional().isISO8601(),
+      query('to_date').optional().isISO8601(),
+    ];
+  }
+
+  /*
+   * Retrieves the sales tax liability summary.
+   * @param {Request} req -
+   * @param {Response} res -
+   * @param {NextFunction} next -
+   */
+  async salesTaxLiabilitySummary(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    const { tenantId } = req;
+    const filter = this.matchedQueryData(req);
+
+    try {
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
+
+      switch (acceptType) {
+        case 'application/json+table':
+          const salesTaxLiabilityTable =
+            await this.salesTaxLiabilitySummaryService.salesTaxLiabilitySummaryTable(
+              tenantId,
+              filter
+            );
+
+          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/ManualJournals.ts

@@ -387,7 +387,7 @@ export default class ManualJournalsController extends BaseController {
           errors: [{ type: 'CREDIT.DEBIT.NOT.EQUALS', code: 300 }],
         });
       }
-      if (error.errorType === 'acccounts_ids_not_found') {
+      if (error.errorType === 'accounts_ids_not_found') {
         return res.boom.badRequest(
           'Journal entries some of accounts ids not exists.',
           { errors: [{ type: 'ACCOUNTS.IDS.NOT.FOUND', code: 400 }] }

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

@@ -1,26 +1,27 @@
+import { Service, Inject } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { check, param, query } from 'express-validator';
-import { Service, Inject } from 'typedi';
+import {
-import { AbilitySubject, BillAction, IBillDTO, IBillEditDTO } from '@/interfaces';
+  AbilitySubject,
+  BillAction,
+  IBillDTO,
+  IBillEditDTO,
+} from '@/interfaces';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import BillsService from '@/services/Purchases/Bills';
 import BaseController from '@/api/controllers/BaseController';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { ServiceError } from '@/exceptions';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import BillPaymentsService from '@/services/Purchases/BillPaymentsService';
+import { BillsApplication } from '@/services/Purchases/Bills/BillsApplication';
 
 @Service()
 export default class BillsController extends BaseController {
   @Inject()
-  private billsService: BillsService;
+  private billsApplication: BillsApplication;
 
   @Inject()
   private dynamicListService: DynamicListingService;
 
-  @Inject()
-  private billPayments: BillPaymentsService;
-
   /**
    * Router constructor.
    */
@@ -97,7 +98,7 @@ export default class BillsController extends BaseController {
   /**
    * Common validation schema.
    */
-  get billValidationSchema() {
+  private get billValidationSchema() {
     return [
       check('bill_number').exists().trim().escape(),
       check('reference_no').optional().trim().escape(),
@@ -142,7 +143,7 @@ export default class BillsController extends BaseController {
   /**
    * Common validation schema.
    */
-  get billEditValidationSchema() {
+  private get billEditValidationSchema() {
     return [
       check('bill_number').optional().trim().escape(),
       check('reference_no').optional().trim().escape(),
@@ -184,14 +185,14 @@ export default class BillsController extends BaseController {
   /**
    * Bill validation schema.
    */
-  get specificBillValidationSchema() {
+  private get specificBillValidationSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Bills list validation schema.
    */
-  get billsListingValidationSchema() {
+  private get billsListingValidationSchema() {
     return [
       query('view_slug').optional().isString().trim(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -203,7 +204,7 @@ export default class BillsController extends BaseController {
     ];
   }
 
-  get dueBillsListingValidationSchema() {
+  private get dueBillsListingValidationSchema() {
     return [
       query('vendor_id').optional().trim().escape(),
       query('payment_made_id').optional().trim().escape(),
@@ -216,17 +217,16 @@ export default class BillsController extends BaseController {
    * @param {Response} res
    * @param {Function} next
    */
-  async newBill(req: Request, res: Response, next: NextFunction) {
+  private async newBill(req: Request, res: Response, next: NextFunction) {
     const { tenantId, user } = req;
     const billDTO: IBillDTO = this.matchedBodyData(req);
 
     try {
-      const storedBill = await this.billsService.createBill(
+      const storedBill = await this.billsApplication.createBill(
         tenantId,
         billDTO,
         user
       );
-
       return res.status(200).send({
         id: storedBill.id,
         message: 'The bill has been created successfully.',
@@ -241,13 +241,13 @@ export default class BillsController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async editBill(req: Request, res: Response, next: NextFunction) {
+  private async editBill(req: Request, res: Response, next: NextFunction) {
     const { id: billId } = req.params;
     const { tenantId, user } = req;
     const billDTO: IBillEditDTO = this.matchedBodyData(req);
 
     try {
-      await this.billsService.editBill(tenantId, billId, billDTO, user);
+      await this.billsApplication.editBill(tenantId, billId, billDTO, user);
 
       return res.status(200).send({
         id: billId,
@@ -263,12 +263,12 @@ export default class BillsController extends BaseController {
    * @param {Request} req -
    * @param {Response} res -
    */
-  async openBill(req: Request, res: Response, next: NextFunction) {
+  private async openBill(req: Request, res: Response, next: NextFunction) {
     const { id: billId } = req.params;
     const { tenantId } = req;
 
     try {
-      await this.billsService.openBill(tenantId, billId);
+      await this.billsApplication.openBill(tenantId, billId);
 
       return res.status(200).send({
         id: billId,
@@ -285,12 +285,12 @@ export default class BillsController extends BaseController {
    * @param {Response} res
    * @return {Response}
    */
-  async getBill(req: Request, res: Response, next: NextFunction) {
+  private async getBill(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { id: billId } = req.params;
 
     try {
-      const bill = await this.billsService.getBill(tenantId, billId);
+      const bill = await this.billsApplication.getBill(tenantId, billId);
 
       return res.status(200).send(this.transfromToResponse({ bill }));
     } catch (error) {
@@ -304,12 +304,12 @@ export default class BillsController extends BaseController {
    * @param {Response} res -
    * @return {Response}
    */
-  async deleteBill(req: Request, res: Response, next: NextFunction) {
+  private async deleteBill(req: Request, res: Response, next: NextFunction) {
     const billId = req.params.id;
     const { tenantId } = req;
 
     try {
-      await this.billsService.deleteBill(tenantId, billId);
+      await this.billsApplication.deleteBill(tenantId, billId);
 
       return res.status(200).send({
         id: billId,
@@ -326,7 +326,7 @@ export default class BillsController extends BaseController {
    * @param {Response} res -
    * @return {Response}
    */
-  public async billsList(req: Request, res: Response, next: NextFunction) {
+  private async billsList(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
       page: 1,
@@ -338,7 +338,7 @@ export default class BillsController extends BaseController {
 
     try {
       const { bills, pagination, filterMeta } =
-        await this.billsService.getBills(tenantId, filter);
+        await this.billsApplication.getBills(tenantId, filter);
 
       return res.status(200).send({
         bills: this.transfromToResponse(bills),
@@ -356,12 +356,13 @@ export default class BillsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  public async getDueBills(req: Request, res: Response, next: NextFunction) {
+  private async getDueBills(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const { vendorId } = this.matchedQueryData(req);
 
     try {
-      const bills = await this.billsService.getDueBills(tenantId, vendorId);
+      const bills = await this.billsApplication.getDueBills(tenantId, vendorId);
+
       return res.status(200).send({ bills });
     } catch (error) {
       next(error);
@@ -374,7 +375,7 @@ export default class BillsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  public getBillPaymentsTransactions = async (
+  private getBillPaymentsTransactions = async (
     req: Request,
     res: Response,
     next: NextFunction
@@ -383,7 +384,7 @@ export default class BillsController extends BaseController {
     const { id: billId } = req.params;
 
     try {
-      const billPayments = await this.billPayments.getBillPayments(
+      const billPayments = await this.billsApplication.getBillPayments(
         tenantId,
         billId
       );

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

@@ -4,7 +4,7 @@ import { check, param, query, ValidationChain } from 'express-validator';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
 import { ServiceError } from '@/exceptions';
 import BaseController from '@/api/controllers/BaseController';
-import BillPaymentsService from '@/services/Purchases/BillPayments/BillPayments';
+import { BillPaymentsApplication } from '@/services/Purchases/BillPayments/BillPaymentsApplication';
 import BillPaymentsPages from '@/services/Purchases/BillPayments/BillPaymentsPages';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
@@ -17,18 +17,18 @@ import { AbilitySubject, IPaymentMadeAction } from '@/interfaces';
 @Service()
 export default class BillsPayments extends BaseController {
   @Inject()
-  billPaymentService: BillPaymentsService;
+  private billPaymentsApplication: BillPaymentsApplication;
 
   @Inject()
-  dynamicListService: DynamicListingService;
+  private dynamicListService: DynamicListingService;
 
   @Inject()
-  billPaymentsPages: BillPaymentsPages;
+  private billPaymentsPages: BillPaymentsPages;
 
   /**
    * Router constructor.
    */
-  router() {
+  public router() {
     const router = Router();
 
     router.post(
@@ -106,7 +106,7 @@ export default class BillsPayments extends BaseController {
    * Bill payments schema validation.
    * @return {ValidationChain[]}
    */
-  get billPaymentSchemaValidation(): ValidationChain[] {
+  private get billPaymentSchemaValidation(): ValidationChain[] {
     return [
       check('vendor_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
@@ -129,7 +129,7 @@ export default class BillsPayments extends BaseController {
    * Specific bill payment schema validation.
    * @returns {ValidationChain[]}
    */
-  get specificBillPaymentValidateSchema(): ValidationChain[] {
+  private get specificBillPaymentValidateSchema(): ValidationChain[] {
     return [param('id').exists().isNumeric().toInt()];
   }
 
@@ -137,7 +137,7 @@ export default class BillsPayments extends BaseController {
    * Bills payment list validation schema.
    * @returns {ValidationChain[]}
    */
-  get listingValidationSchema(): ValidationChain[] {
+  private get listingValidationSchema(): ValidationChain[] {
     return [
       query('custom_view_id').optional().isNumeric().toInt(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -154,7 +154,7 @@ export default class BillsPayments extends BaseController {
    * @param {Request} req -
    * @param {Response} res -
    */
-  async getBillPaymentNewPageEntries(req: Request, res: Response) {
+  private async getBillPaymentNewPageEntries(req: Request, res: Response) {
     const { tenantId } = req;
     const { vendorId } = this.matchedQueryData(req);
 
@@ -174,7 +174,7 @@ export default class BillsPayments extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async getBillPaymentEditPage(
+  private async getBillPaymentEditPage(
     req: Request,
     res: Response,
     next: NextFunction
@@ -205,16 +205,19 @@ export default class BillsPayments extends BaseController {
    * @param {Response} res
    * @param {Response} res
    */
-  async createBillPayment(req: Request, res: Response, next: NextFunction) {
+  private async createBillPayment(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const billPaymentDTO = this.matchedBodyData(req);
 
     try {
-      const billPayment = await this.billPaymentService.createBillPayment(
+      const billPayment = await this.billPaymentsApplication.createBillPayment(
         tenantId,
         billPaymentDTO
       );
-
       return res.status(200).send({
         id: billPayment.id,
         message: 'Payment made has been created successfully.',
@@ -229,13 +232,17 @@ export default class BillsPayments extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async editBillPayment(req: Request, res: Response, next: NextFunction) {
+  private async editBillPayment(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const billPaymentDTO = this.matchedBodyData(req);
     const { id: billPaymentId } = req.params;
 
     try {
-      const paymentMade = await this.billPaymentService.editBillPayment(
+      const paymentMade = await this.billPaymentsApplication.editBillPayment(
         tenantId,
         billPaymentId,
         billPaymentDTO
@@ -256,12 +263,19 @@ export default class BillsPayments extends BaseController {
    * @param {Response} res -
    * @return {Response} res -
    */
-  async deleteBillPayment(req: Request, res: Response, next: NextFunction) {
+  private async deleteBillPayment(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: billPaymentId } = req.params;
 
     try {
-      await this.billPaymentService.deleteBillPayment(tenantId, billPaymentId);
+      await this.billPaymentsApplication.deleteBillPayment(
+        tenantId,
+        billPaymentId
+      );
 
       return res.status(200).send({
         id: billPaymentId,
@@ -277,16 +291,19 @@ export default class BillsPayments extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async getBillPayment(req: Request, res: Response, next: NextFunction) {
+  private async getBillPayment(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: billPaymentId } = req.params;
 
     try {
-      const billPayment = await this.billPaymentService.getBillPayment(
+      const billPayment = await this.billPaymentsApplication.getBillPayment(
         tenantId,
         billPaymentId
       );
-
       return res.status(200).send({
         bill_payment: this.transfromToResponse(billPayment),
       });
@@ -301,12 +318,16 @@ export default class BillsPayments extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async getPaymentBills(req: Request, res: Response, next: NextFunction) {
+  private async getPaymentBills(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: billPaymentId } = req.params;
 
     try {
-      const bills = await this.billPaymentService.getPaymentBills(
+      const bills = await this.billPaymentsApplication.getPaymentBills(
         tenantId,
         billPaymentId
       );
@@ -322,7 +343,11 @@ export default class BillsPayments extends BaseController {
    * @param {Response} res -
    * @return {Response}
    */
-  async getBillsPayments(req: Request, res: Response, next: NextFunction) {
+  private async getBillsPayments(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const billPaymentsFilter = {
       page: 1,
@@ -335,7 +360,7 @@ export default class BillsPayments extends BaseController {
 
     try {
       const { billPayments, pagination, filterMeta } =
-        await this.billPaymentService.listBillPayments(
+        await this.billPaymentsApplication.getBillPayments(
           tenantId,
           billPaymentsFilter
         );
@@ -357,7 +382,7 @@ export default class BillsPayments extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  handleServiceError(
+  private handleServiceError(
     error: Error,
     req: Request,
     res: Response,

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

@@ -1,42 +1,29 @@
+import { Inject, Service } from 'typedi';
 import { Router, Request, Response, NextFunction } from 'express';
 import { check, param, query, ValidationChain } from 'express-validator';
-import { Inject, Service } from 'typedi';
 import {
   AbilitySubject,
   IPaymentReceiveDTO,
   PaymentReceiveAction,
-  SaleInvoiceAction,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import PaymentReceiveService from '@/services/Sales/PaymentReceives/PaymentsReceives';
 import PaymentReceivesPages from '@/services/Sales/PaymentReceives/PaymentReceivesPages';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
-import { ServiceError } from '@/exceptions';
+import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
-import PaymentReceiveNotifyBySms from '@/services/Sales/PaymentReceives/PaymentReceiveSmsNotify';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import GetPaymentReceivePdf from '@/services/Sales/PaymentReceives/GetPaymentReeceivePdf';
+import { ServiceError } from '@/exceptions';
 
-/**
- * Payments receives controller.
- * @service
- */
 @Service()
 export default class PaymentReceivesController extends BaseController {
   @Inject()
-  paymentReceiveService: PaymentReceiveService;
+  private paymentReceiveApplication: PaymentReceivesApplication;
 
   @Inject()
-  PaymentReceivesPages: PaymentReceivesPages;
+  private PaymentReceivesPages: PaymentReceivesPages;
 
   @Inject()
-  dynamicListService: DynamicListingService;
+  private dynamicListService: DynamicListingService;
-
-  @Inject()
-  paymentReceiveSmsNotify: PaymentReceiveNotifyBySms;
-
-  @Inject()
-  paymentReceivePdf: GetPaymentReceivePdf;
 
   /**
    * Router constructor.
@@ -137,7 +124,7 @@ export default class PaymentReceivesController extends BaseController {
    * Payment receive schema.
    * @return {Array}
    */
-  get paymentReceiveSchema(): ValidationChain[] {
+  private get paymentReceiveSchema(): ValidationChain[] {
     return [
       check('customer_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
@@ -162,7 +149,7 @@ export default class PaymentReceivesController extends BaseController {
   /**
    * Payment receive list validation schema.
    */
-  get validatePaymentReceiveList(): ValidationChain[] {
+  private get validatePaymentReceiveList(): ValidationChain[] {
     return [
       query('stringified_filter_roles').optional().isJSON(),
 
@@ -181,7 +168,7 @@ export default class PaymentReceivesController extends BaseController {
   /**
    * Validate payment receive parameters.
    */
-  get paymentReceiveValidation() {
+  private get paymentReceiveValidation() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
@@ -189,14 +176,14 @@ export default class PaymentReceivesController extends BaseController {
    * New payment receive validation schema.
    * @return {Array}
    */
-  get newPaymentReceiveValidation() {
+  private get newPaymentReceiveValidation() {
     return [...this.paymentReceiveSchema];
   }
 
   /**
    * Edit payment receive validation.
    */
-  get editPaymentReceiveValidation() {
+  private get editPaymentReceiveValidation() {
     return [
       param('id').exists().isNumeric().toInt(),
       ...this.paymentReceiveSchema,
@@ -209,13 +196,17 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Response} res
    * @return {Response}
    */
-  async newPaymentReceive(req: Request, res: Response, next: NextFunction) {
+  private async newPaymentReceive(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const paymentReceive: IPaymentReceiveDTO = this.matchedBodyData(req);
 
     try {
       const storedPaymentReceive =
-        await this.paymentReceiveService.createPaymentReceive(
+        await this.paymentReceiveApplication.createPaymentReceive(
           tenantId,
           paymentReceive,
           user
@@ -235,14 +226,18 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Response} res
    * @return {Response}
    */
-  async editPaymentReceive(req: Request, res: Response, next: NextFunction) {
+  private async editPaymentReceive(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const { id: paymentReceiveId } = req.params;
 
     const paymentReceive: IPaymentReceiveDTO = this.matchedBodyData(req);
 
     try {
-      await this.paymentReceiveService.editPaymentReceive(
+      await this.paymentReceiveApplication.editPaymentReceive(
         tenantId,
         paymentReceiveId,
         paymentReceive,
@@ -262,17 +257,20 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async deletePaymentReceive(req: Request, res: Response, next: NextFunction) {
+  private async deletePaymentReceive(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const { id: paymentReceiveId } = req.params;
 
     try {
-      await this.paymentReceiveService.deletePaymentReceive(
+      await this.paymentReceiveApplication.deletePaymentReceive(
         tenantId,
         paymentReceiveId,
         user
       );
-
       return res.status(200).send({
         id: paymentReceiveId,
         message: 'The payment receive has been deleted successfully',
@@ -288,7 +286,7 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async getPaymentReceiveInvoices(
+  private async getPaymentReceiveInvoices(
     req: Request,
     res: Response,
     next: NextFunction
@@ -298,7 +296,7 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const saleInvoices =
-        await this.paymentReceiveService.getPaymentReceiveInvoices(
+        await this.paymentReceiveApplication.getPaymentReceiveInvoices(
           tenantId,
           paymentReceiveId
         );
@@ -315,7 +313,11 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Response} res
    * @return {Response}
    */
-  async getPaymentReceiveList(req: Request, res: Response, next: NextFunction) {
+  private async getPaymentReceiveList(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -327,7 +329,10 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const { paymentReceives, pagination, filterMeta } =
-        await this.paymentReceiveService.listPaymentReceives(tenantId, filter);
+        await this.paymentReceiveApplication.getPaymentReceives(
+          tenantId,
+          filter
+        );
 
       return res.status(200).send({
         payment_receives: this.transfromToResponse(paymentReceives),
@@ -344,7 +349,7 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Request} req - Request.
    * @param {Response} res - Response.
    */
-  async getPaymentReceiveNewPageEntries(
+  private async getPaymentReceiveNewPageEntries(
     req: Request,
     res: Response,
     next: NextFunction
@@ -367,11 +372,11 @@ export default class PaymentReceivesController extends BaseController {
 
   /**
    * Retrieve the given payment receive details.
-   * @asycn
+   * @async
    * @param {Request} req -
    * @param {Response} res -
    */
-  async getPaymentReceiveEditPage(
+  private async getPaymentReceiveEditPage(
     req: Request,
     res: Response,
     next: NextFunction
@@ -402,15 +407,20 @@ export default class PaymentReceivesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async getPaymentReceive(req: Request, res: Response, next: NextFunction) {
+  private async getPaymentReceive(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: paymentReceiveId } = req.params;
 
     try {
-      const paymentReceive = await this.paymentReceiveService.getPaymentReceive(
+      const paymentReceive =
-        tenantId,
+        await this.paymentReceiveApplication.getPaymentReceive(
-        paymentReceiveId
+          tenantId,
-      );
+          paymentReceiveId
+        );
 
       const ACCEPT_TYPE = {
         APPLICATION_PDF: 'application/pdf',
@@ -423,10 +433,11 @@ export default class PaymentReceivesController extends BaseController {
           });
         },
         [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
-          const pdfContent = await this.paymentReceivePdf.getPaymentReceivePdf(
+          const pdfContent =
-            tenantId,
+            await this.paymentReceiveApplication.getPaymentReceivePdf(
-            paymentReceive
+              tenantId,
-          );
+              paymentReceive
+            );
           res.set({
             'Content-Type': 'application/pdf',
             'Content-Length': pdfContent.length,
@@ -454,10 +465,11 @@ export default class PaymentReceivesController extends BaseController {
     const { id: paymentReceiveId } = req.params;
 
     try {
-      const paymentReceive = await this.paymentReceiveSmsNotify.notifyBySms(
+      const paymentReceive =
-        tenantId,
+        await this.paymentReceiveApplication.notifyPaymentBySms(
-        paymentReceiveId
+          tenantId,
-      );
+          paymentReceiveId
+        );
       return res.status(200).send({
         id: paymentReceive.id,
         message: 'The payment notification has been sent successfully.',
@@ -482,10 +494,11 @@ export default class PaymentReceivesController extends BaseController {
     const { id: paymentReceiveId } = req.params;
 
     try {
-      const smsDetails = await this.paymentReceiveSmsNotify.smsDetails(
+      const smsDetails =
-        tenantId,
+        await this.paymentReceiveApplication.getPaymentSmsDetails(
-        paymentReceiveId
+          tenantId,
-      );
+          paymentReceiveId
+        );
       return res.status(200).send({
         data: smsDetails,
       });

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

@@ -1,20 +1,17 @@
 import { Router, Request, Response, NextFunction } from 'express';
-import { check, param, query, matchedData } from 'express-validator';
+import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import {
   AbilitySubject,
   ISaleEstimateDTO,
   SaleEstimateAction,
-  SaleInvoiceAction,
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import SaleEstimateService from '@/services/Sales/SalesEstimate';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { ServiceError } from '@/exceptions';
-import SaleEstimatesPdfService from '@/services/Sales/Estimates/SaleEstimatesPdf';
-import SaleEstimateNotifyBySms from '@/services/Sales/Estimates/SaleEstimateSmsNotify';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
+import { SaleEstimatesApplication } from '@/services/Sales/Estimates/SaleEstimatesApplication';
 
 const ACCEPT_TYPE = {
   APPLICATION_PDF: 'application/pdf',
@@ -23,21 +20,15 @@ const ACCEPT_TYPE = {
 @Service()
 export default class SalesEstimatesController extends BaseController {
   @Inject()
-  saleEstimateService: SaleEstimateService;
+  private saleEstimatesApplication: SaleEstimatesApplication;
 
   @Inject()
-  dynamicListService: DynamicListingService;
+  private dynamicListService: DynamicListingService;
-
-  @Inject()
-  saleEstimatesPdf: SaleEstimatesPdfService;
-
-  @Inject()
-  saleEstimateNotifySms: SaleEstimateNotifyBySms;
 
   /**
    * Router constructor.
    */
-  router() {
+  public router() {
     const router = Router();
 
     router.post(
@@ -136,7 +127,7 @@ export default class SalesEstimatesController extends BaseController {
   /**
    * Estimate validation schema.
    */
-  get estimateValidationSchema() {
+  private get estimateValidationSchema() {
     return [
       check('customer_id').exists().isNumeric().toInt(),
       check('estimate_date').exists().isISO8601().toDate(),
@@ -177,14 +168,14 @@ export default class SalesEstimatesController extends BaseController {
   /**
    * Specific sale estimate validation schema.
    */
-  get validateSpecificEstimateSchema() {
+  private get validateSpecificEstimateSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Sales estimates list validation schema.
    */
-  get validateEstimateListSchema() {
+  private get validateEstimateListSchema() {
     return [
       query('view_slug').optional().isString().trim(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -202,15 +193,16 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Response} res -
    * @return {Response} res -
    */
-  async newEstimate(req: Request, res: Response, next: NextFunction) {
+  private async newEstimate(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const estimateDTO: ISaleEstimateDTO = this.matchedBodyData(req);
 
     try {
-      const storedEstimate = await this.saleEstimateService.createEstimate(
+      const storedEstimate =
-        tenantId,
+        await this.saleEstimatesApplication.createSaleEstimate(
-        estimateDTO
+          tenantId,
-      );
+          estimateDTO
+        );
 
       return res.status(200).send({
         id: storedEstimate.id,
@@ -226,19 +218,18 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async editEstimate(req: Request, res: Response, next: NextFunction) {
+  private async editEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
     const estimateDTO: ISaleEstimateDTO = this.matchedBodyData(req);
 
     try {
       // Update estimate with associated estimate entries.
-      await this.saleEstimateService.editEstimate(
+      await this.saleEstimatesApplication.editSaleEstimate(
         tenantId,
         estimateId,
         estimateDTO
       );
-
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been created successfully.',
@@ -253,13 +244,19 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async deleteEstimate(req: Request, res: Response, next: NextFunction) {
+  private async deleteEstimate(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      await this.saleEstimateService.deleteEstimate(tenantId, estimateId);
+      await this.saleEstimatesApplication.deleteSaleEstimate(
-
+        tenantId,
+        estimateId
+      );
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been deleted successfully.',
@@ -274,13 +271,19 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async deliverSaleEstimate(req: Request, res: Response, next: NextFunction) {
+  private async deliverSaleEstimate(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      await this.saleEstimateService.deliverSaleEstimate(tenantId, estimateId);
+      await this.saleEstimatesApplication.deliverSaleEstimate(
-
+        tenantId,
+        estimateId
+      );
       return res.status(200).send({
         id: estimateId,
         message: 'The sale estimate has been delivered successfully.',
@@ -296,12 +299,19 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async approveSaleEstimate(req: Request, res: Response, next: NextFunction) {
+  private async approveSaleEstimate(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      await this.saleEstimateService.approveSaleEstimate(tenantId, estimateId);
+      await this.saleEstimatesApplication.approveSaleEstimate(
+        tenantId,
+        estimateId
+      );
 
       return res.status(200).send({
         id: estimateId,
@@ -318,12 +328,19 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async rejectSaleEstimate(req: Request, res: Response, next: NextFunction) {
+  private async rejectSaleEstimate(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      await this.saleEstimateService.rejectSaleEstimate(tenantId, estimateId);
+      await this.saleEstimatesApplication.rejectSaleEstimate(
+        tenantId,
+        estimateId
+      );
 
       return res.status(200).send({
         id: estimateId,
@@ -340,12 +357,12 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async getEstimate(req: Request, res: Response, next: NextFunction) {
+  private async getEstimate(req: Request, res: Response, next: NextFunction) {
     const { id: estimateId } = req.params;
     const { tenantId } = req;
 
     try {
-      const estimate = await this.saleEstimateService.getEstimate(
+      const estimate = await this.saleEstimatesApplication.getSaleEstimate(
         tenantId,
         estimateId
       );
@@ -357,10 +374,11 @@ export default class SalesEstimatesController extends BaseController {
         },
         // PDF content type.
         [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
-          const pdfContent = await this.saleEstimatesPdf.saleEstimatePdf(
+          const pdfContent =
-            tenantId,
+            await this.saleEstimatesApplication.getSaleEstimatePdf(
-            estimate
+              tenantId,
-          );
+              estimate
+            );
           res.set({
             'Content-Type': 'application/pdf',
             'Content-Length': pdfContent.length,
@@ -378,7 +396,7 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async getEstimates(req: Request, res: Response, next: NextFunction) {
+  private async getEstimates(req: Request, res: Response, next: NextFunction) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -390,7 +408,7 @@ export default class SalesEstimatesController extends BaseController {
 
     try {
       const { salesEstimates, pagination, filterMeta } =
-        await this.saleEstimateService.estimatesList(tenantId, filter);
+        await this.saleEstimatesApplication.getSaleEstimates(tenantId, filter);
 
       res.format({
         [ACCEPT_TYPE.APPLICATION_JSON]: () => {
@@ -408,7 +426,7 @@ export default class SalesEstimatesController extends BaseController {
     }
   }
 
-  public saleEstimateNotifyBySms = async (
+  private saleEstimateNotifyBySms = async (
     req: Request,
     res: Response,
     next: NextFunction
@@ -417,10 +435,11 @@ export default class SalesEstimatesController extends BaseController {
     const { id: estimateId } = req.params;
 
     try {
-      const saleEstimate = await this.saleEstimateNotifySms.notifyBySms(
+      const saleEstimate =
-        tenantId,
+        await this.saleEstimatesApplication.notifySaleEstimateBySms(
-        estimateId
+          tenantId,
-      );
+          estimateId
+        );
       return res.status(200).send({
         id: saleEstimate.id,
         message:
@@ -437,7 +456,7 @@ export default class SalesEstimatesController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  public saleEstimateSmsDetails = async (
+  private saleEstimateSmsDetails = async (
     req: Request,
     res: Response,
     next: NextFunction
@@ -446,10 +465,11 @@ export default class SalesEstimatesController extends BaseController {
     const { id: estimateId } = req.params;
 
     try {
-      const estimateSmsDetails = await this.saleEstimateNotifySms.smsDetails(
+      const estimateSmsDetails =
-        tenantId,
+        await this.saleEstimatesApplication.getSaleEstimateSmsDetails(
-        estimateId
+          tenantId,
-      );
+          estimateId
+        );
       return res.status(200).send({
         data: estimateSmsDetails,
       });

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

@@ -3,7 +3,6 @@ import { check, param, query } from 'express-validator';
 import { Service, Inject } from 'typedi';
 import BaseController from '../BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import SaleInvoiceService from '@/services/Sales/SalesInvoices';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
 import { ServiceError } from '@/exceptions';
 import {
@@ -12,11 +11,8 @@ import {
   SaleInvoiceAction,
   AbilitySubject,
 } from '@/interfaces';
-import SaleInvoicePdf from '@/services/Sales/SaleInvoicePdf';
-import SaleInvoiceWriteoff from '@/services/Sales/SaleInvoiceWriteoff';
-import SaleInvoiceNotifyBySms from '@/services/Sales/SaleInvoiceNotifyBySms';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
-import InvoicePaymentsService from '@/services/Sales/Invoices/InvoicePaymentsService';
+import { SaleInvoiceApplication } from '@/services/Sales/Invoices/SaleInvoicesApplication';
 
 const ACCEPT_TYPE = {
   APPLICATION_PDF: 'application/pdf',
@@ -25,27 +21,15 @@ const ACCEPT_TYPE = {
 @Service()
 export default class SaleInvoicesController extends BaseController {
   @Inject()
-  saleInvoiceService: SaleInvoiceService;
+  private saleInvoiceApplication: SaleInvoiceApplication;
 
   @Inject()
-  dynamicListService: DynamicListingService;
+  private dynamicListService: DynamicListingService;
-
-  @Inject()
-  saleInvoicePdf: SaleInvoicePdf;
-
-  @Inject()
-  saleInvoiceWriteoff: SaleInvoiceWriteoff;
-
-  @Inject()
-  saleInvoiceSmsNotify: SaleInvoiceNotifyBySms;
-
-  @Inject()
-  invoicePaymentsSerivce: InvoicePaymentsService;
 
   /**
    * Router constructor.
    */
-  router() {
+  public router() {
     const router = Router();
 
     router.post(
@@ -167,7 +151,7 @@ export default class SaleInvoicesController extends BaseController {
   /**
    * Sale invoice validation schema.
    */
-  get saleInvoiceValidationSchema() {
+  private get saleInvoiceValidationSchema() {
     return [
       check('customer_id').exists().isNumeric().toInt(),
       check('invoice_date').exists().isISO8601().toDate(),
@@ -185,8 +169,9 @@ export default class SaleInvoicesController extends BaseController {
       check('branch_id').optional({ nullable: true }).isNumeric().toInt(),
       check('project_id').optional({ nullable: true }).isNumeric().toInt(),
 
-      check('entries').exists().isArray({ min: 1 }),
+      check('is_inclusive_tax').optional().isBoolean().toBoolean(),
 
+      check('entries').exists().isArray({ min: 1 }),
       check('entries.*.index').exists().isNumeric().toInt(),
       check('entries.*.item_id').exists().isNumeric().toInt(),
       check('entries.*.rate').exists().isNumeric().toFloat(),
@@ -199,6 +184,15 @@ export default class SaleInvoicesController extends BaseController {
         .optional({ nullable: true })
         .trim()
         .escape(),
+      check('entries.*.tax_code')
+        .optional({ nullable: true })
+        .trim()
+        .escape()
+        .isString(),
+      check('entries.*.tax_rate_id')
+        .optional({ nullable: true })
+        .isNumeric()
+        .toInt(),
       check('entries.*.warehouse_id')
         .optional({ nullable: true })
         .isNumeric()
@@ -227,14 +221,14 @@ export default class SaleInvoicesController extends BaseController {
   /**
    * Specific sale invoice validation schema.
    */
-  get specificSaleInvoiceValidation() {
+  private get specificSaleInvoiceValidation() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * Sales invoices list validation schema.
    */
-  get saleInvoiceListValidationSchema() {
+  private get saleInvoiceListValidationSchema() {
     return [
       query('view_slug').optional({ nullable: true }).isString().trim(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -249,7 +243,7 @@ export default class SaleInvoicesController extends BaseController {
   /**
    * Due sale invoice list validation schema.
    */
-  get dueSalesInvoicesListValidationSchema() {
+  private get dueSalesInvoicesListValidationSchema() {
     return [query('customer_id').optional().isNumeric().toInt()];
   }
 
@@ -259,17 +253,22 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Response} res
    * @param {Function} next
    */
-  async newSaleInvoice(req: Request, res: Response, next: NextFunction) {
+  private async newSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const saleInvoiceDTO: ISaleInvoiceCreateDTO = this.matchedBodyData(req);
 
     try {
       // Creates a new sale invoice with associated entries.
-      const storedSaleInvoice = await this.saleInvoiceService.createSaleInvoice(
+      const storedSaleInvoice =
-        tenantId,
+        await this.saleInvoiceApplication.createSaleInvoice(
-        saleInvoiceDTO,
+          tenantId,
-        user
+          saleInvoiceDTO,
-      );
+          user
+        );
       return res.status(200).send({
         id: storedSaleInvoice.id,
         message: 'The sale invoice has been created successfully.',
@@ -285,14 +284,18 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Response} res
    * @param {Function} next
    */
-  async editSaleInvoice(req: Request, res: Response, next: NextFunction) {
+  private async editSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const { id: saleInvoiceId } = req.params;
     const saleInvoiceOTD: ISaleInvoiceDTO = this.matchedBodyData(req);
 
     try {
       // Update the given sale invoice details.
-      await this.saleInvoiceService.editSaleInvoice(
+      await this.saleInvoiceApplication.editSaleInvoice(
         tenantId,
         saleInvoiceId,
         saleInvoiceOTD,
@@ -313,12 +316,16 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Response} res -
    * @param {NextFunction} next -
    */
-  async deliverSaleInvoice(req: Request, res: Response, next: NextFunction) {
+  private async deliverSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId, user } = req;
     const { id: saleInvoiceId } = req.params;
 
     try {
-      await this.saleInvoiceService.deliverSaleInvoice(
+      await this.saleInvoiceApplication.deliverSaleInvoice(
         tenantId,
         saleInvoiceId,
         user
@@ -338,13 +345,17 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Response} res
    * @param {Function} next
    */
-  async deleteSaleInvoice(req: Request, res: Response, next: NextFunction) {
+  private async deleteSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: saleInvoiceId } = req.params;
     const { tenantId, user } = req;
 
     try {
       // Deletes the sale invoice with associated entries and journal transaction.
-      await this.saleInvoiceService.deleteSaleInvoice(
+      await this.saleInvoiceApplication.deleteSaleInvoice(
         tenantId,
         saleInvoiceId,
         user
@@ -364,12 +375,16 @@ export default class SaleInvoicesController extends BaseController {
    * @param {Request} req - Request object.
    * @param {Response} res - Response object.
    */
-  async getSaleInvoice(req: Request, res: Response, next: NextFunction) {
+  private async getSaleInvoice(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { id: saleInvoiceId } = req.params;
     const { tenantId, user } = req;
 
     try {
-      const saleInvoice = await this.saleInvoiceService.getSaleInvoice(
+      const saleInvoice = await this.saleInvoiceApplication.getSaleInvoice(
         tenantId,
         saleInvoiceId,
         user
@@ -384,7 +399,7 @@ export default class SaleInvoicesController extends BaseController {
         },
         // PDF content type.
         [ACCEPT_TYPE.APPLICATION_PDF]: async () => {
-          const pdfContent = await this.saleInvoicePdf.saleInvoicePdf(
+          const pdfContent = await this.saleInvoiceApplication.saleInvoicePdf(
             tenantId,
             saleInvoice
           );
@@ -420,7 +435,7 @@ export default class SaleInvoicesController extends BaseController {
     };
     try {
       const { salesInvoices, filterMeta, pagination } =
-        await this.saleInvoiceService.salesInvoicesList(tenantId, filter);
+        await this.saleInvoiceApplication.getSaleInvoices(tenantId, filter);
 
       return res.status(200).send({
         sales_invoices: this.transfromToResponse(salesInvoices),
@@ -448,10 +463,11 @@ export default class SaleInvoicesController extends BaseController {
     const { customerId } = this.matchedQueryData(req);
 
     try {
-      const salesInvoices = await this.saleInvoiceService.getPayableInvoices(
+      const salesInvoices =
-        tenantId,
+        await this.saleInvoiceApplication.getReceivableSaleInvoices(
-        customerId
+          tenantId,
-      );
+          customerId
+        );
       return res.status(200).send({
         sales_invoices: this.transfromToResponse(salesInvoices),
       });
@@ -477,7 +493,7 @@ export default class SaleInvoicesController extends BaseController {
     const writeoffDTO = this.matchedBodyData(req);
 
     try {
-      const saleInvoice = await this.saleInvoiceWriteoff.writeOff(
+      const saleInvoice = await this.saleInvoiceApplication.writeOff(
         tenantId,
         invoiceId,
         writeoffDTO
@@ -485,7 +501,7 @@ export default class SaleInvoicesController extends BaseController {
 
       return res.status(200).send({
         id: saleInvoice.id,
-        message: 'The given sale invoice has been writte-off successfully.',
+        message: 'The given sale invoice has been written-off successfully.',
       });
     } catch (error) {
       next(error);
@@ -507,7 +523,7 @@ export default class SaleInvoicesController extends BaseController {
     const { id: invoiceId } = req.params;
 
     try {
-      const saleInvoice = await this.saleInvoiceWriteoff.cancelWrittenoff(
+      const saleInvoice = await this.saleInvoiceApplication.cancelWrittenoff(
         tenantId,
         invoiceId
       );
@@ -538,11 +554,12 @@ export default class SaleInvoicesController extends BaseController {
     const invoiceNotifySmsDTO = this.matchedBodyData(req);
 
     try {
-      const saleInvoice = await this.saleInvoiceSmsNotify.notifyBySms(
+      const saleInvoice =
-        tenantId,
+        await this.saleInvoiceApplication.notifySaleInvoiceBySms(
-        invoiceId,
+          tenantId,
-        invoiceNotifySmsDTO.notificationKey
+          invoiceId,
-      );
+          invoiceNotifySmsDTO.notificationKey
+        );
       return res.status(200).send({
         id: saleInvoice.id,
         message:
@@ -569,11 +586,12 @@ export default class SaleInvoicesController extends BaseController {
     const smsDetailsDTO = this.matchedQueryData(req);
 
     try {
-      const invoiceSmsDetails = await this.saleInvoiceSmsNotify.smsDetails(
+      const invoiceSmsDetails =
-        tenantId,
+        await this.saleInvoiceApplication.getSaleInvoiceSmsDetails(
-        invoiceId,
+          tenantId,
-        smsDetailsDTO
+          invoiceId,
-      );
+          smsDetailsDTO
+        );
       return res.status(200).send({
         data: invoiceSmsDetails,
       });
@@ -599,7 +617,7 @@ export default class SaleInvoicesController extends BaseController {
 
     try {
       const invoicePayments =
-        await this.invoicePaymentsSerivce.getInvoicePayments(
+        await this.saleInvoiceApplication.getInvoicePayments(
           tenantId,
           invoiceId
         );
@@ -748,6 +766,16 @@ export default class SaleInvoicesController 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: 5000 }],
+        });
+      }
+      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: 5100 }],
+        });
+      }
     }
     next(error);
   }

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

@@ -2,34 +2,26 @@ import { Router, Request, Response, NextFunction } from 'express';
 import { check, param, query } from 'express-validator';
 import { Inject, Service } from 'typedi';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import SaleReceiptService from '@/services/Sales/SalesReceipts';
-import SaleReceiptsPdfService from '@/services/Sales/Receipts/SaleReceiptsPdfService';
 import BaseController from '../BaseController';
 import { ISaleReceiptDTO } from '@/interfaces/SaleReceipt';
 import { ServiceError } from '@/exceptions';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
-import SaleReceiptNotifyBySms from '@/services/Sales/SaleReceiptNotifyBySms';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { AbilitySubject, SaleReceiptAction } from '@/interfaces';
+import { SaleReceiptApplication } from '@/services/Sales/Receipts/SaleReceiptApplication';
 
 @Service()
 export default class SalesReceiptsController extends BaseController {
   @Inject()
-  saleReceiptService: SaleReceiptService;
+  private saleReceiptsApplication: SaleReceiptApplication;
 
   @Inject()
-  saleReceiptsPdf: SaleReceiptsPdfService;
+  private dynamicListService: DynamicListingService;
-
-  @Inject()
-  dynamicListService: DynamicListingService;
-
-  @Inject()
-  saleReceiptSmsNotify: SaleReceiptNotifyBySms;
 
   /**
    * Router constructor.
    */
-  router() {
+  public router() {
     const router = Router();
 
     router.post(
@@ -105,7 +97,7 @@ export default class SalesReceiptsController extends BaseController {
    * Sales receipt validation schema.
    * @return {Array}
    */
-  get salesReceiptsValidationSchema() {
+  private get salesReceiptsValidationSchema() {
     return [
       check('customer_id').exists().isNumeric().toInt(),
       check('exchange_rate').optional().isFloat({ gt: 0 }).toFloat(),
@@ -146,14 +138,14 @@ export default class SalesReceiptsController extends BaseController {
   /**
    * Specific sale receipt validation schema.
    */
-  get specificReceiptValidationSchema() {
+  private get specificReceiptValidationSchema() {
     return [param('id').exists().isNumeric().toInt()];
   }
 
   /**
    * List sales receipts validation schema.
    */
-  get listSalesReceiptsValidationSchema() {
+  private get listSalesReceiptsValidationSchema() {
     return [
       query('view_slug').optional().isString().trim(),
       query('stringified_filter_roles').optional().isJSON(),
@@ -170,16 +162,21 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async newSaleReceipt(req: Request, res: Response, next: NextFunction) {
+  private async newSaleReceipt(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const saleReceiptDTO: ISaleReceiptDTO = this.matchedBodyData(req);
 
     try {
       // Store the given sale receipt details with associated entries.
-      const storedSaleReceipt = await this.saleReceiptService.createSaleReceipt(
+      const storedSaleReceipt =
-        tenantId,
+        await this.saleReceiptsApplication.createSaleReceipt(
-        saleReceiptDTO
+          tenantId,
-      );
+          saleReceiptDTO
+        );
       return res.status(200).send({
         id: storedSaleReceipt.id,
         message: 'Sale receipt has been created successfully.',
@@ -194,13 +191,20 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async deleteSaleReceipt(req: Request, res: Response, next: NextFunction) {
+  private async deleteSaleReceipt(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: saleReceiptId } = req.params;
 
     try {
       // Deletes the sale receipt.
-      await this.saleReceiptService.deleteSaleReceipt(tenantId, saleReceiptId);
+      await this.saleReceiptsApplication.deleteSaleReceipt(
+        tenantId,
+        saleReceiptId
+      );
 
       return res.status(200).send({
         id: saleReceiptId,
@@ -217,14 +221,18 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Request} req -
    * @param {Response} res -
    */
-  async editSaleReceipt(req: Request, res: Response, next: NextFunction) {
+  private async editSaleReceipt(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: saleReceiptId } = req.params;
     const saleReceipt = this.matchedBodyData(req);
 
     try {
       // Update the given sale receipt details.
-      await this.saleReceiptService.editSaleReceipt(
+      await this.saleReceiptsApplication.editSaleReceipt(
         tenantId,
         saleReceiptId,
         saleReceipt
@@ -244,13 +252,20 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Response} res
    * @param {NextFunction} next
    */
-  async closeSaleReceipt(req: Request, res: Response, next: NextFunction) {
+  private async closeSaleReceipt(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const { id: saleReceiptId } = req.params;
 
     try {
       // Update the given sale receipt details.
-      await this.saleReceiptService.closeSaleReceipt(tenantId, saleReceiptId);
+      await this.saleReceiptsApplication.closeSaleReceipt(
+        tenantId,
+        saleReceiptId
+      );
       return res.status(200).send({
         id: saleReceiptId,
         message: 'Sale receipt has been closed successfully.',
@@ -265,7 +280,11 @@ export default class SalesReceiptsController extends BaseController {
    * @param {Request} req
    * @param {Response} res
    */
-  async getSalesReceipts(req: Request, res: Response, next: NextFunction) {
+  private async getSalesReceipts(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
     const { tenantId } = req;
     const filter = {
       sortOrder: 'desc',
@@ -274,10 +293,9 @@ export default class SalesReceiptsController extends BaseController {
       pageSize: 12,
       ...this.matchedQueryData(req),
     };
-
     try {
       const { data, pagination, filterMeta } =
-        await this.saleReceiptService.salesReceiptsList(tenantId, filter);
+        await this.saleReceiptsApplication.getSaleReceipts(tenantId, filter);
 
       const response = this.transfromToResponse({
         data,
@@ -301,11 +319,10 @@ export default class SalesReceiptsController extends BaseController {
     const { tenantId } = req;
 
     try {
-      const saleReceipt = await this.saleReceiptService.getSaleReceipt(
+      const saleReceipt = await this.saleReceiptsApplication.getSaleReceipt(
         tenantId,
         saleReceiptId
       );
-
       res.format({
         'application/json': () => {
           return res
@@ -313,10 +330,11 @@ export default class SalesReceiptsController extends BaseController {
             .send(this.transfromToResponse({ saleReceipt }));
         },
         'application/pdf': async () => {
-          const pdfContent = await this.saleReceiptsPdf.saleReceiptPdf(
+          const pdfContent =
-            tenantId,
+            await this.saleReceiptsApplication.getSaleReceiptPdf(
-            saleReceipt
+              tenantId,
-          );
+              saleReceipt
+            );
           res.set({
             'Content-Type': 'application/pdf',
             'Content-Length': pdfContent.length,
@@ -344,10 +362,11 @@ export default class SalesReceiptsController extends BaseController {
     const { id: receiptId } = req.params;
 
     try {
-      const saleReceipt = await this.saleReceiptSmsNotify.notifyBySms(
+      const saleReceipt =
-        tenantId,
+        await this.saleReceiptsApplication.saleReceiptNotifyBySms(
-        receiptId
+          tenantId,
-      );
+          receiptId
+        );
       return res.status(200).send({
         id: saleReceipt.id,
         message:
@@ -373,10 +392,11 @@ export default class SalesReceiptsController extends BaseController {
     const { id: receiptId } = req.params;
 
     try {
-      const smsDetails = await this.saleReceiptSmsNotify.smsDetails(
+      const smsDetails =
-        tenantId,
+        await this.saleReceiptsApplication.getSaleReceiptSmsDetails(
-        receiptId
+          tenantId,
-      );
+          receiptId
+        );
       return res.status(200).send({
         data: smsDetails,
       });

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

@@ -1,10 +1,10 @@
 import { Router } from 'express';
 import { Container, Service } from 'typedi';
+import SalesInvoices from './SalesInvoices'
 import SalesEstimates from './SalesEstimates';
 import SalesReceipts from './SalesReceipts';
-import SalesInvoices from './SalesInvoices'
-import PaymentReceives from './PaymentReceives';
 import CreditNotes from './CreditNotes';
+import PaymentReceives from './PaymentReceives';
 @Service()
 export default class SalesController {
   /**

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

@@ -0,0 +1,278 @@
+import { Inject, Service } from 'typedi';
+import { Router, Request, Response } from 'express';
+import { body, param } from 'express-validator';
+import BaseController from '@/api/controllers/BaseController';
+import asyncMiddleware from '@/api/middleware/asyncMiddleware';
+import { TaxRatesApplication } from '@/services/TaxRates/TaxRatesApplication';
+import CheckAbilities from '@/api/middleware/CheckPolicies';
+import { ServiceError } from '@/exceptions';
+import { ERRORS } from '@/services/TaxRates/constants';
+import { AbilitySubject, TaxRateAction } from '@/interfaces';
+
+@Service()
+export class TaxRatesController extends BaseController {
+  @Inject()
+  private taxRatesApplication: TaxRatesApplication;
+
+  /**
+   * Router constructor.
+   */
+  public router() {
+    const router = Router();
+
+    router.post(
+      '/',
+      CheckAbilities(TaxRateAction.CREATE, AbilitySubject.TaxRate),
+      this.taxRateValidationSchema,
+      this.validationResult,
+      asyncMiddleware(this.createTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.post(
+      '/:id',
+      CheckAbilities(TaxRateAction.EDIT, AbilitySubject.TaxRate),
+      [param('id').exists().toInt(), ...this.taxRateValidationSchema],
+      this.validationResult,
+      asyncMiddleware(this.editTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.post(
+      '/:id/active',
+      CheckAbilities(TaxRateAction.EDIT, AbilitySubject.TaxRate),
+      [param('id').exists().toInt()],
+      this.validationResult,
+      asyncMiddleware(this.activateTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.post(
+      '/:id/inactive',
+      CheckAbilities(TaxRateAction.EDIT, AbilitySubject.TaxRate),
+      [param('id').exists().toInt()],
+      this.validationResult,
+      asyncMiddleware(this.inactivateTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.delete(
+      '/:id',
+      CheckAbilities(TaxRateAction.DELETE, AbilitySubject.TaxRate),
+      [param('id').exists().toInt()],
+      this.validationResult,
+      asyncMiddleware(this.deleteTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.get(
+      '/:id',
+      CheckAbilities(TaxRateAction.VIEW, AbilitySubject.TaxRate),
+      [param('id').exists().toInt()],
+      this.validationResult,
+      asyncMiddleware(this.getTaxRate.bind(this)),
+      this.handleServiceErrors
+    );
+    router.get(
+      '/',
+      CheckAbilities(TaxRateAction.VIEW, AbilitySubject.TaxRate),
+      this.validationResult,
+      asyncMiddleware(this.getTaxRates.bind(this)),
+      this.handleServiceErrors
+    );
+    return router;
+  }
+
+  /**
+   * Tax rate validation schema.
+   */
+  private get taxRateValidationSchema() {
+    return [
+      body('name').exists(),
+      body('code').exists().isString(),
+      body('rate').exists().isNumeric().toFloat(),
+      body('description').optional().trim().isString(),
+      body('is_non_recoverable').optional().isBoolean().default(false),
+      body('is_compound').optional().isBoolean().default(false),
+      body('active').optional().isBoolean().default(false),
+    ];
+  }
+
+  /**
+   * Creates a new tax rate.
+   * @param {Request} req -
+   * @param {Response} res -
+   */
+  public async createTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const createTaxRateDTO = this.matchedBodyData(req);
+
+    try {
+      const taxRate = await this.taxRatesApplication.createTaxRate(
+        tenantId,
+        createTaxRateDTO
+      );
+      return res.status(200).send({
+        data: taxRate,
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Edits the given tax rate.
+   * @param {Request} req -
+   * @param {Response} res -
+   */
+  public async editTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const editTaxRateDTO = this.matchedBodyData(req);
+    const { id: taxRateId } = req.params;
+
+    try {
+      const taxRate = await this.taxRatesApplication.editTaxRate(
+        tenantId,
+        taxRateId,
+        editTaxRateDTO
+      );
+      return res.status(200).send({
+        data: taxRate,
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Deletes the given tax rate.
+   * @param {Request} req -
+   * @param {Response} res -
+   */
+  public async deleteTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const { id: taxRateId } = req.params;
+
+    try {
+      await this.taxRatesApplication.deleteTaxRate(tenantId, taxRateId);
+
+      return res.status(200).send({
+        code: 200,
+        message: 'The tax rate has been deleted successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Retrieves the given tax rate.
+   * @param {Request} req -
+   * @param {Response} res -
+   */
+  public async getTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const { id: taxRateId } = req.params;
+
+    try {
+      const taxRate = await this.taxRatesApplication.getTaxRate(
+        tenantId,
+        taxRateId
+      );
+      return res.status(200).send({ data: taxRate });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Retrieves the tax rates list.
+   * @param {Request} req -
+   * @param {Response} res -
+   */
+  public async getTaxRates(req: Request, res: Response, next) {
+    const { tenantId } = req;
+
+    try {
+      const taxRates = await this.taxRatesApplication.getTaxRates(tenantId);
+
+      return res.status(200).send({ data: taxRates });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Inactivates the given tax rate.
+   * @param req
+   * @param res
+   * @param next
+   * @returns
+   */
+  public async inactivateTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const { id: taxRateId } = req.params;
+
+    try {
+      await this.taxRatesApplication.inactivateTaxRate(tenantId, taxRateId);
+
+      return res.status(200).send({
+        id: taxRateId,
+        message: 'The given tax rate has been inactivated successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Inactivates the given tax rate.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   * @returns
+   */
+  public async activateTaxRate(req: Request, res: Response, next) {
+    const { tenantId } = req;
+    const { id: taxRateId } = req.params;
+
+    try {
+      await this.taxRatesApplication.activateTaxRate(tenantId, taxRateId);
+
+      return res.status(200).send({
+        id: taxRateId,
+        message: 'The given tax rate has been activated successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  }
+
+  /**
+   * Handles service errors.
+   * @param {Error} error
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  private handleServiceErrors(error: Error, req: Request, res: Response, next) {
+    if (error instanceof ServiceError) {
+      if (error.errorType === ERRORS.TAX_CODE_NOT_UNIQUE) {
+        return res.boom.badRequest(null, {
+          errors: [{ type: ERRORS.TAX_CODE_NOT_UNIQUE, code: 100 }],
+        });
+      }
+      if (error.errorType === ERRORS.TAX_RATE_NOT_FOUND) {
+        return res.boom.badRequest(null, {
+          errors: [{ type: ERRORS.TAX_RATE_NOT_FOUND, code: 200 }],
+        });
+      }
+      if (error.errorType === ERRORS.TAX_RATE_ALREADY_INACTIVE) {
+        return res.boom.badRequest(null, {
+          errors: [{ type: ERRORS.TAX_RATE_ALREADY_INACTIVE, code: 300 }],
+        });
+      }
+      if (error.errorType === ERRORS.TAX_RATE_ALREADY_ACTIVE) {
+        return res.boom.badRequest(null, {
+          errors: [{ type: ERRORS.TAX_RATE_ALREADY_ACTIVE, code: 400 }],
+        });
+      }
+    }
+    next(error);
+  }
+}

packages/server/src/api/index.ts

@@ -55,6 +55,7 @@ import { InventoryItemsCostController } from './controllers/Inventory/Inventorty
 import { ProjectsController } from './controllers/Projects/Projects';
 import { ProjectTasksController } from './controllers/Projects/Tasks';
 import { ProjectTimesController } from './controllers/Projects/Times';
+import { TaxRatesController } from './controllers/TaxRates/TaxRates';
 
 export default () => {
   const app = Router();
@@ -129,6 +130,7 @@ export default () => {
   );
   dashboard.use('/warehouses', Container.get(WarehousesController).router());
   dashboard.use('/projects', Container.get(ProjectsController).router());
+  dashboard.use('/tax-rates', Container.get(TaxRatesController).router());
   dashboard.use('/', Container.get(ProjectTasksController).router());
   dashboard.use('/', Container.get(ProjectTimesController).router());
 

packages/server/src/config/index.ts

@@ -1,9 +1,12 @@
 import dotenv from 'dotenv';
 import path from 'path';
+import { toInteger } from 'lodash';
 import { castCommaListEnvVarToArray, parseBoolean } from '@/utils';
 
 dotenv.config();
 
+const API_RATE_LIMIT = process.env.API_RATE_LIMIT?.split(',') || [];
+
 module.exports = {
   /**
    * Your favorite port
@@ -95,16 +98,15 @@ module.exports = {
    * JWT secret.
    */
   jwtSecret: process.env.JWT_SECRET,
-  resetPasswordSeconds: 600,
 
   /**
    *
    */
-  customerSuccess: {
+  resetPasswordSeconds: 600,
-    email: 'success@bigcapital.ly',
-    phoneNumber: '(218) 92 791 8381',
-  },
 
+  /**
+   * Application base URL.
+   */
   baseURL: process.env.BASE_URL,
 
   /**
@@ -131,19 +133,9 @@ module.exports = {
       blockDuration: 60 * 15,
     },
     requests: {
-      points: 60,
+      points: API_RATE_LIMIT[0] ? toInteger(API_RATE_LIMIT[0]) : 120,
-      duration: 60,
+      duration: API_RATE_LIMIT[1] ? toInteger(API_RATE_LIMIT[1]) : 60,
-      blockDuration: 60 * 10,
+      blockDuration: API_RATE_LIMIT[2] ? toInteger(API_RATE_LIMIT[2]) : 60 * 10,
-    },
-  },
-
-  /**
-   * Users registeration configuration.
-   */
-  registration: {
-    countries: {
-      whitelist: ['LY'],
-      blacklist: [],
     },
   },
 
@@ -167,8 +159,6 @@ module.exports = {
     browserWSEndpoint: process.env.BROWSER_WS_ENDPOINT,
   },
 
-  protocol: '',
-  hostname: '',
   scheduleComputeItemCost: 'in 5 seconds',
 
   /**

packages/server/src/data/TransactionTypes.ts

@@ -0,0 +1,28 @@
+export const TransactionTypes = {
+  SaleInvoice: 'Sale invoice',
+  SaleReceipt: 'Sale receipt',
+  PaymentReceive: 'Payment receive',
+  Bill: 'Bill',
+  BillPayment: 'Payment made',
+  VendorOpeningBalance: 'Vendor opening balance',
+  CustomerOpeningBalance: 'Customer opening balance',
+  InventoryAdjustment: 'Inventory adjustment',
+  ManualJournal: 'Manual journal',
+  Journal: 'Manual journal',
+  Expense: 'Expense',
+  OwnerContribution: 'Owner contribution',
+  TransferToAccount: 'Transfer to account',
+  TransferFromAccount: 'Transfer from account',
+  OtherIncome: 'Other income',
+  OtherExpense: 'Other expense',
+  OwnerDrawing: 'Owner drawing',
+  InvoiceWriteOff: 'Invoice write-off',
+
+  CreditNote: 'transaction_type.credit_note',
+  VendorCredit: 'transaction_type.vendor_credit',
+
+  RefundCreditNote: 'transaction_type.refund_credit_note',
+  RefundVendorCredit: 'transaction_type.refund_vendor_credit',
+
+  LandedCost: 'transaction_type.landed_cost',
+};

packages/server/src/database/migrations/20230810191606_create_tax_rates.js

@@ -0,0 +1,52 @@
+exports.up = (knex) => {
+  return knex.schema
+    .createTable('tax_rates', (table) => {
+      table.increments();
+      table.string('name');
+      table.string('code');
+      table.decimal('rate');
+      table.string('description');
+      table.boolean('is_non_recoverable').defaultTo(false);
+      table.boolean('is_compound').defaultTo(false);
+      table.boolean('active').defaultTo(false);
+      table.date('deleted_at');
+      table.timestamps();
+    })
+    .table('items_entries', (table) => {
+      table.boolean('is_inclusive_tax').defaultTo(false);
+      table
+        .integer('tax_rate_id')
+        .unsigned()
+        .references('id')
+        .inTable('tax_rates');
+      table.decimal('tax_rate').unsigned();
+    })
+    .table('sales_invoices', (table) => {
+      table.boolean('is_inclusive_tax').defaultTo(false);
+      table.decimal('tax_amount_withheld');
+    })
+    .createTable('tax_rate_transactions', (table) => {
+      table.increments('id');
+      table
+        .integer('tax_rate_id')
+        .unsigned()
+        .references('id')
+        .inTable('tax_rates');
+      table.string('reference_type');
+      table.integer('reference_id');
+      table.decimal('rate').unsigned();
+      table.integer('tax_account_id').unsigned();
+    })
+    .table('accounts_transactions', (table) => {
+      table
+        .integer('tax_rate_id')
+        .unsigned()
+        .references('id')
+        .inTable('tax_rates');
+      table.decimal('tax_rate').unsigned();
+    });
+};
+
+exports.down = (knex) => {
+  return knex.schema.dropTableIfExists('tax_rates');
+};

packages/server/src/database/seeds/core/20230912121909_seed_tax_rates.ts

@@ -0,0 +1,14 @@
+import { TenantSeeder } from '@/lib/Seeder/TenantSeeder';
+import { InitialTaxRates } from '../data/TaxRates';
+
+export default class SeedTaxRates extends TenantSeeder {
+  /**
+   * Seeds initial tax rates to the organization.
+   */
+  up(knex) {
+    return knex('tax_rates').then(async () => {
+      // Inserts seed entries.
+      return knex('tax_rates').insert(InitialTaxRates);
+    });
+  }
+}

packages/server/src/database/seeds/core/20230912121909_update_tax_payable_account.ts

@@ -0,0 +1,16 @@
+import { TenantSeeder } from '@/lib/Seeder/TenantSeeder';
+import { InitialTaxRates } from '../data/TaxRates';
+
+export default class UpdateTaxPayableAccount extends TenantSeeder {
+  /**
+   * Seeds initial tax rates to the organization.
+   */
+  up(knex) {
+    return knex('accounts').then(async () => {
+      // Inserts seed entries.
+      return knex('accounts').where('slug', 'tax-payable').update({
+        account_type: 'tax-payable',
+      });
+    });
+  }
+}

packages/server/src/database/seeds/data/TaxRates.ts

@@ -0,0 +1,30 @@
+export const InitialTaxRates = [
+  {
+    name: 'Tax Exempt',
+    code: 'TAX-EXEMPT',
+    description: 'Exempts goods or services from taxes.',
+    rate: 0,
+    active: 1,
+  },
+  {
+    name: 'Tax on Purchases',
+    code: 'TAX-PURCHASES',
+    description: 'Fee added to the cost when you buy items.',
+    rate: 0,
+    active: 1,
+  },
+  {
+    name: 'Tax on Sales',
+    code: 'TAX-SALES',
+    description: 'Fee added to the cost when you sell items.',
+    rate: 0,
+    active: 1,
+  },
+  {
+    name: 'Sales Tax on Imports',
+    code: 'TAX-IMPORTS',
+    description: 'Fee added to the cost when you sale to another country.',
+    rate: 0,
+    active: 1,
+  },
+];

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

@@ -1,7 +1,17 @@
+export const TaxPayableAccount = {
+  name: 'Tax Payable',
+  slug: 'tax-payable',
+  account_type: 'tax-payable',
+  code: '20006',
+  description: '',
+  active: 1,
+  index: 1,
+  predefined: 1,
+};
 
 export default [
   {
-    name:'Bank Account',
+    name: 'Bank Account',
     slug: 'bank-account',
     account_type: 'bank',
     code: '10001',
@@ -11,7 +21,7 @@ export default [
     predefined: 1,
   },
   {
-    name:'Saving Bank Account',
+    name: 'Saving Bank Account',
     slug: 'saving-bank-account',
     account_type: 'bank',
     code: '10002',
@@ -21,7 +31,7 @@ export default [
     predefined: 0,
   },
   {
-    name:'Undeposited Funds',
+    name: 'Undeposited Funds',
     slug: 'undeposited-funds',
     account_type: 'cash',
     code: '10003',
@@ -31,7 +41,7 @@ export default [
     predefined: 1,
   },
   {
-    name:'Petty Cash',
+    name: 'Petty Cash',
     slug: 'petty-cash',
     account_type: 'cash',
     code: '10004',
@@ -41,7 +51,7 @@ export default [
     predefined: 1,
   },
   {
-    name:'Computer Equipment',
+    name: 'Computer Equipment',
     slug: 'computer-equipment',
     code: '10005',
     account_type: 'fixed-asset',
@@ -52,7 +62,7 @@ export default [
     description: '',
   },
   {
-    name:'Office Equipment',
+    name: 'Office Equipment',
     slug: 'office-equipment',
     code: '10006',
     account_type: 'fixed-asset',
@@ -63,7 +73,7 @@ export default [
     description: '',
   },
   {
-    name:'Accounts Receivable (A/R)',
+    name: 'Accounts Receivable (A/R)',
     slug: 'accounts-receivable',
     account_type: 'accounts-receivable',
     code: '10007',
@@ -73,7 +83,7 @@ export default [
     predefined: 1,
   },
   {
-    name:'Inventory Asset',
+    name: 'Inventory Asset',
     slug: 'inventory-asset',
     code: '10008',
     account_type: 'inventory',
@@ -81,12 +91,13 @@ export default [
     parent_account_id: null,
     index: 1,
     active: 1,
-    description:'An account that holds valuation of products or goods that availiable for sale.',
+    description:
+      'An account that holds valuation of products or goods that available for sale.',
   },
 
   // Libilities
   {
-    name:'Accounts Payable (A/P)',
+    name: 'Accounts Payable (A/P)',
     slug: 'accounts-payable',
     account_type: 'accounts-payable',
     parent_account_id: null,
@@ -97,38 +108,39 @@ export default [
     predefined: 1,
   },
   {
-    name:'Owner A Drawings',
+    name: 'Owner A Drawings',
     slug: 'owner-drawings',
     account_type: 'other-current-liability',
     parent_account_id: null,
     code: '20002',
-    description:'Withdrawals by the owners.',
+    description: 'Withdrawals by the owners.',
     active: 1,
     index: 1,
     predefined: 0,
   },
   {
-    name:'Loan',
+    name: 'Loan',
     slug: 'owner-drawings',
     account_type: 'other-current-liability',
     code: '20003',
-    description:'Money that has been borrowed from a creditor.',
+    description: 'Money that has been borrowed from a creditor.',
     active: 1,
     index: 1,
     predefined: 0,
   },
   {
-    name:'Opening Balance Liabilities',
+    name: 'Opening Balance Liabilities',
     slug: 'opening-balance-liabilities',
     account_type: 'other-current-liability',
     code: '20004',
-    description:'This account will hold the difference in the debits and credits entered during the opening balance..',
+    description:
+      'This account will hold the difference in the debits and credits entered during the opening balance..',
     active: 1,
     index: 1,
     predefined: 0,
   },
   {
-    name:'Revenue Received in Advance',
+    name: 'Revenue Received in Advance',
     slug: 'revenue-received-in-advance',
     account_type: 'other-current-liability',
     parent_account_id: null,
@@ -138,34 +150,27 @@ export default [
     index: 1,
     predefined: 0,
   },
-  {
+  TaxPayableAccount,
-    name:'Sales Tax Payable',
-    slug: 'owner-drawings',
-    account_type: 'other-current-liability',
-    code: '20006',
-    description: '',
-    active: 1,
-    index: 1,
-    predefined: 1,
-  },
 
   // Equity
   {
-    name:'Retained Earnings',
+    name: 'Retained Earnings',
     slug: 'retained-earnings',
     account_type: 'equity',
     code: '30001',
-    description:'Retained earnings tracks net income from previous fiscal years.',
+    description:
+      'Retained earnings tracks net income from previous fiscal years.',
     active: 1,
     index: 1,
     predefined: 1,
   },
   {
-    name:'Opening Balance Equity',
+    name: 'Opening Balance Equity',
     slug: 'opening-balance-equity',
     account_type: 'equity',
     code: '30002',
-    description:'When you enter opening balances to the accounts, the amounts enter in Opening balance equity. This ensures that you have a correct trial balance sheet for your company, without even specific the second credit or debit entry.',
+    description:
+      'When you enter opening balances to the accounts, the amounts enter in Opening balance equity. This ensures that you have a correct trial balance sheet for your company, without even specific the second credit or debit entry.',
     active: 1,
     index: 1,
     predefined: 1,
@@ -181,11 +186,12 @@ export default [
     predefined: 1,
   },
   {
-    name:`Drawings`,
+    name: `Drawings`,
     slug: 'drawings',
     account_type: 'equity',
     code: '30003',
-    description:'Goods purchased with the intention of selling these to customers',
+    description:
+      'Goods purchased with the intention of selling these to customers',
     active: 1,
     index: 1,
     predefined: 1,
@@ -193,7 +199,7 @@ export default [
 
   // Expenses
   {
-    name:'Other Expenses',
+    name: 'Other Expenses',
     slug: 'other-expenses',
     account_type: 'other-expense',
     parent_account_id: null,
@@ -204,18 +210,18 @@ export default [
     predefined: 1,
   },
   {
-    name:'Cost of Goods Sold',
+    name: 'Cost of Goods Sold',
     slug: 'cost-of-goods-sold',
     account_type: 'cost-of-goods-sold',
     parent_account_id: null,
     code: '40002',
-    description:'Tracks the direct cost of the goods sold.',
+    description: 'Tracks the direct cost of the goods sold.',
     active: 1,
     index: 1,
     predefined: 1,
   },
   {
-    name:'Office expenses',
+    name: 'Office expenses',
     slug: 'office-expenses',
     account_type: 'expense',
     parent_account_id: null,
@@ -226,7 +232,7 @@ export default [
     predefined: 0,
   },
   {
-    name:'Rent',
+    name: 'Rent',
     slug: 'rent',
     account_type: 'expense',
     parent_account_id: null,
@@ -237,29 +243,30 @@ export default [
     predefined: 0,
   },
   {
-    name:'Exchange Gain or Loss',
+    name: 'Exchange Gain or Loss',
     slug: 'exchange-grain-loss',
     account_type: 'other-expense',
     parent_account_id: null,
     code: '40005',
-    description:'Tracks the gain and losses of the exchange differences.',
+    description: 'Tracks the gain and losses of the exchange differences.',
     active: 1,
     index: 1,
     predefined: 1,
   },
   {
-    name:'Bank Fees and Charges',
+    name: 'Bank Fees and Charges',
     slug: 'bank-fees-and-charges',
     account_type: 'expense',
     parent_account_id: null,
     code: '40006',
-    description: 'Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.',
+    description:
+      'Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.',
     active: 1,
     index: 1,
     predefined: 0,
   },
   {
-    name:'Depreciation Expense',
+    name: 'Depreciation Expense',
     slug: 'depreciation-expense',
     account_type: 'expense',
     parent_account_id: null,
@@ -272,7 +279,7 @@ export default [
 
   // Income
   {
-    name:'Sales of Product Income',
+    name: 'Sales of Product Income',
     slug: 'sales-of-product-income',
     account_type: 'income',
     predefined: 1,
@@ -283,7 +290,7 @@ export default [
     description: '',
   },
   {
-    name:'Sales of Service Income',
+    name: 'Sales of Service Income',
     slug: 'sales-of-service-income',
     account_type: 'income',
     predefined: 0,
@@ -294,7 +301,7 @@ export default [
     description: '',
   },
   {
-    name:'Uncategorized Income',
+    name: 'Uncategorized Income',
     slug: 'uncategorized-income',
     account_type: 'income',
     parent_account_id: null,
@@ -305,14 +312,15 @@ export default [
     predefined: 1,
   },
   {
-    name:'Other Income',
+    name: 'Other Income',
     slug: 'other-income',
     account_type: 'other-income',
     parent_account_id: null,
     code: '50004',
-    description:'The income activities are not associated to the core business.',
+    description:
+      'The income activities are not associated to the core business.',
     active: 1,
     index: 1,
     predefined: 0,
-  }
+  },
 ];

packages/server/src/interfaces/APAgingSummaryReport.ts

@@ -1,51 +1,36 @@
 import {
   IAgingPeriod,
   IAgingPeriodTotal,
-  IAgingAmount
+  IAgingAmount,
+  IAgingSummaryQuery,
+  IAgingSummaryTotal,
+  IAgingSummaryContact,
+  IAgingSummaryData,
 } from './AgingReport';
-import {
+import { INumberFormatQuery } from './FinancialStatements';
-  INumberFormatQuery
-} from './FinancialStatements';
 
-export interface IAPAgingSummaryQuery {
+export interface IAPAgingSummaryQuery extends IAgingSummaryQuery {
-  asDate: Date | string;
-  agingDaysBefore: number;
-  agingPeriods: number;
-  numberFormat: INumberFormatQuery;
   vendorsIds: number[];
-  noneZero: boolean;
-
-  branchesIds?: number[]
 }
 
-export interface IAPAgingSummaryVendor {
+export interface IAPAgingSummaryVendor extends IAgingSummaryContact {
-  vendorName: string,
+  vendorName: string;
-  current: IAgingAmount,
+}
-  aging: IAgingPeriodTotal[],
-  total: IAgingAmount,
-};
 
-export interface IAPAgingSummaryTotal {
+export interface IAPAgingSummaryTotal extends IAgingSummaryTotal {}
-  current: IAgingAmount,
-  aging: IAgingPeriodTotal[],
-  total: IAgingAmount,
-};
 
-export interface IAPAgingSummaryData {
+export interface IAPAgingSummaryData extends IAgingSummaryData {
-  vendors: IAPAgingSummaryVendor[],
+  vendors: IAPAgingSummaryVendor[];
-  total: IAPAgingSummaryTotal,
+}
-};
 
 export type IAPAgingSummaryColumns = IAgingPeriod[];
 
-
 export interface IARAgingSummaryMeta {
-  baseCurrency: string,
+  baseCurrency: string;
-  organizationName: string,
+  organizationName: string;
 }
 
-
 export interface IAPAgingSummaryMeta {
-  baseCurrency: string,
+  baseCurrency: string;
-  organizationName: string,
+  organizationName: string;
 }

packages/server/src/interfaces/ARAgingSummaryReport.ts

@@ -1,37 +1,28 @@
-import { IAgingPeriod, IAgingPeriodTotal, IAgingAmount } from './AgingReport';
+import {
-import { INumberFormatQuery } from './FinancialStatements';
+  IAgingPeriod,
+  IAgingSummaryQuery,
+  IAgingSummaryTotal,
+  IAgingSummaryContact,
+  IAgingSummaryData,
+} from './AgingReport';
 
-export interface IARAgingSummaryQuery {
+export interface IARAgingSummaryQuery extends IAgingSummaryQuery {
-  asDate: Date | string;
-  agingDaysBefore: number;
-  agingPeriods: number;
-  numberFormat: INumberFormatQuery;
   customersIds: number[];
-  branchesIds: number[];
-  noneZero: boolean;
 }
 
-export interface IARAgingSummaryCustomer {
+export interface IARAgingSummaryCustomer extends IAgingSummaryContact {
   customerName: string;
-  current: IAgingAmount;
-  aging: IAgingPeriodTotal[];
-  total: IAgingAmount;
 }
 
-export interface IARAgingSummaryTotal {
+export interface IARAgingSummaryTotal extends IAgingSummaryTotal {}
-  current: IAgingAmount;
-  aging: IAgingPeriodTotal[];
-  total: IAgingAmount;
-}
 
-export interface IARAgingSummaryData {
+export interface IARAgingSummaryData extends IAgingSummaryData {
   customers: IARAgingSummaryCustomer[];
-  total: IARAgingSummaryTotal;
 }
 
 export type IARAgingSummaryColumns = IAgingPeriod[];
 
 export interface IARAgingSummaryMeta {
-  organizationName: string,
+  organizationName: string;
-  baseCurrency: string,
+  baseCurrency: string;
 }

packages/server/src/interfaces/Account.ts

@@ -58,6 +58,7 @@ export interface IAccountTransaction {
   date: string | Date;
 
   referenceType: string;
+  referenceTypeFormatted: string;
   referenceId: number;
 
   referenceNumber?: string;
@@ -76,6 +77,9 @@ export interface IAccountTransaction {
   projectId?: number;
 
   account?: IAccount;
+
+  taxRateId?: number;
+  taxRate?: number;
 }
 export interface IAccountResponse extends IAccount {}
 
@@ -149,3 +153,11 @@ export enum AccountAction {
   VIEW = 'View',
   TransactionsLocking = 'TransactionsLocking',
 }
+
+
+export enum TaxRateAction {
+  CREATE = 'Create',
+  EDIT = 'Edit',
+  DELETE = 'Delete',
+  VIEW = 'View',
+}

packages/server/src/interfaces/AgingReport.ts

@@ -1,6 +1,9 @@
+
+import { INumberFormatQuery } from './FinancialStatements';
+
 export interface IAgingPeriodTotal extends IAgingPeriod {
   total: IAgingAmount;
-};
+}
 
 export interface IAgingAmount {
   amount: number;
@@ -20,3 +23,22 @@ export interface IAgingSummaryContact {
   aging: IAgingPeriodTotal[];
   total: IAgingAmount;
 }
+
+export interface IAgingSummaryQuery {
+  asDate: Date | string;
+  agingDaysBefore: number;
+  agingPeriods: number;
+  numberFormat: INumberFormatQuery;
+  branchesIds: number[];
+  noneZero: boolean;
+}
+
+export interface IAgingSummaryTotal {
+  current: IAgingAmount;
+  aging: IAgingPeriodTotal[];
+  total: IAgingAmount;
+}
+
+export interface IAgingSummaryData {
+  total: IAgingSummaryTotal;
+}

packages/server/src/interfaces/Bill.ts

@@ -99,7 +99,7 @@ export interface IBillCreatedPayload {
   trx: Knex.Transaction;
 }
 
-export interface IBillCreatingPayload{
+export interface IBillCreatingPayload {
   tenantId: number;
   billDTO: IBillDTO;
   trx: Knex.Transaction;
@@ -138,3 +138,16 @@ export enum BillAction {
   View = 'View',
   NotifyBySms = 'NotifyBySms',
 }
+
+export interface IBillOpeningPayload {
+  trx: Knex.Transaction;
+  tenantId: number;
+  oldBill: IBill;
+}
+
+export interface IBillOpenedPayload {
+  trx: Knex.Transaction;
+  bill: IBill;
+  oldBill: IBill;
+  tenantId: number;
+}

packages/server/src/interfaces/CashFlow.ts

@@ -41,7 +41,7 @@ export interface ICashFlowStatementAccountMeta {
   code: string;
   total: ICashFlowStatementTotal;
   accountType: string;
-  adjusmentType: string;
+  adjustmentType: string;
   sectionType: ICashFlowStatementSectionType.ACCOUNT;
 }
 

packages/server/src/interfaces/FinancialStatements.ts

@@ -37,6 +37,7 @@ export enum ReportsAction {
   READ_INVENTORY_ITEM_DETAILS = 'read-inventory-item-details',
   READ_CASHFLOW_ACCOUNT_TRANSACTION = 'read-cashflow-account-transactions',
   READ_PROJECT_PROFITABILITY_SUMMARY = 'read-project-profitability-summary',
+  READ_SALES_TAX_LIABILITY_SUMMARY = 'read-sales-tax-liability-summary',
 }
 
 export interface IFinancialSheetBranchesQuery {

packages/server/src/interfaces/ItemEntry.ts

@@ -18,6 +18,11 @@ export interface IItemEntry {
   rate: number;
   amount: number;
 
+  total: number;
+  amountInclusingTax: number;
+  amountExludingTax: number;
+  discountAmount: number;
+
   landedCost: number;
   allocatedCostAmount: number;
   unallocatedCostAmount: number;
@@ -32,6 +37,10 @@ export interface IItemEntry {
   projectRefType?: ProjectLinkRefType;
   projectRefInvoicedAmount?: number;
 
+  taxRateId: number | null;
+  taxRate: number;
+  taxAmount: number;
+
   item?: IItem;
 
   allocatedCostEntries?: IBillLandedCostEntry[];
@@ -46,6 +55,9 @@ export interface IItemEntryDTO {
   projectRefId?: number;
   projectRefType?: ProjectLinkRefType;
   projectRefInvoicedAmount?: number;
+
+  taxRateId?: number;
+  taxCode?: string;
 }
 
 export enum ProjectLinkRefType {

packages/server/src/interfaces/Ledger.ts

@@ -4,6 +4,8 @@ export interface ILedger {
 
   getEntries(): ILedgerEntry[];
 
+  filter(cb: (entry: ILedgerEntry) => boolean): ILedger;
+
   whereAccountId(accountId: number): ILedger;
   whereContactId(contactId: number): ILedger;
   whereFromDate(fromDate: Date | string): ILedger;
@@ -39,11 +41,16 @@ export interface ILedgerEntry {
   index: number;
   indexGroup?: number;
 
+  note?: string;
+
   userId?: number;
   itemId?: number;
   branchId?: number;
   projectId?: number;
 
+  taxRateId?: number;
+  taxRate?: number;
+
   entryId?: number;
   createdAt?: Date;
 

packages/server/src/interfaces/PaymentReceive.ts

@@ -1,6 +1,5 @@
-import { ISystemUser } from '@/interfaces';
 import { Knex } from 'knex';
-import { pick } from 'lodash';
+import { ISystemUser } from '@/interfaces';
 import { ILedgerEntry } from './Ledger';
 import { ISaleInvoice } from './SaleInvoice';
 

packages/server/src/interfaces/SaleEstimate.ts

@@ -1,5 +1,5 @@
 import { Knex } from 'knex';
-import { IItemEntry } from './ItemEntry';
+import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 import { IDynamicListFilterDTO } from '@/interfaces/DynamicFilter';
 
 export interface ISaleEstimate {
@@ -29,7 +29,7 @@ export interface ISaleEstimateDTO {
   estimateDate?: Date;
   reference?: string;
   estimateNumber?: string;
-  entries: IItemEntry[];
+  entries: IItemEntryDTO[];
   note: string;
   termsConditions: string;
   sendToEmail: string;

packages/server/src/interfaces/SaleInvoice.ts

@@ -1,11 +1,12 @@
 import { Knex } from 'knex';
-import { ISystemUser, IAccount } from '@/interfaces';
+import { ISystemUser, IAccount, ITaxTransaction } from '@/interfaces';
 import { IDynamicListFilter } from '@/interfaces/DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
 
 export interface ISaleInvoice {
   id: number;
-  balance: number;
+  amount: number;
+  amountLocal?: number;
   paymentAmount: number;
   currencyCode: string;
   exchangeRate?: number;
@@ -27,12 +28,21 @@ export interface ISaleInvoice {
   branchId?: number;
   projectId?: number;
 
-  localAmount?: number;
+  writtenoffAmount?: number;
-
+  writtenoffAmountLocal?: number;
-  localWrittenoffAmount?: number;
   writtenoffExpenseAccountId?: number;
-
   writtenoffExpenseAccount?: IAccount;
+
+  taxAmountWithheld: number;
+  taxAmountWithheldLocal: number;
+  taxes: ITaxTransaction[];
+
+  total: number;
+  totalLocal: number;
+
+  subtotal: number;
+  subtotalLocal: number;
+  subtotalExludingTax: number;
 }
 
 export interface ISaleInvoiceDTO {
@@ -44,12 +54,15 @@ export interface ISaleInvoiceDTO {
   exchangeRate?: number;
   invoiceMessage: string;
   termsConditions: string;
+  isTaxExclusive: boolean;
   entries: IItemEntryDTO[];
   delivered: boolean;
 
   warehouseId?: number | null;
   projectId?: number;
   branchId?: number | null;
+
+  isInclusiveTax?: boolean;
 }
 
 export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {
@@ -156,6 +169,7 @@ export interface ISaleInvoiceEventDeliveredPayload {
   tenantId: number;
   saleInvoiceId: number;
   saleInvoice: ISaleInvoice;
+  trx: Knex.Transaction;
 }
 
 export interface ISaleInvoiceDeliveringPayload {

packages/server/src/interfaces/SalesTaxLiabilitySummary.ts

@@ -0,0 +1,51 @@
+export interface SalesTaxLiabilitySummaryQuery {
+  fromDate: Date;
+  toDate: Date;
+  basis: 'cash' | 'accrual';
+}
+
+export interface SalesTaxLiabilitySummaryAmount {
+  amount: number;
+  formattedAmount: string;
+  currencyCode: string;
+}
+
+export interface SalesTaxLiabilitySummaryTotal {
+  taxableAmount: SalesTaxLiabilitySummaryAmount;
+  taxAmount: SalesTaxLiabilitySummaryAmount;
+  collectedTaxAmount: SalesTaxLiabilitySummaryAmount;
+}
+
+export interface SalesTaxLiabilitySummaryRate {
+  id: number;
+  taxName: string;
+  taxableAmount: SalesTaxLiabilitySummaryAmount;
+  taxAmount: SalesTaxLiabilitySummaryAmount;
+  taxPercentage: any;
+  collectedTaxAmount: SalesTaxLiabilitySummaryAmount;
+}
+
+export enum SalesTaxLiabilitySummaryTableRowType {
+  TaxRate = 'TaxRate',
+  Total = 'Total',
+}
+
+export interface SalesTaxLiabilitySummaryReportData {
+  taxRates: SalesTaxLiabilitySummaryRate[];
+  total: SalesTaxLiabilitySummaryTotal;
+}
+
+export type SalesTaxLiabilitySummaryPayableById = Record<
+  string,
+  { taxRateId: number; credit: number; debit: number }
+>;
+
+export type SalesTaxLiabilitySummarySalesById = Record<
+  string,
+  { taxRateId: number; credit: number; debit: number }
+>;
+
+export interface SalesTaxLiabilitySummaryMeta  {
+  organizationName: string;
+  baseCurrency: string;
+}

packages/server/src/interfaces/TaxRate.ts

@@ -0,0 +1,88 @@
+import { Knex } from 'knex';
+
+export interface ITaxRate {
+  id?: number;
+  name: string;
+  code: string;
+  rate: number;
+  description: string;
+  IsNonRecoverable: boolean;
+  IsCompound: boolean;
+  active: boolean;
+}
+
+export interface ICommonTaxRateDTO {
+  name: string;
+  code: string;
+  rate: number;
+  description: string;
+  IsNonRecoverable: boolean;
+  IsCompound: boolean;
+  active: boolean;
+}
+export interface ICreateTaxRateDTO extends ICommonTaxRateDTO {}
+export interface IEditTaxRateDTO extends ICommonTaxRateDTO {}
+
+export interface ITaxRateCreatingPayload {
+  createTaxRateDTO: ICreateTaxRateDTO;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+export interface ITaxRateCreatedPayload {
+  createTaxRateDTO: ICreateTaxRateDTO;
+  taxRate: ITaxRate;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+
+export interface ITaxRateEditingPayload {
+  editTaxRateDTO: IEditTaxRateDTO;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+export interface ITaxRateEditedPayload {
+  editTaxRateDTO: IEditTaxRateDTO;
+  oldTaxRate: ITaxRate;
+  taxRate: ITaxRate;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+
+export interface ITaxRateDeletingPayload {
+  oldTaxRate: ITaxRate;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+
+export interface ITaxRateActivatingPayload {
+  taxRateId: number;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+export interface ITaxRateActivatedPayload {
+  taxRateId: number;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+
+export interface ITaxRateDeletedPayload {
+  oldTaxRate: ITaxRate;
+  tenantId: number;
+  trx: Knex.Transaction;
+}
+
+export interface ITaxTransaction {
+  id?: number;
+  taxRateId: number;
+  referenceType: string;
+  referenceId: number;
+  rate: number;
+  taxAccountId: number;
+}
+
+export enum TaxRateAction {
+  CREATE = 'Create',
+  EDIT = 'Edit',
+  DELETE = 'Delete',
+  VIEW = 'View',
+}

packages/server/src/interfaces/index.ts

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

packages/server/src/jobs/ResetPasswordMail.ts

@@ -1,7 +1,7 @@
-import { Container, Inject } from 'typedi';
+import { Container } from 'typedi';
-import AuthenticationService from '@/services/Authentication/AuthApplication';
+import AuthenticationMailMesssages from '@/services/Authentication/AuthenticationMailMessages';
 
-export default class WelcomeEmailJob {
+export default class ResetPasswordEmailJob {
   /**
    * Constructor method.
    * @param {Agenda} agenda
@@ -10,7 +10,7 @@ export default class WelcomeEmailJob {
     agenda.define(
       'reset-password-mail',
       { priority: 'high' },
-      this.handler.bind(this),
+      this.handler.bind(this)
     );
   }
 
@@ -22,17 +22,13 @@ export default class WelcomeEmailJob {
   public async handler(job, done: Function): Promise<void> {
     const { data } = job.attrs;
     const { user, token } = data;
-    const Logger = Container.get('logger');
+    const authService = Container.get(AuthenticationMailMesssages);
-    const authService = Container.get(AuthenticationService);
-
-    Logger.info(`[send_reset_password] started.`, { data });
 
     try {
-      await authService.mailMessages.sendResetPasswordMessage(user, token);
+      await authService.sendResetPasswordMessage(user, token);
-      Logger.info(`[send_reset_password] finished.`, { data });
+      done();
-      done()
     } catch (error) {
-      Logger.error(`[send_reset_password] error.`, { data, error });
+      console.log(error);
       done(error);
     }
   }

packages/server/src/jobs/SmsNotification.ts

@@ -1,22 +0,0 @@
-import { Container } from 'typedi';
-
-export default class SmsNotification {
-  constructor(agenda) {
-    agenda.define('sms-notification', { priority: 'high' }, this.handler);
-  }
-
-  /**
-   *
-   * @param {Job}job
-   */
-  async handler(job) {
-    const { message, to } = job.attrs.data;
-    const smsClient = Container.get('SMSClient');
-
-    try {
-      await smsClient.sendMessage(to, message);
-    } catch (error) {
-      done(e);
-    }
-  }
-}

packages/server/src/jobs/WelcomeSMS.ts

@@ -1,35 +0,0 @@
-import { Container, Inject } from 'typedi';
-import AuthenticationService from '@/services/Authentication/AuthApplication';
-
-export default class WelcomeSMSJob {
-  /**
-   * Constructor method.
-   * @param {Agenda} agenda 
-   */
-  constructor(agenda) {
-    agenda.define('welcome-sms', { priority: 'high' }, this.handler);
-  }
-
-  /**
-   * Handle send welcome mail job.
-   * @param {Job} job 
-   * @param {Function} done 
-   */
-  public async handler(job, done: Function): Promise<void> {
-    const { tenant, user } = job.attrs.data;
-
-    const Logger = Container.get('logger');
-    const authService = Container.get(AuthenticationService);
-
-    Logger.info(`[welcome_sms] started: ${job.attrs.data}`);
-
-    try {
-      await authService.smsMessages.sendWelcomeMessage(tenant, user);
-      Logger.info(`[welcome_sms] finished`, { tenant, user });
-      done();
-    } catch (error) {
-      Logger.info(`[welcome_sms] error`, { error, tenant, user });
-      done(error);
-    }
-  }
-}

packages/server/src/jobs/WriteInvoicesJEntries.ts

@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
 import events from '@/subscribers/events';
-import SalesInvoicesCost from '@/services/Sales/SalesInvoicesCost';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { SaleInvoicesCost } from '@/services/Sales/Invoices/SalesInvoicesCost';
 
 export default class WriteInvoicesJournalEntries {
   eventPublisher: EventPublisher;
@@ -26,7 +26,7 @@ export default class WriteInvoicesJournalEntries {
    */
   public async handler(job, done: Function): Promise<void> {
     const { startingDate, tenantId } = job.attrs.data;
-    const salesInvoicesCost = Container.get(SalesInvoicesCost);
+    const salesInvoicesCost = Container.get(SaleInvoicesCost);
 
     try {
       await salesInvoicesCost.writeCostLotsGLEntries(tenantId, startingDate);

packages/server/src/jobs/welcomeEmail.ts

@@ -1,39 +0,0 @@
-import { Container } from 'typedi';
-import AuthenticationService from '@/services/Authentication/AuthApplication';
-
-export default class WelcomeEmailJob {
-  /**
-   * Constructor method.
-   * @param {Agenda} agenda - 
-   */
-  constructor(agenda) {
-    // Welcome mail and SMS message.
-    agenda.define(
-      'welcome-email',
-      { priority: 'high' },
-      this.handler.bind(this),
-    );
-  }
-
-  /**
-   * Handle send welcome mail job.
-   * @param {Job} job 
-   * @param {Function} done 
-   */
-  public async handler(job, done: Function): Promise<void> {
-    const { organizationId, user } = job.attrs.data;
-    const Logger: any = Container.get('logger');
-    const authService = Container.get(AuthenticationService);
-
-    Logger.info(`[welcome_mail] started: ${job.attrs.data}`);
-
-    try {
-      await authService.mailMessages.sendWelcomeMessage(user, organizationId);
-      Logger.info(`[welcome_mail] finished: ${job.attrs.data}`);
-      done();
-    } catch (error) {
-      Logger.error(`[welcome_mail] error: ${job.attrs.data}, error: ${error}`);
-      done(error);
-    }
-  }
-}

packages/server/src/lib/DynamicFilter/DynamicFilter.ts

@@ -1,8 +1,8 @@
 import { forEach, uniqBy } from 'lodash';
-import DynamicFilterAbstructor from './DynamicFilterAbstructor';
+import DynamicFilterAbstractor from './DynamicFilterAbstractor';
 import { IDynamicFilter, IFilterRole, IModel } from '@/interfaces';
 
-export default class DynamicFilter extends DynamicFilterAbstructor{
+export default class DynamicFilter extends DynamicFilterAbstractor{
   private model: IModel;
   private tableName: string;
   private dynamicFilters: IDynamicFilter[];

packages/server/src/lib/DynamicFilter/DynamicFilterAbstractor.ts

@@ -1,5 +1,5 @@
 
-export default class DynamicFilterAbstructor {
+export default class DynamicFilterAbstractor {
   /**
    * Extract relation table name from relation.
    * @param {String} column -

packages/server/src/lib/DynamicFilter/DynamicFilterFilterRoles.ts

@@ -1,7 +1,7 @@
-import DynamicFilterRoleAbstructor from './DynamicFilterRoleAbstructor';
+import DynamicFilterRoleAbstractor from './DynamicFilterRoleAbstractor';
 import { IFilterRole } from '@/interfaces';
 
-export default class FilterRoles extends DynamicFilterRoleAbstructor {
+export default class FilterRoles extends DynamicFilterRoleAbstractor {
   private filterRoles: IFilterRole[];
 
   /**

packages/server/src/lib/DynamicFilter/DynamicFilterRoleAbstractor.ts

@@ -6,7 +6,7 @@ import DynamicFilterQueryParser from './DynamicFilterQueryParser';
 import { Lexer } from '../LogicEvaluation/Lexer';
 import { COMPARATOR_TYPE, FIELD_TYPE } from './constants';
 
-export default abstract class DynamicFilterAbstructor
+export default abstract class DynamicFilterAbstractor
   implements IDynamicFilter
 {
   protected filterRoles: IFilterRole[] = [];

packages/server/src/lib/DynamicFilter/DynamicFilterSortBy.ts

@@ -1,4 +1,4 @@
-import DynamicFilterRoleAbstructor from '@/lib/DynamicFilter/DynamicFilterRoleAbstructor';
+import DynamicFilterRoleAbstractor from '@/lib/DynamicFilter/DynamicFilterRoleAbstractor';
 import { FIELD_TYPE } from './constants';
 
 interface ISortRole {
@@ -6,7 +6,7 @@ interface ISortRole {
   order: string;
 }
 
-export default class DynamicFilterSortBy extends DynamicFilterRoleAbstructor {
+export default class DynamicFilterSortBy extends DynamicFilterRoleAbstractor {
   private sortRole: ISortRole = {};
 
   /**

packages/server/src/lib/DynamicFilter/DynamicFilterViews.ts

@@ -1,8 +1,8 @@
 import { omit } from 'lodash';
 import { IView, IViewRole } from '@/interfaces';
-import DynamicFilterRoleAbstructor from './DynamicFilterRoleAbstructor';
+import DynamicFilterRoleAbstractor from './DynamicFilterRoleAbstractor';
 
-export default class DynamicFilterViews extends DynamicFilterRoleAbstructor {
+export default class DynamicFilterViews extends DynamicFilterRoleAbstractor {
   private viewSlug: string;
   private logicExpression: string;
   private filterRoles: IViewRole[];

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

@@ -1,8 +1,7 @@
 import moment from 'moment';
 import * as R from 'ramda';
 import { includes, isFunction, isObject, isUndefined, omit } from 'lodash';
-import { formatNumber } from 'utils';
+import { formatNumber, sortObjectKeysAlphabetically } from 'utils';
-import { isArrayLikeObject } from 'lodash/fp';
 
 export class Transformer {
   public context: any;
@@ -82,6 +81,7 @@ export class Transformer {
     const normlizedItem = this.normalizeModelItem(item);
 
     return R.compose(
+      sortObjectKeysAlphabetically,
       this.transform,
       R.when(this.hasExcludeAttributes, this.excludeAttributesTransformed),
       this.includeAttributesTransformed

packages/server/src/lib/ViewRolesBuilder/FilterRolesDynamicFilter.js

@@ -1,10 +1,10 @@
-import DynamicFilterRoleAbstructor from '@/lib/DynamicFilter/DynamicFilterRoleAbstructor';
+import DynamicFilterRoleAbstractor from '@/lib/DynamicFilter/DynamicFilterRoleAbstractor';
 import {
   validateViewRoles,
   buildFilterQuery,
 } from '@/lib/ViewRolesBuilder';
 
-export default class ViewRolesDynamicFilter extends DynamicFilterRoleAbstructor {
+export default class ViewRolesDynamicFilter extends DynamicFilterRoleAbstractor {
   /**
    * Constructor method.
    * @param {*} filterRoles -

packages/server/src/loaders/eventEmitter.ts

@@ -1,17 +1,16 @@
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 
-import ItemSubscriber from '@/subscribers/Items/ItemSubscriber';
 import InventoryAdjustmentsSubscriber from '@/subscribers/Inventory/InventoryAdjustment';
 import BillWriteInventoryTransactionsSubscriber from '@/subscribers/Bills/WriteInventoryTransactions';
 import PaymentSyncBillBalance from '@/subscribers/PaymentMades/PaymentSyncBillBalance';
 import SaleReceiptInventoryTransactionsSubscriber from '@/subscribers/SaleReceipt/WriteInventoryTransactions';
 import SaleInvoiceWriteInventoryTransactions from '@/subscribers/SaleInvoices/WriteInventoryTransactions';
 import SaleInvoiceWriteGLEntriesSubscriber from '@/subscribers/SaleInvoices/WriteJournalEntries';
+import SaleReceiptWriteGLEntriesSubscriber from '@/subscribers/SaleReceipt/WriteJournalEntries';
 import PaymentReceiveSyncInvoices from '@/subscribers/PaymentReceive/PaymentReceiveSyncInvoices';
 import CashflowTransactionSubscriber from '@/services/Cashflow/CashflowTransactionSubscriber';
 import PaymentReceivesWriteGLEntriesSubscriber from '@/subscribers/PaymentReceive/WriteGLEntries';
 import InventorySubscriber from '@/subscribers/Inventory/Inventory';
-import SaleReceiptWriteGLEntriesSubscriber from '@/subscribers/SaleReceipt/WriteJournalEntries';
 import { CustomerWriteGLOpeningBalanceSubscriber } from '@/services/Contacts/Customers/Subscribers/CustomerGLEntriesSubscriber';
 import { VendorsWriteGLOpeningSubscriber } from '@/services/Contacts/Vendors/Subscribers/VendorGLEntriesSubscriber';
 import SaleEstimateAutoSerialSubscriber from '@/subscribers/SaleEstimate/AutoIncrementSerial';
@@ -31,12 +30,11 @@ import OrgBuildSmsNotificationSubscriber from '@/subscribers/Organization/BuildS
 import PurgeUserAbilityCache from '@/services/Users/PurgeUserAbilityCache';
 import ResetLoginThrottleSubscriber from '@/subscribers/Authentication/ResetLoginThrottle';
 import AuthenticationSubscriber from '@/subscribers/Authentication/SendResetPasswordMail';
-import AuthSendWelcomeMailSubscriber from '@/subscribers/Authentication/SendWelcomeMail';
 import PurgeAuthorizedUserOnceRoleMutate from '@/services/Roles/PurgeAuthorizedUser';
 import SendSmsNotificationToCustomer from '@/subscribers/SaleInvoices/SendSmsNotificationToCustomer';
 import SendSmsNotificationSaleReceipt from '@/subscribers/SaleReceipt/SendSmsNotificationToCustomer';
 import SendSmsNotificationPaymentReceive from '@/subscribers/PaymentReceive/SendSmsNotificationToCustomer';
-import SaleInvoiceWriteoffSubscriber from '@/services/Sales/SaleInvoiceWriteoffSubscriber';
+import SaleInvoiceWriteoffSubscriber from '@/services/Sales/Invoices/SaleInvoiceWriteoffSubscriber';
 import LandedCostSyncCostTransactionsSubscriber from '@/services/Purchases/LandedCost/LandedCostSyncCostTransactionsSubscriber';
 import LandedCostInventoryTransactionsSubscriber from '@/services/Purchases/LandedCost/LandedCostInventoryTransactionsSubscriber';
 import CreditNoteGLEntriesSubscriber from '@/services/CreditNotes/CreditNoteGLEntriesSubscriber';
@@ -67,7 +65,6 @@ import { ActivateWarehousesSubscriber } from '@/services/Warehouses/ActivateWare
 import { ManualJournalWriteGLSubscriber } from '@/services/ManualJournals/ManualJournalGLEntriesSubscriber';
 import { BillGLEntriesSubscriber } from '@/services/Purchases/Bills/BillGLEntriesSubscriber';
 import { PaymentWriteGLEntriesSubscriber } from '@/services/Purchases/BillPayments/BillPaymentGLEntriesSubscriber';
-
 import BranchesIntegrationsSubscribers from '@/services/Branches/EventsProvider';
 import WarehousesIntegrationsSubscribers from '@/services/Warehouses/EventsProvider';
 import { WarehouseTransferAutoIncrementSubscriber } from '@/services/Warehouses/WarehousesTransfers/WarehouseTransferAutoIncrementSubscriber';
@@ -82,6 +79,8 @@ import { ProjectBillableTasksSubscriber } from '@/services/Projects/Projects/Pro
 import { ProjectBillableExpensesSubscriber } from '@/services/Projects/Projects/ProjectBillableExpenseSubscriber';
 import { ProjectBillableBillSubscriber } from '@/services/Projects/Projects/ProjectBillableBillSubscriber';
 import { SyncActualTimeTaskSubscriber } from '@/services/Projects/Times/SyncActualTimeTaskSubscriber';
+import { SaleInvoiceTaxRateValidateSubscriber } from '@/services/TaxRates/subscribers/SaleInvoiceTaxRateValidateSubscriber';
+import { WriteInvoiceTaxTransactionsSubscriber } from '@/services/TaxRates/subscribers/WriteInvoiceTaxTransactionsSubscriber';
 
 export default () => {
   return new EventPublisher();
@@ -89,7 +88,6 @@ export default () => {
 
 export const susbcribers = () => {
   return [
-    ItemSubscriber,
     InventoryAdjustmentsSubscriber,
     BillWriteInventoryTransactionsSubscriber,
     PaymentSyncBillBalance,
@@ -120,7 +118,6 @@ export const susbcribers = () => {
     PurgeUserAbilityCache,
     ResetLoginThrottleSubscriber,
     AuthenticationSubscriber,
-    AuthSendWelcomeMailSubscriber,
     PurgeAuthorizedUserOnceRoleMutate,
     SendSmsNotificationToCustomer,
     SendSmsNotificationSaleReceipt,
@@ -190,5 +187,9 @@ export const susbcribers = () => {
     ProjectBillableTasksSubscriber,
     ProjectBillableExpensesSubscriber,
     ProjectBillableBillSubscriber,
+
+    // Tax Rates
+    SaleInvoiceTaxRateValidateSubscriber,
+    WriteInvoiceTaxTransactionsSubscriber,
   ];
 };

packages/server/src/loaders/jobs.ts

@@ -1,24 +1,18 @@
 import Agenda from 'agenda';
-import WelcomeEmailJob from 'jobs/welcomeEmail';
-import WelcomeSMSJob from 'jobs/WelcomeSMS';
 import ResetPasswordMailJob from 'jobs/ResetPasswordMail';
 import ComputeItemCost from 'jobs/ComputeItemCost';
-import RewriteInvoicesJournalEntries from 'jobs/writeInvoicesJEntries';
+import RewriteInvoicesJournalEntries from 'jobs/WriteInvoicesJEntries';
 import UserInviteMailJob from 'jobs/UserInviteMail';
 import OrganizationSetupJob from 'jobs/OrganizationSetup';
 import OrganizationUpgrade from 'jobs/OrganizationUpgrade';
-import SmsNotification from 'jobs/SmsNotification';
 
 export default ({ agenda }: { agenda: Agenda }) => {
-  new WelcomeEmailJob(agenda);
   new ResetPasswordMailJob(agenda);
-  new WelcomeSMSJob(agenda);
   new UserInviteMailJob(agenda);
   new ComputeItemCost(agenda);
   new RewriteInvoicesJournalEntries(agenda);
   new OrganizationSetupJob(agenda);
   new OrganizationUpgrade(agenda);
-  new SmsNotification(agenda);
 
   agenda.start();
 };

packages/server/src/loaders/tenantModels.ts

@@ -58,6 +58,8 @@ import ItemWarehouseQuantity from 'models/ItemWarehouseQuantity';
 import Project from 'models/Project';
 import Time from 'models/Time';
 import Task from 'models/Task';
+import TaxRate from 'models/TaxRate';
+import TaxRateTransaction from 'models/TaxRateTransaction';
 
 export default (knex) => {
   const models = {
@@ -119,6 +121,8 @@ export default (knex) => {
     Project,
     Time,
     Task,
+    TaxRate,
+    TaxRateTransaction,
   };
   return mapValues(models, (model) => model.bindKnex(knex));
 };

packages/server/src/locales/ar.json

@@ -152,7 +152,7 @@
   "Opening Balance Liabilities": "رصيد الالتزامات الافتتاحي",
   "Loan": "اقراض",
   "Owner A Drawings": "مسحوبات المالك",
-  "An account that holds valuation of products or goods that availiable for sale.": "حساب يحمل قيم مخزون البضاعة أو السلع المتاحة للبيع.",
+  "An account that holds valuation of products or goods that available for sale.": "حساب يحمل قيم مخزون البضاعة أو السلع المتاحة للبيع.",
   "Tracks the gain and losses of the exchange differences.": "يسجل مكاسب وخسائر فروق الصرف.",
   "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.": "يتم تسجيل أي رسوم مصرفية يتم فرضها في حساب الرسوم والمصروفات البنكية. ومن الأمثلة على ذلك رسوم صيانة الحساب المصرفي ورسوم المعاملات ورسوم الدفع المتأخر.",
   "The income activities are not associated to the core business.": "لا ترتبط انشطة الدخل إلى الأعمال الأساسية.",

packages/server/src/locales/en.json

@@ -151,7 +151,7 @@
   "Opening Balance Liabilities": "Opening Balance Liabilities",
   "Loan": "Loan",
   "Owner A Drawings": "Owner A Drawings",
-  "An account that holds valuation of products or goods that availiable for sale.": "An account that holds valuation of products or goods that availiable for sale.",
+  "An account that holds valuation of products or goods that available for sale.": "An account that holds valuation of products or goods that available for sale.",
   "Tracks the gain and losses of the exchange differences.": "Tracks the gain and losses of the exchange differences.",
   "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.": "Any bank fees levied is recorded into the bank fees and charges account. A bank account maintenance fee, transaction charges, a late payment fee are some examples.",
   "The income activities are not associated to the core business.": "The income activities are not associated to the core business.",

packages/server/src/models/Account.ts

@@ -127,7 +127,7 @@ export default class Account extends mixin(TenantModel, [
       },
       filterAccountTypes(query, typesIds) {
         if (typesIds.length > 0) {
-          query.whereIn('account_types.accoun_type_id', typesIds);
+          query.whereIn('account_types.account_type_id', typesIds);
         }
       },
       viewRolesBuilder(query, conditionals, expression) {

packages/server/src/models/AccountTransaction.ts

@@ -2,8 +2,15 @@ import { Model, raw } from 'objection';
 import moment from 'moment';
 import { isEmpty, castArray } from 'lodash';
 import TenantModel from 'models/TenantModel';
+import { getTransactionTypeLabel } from '@/utils/transactions-types';
 
 export default class AccountTransaction extends TenantModel {
+  referenceType: string;
+  credit: number;
+  debit: number;
+  exchangeRate: number;
+  taxRate: number;
+
   /**
    * Table name
    */
@@ -22,7 +29,23 @@ export default class AccountTransaction extends TenantModel {
    * Virtual attributes.
    */
   static get virtualAttributes() {
-    return ['referenceTypeFormatted'];
+    return ['referenceTypeFormatted', 'creditLocal', 'debitLocal'];
+  }
+
+  /**
+   * Retrieves the credit amount in base currency.
+   * @return {number}
+   */
+  get creditLocal() {
+    return this.credit * this.exchangeRate;
+  }
+
+  /**
+   * Retrieves the debit amount in base currency.
+   * @return {number}
+   */
+  get debitLocal() {
+    return this.debit * this.exchangeRate;
   }
 
   /**
@@ -30,40 +53,7 @@ export default class AccountTransaction extends TenantModel {
    * @return {string}
    */
   get referenceTypeFormatted() {
-    return AccountTransaction.getReferenceTypeFormatted(this.referenceType);
+    return getTransactionTypeLabel(this.referenceType);
-  }
-
-  /**
-   * Reference type formatted.
-   */
-  static getReferenceTypeFormatted(referenceType) {
-    const mapped = {
-      SaleInvoice: 'Sale invoice',
-      SaleReceipt: 'Sale receipt',
-      PaymentReceive: 'Payment receive',
-      Bill: 'Bill',
-      BillPayment: 'Payment made',
-      VendorOpeningBalance: 'Vendor opening balance',
-      CustomerOpeningBalance: 'Customer opening balance',
-      InventoryAdjustment: 'Inventory adjustment',
-      ManualJournal: 'Manual journal',
-      Journal: 'Manual journal',
-      Expense: 'Expense',
-      OwnerContribution: 'Owner contribution',
-      TransferToAccount: 'Transfer to account',
-      TransferFromAccount: 'Transfer from account',
-      OtherIncome: 'Other income',
-      OtherExpense: 'Other expense',
-      OwnerDrawing: 'Owner drawing',
-      InvoiceWriteOff: 'Invoice write-off',
-
-      CreditNote: 'transaction_type.credit_note',
-      VendorCredit: 'transaction_type.vendor_credit',
-
-      RefundCreditNote: 'transaction_type.refund_credit_note',
-      RefundVendorCredit: 'transaction_type.refund_vendor_credit',
-    };
-    return mapped[referenceType] || '';
   }
 
   /**
@@ -89,15 +79,9 @@ export default class AccountTransaction extends TenantModel {
         }
       },
       filterDateRange(query, startDate, endDate, type = 'day') {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
+        const dateFormat = 'YYYY-MM-DD';
-        const fromDate = moment(startDate)
+        const fromDate = moment(startDate).startOf(type).format(dateFormat);
-          .utcOffset(0)
+        const toDate = moment(endDate).endOf(type).format(dateFormat);
-          .startOf(type)
-          .format(dateFormat);
-        const toDate = moment(endDate)
-          .utcOffset(0)
-          .endOf(type)
-          .format(dateFormat);
 
         if (startDate) {
           query.where('date', '>=', fromDate);
@@ -141,7 +125,6 @@ export default class AccountTransaction extends TenantModel {
         query.modify('filterDateRange', null, toDate);
         query.modify('sumationCreditDebit');
       },
-
       contactsOpeningBalance(
         query,
         openingDate,

packages/server/src/models/Bill.ts

@@ -5,7 +5,7 @@ import TenantModel from 'models/TenantModel';
 import BillSettings from './Bill.Settings';
 import ModelSetting from './ModelSetting';
 import CustomViewBaseModel from './CustomViewBaseModel';
-import { DEFAULT_VIEWS } from '@/services/Purchases/constants';
+import { DEFAULT_VIEWS } from '@/services/Purchases/Bills/constants';
 import ModelSearchable from './ModelSearchable';
 
 export default class Bill extends mixin(TenantModel, [

packages/server/src/models/Branch.ts

@@ -97,7 +97,7 @@ export default class Branch extends TenantModel {
       },
 
       /**
-       * Branch may belongs to assocaited bills.
+       * Branch may belongs to associated bills.
        */
       bills: {
         relation: Model.HasManyRelation,

packages/server/src/models/CashflowTransaction.ts

@@ -121,7 +121,7 @@ export default class CashflowTransaction extends TenantModel {
       },
 
       /**
-       * Cashflow transaction may has assocaited cashflow account.
+       * Cashflow transaction may has associated cashflow account.
        */
       cashflowAccount: {
         relation: Model.BelongsToOneRelation,

packages/server/src/models/InventoryCostLotTracker.ts

@@ -33,7 +33,7 @@ export default class InventoryCostLotTracker extends TenantModel {
         query.groupBy('item_id');
       },
       filterDateRange(query, startDate, endDate, type = 'day') {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
+        const dateFormat = 'YYYY-MM-DD';
         const fromDate = moment(startDate).startOf(type).format(dateFormat);
         const toDate = moment(endDate).endOf(type).format(dateFormat);
 

packages/server/src/models/InventoryTransaction.ts

@@ -1,9 +1,13 @@
 import { Model, raw } from 'objection';
-import { castArray, isEmpty } from 'lodash';
+import { castArray } from 'lodash';
 import moment from 'moment';
 import TenantModel from 'models/TenantModel';
+import { getTransactionTypeLabel } from '@/utils/transactions-types';
 
 export default class InventoryTransaction extends TenantModel {
+  transactionId: number;
+  transactionType: string;
+
   /**
    * Table name
    */
@@ -23,27 +27,7 @@ export default class InventoryTransaction extends TenantModel {
    * @return {string}
    */
   get transcationTypeFormatted() {
-    return InventoryTransaction.getReferenceTypeFormatted(this.transactionType);
+    return getTransactionTypeLabel(this.transactionType);
-  }
-
-  /**
-   * Reference type formatted.
-   */
-  static getReferenceTypeFormatted(referenceType) {
-    const mapped = {
-      SaleInvoice: 'Sale invoice',
-      SaleReceipt: 'Sale receipt',
-      PaymentReceive: 'Payment receive',
-      Bill: 'Bill',
-      BillPayment: 'Payment made',
-      VendorOpeningBalance: 'Vendor opening balance',
-      CustomerOpeningBalance: 'Customer opening balance',
-      InventoryAdjustment: 'Inventory adjustment',
-      ManualJournal: 'Manual journal',
-      Journal: 'Manual journal',
-      LandedCost: 'transaction_type.landed_cost',
-    };
-    return mapped[referenceType] || '';
   }
 
   /**
@@ -52,7 +36,7 @@ export default class InventoryTransaction extends TenantModel {
   static get modifiers() {
     return {
       filterDateRange(query, startDate, endDate, type = 'day') {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
+        const dateFormat = 'YYYY-MM-DD';
         const fromDate = moment(startDate).startOf(type).format(dateFormat);
         const toDate = moment(endDate).endOf(type).format(dateFormat);
 

packages/server/src/models/ItemEntry.ts

@@ -1,9 +1,17 @@
 import { Model } from 'objection';
 import TenantModel from 'models/TenantModel';
+import { getExlusiveTaxAmount, getInclusiveTaxAmount } from '@/utils/taxRate';
 
 export default class ItemEntry extends TenantModel {
+  public taxRate: number;
+  public discount: number;
+  public quantity: number;
+  public rate: number;
+  public isInclusiveTax: number;
+
   /**
    * Table name.
+   * @returns {string}
    */
   static get tableName() {
     return 'items_entries';
@@ -11,26 +19,89 @@ export default class ItemEntry extends TenantModel {
 
   /**
    * Timestamps columns.
+   * @returns {string[]}
    */
   get timestamps() {
     return ['created_at', 'updated_at'];
   }
 
+  /**
+   * Virtual attributes.
+   * @returns {string[]}
+   */
   static get virtualAttributes() {
-    return ['amount'];
+    return [
+      'amount',
+      'taxAmount',
+      'amountExludingTax',
+      'amountInclusingTax',
+      'total',
+    ];
   }
 
+  /**
+   * Item entry total.
+   * Amount of item entry includes tax and subtracted discount amount.
+   * @returns {number}
+   */
+  get total() {
+    return this.amountInclusingTax;
+  }
+
+  /**
+   * Item entry amount.
+   * Amount of item entry that may include or exclude tax.
+   * @returns {number}
+   */
   get amount() {
-    return ItemEntry.calcAmount(this);
+    return this.quantity * this.rate;
   }
 
-  static calcAmount(itemEntry) {
+  /**
-    const { discount, quantity, rate } = itemEntry;
+   * Item entry amount including tax.
-    const total = quantity * rate;
+   * @returns {number}
-
+   */
-    return discount ? total - total * discount * 0.01 : total;
+  get amountInclusingTax() {
+    return this.isInclusiveTax ? this.amount : this.amount + this.taxAmount;
   }
 
+  /**
+   * Item entry amount excluding tax.
+   * @returns {number}
+   */
+  get amountExludingTax() {
+    return this.isInclusiveTax ? this.amount - this.taxAmount : this.amount;
+  }
+
+  /**
+   * Discount amount.
+   * @returns {number}
+   */
+  get discountAmount() {
+    return this.amount * (this.discount / 100);
+  }
+
+  /**
+   * Tag rate fraction.
+   * @returns {number}
+   */
+  get tagRateFraction() {
+    return this.taxRate / 100;
+  }
+
+  /**
+   * Tax amount withheld.
+   * @returns {number}
+   */
+  get taxAmount() {
+    return this.isInclusiveTax
+      ? getInclusiveTaxAmount(this.amount, this.taxRate)
+      : getExlusiveTaxAmount(this.amount, this.taxRate);
+  }
+
+  /**
+   * Item entry relations.
+   */
   static get relationMappings() {
     const Item = require('models/Item');
     const BillLandedCostEntry = require('models/BillLandedCostEntry');
@@ -40,6 +111,7 @@ export default class ItemEntry extends TenantModel {
     const SaleEstimate = require('models/SaleEstimate');
     const ProjectTask = require('models/Task');
     const Expense = require('models/Expense');
+    const TaxRate = require('models/TaxRate');
 
     return {
       item: {
@@ -86,6 +158,9 @@ export default class ItemEntry extends TenantModel {
         },
       },
 
+      /**
+       * Sale receipt reference.
+       */
       receipt: {
         relation: Model.BelongsToOneRelation,
         modelClass: SaleReceipt.default,
@@ -96,7 +171,7 @@ export default class ItemEntry extends TenantModel {
       },
 
       /**
-       *
+       * Project task reference.
        */
       projectTaskRef: {
         relation: Model.HasManyRelation,
@@ -108,7 +183,7 @@ export default class ItemEntry extends TenantModel {
       },
 
       /**
-       *
+       * Project expense reference.
        */
       projectExpenseRef: {
         relation: Model.HasManyRelation,
@@ -120,7 +195,7 @@ export default class ItemEntry extends TenantModel {
       },
 
       /**
-       *
+       * Project bill reference.
        */
       projectBillRef: {
         relation: Model.HasManyRelation,
@@ -130,6 +205,18 @@ export default class ItemEntry extends TenantModel {
           to: 'bills.id',
         },
       },
+
+      /**
+       * Tax rate reference.
+       */
+      tax: {
+        relation: Model.HasOneRelation,
+        modelClass: TaxRate.default,
+        join: {
+          from: 'items_entries.taxRateId',
+          to: 'tax_rates.id',
+        },
+      },
     };
   }
 }

packages/server/src/models/SaleInvoice.ts

@@ -1,11 +1,11 @@
 import { mixin, Model, raw } from 'objection';
-import { castArray } from 'lodash';
+import { castArray, takeWhile } from 'lodash';
 import moment from 'moment';
 import TenantModel from 'models/TenantModel';
 import ModelSetting from './ModelSetting';
 import SaleInvoiceMeta from './SaleInvoice.Settings';
 import CustomViewBaseModel from './CustomViewBaseModel';
-import { DEFAULT_VIEWS } from '@/services/Sales/constants';
+import { DEFAULT_VIEWS } from '@/services/Sales/Invoices/constants';
 import ModelSearchable from './ModelSearchable';
 
 export default class SaleInvoice extends mixin(TenantModel, [
@@ -13,6 +13,17 @@ export default class SaleInvoice extends mixin(TenantModel, [
   CustomViewBaseModel,
   ModelSearchable,
 ]) {
+  public taxAmountWithheld: number;
+  public balance: number;
+  public paymentAmount: number;
+  public exchangeRate: number;
+  public writtenoffAmount: number;
+  public creditedAmount: number;
+  public isInclusiveTax: boolean;
+  public writtenoffAt: Date;
+  public dueDate: Date;
+  public deliveredAt: Date;
+
   /**
    * Table name
    */
@@ -27,6 +38,9 @@ export default class SaleInvoice extends mixin(TenantModel, [
     return ['created_at', 'updated_at'];
   }
 
+  /**
+   *
+   */
   get pluralName() {
     return 'asdfsdf';
   }
@@ -36,35 +50,97 @@ export default class SaleInvoice extends mixin(TenantModel, [
    */
   static get virtualAttributes() {
     return [
-      'localAmount',
-      'dueAmount',
-      'balanceAmount',
       'isDelivered',
       'isOverdue',
       'isPartiallyPaid',
       'isFullyPaid',
-      'isPaid',
       'isWrittenoff',
+      'isPaid',
+
+      'dueAmount',
+      'balanceAmount',
       'remainingDays',
       'overdueDays',
-      'filterByBranches',
+
+      'subtotal',
+      'subtotalLocal',
+      'subtotalExludingTax',
+
+      'taxAmountWithheldLocal',
+      'total',
+      'totalLocal',
+
+      'writtenoffAmountLocal',
     ];
   }
 
   /**
-   * Invoice amount in local currency.
+   * Invoice amount.
+   * @todo Sugger attribute to balance, we need to rename the balance to amount.
    * @returns {number}
    */
-  get localAmount() {
+  get amount() {
-    return this.balance * this.exchangeRate;
+    return this.balance;
   }
 
   /**
-   * Invoice local written-off amount.
+   * Invoice amount in base currency.
    * @returns {number}
    */
-  get localWrittenoffAmount() {
+  get amountLocal() {
-    return this.writtenoffAmount * this.exchangeRate;
+    return this.amount * this.exchangeRate;
+  }
+
+  /**
+   * Subtotal. (Tax inclusive) if the tax inclusive is enabled.
+   * @returns {number}
+   */
+  get subtotal() {
+    return this.amount;
+  }
+
+  /**
+   * Subtotal in base currency. (Tax inclusive) if the tax inclusive is enabled.
+   * @returns {number}
+   */
+  get subtotalLocal() {
+    return this.amountLocal;
+  }
+
+  /**
+   * Sale invoice amount excluding tax.
+   * @returns {number}
+   */
+  get subtotalExludingTax() {
+    return this.isInclusiveTax
+      ? this.subtotal - this.taxAmountWithheld
+      : this.subtotal;
+  }
+
+  /**
+   * Tax amount withheld in base currency.
+   * @returns {number}
+   */
+  get taxAmountWithheldLocal() {
+    return this.taxAmountWithheld * this.exchangeRate;
+  }
+
+  /**
+   * Invoice total. (Tax included)
+   * @returns {number}
+   */
+  get total() {
+    return this.isInclusiveTax
+      ? this.subtotal
+      : this.subtotal + this.taxAmountWithheld;
+  }
+
+  /**
+   * Invoice total in local currency. (Tax included)
+   * @returns {number}
+   */
+  get totalLocal() {
+    return this.total * this.exchangeRate;
   }
 
   /**
@@ -97,7 +173,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
    * @return {boolean}
    */
   get dueAmount() {
-    return Math.max(this.balance - this.balanceAmount, 0);
+    return Math.max(this.total - this.balanceAmount, 0);
   }
 
   /**
@@ -105,7 +181,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
    * @return {boolean}
    */
   get isPartiallyPaid() {
-    return this.dueAmount !== this.balance && this.dueAmount > 0;
+    return this.dueAmount !== this.total && this.dueAmount > 0;
   }
 
   /**
@@ -176,7 +252,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
        * Filters the invoices between the given date range.
        */
       filterDateRange(query, startDate, endDate, type = 'day') {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
+        const dateFormat = 'YYYY-MM-DD';
         const fromDate = moment(startDate).startOf(type).format(dateFormat);
         const toDate = moment(endDate).endOf(type).format(dateFormat);
 
@@ -333,6 +409,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
     const PaymentReceiveEntry = require('models/PaymentReceiveEntry');
     const Branch = require('models/Branch');
     const Account = require('models/Account');
+    const TaxRateTransaction = require('models/TaxRateTransaction');
 
     return {
       /**
@@ -382,7 +459,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
       },
 
       /**
-       *
+       * Invoice may has associated cost transactions.
        */
       costTransactions: {
         relation: Model.HasManyRelation,
@@ -397,7 +474,7 @@ export default class SaleInvoice extends mixin(TenantModel, [
       },
 
       /**
-       *
+       * Invoice may has associated payment entries.
        */
       paymentEntries: {
         relation: Model.HasManyRelation,
@@ -420,6 +497,9 @@ export default class SaleInvoice extends mixin(TenantModel, [
         },
       },
 
+      /**
+       * Invoice may has associated written-off expense account.
+       */
       writtenoffExpenseAccount: {
         relation: Model.BelongsToOneRelation,
         modelClass: Account.default,
@@ -428,6 +508,21 @@ export default class SaleInvoice extends mixin(TenantModel, [
           to: 'accounts.id',
         },
       },
+
+      /**
+       * Invoice may has associated tax rate transactions.
+       */
+      taxes: {
+        relation: Model.HasManyRelation,
+        modelClass: TaxRateTransaction.default,
+        join: {
+          from: 'sales_invoices.id',
+          to: 'tax_rate_transactions.referenceId',
+        },
+        filter(builder) {
+          builder.where('reference_type', 'SaleInvoice');
+        },
+      },
     };
   }
 

packages/server/src/models/TaxRate.ts

@@ -0,0 +1,48 @@
+import { mixin, Model, raw } from 'objection';
+import TenantModel from 'models/TenantModel';
+import ModelSearchable from './ModelSearchable';
+import SoftDeleteQueryBuilder from '@/collection/SoftDeleteQueryBuilder';
+
+export default class TaxRate extends mixin(TenantModel, [ModelSearchable]) {
+  /**
+   * Table name
+   */
+  static get tableName() {
+    return 'tax_rates';
+  }
+
+  /**
+   * Soft delete query builder.
+   */
+  static get QueryBuilder() {
+    return SoftDeleteQueryBuilder;
+  }
+
+  /**
+   * Timestamps columns.
+   */
+  get timestamps() {
+    return ['createdAt', 'updatedAt'];
+  }
+
+  /**
+   * Virtual attributes.
+   */
+  static get virtualAttributes() {
+    return [];
+  }
+
+  /**
+   * Model modifiers.
+   */
+  static get modifiers() {
+    return {};
+  }
+
+  /**
+   * Relationship mapping.
+   */
+  static get relationMappings() {
+    return {};
+  }
+}

packages/server/src/models/TaxRateTransaction.ts

@@ -0,0 +1,56 @@
+import { mixin, Model, raw } from 'objection';
+import TenantModel from 'models/TenantModel';
+import ModelSearchable from './ModelSearchable';
+
+export default class TaxRateTransaction extends mixin(TenantModel, [
+  ModelSearchable,
+]) {
+  /**
+   * Table name
+   */
+  static get tableName() {
+    return 'tax_rate_transactions';
+  }
+
+  /**
+   * Timestamps columns.
+   */
+  get timestamps() {
+    return [];
+  }
+
+  /**
+   * Virtual attributes.
+   */
+  static get virtualAttributes() {
+    return [];
+  }
+
+  /**
+   * Model modifiers.
+   */
+  static get modifiers() {
+    return {};
+  }
+
+  /**
+   * Relationship mapping.
+   */
+  static get relationMappings() {
+    const TaxRate = require('models/TaxRate');
+
+    return {
+      /**
+       * Belongs to the tax rate.
+       */
+      taxRate: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: TaxRate.default,
+        join: {
+          from: 'tax_rate_transactions.taxRateId',
+          to: 'tax_rates.id',
+        },
+      },
+    };
+  }
+}

packages/server/src/models/Warehouse.ts

@@ -84,7 +84,7 @@ export default class Warehouse extends TenantModel {
       },
 
       /**
-       * Warehouse may belongs to assocaited bills.
+       * Warehouse may belongs to associated bills.
        */
       bills: {
         relation: Model.HasManyRelation,

packages/server/src/repositories/AccountRepository.ts

@@ -2,6 +2,7 @@ import { Account } from 'models';
 import TenantRepository from '@/repositories/TenantRepository';
 import { IAccount } from '@/interfaces';
 import { Knex } from 'knex';
+import { TaxPayableAccount } from '@/database/seeds/data/accounts';
 
 export default class AccountRepository extends TenantRepository {
   /**
@@ -116,7 +117,7 @@ export default class AccountRepository extends TenantRepository {
     if (!result) {
       result = await this.model.query(trx).insertAndFetch({
         name: this.i18n.__('account.accounts_receivable.currency', {
-          currency: currencyCode
+          currency: currencyCode,
         }),
         accountType: 'accounts-receivable',
         currencyCode,
@@ -127,6 +128,29 @@ export default class AccountRepository extends TenantRepository {
     return result;
   };
 
+  /**
+   * Find or create tax payable account.
+   * @param {Record<string, string>}extraAttrs
+   * @param {Knex.Transaction} trx
+   * @returns
+   */
+  async findOrCreateTaxPayable(
+    extraAttrs: Record<string, string> = {},
+    trx?: Knex.Transaction
+  ) {
+    let result = await this.model
+      .query(trx)
+      .findOne({ slug: TaxPayableAccount.slug, ...extraAttrs });
+
+    if (!result) {
+      result = await this.model.query(trx).insertAndFetch({
+        ...TaxPayableAccount,
+        ...extraAttrs,
+      });
+    }
+    return result;
+  }
+
   findOrCreateAccountsPayable = async (
     currencyCode: string = '',
     extraAttrs = {},

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

@@ -1,6 +1,6 @@
 import { Service, Inject } from 'typedi';
 import events from '@/subscribers/events';
-import { InventoryTransactionsWarehouses } from './AcountsTransactionsWarehouses';
+import { InventoryTransactionsWarehouses } from './AccountsTransactionsWarehouses';
 import { IBranchesActivatedPayload } from '@/interfaces';
 
 @Service()

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

@@ -1,10 +1,6 @@
-import moment from 'moment';
+import { castArray } from 'lodash';
-import { castArray, sumBy, toArray } from 'lodash';
-import { IBill, ISystemUser, IAccount } from '@/interfaces';
 import JournalPoster from './JournalPoster';
-import JournalEntry from './JournalEntry';
+
-import { IExpense, IExpenseCategory } from '@/interfaces';
-import { increment } from 'utils';
 export default class JournalCommands {
   journal: JournalPoster;
   models: any;
@@ -16,7 +12,6 @@ export default class JournalCommands {
    */
   constructor(journal: JournalPoster) {
     this.journal = journal;
-
     this.repositories = this.journal.repositories;
     this.models = this.journal.models;
   }

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

@@ -79,7 +79,7 @@ export default class JournalPoster implements IJournalPoster {
   }
 
   /**
-   * Async initialize acccounts dependency graph.
+   * Async initialize accounts dependency graph.
    * @private
    * @returns {Promise<void>}
    */