fix(server): date format of filtering transactions by date range

fix: change the default from/date date value of reports

.all-contributorsrc

@@ -42,6 +42,24 @@
       "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,

.env.example

@@ -47,3 +47,6 @@ AGENDASH_AUTH_PASSWORD=123123
 SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=
 SIGNUP_ALLOWED_EMAILS=
+
+# API rate limit (points,duration,block duration).
+API_RATE_LIMIT=120,60,600

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+# [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
@@ -86,7 +97,7 @@ 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.
 

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

@@ -69,9 +69,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   <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="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="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>

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.', () => {});
+});

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/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 } =
-        await this.APAgingSummaryService.APAgingSummary(tenantId, filter);
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      return res.status(200).send({
-        data: this.transfromToResponse(data),
-        columns: this.transfromToResponse(columns),
-        query: this.transfromToResponse(query),
-        meta: this.transfromToResponse(meta),
-      });
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.APAgingSummaryService.APAgingSummaryTable(
+            tenantId,
+            filter
+          );
+          return res.status(200).send({
+            table: {
+              rows: table.rows,
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.APAgingSummaryService.APAgingSummary(tenantId, filter);
+
+          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_periods').optional().isInt({ max: 12 }).toInt(),
+      query('aging_days_before').default(30).isInt({ max: 500 }).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 } =
-        await this.ARAgingSummaryService.ARAgingSummary(tenantId, filter);
+      const accept = this.accepts(req);
+      const acceptType = accept.types(['json', 'application/json+table']);
 
-      return res.status(200).send({
-        data: this.transfromToResponse(data),
-        columns: this.transfromToResponse(columns),
-        query: this.transfromToResponse(query),
-        meta: this.transfromToResponse(meta),
-      });
+      switch (acceptType) {
+        case 'application/json+table':
+          const table = await this.ARAgingSummaryService.ARAgingSummaryTable(
+            tenantId,
+            filter
+          );
+          return res.status(200).send({
+            table: {
+              rows: table.rows,
+              columns: table.columns,
+            },
+            meta: table.meta,
+            query: table.query,
+          });
+          break;
+        default:
+          const { data, columns, query, meta } =
+            await this.ARAgingSummaryService.ARAgingSummary(tenantId, filter);
+
+          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/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 { AbilitySubject, BillAction, IBillDTO, IBillEditDTO } from '@/interfaces';
+import {
+  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 PaymentReceiveNotifyBySms from '@/services/Sales/PaymentReceives/PaymentReceiveSmsNotify';
+import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
 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;
-
-  @Inject()
-  paymentReceiveSmsNotify: PaymentReceiveNotifyBySms;
-
-  @Inject()
-  paymentReceivePdf: GetPaymentReceivePdf;
+  private dynamicListService: DynamicListingService;
 
   /**
    * 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(
-        tenantId,
-        paymentReceiveId
-      );
+      const paymentReceive =
+        await this.paymentReceiveApplication.getPaymentReceive(
+          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(
-            tenantId,
-            paymentReceive
-          );
+          const pdfContent =
+            await this.paymentReceiveApplication.getPaymentReceivePdf(
+              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(
-        tenantId,
-        paymentReceiveId
-      );
+      const paymentReceive =
+        await this.paymentReceiveApplication.notifyPaymentBySms(
+          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(
-        tenantId,
-        paymentReceiveId
-      );
+      const smsDetails =
+        await this.paymentReceiveApplication.getPaymentSmsDetails(
+          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;
-
-  @Inject()
-  saleEstimatesPdf: SaleEstimatesPdfService;
-
-  @Inject()
-  saleEstimateNotifySms: SaleEstimateNotifyBySms;
+  private dynamicListService: DynamicListingService;
 
   /**
    * 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(
-        tenantId,
-        estimateDTO
-      );
+      const storedEstimate =
+        await this.saleEstimatesApplication.createSaleEstimate(
+          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(
-            tenantId,
-            estimate
-          );
+          const pdfContent =
+            await this.saleEstimatesApplication.getSaleEstimatePdf(
+              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(
-        tenantId,
-        estimateId
-      );
+      const saleEstimate =
+        await this.saleEstimatesApplication.notifySaleEstimateBySms(
+          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(
-        tenantId,
-        estimateId
-      );
+      const estimateSmsDetails =
+        await this.saleEstimatesApplication.getSaleEstimateSmsDetails(
+          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;
-
-  @Inject()
-  saleInvoicePdf: SaleInvoicePdf;
-
-  @Inject()
-  saleInvoiceWriteoff: SaleInvoiceWriteoff;
-
-  @Inject()
-  saleInvoiceSmsNotify: SaleInvoiceNotifyBySms;
-
-  @Inject()
-  invoicePaymentsSerivce: InvoicePaymentsService;
+  private dynamicListService: DynamicListingService;
 
   /**
    * 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(),
@@ -227,14 +211,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 +233,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 +243,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(
-        tenantId,
-        saleInvoiceDTO,
-        user
-      );
+      const storedSaleInvoice =
+        await this.saleInvoiceApplication.createSaleInvoice(
+          tenantId,
+          saleInvoiceDTO,
+          user
+        );
       return res.status(200).send({
         id: storedSaleInvoice.id,
         message: 'The sale invoice has been created successfully.',
@@ -285,14 +274,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 +306,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 +335,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 +365,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 +389,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 +425,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 +453,11 @@ export default class SaleInvoicesController extends BaseController {
     const { customerId } = this.matchedQueryData(req);
 
     try {
-      const salesInvoices = await this.saleInvoiceService.getPayableInvoices(
-        tenantId,
-        customerId
-      );
+      const salesInvoices =
+        await this.saleInvoiceApplication.getReceivableSaleInvoices(
+          tenantId,
+          customerId
+        );
       return res.status(200).send({
         sales_invoices: this.transfromToResponse(salesInvoices),
       });
@@ -477,7 +483,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 +491,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 +513,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 +544,12 @@ export default class SaleInvoicesController extends BaseController {
     const invoiceNotifySmsDTO = this.matchedBodyData(req);
 
     try {
-      const saleInvoice = await this.saleInvoiceSmsNotify.notifyBySms(
-        tenantId,
-        invoiceId,
-        invoiceNotifySmsDTO.notificationKey
-      );
+      const saleInvoice =
+        await this.saleInvoiceApplication.notifySaleInvoiceBySms(
+          tenantId,
+          invoiceId,
+          invoiceNotifySmsDTO.notificationKey
+        );
       return res.status(200).send({
         id: saleInvoice.id,
         message:
@@ -569,11 +576,12 @@ export default class SaleInvoicesController extends BaseController {
     const smsDetailsDTO = this.matchedQueryData(req);
 
     try {
-      const invoiceSmsDetails = await this.saleInvoiceSmsNotify.smsDetails(
-        tenantId,
-        invoiceId,
-        smsDetailsDTO
-      );
+      const invoiceSmsDetails =
+        await this.saleInvoiceApplication.getSaleInvoiceSmsDetails(
+          tenantId,
+          invoiceId,
+          smsDetailsDTO
+        );
       return res.status(200).send({
         data: invoiceSmsDetails,
       });
@@ -599,7 +607,7 @@ export default class SaleInvoicesController extends BaseController {
 
     try {
       const invoicePayments =
-        await this.invoicePaymentsSerivce.getInvoicePayments(
+        await this.saleInvoiceApplication.getInvoicePayments(
           tenantId,
           invoiceId
         );

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;
-
-  @Inject()
-  dynamicListService: DynamicListingService;
-
-  @Inject()
-  saleReceiptSmsNotify: SaleReceiptNotifyBySms;
+  private dynamicListService: DynamicListingService;
 
   /**
    * 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(
-        tenantId,
-        saleReceiptDTO
-      );
+      const storedSaleReceipt =
+        await this.saleReceiptsApplication.createSaleReceipt(
+          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(
-            tenantId,
-            saleReceipt
-          );
+          const pdfContent =
+            await this.saleReceiptsApplication.getSaleReceiptPdf(
+              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(
-        tenantId,
-        receiptId
-      );
+      const saleReceipt =
+        await this.saleReceiptsApplication.saleReceiptNotifyBySms(
+          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(
-        tenantId,
-        receiptId
-      );
+      const smsDetails =
+        await this.saleReceiptsApplication.getSaleReceiptSmsDetails(
+          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/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
@@ -97,7 +100,7 @@ module.exports = {
   jwtSecret: process.env.JWT_SECRET,
 
   /**
-   * 
+   *
    */
   resetPasswordSeconds: 600,
 
@@ -130,9 +133,9 @@ module.exports = {
       blockDuration: 60 * 15,
     },
     requests: {
-      points: 60,
-      duration: 60,
-      blockDuration: 60 * 10,
+      points: API_RATE_LIMIT[0] ? toInteger(API_RATE_LIMIT[0]) : 120,
+      duration: API_RATE_LIMIT[1] ? toInteger(API_RATE_LIMIT[1]) : 60,
+      blockDuration: API_RATE_LIMIT[2] ? toInteger(API_RATE_LIMIT[2]) : 60 * 10,
     },
   },
 

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

@@ -81,7 +81,7 @@ 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

packages/server/src/interfaces/APAgingSummaryReport.ts

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

packages/server/src/interfaces/ARAgingSummaryReport.ts

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

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

@@ -1,7 +1,7 @@
 import { Knex } from 'knex';
 import { IDynamicListFilterDTO } from './DynamicFilter';
 import { IItemEntry, IItemEntryDTO } from './ItemEntry';
-import { IBillLandedCost } from './LandedCost'; 
+import { IBillLandedCost } from './LandedCost';
 export interface IBillDTO {
   vendorId: number;
   billNumber: string;
@@ -99,17 +99,17 @@ export interface IBillCreatedPayload {
   trx: Knex.Transaction;
 }
 
-export interface IBillCreatingPayload{
+export interface IBillCreatingPayload {
   tenantId: number;
   billDTO: IBillDTO;
-  trx: Knex.Transaction; 
+  trx: Knex.Transaction;
 }
 
 export interface IBillEditingPayload {
   tenantId: number;
   oldBill: IBill;
   billDTO: IBillEditDTO;
-  trx: Knex.Transaction; 
+  trx: Knex.Transaction;
 }
 export interface IBillEditedPayload {
   tenantId: number;
@@ -129,7 +129,7 @@ export interface IBIllEventDeletedPayload {
 export interface IBillEventDeletingPayload {
   tenantId: number;
   oldBill: IBill;
-  trx: Knex.Transaction; 
+  trx: Knex.Transaction;
 }
 export enum BillAction {
   Create = 'Create',
@@ -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/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/SaleInvoice.ts

@@ -156,6 +156,7 @@ export interface ISaleInvoiceEventDeliveredPayload {
   tenantId: number;
   saleInvoiceId: number;
   saleInvoice: ISaleInvoice;
+  trx: Knex.Transaction;
 }
 
 export interface ISaleInvoiceDeliveringPayload {

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/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/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';
@@ -35,7 +34,7 @@ import PurgeAuthorizedUserOnceRoleMutate from '@/services/Roles/PurgeAuthorizedU
 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';
@@ -66,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';
@@ -88,7 +86,6 @@ export default () => {
 
 export const susbcribers = () => {
   return [
-    ItemSubscriber,
     InventoryAdjustmentsSubscriber,
     BillWriteInventoryTransactionsSubscriber,
     PaymentSyncBillBalance,

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,11 @@ 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;
+
   /**
    * Table name
    */
@@ -30,40 +33,7 @@ export default class AccountTransaction extends TenantModel {
    * @return {string}
    */
   get referenceTypeFormatted() {
-    return AccountTransaction.getReferenceTypeFormatted(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] || '';
+    return getTransactionTypeLabel(this.referenceType);
   }
 
   /**
@@ -89,15 +59,9 @@ export default class AccountTransaction extends TenantModel {
         }
       },
       filterDateRange(query, startDate, endDate, type = 'day') {
-        const dateFormat = 'YYYY-MM-DD HH:mm:ss';
-        const fromDate = moment(startDate)
-          .utcOffset(0)
-          .startOf(type)
-          .format(dateFormat);
-        const toDate = moment(endDate)
-          .utcOffset(0)
-          .endOf(type)
-          .format(dateFormat);
+        const dateFormat = 'YYYY-MM-DD';
+        const fromDate = moment(startDate).startOf(type).format(dateFormat);
+        const toDate = moment(endDate).endOf(type).format(dateFormat);
 
         if (startDate) {
           query.where('date', '>=', fromDate);
@@ -141,7 +105,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);
-  }
-
-  /**
-   * 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] || '';
+    return getTransactionTypeLabel(this.transactionType);
   }
 
   /**
@@ -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/SaleInvoice.ts

@@ -5,7 +5,7 @@ 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, [
@@ -176,7 +176,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);
 

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/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/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>}
    */

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

@@ -66,14 +66,14 @@ export class LedgerContactsBalanceStorage {
   ): Promise<(entry: ILedgerEntry) => boolean> => {
     const { Account } = this.tenancy.models(tenantId);
 
-    const ARAPAcounts = await Account.query(trx).whereIn('accountType', [
+    const ARAPAccounts = await Account.query(trx).whereIn('accountType', [
       ACCOUNT_TYPE.ACCOUNTS_RECEIVABLE,
       ACCOUNT_TYPE.ACCOUNTS_PAYABLE,
     ]);
-    const ARAPAcountsIds = ARAPAcounts.map((a) => a.id);
+    const ARAPAccountsIds = ARAPAccounts.map((a) => a.id);
 
     return (entry: ILedgerEntry) => {
-      return ARAPAcountsIds.indexOf(entry.accountId) !== -1;
+      return ARAPAccountsIds.indexOf(entry.accountId) !== -1;
     };
   };
 

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

@@ -35,7 +35,7 @@ export default class LedgerStorageService {
       // Saves the ledger entries.
       this.ledgerEntriesService.saveEntries(tenantId, ledger, trx),
 
-      // Mutates the assocaited accounts balances.
+      // Mutates the associated accounts balances.
       this.ledgerAccountsBalance.saveAccountsBalance(tenantId, ledger, trx),
 
       // Mutates the associated contacts balances.
@@ -60,7 +60,7 @@ export default class LedgerStorageService {
       // Deletes the ledger entries.
       this.ledgerEntriesService.deleteEntries(tenantId, ledger, trx),
 
-      // Mutates the assocaited accounts balances.
+      // Mutates the associated accounts balances.
       this.ledgerAccountsBalance.saveAccountsBalance(tenantId, ledger, trx),
 
       // Mutates the associated contacts balances.

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

@@ -108,7 +108,7 @@ export class LedegrAccountsStorage {
     const { Account } = this.tenancy.models(tenantId);
     const account = await Account.query(trx).findById(accountId);
 
-    // Filters the ledger entries by the current acount.
+    // Filters the ledger entries by the current account.
     const accountLedger = ledger.whereAccountId(accountId);
 
     // Retrieves the given tenant metadata.

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

@@ -46,7 +46,7 @@ export default class AccountTransactionTransformer extends Transformer {
    * @returns {string}
    */
   public transactionTypeFormatted(transaction: IAccountTransaction) {
-    return transaction.referenceTypeFormatted;
+    return this.context.i18n.__(transaction.referenceTypeFormatted);
   }
 
   /**

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

@@ -77,7 +77,7 @@ export class DeleteAccount {
     // Authorize before delete account.
     await this.authorize(tenantId, accountId, oldAccount);
 
-    // Deletes the account and assocaited transactions under UOW envirement.
+    // Deletes the account and associated transactions under UOW envirement.
     return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
       // Triggers `onAccountDelete` event.
       await this.eventPublisher.emitAsync(events.accounts.onDelete, {

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

@@ -23,15 +23,6 @@ export class GetAccounts {
   @Inject()
   private transformer: TransformerInjectable;
 
-  /**
-   * Parsees accounts list filter DTO.
-   * @param filterDTO
-   * @returns
-   */
-  private parseListFilterDTO(filterDTO) {
-    return R.compose(this.dynamicListService.parseStringifiedFilter)(filterDTO);
-  }
-
   /**
    * Retrieve accounts datatable list.
    * @param {number} tenantId
@@ -75,4 +66,13 @@ export class GetAccounts {
       filterMeta: dynamicList.getResponseMeta(),
     };
   };
+
+  /**
+   * Parsees accounts list filter DTO.
+   * @param filterDTO
+   * @returns
+   */
+  private parseListFilterDTO(filterDTO) {
+    return R.compose(this.dynamicListService.parseStringifiedFilter)(filterDTO);
+  }
 }

packages/server/src/services/AccountsReceivable/AccountsReceivableRepository.ts

@@ -1,9 +0,0 @@
-
-
-export class AccountsReceivableRepository {
-
-
-  findOrCreateAccount = (currencyCode?: string) => {
-    
-  };
-}

packages/server/src/services/Branches/DeleteBranch.ts

@@ -8,6 +8,7 @@ import { IBranchDeletedPayload, IBranchDeletePayload } from '@/interfaces';
 import { CURDBranch } from './CRUDBranch';
 import { BranchValidator } from './BranchValidate';
 import { ERRORS } from './constants';
+
 @Service()
 export class DeleteBranch extends CURDBranch {
   @Inject()

packages/server/src/services/Branches/Integrations/ValidateBranchExistance.ts

@@ -14,8 +14,8 @@ export class ValidateBranchExistance {
 
   /**
    * Validate transaction branch id when the feature is active.
-   * @param   {number} tenantId 
-   * @param   {number} branchId 
+   * @param   {number} tenantId
+   * @param   {number} branchId
    * @returns {Promise<void>}
    */
   public validateTransactionBranchWhenActive = async (
@@ -32,18 +32,16 @@ export class ValidateBranchExistance {
 
   /**
    * Validate transaction branch id existance.
-   * @param  {number} tenantId 
-   * @param  {number} branchId 
+   * @param  {number} tenantId
+   * @param  {number} branchId
    * @return {Promise<void>}
    */
   public validateTransactionBranch = async (
     tenantId: number,
     branchId: number | null
   ) => {
-    //
     this.validateBranchIdExistance(branchId);
 
-    //
     await this.validateBranchExistance(tenantId, branchId);
   };
 
@@ -62,7 +60,10 @@ export class ValidateBranchExistance {
    * @param tenantId
    * @param branchId
    */
-  public validateBranchExistance = async (tenantId: number, branchId: number) => {
+  public validateBranchExistance = async (
+    tenantId: number,
+    branchId: number
+  ) => {
     const { Branch } = this.tenancy.models(tenantId);
 
     const branch = await Branch.query().findById(branchId);

packages/server/src/services/Branches/Subscribers/Activate/index.ts

@@ -1,4 +1,4 @@
-export * from './CashflowBranchesActviateSubscriber';
+export * from './CashflowBranchesActivateSubscriber';
 export * from './CreditNoteBranchesActivateSubscriber';
 export * from './PaymentMadeBranchesActivateSubscriber';
 export * from './PaymentReceiveBranchesActivateSubscriber';

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

@@ -1,17 +1,12 @@
-import { Service, Inject } from 'typedi';
-import { includes, difference, camelCase, upperFirst } from 'lodash';
-import { ACCOUNT_TYPE } from '@/data/AccountTypes';
-import { IAccount, ICashflowTransactionLine } from '@/interfaces';
+import { Service } from 'typedi';
+import { includes, camelCase, upperFirst } from 'lodash';
+import { IAccount } from '@/interfaces';
 import { getCashflowTransactionType } from './utils';
 import { ServiceError } from '@/exceptions';
 import { CASHFLOW_TRANSACTION_TYPE, ERRORS } from './constants';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 
 @Service()
 export class CommandCashflowValidator {
-  @Inject()
-  private tenancy: HasTenancyService;
-
   /**
    * Validates the lines accounts type should be cash or bank account.
    * @param {IAccount} accounts -

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

@@ -1,14 +0,0 @@
-import { difference, includes } from 'lodash';
-import { ICashflowTransactionLine } from '@/interfaces';
-import { ServiceError } from '@/exceptions';
-import { Inject, Service } from 'typedi';
-import { CASHFLOW_TRANSACTION_TYPE, ERRORS } from './constants';
-import { IAccount } from '@/interfaces';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
-
-@Service()
-export default class CommandCashflowTransaction {
-  @Inject()
-  private tenancy: HasTenancyService;
-
-}

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

@@ -6,7 +6,7 @@ import {
 } from './constants';
 
 /**
- * Ensures the given transaction type to transformed to properiate format.
+ * Ensures the given transaction type to transformed to appropriate format.
  * @param {string} type 
  * @returns {string}
  */

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

@@ -16,16 +16,16 @@ import BaseCreditNotes from './CreditNotes';
 @Service()
 export default class CreateCreditNote extends BaseCreditNotes {
   @Inject()
-  uow: UnitOfWork;
+  private uow: UnitOfWork;
 
   @Inject()
-  itemsEntriesService: ItemsEntriesService;
+  private itemsEntriesService: ItemsEntriesService;
 
   @Inject()
-  tenancy: HasTenancyService;
+  private tenancy: HasTenancyService;
 
   @Inject()
-  eventPublisher: EventPublisher;
+  private eventPublisher: EventPublisher;
 
   /**
    * Creates a new credit note.

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

@@ -1,5 +1,4 @@
 import { Service, Inject } from 'typedi';
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 import events from '@/subscribers/events';
 import {
   IApplyCreditToInvoicesCreatedPayload,
@@ -10,15 +9,12 @@ import CreditNoteApplySyncInvoicesCreditedAmount from './CreditNoteApplySyncInvo
 @Service()
 export default class CreditNoteApplySyncInvoicesCreditedAmountSubscriber {
   @Inject()
-  tenancy: HasTenancyService;
-
-  @Inject()
-  syncInvoicesWithCreditNote: CreditNoteApplySyncInvoicesCreditedAmount;
+  private syncInvoicesWithCreditNote: CreditNoteApplySyncInvoicesCreditedAmount;
 
   /**
    * Attaches events with handlers.
    */
-  attach(bus) {
+  public attach(bus) {
     bus.subscribe(
       events.creditNote.onApplyToInvoicesCreated,
       this.incrementAppliedInvoicesOnceCreditCreated

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

@@ -1,5 +1,5 @@
 import { Service, Inject } from 'typedi';
-import Knex from 'knex';
+import { Knex } from 'knex';
 import { sumBy } from 'lodash';
 import {
   ICreditNote,
@@ -8,27 +8,31 @@ import {
   ISaleInvoice,
 } from '@/interfaces';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import PaymentReceiveService from '@/services/Sales/PaymentReceives/PaymentsReceives';
 import UnitOfWork from '@/services/UnitOfWork';
-import events from '@/subscribers/events';
+import { PaymentReceiveValidators } from '../Sales/PaymentReceives/PaymentReceiveValidators';
 import BaseCreditNotes from './CreditNotes';
 import {
   IApplyCreditToInvoicesDTO,
   IApplyCreditToInvoicesCreatedPayload,
 } from '@/interfaces';
 import { ServiceError } from '@/exceptions';
+import events from '@/subscribers/events';
 import { ERRORS } from './constants';
+import HasTenancyService from '../Tenancy/TenancyService';
 
 @Service()
 export default class CreditNoteApplyToInvoices extends BaseCreditNotes {
-  @Inject('PaymentReceives')
-  paymentReceive: PaymentReceiveService;
+  @Inject()
+  private tenancy: HasTenancyService;
 
   @Inject()
-  uow: UnitOfWork;
+  private paymentReceiveValidators: PaymentReceiveValidators;
 
   @Inject()
-  eventPublisher: EventPublisher;
+  private uow: UnitOfWork;
+
+  @Inject()
+  private eventPublisher: EventPublisher;
 
   /**
    * Apply credit note to the given invoices.
@@ -50,7 +54,7 @@ export default class CreditNoteApplyToInvoices extends BaseCreditNotes {
     );
     // Retrieve the applied invoices that associated to the credit note customer.
     const appliedInvoicesEntries =
-      await this.paymentReceive.validateInvoicesIDsExistance(
+      await this.paymentReceiveValidators.validateInvoicesIDsExistance(
         tenantId,
         creditNote.customerId,
         applyCreditToInvoicesDTO.entries

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

@@ -15,7 +15,7 @@ export default class CreditNoteInventoryTransactionsSubscriber {
   /**
    * Attaches events with publisher.
    */
-  attach(bus) {
+  public attach(bus) {
     bus.subscribe(
       events.creditNote.onCreated,
       this.writeInventoryTranscationsOnceCreated
@@ -37,6 +37,7 @@ export default class CreditNoteInventoryTransactionsSubscriber {
   /**
    * Writes inventory transactions once credit note created.
    * @param {ICreditNoteCreatedPayload} payload -
+   * @returns {Promise<void>}
    */
   public writeInventoryTranscationsOnceCreated = async ({
     tenantId,
@@ -44,9 +45,8 @@ export default class CreditNoteInventoryTransactionsSubscriber {
     trx,
   }: ICreditNoteCreatedPayload) => {
     // Can't continue if the credit note is open yet.
-    if (!creditNote.isOpen) {
-      return;
-    }
+    if (!creditNote.isOpen) return;
+
     await this.inventoryTransactions.createInventoryTransactions(
       tenantId,
       creditNote,
@@ -57,6 +57,7 @@ export default class CreditNoteInventoryTransactionsSubscriber {
   /**
    * Rewrites inventory transactions once credit note edited.
    * @param {ICreditNoteEditedPayload} payload -
+   * @returns {Promise<void>}
    */
   public rewriteInventoryTransactionsOnceEdited = async ({
     tenantId,
@@ -65,9 +66,8 @@ export default class CreditNoteInventoryTransactionsSubscriber {
     trx,
   }: ICreditNoteEditedPayload) => {
     // Can't continue if the credit note is open yet.
-    if (!creditNote.isOpen) {
-      return;
-    }
+    if (!creditNote.isOpen) return;
+
     await this.inventoryTransactions.editInventoryTransactions(
       tenantId,
       creditNoteId,
@@ -87,9 +87,8 @@ export default class CreditNoteInventoryTransactionsSubscriber {
     trx,
   }: ICreditNoteDeletedPayload) => {
     // Can't continue if the credit note is open yet.
-    if (!oldCreditNote.isOpen) {
-      return;
-    }
+    if (!oldCreditNote.isOpen) return;
+
     await this.inventoryTransactions.deleteInventoryTransactions(
       tenantId,
       creditNoteId,

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

@@ -49,7 +49,7 @@ export default class CreditNoteInventoryTransactions {
   };
 
   /**
-   * Edits vendor credit assocaited inventory transactions.
+   * Edits vendor credit associated inventory transactions.
    * @param {number} tenantId
    * @param {number} creditNoteId
    * @param {ICreditNote} creditNote

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

@@ -1,24 +1,24 @@
 import { Service, Inject } from 'typedi';
-import Knex from 'knex';
+import { Knex } from 'knex';
 import { IApplyCreditToInvoicesDeletedPayload } from '@/interfaces';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import PaymentReceiveService from '@/services/Sales/PaymentReceives/PaymentsReceives';
 import UnitOfWork from '@/services/UnitOfWork';
 import events from '@/subscribers/events';
 import BaseCreditNotes from './CreditNotes';
 import { ServiceError } from '@/exceptions';
 import { ERRORS } from './constants';
+import HasTenancyService from '../Tenancy/TenancyService';
 
 @Service()
 export default class DeletreCreditNoteApplyToInvoices extends BaseCreditNotes {
-  @Inject('PaymentReceives')
-  paymentReceive: PaymentReceiveService;
+  @Inject()
+  private uow: UnitOfWork;
 
   @Inject()
-  uow: UnitOfWork;
+  private eventPublisher: EventPublisher;
 
   @Inject()
-  eventPublisher: EventPublisher;
+  private tenancy: HasTenancyService;
 
   /**
    * Apply credit note to the given invoices.

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

@@ -29,7 +29,7 @@ export default class DeleteCustomerLinkedCreditSubscriber {
   };
 
   /**
-   * Validate vendor has no assocaited credit transaction once the vendor deleting.
+   * Validate vendor has no associated credit transaction once the vendor deleting.
    * @param {IVendorEventDeletingPayload} payload -
    */
   public validateCustomerHasNoLinkedCreditsOnDeleting = async ({

packages/server/src/services/DynamicListing/DynamicListAbstract.ts

@@ -0,0 +1,6 @@
+
+
+
+export default class DynamicListAbstract {
+    
+}

packages/server/src/services/DynamicListing/DynamicListAbstruct.ts

@@ -1,6 +0,0 @@
-
-
-
-export default class DynamicListAbstruct {
-    
-}

packages/server/src/services/DynamicListing/DynamicListCustomView.ts

@@ -1,5 +1,5 @@
 import { Inject, Service } from 'typedi';
-import DynamicListAbstruct from './DynamicListAbstruct';
+import DynamicListAbstract from './DynamicListAbstract';
 import DynamicFilterViews from '@/lib/DynamicFilter/DynamicFilterViews';
 import { ServiceError } from '@/exceptions';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
@@ -7,7 +7,7 @@ import { ERRORS } from './constants';
 import { IModel } from '@/interfaces';
 
 @Service()
-export default class DynamicListCustomView extends DynamicListAbstruct {
+export default class DynamicListCustomView extends DynamicListAbstract {
   @Inject()
   tenancy: HasTenancyService;
 

packages/server/src/services/DynamicListing/DynamicListFilterRoles.ts

@@ -2,13 +2,13 @@ import { Service } from 'typedi';
 import * as R from 'ramda';
 import validator from 'is-my-json-valid';
 import { IFilterRole, IModel } from '@/interfaces';
-import DynamicListAbstruct from './DynamicListAbstruct';
+import DynamicListAbstract from './DynamicListAbstract';
 import DynamicFilterAdvancedFilter from '@/lib/DynamicFilter/DynamicFilterAdvancedFilter';
 import { ERRORS } from './constants';
 import { ServiceError } from '@/exceptions';
 
 @Service()
-export default class DynamicListFilterRoles extends DynamicListAbstruct {
+export default class DynamicListFilterRoles extends DynamicListAbstract {
   /**
    * Validates filter roles schema.
    * @param {IFilterRole[]} filterRoles - Filter roles.

packages/server/src/services/DynamicListing/DynamicListSearch.ts

@@ -1,11 +1,11 @@
 import { Service } from 'typedi';
 import { IFilterRole, IModel } from '@/interfaces';
-import DynamicListAbstruct from './DynamicListAbstruct';
+import DynamicListAbstract from './DynamicListAbstract';
 import DynamicFilterFilterRoles from '@/lib/DynamicFilter/DynamicFilterFilterRoles';
 import DynamicFilterSearch from '@/lib/DynamicFilter/DynamicFilterSearch';
 
 @Service()
-export default class DynamicListSearch extends DynamicListAbstruct {
+export default class DynamicListSearch extends DynamicListAbstract {
   /**
    * Dynamic list filter roles.
    * @param {IModel} model

packages/server/src/services/DynamicListing/DynamicListSortBy.ts

@@ -1,12 +1,12 @@
 import { Service } from 'typedi';
-import DynamicListAbstruct from './DynamicListAbstruct';
+import DynamicListAbstract from './DynamicListAbstract';
 import DynamicFilterSortBy from '@/lib/DynamicFilter/DynamicFilterSortBy';
 import { IModel, ISortOrder } from '@/interfaces';
 import { ServiceError } from '@/exceptions';
 import { ERRORS } from './constants';
 
 @Service()
-export default class DynamicListSortBy extends DynamicListAbstruct {
+export default class DynamicListSortBy extends DynamicListAbstract {
   /**
    * Dynamic list sort by.
    * @param {IModel} model

packages/server/src/services/Expenses/ExpenseGLEntriesSubscriber.ts

@@ -21,7 +21,7 @@ export class ExpensesWriteGLSubscriber {
    * Attaches events with handlers.
    * @param bus
    */
-  attach(bus) {
+  public attach(bus) {
     bus.subscribe(
       events.expenses.onCreated,
       this.handleWriteGLEntriesOnceCreated

packages/server/src/services/Features/FeaturesManager.ts

@@ -34,7 +34,7 @@ export class FeaturesManager {
   }
 
   /**
-   * Detarmines the given feature name is accessiable.
+   * Detarmines the given feature name is accessible.
    * @param   {number} tenantId
    * @param   {string} feature
    * @returns {Promise<void>}

packages/server/src/services/Features/FeaturesSettingsDriver.ts

@@ -33,7 +33,7 @@ export class FeaturesSettingsDriver {
   }
 
   /**
-   * Detarmines the given feature name is accessiable.
+   * Detarmines the given feature name is accessible.
    * @param   {number} tenantId
    * @param   {string} feature
    * @returns {Promise<boolean|null|undefined>}

packages/server/src/services/FinancialStatements/AgingSummary/APAgingSummaryService.ts

@@ -5,6 +5,7 @@ import TenancyService from '@/services/Tenancy/TenancyService';
 import APAgingSummarySheet from './APAgingSummarySheet';
 import { Tenant } from '@/system/models';
 import { isEmpty } from 'lodash';
+import APAgingSummaryTable from './APAgingSummaryTable';
 
 @Service()
 export default class PayableAgingSummaryService {
@@ -84,7 +85,7 @@ export default class PayableAgingSummaryService {
 
     // Common query.
     const commonQuery = (query) => {
-      if (isEmpty(filter.branchesIds)) {
+      if (!isEmpty(filter.branchesIds)) {
         query.modify('filterByBranches', filter.branchesIds);
       }
     };
@@ -118,4 +119,21 @@ export default class PayableAgingSummaryService {
       meta: this.reportMetadata(tenantId),
     };
   }
+
+  /**
+   * Retrieves A/P aging summary in table format.
+   * @param {number} tenantId
+   * @param {IAPAgingSummaryQuery} query
+   */
+  async APAgingSummaryTable(tenantId: number, query: IAPAgingSummaryQuery) {
+    const report = await this.APAgingSummary(tenantId, query);
+    const table = new APAgingSummaryTable(report.data, query, {});
+
+    return {
+      columns: table.tableColumns(),
+      rows: table.tableRows(),
+      meta: report.meta,
+      query: report.query,
+    };
+  }
 }

packages/server/src/services/FinancialStatements/AgingSummary/APAgingSummarySheet.ts

@@ -91,7 +91,7 @@ export default class APAgingSummarySheet extends AgingSummaryReport {
 
     return {
       vendorName: vendor.displayName,
-      current: this.formatTotalAmount(currentTotal),
+      current: this.formatAmount(currentTotal),
       aging: agingPeriods,
       total: this.formatTotalAmount(amount),
     };

packages/server/src/services/FinancialStatements/AgingSummary/APAgingSummaryTable.ts

@@ -0,0 +1,46 @@
+import {
+  IAPAgingSummaryData,
+  IAgingSummaryQuery,
+  ITableColumn,
+  ITableColumnAccessor,
+  ITableRow,
+} from '@/interfaces';
+import AgingSummaryTable from './AgingSummaryTable';
+
+export default class APAgingSummaryTable extends AgingSummaryTable {
+  readonly report: IAPAgingSummaryData;
+
+  /**
+   * Constructor method.
+   * @param {IARAgingSummaryData} data
+   * @param {IAgingSummaryQuery} query
+   * @param {any} i18n
+   */
+  constructor(data: IAPAgingSummaryData, query: IAgingSummaryQuery, i18n: any) {
+    super(data, query, i18n);
+  }
+
+  /**
+   * Retrieves the contacts table rows.
+   * @returns {ITableRow[]}
+   */
+  get contactsRows(): ITableRow[] {
+    return this.contactsNodes(this.report.vendors);
+  }
+
+  /**
+   * Contact name node accessor.
+   * @returns {ITableColumnAccessor}
+   */
+  get contactNameNodeAccessor(): ITableColumnAccessor {
+    return { key: 'vendor_name', accessor: 'vendorName' };
+  }
+
+  /**
+   * Retrieves the contact name table column.
+   * @returns {ITableColumn}
+   */
+  contactNameTableColumn = (): ITableColumn => {
+    return { label: 'Vendor name', key: 'vendor_name' };
+  };
+}

packages/server/src/services/FinancialStatements/AgingSummary/ARAgingSummaryService.ts

@@ -5,6 +5,7 @@ import { IARAgingSummaryQuery, IARAgingSummaryMeta } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import ARAgingSummarySheet from './ARAgingSummarySheet';
 import { Tenant } from '@/system/models';
+import ARAgingSummaryTable from './ARAgingSummaryTable';
 
 @Service()
 export default class ARAgingSummaryService {
@@ -89,12 +90,12 @@ export default class ARAgingSummaryService {
     };
     // Retrieve all overdue sale invoices.
     const overdueSaleInvoices = await SaleInvoice.query()
-      .modify('dueInvoicesFromDate', filter.asDate)
+      .modify('overdueInvoicesFromDate', filter.asDate)
       .onBuild(commonQuery);
 
     // Retrieve all due sale invoices.
     const currentInvoices = await SaleInvoice.query()
-      .modify('overdueInvoicesFromDate', filter.asDate)
+      .modify('dueInvoicesFromDate', filter.asDate)
       .onBuild(commonQuery);
 
     // AR aging summary report instance.
@@ -117,4 +118,21 @@ export default class ARAgingSummaryService {
       meta: this.reportMetadata(tenantId),
     };
   }
+
+  /**
+   * Retrieves A/R aging summary in table format.
+   * @param {number} tenantId
+   * @param {IARAgingSummaryQuery} query
+   */
+  async ARAgingSummaryTable(tenantId: number, query: IARAgingSummaryQuery) {
+    const report = await this.ARAgingSummary(tenantId, query);
+    const table = new ARAgingSummaryTable(report.data, query, {});
+
+    return {
+      columns: table.tableColumns(),
+      rows: table.tableRows(),
+      meta: report.meta,
+      query,
+    };
+  }
 }

packages/server/src/services/FinancialStatements/AgingSummary/ARAgingSummarySheet.ts

@@ -1,4 +1,4 @@
-import { groupBy, isEmpty, sum } from 'lodash';
+import { Dictionary, groupBy, isEmpty, sum } from 'lodash';
 import * as R from 'ramda';
 import {
   ICustomer,
@@ -54,7 +54,6 @@ export default class ARAgingSummarySheet extends AgingSummaryReport {
       currentSaleInvoices,
       'customerId'
     );
-
     // Initializes the aging periods.
     this.agingPeriods = this.agingRangePeriods(
       this.query.asDate,
@@ -189,7 +188,7 @@ export default class ARAgingSummarySheet extends AgingSummaryReport {
   };
 
   /**
-   * Retrieve AR aging summary report columns.
+   * Retrieve A/R aging summary report columns.
    * @return {IARAgingSummaryColumns}
    */
   public reportColumns(): IARAgingSummaryColumns {

packages/server/src/services/FinancialStatements/AgingSummary/ARAgingSummaryTable.ts

@@ -0,0 +1,38 @@
+import {
+  IARAgingSummaryData,
+  IAgingSummaryData,
+  IAgingSummaryQuery,
+  ITableColumnAccessor,
+  ITableRow,
+} from '@/interfaces';
+import AgingSummaryTable from './AgingSummaryTable';
+
+export default class ARAgingSummaryTable extends AgingSummaryTable {
+  readonly report: IARAgingSummaryData;
+
+  /**
+   * Constructor method.
+   * @param {IARAgingSummaryData} data
+   * @param {IAgingSummaryQuery} query
+   * @param {any} i18n
+   */
+  constructor(data: IARAgingSummaryData, query: IAgingSummaryQuery, i18n: any) {
+    super(data, query, i18n);
+  }
+
+  /**
+   * Retrieves the contacts table rows.
+   * @returns {ITableRow[]}
+   */
+  get contactsRows(): ITableRow[] {
+    return this.contactsNodes(this.report.customers);
+  }
+
+  /**
+   * Contact name node accessor.
+   * @returns {ITableColumnAccessor}
+   */
+  get contactNameNodeAccessor(): ITableColumnAccessor {
+    return { key: 'customer_name', accessor: 'customerName' };
+  }
+}

packages/server/src/services/FinancialStatements/AgingSummary/AgingSummaryTable.ts

@@ -0,0 +1,211 @@
+import * as R from 'ramda';
+import {
+  IAgingPeriod,
+  IAgingSummaryContact,
+  IAgingSummaryData,
+  IAgingSummaryQuery,
+  IAgingSummaryTotal,
+  ITableColumn,
+  ITableColumnAccessor,
+  ITableRow,
+} from '@/interfaces';
+import { tableRowMapper } from '@/utils';
+import AgingReport from './AgingReport';
+import { AgingSummaryRowType } from './_constants';
+import { FinancialTable } from '../FinancialTable';
+import { FinancialSheetStructure } from '../FinancialSheetStructure';
+
+export default abstract class AgingSummaryTable extends R.compose(
+  FinancialSheetStructure,
+  FinancialTable
+)(AgingReport) {
+  protected readonly report: IAgingSummaryData;
+  protected readonly query: IAgingSummaryQuery;
+  protected readonly agingPeriods: IAgingPeriod[];
+  protected readonly i18n: any;
+
+  /**
+   * Constructor method.
+   * @param {IARAgingSummaryData} data
+   * @param {IAgingSummaryQuery} query
+   * @param {any} i18n
+   */
+  constructor(data: IAgingSummaryData, query: IAgingSummaryQuery, i18n: any) {
+    super();
+
+    this.report = data;
+    this.i18n = i18n;
+    this.query = query;
+
+    this.agingPeriods = this.agingRangePeriods(
+      this.query.asDate,
+      this.query.agingDaysBefore,
+      this.query.agingPeriods
+    );
+  }
+
+  // -------------------------
+  // # Accessors.
+  // -------------------------
+  /**
+   * Aging accessors of contact and total nodes.
+   * @param {IAgingSummaryContact | IAgingSummaryTotal} node
+   * @returns {ITableColumnAccessor[]}
+   */
+  protected agingNodeAccessors = (
+    node: IAgingSummaryContact | IAgingSummaryTotal
+  ): ITableColumnAccessor[] => {
+    return node.aging.map((aging, index) => ({
+      key: 'aging',
+      accessor: `aging[${index}].total.formattedAmount`,
+    }));
+  };
+
+  /**
+   * Contact name node accessor.
+   * @returns {ITableColumnAccessor}
+   */
+  protected get contactNameNodeAccessor(): ITableColumnAccessor {
+    return { key: 'customer_name', accessor: 'customerName' };
+  }
+
+  /**
+   * Retrieves the common columns for all report nodes.
+   * @param {IAgingSummaryContact}
+   * @returns {ITableColumnAccessor[]}
+   */
+  protected contactNodeAccessors = (
+    node: IAgingSummaryContact
+  ): ITableColumnAccessor[] => {
+    return R.compose(
+      R.concat([
+        this.contactNameNodeAccessor,
+        { key: 'current', accessor: 'current.formattedAmount' },
+        ...this.agingNodeAccessors(node),
+        { key: 'total', accessor: 'total.formattedAmount' },
+      ])
+    )([]);
+  };
+
+  /**
+   * Retrieves the contact name table row.
+   * @param {IAgingSummaryContact} node -
+   * @return {ITableRow}
+   */
+  protected contactNameNode = (node: IAgingSummaryContact): ITableRow => {
+    const columns = this.contactNodeAccessors(node);
+    const meta = {
+      rowTypes: [AgingSummaryRowType.Contact],
+    };
+    return tableRowMapper(node, columns, meta);
+  };
+
+  /**
+   * Maps the customers nodes to table rows.
+   * @param {IAgingSummaryContact[]} nodes
+   * @returns {ITableRow[]}
+   */
+  protected contactsNodes = (nodes: IAgingSummaryContact[]): ITableRow[] => {
+    return nodes.map(this.contactNameNode);
+  };
+
+  /**
+   * Retrieves the common columns for all report nodes.
+   * @param {IAgingSummaryTotal}
+   * @returns {ITableColumnAccessor[]}
+   */
+  protected totalNodeAccessors = (
+    node: IAgingSummaryTotal
+  ): ITableColumnAccessor[] => {
+    return R.compose(
+      R.concat([
+        { key: 'blank', value: '' },
+        { key: 'current', accessor: 'current.formattedAmount' },
+        ...this.agingNodeAccessors(node),
+        { key: 'total', accessor: 'total.formattedAmount' },
+      ])
+    )([]);
+  };
+
+  /**
+   * Retrieves the total row of the given report total node.
+   * @param {IAgingSummaryTotal} node
+   * @returns {ITableRow}
+   */
+  protected totalNode = (node: IAgingSummaryTotal): ITableRow => {
+    const columns = this.totalNodeAccessors(node);
+    const meta = {
+      rowTypes: [AgingSummaryRowType.Total],
+    };
+    return tableRowMapper(node, columns, meta);
+  };
+
+  // -------------------------
+  // # Computed Rows.
+  // -------------------------
+  /**
+   * Retrieves the contacts table rows.
+   * @returns {ITableRow[]}
+   */
+  protected get contactsRows(): ITableRow[] {
+    return [];
+  }
+
+  /**
+   * Table total row.
+   * @returns {ITableRow}
+   */
+  protected get totalRow(): ITableRow {
+    return this.totalNode(this.report.total);
+  }
+
+  /**
+   * Retrieves the table rows.
+   * @returns {ITableRow[]}
+   */
+  public tableRows = (): ITableRow[] => {
+    return R.compose(
+      R.unless(R.isEmpty, R.append(this.totalRow)),
+      R.concat(this.contactsRows)
+    )([]);
+  };
+
+  // -------------------------
+  // # Columns.
+  // -------------------------
+  /**
+   * Retrieves the aging table columns.
+   * @returns {ITableColumn[]}
+   */
+  protected agingTableColumns = (): ITableColumn[] => {
+    return this.agingPeriods.map((agingPeriod) => {
+      return {
+        label: `${agingPeriod.beforeDays} - ${
+          agingPeriod.toDays || 'And Over'
+        }`,
+        key: 'aging_period',
+      };
+    });
+  };
+
+  /**
+   * Retrieves the contact name table column.
+   * @returns {ITableColumn}
+   */
+  protected contactNameTableColumn = (): ITableColumn => {
+    return { label: 'Customer name', key: 'customer_name' };
+  };
+
+  /**
+   * Retrieves the report columns.
+   * @returns {ITableColumn}
+   */
+  public tableColumns = (): ITableColumn[] => {
+    return R.compose(this.tableColumnsCellIndexing)([
+      this.contactNameTableColumn(),
+      { label: 'Current', key: 'current' },
+      ...this.agingTableColumns(),
+      { label: 'Total', key: 'total' },
+    ]);
+  };
+}

packages/server/src/services/FinancialStatements/AgingSummary/_constants.ts

@@ -0,0 +1,4 @@
+export enum AgingSummaryRowType {
+  Contact = 'contact',
+  Total = 'total',
+}

packages/server/src/services/FinancialStatements/BalanceSheet/BalanceSheetService.ts

@@ -37,7 +37,7 @@ export default class BalanceSheetStatementService
       displayColumnsBy: 'month',
 
       fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-      toDate: moment().endOf('year').format('YYYY-MM-DD'),
+      toDate: moment().format('YYYY-MM-DD'),
 
       numberFormat: {
         precision: 2,

packages/server/src/services/FinancialStatements/CashFlow/CashFlow.ts

@@ -197,7 +197,7 @@ export default class CashFlowStatement extends compose(
       code: account.code,
       label: account.name,
       accountType: account.accountType,
-      adjusmentType: relation.direction,
+      adjustmentType: relation.direction,
       total: this.getAmountMeta(closingBalance),
       sectionType: ICashFlowStatementSectionType.ACCOUNT,
     };
@@ -362,14 +362,14 @@ export default class CashFlowStatement extends compose(
   /**
    * Retrieve the total section from the eqauation parser.
    * @param   {ICashFlowSchemaTotalSection} sectionSchema
-   * @param   {ICashFlowSchemaSection[]} accumlatedSections
+   * @param   {ICashFlowSchemaSection[]} accumulatedSections
    * @returns {ICashFlowStatementTotalSection}
    */
   private totalEquationSectionParser = (
-    accumlatedSections: ICashFlowSchemaSection[],
+    accumulatedSections: ICashFlowSchemaSection[],
     sectionSchema: ICashFlowSchemaTotalSection
   ): ICashFlowStatementTotalSection => {
-    const mappedSectionsById = this.transformSectionsToMap(accumlatedSections);
+    const mappedSectionsById = this.transformSectionsToMap(accumulatedSections);
     const nodesTotalById = this.sectionsMapToTotal(mappedSectionsById);
 
     const total = this.evaluateEquation(sectionSchema.equation, nodesTotalById);
@@ -421,7 +421,7 @@ export default class CashFlowStatement extends compose(
       code: account.code,
       label: account.name,
       accountType: account.accountType,
-      adjusmentType: relation.direction,
+      adjustmentType: relation.direction,
       total: this.getAmountMeta(closingBalance),
       sectionType: ICashFlowStatementSectionType.ACCOUNT,
     };
@@ -524,7 +524,7 @@ export default class CashFlowStatement extends compose(
    * @param   {ICashFlowSchemaSection | ICashFlowStatementSection} section
    * @param   {number} key
    * @param   {ICashFlowSchemaSection[]} parentValue
-   * @param   {(ICashFlowSchemaSection | ICashFlowStatementSection)[]} accumlatedSections
+   * @param   {(ICashFlowSchemaSection | ICashFlowStatementSection)[]} accumulatedSections
    * @returns {ICashFlowSchemaSection}
    */
   private schemaSectionTotalParser = (
@@ -532,13 +532,13 @@ export default class CashFlowStatement extends compose(
     key: number,
     parentValue: ICashFlowSchemaSection[],
     context,
-    accumlatedSections: (ICashFlowSchemaSection | ICashFlowStatementSection)[]
+    accumulatedSections: (ICashFlowSchemaSection | ICashFlowStatementSection)[]
   ): ICashFlowSchemaSection | ICashFlowStatementSection => {
     return R.compose(
       // Total equation section.
       R.when(
         this.isSchemaSectionType(ICashFlowStatementSectionType.TOTAL),
-        R.curry(this.totalEquationSectionParser)(accumlatedSections)
+        R.curry(this.totalEquationSectionParser)(accumulatedSections)
       )
     )(section);
   };

packages/server/src/services/FinancialStatements/CashFlow/CashFlowDatePeriods.ts

@@ -165,7 +165,7 @@ export const CashFlowStatementDatePeriods = (Base) =>
         .whereAccountId(node.id)
         .getClosingBalance();
 
-      return this.amountAdjustment(node.adjusmentType, closingBalance);
+      return this.amountAdjustment(node.adjustmentType, closingBalance);
     };
 
     /**
@@ -322,7 +322,7 @@ export const CashFlowStatementDatePeriods = (Base) =>
     // Cash at beginning ----------------------
 
     /**
-     * Retrieve the date preioods of the given node and accumlated function.
+     * Retrieve the date preioods of the given node and accumulated function.
      * @param {} node
      * @param {}
      * @return {}

packages/server/src/services/FinancialStatements/CashFlow/CashFlowService.ts

@@ -40,7 +40,7 @@ export default class CashFlowStatementService
       displayColumnsType: 'total',
       displayColumnsBy: 'day',
       fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-      toDate: moment().endOf('year').format('YYYY-MM-DD'),
+      toDate: moment().format('YYYY-MM-DD'),
       numberFormat: {
         precision: 2,
         divideOn1000: false,

packages/server/src/services/FinancialStatements/CashflowAccountTransactions/CashflowAccountTransactionsService.ts

@@ -41,7 +41,7 @@ export default class CashflowAccountTransactionsService extends FinancialSheet {
   }
 
   /**
-   * Retrieve the cashflow accouynt transactions report data.
+   * Retrieve the cashflow account transactions report data.
    * @param {number} tenantId -
    * @param {ICashflowAccountTransactionsQuery} query -
    * @return {Promise<IInvetoryItemDetailDOO>}

packages/server/src/services/FinancialStatements/FinancialDatePeriods.ts

@@ -64,7 +64,7 @@ export const FinancialDatePeriods = (Base) =>
     };
 
     /**
-     * Retrieve the date preioods of the given node and accumlated function.
+     * Retrieve the date preioods of the given node and accumulated function.
      * @param  {IBalanceSheetAccountNode} node
      * @param  {(fromDate: Date, toDate: Date, index: number) => any}
      * @return {}

packages/server/src/services/FinancialStatements/FinancialTable.ts

@@ -12,7 +12,7 @@ export const FinancialTable = (Base) =>
      * @param   {ITableColumn[]} columns
      * @returns {ITableColumn[]}
      */
-    protected tableColumnsCellIndexing = (
+    public tableColumnsCellIndexing = (
       columns: ITableColumn[]
     ): ITableColumn[] => {
       const cellIndex = increment(-1);

packages/server/src/services/FinancialStatements/GeneralLedger/GeneralLedgerService.ts

@@ -31,8 +31,8 @@ export default class GeneralLedgerService {
    */
   get defaultQuery() {
     return {
-      fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-      toDate: moment().endOf('year').format('YYYY-MM-DD'),
+      fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+      toDate: moment().format('YYYY-MM-DD'),
       basis: 'cash',
       numberFormat: {
         noCents: false,

packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetails.ts

@@ -126,7 +126,7 @@ export default class InventoryDetails extends FinancialSheet {
   );
 
   /**
-   * Accumlate and mapping running quantity on transactions.
+   * Accumulate and mapping running quantity on transactions.
    * @param {IInventoryDetailsItemTransaction[]} transactions
    * @returns {IInventoryDetailsItemTransaction[]}
    */
@@ -150,7 +150,7 @@ export default class InventoryDetails extends FinancialSheet {
   }
 
   /**
-   * Accumlate and mapping running valuation on transactions.
+   * Accumulate and mapping running valuation on transactions.
    * @param {IInventoryDetailsItemTransaction[]} transactions
    * @returns {IInventoryDetailsItemTransaction}
    */
@@ -160,8 +160,8 @@ export default class InventoryDetails extends FinancialSheet {
     const initial = this.getNumberMeta(0);
 
     const mapAccumAppender = (a, b) => {
-      const adjusmtent = b.direction === 'OUT' ? -1 : 1;
-      const total = a.runningValuation.number + b.cost.number * adjusmtent;
+      const adjustment = b.direction === 'OUT' ? -1 : 1;
+      const total = a.runningValuation.number + b.cost.number * adjustment;
       const totalMeta = this.getNumberMeta(total, { excerptZero: false });
       const accum = { ...b, runningValuation: totalMeta };
 

packages/server/src/services/FinancialStatements/InventoryDetails/InventoryDetailsService.ts

@@ -16,13 +16,13 @@ import { Tenant } from '@/system/models';
 @Service()
 export default class InventoryDetailsService extends FinancialSheet {
   @Inject()
-  tenancy: TenancyService;
+  private tenancy: TenancyService;
 
   @Inject()
-  reportRepo: InventoryDetailsRepository;
+  private reportRepo: InventoryDetailsRepository;
 
   @Inject()
-  inventoryService: InventoryService;
+  private inventoryService: InventoryService;
 
   /**
    * Defaults balance sheet filter query.
@@ -30,8 +30,8 @@ export default class InventoryDetailsService extends FinancialSheet {
    */
   private get defaultQuery(): IInventoryDetailsQuery {
     return {
-      fromDate: moment().startOf('year').format('YYYY-MM-DD'),
-      toDate: moment().endOf('year').format('YYYY-MM-DD'),
+      fromDate: moment().startOf('month').format('YYYY-MM-DD'),
+      toDate: moment().format('YYYY-MM-DD'),
       itemsIds: [],
       numberFormat: {
         precision: 2,

packages/server/src/services/FinancialStatements/InventoryValuationSheet/InventoryValuationSheetService.ts

@@ -27,7 +27,7 @@ export default class InventoryValuationSheetService {
    */
   get defaultQuery(): IInventoryValuationReportQuery {
     return {
-      asDate: moment().endOf('year').format('YYYY-MM-DD'),
+      asDate: moment().format('YYYY-MM-DD'),
       itemsIds: [],
       numberFormat: {
         precision: 2,