fix: Organize Plaid env variables for development and sandbox envs

.env.example

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

CHANGELOG.md

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

docker-compose.prod.yml

@@ -3,17 +3,24 @@
 version: '3.3'
 
 services:
-  proxy:
-    image: envoyproxy/envoy:v1.30-latest
-    depends_on:
-      - server
-      - webapp
+  nginx:
+    container_name: bigcapital-nginx-gateway
+    build:
+      context: ./docker/nginx
+      args:
+        - SERVER_PROXY_PORT=3000
+        - WEB_SSL=false
+        - SELF_SIGNED=false
+    volumes:
+      - ./data/logs/nginx/:/var/log/nginx
+      - ./docker/certbot/certs/:/var/certs
     ports:
       - '${PUBLIC_PROXY_PORT:-80}:80'
       - '${PUBLIC_PROXY_SSL_PORT:-443}:443'
     tty: true
-    volumes:
-      - ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
+    depends_on:
+      - server
+      - webapp
     restart: on-failure
     networks:
       - bigcapital_network
@@ -39,8 +46,6 @@ services:
       - mongo
       - redis
     restart: on-failure
-    networks:
-      - bigcapital_network
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
@@ -88,17 +93,14 @@ services:
       - GOTENBERG_URL=${GOTENBERG_URL}
       - GOTENBERG_DOCS_URL=${GOTENBERG_DOCS_URL}
 
-      # Exchange Rate
-      - EXCHANGE_RATE_SERVICE=${EXCHANGE_RATE_SERVICE}
-      - OPEN_EXCHANGE_RATE_APP_ID-${OPEN_EXCHANGE_RATE_APP_ID}
-
       # Bank Sync
       - BANKING_CONNECT=${BANKING_CONNECT}
 
       # Plaid
       - PLAID_ENV=${PLAID_ENV}
       - PLAID_CLIENT_ID=${PLAID_CLIENT_ID}
-      - PLAID_SECRET=${PLAID_SECRET}
+      - PLAID_SECRET_DEVELOPMENT=${PLAID_SECRET_DEVELOPMENT}
+      - PLAID_SECRET_SANDBOX=${PLAID_SECRET_SANDBOX}
       - PLAID_LINK_WEBHOOK=${PLAID_LINK_WEBHOOK}
 
       # Lemon Squeez
@@ -122,6 +124,8 @@ services:
       - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
       - S3_ENDPOINT=${S3_ENDPOINT}
       - S3_BUCKET=${S3_BUCKET}
+    networks:
+      - bigcapital_network
 
   database_migration:
     container_name: bigcapital-database-migration

docker/envoy/envoy.yaml

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

docker/nginx/Dockerfile

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

docker/nginx/nginx.conf

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

docker/nginx/scripts/build-nginx.sh

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

docker/nginx/sites/server.template

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

packages/server/package.json

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

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

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

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

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

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

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

packages/server/src/commands/bigcapital.ts

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

packages/server/src/config/index.ts

@@ -235,6 +235,6 @@ module.exports = {
     accessKeyId: process.env.S3_ACCESS_KEY_ID,
     secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
     endpoint: process.env.S3_ENDPOINT,
-    bucket: process.env.S3_BUCKET || 'bigcapital-documents',
+    bucket: process.env.S3_BUCKET,
   },
 };

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

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

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

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

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

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

packages/server/src/interfaces/Account.ts

@@ -164,7 +164,3 @@ export enum TaxRateAction {
   DELETE = 'Delete',
   VIEW = 'View',
 }
-
-export interface CreateAccountParams {
-  ignoreUniqueName: boolean;
-}

packages/server/src/interfaces/GeneralLedgerSheet.ts

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

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

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

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

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

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -104,10 +104,10 @@ export default class UncategorizedCashflowTransaction extends mixin(
    */
   private async updateUncategorizedTransactionCount(
     queryContext: QueryContext,
-    increment: boolean,
-    amount: number = 1
+    increment: boolean
   ) {
     const operation = increment ? 'increment' : 'decrement';
+    const amount = increment ? 1 : -1;
 
     await Account.query(queryContext.transaction)
       .findById(this.accountId)

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

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

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

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

packages/server/src/services/Attachments/AttachmentsApplication.ts

@@ -2,9 +2,11 @@ import { Inject, Service } from 'typedi';
 import { UploadDocument } from './UploadDocument';
 import { DeleteAttachment } from './DeleteAttachment';
 import { GetAttachment } from './GetAttachment';
+import { AttachmentUploadPipeline } from './S3UploadPipeline';
 import { LinkAttachment } from './LinkAttachment';
 import { UnlinkAttachment } from './UnlinkAttachment';
 import { getAttachmentPresignedUrl } from './GetAttachmentPresignedUrl';
+import type { Multer } from 'multer';
 
 @Service()
 export class AttachmentsApplication {
@@ -17,6 +19,9 @@ export class AttachmentsApplication {
   @Inject()
   private getDocumentService: GetAttachment;
 
+  @Inject()
+  private uploadPipelineService: AttachmentUploadPipeline;
+
   @Inject()
   private linkDocumentService: LinkAttachment;
 
@@ -26,6 +31,14 @@ export class AttachmentsApplication {
   @Inject()
   private getPresignedUrlService: getAttachmentPresignedUrl;
 
+  /**
+   * Express middleware for uploading attachments to an S3 bucket.
+   * @returns {Multer}
+   */
+  get uploadPipeline(): Multer {
+    return this.uploadPipelineService.uploadPipeline();
+  }
+
   /**
    * Saves the metadata of uploaded document to S3 on database.
    * @param {number} tenantId

packages/server/src/services/Attachments/S3UploadPipeline.ts

@@ -1,38 +1,12 @@
 import multer from 'multer';
-import type { Multer } from 'multer';
+import type { Multer } from 'multer'
 import multerS3 from 'multer-s3';
 import { s3 } from '@/lib/S3/S3';
 import { Service } from 'typedi';
 import config from '@/config';
-import { NextFunction, Request, Response } from 'express';
 
 @Service()
 export class AttachmentUploadPipeline {
-  /**
-   * Middleware to ensure that S3 configuration is properly set before proceeding.
-   * This function checks if the necessary S3 configuration keys are present and throws an error if any are missing.
-   *
-   * @param req The HTTP request object.
-   * @param res The HTTP response object.
-   * @param next The callback to pass control to the next middleware function.
-   */
-  public validateS3Configured(req: Request, res: Response, next: NextFunction) {
-    if (
-      !config.s3.region ||
-      !config.s3.accessKeyId ||
-      !config.s3.secretAccessKey
-    ) {
-      const missingKeys = [];
-      if (!config.s3.region) missingKeys.push('region');
-      if (!config.s3.accessKeyId) missingKeys.push('accessKeyId');
-      if (!config.s3.secretAccessKey) missingKeys.push('secretAccessKey');
-      const missing = missingKeys.join(', ');
-
-      throw new Error(`S3 configuration error: Missing ${missing}`);
-    }
-    next();
-  }
-
   /**
    * Express middleware for uploading attachments to an S3 bucket.
    * It utilizes the multer middleware for handling multipart/form-data, specifically for file uploads.

packages/server/src/services/Authentication/AuthSignin.ts

@@ -1,6 +1,6 @@
 import { Container, Inject } from 'typedi';
 import { cloneDeep } from 'lodash';
-import { SystemUser, Tenant } from '@/system/models';
+import { Tenant } from '@/system/models';
 import {
   IAuthSignedInEventPayload,
   IAuthSigningInEventPayload,
@@ -64,9 +64,7 @@ export class AuthSigninService {
     const { systemUserRepository } = this.sysRepositories;
 
     // Finds the user of the given email address.
-    const user = await SystemUser.query()
-      .findOne('email', email)
-      .modify('inviteAccepted');
+    const user = await systemUserRepository.findOneByEmail(email);
 
     // Validate the given email and password.
     await this.validateSignIn(user, email, password);

packages/server/src/services/Banking/Plaid/PlaidSyncDB.ts

@@ -3,11 +3,7 @@ import { Inject, Service } from 'typedi';
 import bluebird from 'bluebird';
 import { entries, groupBy } from 'lodash';
 import { CreateAccount } from '@/services/Accounts/CreateAccount';
-import {
-  IAccountCreateDTO,
-  PlaidAccount,
-  PlaidTransaction,
-} from '@/interfaces';
+import { PlaidAccount, PlaidTransaction } from '@/interfaces';
 import {
   transformPlaidAccountToCreateAccount,
   transformPlaidTrxsToCashflowCreate,
@@ -15,7 +11,6 @@ import {
 import { DeleteCashflowTransaction } from '@/services/Cashflow/DeleteCashflowTransactionService';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { CashflowApplication } from '@/services/Cashflow/CashflowApplication';
-import { Knex } from 'knex';
 
 const CONCURRENCY_ASYNC = 10;
 
@@ -33,35 +28,6 @@ export class PlaidSyncDb {
   @Inject()
   private deleteCashflowTransactionService: DeleteCashflowTransaction;
 
-  /**
-   * Syncs the Plaid bank account.
-   * @param {number} tenantId
-   * @param {IAccountCreateDTO} createBankAccountDTO
-   * @param {Knex.Transaction} trx
-   * @returns {Promise<void>}
-   */
-  public async syncBankAccount(
-    tenantId: number,
-    createBankAccountDTO: IAccountCreateDTO,
-    trx?: Knex.Transaction
-  ) {
-    const { Account } = this.tenancy.models(tenantId);
-    const plaidAccount = await Account.query().findOne(
-      'plaidAccountId',
-      createBankAccountDTO.plaidAccountId
-    );
-    // Can't continue if the Plaid account is already created.
-    if (plaidAccount) {
-      return;
-    }
-    await this.createAccountService.createAccount(
-      tenantId,
-      createBankAccountDTO,
-      trx,
-      { ignoreUniqueName: true }
-    );
-  }
-
   /**
    * Syncs the plaid accounts to the system accounts.
    * @param {number} tenantId Tenant ID.
@@ -71,8 +37,7 @@ export class PlaidSyncDb {
   public async syncBankAccounts(
     tenantId: number,
     plaidAccounts: PlaidAccount[],
-    institution: any,
-    trx?: Knex.Transaction
+    institution: any
   ): Promise<void> {
     const transformToPlaidAccounts =
       transformPlaidAccountToCreateAccount(institution);
@@ -82,7 +47,7 @@ export class PlaidSyncDb {
     await bluebird.map(
       accountCreateDTOs,
       (createAccountDTO: any) =>
-        this.syncBankAccount(tenantId, createAccountDTO, trx),
+        this.createAccountService.createAccount(tenantId, createAccountDTO),
       { concurrency: CONCURRENCY_ASYNC }
     );
   }
@@ -96,16 +61,15 @@ export class PlaidSyncDb {
   public async syncAccountTranactions(
     tenantId: number,
     plaidAccountId: number,
-    plaidTranasctions: PlaidTransaction[],
-    trx?: Knex.Transaction
+    plaidTranasctions: PlaidTransaction[]
   ): Promise<void> {
     const { Account } = this.tenancy.models(tenantId);
 
-    const cashflowAccount = await Account.query(trx)
+    const cashflowAccount = await Account.query()
       .findOne({ plaidAccountId })
       .throwIfNotFound();
 
-    const openingEquityBalance = await Account.query(trx).findOne(
+    const openingEquityBalance = await Account.query().findOne(
       'slug',
       'opening-balance-equity'
     );
@@ -123,8 +87,7 @@ export class PlaidSyncDb {
       (uncategoriedDTO) =>
         this.cashflowApp.createUncategorizedTransaction(
           tenantId,
-          uncategoriedDTO,
-          trx
+          uncategoriedDTO
         ),
       { concurrency: 1 }
     );
@@ -137,8 +100,7 @@ export class PlaidSyncDb {
    */
   public async syncAccountsTransactions(
     tenantId: number,
-    plaidAccountsTransactions: PlaidTransaction[],
-    trx?: Knex.Transaction
+    plaidAccountsTransactions: PlaidTransaction[]
   ): Promise<void> {
     const groupedTrnsxByAccountId = entries(
       groupBy(plaidAccountsTransactions, 'account_id')
@@ -149,8 +111,7 @@ export class PlaidSyncDb {
         return this.syncAccountTranactions(
           tenantId,
           plaidAccountId,
-          plaidTransactions,
-          trx
+          plaidTransactions
         );
       },
       { concurrency: CONCURRENCY_ASYNC }
@@ -163,12 +124,11 @@ export class PlaidSyncDb {
    */
   public async syncRemoveTransactions(
     tenantId: number,
-    plaidTransactionsIds: string[],
-    trx?: Knex.Transaction
+    plaidTransactionsIds: string[]
   ) {
     const { CashflowTransaction } = this.tenancy.models(tenantId);
 
-    const cashflowTransactions = await CashflowTransaction.query(trx).whereIn(
+    const cashflowTransactions = await CashflowTransaction.query().whereIn(
       'plaidTransactionId',
       plaidTransactionsIds
     );
@@ -180,8 +140,7 @@ export class PlaidSyncDb {
       (transactionId: number) =>
         this.deleteCashflowTransactionService.deleteCashflowTransaction(
           tenantId,
-          transactionId,
-          trx
+          transactionId
         ),
       { concurrency: CONCURRENCY_ASYNC }
     );
@@ -196,12 +155,11 @@ export class PlaidSyncDb {
   public async syncTransactionsCursor(
     tenantId: number,
     plaidItemId: string,
-    lastCursor: string,
-    trx?: Knex.Transaction
+    lastCursor: string
   ) {
     const { PlaidItem } = this.tenancy.models(tenantId);
 
-    await PlaidItem.query(trx).findOne({ plaidItemId }).patch({ lastCursor });
+    await PlaidItem.query().findOne({ plaidItemId }).patch({ lastCursor });
   }
 
   /**
@@ -211,16 +169,13 @@ export class PlaidSyncDb {
    */
   public async updateLastFeedsUpdatedAt(
     tenantId: number,
-    plaidAccountIds: string[],
-    trx?: Knex.Transaction
+    plaidAccountIds: string[]
   ) {
     const { Account } = this.tenancy.models(tenantId);
 
-    await Account.query(trx)
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
-        lastFeedsUpdatedAt: new Date(),
-      });
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
+      lastFeedsUpdatedAt: new Date(),
+    });
   }
 
   /**
@@ -232,15 +187,12 @@ export class PlaidSyncDb {
   public async updateAccountsFeedsActive(
     tenantId: number,
     plaidAccountIds: string[],
-    isFeedsActive: boolean = true,
-    trx?: Knex.Transaction
+    isFeedsActive: boolean = true
   ) {
     const { Account } = this.tenancy.models(tenantId);
 
-    await Account.query(trx)
-      .whereIn('plaid_account_id', plaidAccountIds)
-      .patch({
-        isFeedsActive,
-      });
+    await Account.query().whereIn('plaid_account_id', plaidAccountIds).patch({
+      isFeedsActive,
+    });
   }
 }

packages/server/src/services/Banking/Plaid/PlaidUpdateTransactions.ts

@@ -3,8 +3,6 @@ import { Inject, Service } from 'typedi';
 import { PlaidClientWrapper } from '@/lib/Plaid/Plaid';
 import { PlaidSyncDb } from './PlaidSyncDB';
 import { PlaidFetchedTransactionsUpdates } from '@/interfaces';
-import UnitOfWork from '@/services/UnitOfWork';
-import { Knex } from 'knex';
 
 @Service()
 export class PlaidUpdateTransactions {
@@ -14,40 +12,12 @@ export class PlaidUpdateTransactions {
   @Inject()
   private plaidSync: PlaidSyncDb;
 
-  @Inject()
-  private uow: UnitOfWork;
-
   /**
-   * Handles sync the Plaid item to Bigcaptial under UOW.
-   * @param {number} tenantId
-   * @param {number} plaidItemId
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
+   * Handles the fetching and storing of new, modified, or removed transactions
+   * @param {number} tenantId Tenant ID.
+   * @param {string} plaidItemId the Plaid ID for the item.
    */
   public async updateTransactions(tenantId: number, plaidItemId: string) {
-    return this.uow.withTransaction(tenantId, (trx: Knex.Transaction) => {
-      return this.updateTransactionsWork(tenantId, plaidItemId, trx);
-    });
-  }
-
-  /**
-   * Handles the fetching and storing the following:
-   *  - New, modified, or removed transactions.
-   *  - New bank accounts.
-   *  - Last accounts feeds updated at.
-   *  - Turn on the accounts feed flag.
-   * @param {number} tenantId - Tenant ID.
-   * @param {string} plaidItemId - The Plaid ID for the item.
-   * @returns {Promise<{  addedCount: number; modifiedCount: number; removedCount: number; }>}
-   */
-  public async updateTransactionsWork(
-    tenantId: number,
-    plaidItemId: string,
-    trx?: Knex.Transaction
-  ): Promise<{
-    addedCount: number;
-    modifiedCount: number;
-    removedCount: number;
-  }> {
     // Fetch new transactions from plaid api.
     const { added, modified, removed, cursor, accessToken } =
       await this.fetchTransactionUpdates(tenantId, plaidItemId);
@@ -59,42 +29,28 @@ export class PlaidUpdateTransactions {
     } = await plaidInstance.accountsGet(request);
 
     const plaidAccountsIds = accounts.map((a) => a.account_id);
+
     const {
       data: { institution },
     } = await plaidInstance.institutionsGetById({
       institution_id: item.institution_id,
       country_codes: ['US', 'UK'],
     });
-    // Sync bank accounts.
-    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution, trx);
-    // Sync bank account transactions.
+    // Update the DB.
+    await this.plaidSync.syncBankAccounts(tenantId, accounts, institution);
     await this.plaidSync.syncAccountsTransactions(
       tenantId,
-      added.concat(modified),
-      trx
-    );
-    // Sync removed transactions.
-    await this.plaidSync.syncRemoveTransactions(tenantId, removed, trx);
-    // Sync transactions cursor.
-    await this.plaidSync.syncTransactionsCursor(
-      tenantId,
-      plaidItemId,
-      cursor,
-      trx
+      added.concat(modified)
     );
+    await this.plaidSync.syncRemoveTransactions(tenantId, removed);
+    await this.plaidSync.syncTransactionsCursor(tenantId, plaidItemId, cursor);
+
     // Update the last feeds updated at of the updated accounts.
-    await this.plaidSync.updateLastFeedsUpdatedAt(
-      tenantId,
-      plaidAccountsIds,
-      trx
-    );
+    await this.plaidSync.updateLastFeedsUpdatedAt(tenantId, plaidAccountsIds);
+
     // Turn on the accounts feeds flag.
-    await this.plaidSync.updateAccountsFeedsActive(
-      tenantId,
-      plaidAccountsIds,
-      true,
-      trx
-    );
+    await this.plaidSync.updateAccountsFeedsActive(tenantId, plaidAccountsIds);
+
     return {
       addedCount: added.length,
       modifiedCount: modified.length,

packages/server/src/services/Banking/Plaid/utils.ts

@@ -42,12 +42,7 @@ export const transformPlaidTrxsToCashflowCreate = R.curry(
   ): CreateUncategorizedTransactionDTO => {
     return {
       date: plaidTranasction.date,
-
-      // Plaid: Positive values when money moves out of the account; negative values
-      // when money moves in. For example, debit card purchases are positive;
-      // credit card payments, direct deposits, and refunds are negative.
-      amount: -1 * plaidTranasction.amount,
-
+      amount: plaidTranasction.amount,
       description: plaidTranasction.name,
       payee: plaidTranasction.payment_meta?.payee,
       currencyCode: plaidTranasction.iso_currency_code,

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

@@ -1,4 +1,3 @@
-import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
 import { DeleteCashflowTransaction } from './DeleteCashflowTransactionService';
 import { UncategorizeCashflowTransaction } from './UncategorizeCashflowTransaction';
@@ -120,13 +119,11 @@ export class CashflowApplication {
    */
   public createUncategorizedTransaction(
     tenantId: number,
-    createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO,
-    trx?: Knex.Transaction
+    createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO
   ) {
     return this.createUncategorizedTransactionService.create(
       tenantId,
-      createUncategorizedTransactionDTO,
-      trx
+      createUncategorizedTransactionDTO
     );
   }
 

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

@@ -7,12 +7,7 @@ export class CashflowTransactionTransformer extends Transformer {
    * @returns {string[]}
    */
   public includeAttributes = (): string[] => {
-    return [
-      'formattedAmount',
-      'transactionTypeFormatted',
-      'formattedDate',
-      'formattedCreatedAt',
-    ];
+    return ['formattedAmount', 'transactionTypeFormatted'];
   };
 
   /**
@@ -29,28 +24,10 @@ export class CashflowTransactionTransformer extends Transformer {
 
   /**
    * Formatted transaction type.
-   * @param transaction
+   * @param transaction 
    * @returns {string}
    */
   protected transactionTypeFormatted = (transaction) => {
     return this.context.i18n.__(transaction.transactionTypeFormatted);
-  };
-
-  /**
-   * Retrieve the formatted transaction date.
-   * @param invoice
-   * @returns {string}
-   */
-  protected formattedDate = (invoice): string => {
-    return this.formatDate(invoice.date);
-  };
-
-  /**
-   * Retrieve the formatted created at date.
-   * @param invoice
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (invoice): string => {
-    return this.formatDate(invoice.createdAt);
-  };
+  }
 }

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

@@ -12,6 +12,7 @@ import { Knex } from 'knex';
 import { transformCategorizeTransToCashflow } from './utils';
 import { CommandCashflowValidator } from './CommandCasflowValidator';
 import NewCashflowTransactionService from './NewCashflowTransactionService';
+import { TransferAuthorizationGuaranteeDecision } from 'plaid';
 
 @Service()
 export class CategorizeCashflowTransaction {

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

@@ -30,8 +30,7 @@ export class DeleteCashflowTransaction {
    */
   public deleteCashflowTransaction = async (
     tenantId: number,
-    cashflowTransactionId: number,
-    trx?: Knex.Transaction
+    cashflowTransactionId: number
   ): Promise<{ oldCashflowTransaction: ICashflowTransaction }> => {
     const { CashflowTransaction, CashflowTransactionLine } =
       this.tenancy.models(tenantId);
@@ -44,44 +43,34 @@ export class DeleteCashflowTransaction {
     this.throwErrorIfTransactionNotFound(oldCashflowTransaction);
 
     // Starting database transaction.
-    return this.uow.withTransaction(
-      tenantId,
-      async (trx: Knex.Transaction) => {
-        // Triggers `onCashflowTransactionDelete` event.
-        await this.eventPublisher.emitAsync(
-          events.cashflow.onTransactionDeleting,
-          {
-            trx,
-            tenantId,
-            oldCashflowTransaction,
-          } as ICommandCashflowDeletingPayload
-        );
+    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+      // Triggers `onCashflowTransactionDelete` event.
+      await this.eventPublisher.emitAsync(events.cashflow.onTransactionDeleting, {
+        trx,
+        tenantId,
+        oldCashflowTransaction,
+      } as ICommandCashflowDeletingPayload);
 
-        // Delete cashflow transaction associated lines first.
-        await CashflowTransactionLine.query(trx)
-          .where('cashflow_transaction_id', cashflowTransactionId)
-          .delete();
+      // Delete cashflow transaction associated lines first.
+      await CashflowTransactionLine.query(trx)
+        .where('cashflow_transaction_id', cashflowTransactionId)
+        .delete();
 
-        // Delete cashflow transaction.
-        await CashflowTransaction.query(trx)
-          .findById(cashflowTransactionId)
-          .delete();
+      // Delete cashflow transaction.
+      await CashflowTransaction.query(trx)
+        .findById(cashflowTransactionId)
+        .delete();
 
-        // Triggers `onCashflowTransactionDeleted` event.
-        await this.eventPublisher.emitAsync(
-          events.cashflow.onTransactionDeleted,
-          {
-            trx,
-            tenantId,
-            cashflowTransactionId,
-            oldCashflowTransaction,
-          } as ICommandCashflowDeletedPayload
-        );
+      // Triggers `onCashflowTransactionDeleted` event.
+      await this.eventPublisher.emitAsync(events.cashflow.onTransactionDeleted, {
+        trx,
+        tenantId,
+        cashflowTransactionId,
+        oldCashflowTransaction,
+      } as ICommandCashflowDeletedPayload);
 
-        return { oldCashflowTransaction };
-      },
-      trx
-    );
+      return { oldCashflowTransaction };
+    });
   };
 
   /**

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

@@ -68,11 +68,7 @@ export const CASHFLOW_TRANSACTION_TYPE_META = {
   [`${CASHFLOW_TRANSACTION_TYPE.OTHER_EXPENSE}`]: {
     type: 'OtherExpense',
     direction: CASHFLOW_DIRECTION.OUT,
-    creditType: [
-      ACCOUNT_TYPE.EXPENSE,
-      ACCOUNT_TYPE.OTHER_EXPENSE,
-      ACCOUNT_TYPE.COST_OF_GOODS_SOLD,
-    ],
+    creditType: [ACCOUNT_TYPE.EXPENSE, ACCOUNT_TYPE.OTHER_EXPENSE],
   },
 };
 

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

@@ -1,4 +1,4 @@
-import { upperFirst, camelCase } from 'lodash';
+import { upperFirst, camelCase, omit } from 'lodash';
 import {
   CASHFLOW_TRANSACTION_TYPE,
   CASHFLOW_TRANSACTION_TYPE_META,
@@ -6,6 +6,7 @@ import {
 } from './constants';
 import {
   ICashflowNewCommandDTO,
+  ICashflowTransaction,
   ICategorizeCashflowTransactioDTO,
   IUncategorizedCashflowTransaction,
 } from '@/interfaces';
@@ -41,8 +42,8 @@ export const getCashflowAccountTransactionsTypes = () => {
 /**
  * Tranasformes the given uncategorized transaction and categorized DTO
  * to cashflow create DTO.
- * @param {IUncategorizedCashflowTransaction} uncategorizeModel
- * @param {ICategorizeCashflowTransactioDTO} categorizeDTO
+ * @param {IUncategorizedCashflowTransaction} uncategorizeModel 
+ * @param {ICategorizeCashflowTransactioDTO} categorizeDTO 
  * @returns {ICashflowNewCommandDTO}
  */
 export const transformCategorizeTransToCashflow = (
@@ -61,7 +62,6 @@ export const transformCategorizeTransToCashflow = (
     transactionNumber: categorizeDTO.transactionNumber,
     transactionType: categorizeDTO.transactionType,
     uncategorizedTransactionId: uncategorizeModel.id,
-    branchId: categorizeDTO?.branchId,
     publish: true,
   };
 };

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

@@ -13,8 +13,6 @@ export class CreditNoteTransformer extends Transformer {
     return [
       'formattedCreditsRemaining',
       'formattedCreditNoteDate',
-      'formattedCreatedAt',
-      'formattedCreatedAt',
       'formattedAmount',
       'formattedCreditsUsed',
       'formattedSubtotal',
@@ -32,15 +30,6 @@ export class CreditNoteTransformer extends Transformer {
     return this.formatDate(credit.creditNoteDate);
   };
 
-  /**
-   * Retrieve formatted created at date.
-   * @param credit 
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (credit): string => {
-    return this.formatDate(credit.createdAt);
-  };
-
   /**
    * Retrieve formatted invoice amount.
    * @param {ICreditNote} credit

packages/server/src/services/Expenses/CRUD/ExpenseTransformer.ts

@@ -15,7 +15,6 @@ export class ExpenseTransfromer extends Transformer {
       'formattedLandedCostAmount',
       'formattedAllocatedCostAmount',
       'formattedDate',
-      'formattedCreatedAt',
       'categories',
       'attachments',
     ];
@@ -63,15 +62,6 @@ export class ExpenseTransfromer extends Transformer {
     return this.formatDate(expense.paymentDate);
   };
 
-  /**
-   * Retrieve formatted created at date.
-   * @param {IExpense} expense 
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (expense: IExpense): string => {
-    return this.formatDate(expense.createdAt);
-  }
-
   /**
    * Retrieves the transformed expense categories.
    * @param {IExpense} expense

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

@@ -20,8 +20,6 @@ import { BalanceSheetPercentage } from './BalanceSheetPercentage';
 import { BalanceSheetSchema } from './BalanceSheetSchema';
 import { BalanceSheetBase } from './BalanceSheetBase';
 import { BalanceSheetQuery } from './BalanceSheetQuery';
-import { flatToNestedArray } from '@/utils';
-import BalanceSheetRepository from './BalanceSheetRepository';
 
 export const BalanceSheetAccounts = (Base: any) =>
   class extends R.compose(
@@ -58,11 +56,6 @@ export const BalanceSheetAccounts = (Base: any) =>
      */
     readonly i18n: any;
 
-    /**
-     * Balance sheet repository.
-     */
-    readonly repository: BalanceSheetRepository;
-
     /**
      * Retrieve the accounts node of accounts types.
      * @param   {string} accountsTypes
@@ -85,12 +78,8 @@ export const BalanceSheetAccounts = (Base: any) =>
     private reportSchemaAccountNodeMapper = (
       account: IAccount
     ): IBalanceSheetAccountNode => {
-      const childrenAccountsIds = this.repository.accountsGraph.dependenciesOf(
-        account.id
-      );
-      const accountIds = R.uniq(R.append(account.id, childrenAccountsIds));
       const total = this.repository.totalAccountsLedger
-        .whereAccountsIds(accountIds)
+        .whereAccountId(account.id)
         .getClosingBalance();
 
       return {
@@ -139,19 +128,8 @@ export const BalanceSheetAccounts = (Base: any) =>
     private getAccountsNodesByAccountTypes = (
       accountsTypes: string[]
     ): IBalanceSheetAccountNode[] => {
-      // Retrieves accounts from the given defined node account types.
       const accounts = this.getAccountsByAccountTypes(accountsTypes);
-
-      // Converts the flatten accounts to tree.
-      const accountsTree = flatToNestedArray(accounts, {
-        id: 'id',
-        parentId: 'parentAccountId',
-      });
-      // Maps over the accounts tree.
-      return this.mapNodesDeep(
-        accountsTree,
-        this.reportSchemaAccountNodeComposer
-      );
+      return R.map(this.reportSchemaAccountNodeComposer, accounts);
     };
 
     /**

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

@@ -1,4 +1,6 @@
 import * as R from 'ramda';
+import { FinancialPreviousPeriod } from '../FinancialPreviousPeriod';
+import { FinancialHorizTotals } from '../FinancialHorizTotals';
 import { FinancialSheetStructure } from '../FinancialSheetStructure';
 import {
   BALANCE_SHEET_SCHEMA_NODE_TYPE,

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

@@ -3,6 +3,7 @@ import * as R from 'ramda';
 import { Knex } from 'knex';
 import { isEmpty } from 'lodash';
 import {
+  IAccount,
   IAccountTransactionsGroupBy,
   IBalanceSheetQuery,
   ILedger,
@@ -11,6 +12,7 @@ import { transformToMapBy } from 'utils';
 import Ledger from '@/services/Accounting/Ledger';
 import { BalanceSheetQuery } from './BalanceSheetQuery';
 import { FinancialDatePeriods } from '../FinancialDatePeriods';
+import { ACCOUNT_PARENT_TYPE, ACCOUNT_TYPE } from '@/data/AccountTypes';
 import { BalanceSheetRepositoryNetIncome } from './BalanceSheetRepositoryNetIncome';
 
 @Service()
@@ -38,11 +40,6 @@ export default class BalanceSheetRepository extends R.compose(
    */
   public accounts: any;
 
-  /**
-   * @param {}
-   */
-  public accountsGraph: any;
-
   /**
    *
    */
@@ -166,8 +163,6 @@ export default class BalanceSheetRepository extends R.compose(
    */
   public asyncInitialize = async () => {
     await this.initAccounts();
-    await this.initAccountsGraph();
-
     await this.initAccountsTotalLedger();
 
     // Date periods.
@@ -209,15 +204,6 @@ export default class BalanceSheetRepository extends R.compose(
     this.accountsByParentType = transformToMapBy(accounts, 'accountParentType');
   };
 
-  /**
-   * Initialize accounts graph.
-   */
-  public initAccountsGraph = async () => {
-    const { Account } = this.models;
-
-    this.accountsGraph = Account.toDependencyGraph(this.accounts);
-  };
-
   // ----------------------------
   // # Closing Total
   // ----------------------------

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

@@ -1,31 +1,29 @@
-import { isEmpty, get, last, sumBy, first, head } from 'lodash';
-import moment from 'moment';
-import * as R from 'ramda';
+import { isEmpty, get, last, sumBy } from 'lodash';
 import {
   IGeneralLedgerSheetQuery,
   IGeneralLedgerSheetAccount,
   IGeneralLedgerSheetAccountBalance,
   IGeneralLedgerSheetAccountTransaction,
   IAccount,
-  ILedgerEntry,
+  IJournalPoster,
+  IJournalEntry,
+  IContact,
 } from '@/interfaces';
 import FinancialSheet from '../FinancialSheet';
-import { GeneralLedgerRepository } from './GeneralLedgerRepository';
-import { FinancialSheetStructure } from '../FinancialSheetStructure';
-import { flatToNestedArray } from '@/utils';
-import Ledger from '@/services/Accounting/Ledger';
-import { calculateRunningBalance } from './_utils';
+import moment from 'moment';
 
 /**
  * General ledger sheet.
  */
-export default class GeneralLedgerSheet extends R.compose(
-  FinancialSheetStructure
-)(FinancialSheet) {
-  private query: IGeneralLedgerSheetQuery;
-  private baseCurrency: string;
-  private i18n: any;
-  private repository: GeneralLedgerRepository;
+export default class GeneralLedgerSheet extends FinancialSheet {
+  tenantId: number;
+  accounts: IAccount[];
+  query: IGeneralLedgerSheetQuery;
+  openingBalancesJournal: IJournalPoster;
+  transactions: IJournalPoster;
+  contactsMap: Map<number, IContact>;
+  baseCurrency: string;
+  i18n: any;
 
   /**
    * Constructor method.
@@ -36,59 +34,63 @@ export default class GeneralLedgerSheet extends R.compose(
    * @param {IJournalPoster} closingBalancesJournal -
    */
   constructor(
+    tenantId: number,
     query: IGeneralLedgerSheetQuery,
-    repository: GeneralLedgerRepository,
+    accounts: IAccount[],
+    contactsByIdMap: Map<number, IContact>,
+    transactions: IJournalPoster,
+    openingBalancesJournal: IJournalPoster,
+    baseCurrency: string,
     i18n
   ) {
     super();
 
+    this.tenantId = tenantId;
     this.query = query;
     this.numberFormat = this.query.numberFormat;
-    this.repository = repository;
-    this.baseCurrency = this.repository.tenant.metadata.currencyCode;
+    this.accounts = accounts;
+    this.contactsMap = contactsByIdMap;
+    this.transactions = transactions;
+    this.openingBalancesJournal = openingBalancesJournal;
+    this.baseCurrency = baseCurrency;
     this.i18n = i18n;
   }
 
   /**
-   * Entry mapper.
-   * @param {ILedgerEntry} entry -
-   * @return {IGeneralLedgerSheetAccountTransaction}
+   * Retrieve the transaction amount.
+   * @param {number} credit - Credit amount.
+   * @param {number} debit - Debit amount.
+   * @param {string} normal - Credit or debit.
    */
-  private getEntryRunningBalance(
-    entry: ILedgerEntry,
-    openingBalance: number,
-    runningBalance?: number
-  ): number {
-    const lastRunningBalance = runningBalance || openingBalance;
-
-    const amount = Ledger.getAmount(
-      entry.credit,
-      entry.debit,
-      entry.accountNormal
-    );
-    return calculateRunningBalance(amount, lastRunningBalance);
+  getAmount(credit: number, debit: number, normal: string) {
+    return normal === 'credit' ? credit - debit : debit - credit;
   }
 
   /**
-   * Maps the given ledger entry to G/L transaction.
-   * @param {ILedgerEntry} entry
-   * @param {number} runningBalance
-   * @returns {IGeneralLedgerSheetAccountTransaction}
+   * Entry mapper.
+   * @param {IJournalEntry} entry -
+   * @return {IGeneralLedgerSheetAccountTransaction}
    */
-  private transactionMapper(
-    entry: ILedgerEntry,
-    runningBalance: number
-  ): IGeneralLedgerSheetAccountTransaction {
-    const contact = this.repository.contactsById.get(entry.contactId);
-    const amount = Ledger.getAmount(
+  entryReducer(
+    entries: IGeneralLedgerSheetAccountTransaction[],
+    entry: IJournalEntry,
+    openingBalance: number
+  ): IGeneralLedgerSheetAccountTransaction[] {
+    const lastEntry = last(entries);
+
+    const contact = this.contactsMap.get(entry.contactId);
+    const amount = this.getAmount(
       entry.credit,
       entry.debit,
       entry.accountNormal
     );
-    return {
-      id: entry.id,
+    const runningBalance =
+      amount + (!isEmpty(entries) ? lastEntry.runningBalance : openingBalance);
+
+    const newEntry = {
       date: entry.date,
       dateFormatted: moment(entry.date).format('YYYY MMM DD'),
+      entryId: entry.id,
 
       transactionNumber: entry.transactionNumber,
       referenceType: entry.referenceType,
@@ -107,15 +109,16 @@ export default class GeneralLedgerSheet extends R.compose(
       amount,
       runningBalance,
 
-      formattedAmount: this.formatNumber(amount, { excerptZero: false }),
-      formattedCredit: this.formatNumber(entry.credit, { excerptZero: false }),
-      formattedDebit: this.formatNumber(entry.debit, { excerptZero: false }),
-      formattedRunningBalance: this.formatNumber(runningBalance, {
-        excerptZero: false,
-      }),
+      formattedAmount: this.formatNumber(amount),
+      formattedCredit: this.formatNumber(entry.credit),
+      formattedDebit: this.formatNumber(entry.debit),
+      formattedRunningBalance: this.formatNumber(runningBalance),
 
       currencyCode: this.baseCurrency,
-    } as IGeneralLedgerSheetAccountTransaction;
+    };
+    entries.push(newEntry);
+
+    return entries;
   }
 
   /**
@@ -127,48 +130,28 @@ export default class GeneralLedgerSheet extends R.compose(
     account: IAccount,
     openingBalance: number
   ): IGeneralLedgerSheetAccountTransaction[] {
-    const entries = this.repository.transactionsLedger
-      .whereAccountId(account.id)
-      .getEntries();
+    const entries = this.transactions.getAccountEntries(account.id);
 
-    return entries
-      .reduce((prev: Array<[number, ILedgerEntry]>, current: ILedgerEntry) => {
-        const prevEntry = last(prev);
-        const prevRunningBalance = head(prevEntry) as number;
-        const amount = this.getEntryRunningBalance(
-          current,
-          openingBalance,
-          prevRunningBalance
-        );
-        return [...prev, [amount, current]];
-      }, [])
-      .map((entryPair: [number, ILedgerEntry]) => {
-        const [runningBalance, entry] = entryPair;
-
-        return this.transactionMapper(entry, runningBalance);
-      });
+    return entries.reduce(
+      (
+        entries: IGeneralLedgerSheetAccountTransaction[],
+        entry: IJournalEntry
+      ) => {
+        return this.entryReducer(entries, entry, openingBalance);
+      },
+      []
+    );
   }
 
   /**
-   * Retrieves the given account opening balance.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountOpeningBalance(accountId: number): number {
-    return this.repository.openingBalanceTransactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-  }
-
-  /**
-   * Retrieve the given account opening balance.
+   * Retrieve account opening balance.
    * @param {IAccount} account
    * @return {IGeneralLedgerSheetAccountBalance}
    */
-  private accountOpeningBalanceTotal(
-    accountId: number
+  private accountOpeningBalance(
+    account: IAccount
   ): IGeneralLedgerSheetAccountBalance {
-    const amount = this.accountOpeningBalance(accountId);
+    const amount = this.openingBalancesJournal.getAccountBalance(account.id);
     const formattedAmount = this.formatTotalNumber(amount);
     const currencyCode = this.baseCurrency;
     const date = this.query.fromDate;
@@ -177,31 +160,15 @@ export default class GeneralLedgerSheet extends R.compose(
   }
 
   /**
-   * Retrieves the given account closing balance.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountClosingBalance(accountId: number): number {
-    const openingBalance = this.repository.openingBalanceTransactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-
-    const transactionsBalance = this.repository.transactionsLedger
-      .whereAccountId(accountId)
-      .getClosingBalance();
-
-    return openingBalance + transactionsBalance;
-  }
-
-  /**
-   * Retrieves the given account closing balance.
+   * Retrieve account closing balance.
    * @param {IAccount} account
    * @return {IGeneralLedgerSheetAccountBalance}
    */
-  private accountClosingBalanceTotal(
-    accountId: number
+  private accountClosingBalance(
+    openingBalance: number,
+    transactions: IGeneralLedgerSheetAccountTransaction[]
   ): IGeneralLedgerSheetAccountBalance {
-    const amount = this.accountClosingBalance(accountId);
+    const amount = this.calcClosingBalance(openingBalance, transactions);
     const formattedAmount = this.formatTotalNumber(amount);
     const currencyCode = this.baseCurrency;
     const date = this.query.toDate;
@@ -209,78 +176,31 @@ export default class GeneralLedgerSheet extends R.compose(
     return { amount, formattedAmount, currencyCode, date };
   }
 
-  /**
-   * Retrieves the given account closing balance with subaccounts.
-   * @param {number} accountId
-   * @returns {number}
-   */
-  private accountClosingBalanceWithSubaccounts = (
-    accountId: number
-  ): number => {
-    const depsAccountsIds =
-      this.repository.accountsGraph.dependenciesOf(accountId);
-
-    const openingBalance = this.repository.openingBalanceTransactionsLedger
-      .whereAccountsIds([...depsAccountsIds, accountId])
-      .getClosingBalance();
-
-    const transactionsBalanceWithSubAccounts =
-      this.repository.transactionsLedger
-        .whereAccountsIds([...depsAccountsIds, accountId])
-        .getClosingBalance();
-
-    const closingBalance = openingBalance + transactionsBalanceWithSubAccounts;
-
-    return closingBalance;
-  };
-
-  /**
-   * Retrieves the closing balance with subaccounts total node.
-   * @param {number} accountId
-   * @returns {IGeneralLedgerSheetAccountBalance}
-   */
-  private accountClosingBalanceWithSubaccountsTotal = (
-    accountId: number
-  ): IGeneralLedgerSheetAccountBalance => {
-    const amount = this.accountClosingBalanceWithSubaccounts(accountId);
-    const formattedAmount = this.formatTotalNumber(amount);
-    const currencyCode = this.baseCurrency;
-    const date = this.query.toDate;
-
-    return { amount, formattedAmount, currencyCode, date };
-  };
-
-  /**
-   * Detarmines whether the closing balance subaccounts node should be exist.
-   * @param {number} accountId
-   * @returns {boolean}
-   */
-  private isAccountNodeIncludesClosingSubaccounts = (accountId: number) => {
-    // Retrun early if there is no accounts in the filter so
-    // return closing subaccounts in all cases.
-    if (isEmpty(this.query.accountsIds)) {
-      return true;
-    }
-    // Returns true if the given account id includes transactions.
-    return this.repository.accountNodesIncludeTransactions.includes(accountId);
-  };
+  private calcClosingBalance(
+    openingBalance: number,
+    transactions: IGeneralLedgerSheetAccountTransaction[]
+  ) {
+    return openingBalance + sumBy(transactions, (trans) => trans.amount);
+  }
 
   /**
    * Retreive general ledger accounts sections.
    * @param {IAccount} account
    * @return {IGeneralLedgerSheetAccount}
    */
-  private accountMapper = (account: IAccount): IGeneralLedgerSheetAccount => {
-    const openingBalance = this.accountOpeningBalanceTotal(account.id);
+  private accountMapper(account: IAccount): IGeneralLedgerSheetAccount {
+    const openingBalance = this.accountOpeningBalance(account);
+
     const transactions = this.accountTransactionsMapper(
       account,
       openingBalance.amount
     );
-    const closingBalance = this.accountClosingBalanceTotal(account.id);
-    const closingBalanceSubaccounts =
-      this.accountClosingBalanceWithSubaccountsTotal(account.id);
+    const closingBalance = this.accountClosingBalance(
+      openingBalance.amount,
+      transactions
+    );
 
-    const initialNode = {
+    return {
       id: account.id,
       name: account.name,
       code: account.code,
@@ -290,90 +210,34 @@ export default class GeneralLedgerSheet extends R.compose(
       transactions,
       closingBalance,
     };
-
-    return R.compose(
-      R.when(
-        () => this.isAccountNodeIncludesClosingSubaccounts(account.id),
-        R.assoc('closingBalanceSubaccounts', closingBalanceSubaccounts)
-      )
-    )(initialNode);
-  };
+  }
 
   /**
-   * Maps over deep nodes to retrieve the G/L account node.
-   * @param {IAccount[]} accounts
-   * @returns {IGeneralLedgerSheetAccount[]}
-   */
-  private accountNodesDeepMap = (
-    accounts: IAccount[]
-  ): IGeneralLedgerSheetAccount[] => {
-    return this.mapNodesDeep(accounts, this.accountMapper);
-  };
-
-  /**
-   * Transformes the flatten nodes to nested nodes.
-   */
-  private nestedAccountsNode = (flattenAccounts: IAccount[]): IAccount[] => {
-    return flatToNestedArray(flattenAccounts, {
-      id: 'id',
-      parentId: 'parentAccountId',
-    });
-  };
-
-  /**
-   * Filters account nodes.
-   * @param {IGeneralLedgerSheetAccount[]} nodes
-   * @returns  {IGeneralLedgerSheetAccount[]}
-   */
-  private filterAccountNodesByTransactionsFilter = (
-    nodes: IGeneralLedgerSheetAccount[]
-  ): IGeneralLedgerSheetAccount[] => {
-    return this.filterNodesDeep(
-      nodes,
-      (account: IGeneralLedgerSheetAccount) =>
-        !(account.transactions.length === 0 && this.query.noneTransactions)
-    );
-  };
-
-  /**
-   * Filters account nodes by the acounts filter.
-   * @param {IAccount[]} nodes
-   * @returns {IAccount[]}
-   */
-  private filterAccountNodesByAccountsFilter = (
-    nodes: IAccount[]
-  ): IAccount[] => {
-    return this.filterNodesDeep(nodes, (node: IGeneralLedgerSheetAccount) => {
-      if (R.isEmpty(this.query.accountsIds)) {
-        return true;
-      }
-      // Returns true if the given account id exists in the filter.
-      return this.repository.accountNodeInclude?.includes(node.id);
-    });
-  };
-
-  /**
-   * Retrieves mapped accounts with general ledger transactions and
-   * opeing/closing balance.
+   * Retrieve mapped accounts with general ledger transactions and opeing/closing balance.
    * @param {IAccount[]} accounts -
    * @return {IGeneralLedgerSheetAccount[]}
    */
   private accountsWalker(accounts: IAccount[]): IGeneralLedgerSheetAccount[] {
-    return R.compose(
-      R.defaultTo([]),
-      this.filterAccountNodesByTransactionsFilter,
-      this.accountNodesDeepMap,
-      R.defaultTo([]),
-      this.filterAccountNodesByAccountsFilter,
-      this.nestedAccountsNode
-    )(accounts);
+    return (
+      accounts
+        .map((account: IAccount) => this.accountMapper(account))
+        // Filter general ledger accounts that have no transactions
+        // when`noneTransactions` is on.
+        .filter(
+          (generalLedgerAccount: IGeneralLedgerSheetAccount) =>
+            !(
+              generalLedgerAccount.transactions.length === 0 &&
+              this.query.noneTransactions
+            )
+        )
+    );
   }
 
   /**
-   * Retrieves general ledger report data.
+   * Retrieve general ledger report data.
    * @return {IGeneralLedgerSheetAccount[]}
    */
   public reportData(): IGeneralLedgerSheetAccount[] {
-    return this.accountsWalker(this.repository.accounts);
+    return this.accountsWalker(this.accounts);
   }
 }

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

@@ -1,180 +0,0 @@
-import moment from 'moment';
-import * as R from 'ramda';
-import {
-  IAccount,
-  IAccountTransaction,
-  IContact,
-  IGeneralLedgerSheetQuery,
-  ITenant,
-} from '@/interfaces';
-import Ledger from '@/services/Accounting/Ledger';
-import { transformToMap } from '@/utils';
-import { Tenant } from '@/system/models';
-import { flatten, isEmpty, uniq } from 'lodash';
-
-export class GeneralLedgerRepository {
-  public filter: IGeneralLedgerSheetQuery;
-  public accounts: IAccount[];
-
-  public transactions: IAccountTransaction[];
-  public openingBalanceTransactions: IAccountTransaction[];
-
-  public transactionsLedger: Ledger;
-  public openingBalanceTransactionsLedger: Ledger;
-
-  public repositories: any;
-  public models: any;
-  public accountsGraph: any;
-
-  public contacts: IContact;
-  public contactsById: Map<number, IContact>;
-
-  public tenantId: number;
-  public tenant: ITenant;
-
-  public accountNodesIncludeTransactions: Array<number> = [];
-  public accountNodeInclude: Array<number> = [];
-
-  /**
-   * Constructor method.
-   * @param models
-   * @param repositories
-   * @param filter
-   */
-  constructor(
-    repositories: any,
-    filter: IGeneralLedgerSheetQuery,
-    tenantId: number
-  ) {
-    this.filter = filter;
-    this.repositories = repositories;
-    this.tenantId = tenantId;
-  }
-
-  /**
-   * Initialize the G/L report.
-   */
-  public async asyncInitialize() {
-    await this.initTenant();
-    await this.initAccounts();
-    await this.initAccountsGraph();
-    await this.initContacts();
-    await this.initAccountsOpeningBalance();
-    this.initAccountNodesIncludeTransactions();
-    await this.initTransactions();
-    this.initAccountNodesIncluded();
-  }
-
-  /**
-   * Initialize the tenant.
-   */
-  public async initTenant() {
-    this.tenant = await Tenant.query()
-      .findById(this.tenantId)
-      .withGraphFetched('metadata');
-  }
-
-  /**
-   * Initialize the accounts.
-   */
-  public async initAccounts() {
-    this.accounts = await this.repositories.accountRepository
-      .all()
-      .orderBy('name', 'ASC');
-  }
-
-  /**
-   * Initialize the accounts graph.
-   */
-  public async initAccountsGraph() {
-    this.accountsGraph =
-      await this.repositories.accountRepository.getDependencyGraph();
-  }
-
-  /**
-   * Initialize the contacts.
-   */
-  public async initContacts() {
-    this.contacts = await this.repositories.contactRepository.all();
-    this.contactsById = transformToMap(this.contacts, 'id');
-  }
-
-  /**
-   * Initialize the G/L transactions from/to the given date.
-   */
-  public async initTransactions() {
-    this.transactions = await this.repositories.transactionsRepository
-      .journal({
-        fromDate: this.filter.fromDate,
-        toDate: this.filter.toDate,
-        branchesIds: this.filter.branchesIds,
-      })
-      .orderBy('date', 'ASC')
-      .onBuild((query) => {
-        if (this.filter.accountsIds?.length > 0) {
-          query.whereIn('accountId', this.accountNodesIncludeTransactions);
-        }
-      });
-    // Transform array transactions to journal collection.
-    this.transactionsLedger = Ledger.fromTransactions(this.transactions);
-  }
-
-  /**
-   * Initialize the G/L accounts opening balance.
-   */
-  public async initAccountsOpeningBalance() {
-    // Retreive opening balance credit/debit sumation.
-    this.openingBalanceTransactions =
-      await this.repositories.transactionsRepository.journal({
-        toDate: moment(this.filter.fromDate).subtract(1, 'day'),
-        sumationCreditDebit: true,
-        branchesIds: this.filter.branchesIds,
-      });
-
-    // Accounts opening transactions.
-    this.openingBalanceTransactionsLedger = Ledger.fromTransactions(
-      this.openingBalanceTransactions
-    );
-  }
-
-  /**
-   * Initialize the account nodes that should include transactions.
-   * @returns {void}
-   */
-  public initAccountNodesIncludeTransactions() {
-    if (isEmpty(this.filter.accountsIds)) {
-      return;
-    }
-    const childrenNodeIds = this.filter.accountsIds?.map(
-      (accountId: number) => {
-        return this.accountsGraph.dependenciesOf(accountId);
-      }
-    );
-    const nodeIds = R.concat(this.filter.accountsIds, childrenNodeIds);
-
-    this.accountNodesIncludeTransactions = uniq(flatten(nodeIds));
-  }
-
-  /**
-   * Initialize the account node ids should be included,
-   * if the filter by acounts is presented.
-   * @returns {void}
-   */
-  public initAccountNodesIncluded() {
-    if (isEmpty(this.filter.accountsIds)) {
-      return;
-    }
-    const nodeIds = this.filter.accountsIds.map((accountId) => {
-      const childrenIds = this.accountsGraph.dependenciesOf(accountId);
-      const parentIds = this.accountsGraph.dependantsOf(accountId);
-
-      return R.concat(childrenIds, parentIds);
-    });
-
-    this.accountNodeInclude = R.compose(
-      R.uniq,
-      R.flatten,
-      R.concat(this.filter.accountsIds)
-    )(nodeIds);
-  }
-}

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

@@ -1,10 +1,18 @@
 import { Service, Inject } from 'typedi';
 import moment from 'moment';
+import { ServiceError } from '@/exceptions';
+import { difference } from 'lodash';
 import { IGeneralLedgerSheetQuery, IGeneralLedgerMeta } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
+import Journal from '@/services/Accounting/JournalPoster';
 import GeneralLedgerSheet from '@/services/FinancialStatements/GeneralLedger/GeneralLedger';
+import { transformToMap } from 'utils';
+import { Tenant } from '@/system/models';
 import { GeneralLedgerMeta } from './GeneralLedgerMeta';
-import { GeneralLedgerRepository } from './GeneralLedgerRepository';
+
+const ERRORS = {
+  ACCOUNTS_NOT_FOUND: 'ACCOUNTS_NOT_FOUND',
+};
 
 @Service()
 export class GeneralLedgerService {
@@ -32,13 +40,29 @@ export class GeneralLedgerService {
     };
   }
 
+  /**
+   * Validates accounts existance on the storage.
+   * @param {number} tenantId
+   * @param {number[]} accountsIds
+   */
+  async validateAccountsExistance(tenantId: number, accountsIds: number[]) {
+    const { Account } = this.tenancy.models(tenantId);
+
+    const storedAccounts = await Account.query().whereIn('id', accountsIds);
+    const storedAccountsIds = storedAccounts.map((a) => a.id);
+
+    if (difference(accountsIds, storedAccountsIds).length > 0) {
+      throw new ServiceError(ERRORS.ACCOUNTS_NOT_FOUND);
+    }
+  }
+
   /**
    * Retrieve general ledger report statement.
    * @param {number} tenantId
    * @param {IGeneralLedgerSheetQuery} query
-   * @return {Promise<IGeneralLedgerStatement>}
+   * @return {IGeneralLedgerStatement}
    */
-  public async generalLedger(
+  async generalLedger(
     tenantId: number,
     query: IGeneralLedgerSheetQuery
   ): Promise<{
@@ -46,24 +70,60 @@ export class GeneralLedgerService {
     query: IGeneralLedgerSheetQuery;
     meta: IGeneralLedgerMeta;
   }> {
-    const repositories = this.tenancy.repositories(tenantId);
+    const { accountRepository, transactionsRepository, contactRepository } =
+      this.tenancy.repositories(tenantId);
+
     const i18n = this.tenancy.i18n(tenantId);
 
+    const tenant = await Tenant.query()
+      .findById(tenantId)
+      .withGraphFetched('metadata');
+
     const filter = {
       ...this.defaultQuery,
       ...query,
     };
-    const genealLedgerRepository = new GeneralLedgerRepository(
-      repositories,
-      query,
-      tenantId
-    );
-    await genealLedgerRepository.asyncInitialize();
+    // Retrieve all accounts with associated type from the storage.
+    const accounts = await accountRepository.all();
+    const accountsGraph = await accountRepository.getDependencyGraph();
 
+    // Retrieve all contacts on the storage.
+    const contacts = await contactRepository.all();
+    const contactsByIdMap = transformToMap(contacts, 'id');
+
+    // Retreive journal transactions from/to the given date.
+    const transactions = await transactionsRepository.journal({
+      fromDate: filter.fromDate,
+      toDate: filter.toDate,
+      branchesIds: filter.branchesIds,
+    });
+    // Retreive opening balance credit/debit sumation.
+    const openingBalanceTrans = await transactionsRepository.journal({
+      toDate: moment(filter.fromDate).subtract(1, 'day'),
+      sumationCreditDebit: true,
+      branchesIds: filter.branchesIds,
+    });
+    // Transform array transactions to journal collection.
+    const transactionsJournal = Journal.fromTransactions(
+      transactions,
+      tenantId,
+      accountsGraph
+    );
+    // Accounts opening transactions.
+    const openingTransJournal = Journal.fromTransactions(
+      openingBalanceTrans,
+      tenantId,
+      accountsGraph
+    );
     // General ledger report instance.
     const generalLedgerInstance = new GeneralLedgerSheet(
+      tenantId,
       filter,
-      genealLedgerRepository,
+      accounts,
+      contactsByIdMap,
+      transactionsJournal,
+      openingTransJournal,
+      tenant.metadata.baseCurrency,
       i18n
     );
     // Retrieve general ledger report data.

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

@@ -83,8 +83,8 @@ export class GeneralLedgerTable extends R.compose(
    */
   private openingBalanceColumnsAccessors(): IColumnMapperMeta[] {
     return [
-      { key: 'date', value: 'Opening Balance' },
-      { key: 'account_name', value: '' },
+      { key: 'date', value: this.meta.fromDate },
+      { key: 'account_name', value: 'Opening Balance' },
       { key: 'reference_type', accessor: '_empty_' },
       { key: 'reference_number', accessor: '_empty_' },
       { key: 'description', accessor: 'description' },
@@ -97,15 +97,12 @@ export class GeneralLedgerTable extends R.compose(
 
   /**
    * Closing balance row column accessors.
-   * @param {IGeneralLedgerSheetAccount} account -
    * @returns {ITableColumnAccessor[]}
    */
-  private closingBalanceColumnAccessors(
-    account: IGeneralLedgerSheetAccount
-  ): IColumnMapperMeta[] {
+  private closingBalanceColumnAccessors(): IColumnMapperMeta[] {
     return [
-      { key: 'date', value: `Closing balance for ${account.name}` },
-      { key: 'account_name', value: `` },
+      { key: 'date', value: this.meta.toDate },
+      { key: 'account_name', value: 'Closing Balance' },
       { key: 'reference_type', accessor: '_empty_' },
       { key: 'reference_number', accessor: '_empty_' },
       { key: 'description', accessor: '_empty_' },
@@ -116,36 +113,6 @@ export class GeneralLedgerTable extends R.compose(
     ];
   }
 
-  /**
-   * Closing balance row column accessors.
-   * @param {IGeneralLedgerSheetAccount} account -
-   * @returns {ITableColumnAccessor[]}
-   */
-  private closingBalanceWithSubaccountsColumnAccessors(
-    account: IGeneralLedgerSheetAccount
-  ): IColumnMapperMeta[] {
-    return [
-      {
-        key: 'date',
-        value: `Closing Balance for ${account.name} with sub-accounts`,
-      },
-      {
-        key: 'account_name',
-        value: ``,
-      },
-      { key: 'reference_type', accessor: '_empty_' },
-      { key: 'reference_number', accessor: '_empty_' },
-      { key: 'description', accessor: '_empty_' },
-      { key: 'credit', accessor: '_empty_' },
-      { key: 'debit', accessor: '_empty_' },
-      { key: 'amount', accessor: 'closingBalanceSubaccounts.formattedAmount' },
-      {
-        key: 'running_balance',
-        accessor: 'closingBalanceSubaccounts.formattedAmount',
-      },
-    ];
-  }
-
   /**
    * Retrieves the common table columns.
    * @returns {ITableColumn[]}
@@ -217,22 +184,7 @@ export class GeneralLedgerTable extends R.compose(
    * @returns {ITableRow}
    */
   private closingBalanceMapper = (account: IGeneralLedgerSheetAccount) => {
-    const columns = this.closingBalanceColumnAccessors(account);
-    const meta = {
-      rowTypes: [ROW_TYPE.CLOSING_BALANCE],
-    };
-    return tableRowMapper(account, columns, meta);
-  };
-
-  /**
-   * Maps the given account node to opening balance table row.
-   * @param {IGeneralLedgerSheetAccount} account
-   * @returns {ITableRow}
-   */
-  private closingBalanceWithSubaccountsMapper = (
-    account: IGeneralLedgerSheetAccount
-  ): ITableRow => {
-    const columns = this.closingBalanceWithSubaccountsColumnAccessors(account);
+    const columns = this.closingBalanceColumnAccessors();
     const meta = {
       rowTypes: [ROW_TYPE.CLOSING_BALANCE],
     };
@@ -269,27 +221,8 @@ export class GeneralLedgerTable extends R.compose(
       rowTypes: [ROW_TYPE.ACCOUNT],
     };
     const row = tableRowMapper(account, columns, meta);
-    const closingBalanceWithSubaccounts =
-      this.closingBalanceWithSubaccountsMapper(account);
 
-    // Appends the closing balance with sub-accounts row if the account
-    // has children accounts and the node is define.
-    const isAppendClosingSubaccounts = () =>
-      account.children?.length > 0 && !!account.closingBalanceSubaccounts;
-
-    const children = R.compose(
-      R.when(
-        isAppendClosingSubaccounts,
-        R.append(closingBalanceWithSubaccounts)
-      ),
-      R.concat(R.defaultTo([], transactions)),
-      R.when(
-        () => account?.children?.length > 0,
-        R.concat(R.defaultTo([], account.children))
-      )
-    )([]);
-
-    return R.assoc('children', children)(row);
+    return R.assoc('children', transactions)(row);
   };
 
   /**
@@ -300,7 +233,7 @@ export class GeneralLedgerTable extends R.compose(
   private accountsMapper = (
     accounts: IGeneralLedgerSheetAccount[]
   ): ITableRow[] => {
-    return this.mapNodesDeepReverse(accounts, this.accountMapper);
+    return this.mapNodesDeep(accounts, this.accountMapper);
   };
 
   /**
@@ -317,6 +250,7 @@ export class GeneralLedgerTable extends R.compose(
    */
   public tableColumns(): ITableColumn[] {
     const columns = this.commonColumns();
+
     return R.compose(this.tableColumnsCellIndexing)(columns);
   }
 }

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

@@ -1,13 +0,0 @@
-/**
- * Calculate the running balance.
- * @param {number} amount - Transaction amount.
- * @param {number} lastRunningBalance - Last running balance.
- * @param {number} openingBalance - Opening balance.
- * @return {number} Running balance.
- */
-export function calculateRunningBalance(
-  amount: number,
-  lastRunningBalance: number
-): number {
-  return amount + lastRunningBalance;
-}

packages/server/src/services/FinancialStatements/JournalSheet/JournalSheetTable.ts

@@ -50,8 +50,8 @@ export class JournalSheetTable extends R.compose(
       { key: 'description', accessor: 'entry.note' },
       { key: 'account_code', accessor: 'entry.accountCode' },
       { key: 'account_name', accessor: 'entry.accountName' },
-      { key: 'debit', accessor: 'entry.formattedDebit' },
       { key: 'credit', accessor: 'entry.formattedCredit' },
+      { key: 'debit', accessor: 'entry.formattedDebit' },
     ];
   };
 
@@ -67,8 +67,8 @@ export class JournalSheetTable extends R.compose(
       { key: 'description', accessor: 'note' },
       { key: 'account_code', accessor: 'accountCode' },
       { key: 'account_name', accessor: 'accountName' },
-      { key: 'debit', accessor: 'formattedDebit' },
       { key: 'credit', accessor: 'formattedCredit' },
+      { key: 'debit', accessor: 'formattedDebit' },
     ];
   };
 
@@ -84,8 +84,8 @@ export class JournalSheetTable extends R.compose(
       { key: 'description', accessor: '_empty_' },
       { key: 'account_code', accessor: '_empty_' },
       { key: 'account_name', accessor: '_empty_' },
-      { key: 'debit', accessor: 'formattedDebit' },
       { key: 'credit', accessor: 'formattedCredit' },
+      { key: 'debit', accessor: 'formattedDebit' },
     ];
   };
 
@@ -101,8 +101,8 @@ export class JournalSheetTable extends R.compose(
       { key: 'description', value: '' },
       { key: 'account_code', value: '' },
       { key: 'account_name', value: '' },
-      { key: 'debit', value: '' },
       { key: 'credit', value: '' },
+      { key: 'debit', value: '' },
     ];
   };
 
@@ -118,8 +118,8 @@ export class JournalSheetTable extends R.compose(
       { key: 'description', label: 'Description' },
       { key: 'account_code', label: 'Acc. Code' },
       { key: 'account_name', label: 'Account' },
-      { key: 'debit', label: 'Debit' },
       { key: 'credit', label: 'Credit' },
+      { key: 'debit', label: 'Debit' },
     ];
   }
 

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

@@ -24,7 +24,6 @@ import { ProfitLossSheetPreviousYear } from './ProfitLossSheetPreviousYear';
 import { ProfitLossSheetPreviousPeriod } from './ProfitLossSheetPreviousPeriod';
 import { FinancialDateRanges } from '../FinancialDateRanges';
 import { ProfitLossSheetFilter } from './ProfitLossSheetFilter';
-import { flatToNestedArray } from '@/utils';
 
 export default class ProfitLossSheet extends R.compose(
   ProfitLossSheetPreviousYear,
@@ -83,22 +82,14 @@ export default class ProfitLossSheet extends R.compose(
 
   /**
    * Retrieve the sheet account node from the given account.
-   * @param {IAccount} account
+   * @param   {IAccount} account
    * @returns {IProfitLossSheetAccountNode}
    */
   private accountNodeMapper = (
     account: IAccount
   ): IProfitLossSheetAccountNode => {
-    // Retrieves the children account ids of the given account id.
-    const childrenAccountIds = this.repository.accountsGraph.dependenciesOf(
-      account.id
-    );
-    // Concat the children and the given account id.
-    const accountIds = R.uniq(R.append(account.id, childrenAccountIds));
-
-    // Retrieves the closing balance of the account included children accounts.
     const total = this.repository.totalAccountsLedger
-      .whereAccountsIds(accountIds)
+      .whereAccountId(account.id)
       .getClosingBalance();
 
     return {
@@ -135,19 +126,18 @@ export default class ProfitLossSheet extends R.compose(
   };
 
   /**
-   * Retrieves report accounts nodes by the given accounts types.
-   * @param {string[]} types
+   * Retrieve report accounts nodes by the given accounts types.
+   * @param   {string[]} types
    * @returns {IBalanceSheetAccountNode}
    */
   private getAccountsNodesByTypes = (
     types: string[]
   ): IProfitLossSheetAccountNode[] => {
-    const accounts = this.repository.getAccountsByType(types);
-    const accountsTree = flatToNestedArray(accounts, {
-      id: 'id',
-      parentId: 'parentAccountId',
-    });
-    return this.mapNodesDeep(accountsTree, this.accountNodeCompose);
+    return R.compose(
+      R.map(this.accountNodeCompose),
+      R.flatten,
+      R.map(this.repository.getAccountsByType)
+    )(types);
   };
 
   /**

packages/server/src/services/FinancialStatements/ProfitLossSheet/ProfitLossSheetRepository.ts

@@ -1,4 +1,4 @@
-import { castArray, defaultTo } from 'lodash';
+import { defaultTo } from 'lodash';
 import * as R from 'ramda';
 import { Knex } from 'knex';
 import { isEmpty } from 'lodash';
@@ -31,11 +31,6 @@ export class ProfitLossSheetRepository extends R.compose(FinancialDatePeriods)(
    */
   public accounts: IAccount[];
 
-  /**
-   *
-   */
-  public accountsGraph: any;
-
   /**
    * Transactions group type.
    * @param {IAccountTransactionsGroupBy}
@@ -140,8 +135,6 @@ export class ProfitLossSheetRepository extends R.compose(FinancialDatePeriods)(
    */
   public asyncInitialize = async () => {
     await this.initAccounts();
-    await this.initAccountsGraph();
-
     await this.initAccountsTotalLedger();
 
     // Date Periods.
@@ -184,15 +177,6 @@ export class ProfitLossSheetRepository extends R.compose(FinancialDatePeriods)(
     this.accountsByType = transformToMapBy(accounts, 'accountType');
   };
 
-  /**
-   * Initialize accounts graph.
-   */
-  private initAccountsGraph = async () => {
-    const { Account } = this.models;
-
-    this.accountsGraph = Account.toDependencyGraph(this.accounts);
-  };
-
   // ----------------------------
   // # Closing Total.
   // ----------------------------
@@ -353,18 +337,7 @@ export class ProfitLossSheetRepository extends R.compose(FinancialDatePeriods)(
     return Account.query();
   };
 
-  /**
-   * 
-   * @param type 
-   * @returns 
-   */
-  public getAccountsByType = (type: string[] | string) => {
-    return R.compose(
-      R.flatten,
-      R.map((accountType) =>
-        R.defaultTo([], this.accountsByType.get(accountType))
-      ),
-      castArray
-    )(type);
+  public getAccountsByType = (type: string) => {
+    return defaultTo(this.accountsByType.get(type), []);
   };
 }

packages/server/src/services/InviteUsers/SyncSystemSendInvite.ts

@@ -46,9 +46,6 @@ export default class SyncSystemSendInvite {
       email: user.email,
       active: user.active,
       tenantId,
-
-      // Email should be verified since the user got the invite token through email.
-      verified: true,
     });
     // Creates a invite user token.
     const invite = await Invite.query().insert({

packages/server/src/services/ManualJournals/ManualJournalTransformer.ts

@@ -13,7 +13,6 @@ export class ManualJournalTransfromer extends Transformer {
       'formattedAmount',
       'formattedDate',
       'formattedPublishedAt',
-      'formattedCreatedAt',
       'attachments',
     ];
   };
@@ -38,15 +37,6 @@ export class ManualJournalTransfromer extends Transformer {
     return this.formatDate(manualJorunal.date);
   };
 
-  /**
-   * Retrieve formatted created at date.
-   * @param {IManualJournal} manualJournal
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (manualJorunal: IManualJournal): string => {
-    return this.formatDate(manualJorunal.createdAt);
-  };
-
   /**
    * Retrieve formatted published at date.
    * @param {IManualJournal} manualJournal

packages/server/src/services/Organization/OrganizationService.ts

@@ -207,7 +207,7 @@ export default class OrganizationService {
   ): IOrganizationBuildDTO {
     return {
       ...buildDTO,
-      dateFormat: defaultTo(buildDTO.dateFormat, 'DD MMM yyyy'),
+      dateFormat: defaultTo(buildDTO.dateFormat, 'DD/MM/yyyy'),
     };
   }
 

packages/server/src/services/Purchases/BillPayments/BillPaymentEntryTransformer.ts

@@ -1,6 +1,5 @@
 import { Transformer } from '@/lib/Transformer/Transformer';
 import { formatNumber } from '@/utils';
-import { PurchaseInvoiceTransformer } from '../Bills/PurchaseInvoiceTransformer';
 
 export class BillPaymentEntryTransformer extends Transformer {
   /**
@@ -8,14 +7,7 @@ export class BillPaymentEntryTransformer extends Transformer {
    * @returns {Array}
    */
   public includeAttributes = (): string[] => {
-    return ['paymentAmountFormatted', 'bill'];
-  };
-
-  /**
-   * Retreives the
-   */
-  protected bill = (entry) => {
-    return this.item(entry.bill, new PurchaseInvoiceTransformer());
+    return ['paymentAmountFormatted'];
   };
 
   /**

packages/server/src/services/Purchases/BillPayments/BillPaymentTransformer.ts

@@ -12,7 +12,6 @@ export class BillPaymentTransformer extends Transformer {
   public includeAttributes = (): string[] => {
     return [
       'formattedPaymentDate',
-      'formattedCreatedAt',
       'formattedAmount',
       'entries',
       'attachments',
@@ -28,15 +27,6 @@ export class BillPaymentTransformer extends Transformer {
     return this.formatDate(billPayment.paymentDate);
   };
 
-  /**
-   * Retrieve formatted created at date.
-   * @param {IBillPayment} billPayment 
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (billPayment: IBillPayment): string => {
-    return this.formatDate(billPayment.createdAt);
-  }
-
   /**
    * Retrieve formatted bill amount.
    * @param {IBill} invoice

packages/server/src/services/Purchases/Bills/PurchaseInvoiceTransformer.ts

@@ -14,7 +14,6 @@ export class PurchaseInvoiceTransformer extends Transformer {
     return [
       'formattedBillDate',
       'formattedDueDate',
-      'formattedCreatedAt',
       'formattedAmount',
       'formattedPaymentAmount',
       'formattedBalance',
@@ -58,15 +57,6 @@ export class PurchaseInvoiceTransformer extends Transformer {
     return this.formatDate(bill.dueDate);
   };
 
-  /**
-   * Retrieve the formatted created at date.
-   * @param {IBill} bill
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (bill: IBill): string => {
-    return this.formatDate(bill.createdAt);
-  };
-
   /**
    * Retrieve formatted bill amount.
    * @param {IBill} bill

packages/server/src/services/Purchases/VendorCredits/VendorCreditTransformer.ts

@@ -14,7 +14,6 @@ export class VendorCreditTransformer extends Transformer {
       'formattedAmount',
       'formattedSubtotal',
       'formattedVendorCreditDate',
-      'formattedCreatedAt',
       'formattedCreditsRemaining',
       'formattedInvoicedAmount',
       'entries',
@@ -31,15 +30,6 @@ export class VendorCreditTransformer extends Transformer {
     return this.formatDate(vendorCredit.vendorCreditDate);
   };
 
-  /**
-   * Retireve formatted created at date.
-   * @param vendorCredit 
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (vendorCredit): string => {
-    return this.formatDate(vendorCredit.createdAt);
-  };
-
   /**
    * Retrieve formatted vendor credit amount.
    * @param {IVendorCredit} credit

packages/server/src/services/Resource/ResourceService.ts

@@ -108,28 +108,17 @@ export default class ResourceService {
     const $hasFields = (field) =>
       'undefined' !== typeof field.fields ? field : undefined;
 
-    const $ColumnHasColumns = (column) =>
+    const $hasColumns = (column) =>
       'undefined' !== typeof column.columns ? column : undefined;
 
-    const $hasColumns = (columns) =>
-      'undefined' !== typeof columns ? columns : undefined;
-
     const naviagations = [
       ['fields', qim.$each, 'name'],
       ['fields', qim.$each, $enumerationType, 'options', qim.$each, 'label'],
       ['fields2', qim.$each, 'name'],
       ['fields2', qim.$each, $enumerationType, 'options', qim.$each, 'label'],
       ['fields2', qim.$each, $hasFields, 'fields', qim.$each, 'name'],
-      ['columns', $hasColumns, qim.$each, 'name'],
-      [
-        'columns',
-        $hasColumns,
-        qim.$each,
-        $ColumnHasColumns,
-        'columns',
-        qim.$each,
-        'name',
-      ],
+      ['columns', qim.$each, 'name'],
+      ['columns', qim.$each, $hasColumns, 'columns', qim.$each, 'name'],
     ];
     return this.i18nService.i18nApply(naviagations, meta, tenantId);
   }

packages/server/src/services/Sales/Estimates/SaleEstimateTransformer.ts

@@ -18,7 +18,6 @@ export class SaleEstimateTransfromer extends Transformer {
       'formattedDeliveredAtDate',
       'formattedApprovedAtDate',
       'formattedRejectedAtDate',
-      'formattedCreatedAt',
       'entries',
       'attachments',
     ];
@@ -42,15 +41,6 @@ export class SaleEstimateTransfromer extends Transformer {
     return this.formatDate(estimate.expirationDate);
   };
 
-  /**
-   * Retrieves the formatted estimate created at.
-   * @param {ISaleEstimate} estimate -
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (estimate: ISaleEstimate): string => {
-    return this.formatDate(estimate.createdAt);
-  };
-
   /**
    * Retrieve formatted estimate date.
    * @param {ISaleEstimate} invoice

packages/server/src/services/Sales/Invoices/SaleInvoiceTransformer.ts

@@ -13,7 +13,6 @@ export class SaleInvoiceTransformer extends Transformer {
     return [
       'invoiceDateFormatted',
       'dueDateFormatted',
-      'createdAtFormatted',
       'dueAmountFormatted',
       'paymentAmountFormatted',
       'balanceAmountFormatted',
@@ -49,15 +48,6 @@ export class SaleInvoiceTransformer extends Transformer {
     return this.formatDate(invoice.dueDate);
   };
 
-  /**
-   * Retrieve the formatted created at date.
-   * @param invoice
-   * @returns {string}
-   */
-  protected createdAtFormatted = (invoice): string => {
-    return this.formatDate(invoice.createdAt);
-  };
-
   /**
    * Retrieve formatted invoice due amount.
    * @param {ISaleInvoice} invoice

packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts

@@ -146,7 +146,6 @@ export class EditPaymentReceive {
         paymentReceiveId,
         paymentReceive,
         oldPaymentReceive,
-        paymentReceiveDTO,
         authorizedUser,
         trx,
       } as IPaymentReceiveEditedPayload);

packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts

@@ -12,7 +12,6 @@ export class PaymentReceiveTransfromer extends Transformer {
     return [
       'subtotalFormatted',
       'formattedPaymentDate',
-      'formattedCreatedAt',
       'formattedAmount',
       'formattedExchangeRate',
       'entries',
@@ -28,18 +27,9 @@ export class PaymentReceiveTransfromer extends Transformer {
     return this.formatDate(payment.paymentDate);
   };
 
-  /**
-   * Retrieves the formatted created at date.
-   * @param {IPaymentReceive} payment
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (payment: IPaymentReceive): string => {
-    return this.formatDate(payment.createdAt);
-  };
-
   /**
    * Retrieve the formatted payment subtotal.
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceive} payment 
    * @returns {string}
    */
   protected subtotalFormatted = (payment: IPaymentReceive): string => {

packages/server/src/services/Sales/Receipts/SaleReceiptTransformer.ts

@@ -17,7 +17,6 @@ export class SaleReceiptTransformer extends Transformer {
       'formattedAmount',
       'formattedReceiptDate',
       'formattedClosedAtDate',
-      'formattedCreatedAt',
       'entries',
       'attachments',
     ];
@@ -41,15 +40,6 @@ export class SaleReceiptTransformer extends Transformer {
     return this.formatDate(receipt.closedAt);
   };
 
-  /**
-   * Retrieve formatted receipt created at date.
-   * @param receipt 
-   * @returns {string}
-   */
-  protected formattedCreatedAt = (receipt: ISaleReceipt): string => {
-    return this.formatDate(receipt.createdAt);
-  };
-
   /**
    * Retrieves the estimate formatted subtotal.
    * @param {ISaleReceipt} receipt

packages/server/src/system/models/SystemUser.ts

@@ -90,20 +90,6 @@ export default class SystemUser extends SystemModel {
     };
   }
 
-  /**
-   * Model modifiers.
-   */
-  static get modifiers() {
-    return {
-      /**
-       * Filters the invite accepted users.
-       */
-      inviteAccepted(query) {
-        query.whereNotNull('invite_accepted_at');
-      },
-    };
-  }
-
   /**
    * Verify the password of the user.
    * @param  {String} password - The given password.

packages/webapp/src/components/Branches/BranchSuggestField_.tsx

@@ -1,18 +0,0 @@
-// @ts-nocheck
-import { FSuggest } from '../Forms';
-
-interface BranchSuggestFieldProps {
-  items: any[];
-}
-
-export function BranchSuggestField({ ...props }: BranchSuggestFieldProps) {
-  return (
-    <FSuggest
-      valueAccessor={'id'}
-      labelAccessor={'code'}
-      textAccessor={'name'}
-      inputProps={{ placeholder: 'Select a branch' }}
-      {...props}
-    />
-  );
-}

packages/webapp/src/components/DrawersContainer.tsx

@@ -21,9 +21,9 @@ import RefundCreditNoteDetailDrawer from '@/containers/Drawers/RefundCreditNoteD
 import RefundVendorCreditDetailDrawer from '@/containers/Drawers/RefundVendorCreditDetailDrawer';
 import WarehouseTransferDetailDrawer from '@/containers/Drawers/WarehouseTransferDetailDrawer';
 import TaxRateDetailsDrawer from '@/containers/TaxRates/drawers/TaxRateDetailsDrawer/TaxRateDetailsDrawer';
-import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer';
 
 import { DRAWERS } from '@/constants/drawers';
+import CategorizeTransactionDrawer from '@/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionDrawer';
 
 /**
  * Drawers container of the dashboard.

packages/webapp/src/containers/Accounting/JournalsLanding/utils.tsx

@@ -16,7 +16,8 @@ export const useManualJournalsColumns = () => {
       {
         id: 'date',
         Header: intl.get('date'),
-        accessor: 'formatted_date',
+        accessor: 'date',
+        Cell: FormatDateCell,
         width: 115,
         className: 'date',
         clickable: true,
@@ -65,7 +66,8 @@ export const useManualJournalsColumns = () => {
       {
         id: 'created_at',
         Header: intl.get('created_at'),
-        accessor: 'formatted_created_at',
+        accessor: 'created_at',
+        Cell: FormatDateCell,
         width: 125,
         clickable: true,
       },

packages/webapp/src/containers/Accounting/MakeJournal/MakeJournalFormFloatingActions.tsx

@@ -13,7 +13,7 @@ import {
 import { useHistory } from 'react-router-dom';
 import { useFormikContext } from 'formik';
 import classNames from 'classnames';
-import { Group, Icon, If, FormattedMessage as T } from '@/components';
+import { Icon, If, FormattedMessage as T } from '@/components';
 import { CLASSES } from '@/constants/classes';
 import { useMakeJournalFormContext } from './MakeJournalProvider';
 
@@ -76,10 +76,7 @@ export default function MakeJournalFloatingAction() {
   };
 
   return (
-    <Group
-      spacing={10}
-      className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}
-    >
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Publish ----------- */}
       <If condition={!manualJournal || !manualJournal?.is_published}>
         <ButtonGroup>
@@ -191,6 +188,6 @@ export default function MakeJournalFloatingAction() {
         onClick={handleCancelBtnClick}
         text={<T id={'cancel'} />}
       />
-    </Group>
+    </div>
   );
 }

packages/webapp/src/containers/Accounting/MakeJournal/components.tsx

@@ -111,16 +111,16 @@ export const useJournalTableEntriesColumns = () => {
         fieldProps: { allowCreate: true },
       },
       {
-        Header: DebitHeaderCell,
-        accessor: 'debit',
+        Header: CreditHeaderCell,
+        accessor: 'credit',
         Cell: MoneyFieldCell,
         disableSortBy: true,
         width: 100,
         align: Align.Right,
       },
       {
-        Header: CreditHeaderCell,
-        accessor: 'credit',
+        Header: DebitHeaderCell,
+        accessor: 'debit',
         Cell: MoneyFieldCell,
         disableSortBy: true,
         width: 100,

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBoot.tsx

@@ -1,6 +1,5 @@
 // @ts-nocheck
-import React, { useMemo } from 'react';
-import { first } from 'lodash';
+import React from 'react';
 import { DrawerHeaderContent, DrawerLoading } from '@/components';
 import { DRAWERS } from '@/constants/drawers';
 import {
@@ -35,12 +34,6 @@ function CategorizeTransactionBoot({ uncategorizedTransactionId, ...props }) {
     isLoading: isUncategorizedTransactionLoading,
   } = useUncategorizedTransaction(uncategorizedTransactionId);
 
-  // Retrieves the primary branch.
-  const primaryBranch = useMemo(
-    () => branches?.find((b) => b.primary) || first(branches),
-    [branches],
-  );
-
   const provider = {
     uncategorizedTransactionId,
     uncategorizedTransaction,
@@ -49,7 +42,6 @@ function CategorizeTransactionBoot({ uncategorizedTransactionId, ...props }) {
     accounts,
     isBranchesLoading,
     isAccountsLoading,
-    primaryBranch,
   };
   const isLoading =
     isBranchesLoading || isUncategorizedTransactionLoading || isAccountsLoading;

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionBranchField.tsx

@@ -1,22 +0,0 @@
-// @ts-nocheck
-import { FFormGroup, FeatureCan } from '@/components';
-import { useCategorizeTransactionBoot } from './CategorizeTransactionBoot';
-import { Features } from '@/constants';
-import { BranchSuggestField } from '@/components/Branches/BranchSuggestField_';
-
-export function CategorizeTransactionBranchField() {
-  const { branches } = useCategorizeTransactionBoot();
-
-  return (
-    <FFormGroup name={'branchId'} label={'Branch'} fastField inline>
-      <FeatureCan feature={Features.Branches}>
-        <BranchSuggestField
-          name={'branchId'}
-          items={branches}
-          popoverProps={{ minimal: true }}
-          fill
-        />
-      </FeatureCan>
-    </FFormGroup>
-  );
-}

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx

@@ -24,11 +24,8 @@ function CategorizeTransactionFormRoot({
   // #withDrawerActions
   closeDrawer,
 }) {
-  const {
-    uncategorizedTransactionId,
-    uncategorizedTransaction,
-    primaryBranch,
-  } = useCategorizeTransactionBoot();
+  const { uncategorizedTransactionId, uncategorizedTransaction } =
+    useCategorizeTransactionBoot();
   const { mutateAsync: categorizeTransaction } = useCategorizeTransaction();
 
   // Callbacks handles form submit.
@@ -40,28 +37,18 @@ function CategorizeTransactionFormRoot({
       .then(() => {
         setSubmitting(false);
         closeDrawer(DRAWERS.CATEGORIZE_TRANSACTION);
-
+        
         AppToaster.show({
           message: 'The uncategorized transaction has been categorized.',
           intent: Intent.SUCCESS,
         });
       })
-      .catch((err) => {
+      .catch(() => {
         setSubmitting(false);
-        if (
-          err.response.data?.errors?.some(
-            (e) => e.type === 'BRANCH_ID_REQUIRED',
-          )
-        ) {
-          setErrors({
-            branchId: 'The branch is required.',
-          });
-        } else {
-          AppToaster.show({
-            message: 'Something went wrong!',
-            intent: Intent.DANGER,
-          });
-        }
+        AppToaster.show({
+          message: 'Something went wrong!',
+          intent: Intent.DANGER,
+        });
       });
   };
   // Form initial values in create and edit mode.
@@ -73,9 +60,6 @@ function CategorizeTransactionFormRoot({
      * as well.
      */
     ...transformToCategorizeForm(uncategorizedTransaction),
-
-    /** Assign the primary branch id as default value. */
-    branchId: primaryBranch?.id || null,
   };
 
   return (

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOtherIncome.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionOtherIncome() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOtherIncome() {
           fill={true}
         />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionOwnerContribution.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionOwnerContribution() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -64,8 +63,6 @@ export default function CategorizeTransactionOwnerContribution() {
       <FFormGroup name={'description'} label={'Description'} fastField inline>
         <FTextArea name={'description'} growVertically large fill />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyIn/CategorizeTransactionTransferFrom.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionTransferFrom() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -48,7 +47,7 @@ export default function CategorizeTransactionTransferFrom() {
         inline
       >
         <AccountsSelect
-          name={'creditAccountId'}
+          name={'to_account_id'}
           items={accounts}
           filterByRootTypes={['asset']}
           fastField
@@ -69,8 +68,6 @@ export default function CategorizeTransactionTransferFrom() {
           fill={true}
         />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOtherExpense.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionOtherExpense() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOtherExpense() {
           fill={true}
         />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionOwnerDrawings.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionOwnerDrawings() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -69,8 +68,6 @@ export default function CategorizeTransactionOwnerDrawings() {
           fill={true}
         />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/MoneyOut/CategorizeTransactionToAccount.tsx

@@ -8,7 +8,6 @@ import {
   FTextArea,
 } from '@/components';
 import { useCategorizeTransactionBoot } from '../CategorizeTransactionBoot';
-import { CategorizeTransactionBranchField } from '../CategorizeTransactionBranchField';
 
 export default function CategorizeTransactionToAccount() {
   const { accounts } = useCategorizeTransactionBoot();
@@ -50,7 +49,7 @@ export default function CategorizeTransactionToAccount() {
         <AccountsSelect
           name={'creditAccountId'}
           items={accounts}
-          filterByRootTypes={['asset']}
+          filterByRootTypes={['assset']}
           fastField
           fill
           allowCreate
@@ -69,8 +68,6 @@ export default function CategorizeTransactionToAccount() {
           fill={true}
         />
       </FFormGroup>
-
-      <CategorizeTransactionBranchField />
     </>
   );
 }

packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/_utils.ts

@@ -11,7 +11,6 @@ export const defaultInitialValues = {
   transactionType: '',
   referenceNo: '',
   description: '',
-  branchId: '',
 };
 
 export const transformToCategorizeForm = (uncategorizedTransaction) => {

packages/webapp/src/containers/Customers/CustomerForm/CustomerFloatingActions.tsx

@@ -13,11 +13,12 @@ import {
 } from '@blueprintjs/core';
 import classNames from 'classnames';
 import { useFormikContext } from 'formik';
-import { Group, Icon, FormattedMessage as T } from '@/components';
+import { Icon, FormattedMessage as T } from '@/components';
 import { CLASSES } from '@/constants/classes';
 import { useCustomerFormContext } from './CustomerFormProvider';
 import { safeInvoke } from '@/utils';
 
+
 /**
  * Customer floating actions bar.
  */
@@ -50,10 +51,7 @@ export default function CustomerFloatingActions({ onCancel }) {
   };
 
   return (
-    <Group
-      spacing={10}
-      className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}
-    >
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       <ButtonGroup>
         {/* ----------- Save and New ----------- */}
         <SaveButton
@@ -98,7 +96,7 @@ export default function CustomerFloatingActions({ onCancel }) {
         onClick={handleCancelBtnClick}
         text={<T id={'cancel'} />}
       />
-    </Group>
+    </div>
   );
 }
 

packages/webapp/src/containers/Drawers/AccountDrawer/utils.tsx

@@ -26,14 +26,6 @@ export const useAccountReadEntriesColumns = () => {
         width: 100,
         textOverview: true,
       },
-      {
-        Header: intl.get('debit'),
-        accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit',
-        width: 80,
-        className: 'debit',
-        align: 'right',
-        textOverview: true,
-      },
       {
         Header: intl.get('credit'),
         accessor: isFCYCurrencyType
@@ -44,6 +36,14 @@ export const useAccountReadEntriesColumns = () => {
         align: 'right',
         textOverview: true,
       },
+      {
+        Header: intl.get('debit'),
+        accessor: isFCYCurrencyType ? 'formatted_fc_debit' : 'formatted_debit',
+        width: 80,
+        className: 'debit',
+        align: 'right',
+        textOverview: true,
+      },
     ],
     [isFCYCurrencyType],
   );

packages/webapp/src/containers/Drawers/BillDrawer/BillDetailHeader.tsx

@@ -41,23 +41,19 @@ export default function BillDetailHeader() {
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem label={intl.get('bill_date')}>
-              {bill.formatted_bill_date}
+              <FormatDate value={bill.bill_date} />
             </DetailItem>
-
             <DetailItem label={intl.get('due_date')}>
-              {bill.formatted_due_date}
+              <FormatDate value={bill.due_date} />
             </DetailItem>
-
             <DetailItem label={intl.get('vendor_name')}>
               <VendorDrawerLink vendorId={bill.vendor_id}>
                 {bill.vendor?.display_name}
               </VendorDrawerLink>
             </DetailItem>
-
             <DetailItem label={intl.get('bill.details.bill_number')}>
               {defaultTo(bill.bill_number, '-')}
             </DetailItem>
-
             <ExchangeRateDetailItem
               exchangeRate={bill?.exchange_rate}
               toCurrency={bill?.currency_code}
@@ -79,7 +75,7 @@ export default function BillDetailHeader() {
             />
             <DetailItem
               label={intl.get('bill.details.created_at')}
-              children={bill.formatted_created_at}
+              children={<FormatDate value={bill.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/CashflowTransactionDetailDrawer/CashflowTransactionDrawerHeader.tsx

@@ -46,7 +46,7 @@ export default function CashflowTransactionDrawerHeader() {
             </DetailItem>
 
             <DetailItem label={<T id={'date'} />}>
-              {cashflowTransaction.formatted_date}
+              <FormatDate value={cashflowTransaction.date} />
             </DetailItem>
 
             <DetailItem name={'reference-no'} label={<T id={'reference_no'} />}>

packages/webapp/src/containers/Drawers/CreditNoteDetailDrawer/CreditNoteDetailHeader.tsx

@@ -5,11 +5,13 @@ import styled from 'styled-components';
 import { defaultTo } from 'lodash';
 
 import {
+  FormatDate,
   T,
   Row,
   Col,
   DetailsMenu,
   DetailItem,
+  ButtonLink,
   CommercialDocHeader,
   CommercialDocTopHeader,
   CustomerDrawerLink,
@@ -45,7 +47,7 @@ export default function CreditNoteDetailHeader() {
             <DetailItem
               label={intl.get('credit_note.drawer.label_credit_note_date')}
             >
-              {creditNote.formatted_credit_note_date}
+              <FormatDate value={creditNote.formatted_credit_note_date} />
             </DetailItem>
 
             <DetailItem
@@ -83,7 +85,7 @@ export default function CreditNoteDetailHeader() {
             />
             <DetailItem
               label={<T id={'credit_note.drawer.label_created_at'} />}
-              children={creditNote.formatted_created_at}
+              children={<FormatDate value={creditNote.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/EstimateDetailDrawer/EstimateDetailHeader.tsx

@@ -81,7 +81,7 @@ export default function EstimateDetailHeader() {
             />
             <DetailItem
               label={<T id={'estimate.details.created_at'} />}
-              children={estimate.formatted_created_at}
+              children={<FormatDate value={estimate.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/ExpenseDrawer/ExpenseDrawerHeader.tsx

@@ -1,5 +1,6 @@
 // @ts-nocheck
 import React from 'react';
+import moment from 'moment';
 import styled from 'styled-components';
 import { defaultTo } from 'lodash';
 
@@ -41,7 +42,7 @@ export default function ExpenseDrawerHeader() {
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem name={'date'} label={<T id={'date'} />}>
-              {expense.formatted_payment_date}
+              {moment(expense.payment_date).format('YYYY MMM DD')}
             </DetailItem>
 
             <DetailItem name={'reference'} label={<T id={'reference_no'} />}>
@@ -65,11 +66,11 @@ export default function ExpenseDrawerHeader() {
             minLabelSize={'180px'}
           >
             <DetailItem label={<T id={'published_at'} />}>
-              {expense.formatted_date}
+              <FormatDate value={expense.published_at} />
             </DetailItem>
 
             <DetailItem label={<T id={'created_at'} />}>
-              {expense.formatted_created_at}
+              <FormatDate value={expense.created_at} />
             </DetailItem>
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoiceDetailHeader.tsx

@@ -43,11 +43,11 @@ export default function InvoiceDetailHeader() {
         <Col xs={6}>
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem label={intl.get('invoice_date')}>
-              {invoice.invoice_date_formatted}
+              <FormatDate value={invoice.invoice_date} />
             </DetailItem>
 
             <DetailItem label={intl.get('due_date')}>
-              {invoice.due_date_formatted}
+              <FormatDate value={invoice.due_date} />
             </DetailItem>
 
             <DetailItem label={intl.get('customer_name')}>
@@ -86,7 +86,7 @@ export default function InvoiceDetailHeader() {
             />
             <DetailItem
               label={intl.get('invoice.details.created_at')}
-              children={invoice.created_at_formatted}
+              children={<FormatDate value={invoice.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/ManualJournalDrawer/utils.tsx

@@ -82,20 +82,6 @@ export const useManualJournalEntriesColumns = () => {
             },
           ]
         : []),
-      {
-        Header: intl.get('debit'),
-        accessor: 'debit',
-        Cell: FormatNumberCell,
-        width: getColumnWidth(entries, 'debit', {
-          minWidth: 60,
-          magicSpacing: 5,
-        }),
-        disableResizable: true,
-        textOverview: true,
-        disableSortBy: true,
-        formatNumber: { noZero: true },
-        align: 'right',
-      },
       {
         Header: intl.get('credit'),
         accessor: 'credit',
@@ -110,6 +96,20 @@ export const useManualJournalEntriesColumns = () => {
         formatNumber: { noZero: true },
         align: 'right',
       },
+      {
+        Header: intl.get('debit'),
+        accessor: 'debit',
+        Cell: FormatNumberCell,
+        width: getColumnWidth(entries, 'debit', {
+          minWidth: 60,
+          magicSpacing: 5,
+        }),
+        disableResizable: true,
+        textOverview: true,
+        disableSortBy: true,
+        formatNumber: { noZero: true },
+        align: 'right',
+      },
     ],
     [],
   );

packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/PaymentMadeDetailHeader.tsx

@@ -37,7 +37,7 @@ export default function PaymentMadeDetailHeader() {
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem
               label={intl.get('payment_date')}
-              children={paymentMade.formatted_payment_date}
+              children={<FormatDate value={paymentMade.payment_date} />}
             />
             <DetailItem
               label={intl.get('payment_made.details.payment_number')}
@@ -58,7 +58,6 @@ export default function PaymentMadeDetailHeader() {
             />
           </DetailsMenu>
         </Col>
-
         <Col xs={6}>
           <DetailsMenu
             textAlign={'right'}
@@ -71,7 +70,7 @@ export default function PaymentMadeDetailHeader() {
             />
             <DetailItem
               label={intl.get('created_at')}
-              children={paymentMade.formatted_created_at}
+              children={<FormatDate value={paymentMade.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/PaymentMadeDetailDrawer/utils.tsx

@@ -1,6 +1,8 @@
 // @ts-nocheck
 import React from 'react';
 import intl from 'react-intl-universal';
+import moment from 'moment';
+
 import { getColumnWidth } from '@/utils';
 import { FormatNumberCell } from '@/components';
 import { usePaymentMadeDetailContext } from './PaymentMadeDetailProvider';
@@ -15,7 +17,7 @@ export const usePaymentMadeEntriesColumns = () => {
     () => [
       {
         Header: intl.get('date'),
-        accessor: 'bill.formatted_bill_date',
+        accessor: (row) => moment(row.date).format('YYYY MMM DD'),
         width: 100,
         disableSortBy: true,
         className: 'date',

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveDetailHeader.tsx

@@ -5,6 +5,7 @@ import { defaultTo } from 'lodash';
 import {
   Row,
   Col,
+  FormatDate,
   DetailsMenu,
   DetailItem,
   CommercialDocHeader,
@@ -35,7 +36,7 @@ export default function PaymentReceiveDetailHeader() {
           <DetailsMenu direction={'horizantal'} minLabelSize={'180px'}>
             <DetailItem
               label={intl.get('payment_date')}
-              children={paymentReceive.formatted_payment_date}
+              children={<FormatDate value={paymentReceive.payment_date} />}
             />
             <DetailItem
               label={intl.get('payment_receive.details.payment_number')}
@@ -70,7 +71,7 @@ export default function PaymentReceiveDetailHeader() {
             />
             <DetailItem
               label={intl.get('created_at')}
-              children={paymentReceive.formatted_created_at}
+              children={<FormatDate value={paymentReceive.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/utils.tsx

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import intl from 'react-intl-universal';
+import moment from 'moment';
 import {
   Button,
   Popover,
@@ -25,7 +26,7 @@ export const usePaymentReceiveEntriesColumns = () => {
     () => [
       {
         Header: intl.get('date'),
-        accessor: 'invoice.invoice_date_formatted',
+        accessor: (row) => moment(row.payment_date).format('YYYY MMM DD'),
         width: 100,
         className: 'date',
         disableSortBy: true,

packages/webapp/src/containers/Drawers/ReceiptDetailDrawer/ReceiptDetailHeader.tsx

@@ -54,11 +54,11 @@ export default function ReceiptDetailHeader() {
             </DetailItem>
             <DetailItem
               label={intl.get('receipt_date')}
-              children={receipt.formatted_receipt_date}
+              children={<FormatDate value={receipt.receipt_date} />}
             />
             <DetailItem
               label={intl.get('closed_date')}
-              children={receipt.formatted_closed_at_date}
+              children={<FormatDate value={receipt.closed_at_date} />}
             />
             <ExchangeRateDetailItem
               exchangeRate={receipt?.exchange_rate}
@@ -82,7 +82,7 @@ export default function ReceiptDetailHeader() {
             />
             <DetailItem
               label={intl.get('receipt.details.created_at')}
-              children={receipt.formatted_created_at}
+              children={<FormatDate value={receipt.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Drawers/VendorCreditDetailDrawer/VendorCreditDetailHeader.tsx

@@ -42,7 +42,7 @@ export default function VendorCreditDetailHeader() {
             <DetailItem
               label={intl.get('vendor_credit.drawer.label_vendor_credit_date')}
             >
-              {vendorCredit.formatted_vendor_credit_date}
+              <FormatDate value={vendorCredit.formatted_vendor_credit_date} />
             </DetailItem>
             <DetailItem
               label={intl.get('vendor_credit.drawer.label_vendor_credit_no')}
@@ -78,7 +78,7 @@ export default function VendorCreditDetailHeader() {
             />
             <DetailItem
               label={<T id={'vendor_credit.drawer.label_created_at'} />}
-              children={vendorCredit.formatted_created_at}
+              children={<FormatDate value={vendorCredit.created_at} />}
             />
           </DetailsMenu>
         </Col>

packages/webapp/src/containers/Expenses/ExpenseForm/ExpenseFloatingActions.tsx

@@ -11,7 +11,7 @@ import {
   MenuItem,
 } from '@blueprintjs/core';
 import { useFormikContext } from 'formik';
-import { Group, FormattedMessage as T } from '@/components';
+import { FormattedMessage as T } from '@/components';
 import { useHistory } from 'react-router-dom';
 
 import { CLASSES } from '@/constants/classes';
@@ -78,10 +78,7 @@ export default function ExpenseFloatingFooter() {
   };
 
   return (
-    <Group
-      spacing={10}
-      className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}
-    >
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       {/* ----------- Save And Publish ----------- */}
       <If condition={isNewMode}>
         <ButtonGroup>
@@ -193,6 +190,6 @@ export default function ExpenseFloatingFooter() {
         onClick={handleCancelBtnClick}
         text={<T id={'cancel'} />}
       />
-    </Group>
+    </div>
   );
 }

packages/webapp/src/containers/Expenses/ExpensesLanding/components.tsx

@@ -17,7 +17,13 @@ import clsx from 'classnames';
 
 import { CLASSES } from '@/constants/classes';
 import { ExpenseAction, AbilitySubject } from '@/constants/abilityOption';
-import { FormattedMessage as T, Icon, If, Can } from '@/components';
+import {
+  FormatDateCell,
+  FormattedMessage as T,
+  Icon,
+  If,
+  Can,
+} from '@/components';
 import { safeCallback } from '@/utils';
 
 /**
@@ -131,7 +137,8 @@ export function useExpensesTableColumns() {
       {
         id: 'payment_date',
         Header: intl.get('payment_date'),
-        accessor: 'formatted_date',
+        accessor: 'payment_date',
+        Cell: FormatDateCell,
         width: 140,
         className: 'payment_date',
         clickable: true,

packages/webapp/src/containers/FinancialStatements/GeneralLedger/GeneralLedgerTable.tsx

@@ -96,19 +96,12 @@ const GeneralLedgerDataTable = styled(ReportDataTable)`
             }
           }
         }
+        &:not(:first-child).is-expanded .td {
+          border-top: 1px solid #ddd;
+        }
       }
       &--OPENING_BALANCE,
       &--CLOSING_BALANCE {
-        .td {
-          color: #000;
-        }
-        .date {
-          font-weight: 500;
-
-          .cell-inner {
-            position: absolute;
-          }
-        }
         .amount {
           font-weight: 500;
         }
@@ -117,9 +110,6 @@ const GeneralLedgerDataTable = styled(ReportDataTable)`
         .name {
           font-weight: 500;
         }
-        .td {
-          border-top: 1px solid #ddd;
-        }
       }
     }
   }

packages/webapp/src/containers/Items/ItemFormFloatingActions.tsx

@@ -5,8 +5,9 @@ import classNames from 'classnames';
 import { Button, Intent, FormGroup, Checkbox } from '@blueprintjs/core';
 import { FastField, useFormikContext } from 'formik';
 import { CLASSES } from '@/constants/classes';
+
 import { useItemFormContext } from './ItemFormProvider';
-import { Group, FormattedMessage as T } from '@/components';
+import { FormattedMessage as T } from '@/components';
 import { saveInvoke } from '@/utils';
 
 /**
@@ -36,10 +37,7 @@ export default function ItemFormFloatingActions({ onCancel }) {
   };
 
   return (
-    <Group
-      spacing={10}
-      className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}
-    >
+    <div className={classNames(CLASSES.PAGE_FORM_FLOATING_ACTIONS)}>
       <SaveButton
         intent={Intent.PRIMARY}
         disabled={isSubmitting}
@@ -80,7 +78,7 @@ export default function ItemFormFloatingActions({ onCancel }) {
           </FormGroup>
         )}
       </FastField>
-    </Group>
+    </div>
   );
 }