Merge pull request #921 from bigcapitalhq/20260131-145158-fd0c

fix(scripts): db migration dockerfile

.dockerignore

@@ -0,0 +1,93 @@
+# Dependencies
+node_modules/
+**/node_modules/
+.pnpm-store/
+
+# Build outputs
+dist/
+build/
+**/dist/
+**/build/
+*.tsbuildinfo
+
+# Development files
+.git/
+.gitignore
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+
+# Test files
+test/
+**/test/
+**/*.spec.ts
+**/*.test.ts
+**/*.e2e-spec.ts
+coverage/
+.nyc_output/
+test-results/
+playwright-report/
+
+# Documentation
+*.md
+!README.md
+docs/
+CHANGELOG.md
+CONTRIBUTING.md
+DISCLAIMER
+LICENSE
+
+# CI/CD
+.github/
+.gitpod.yml
+
+# Environment files
+.env
+.env.*
+!.env.example
+
+# Logs
+*.log
+logs/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
+# OS files
+.DS_Store
+Thumbs.db
+*.pid
+*.seed
+*.pid.lock
+
+# Docker files (don't copy Dockerfiles into themselves)
+docker-compose*.yml
+Dockerfile*
+.dockerignore
+
+# Misc
+.cache/
+.temp/
+tmp/
+*.tmp
+.qodo/
+e2e/
+playwright.config.ts
+
+# Source maps (not needed in production)
+*.map
+
+# TypeScript configs (not needed at runtime)
+tsconfig*.json
+!tsconfig.json
+
+# Linting/formatting
+.eslintrc*
+.prettierrc*
+.eslintcache
+
+# Package manager locks (we copy them explicitly)
+# pnpm-lock.yaml

.env.example

@@ -35,17 +35,10 @@ TENANT_DB_NAME_PERFIX=bigcapital_tenant_
 BASE_URL=http://example.com
 JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
-# Jobs MongoDB
-MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
-
 # App proxy
 PUBLIC_PROXY_PORT=80
 PUBLIC_PROXY_SSL_PORT=443
 
-# Agendash
-AGENDASH_AUTH_USER=agendash
-AGENDASH_AUTH_PASSWORD=123123
-
 # Sign-up restrictions
 SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=

docker-compose.prod.yml

@@ -32,11 +32,9 @@ services:
       - '3000'
     links:
       - mysql
-      - mongo
       - redis
     depends_on:
       - mysql
-      - mongo
       - redis
     restart: on-failure
     networks:
@@ -60,22 +58,21 @@ services:
       # System database
       - SYSTEM_DB_NAME=${SYSTEM_DB_NAME}
 
+      # Redis
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - QUEUE_HOST=redis
+      - QUEUE_PORT=6379
+
       # Tenants databases
       - TENANT_DB_NAME_PERFIX=${TENANT_DB_NAME_PERFIX}
 
       # Authentication
       - JWT_SECRET=${JWT_SECRET}
 
-      # MongoDB
-      - MONGODB_DATABASE_URL=mongodb://mongo/bigcapital
-
       # Application
       - BASE_URL=${BASE_URL}
 
-      # Agendash
-      - AGENDASH_AUTH_USER=${AGENDASH_AUTH_USER}
-      - AGENDASH_AUTH_PASSWORD=${AGENDASH_AUTH_PASSWORD}
-
       # Sign-up restrictions
       - SIGNUP_DISABLED=${SIGNUP_DISABLED}
       - SIGNUP_ALLOWED_DOMAINS=${SIGNUP_ALLOWED_DOMAINS}
@@ -122,7 +119,7 @@ services:
       - S3_SECRET_ACCESS_KEY=${S3_SECRET_ACCESS_KEY}
       - S3_ENDPOINT=${S3_ENDPOINT}
       - S3_BUCKET=${S3_BUCKET}
-      
+
       # Stripe
       - STRIPE_PAYMENT_SECRET_KEY=${STRIPE_PAYMENT_SECRET_KEY}
       - STRIPE_PAYMENT_PUBLISHABLE_KEY=${STRIPE_PAYMENT_PUBLISHABLE_KEY}
@@ -166,17 +163,6 @@ services:
     networks:
       - bigcapital_network
 
-  mongo:
-    container_name: bigcapital-mongo
-    restart: on-failure
-    build: ./docker/mongo
-    expose:
-      - '27017'
-    volumes:
-      - mongo:/var/lib/mongodb
-    networks:
-      - bigcapital_network
-
   redis:
     container_name: bigcapital-redis
     restart: on-failure
@@ -202,10 +188,6 @@ volumes:
     name: bigcapital_prod_mysql
     driver: local
 
-  mongo:
-    name: bigcapital_prod_mongo
-    driver: local
-
   redis:
     name: bigcapital_prod_redis
     driver: local

docker-compose.yml

@@ -24,25 +24,13 @@ services:
       restart_policy:
         condition: unless-stopped
 
-  mongo:
-    build: ./docker/mongo
-    expose:
-      - '27017'
-    volumes:
-      - mongo:/var/lib/mongodb
-    ports:
-      - '27017:27017'
-    deploy:
-      restart_policy:
-        condition: unless-stopped
-
   redis:
     build:
       context: ./docker/redis
     expose:
-      - "6379"
+      - '6379'
     ports:
-      - "6379:6379"
+      - '6379:6379'
     volumes:
       - redis:/data
     deploy:
@@ -52,7 +40,7 @@ services:
   gotenberg:
     image: gotenberg/gotenberg:7
     ports:
-      - "9000:3000"
+      - '9000:3000'
 
 # Volumes
 volumes:
@@ -60,10 +48,6 @@ volumes:
     name: bigcapital_dev_mysql
     driver: local
 
-  mongo:
-    name: bigcapital_dev_mongo
-    driver: local
-
   redis:
     name: bigcapital_dev_redis
-    driver: local
+    driver: local

docker/migration/Dockerfile

@@ -35,4 +35,4 @@ WORKDIR /app/packages/server
 RUN git clone https://github.com/vishnubob/wait-for-it.git
 
 # Once we listen the mysql port run the migration task.
-CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node ./build/commands.js system:migrate:latest && node ./build/commands.js tenants:migrate:latest"
+CMD ./wait-for-it/wait-for-it.sh mysql:3306 -- sh -c "node dist/cli.js system:migrate:latest && node dist/cli.js tenants:migrate:latest"

docker/mongo/Dockerfile

@@ -1 +0,0 @@
-FROM mongo:5.0

packages/server/.env.example

@@ -35,17 +35,10 @@ TENANT_DB_NAME_PERFIX=bigcapital_tenant_
 BASE_URL=http://example.com
 JWT_SECRET=b0JDZW56RnV6aEthb0RGPXVEcUI
 
-# Jobs MongoDB
-MONGODB_DATABASE_URL=mongodb://localhost/bigcapital
-
 # App proxy
 PUBLIC_PROXY_PORT=80
 PUBLIC_PROXY_SSL_PORT=443
 
-# Agendash
-AGENDASH_AUTH_USER=agendash
-AGENDASH_AUTH_PASSWORD=123123
-
 # Sign-up restrictions
 SIGNUP_DISABLED=false
 SIGNUP_ALLOWED_DOMAINS=

packages/server/Dockerfile

@@ -0,0 +1,102 @@
+# Stage 1: Build
+FROM node:18.16.0-alpine AS builder
+
+WORKDIR /app
+
+# Install pnpm
+RUN npm install -g pnpm@8.10.2
+
+# Install build dependencies
+RUN apk add --no-cache python3 build-base chromium
+
+# Set Python environment
+ENV PYTHON=/usr/bin/python3
+
+# Copy package files for dependency installation
+COPY --chown=node:node package.json pnpm-lock.yaml pnpm-workspace.yaml lerna.json ./
+COPY --chown=node:node packages/server/package.json ./packages/server/
+COPY --chown=node:node shared/bigcapital-utils/package.json ./shared/bigcapital-utils/
+COPY --chown=node:node shared/pdf-templates/package.json ./shared/pdf-templates/
+COPY --chown=node:node shared/email-components/package.json ./shared/email-components/
+
+# Install all dependencies (including devDependencies for build)
+RUN pnpm install --frozen-lockfile
+
+# Copy source code
+COPY --chown=node:node ./packages/server ./packages/server
+COPY --chown=node:node ./shared/bigcapital-utils ./shared/bigcapital-utils
+COPY --chown=node:node ./shared/pdf-templates ./shared/pdf-templates
+COPY --chown=node:node ./shared/email-components ./shared/email-components
+
+# Build NestJS application
+RUN pnpm run build:server --skip-nx-cache
+
+# Stage 2: Production
+FROM node:18.16.0-alpine AS production
+
+WORKDIR /app
+
+# Install pnpm for production
+RUN npm install -g pnpm@8.10.2
+
+# Create non-root user
+RUN addgroup -g 1001 -S nodejs && \
+    adduser -S nodejs -u 1001
+
+# Install build dependencies for native modules (bcrypt, etc.)
+RUN apk add --no-cache python3 build-base
+
+# Set Python environment
+ENV PYTHON=/usr/bin/python3
+
+# Copy package files for production dependency installation
+COPY --chown=nodejs:nodejs package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY --chown=nodejs:nodejs packages/server/package.json ./packages/server/
+COPY --chown=nodejs:nodejs shared/bigcapital-utils/package.json ./shared/bigcapital-utils/
+COPY --chown=nodejs:nodejs shared/pdf-templates/package.json ./shared/pdf-templates/
+COPY --chown=nodejs:nodejs shared/email-components/package.json ./shared/email-components/
+
+# Copy .husky directory (needed for husky install command)
+COPY --chown=nodejs:nodejs .husky ./.husky
+
+# Install only production dependencies
+# Install husky temporarily so prepare script can run, then remove it
+RUN pnpm add -D -w husky && \
+    pnpm install --prod --frozen-lockfile && \
+    pnpm remove -w husky && \
+    # Remove build dependencies to reduce image size
+    apk del python3 build-base
+
+# Copy built application from builder stage
+COPY --from=builder --chown=nodejs:nodejs /app/packages/server/dist ./packages/server/dist
+
+# Copy static assets (i18n, public, static directories)
+COPY --from=builder --chown=nodejs:nodejs /app/packages/server/src/i18n ./packages/server/dist/i18n
+COPY --from=builder --chown=nodejs:nodejs /app/packages/server/public ./packages/server/public
+COPY --from=builder --chown=nodejs:nodejs /app/packages/server/static ./packages/server/static
+
+# Copy database migration files (needed for running migrations)
+COPY --from=builder --chown=nodejs:nodejs /app/packages/server/src/database ./packages/server/src/database
+
+# Copy built shared packages (dist folders and package.json for module resolution)
+COPY --from=builder --chown=nodejs:nodejs /app/shared/bigcapital-utils/dist ./shared/bigcapital-utils/dist
+COPY --from=builder --chown=nodejs:nodejs /app/shared/pdf-templates/dist ./shared/pdf-templates/dist
+COPY --from=builder --chown=nodejs:nodejs /app/shared/email-components/dist ./shared/email-components/dist
+
+# Set runtime environment variables (these should be provided at runtime via docker-compose or k8s)
+ENV NODE_ENV=production
+ENV NEW_RELIC_NO_CONFIG_FILE=true
+ENV PORT=3000
+
+# Switch to non-root user
+USER nodejs
+
+# Expose port
+EXPOSE 3000
+
+# Health check - uses /api/system_db ping endpoint
+HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
+  CMD node -e "require('http').get('http://localhost:3000/api/system_db', (r) => {process.exit(r.statusCode >= 200 && r.statusCode < 300 ? 0 : 1)}).on('error', () => process.exit(1))"
+
+# Start the application
+CMD [ "node", "packages/server/dist/main.js" ]

packages/server/nest-cli.json

@@ -2,10 +2,23 @@
   "$schema": "https://json.schemastore.org/nest-cli",
   "collection": "@nestjs/schematics",
   "sourceRoot": "src",
+  "entryFile": "main",
   "compilerOptions": {
     "deleteOutDir": true,
     "assets": [
-      { "include": "i18n/**/*", "watchAssets": true }
+      { "include": "i18n/**/*", "watchAssets": true },
+      { "include": "database/**/*", "watchAssets": true }
     ]
+  },
+  "projects": {
+    "cli": {
+      "type": "application",
+      "root": "src",
+      "entryFile": "cli",
+      "sourceRoot": "src",
+      "compilerOptions": {
+        "tsConfigPath": "tsconfig.json"
+      }
+    }
   }
 }

packages/server/package.json

@@ -40,6 +40,9 @@
     "@lemonsqueezy/lemonsqueezy.js": "^2.2.0",
     "@liaoliaots/nestjs-redis": "^10.0.0",
     "@nest-lab/throttler-storage-redis": "^1.1.0",
+    "@bull-board/api": "^5.22.0",
+    "@bull-board/express": "^5.22.0",
+    "@bull-board/nestjs": "^5.22.0",
     "@nestjs/bull": "^10.2.1",
     "@nestjs/bullmq": "^10.2.2",
     "@nestjs/cache-manager": "^2.2.2",

packages/server/src/common/config/bull-board.ts

@@ -0,0 +1,8 @@
+import { registerAs } from '@nestjs/config';
+import { parseBoolean } from '@/utils/parse-boolean';
+
+export default registerAs('bullBoard', () => ({
+  enabled: parseBoolean<boolean>(process.env.BULL_BOARD_ENABLED, false),
+  username: process.env.BULL_BOARD_USERNAME,
+  password: process.env.BULL_BOARD_PASSWORD,
+}));

packages/server/src/common/config/index.ts

@@ -17,6 +17,9 @@ import loops from './loops';
 import bankfeed from './bankfeed';
 import throttle from './throttle';
 import cloud from './cloud';
+import redis from './redis';
+import queue from './queue';
+import bullBoard from './bull-board';
 
 export const config = [
   app,
@@ -38,4 +41,7 @@ export const config = [
   loops,
   bankfeed,
   throttle,
+  redis,
+  queue,
+  bullBoard,
 ];

packages/server/src/common/config/queue.ts

@@ -0,0 +1,6 @@
+import { registerAs } from '@nestjs/config';
+
+export default registerAs('queue', () => ({
+  host: process.env.QUEUE_HOST || 'localhost',
+  port: parseInt(process.env.QUEUE_PORT, 10) || 6379,
+}));

packages/server/src/common/interceptors/to-json.interceptor.ts

@@ -5,15 +5,18 @@ import {
   NestInterceptor,
 } from '@nestjs/common';
 import { Observable, map } from 'rxjs';
-import { mapValues, mapValuesDeep } from '@/utils/deepdash';
+import { mapValuesDeep } from '@/utils/deepdash';
 
 @Injectable()
 export class ToJsonInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     return next.handle().pipe(
       map((data) => {
+        if (data === null || data === undefined) {
+          return data;
+        }
         return mapValuesDeep(data, (value) => {
-          if (value && typeof value.toJSON === 'function') {
+          if (value !== null && value !== undefined && typeof value.toJSON === 'function') {
             return value.toJSON();
           }
           return value;

packages/server/src/i18n/en/bill.json

@@ -22,6 +22,9 @@
   "field.status.unpaid": "Unpaid",
   "field.status.opened": "Opened",
   "field.status.draft": "Draft",
-  "field.created_at": "Created At"
+  "field.created_at": "Created At",
+  "allocation_method": "Allocation Method",
+  "allocation_method.quantity": "Quantity",
+  "allocation_method.value": "Valuation"
 }
 

packages/server/src/i18n/en/customer.json

@@ -0,0 +1,5 @@
+{
+  "type.business": "Business",
+  "type.individual": "Individual"
+}
+

packages/server/src/main.ts

@@ -4,10 +4,6 @@ import { ClsMiddleware } from 'nestjs-cls';
 import * as path from 'path';
 import './utils/moment-mysql';
 import { AppModule } from './modules/App/App.module';
-import { ServiceErrorFilter } from './common/filters/service-error.filter';
-import { ModelHasRelationsFilter } from './common/filters/model-has-relations.filter';
-import { ValidationPipe } from './common/pipes/ClassValidation.pipe';
-import { ToJsonInterceptor } from './common/interceptors/to-json.interceptor';
 import { NestExpressApplication } from '@nestjs/platform-express';
 
 global.__public_dirname = path.join(__dirname, '..', 'public');
@@ -25,11 +21,6 @@ async function bootstrap() {
   // create and mount the middleware manually here
   app.use(new ClsMiddleware({}).use);
 
-  app.useGlobalInterceptors(new ToJsonInterceptor());
-
-  // use the validation pipe globally
-  app.useGlobalPipes(new ValidationPipe());
-
   const config = new DocumentBuilder()
     .setTitle('Bigcapital')
     .setDescription('Financial accounting software')
@@ -39,9 +30,6 @@ async function bootstrap() {
   const documentFactory = () => SwaggerModule.createDocument(app, config);
   SwaggerModule.setup('swagger', app, documentFactory);
 
-  app.useGlobalFilters(new ServiceErrorFilter());
-  app.useGlobalFilters(new ModelHasRelationsFilter());
-
   await app.listen(process.env.PORT ?? 3000);
 }
 bootstrap();

packages/server/src/middleware/bull-board-auth.middleware.ts

@@ -0,0 +1,59 @@
+import { Request, Response, NextFunction } from 'express';
+
+/**
+ * Creates Express middleware for the Bull Board UI:
+ * - When disabled: responds with 404.
+ * - When enabled and username/password are set: enforces HTTP Basic Auth (401 if invalid).
+ * - When enabled and credentials are not set: allows access (no auth).
+ */
+export function createBullBoardAuthMiddleware(
+  enabled: boolean,
+  username: string | undefined,
+  password: string | undefined,
+): (req: Request, res: Response, next: NextFunction) => void {
+  return (req: Request, res: Response, next: NextFunction) => {
+    if (!enabled) {
+      res.status(404).send('Not Found');
+      return;
+    }
+
+    if (!username || !password) {
+      return next();
+    }
+
+    const authHeader = req.headers.authorization;
+    if (!authHeader || !authHeader.startsWith('Basic ')) {
+      res.setHeader('WWW-Authenticate', 'Basic realm="Bull Board"');
+      res.status(401).send('Authentication required');
+      return;
+    }
+
+    const base64Credentials = authHeader.slice(6);
+    let decoded: string;
+    try {
+      decoded = Buffer.from(base64Credentials, 'base64').toString('utf8');
+    } catch {
+      res.setHeader('WWW-Authenticate', 'Basic realm="Bull Board"');
+      res.status(401).send('Invalid credentials');
+      return;
+    }
+
+    const colonIndex = decoded.indexOf(':');
+    if (colonIndex === -1) {
+      res.setHeader('WWW-Authenticate', 'Basic realm="Bull Board"');
+      res.status(401).send('Invalid credentials');
+      return;
+    }
+
+    const reqUsername = decoded.slice(0, colonIndex);
+    const reqPassword = decoded.slice(colonIndex + 1);
+
+    if (reqUsername !== username || reqPassword !== password) {
+      res.setHeader('WWW-Authenticate', 'Basic realm="Bull Board"');
+      res.status(401).send('Invalid credentials');
+      return;
+    }
+
+    next();
+  };
+}

packages/server/src/models/Model.ts

@@ -48,14 +48,30 @@ export class PaginationQueryBuilder<
       // No relations defined
       return this.delete();
     }
+
+    // Only check HasManyRelation and ManyToManyRelation relations, as BelongsToOneRelation are just 
+    // foreign key references and shouldn't prevent deletion. Only dependent records should block deletion.
+    const dependentRelationNames = relationNames.filter((name) => {
+      const relation = relationMappings[name];
+      return relation && (
+        relation.relation === Model.HasManyRelation ||
+        relation.relation === Model.ManyToManyRelation
+      );
+    });
+
+    if (dependentRelationNames.length === 0) {
+      // No dependent relations defined, safe to delete
+      return this.delete();
+    }
+
     const recordQuery = this.clone();
 
-    relationNames.forEach((relationName: string) => {
+    dependentRelationNames.forEach((relationName: string) => {
       recordQuery.withGraphFetched(relationName);
     });
     const record = await recordQuery;
 
-    const hasRelations = relationNames.some((name) => {
+    const hasRelations = dependentRelationNames.some((name) => {
       const val = record[name];
       return Array.isArray(val) ? val.length > 0 : val != null;
     });

packages/server/src/modules/Accounts/Accounts.controller.ts

@@ -8,6 +8,7 @@ import {
   Query,
   ParseIntPipe,
   Put,
+  HttpCode,
 } from '@nestjs/common';
 import { AccountsApplication } from './AccountsApplication.service';
 import { CreateAccountDTO } from './CreateAccount.dto';
@@ -43,6 +44,7 @@ export class AccountsController {
   constructor(private readonly accountsApplication: AccountsApplication) { }
 
   @Post('validate-bulk-delete')
+  @HttpCode(200)
   @ApiOperation({
     summary:
       'Validates which accounts can be deleted and returns counts of deletable and non-deletable accounts.',
@@ -64,6 +66,7 @@ export class AccountsController {
   }
 
   @Post('bulk-delete')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Deletes multiple accounts in bulk.' })
   @ApiResponse({
     status: 200,
@@ -125,6 +128,7 @@ export class AccountsController {
   }
 
   @Post(':id/activate')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Activate the given account.' })
   @ApiResponse({
     status: 200,
@@ -142,6 +146,7 @@ export class AccountsController {
   }
 
   @Post(':id/inactivate')
+  @HttpCode(200)
   @ApiOperation({ summary: 'Inactivate the given account.' })
   @ApiResponse({
     status: 200,

packages/server/src/modules/Accounts/DeleteAccount.service.ts

@@ -18,7 +18,7 @@ export class DeleteAccount {
     private eventEmitter: EventEmitter2,
     private uow: UnitOfWork,
     private validator: CommandAccountValidators,
-  ) {}
+  ) { }
 
   /**
    * Authorize account delete.
@@ -57,7 +57,10 @@ export class DeleteAccount {
     trx?: Knex.Transaction,
   ): Promise<void> => {
     // Retrieve account or not found service error.
-    const oldAccount = await this.accountModel().query().findById(accountId);
+    const oldAccount = await this.accountModel()
+      .query()
+      .findById(accountId)
+      .throwIfNotFound();
 
     // Authorize before delete account.
     await this.authorize(accountId, oldAccount);

packages/server/src/modules/Accounts/models/AccountTransaction.model.ts

@@ -33,6 +33,7 @@ export class AccountTransaction extends BaseModel {
   public readonly userId!: number;
   public readonly itemId!: number;
   public readonly projectId!: number;
+  public readonly costable!: boolean;
   public readonly account: Account;
 
   /**

packages/server/src/modules/App/App.module.ts

@@ -1,7 +1,7 @@
 import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
 import { ConfigModule, ConfigService } from '@nestjs/config';
 import { EventEmitterModule } from '@nestjs/event-emitter';
-import { APP_GUARD, APP_INTERCEPTOR } from '@nestjs/core';
+import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE, APP_FILTER } from '@nestjs/core';
 import { join } from 'path';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { RedisModule } from '@liaoliaots/nestjs-redis';
@@ -12,6 +12,9 @@ import {
   I18nModule,
   QueryResolver,
 } from 'nestjs-i18n';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { ExpressAdapter } from '@bull-board/express';
+import { createBullBoardAuthMiddleware } from '@/middleware/bull-board-auth.middleware';
 import { BullModule } from '@nestjs/bullmq';
 import { ScheduleModule } from '@nestjs/schedule';
 import { PassportModule } from '@nestjs/passport';
@@ -36,6 +39,10 @@ import { PdfTemplatesModule } from '../PdfTemplate/PdfTemplates.module';
 import { BranchesModule } from '../Branches/Branches.module';
 import { WarehousesModule } from '../Warehouses/Warehouses.module';
 import { SerializeInterceptor } from '@/common/interceptors/serialize.interceptor';
+import { ToJsonInterceptor } from '@/common/interceptors/to-json.interceptor';
+import { ValidationPipe } from '@/common/pipes/ClassValidation.pipe';
+import { ServiceErrorFilter } from '@/common/filters/service-error.filter';
+import { ModelHasRelationsFilter } from '@/common/filters/model-has-relations.filter';
 import { ChromiumlyTenancyModule } from '../ChromiumlyTenancy/ChromiumlyTenancy.module';
 import { CustomersModule } from '../Customers/Customers.module';
 import { VendorsModule } from '../Vendors/Vendors.module';
@@ -133,12 +140,30 @@ import { AppThrottleModule } from './AppThrottle.module';
       imports: [ConfigModule],
       useFactory: async (configService: ConfigService) => ({
         connection: {
-          host: configService.get('QUEUE_HOST'),
-          port: configService.get('QUEUE_PORT'),
+          host: configService.get('queue.host'),
+          port: configService.get('queue.port'),
         },
       }),
       inject: [ConfigService],
     }),
+    BullBoardModule.forRootAsync({
+      imports: [ConfigModule],
+      useFactory: (configService: ConfigService) => {
+        const enabled = configService.get<boolean>('bullBoard.enabled');
+        const username = configService.get<string>('bullBoard.username');
+        const password = configService.get<string>('bullBoard.password');
+        return {
+          route: '/queues',
+          adapter: ExpressAdapter,
+          middleware: createBullBoardAuthMiddleware(
+            enabled,
+            username,
+            password,
+          ),
+        };
+      },
+      inject: [ConfigService],
+    }),
     ClsModule.forRoot({
       global: true,
       middleware: {
@@ -154,8 +179,8 @@ import { AppThrottleModule } from './AppThrottle.module';
       imports: [ConfigModule],
       useFactory: (configService: ConfigService) => ({
         config: {
-          host: configService.get('redis.host') || 'localhost',
-          port: configService.get('redis.port') || 6379,
+          host: configService.get('redis.host'),
+          port: configService.get('redis.port'),
         },
       }),
       inject: [ConfigService],
@@ -234,6 +259,10 @@ import { AppThrottleModule } from './AppThrottle.module';
   ],
   controllers: [AppController],
   providers: [
+    {
+      provide: APP_PIPE,
+      useClass: ValidationPipe,
+    },
     {
       provide: APP_GUARD,
       useClass: ThrottlerGuard,
@@ -242,6 +271,10 @@ import { AppThrottleModule } from './AppThrottle.module';
       provide: APP_INTERCEPTOR,
       useClass: SerializeInterceptor,
     },
+    {
+      provide: APP_INTERCEPTOR,
+      useClass: ToJsonInterceptor,
+    },
     {
       provide: APP_INTERCEPTOR,
       useClass: UserIpInterceptor,
@@ -250,6 +283,14 @@ import { AppThrottleModule } from './AppThrottle.module';
       provide: APP_INTERCEPTOR,
       useClass: ExcludeNullInterceptor,
     },
+    {
+      provide: APP_FILTER,
+      useClass: ServiceErrorFilter,
+    },
+    {
+      provide: APP_FILTER,
+      useClass: ModelHasRelationsFilter,
+    },
     AppService,
   ],
 })

packages/server/src/modules/App/AppThrottle.module.ts

@@ -9,6 +9,27 @@ import { ThrottlerStorageRedisService } from '@nest-lab/throttler-storage-redis'
       imports: [ConfigModule],
       inject: [ConfigService],
       useFactory: (configService: ConfigService) => {
+        // Use in-memory storage with very high limits for test environment
+        const isTest = process.env.NODE_ENV === 'test' || process.env.JEST_WORKER_ID !== undefined;
+
+        if (isTest) {
+          return {
+            throttlers: [
+              {
+                name: 'default',
+                ttl: 60000,
+                limit: 1000000, // Effectively disable throttling in tests
+              },
+              {
+                name: 'auth',
+                ttl: 60000,
+                limit: 1000000, // Effectively disable throttling in tests
+              },
+            ],
+            // No storage specified = uses in-memory storage
+          };
+        }
+
         const host = configService.get<string>('redis.host') || 'localhost';
         const port = Number(configService.get<number>('redis.port') || 6379);
         const password = configService.get<string>('redis.password');

packages/server/src/modules/Auth/Auth.module.ts

@@ -17,6 +17,8 @@ import { PassportModule } from '@nestjs/passport';
 import { APP_GUARD } from '@nestjs/core';
 import { JwtAuthGuard } from './guards/jwt.guard';
 import { AuthMailSubscriber } from './subscribers/AuthMail.subscriber';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import { BullModule } from '@nestjs/bullmq';
 import {
   SendResetPasswordMailQueue,
@@ -63,6 +65,14 @@ const models = [
     TenancyModule,
     BullModule.registerQueue({ name: SendResetPasswordMailQueue }),
     BullModule.registerQueue({ name: SendSignupVerificationMailQueue }),
+    BullBoardModule.forFeature({
+      name: SendResetPasswordMailQueue,
+      adapter: BullMQAdapter,
+    }),
+    BullBoardModule.forFeature({
+      name: SendSignupVerificationMailQueue,
+      adapter: BullMQAdapter,
+    }),
   ],
   exports: [...models],
   providers: [
@@ -98,4 +108,4 @@ const models = [
     AuthMailSubscriber,
   ],
 })
-export class AuthModule { }
+export class AuthModule {}

packages/server/src/modules/BankingAccounts/BankAccounts.controller.ts

@@ -1,16 +1,28 @@
 import { Controller, Get, Param, Post, Query } from '@nestjs/common';
 import { BankAccountsApplication } from './BankAccountsApplication.service';
-import { ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
-import { ICashflowAccountsFilter } from './types/BankAccounts.types';
+import { ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
+import { BankAccountsQueryDto } from './dtos/BankAccountsQuery.dto';
+import { BankAccountResponseDto } from './dtos/BankAccountResponse.dto';
 
 @Controller('banking/accounts')
 @ApiTags('Bank Accounts')
 export class BankAccountsController {
-  constructor(private bankAccountsApplication: BankAccountsApplication) {}
+  constructor(private bankAccountsApplication: BankAccountsApplication) { }
 
   @Get()
   @ApiOperation({ summary: 'Retrieve the bank accounts.' })
-  getBankAccounts(@Query() filterDto: ICashflowAccountsFilter) {
+  @ApiQuery({
+    name: 'query',
+    description: 'Query parameters for the bank accounts list.',
+    type: BankAccountsQueryDto,
+    required: false,
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'List of bank accounts retrieved successfully.',
+    type: [BankAccountResponseDto],
+  })
+  getBankAccounts(@Query() filterDto: BankAccountsQueryDto) {
     return this.bankAccountsApplication.getBankAccounts(filterDto);
   }
 

packages/server/src/modules/BankingAccounts/BankAccountsApplication.service.ts

@@ -6,6 +6,7 @@ import { PauseBankAccountFeeds } from './commands/PauseBankAccountFeeds.service'
 import { GetBankAccountsService } from './queries/GetBankAccounts';
 import { ICashflowAccountsFilter } from './types/BankAccounts.types';
 import { GetBankAccountSummary } from './queries/GetBankAccountSummary';
+import { BankAccountsQueryDto } from './dtos/BankAccountsQuery.dto';
 
 @Injectable()
 export class BankAccountsApplication {
@@ -16,13 +17,13 @@ export class BankAccountsApplication {
     private readonly refreshBankAccountService: RefreshBankAccountService,
     private readonly resumeBankAccountFeedsService: ResumeBankAccountFeedsService,
     private readonly pauseBankAccountFeedsService: PauseBankAccountFeeds,
-  ) {}
+  ) { }
 
   /**
    * Retrieves the bank accounts.
    * @param {ICashflowAccountsFilter} filterDto -
    */
-  getBankAccounts(filterDto: ICashflowAccountsFilter) {
+  getBankAccounts(filterDto: BankAccountsQueryDto) {
     return this.getBankAccountsService.getCashflowAccounts(filterDto);
   }
 

packages/server/src/modules/BankingAccounts/dtos/BankAccountResponse.dto.ts

@@ -0,0 +1,166 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * Bank Account Response DTO
+ * Based on AccountResponseDto but excludes fields that are filtered out by CashflowAccountTransformer:
+ * - predefined
+ * - index
+ * - accountTypeLabel
+ */
+export class BankAccountResponseDto {
+  @ApiProperty({
+    description: 'The unique identifier of the account',
+    example: 1,
+  })
+  id: number;
+
+  @ApiProperty({
+    description: 'The name of the account',
+    example: 'Cash Account',
+  })
+  name: string;
+
+  @ApiProperty({
+    description: 'The slug of the account',
+    example: 'cash-account',
+  })
+  slug: string;
+
+  @ApiProperty({
+    description: 'The code of the account',
+    example: '1001',
+  })
+  code: string;
+
+  @ApiProperty({
+    description: 'The type of the account',
+    example: 'bank',
+  })
+  accountType: string;
+
+  @ApiProperty({
+    description: 'The parent account ID',
+    example: null,
+  })
+  parentAccountId: number | null;
+
+  @ApiProperty({
+    description: 'The currency code of the account',
+    example: 'USD',
+  })
+  currencyCode: string;
+
+  @ApiProperty({
+    description: 'Whether the account is active',
+    example: true,
+  })
+  active: boolean;
+
+  @ApiProperty({
+    description: 'The bank balance of the account',
+    example: 5000.0,
+  })
+  bankBalance: number;
+
+  @ApiProperty({
+    description: 'The formatted bank balance',
+    example: '$5,000.00',
+  })
+  bankBalanceFormatted: string;
+
+  @ApiProperty({
+    description: 'The last feeds update timestamp',
+    example: '2024-03-20T10:30:00Z',
+  })
+  lastFeedsUpdatedAt: string | Date | null;
+
+  @ApiProperty({
+    description: 'The formatted last feeds update timestamp',
+    example: 'Mar 20, 2024 10:30 AM',
+  })
+  lastFeedsUpdatedAtFormatted: string;
+
+  @ApiProperty({
+    description: 'The last feeds updated from now (relative time)',
+    example: '2 hours ago',
+  })
+  lastFeedsUpdatedFromNow: string;
+
+  @ApiProperty({
+    description: 'The amount of the account',
+    example: 5000.0,
+  })
+  amount: number;
+
+  @ApiProperty({
+    description: 'The formatted amount',
+    example: '$5,000.00',
+  })
+  formattedAmount: string;
+
+  @ApiProperty({
+    description: 'The Plaid item ID',
+    example: 'plaid-item-123',
+  })
+  plaidItemId: string;
+
+  @ApiProperty({
+    description: 'The Plaid account ID',
+    example: 'plaid-account-456',
+  })
+  plaidAccountId: string | null;
+
+  @ApiProperty({
+    description: 'Whether the feeds are active',
+    example: true,
+  })
+  isFeedsActive: boolean;
+
+  @ApiProperty({
+    description: 'Whether the account is syncing owner',
+    example: true,
+  })
+  isSyncingOwner: boolean;
+
+  @ApiProperty({
+    description: 'Whether the feeds are paused',
+    example: false,
+  })
+  isFeedsPaused: boolean;
+
+  @ApiProperty({
+    description: 'The account normal',
+    example: 'debit',
+  })
+  accountNormal: string;
+
+  @ApiProperty({
+    description: 'The formatted account normal',
+    example: 'Debit',
+  })
+  accountNormalFormatted: string;
+
+  @ApiProperty({
+    description: 'The flatten name with all dependant accounts names',
+    example: 'Assets: Cash Account',
+  })
+  flattenName: string;
+
+  @ApiProperty({
+    description: 'The account level in the hierarchy',
+    example: 2,
+  })
+  accountLevel?: number;
+
+  @ApiProperty({
+    description: 'The creation timestamp',
+    example: '2024-03-20T10:00:00Z',
+  })
+  createdAt: Date;
+
+  @ApiProperty({
+    description: 'The update timestamp',
+    example: '2024-03-20T10:30:00Z',
+  })
+  updatedAt: Date;
+}

packages/server/src/modules/BankingAccounts/dtos/BankAccountsQuery.dto.ts

@@ -0,0 +1,107 @@
+import { ApiPropertyOptional } from '@nestjs/swagger';
+import { Transform } from 'class-transformer';
+import { IsArray, IsBoolean, IsEnum, IsInt, IsOptional, IsString, Min } from 'class-validator';
+import { ToNumber } from '@/common/decorators/Validators';
+import { IFilterRole, ISortOrder } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
+import { parseBoolean } from '@/utils/parse-boolean';
+
+export class BankAccountsQueryDto {
+  @ApiPropertyOptional({
+    description: 'Custom view ID',
+    type: Number,
+    example: 1,
+  })
+  @IsOptional()
+  @ToNumber()
+  @IsInt()
+  customViewId?: number;
+
+  @ApiPropertyOptional({
+    description: 'Filter roles array',
+    type: Array,
+    isArray: true,
+  })
+  @IsArray()
+  @IsOptional()
+  filterRoles?: IFilterRole[];
+
+  @ApiPropertyOptional({
+    description: 'Column to sort by',
+    type: String,
+    example: 'created_at',
+  })
+  @IsOptional()
+  @IsString()
+  columnSortBy?: string;
+
+  @ApiPropertyOptional({
+    description: 'Sort order',
+    enum: ISortOrder,
+    example: ISortOrder.DESC,
+  })
+  @IsOptional()
+  @IsEnum(ISortOrder)
+  sortOrder?: string;
+
+  @ApiPropertyOptional({
+    description: 'Stringified filter roles',
+    type: String,
+    example: '{"fieldKey":"status","value":"active"}',
+  })
+  @IsOptional()
+  @IsString()
+  stringifiedFilterRoles?: string;
+
+  @ApiPropertyOptional({
+    description: 'Search keyword',
+    type: String,
+    example: 'bank account',
+  })
+  @IsOptional()
+  @IsString()
+  searchKeyword?: string;
+
+  @ApiPropertyOptional({
+    description: 'View slug',
+    type: String,
+    example: 'active-accounts',
+  })
+  @IsOptional()
+  @IsString()
+  viewSlug?: string;
+
+  @ApiPropertyOptional({
+    description: 'Page number',
+    type: Number,
+    example: 1,
+    minimum: 1,
+  })
+  @IsOptional()
+  @ToNumber()
+  @IsInt()
+  @Min(1)
+  page?: number;
+
+  @ApiPropertyOptional({
+    description: 'Page size',
+    type: Number,
+    example: 25,
+    minimum: 1,
+  })
+  @IsOptional()
+  @ToNumber()
+  @IsInt()
+  @Min(1)
+  pageSize?: number;
+
+  @ApiPropertyOptional({
+    description: 'Include inactive accounts',
+    type: Boolean,
+    example: false,
+    default: false,
+  })
+  @IsOptional()
+  @Transform(({ value }) => parseBoolean(value, false))
+  @IsBoolean()
+  inactiveMode?: boolean;
+}

packages/server/src/modules/BankingAccounts/queries/GetBankAccounts.ts

@@ -6,6 +6,8 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { ICashflowAccountsFilter } from '../types/BankAccounts.types';
 import { TransformerInjectable } from '@/modules/Transformer/TransformerInjectable.service';
 import { DynamicListService } from '@/modules/DynamicListing/DynamicList.service';
+import { BankAccountsQueryDto } from '../dtos/BankAccountsQuery.dto';
+import { IDynamicListFilter } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
 
 @Injectable()
 export class GetBankAccountsService {
@@ -15,14 +17,14 @@ export class GetBankAccountsService {
 
     @Inject(Account.name)
     private readonly accountModel: TenantModelProxy<typeof Account>,
-  ) {}
+  ) { }
 
   /**
    * Retrieve the cash flow accounts.
    * @param {ICashflowAccountsFilter} filterDTO - Filter DTO.
    * @returns {ICashflowAccount[]}
    */
-  public async getCashflowAccounts(filterDTO: ICashflowAccountsFilter) {
+  public async getCashflowAccounts(filterDTO: BankAccountsQueryDto) {
     const _filterDto = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
@@ -30,12 +32,14 @@ export class GetBankAccountsService {
       ...filterDTO,
     };
     // Parsees accounts list filter DTO.
-    const filter = this.dynamicListService.parseStringifiedFilter(_filterDto);
+    const filter = this.dynamicListService.parseStringifiedFilter<BankAccountsQueryDto>(
+      _filterDto,
+    );
 
     // Dynamic list service.
     const dynamicList = await this.dynamicListService.dynamicList(
       this.accountModel(),
-      filter,
+      filter as IDynamicListFilter,
     );
     // Retrieve accounts model based on the given query.
     const accounts = await this.accountModel()

packages/server/src/modules/BankingMatching/BankingMatching.controller.ts

@@ -1,5 +1,5 @@
 import { ApiOperation, ApiTags } from '@nestjs/swagger';
-import { Body, Controller, Get, Param, Post, Query } from '@nestjs/common';
+import { Body, Controller, Get, Param, Patch, Post, Query } from '@nestjs/common';
 import { BankingMatchingApplication } from './BankingMatchingApplication';
 import { GetMatchedTransactionsFilter } from './types';
 import { MatchBankTransactionDto } from './dtos/MatchBankTransaction.dto';
@@ -34,7 +34,7 @@ export class BankingMatchingController {
     );
   }
 
-  @Post('/unmatch/:uncategorizedTransactionId')
+  @Patch('/unmatch/:uncategorizedTransactionId')
   @ApiOperation({ summary: 'Unmatch the given uncategorized transaction.' })
   async unmatchMatchedTransaction(
     @Param('uncategorizedTransactionId') uncategorizedTransactionId: number,

packages/server/src/modules/BankingPlaid/BankingPlaid.module.ts

@@ -1,3 +1,5 @@
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import { BullModule } from '@nestjs/bullmq';
 import { Module } from '@nestjs/common';
 import { SocketModule } from '../Socket/Socket.module';
@@ -33,6 +35,10 @@ const models = [RegisterTenancyModel(PlaidItem)];
     BankingCategorizeModule,
     BankingTransactionsModule,
     BullModule.registerQueue({ name: UpdateBankingPlaidTransitionsQueueJob }),
+    BullBoardModule.forFeature({
+      name: UpdateBankingPlaidTransitionsQueueJob,
+      adapter: BullMQAdapter,
+    }),
     ...models,
   ],
   providers: [
@@ -51,4 +57,4 @@ const models = [RegisterTenancyModel(PlaidItem)];
   exports: [...models],
   controllers: [BankingPlaidController, BankingPlaidWebhooksController],
 })
-export class BankingPlaidModule { }
+export class BankingPlaidModule {}

packages/server/src/modules/BankingTranasctionsRegonize/BankingTransactionsRegonize.module.ts

@@ -10,6 +10,8 @@ import { BankingRecognizedTransactionsController } from './BankingRecognizedTran
 import { RecognizedTransactionsApplication } from './RecognizedTransactions.application';
 import { GetRecognizedTransactionsService } from './GetRecongizedTransactions';
 import { GetRecognizedTransactionService } from './queries/GetRecognizedTransaction.service';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import { BullModule } from '@nestjs/bullmq';
 import { RecognizeUncategorizedTransactionsQueue } from './_types';
 import { RegonizeTransactionsPrcessor } from './jobs/RecognizeTransactionsJob';
@@ -25,6 +27,10 @@ const models = [RegisterTenancyModel(RecognizedBankTransaction)];
     BullModule.registerQueue({
       name: RecognizeUncategorizedTransactionsQueue,
     }),
+    BullBoardModule.forFeature({
+      name: RecognizeUncategorizedTransactionsQueue,
+      adapter: BullMQAdapter,
+    }),
     ...models,
   ],
   providers: [

packages/server/src/modules/BankingTransactionsExclude/commands/UnexcludeBankTransaction.service.ts

@@ -4,8 +4,8 @@ import {
   validateTransactionShouldBeExcluded,
 } from './utils';
 import {
-  IBankTransactionExcludedEventPayload,
-  IBankTransactionExcludingEventPayload,
+  IBankTransactionUnexcludedEventPayload,
+  IBankTransactionUnexcludingEventPayload,
 } from '../types/BankTransactionsExclude.types';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Inject, Injectable } from '@nestjs/common';
@@ -24,7 +24,7 @@ export class UnexcludeBankTransactionService {
     private readonly uncategorizedBankTransactionModel: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) {}
+  ) { }
 
   /**
    * Marks the given bank transaction as excluded.
@@ -50,7 +50,8 @@ export class UnexcludeBankTransactionService {
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluding, {
         uncategorizedTransactionId,
-      } as IBankTransactionExcludingEventPayload);
+        trx,
+      } as IBankTransactionUnexcludingEventPayload);
 
       await this.uncategorizedBankTransactionModel()
         .query(trx)
@@ -61,7 +62,8 @@ export class UnexcludeBankTransactionService {
 
       await this.eventEmitter.emitAsync(events.bankTransactions.onUnexcluded, {
         uncategorizedTransactionId,
-      } as IBankTransactionExcludedEventPayload);
+        trx,
+      } as IBankTransactionUnexcludedEventPayload);
     });
   }
 }

packages/server/src/modules/BankingTransactionsExclude/subscribers/DecrementUncategorizedTransactionOnExclude.ts

@@ -19,7 +19,7 @@ export class DecrementUncategorizedTransactionOnExclude {
     private readonly uncategorizedBankTransaction: TenantModelProxy<
       typeof UncategorizedBankTransaction
     >,
-  ) {}
+  ) { }
 
   /**
    * Validates the cashflow transaction whether matched with bank transaction on deleting.
@@ -50,7 +50,7 @@ export class DecrementUncategorizedTransactionOnExclude {
     trx,
   }: IBankTransactionUnexcludedEventPayload) {
     const transaction = await this.uncategorizedBankTransaction()
-      .query()
+      .query(trx)
       .findById(uncategorizedTransactionId);
     //
     await this.account()

packages/server/src/modules/BillLandedCosts/BillLandedCosts.module.ts

@@ -2,9 +2,11 @@ import { forwardRef, Module } from '@nestjs/common';
 import { TransactionLandedCostEntriesService } from './TransactionLandedCostEntries.service';
 import { AllocateLandedCostService } from './commands/AllocateLandedCost.service';
 import { LandedCostGLEntriesSubscriber } from './commands/LandedCostGLEntries.subscriber';
-// import { LandedCostGLEntries } from './commands/LandedCostGLEntries.service';
+import { LandedCostGLEntriesService } from './commands/LandedCostGLEntries.service';
 import { LandedCostSyncCostTransactions } from './commands/LandedCostSyncCostTransactions.service';
+import { LedgerModule } from '../Ledger/Ledger.module';
 import { LandedCostSyncCostTransactionsSubscriber } from './commands/LandedCostSyncCostTransactions.subscriber';
+import { LandedCostInventoryTransactionsSubscriber } from './commands/LandedCostInventoryTransactions.subscriber';
 import { BillAllocatedLandedCostTransactions } from './commands/BillAllocatedLandedCostTransactions.service';
 import { BillAllocateLandedCostController } from './LandedCost.controller';
 import { RevertAllocatedLandedCost } from './commands/RevertAllocatedLandedCost.service';
@@ -16,12 +18,12 @@ import { ExpenseLandedCost } from './commands/ExpenseLandedCost.service';
 import { BillLandedCost } from './commands/BillLandedCost.service';
 
 @Module({
-  imports: [forwardRef(() => InventoryCostModule)],
+  imports: [forwardRef(() => InventoryCostModule), LedgerModule],
   providers: [
     AllocateLandedCostService,
     TransactionLandedCostEntriesService,
     BillAllocatedLandedCostTransactions,
-    LandedCostGLEntriesSubscriber,
+    LandedCostGLEntriesService,
     TransactionLandedCost,
     BillLandedCost,
     ExpenseLandedCost,
@@ -29,6 +31,8 @@ import { BillLandedCost } from './commands/BillLandedCost.service';
     RevertAllocatedLandedCost,
     LandedCostInventoryTransactions,
     LandedCostTranasctions,
+    LandedCostGLEntriesSubscriber,
+    LandedCostInventoryTransactionsSubscriber,
     LandedCostSyncCostTransactionsSubscriber,
   ],
   exports: [TransactionLandedCostEntriesService],

packages/server/src/modules/BillLandedCosts/LandedCost.controller.ts

@@ -25,7 +25,7 @@ export class BillAllocateLandedCostController {
     private billAllocatedCostTransactions: BillAllocatedLandedCostTransactions,
     private revertAllocatedLandedCost: RevertAllocatedLandedCost,
     private landedCostTransactions: LandedCostTranasctions,
-  ) {}
+  ) { }
 
   @Get('/transactions')
   @ApiOperation({ summary: 'Get landed cost transactions' })

packages/server/src/modules/BillLandedCosts/commands/AllocateLandedCost.service.ts

@@ -23,7 +23,9 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     private readonly billModel: TenantModelProxy<typeof Bill>,
 
     @Inject(BillLandedCost.name)
-    protected readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>
+    protected readonly billLandedCostModel: TenantModelProxy<
+      typeof BillLandedCost
+    >,
   ) {
     super();
   }
@@ -54,7 +56,8 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     const amount = this.getAllocateItemsCostTotal(allocateCostDTO);
 
     // Retrieve the purchase invoice or throw not found error.
-    const bill = await this.billModel().query()
+    const bill = await this.billModel()
+      .query()
       .findById(billId)
       .withGraphFetched('entries')
       .throwIfNotFound();
@@ -89,8 +92,9 @@ export class AllocateLandedCostService extends BaseLandedCostService {
     // unit-of-work eniverment.
     return this.uow.withTransaction(async (trx: Knex.Transaction) => {
       // Save the bill landed cost model.
-      const billLandedCost =
-        await BillLandedCost.query(trx).insertGraph(billLandedCostObj);
+      const billLandedCost = await this.billLandedCostModel()
+        .query(trx)
+        .insertGraph(billLandedCostObj);
       // Triggers `onBillLandedCostCreated` event.
       await this.eventPublisher.emitAsync(events.billLandedCost.onCreated, {
         bill,
@@ -103,5 +107,5 @@ export class AllocateLandedCostService extends BaseLandedCostService {
 
       return billLandedCost;
     });
-  };
+  }
 }

packages/server/src/modules/BillLandedCosts/commands/BillAllocatedLandedCostTransactions.service.ts

@@ -21,7 +21,7 @@ export class BillAllocatedLandedCostTransactions {
     private readonly billLandedCostModel: TenantModelProxy<
       typeof BillLandedCost
     >,
-  ) {}
+  ) { }
 
   /**
    * Retrieve the bill associated landed cost transactions.
@@ -77,6 +77,13 @@ export class BillAllocatedLandedCostTransactions {
       transaction.fromTransactionType,
       transaction,
     );
+    const allocationMethodFormattedKey = transaction.allocationMethodFormatted;
+    const allocationMethodFormatted = allocationMethodFormattedKey
+      ? this.i18nService.t(allocationMethodFormattedKey, {
+        defaultValue: allocationMethodFormattedKey,
+      })
+      : '';
+
     return {
       formattedAmount: formatNumber(transaction.amount, {
         currencyCode: transaction.currencyCode,
@@ -84,12 +91,14 @@ export class BillAllocatedLandedCostTransactions {
       ...omit(transaction, [
         'allocatedFromBillEntry',
         'allocatedFromExpenseEntry',
+        'allocationMethodFormatted',
       ]),
       name,
       description,
       formattedLocalAmount: formatNumber(transaction.localAmount, {
         currencyCode: 'USD',
       }),
+      allocationMethodFormatted,
     };
   };
 

packages/server/src/modules/BillLandedCosts/commands/LandedCostGLEntries.service.ts

@@ -1,236 +1,188 @@
-// import * as R from 'ramda';
-// import { Knex } from 'knex';
-// import { Inject, Injectable } from '@nestjs/common';
-// import { BaseLandedCostService } from '../BaseLandedCost.service';
-// import { BillLandedCost } from '../models/BillLandedCost';
-// import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
-// import { Bill } from '@/modules/Bills/models/Bill';
-// import { BillLandedCostEntry } from '../models/BillLandedCostEntry';
-// import { ILedger, ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
-// import { Ledger } from '@/modules/Ledger/Ledger';
-// import { AccountNormal } from '@/interfaces/Account';
-// import { ILandedCostTransactionEntry } from '../types/BillLandedCosts.types';
+import { Knex } from 'knex';
+import { Inject, Injectable } from '@nestjs/common';
+import * as moment from 'moment';
+import { BaseLandedCostService } from '../BaseLandedCost.service';
+import { BillLandedCost } from '../models/BillLandedCost';
+import { Bill } from '@/modules/Bills/models/Bill';
+import { BillLandedCostEntry } from '../models/BillLandedCostEntry';
+import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
+import { Ledger } from '@/modules/Ledger/Ledger';
+import { LedgerStorageService } from '@/modules/Ledger/LedgerStorage.service';
+import { AccountNormal } from '@/modules/Accounts/Accounts.types';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
-// @Injectable()
-// export class LandedCostGLEntries extends BaseLandedCostService {
-//   constructor(
-//     private readonly journalService: JournalPosterService,
-//     private readonly ledgerRepository: LedgerRepository,
+@Injectable()
+export class LandedCostGLEntriesService extends BaseLandedCostService {
+  constructor(
+    private readonly ledgerStorage: LedgerStorageService,
 
-//     @Inject(BillLandedCost.name)
-//     private readonly billLandedCostModel: TenantModelProxy<typeof BillLandedCost>,
-//   ) {
-//     super();
-//   }
+    @Inject(BillLandedCost.name)
+    protected readonly billLandedCostModel: TenantModelProxy<
+      typeof BillLandedCost
+    >,
+  ) {
+    super();
+  }
 
-//   /**
-//    * Retrieves the landed cost GL common entry.
-//    * @param {IBill} bill
-//    * @param {IBillLandedCost} allocatedLandedCost
-//    * @returns
-//    */
-//   private getLandedCostGLCommonEntry = (
-//     bill: Bill,
-//     allocatedLandedCost: BillLandedCost
-//   ) => {
-//     return {
-//       date: bill.billDate,
-//       currencyCode: allocatedLandedCost.currencyCode,
-//       exchangeRate: allocatedLandedCost.exchangeRate,
+  /**
+   * Retrieves the landed cost GL common entry.
+   */
+  private getLandedCostGLCommonEntry(
+    bill: Bill,
+    allocatedLandedCost: BillLandedCost,
+  ) {
+    return {
+      date: moment(bill.billDate).format('YYYY-MM-DD'),
+      currencyCode: allocatedLandedCost.currencyCode,
+      exchangeRate: allocatedLandedCost.exchangeRate,
 
-//       transactionType: 'LandedCost',
-//       transactionId: allocatedLandedCost.id,
-//       transactionNumber: bill.billNumber,
+      transactionType: 'LandedCost',
+      transactionId: allocatedLandedCost.id,
+      transactionNumber: bill.billNumber,
 
-//       referenceNumber: bill.referenceNo,
+      referenceNumber: bill.referenceNo,
 
-//       credit: 0,
-//       debit: 0,
-//     };
-//   };
+      branchId: bill.branchId,
+      projectId: bill.projectId,
 
-//   /**
-//    * Retrieves the landed cost GL inventory entry.
-//    * @param {IBill} bill
-//    * @param {IBillLandedCost} allocatedLandedCost
-//    * @param {IBillLandedCostEntry} allocatedEntry
-//    * @returns {ILedgerEntry}
-//    */
-//   private getLandedCostGLInventoryEntry = (
-//     bill: Bill,
-//     allocatedLandedCost: BillLandedCost,
-//     allocatedEntry: BillLandedCostEntry
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getLandedCostGLCommonEntry(
-//       bill,
-//       allocatedLandedCost
-//     );
-//     return {
-//       ...commonEntry,
-//       debit: allocatedLandedCost.localAmount,
-//       accountId: allocatedEntry.itemEntry.item.inventoryAccountId,
-//       index: 1,
-//       accountNormal: AccountNormal.DEBIT,
-//     };
-//   };
+      credit: 0,
+      debit: 0,
+    };
+  }
 
-//   /**
-//    * Retrieves the landed cost GL cost entry.
-//    * @param {IBill} bill
-//    * @param {IBillLandedCost} allocatedLandedCost
-//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
-//    * @returns {ILedgerEntry}
-//    */
-//   private getLandedCostGLCostEntry = (
-//     bill: Bill,
-//     allocatedLandedCost: BillLandedCost,
-//     fromTransactionEntry: ILandedCostTransactionEntry
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getLandedCostGLCommonEntry(
-//       bill,
-//       allocatedLandedCost
-//     );
-//     return {
-//       ...commonEntry,
-//       credit: allocatedLandedCost.localAmount,
-//       accountId: fromTransactionEntry.costAccountId,
-//       index: 2,
-//       accountNormal: AccountNormal.CREDIT,
-//     };
-//   };
+  /**
+   * Retrieves the landed cost GL inventory entry for an allocated item.
+   */
+  private getLandedCostGLInventoryEntry(
+    bill: Bill,
+    allocatedLandedCost: BillLandedCost,
+    allocatedEntry: BillLandedCostEntry,
+    index: number,
+  ): ILedgerEntry {
+    const commonEntry = this.getLandedCostGLCommonEntry(
+      bill,
+      allocatedLandedCost,
+    );
+    const itemEntry = (
+      allocatedEntry as BillLandedCostEntry & {
+        itemEntry?: {
+          item?: { type?: string; inventoryAccountId?: number };
+          costAccountId?: number;
+          itemId?: number;
+        };
+      }
+    ).itemEntry;
+    const item = itemEntry?.item;
+    const isInventory = item && ['inventory'].indexOf(item.type) !== -1;
+    const accountId = isInventory
+      ? item?.inventoryAccountId
+      : itemEntry?.costAccountId;
 
-//   /**
-//    * Retrieve allocated landed cost entry GL entries.
-//    * @param {IBill} bill
-//    * @param {IBillLandedCost} allocatedLandedCost
-//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
-//    * @param {IBillLandedCostEntry} allocatedEntry
-//    * @returns {ILedgerEntry}
-//    */
-//   private getLandedCostGLAllocateEntry = R.curry(
-//     (
-//       bill: Bill,
-//       allocatedLandedCost: BillLandedCost,
-//       fromTransactionEntry: ILandedCostTransactionEntry,
-//       allocatedEntry: BillLandedCostEntry
-//     ): ILedgerEntry[] => {
-//       const inventoryEntry = this.getLandedCostGLInventoryEntry(
-//         bill,
-//         allocatedLandedCost,
-//         allocatedEntry
-//       );
-//       const costEntry = this.getLandedCostGLCostEntry(
-//         bill,
-//         allocatedLandedCost,
-//         fromTransactionEntry
-//       );
-//       return [inventoryEntry, costEntry];
-//     }
-//   );
+    if (!accountId) {
+      throw new Error(
+        `Cannot determine GL account for landed cost allocate entry (entryId: ${allocatedEntry.entryId})`,
+      );
+    }
 
-//   /**
-//    * Compose the landed cost GL entries.
-//    * @param {BillLandedCost} allocatedLandedCost
-//    * @param {Bill} bill
-//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
-//    * @returns {ILedgerEntry[]}
-//    */
-//   public getLandedCostGLEntries = (
-//     allocatedLandedCost: BillLandedCost,
-//     bill: Bill,
-//     fromTransactionEntry: ILandedCostTransactionEntry
-//   ): ILedgerEntry[] => {
-//     const getEntry = this.getLandedCostGLAllocateEntry(
-//       bill,
-//       allocatedLandedCost,
-//       fromTransactionEntry
-//     );
-//     return allocatedLandedCost.allocateEntries.map(getEntry).flat();
-//   };
+    const localAmount =
+      allocatedEntry.cost * (allocatedLandedCost.exchangeRate || 1);
 
-//   /**
-//    * Retrieves the landed cost GL ledger.
-//    * @param {BillLandedCost} allocatedLandedCost
-//    * @param {Bill} bill
-//    * @param {ILandedCostTransactionEntry} fromTransactionEntry
-//    * @returns {ILedger}
-//    */
-//   public getLandedCostLedger = (
-//     allocatedLandedCost: BillLandedCost,
-//     bill: Bill,
-//     fromTransactionEntry: ILandedCostTransactionEntry
-//   ): ILedger => {
-//     const entries = this.getLandedCostGLEntries(
-//       allocatedLandedCost,
-//       bill,
-//       fromTransactionEntry
-//     );
-//     return new Ledger(entries);
-//   };
+    return {
+      ...commonEntry,
+      debit: localAmount,
+      accountId,
+      index: index + 1,
+      indexGroup: 10,
+      itemId: itemEntry?.itemId,
+      accountNormal: AccountNormal.DEBIT,
+    };
+  }
 
-//   /**
-//    * Writes landed cost GL entries to the storage layer.
-//    * @param {number} tenantId -
-//    */
-//   public writeLandedCostGLEntries = async (
-//     allocatedLandedCost: BillLandedCost,
-//     bill: Bill,
-//     fromTransactionEntry: ILandedCostTransactionEntry,
-//     trx?: Knex.Transaction
-//   ) => {
-//     const ledgerEntries = this.getLandedCostGLEntries(
-//       allocatedLandedCost,
-//       bill,
-//       fromTransactionEntry
-//     );
-//     await this.ledgerRepository.saveLedgerEntries(ledgerEntries, trx);
-//   };
+  /**
+   * Retrieves the landed cost GL cost entry (credit to cost account).
+   */
+  private getLandedCostGLCostEntry(
+    bill: Bill,
+    allocatedLandedCost: BillLandedCost,
+  ): ILedgerEntry {
+    const commonEntry = this.getLandedCostGLCommonEntry(
+      bill,
+      allocatedLandedCost,
+    );
 
-//   /**
-//    * Generates and writes GL entries of the given landed cost.
-//    * @param {number} billLandedCostId
-//    * @param {Knex.Transaction} trx
-//    */
-//   public createLandedCostGLEntries = async (
-//     billLandedCostId: number,
-//     trx?: Knex.Transaction
-//   ) => {
-//     // Retrieve the bill landed cost transacion with associated
-//     // allocated entries and items.
-//     const allocatedLandedCost = await this.billLandedCostModel().query(trx)
-//       .findById(billLandedCostId)
-//       .withGraphFetched('bill')
-//       .withGraphFetched('allocateEntries.itemEntry.item');
+    return {
+      ...commonEntry,
+      credit: allocatedLandedCost.localAmount,
+      accountId: allocatedLandedCost.costAccountId,
+      index: 1,
+      indexGroup: 20,
+      accountNormal: AccountNormal.CREDIT,
+    };
+  }
 
-//     // Retrieve the allocated from transactione entry.
-//     const transactionEntry = await this.getLandedCostEntry(
-//       allocatedLandedCost.fromTransactionType,
-//       allocatedLandedCost.fromTransactionId,
-//       allocatedLandedCost.fromTransactionEntryId
-//     );
-//     // Writes the given landed cost GL entries to the storage layer.
-//     await this.writeLandedCostGLEntries(
-//       allocatedLandedCost,
-//       allocatedLandedCost.bill,
-//       transactionEntry,
-//       trx
-//     );
-//   };
+  /**
+   * Composes the landed cost GL entries.
+   */
+  public getLandedCostGLEntries(
+    allocatedLandedCost: BillLandedCost,
+    bill: Bill,
+  ): ILedgerEntry[] {
+    const inventoryEntries = allocatedLandedCost.allocateEntries.map(
+      (allocatedEntry, index) =>
+        this.getLandedCostGLInventoryEntry(
+          bill,
+          allocatedLandedCost,
+          allocatedEntry,
+          index,
+        ),
+    );
+    const costEntry = this.getLandedCostGLCostEntry(bill, allocatedLandedCost);
 
-//   /**
-//    * Reverts GL entries of the given allocated landed cost transaction.
-//    * @param {number} tenantId
-//    * @param {number} landedCostId
-//    * @param {Knex.Transaction} trx
-//    */
-//   public revertLandedCostGLEntries = async (
-//     landedCostId: number,
-//     trx: Knex.Transaction
-//   ) => {
-//     await this.journalService.revertJournalTransactions(
-//       landedCostId,
-//       'LandedCost',
-//       trx
-//     );
-//   };
-// }
+    return [...inventoryEntries, costEntry];
+  }
+
+  /**
+   * Retrieves the landed cost GL ledger.
+   */
+  public getLandedCostLedger(
+    allocatedLandedCost: BillLandedCost,
+    bill: Bill,
+  ): Ledger {
+    const entries = this.getLandedCostGLEntries(allocatedLandedCost, bill);
+    return new Ledger(entries);
+  }
+
+  /**
+   * Generates and writes GL entries of the given landed cost.
+   */
+  public createLandedCostGLEntries = async (
+    billLandedCostId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    const allocatedLandedCost = await this.billLandedCostModel()
+      .query(trx)
+      .findById(billLandedCostId)
+      .withGraphFetched('bill')
+      .withGraphFetched('allocateEntries.itemEntry.item');
+
+    if (!allocatedLandedCost?.bill) {
+      throw new Error('BillLandedCost or associated Bill not found');
+    }
+
+    const ledger = this.getLandedCostLedger(
+      allocatedLandedCost,
+      allocatedLandedCost.bill,
+    );
+    await this.ledgerStorage.commit(ledger, trx);
+  };
+
+  /**
+   * Reverts GL entries of the given allocated landed cost transaction.
+   */
+  public revertLandedCostGLEntries = async (
+    landedCostId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    await this.ledgerStorage.deleteByReference(landedCostId, 'LandedCost', trx);
+  };
+}

packages/server/src/modules/BillLandedCosts/commands/LandedCostGLEntries.subscriber.ts

@@ -3,14 +3,15 @@ import {
   IAllocatedLandedCostDeletedPayload,
 } from '../types/BillLandedCosts.types';
 import { OnEvent } from '@nestjs/event-emitter';
-// import { LandedCostGLEntries } from './LandedCostGLEntries.service';
 import { Injectable } from '@nestjs/common';
 import { events } from '@/common/events/events';
+import { LandedCostGLEntriesService } from './LandedCostGLEntries.service';
 
 @Injectable()
 export class LandedCostGLEntriesSubscriber {
-  constructor() // private readonly billLandedCostGLEntries: LandedCostGLEntries,
-  {}
+  constructor(
+    private readonly landedCostGLEntries: LandedCostGLEntriesService,
+  ) {}
 
   /**
    * Writes GL entries once landed cost transaction created.
@@ -21,10 +22,10 @@ export class LandedCostGLEntriesSubscriber {
     billLandedCost,
     trx,
   }: IAllocatedLandedCostCreatedPayload) {
-    // await this.billLandedCostGLEntries.createLandedCostGLEntries(
-    //   billLandedCost.id,
-    //   trx
-    // );
+    await this.landedCostGLEntries.createLandedCostGLEntries(
+      billLandedCost.id,
+      trx,
+    );
   }
 
   /**
@@ -32,13 +33,13 @@ export class LandedCostGLEntriesSubscriber {
    * @param {IAllocatedLandedCostDeletedPayload} payload -
    */
   @OnEvent(events.billLandedCost.onDeleted)
-  async revertGLEnteriesOnceLandedCostDeleted({
+  async revertGLEntriesOnceLandedCostDeleted({
     oldBillLandedCost,
     trx,
   }: IAllocatedLandedCostDeletedPayload) {
-    // await this.billLandedCostGLEntries.revertLandedCostGLEntries(
-    //   oldBillLandedCost.id,
-    //   trx
-    // );
+    await this.landedCostGLEntries.revertLandedCostGLEntries(
+      oldBillLandedCost.id,
+      trx,
+    );
   }
 }

packages/server/src/modules/BillLandedCosts/commands/LandedCostTransactions.service.ts

@@ -14,7 +14,7 @@ import { LandedCostTransactionsQueryDto } from '../dtos/LandedCostTransactionsQu
 
 @Injectable()
 export class LandedCostTranasctions {
-  constructor(private readonly transactionLandedCost: TransactionLandedCost) {}
+  constructor(private readonly transactionLandedCost: TransactionLandedCost) { }
 
   /**
    * Retrieve the landed costs based on the given query.
@@ -45,8 +45,8 @@ export class LandedCostTranasctions {
     )(transactionType);
 
     return pipe(
-      this.transformLandedCostTransactions,
       R.map(transformLandedCost),
+      this.transformLandedCostTransactions,
     )(transactions);
   };
 
@@ -90,7 +90,7 @@ export class LandedCostTranasctions {
     const entries = R.map<
       ILandedCostTransactionEntry,
       ILandedCostTransactionEntryDOJO
-    >(transformLandedCostEntry)(transaction.entries);
+    >(transformLandedCostEntry)(transaction.entries ?? []);
 
     return {
       ...transaction,

packages/server/src/modules/BillLandedCosts/dtos/AllocateBillLandedCost.dto.ts

@@ -4,7 +4,6 @@ import {
   IsOptional,
   IsArray,
   ValidateNested,
-  IsDecimal,
   IsString,
   IsNumber,
 } from 'class-validator';
@@ -17,8 +16,9 @@ export class AllocateBillLandedCostItemDto {
   @ToNumber()
   entryId: number;
 
-  @IsDecimal()
-  cost: string; // Use string for IsDecimal, or use @IsNumber() if you want a number
+  @IsNumber()
+  @ToNumber()
+  cost: number;
 }
 
 export class AllocateBillLandedCostDto {

packages/server/src/modules/BillLandedCosts/models/BillLandedCost.ts

@@ -60,8 +60,8 @@ export class BillLandedCost extends BaseModel {
     const allocationMethod = lowerCase(this.allocationMethod);
 
     const keyLabelsPairs = {
-      value: 'allocation_method.value.label',
-      quantity: 'allocation_method.quantity.label',
+      value: 'bill.allocation_method.value',
+      quantity: 'bill.allocation_method.quantity',
     };
     return keyLabelsPairs[allocationMethod] || '';
   }

packages/server/src/modules/BillPayments/BillPayments.module.ts

@@ -14,6 +14,7 @@ import { BranchesSettingsService } from '../Branches/BranchesSettings';
 import { BillPaymentsController } from './BillPayments.controller';
 import { BillPaymentGLEntries } from './commands/BillPaymentGLEntries';
 import { BillPaymentGLEntriesSubscriber } from './subscribers/BillPaymentGLEntriesSubscriber';
+import { BillPaymentBillSyncSubscriber } from './subscribers/BillPaymentBillSyncSubscriber';
 import { LedgerModule } from '../Ledger/Ledger.module';
 import { AccountsModule } from '../Accounts/Accounts.module';
 import { BillPaymentsExportable } from './queries/BillPaymentsExportable';
@@ -39,6 +40,7 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
     TenancyContext,
     BillPaymentGLEntries,
     BillPaymentGLEntriesSubscriber,
+    BillPaymentBillSyncSubscriber,
     BillPaymentsExportable,
     BillPaymentsImportable,
     GetBillPaymentsService,
@@ -52,4 +54,4 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
   ],
   controllers: [BillPaymentsController],
 })
-export class BillPaymentsModule {}
+export class BillPaymentsModule { }

packages/server/src/modules/BillPayments/commands/CreateBillPayment.service.ts

@@ -38,7 +38,7 @@ export class CreateBillPaymentService {
 
     @Inject(BillPayment.name)
     private readonly billPaymentModel: TenantModelProxy<typeof BillPayment>,
-  ) {}
+  ) { }
 
   /**
    * Creates a new bill payment transcations and store it to the storage
@@ -103,11 +103,19 @@ export class CreateBillPaymentService {
       } as IBillPaymentCreatingPayload);
 
       // Writes the bill payment graph to the storage.
-      const billPayment = await this.billPaymentModel()
+      const insertedBillPayment = await this.billPaymentModel()
         .query(trx)
         .insertGraphAndFetch({
           ...billPaymentObj,
         });
+
+      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
+      const billPayment = await this.billPaymentModel()
+        .query(trx)
+        .withGraphFetched('entries')
+        .findById(insertedBillPayment.id)
+        .throwIfNotFound();
+
       // Triggers `onBillPaymentCreated` event.
       await this.eventPublisher.emitAsync(events.billPayment.onCreated, {
         billPayment,

packages/server/src/modules/BillPayments/commands/EditBillPayment.service.ts

@@ -29,7 +29,7 @@ export class EditBillPayment {
 
     @Inject(Vendor.name)
     private readonly vendorModel: TenantModelProxy<typeof Vendor>,
-  ) {}
+  ) { }
 
   /**
    * Edits the details of the given bill payment.
@@ -116,12 +116,20 @@ export class EditBillPayment {
       } as IBillPaymentEditingPayload);
 
       // Edits the bill payment transaction graph on the storage.
-      const billPayment = await this.billPaymentModel()
+      await this.billPaymentModel()
         .query(trx)
-        .upsertGraphAndFetch({
+        .upsertGraph({
           id: billPaymentId,
           ...billPaymentObj,
         });
+
+      // Fetch the bill payment with entries to ensure they're loaded for the subscriber.
+      const billPayment = await this.billPaymentModel()
+        .query(trx)
+        .withGraphFetched('entries')
+        .findById(billPaymentId)
+        .throwIfNotFound();
+
       // Triggers `onBillPaymentEdited` event.
       await this.eventPublisher.emitAsync(events.billPayment.onEdited, {
         billPaymentId,

packages/server/src/modules/BillPayments/queries/BillPaymentsExportable.ts

@@ -16,8 +16,6 @@ export class BillPaymentsExportable extends Exportable {
 
   /**
    * Retrieves the accounts data to exportable sheet.
-   * @param {number} tenantId
-   * @returns
    */
   public async exportable(query: any) {
     const filterQuery = (builder) => {

packages/server/src/modules/BillPayments/subscribers/BillPaymentBillSyncSubscriber.ts

@@ -0,0 +1,80 @@
+import {
+  IBillPaymentEventCreatedPayload,
+  IBillPaymentEventDeletedPayload,
+  IBillPaymentEventEditedPayload,
+} from '../types/BillPayments.types';
+import { BillPaymentBillSync } from '../commands/BillPaymentBillSync.service';
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import { events } from '@/common/events/events';
+
+@Injectable()
+export class BillPaymentBillSyncSubscriber {
+  /**
+   * @param {BillPaymentBillSync} billPaymentBillSync - Bill payment bill sync service.
+   */
+  constructor(private readonly billPaymentBillSync: BillPaymentBillSync) { }
+
+  /**
+   * Handle bill increment/decrement payment amount
+   * once created, edited or deleted.
+   */
+  @OnEvent(events.billPayment.onCreated)
+  async handleBillIncrementPaymentOnceCreated({
+    billPayment,
+    trx,
+  }: IBillPaymentEventCreatedPayload) {
+    // Ensure entries are available - they should be included in insertGraphAndFetch
+    const entries = billPayment.entries || [];
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      entries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: entry.paymentAmount,
+      })),
+      null,
+      trx,
+    );
+  }
+
+  /**
+   * Handle bill increment/decrement payment amount once edited.
+   */
+  @OnEvent(events.billPayment.onEdited)
+  async handleBillIncrementPaymentOnceEdited({
+    billPayment,
+    oldBillPayment,
+    trx,
+  }: IBillPaymentEventEditedPayload) {
+    const entries = billPayment.entries || [];
+    const oldEntries = oldBillPayment?.entries || null;
+
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      entries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: entry.paymentAmount,
+      })),
+      oldEntries,
+      trx,
+    );
+  }
+
+  /**
+   * Handle revert bills payment amount once bill payment deleted.
+   */
+  @OnEvent(events.billPayment.onDeleted)
+  async handleBillDecrementPaymentAmount({
+    oldBillPayment,
+    trx,
+  }: IBillPaymentEventDeletedPayload) {
+    const oldEntries = oldBillPayment.entries || [];
+
+    await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
+      oldEntries.map((entry) => ({
+        billId: entry.billId,
+        paymentAmount: 0,
+      })),
+      oldEntries,
+      trx,
+    );
+  }
+}

packages/server/src/modules/Bills/Bills.controller.ts

@@ -11,10 +11,12 @@ import {
   Post,
   Body,
   Put,
+  Patch,
   Param,
   Delete,
   Get,
   Query,
+  HttpCode,
 } from '@nestjs/common';
 import { BillsApplication } from './Bills.application';
 import { IBillsFilter } from './Bills.types';
@@ -40,6 +42,7 @@ export class BillsController {
   @ApiOperation({
     summary: 'Validate which bills can be deleted and return the results.',
   })
+  @HttpCode(200)
   @ApiResponse({
     status: 200,
     description:
@@ -56,6 +59,7 @@ export class BillsController {
 
   @Post('bulk-delete')
   @ApiOperation({ summary: 'Deletes multiple bills.' })
+  @HttpCode(200)
   @ApiResponse({
     status: 200,
     description: 'Bills deleted successfully',
@@ -160,7 +164,7 @@ export class BillsController {
     return this.billsApplication.getBill(billId);
   }
 
-  @Post(':id/open')
+  @Patch(':id/open')
   @ApiOperation({ summary: 'Open the given bill.' })
   @ApiParam({
     name: 'id',

packages/server/src/modules/Bills/models/Bill.ts

@@ -51,6 +51,7 @@ export class Bill extends TenantBaseModel {
   public updatedAt: Date | null;
 
   public entries?: ItemEntry[];
+  public attachments!: Document[];
   public locatedLandedCosts?: BillLandedCost[];
   /**
    * Timestamps columns.
@@ -633,7 +634,7 @@ export class Bill extends TenantBaseModel {
 
     return this.query(trx)
       .where('id', billId)
-      [changeMethod]('payment_amount', Math.abs(amount));
+    [changeMethod]('payment_amount', Math.abs(amount));
   }
 
   /**

packages/server/src/modules/Bills/queries/Bill.transformer.ts

@@ -1,5 +1,7 @@
 import { Transformer } from '@/modules/Transformer/Transformer';
 import { Bill } from '../models/Bill';
+import { ItemEntryTransformer } from '@/modules/TransactionItemEntry/ItemEntry.transformer';
+import { AttachmentTransformer } from '@/modules/Attachments/Attachment.transformer';
 
 export class BillTransformer extends Transformer {
   /**
@@ -231,20 +233,18 @@ export class BillTransformer extends Transformer {
   /**
    * Retrieves the entries of the bill.
    * @param {Bill} credit
-   * @returns {}
    */
-  // protected entries = (bill: Bill) => {
-  //   return this.item(bill.entries, new ItemEntryTransformer(), {
-  //     currencyCode: bill.currencyCode,
-  //   });
-  // };
+  protected entries = (bill: Bill) => {
+    return this.item(bill.entries, new ItemEntryTransformer(), {
+      currencyCode: bill.currencyCode,
+    });
+  };
 
   /**
    * Retrieves the bill attachments.
-   * @param {ISaleInvoice} invoice
-   * @returns
+   * @param {Bill} bill
    */
-  // protected attachments = (bill: Bill) => {
-  //   return this.item(bill.attachments, new AttachmentTransformer());
-  // };
+  protected attachments = (bill: Bill) => {
+    return this.item(bill.attachments, new AttachmentTransformer());
+  };
 }

packages/server/src/modules/Branches/subscribers/Validators/BillBranchSubscriber.ts

@@ -17,7 +17,7 @@ export class BillBranchValidateSubscriber {
    * Validate branch existance on bill creating.
    * @param {IBillCreatingPayload} payload
    */
-  @OnEvent(events.bill.onCreating)
+  @OnEvent(events.bill.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnBillCreating({
     billDTO,
   }: IBillCreatingPayload) {
@@ -30,7 +30,7 @@ export class BillBranchValidateSubscriber {
    * Validate branch existance once bill editing.
    * @param {IBillEditingPayload} payload
    */
-  @OnEvent(events.bill.onEditing)
+  @OnEvent(events.bill.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnBillEditing({ billDTO }: IBillEditingPayload) {
     await this.validateBranchExistance.validateTransactionBranchWhenActive(
       billDTO.branchId,

packages/server/src/modules/Branches/subscribers/Validators/CashflowBranchDTOValidatorSubscriber.ts

@@ -14,7 +14,7 @@ export class CashflowBranchDTOValidatorSubscriber {
    * Validate branch existance once cashflow transaction creating.
    * @param {ICommandCashflowCreatingPayload} payload
    */
-  @OnEvent(events.cashflow.onTransactionCreating)
+  @OnEvent(events.cashflow.onTransactionCreating, { suppressErrors: false })
   async validateBranchExistanceOnCashflowTransactionCreating({
     newTransactionDTO,
   }: ICommandCashflowCreatingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/ContactOpeningBalanceBranchSubscriber.ts

@@ -15,13 +15,13 @@ import {
 export class ContactBranchValidateSubscriber {
   constructor(
     private readonly validateBranchExistance: ValidateBranchExistance,
-  ) { }
+  ) {}
 
   /**
    * Validate branch existance on customer creating.
    * @param {ICustomerEventCreatingPayload} payload
    */
-  @OnEvent(events.customers.onCreating)
+  @OnEvent(events.customers.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnCustomerCreating({
     customerDTO,
   }: ICustomerEventCreatingPayload) {
@@ -37,7 +37,7 @@ export class ContactBranchValidateSubscriber {
    * Validate branch existance once customer opening balance editing.
    * @param {ICustomerOpeningBalanceEditingPayload} payload
    */
-  @OnEvent(events.customers.onOpeningBalanceChanging)
+  @OnEvent(events.customers.onOpeningBalanceChanging, { suppressErrors: false })
   async validateBranchExistanceOnCustomerOpeningBalanceEditing({
     openingBalanceEditDTO,
   }: ICustomerOpeningBalanceEditingPayload) {
@@ -52,7 +52,7 @@ export class ContactBranchValidateSubscriber {
    * Validates the branch existance on vendor creating.
    * @param {IVendorEventCreatingPayload} payload
    */
-  @OnEvent(events.vendors.onCreating)
+  @OnEvent(events.vendors.onCreating, { suppressErrors: false })
   async validateBranchExistanceonVendorCreating({
     vendorDTO,
   }: IVendorEventCreatingPayload) {
@@ -68,7 +68,7 @@ export class ContactBranchValidateSubscriber {
    * Validate branch existance once the vendor opening balance editing.
    * @param {IVendorOpeningBalanceEditingPayload} payload
    */
-  @OnEvent(events.vendors.onOpeningBalanceChanging)
+  @OnEvent(events.vendors.onOpeningBalanceChanging, { suppressErrors: false })
   async validateBranchExistanceOnVendorOpeningBalanceEditing({
     openingBalanceEditDTO,
   }: IVendorOpeningBalanceEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/CreditNoteBranchesSubscriber.ts

@@ -15,7 +15,7 @@ export class CreditNoteBranchValidateSubscriber {
    * Validate branch existance on credit note creating.
    * @param {ICreditNoteCreatingPayload} payload
    */
-  @OnEvent(events.creditNote.onCreating)
+  @OnEvent(events.creditNote.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnCreditCreating({
     creditNoteDTO,
   }: ICreditNoteCreatingPayload) {
@@ -28,7 +28,7 @@ export class CreditNoteBranchValidateSubscriber {
    * Validate branch existance once credit note editing.
    * @param {ICreditNoteEditingPayload} payload
    */
-  @OnEvent(events.creditNote.onEditing)
+  @OnEvent(events.creditNote.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnCreditEditing({
     creditNoteEditDTO,
   }: ICreditNoteEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/CreditNoteRefundBranchSubscriber.ts

@@ -14,7 +14,7 @@ export class CreditNoteRefundBranchValidateSubscriber {
    * Validate branch existance on refund credit note creating.
    * @param {IRefundCreditNoteCreatingPayload} payload
    */
-  @OnEvent(events.creditNote.onRefundCreating)
+  @OnEvent(events.creditNote.onRefundCreating, { suppressErrors: false })
   async validateBranchExistanceOnCreditRefundCreating({
     newCreditNoteDTO,
   }: IRefundCreditNoteCreatingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/ExpenseBranchSubscriber.ts

@@ -16,7 +16,7 @@ export class ExpenseBranchValidateSubscriber {
    * Validate branch existance once expense transaction creating.
    * @param {IExpenseCreatingPayload} payload
    */
-  @OnEvent(events.expenses.onCreating)
+  @OnEvent(events.expenses.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnExpenseCreating({
     expenseDTO,
   }: IExpenseCreatingPayload) {
@@ -29,7 +29,7 @@ export class ExpenseBranchValidateSubscriber {
    * Validate branch existance once expense transaction editing.
    * @param {IExpenseEventEditingPayload} payload
    */
-  @OnEvent(events.expenses.onEditing)
+  @OnEvent(events.expenses.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnExpenseEditing({
     expenseDTO,
   }: IExpenseEventEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/InventoryAdjustmentBranchValidatorSubscriber.ts

@@ -14,7 +14,7 @@ export class InventoryAdjustmentBranchValidateSubscriber {
    * Validate branch existance on inventory adjustment creating.
    * @param {IInventoryAdjustmentCreatingPayload} payload
    */
-  @OnEvent(events.inventoryAdjustment.onQuickCreating)
+  @OnEvent(events.inventoryAdjustment.onQuickCreating, { suppressErrors: false })
   async validateBranchExistanceOnInventoryCreating({
     quickAdjustmentDTO,
   }: IInventoryAdjustmentCreatingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/InvoiceBranchValidatorSubscriber.ts

@@ -17,7 +17,7 @@ export class InvoiceBranchValidateSubscriber {
    * Validate branch existance on invoice creating.
    * @param {ISaleInvoiceCreatingPayload} payload
    */
-  @OnEvent(events.saleInvoice.onCreating)
+  @OnEvent(events.saleInvoice.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnInvoiceCreating({
     saleInvoiceDTO,
   }: ISaleInvoiceCreatingPaylaod) {
@@ -30,7 +30,7 @@ export class InvoiceBranchValidateSubscriber {
    * Validate branch existance once invoice editing.
    * @param {ISaleInvoiceEditingPayload} payload
    */
-  @OnEvent(events.saleInvoice.onEditing)
+  @OnEvent(events.saleInvoice.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnInvoiceEditing({
     saleInvoiceDTO,
   }: ISaleInvoiceEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/PaymentMadeBranchSubscriber.ts

@@ -17,7 +17,7 @@ export class PaymentMadeBranchValidateSubscriber {
    * Validate branch existance on estimate creating.
    * @param {ISaleEstimateCreatedPayload} payload
    */
-  @OnEvent(events.billPayment.onCreating)
+  @OnEvent(events.billPayment.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnPaymentCreating({
     billPaymentDTO,
   }: IBillPaymentCreatingPayload) {
@@ -30,7 +30,7 @@ export class PaymentMadeBranchValidateSubscriber {
    * Validate branch existance once estimate editing.
    * @param {ISaleEstimateEditingPayload} payload
    */
-  @OnEvent(events.billPayment.onEditing)
+  @OnEvent(events.billPayment.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnPaymentEditing({
     billPaymentDTO,
   }: IBillPaymentEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/PaymentReceiveBranchSubscriber.ts

@@ -17,7 +17,7 @@ export class PaymentReceiveBranchValidateSubscriber {
    * Validate branch existance on estimate creating.
    * @param {IPaymentReceivedCreatingPayload} payload
    */
-  @OnEvent(events.paymentReceive.onCreating)
+  @OnEvent(events.paymentReceive.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnPaymentCreating({
     paymentReceiveDTO,
   }: IPaymentReceivedCreatingPayload) {
@@ -30,7 +30,7 @@ export class PaymentReceiveBranchValidateSubscriber {
    * Validate branch existance once estimate editing.
    * @param {IPaymentReceivedEditingPayload} payload
    */
-  @OnEvent(events.paymentReceive.onEditing)
+  @OnEvent(events.paymentReceive.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnPaymentEditing({
     paymentReceiveDTO,
   }: IPaymentReceivedEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/SaleEstimateMultiBranchesSubscriber.ts

@@ -17,7 +17,7 @@ export class SaleEstimateBranchValidateSubscriber {
    * Validate branch existance on estimate creating.
    * @param {ISaleEstimateCreatedPayload} payload
    */
-  @OnEvent(events.saleEstimate.onCreating)
+  @OnEvent(events.saleEstimate.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnEstimateCreating({
     estimateDTO,
   }: ISaleEstimateCreatingPayload) {
@@ -30,7 +30,7 @@ export class SaleEstimateBranchValidateSubscriber {
    * Validate branch existance once estimate editing.
    * @param {ISaleEstimateEditingPayload} payload
    */
-  @OnEvent(events.saleEstimate.onEditing)
+  @OnEvent(events.saleEstimate.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnEstimateEditing({
     estimateDTO,
   }: ISaleEstimateEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/SaleReceiptBranchesSubscriber.ts

@@ -17,7 +17,7 @@ export class SaleReceiptBranchValidateSubscriber {
    * Validate branch existance on estimate creating.
    * @param {ISaleReceiptCreatingPayload} payload
    */
-  @OnEvent(events.saleReceipt.onCreating)
+  @OnEvent(events.saleReceipt.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnInvoiceCreating({
     saleReceiptDTO,
   }: ISaleReceiptCreatingPayload) {
@@ -30,7 +30,7 @@ export class SaleReceiptBranchValidateSubscriber {
    * Validate branch existance once estimate editing.
    * @param {ISaleReceiptEditingPayload} payload
    */
-  @OnEvent(events.saleReceipt.onEditing)
+  @OnEvent(events.saleReceipt.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnInvoiceEditing({
     saleReceiptDTO,
   }: ISaleReceiptEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/VendorCreditBranchSubscriber.ts

@@ -17,7 +17,7 @@ export class VendorCreditBranchValidateSubscriber {
    * Validate branch existance on estimate creating.
    * @param {ISaleEstimateCreatedPayload} payload
    */
-  @OnEvent(events.vendorCredit.onCreating)
+  @OnEvent(events.vendorCredit.onCreating, { suppressErrors: false })
   async validateBranchExistanceOnCreditCreating({
     vendorCreditCreateDTO,
   }: IVendorCreditCreatingPayload) {
@@ -30,7 +30,7 @@ export class VendorCreditBranchValidateSubscriber {
    * Validate branch existance once estimate editing.
    * @param {ISaleEstimateEditingPayload} payload
    */
-  @OnEvent(events.vendorCredit.onEditing)
+  @OnEvent(events.vendorCredit.onEditing, { suppressErrors: false })
   async validateBranchExistanceOnCreditEditing({
     vendorCreditDTO,
   }: IVendorCreditEditingPayload) {

packages/server/src/modules/Branches/subscribers/Validators/VendorCreditRefundBranchSubscriber.ts

@@ -14,7 +14,7 @@ export class VendorCreditRefundBranchValidateSubscriber {
    * Validate branch existance on refund credit note creating.
    * @param {IRefundVendorCreditCreatingPayload} payload
    */
-  @OnEvent(events.vendorCredit.onRefundCreating)
+  @OnEvent(events.vendorCredit.onRefundCreating, { suppressErrors: false })
   async validateBranchExistanceOnCreditRefundCreating({
     refundVendorCreditDTO,
   }: IRefundVendorCreditCreatingPayload) {

packages/server/src/modules/Contacts/Contacts.controller.ts

@@ -3,7 +3,7 @@ import {
   Get,
   Query,
   Param,
-  Post,
+  Patch,
   ParseIntPipe,
 } from '@nestjs/common';
 import { ApiTags, ApiOperation, ApiParam } from '@nestjs/swagger';
@@ -27,7 +27,7 @@ export class ContactsController {
     return this.getAutoCompleteService.autocompleteContacts(query);
   }
 
-  @Post(':id/activate')
+  @Patch(':id/activate')
   @ApiOperation({ summary: 'Activate a contact' })
   @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
   async activateContact(@Param('id', ParseIntPipe) contactId: number) {
@@ -35,7 +35,7 @@ export class ContactsController {
     return { id: contactId, activated: true };
   }
 
-  @Post(':id/inactivate')
+  @Patch(':id/inactivate')
   @ApiOperation({ summary: 'Inactivate a contact' })
   @ApiParam({ name: 'id', type: 'number', description: 'Contact ID' })
   async inactivateContact(@Param('id', ParseIntPipe) contactId: number) {

packages/server/src/modules/CreditNoteRefunds/CreditNoteRefunds.module.ts

@@ -7,9 +7,13 @@ import { CreditNotesRefundsApplication } from './CreditNotesRefundsApplication.s
 import { CreditNoteRefundsController } from './CreditNoteRefunds.controller';
 import { CreditNotesModule } from '../CreditNotes/CreditNotes.module';
 import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.service';
+import { RefundCreditNoteGLEntries } from './commands/RefundCreditNoteGLEntries';
+import { RefundCreditNoteGLEntriesSubscriber } from '../CreditNotes/subscribers/RefundCreditNoteGLEntriesSubscriber';
+import { LedgerModule } from '../Ledger/Ledger.module';
+import { AccountsModule } from '../Accounts/Accounts.module';
 
 @Module({
-  imports: [forwardRef(() => CreditNotesModule)],
+  imports: [forwardRef(() => CreditNotesModule), LedgerModule, AccountsModule],
   providers: [
     CreateRefundCreditNoteService,
     DeleteRefundCreditNoteService,
@@ -17,8 +21,10 @@ import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.serv
     RefundSyncCreditNoteBalanceService,
     CreditNotesRefundsApplication,
     GetCreditNoteRefundsService,
+    RefundCreditNoteGLEntries,
+    RefundCreditNoteGLEntriesSubscriber,
   ],
   exports: [RefundSyncCreditNoteBalanceService],
   controllers: [CreditNoteRefundsController],
 })
-export class CreditNoteRefundsModule {}
+export class CreditNoteRefundsModule { }

packages/server/src/modules/CreditNoteRefunds/dto/CreditNoteRefund.dto.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsOptional, IsPositive, IsString } from 'class-validator';
+import { ToNumber, IsOptional } from '@/common/decorators/Validators';
+import { IsDateString, IsNotEmpty, IsPositive, IsString } from 'class-validator';
 import { IsDate } from 'class-validator';
 import { IsNumber } from 'class-validator';
 
@@ -10,8 +11,13 @@ export class CreditNoteRefundDto {
     description: 'The id of the from account',
     example: 1,
   })
+  @ApiProperty({
+    description: 'The id of the from account',
+    example: 1,
+  })
   fromAccountId: number;
 
+  @ToNumber()
   @IsNumber()
   @IsPositive()
   @IsNotEmpty()
@@ -21,6 +27,7 @@ export class CreditNoteRefundDto {
   })
   amount: number;
 
+  @ToNumber()
   @IsNumber()
   @IsOptional()
   @IsPositive()
@@ -30,23 +37,23 @@ export class CreditNoteRefundDto {
   })
   exchangeRate?: number;
 
+  @IsOptional()
   @IsString()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The reference number of the credit note refund',
     example: '123456',
   })
   referenceNo: string;
 
+  @IsOptional()
   @IsString()
-  @IsNotEmpty()
   @ApiProperty({
     description: 'The description of the credit note refund',
     example: 'Credit note refund',
   })
   description: string;
 
-  @IsDate()
+  @IsDateString()
   @IsNotEmpty()
   @ApiProperty({
     description: 'The date of the credit note refund',
@@ -54,6 +61,7 @@ export class CreditNoteRefundDto {
   })
   date: Date;
 
+  @ToNumber()
   @IsNumber()
   @IsOptional()
   @ApiProperty({

packages/server/src/modules/CreditNotes/queries/GetCreditNotePdf.serivce.ts

@@ -1,10 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
+import { renderCreditNotePaperTemplateHtml } from '@bigcapital/pdf-templates';
 import { GetCreditNoteService } from './GetCreditNote.service';
 import { CreditNoteBrandingTemplate } from './CreditNoteBrandingTemplate.service';
 import { transformCreditNoteToPdfTemplate } from '../utils';
 import { CreditNote } from '../models/CreditNote';
 import { ChromiumlyTenancy } from '@/modules/ChromiumlyTenancy/ChromiumlyTenancy.service';
-import { TemplateInjectable } from '@/modules/TemplateInjectable/TemplateInjectable.service';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { PdfTemplateModel } from '@/modules/PdfTemplate/models/PdfTemplate';
 import { CreditNotePdfTemplateAttributes } from '../types/CreditNotes.types';
@@ -15,7 +15,6 @@ import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 export class GetCreditNotePdf {
   /**
    * @param {ChromiumlyTenancy} chromiumlyTenancy - Chromiumly tenancy service.
-   * @param {TemplateInjectable} templateInjectable - Template injectable service.
    * @param {GetCreditNote} getCreditNoteService - Get credit note service.
    * @param {CreditNoteBrandingTemplate} creditNoteBrandingTemplate - Credit note branding template service.
    * @param {EventEmitter2} eventPublisher - Event publisher service.
@@ -24,7 +23,6 @@ export class GetCreditNotePdf {
    */
   constructor(
     private readonly chromiumlyTenancy: ChromiumlyTenancy,
-    private readonly templateInjectable: TemplateInjectable,
     private readonly getCreditNoteService: GetCreditNoteService,
     private readonly creditNoteBrandingTemplate: CreditNoteBrandingTemplate,
     private readonly eventPublisher: EventEmitter2,
@@ -36,23 +34,40 @@ export class GetCreditNotePdf {
     private readonly pdfTemplateModel: TenantModelProxy<
       typeof PdfTemplateModel
     >,
-  ) {}
+  ) { }
 
   /**
-   * Retrieves sale invoice pdf content.
+   * Retrieves credit note html content.
+   * @param {number} creditNoteId - Credit note id.
+   * @returns {Promise<string>}
+   */
+  public async getCreditNoteHtml(creditNoteId: number): Promise<string> {
+    const brandingAttributes =
+      await this.getCreditNoteBrandingAttributes(creditNoteId);
+
+    // Map attributes to match the React component props
+    // The branding template returns companyLogoUri, but type may have companyLogo
+    const props = {
+      ...brandingAttributes,
+      companyLogoUri:
+        (brandingAttributes as any).companyLogoUri ||
+        (brandingAttributes as any).companyLogo ||
+        '',
+    };
+
+    return renderCreditNotePaperTemplateHtml(props);
+  }
+
+  /**
+   * Retrieves credit note pdf content.
    * @param {number} creditNoteId - Credit note id.
    * @returns {Promise<[Buffer, string]>}
    */
   public async getCreditNotePdf(
     creditNoteId: number,
   ): Promise<[Buffer, string]> {
-    const brandingAttributes =
-      await this.getCreditNoteBrandingAttributes(creditNoteId);
-    const htmlContent = await this.templateInjectable.render(
-      'modules/credit-note-standard',
-      brandingAttributes,
-    );
     const filename = await this.getCreditNoteFilename(creditNoteId);
+    const htmlContent = await this.getCreditNoteHtml(creditNoteId);
 
     const document =
       await this.chromiumlyTenancy.convertHtmlContent(htmlContent);

packages/server/src/modules/Customers/CustomerGLEntries.ts

@@ -1,117 +1,103 @@
-// import { Service, Inject } from 'typedi';
-// import { AccountNormal, ICustomer, ILedgerEntry } from '@/interfaces';
-// import Ledger from '@/services/Accounting/Ledger';
+import { Injectable } from '@nestjs/common';
+import { AccountNormal } from '@/interfaces/Account';
+import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
+import { Ledger } from '@/modules/Ledger/Ledger';
+import { Customer } from './models/Customer';
 
-// @Service()
-// export class CustomerGLEntries {
-//   /**
-//    * Retrieves the customer opening balance common entry attributes.
-//    * @param {ICustomer} customer
-//    */
-//   private getCustomerOpeningGLCommonEntry = (customer: ICustomer) => {
-//     return {
-//       exchangeRate: customer.openingBalanceExchangeRate,
-//       currencyCode: customer.currencyCode,
+@Injectable()
+export class CustomerGLEntries {
+  /**
+   * Retrieves the customer opening balance common entry attributes.
+   */
+  private getCustomerOpeningGLCommonEntry = (customer: Customer) => {
+    return {
+      exchangeRate: customer.openingBalanceExchangeRate,
+      currencyCode: customer.currencyCode,
 
-//       transactionType: 'CustomerOpeningBalance',
-//       transactionId: customer.id,
+      transactionType: 'CustomerOpeningBalance',
+      transactionId: customer.id,
 
-//       date: customer.openingBalanceAt,
-//       userId: customer.userId,
-//       contactId: customer.id,
+      date: customer.openingBalanceAt,
+      contactId: customer.id,
 
-//       credit: 0,
-//       debit: 0,
+      credit: 0,
+      debit: 0,
 
-//       branchId: customer.openingBalanceBranchId,
-//     };
-//   };
+      branchId: customer.openingBalanceBranchId,
+    };
+  };
 
-//   /**
-//    * Retrieves the customer opening GL credit entry.
-//    * @param   {number} ARAccountId
-//    * @param   {ICustomer} customer
-//    * @returns {ILedgerEntry}
-//    */
-//   private getCustomerOpeningGLCreditEntry = (
-//     ARAccountId: number,
-//     customer: ICustomer
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getCustomerOpeningGLCommonEntry(customer);
+  /**
+   * Retrieves the customer opening GL credit entry.
+   */
+  private getCustomerOpeningGLCreditEntry = (
+    ARAccountId: number,
+    customer: Customer
+  ): ILedgerEntry => {
+    const commonEntry = this.getCustomerOpeningGLCommonEntry(customer);
 
-//     return {
-//       ...commonEntry,
-//       credit: 0,
-//       debit: customer.localOpeningBalance,
-//       accountId: ARAccountId,
-//       accountNormal: AccountNormal.DEBIT,
-//       index: 1,
-//     };
-//   };
+    return {
+      ...commonEntry,
+      credit: 0,
+      debit: customer.localOpeningBalance,
+      accountId: ARAccountId,
+      accountNormal: AccountNormal.DEBIT,
+      index: 1,
+    };
+  };
 
-//   /**
-//    * Retrieves the customer opening GL debit entry.
-//    * @param   {number} incomeAccountId
-//    * @param   {ICustomer} customer
-//    * @returns {ILedgerEntry}
-//    */
-//   private getCustomerOpeningGLDebitEntry = (
-//     incomeAccountId: number,
-//     customer: ICustomer
-//   ): ILedgerEntry => {
-//     const commonEntry = this.getCustomerOpeningGLCommonEntry(customer);
+  /**
+   * Retrieves the customer opening GL debit entry.
+   */
+  private getCustomerOpeningGLDebitEntry = (
+    incomeAccountId: number,
+    customer: Customer
+  ): ILedgerEntry => {
+    const commonEntry = this.getCustomerOpeningGLCommonEntry(customer);
 
-//     return {
-//       ...commonEntry,
-//       credit: customer.localOpeningBalance,
-//       debit: 0,
-//       accountId: incomeAccountId,
-//       accountNormal: AccountNormal.CREDIT,
+    return {
+      ...commonEntry,
+      credit: customer.localOpeningBalance,
+      debit: 0,
+      accountId: incomeAccountId,
+      accountNormal: AccountNormal.CREDIT,
 
-//       index: 2,
-//     };
-//   };
+      index: 2,
+    };
+  };
 
-//   /**
-//    * Retrieves the customer opening GL entries.
-//    * @param   {number} ARAccountId
-//    * @param   {number} incomeAccountId
-//    * @param   {ICustomer} customer
-//    * @returns {ILedgerEntry[]}
-//    */
-//   public getCustomerOpeningGLEntries = (
-//     ARAccountId: number,
-//     incomeAccountId: number,
-//     customer: ICustomer
-//   ) => {
-//     const debitEntry = this.getCustomerOpeningGLDebitEntry(
-//       incomeAccountId,
-//       customer
-//     );
-//     const creditEntry = this.getCustomerOpeningGLCreditEntry(
-//       ARAccountId,
-//       customer
-//     );
-//     return [debitEntry, creditEntry];
-//   };
+  /**
+   * Retrieves the customer opening GL entries.
+   */
+  public getCustomerOpeningGLEntries = (
+    ARAccountId: number,
+    incomeAccountId: number,
+    customer: Customer
+  ) => {
+    const debitEntry = this.getCustomerOpeningGLDebitEntry(
+      incomeAccountId,
+      customer
+    );
+    const creditEntry = this.getCustomerOpeningGLCreditEntry(
+      ARAccountId,
+      customer
+    );
+    return [debitEntry, creditEntry];
+  };
 
-//   /**
-//    * Retrieves the customer opening balance ledger.
-//    * @param   {number} ARAccountId
-//    * @param   {number} incomeAccountId
-//    * @param   {ICustomer} customer
-//    * @returns {ILedger}
-//    */
-//   public getCustomerOpeningLedger = (
-//     ARAccountId: number,
-//     incomeAccountId: number,
-//     customer: ICustomer
-//   ) => {
-//     const entries = this.getCustomerOpeningGLEntries(
-//       ARAccountId,
-//       incomeAccountId,
-//       customer
-//     );
-//     return new Ledger(entries);
-//   };
-// }
+  /**
+   * Retrieves the customer opening balance ledger.
+   */
+  public getCustomerOpeningLedger = (
+    ARAccountId: number,
+    incomeAccountId: number,
+    customer: Customer
+  ) => {
+    const entries = this.getCustomerOpeningGLEntries(
+      ARAccountId,
+      incomeAccountId,
+      customer
+    );
+    return new Ledger(entries);
+  };
+}

packages/server/src/modules/Customers/CustomerGLEntriesStorage.ts

@@ -1,90 +1,84 @@
-// import { Knex } from 'knex';
-// import LedgerStorageService from '@/services/Accounting/LedgerStorageService';
-// import HasTenancyService from '@/services/Tenancy/TenancyService';
-// import { Service, Inject } from 'typedi';
-// import { CustomerGLEntries } from './CustomerGLEntries';
+import { Knex } from 'knex';
+import { Inject, Injectable } from '@nestjs/common';
+import { LedgerStorageService } from '@/modules/Ledger/LedgerStorage.service';
+import { AccountRepository } from '@/modules/Accounts/repositories/Account.repository';
+import { CustomerGLEntries } from './CustomerGLEntries';
+import { Customer } from './models/Customer';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
+import { Account } from '../Accounts/models/Account.model';
 
-// @Service()
-// export class CustomerGLEntriesStorage {
-//   @Inject()
-//   private tenancy: HasTenancyService;
+@Injectable()
+export class CustomerGLEntriesStorage {
+  constructor(
+    private readonly ledgerStorage: LedgerStorageService,
+    private readonly accountRepository: AccountRepository,
+    private readonly customerGLEntries: CustomerGLEntries,
 
-//   @Inject()
-//   private ledegrRepository: LedgerStorageService;
+    @Inject(Account.name)
+    private readonly accountModel: TenantModelProxy<typeof Account>,
 
-//   @Inject()
-//   private customerGLEntries: CustomerGLEntries;
+    @Inject(Customer.name)
+    private readonly customerModel: TenantModelProxy<typeof Customer>,
+  ) { }
 
-//   /**
-//    * Customer opening balance journals.
-//    * @param {number} tenantId
-//    * @param {number} customerId
-//    * @param {Knex.Transaction} trx
-//    */
-//   public writeCustomerOpeningBalance = async (
-//     tenantId: number,
-//     customerId: number,
-//     trx?: Knex.Transaction
-//   ) => {
-//     const { Customer } = this.tenancy.models(tenantId);
-//     const { accountRepository } = this.tenancy.repositories(tenantId);
+  /**
+   * Customer opening balance journals.
+   */
+  public writeCustomerOpeningBalance = async (
+    customerId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    const customer = await this.customerModel()
+      .query(trx)
+      .findById(customerId);
 
-//     const customer = await Customer.query(trx).findById(customerId);
+    // Finds the income account.
+    const incomeAccount = await this.accountModel()
+      .query(trx)
+      .findOne({ slug: 'other-income' });
 
-//     // Finds the income account.
-//     const incomeAccount = await accountRepository.findOne({
-//       slug: 'other-income',
-//     });
-//     // Find or create the A/R account.
-//     const ARAccount = await accountRepository.findOrCreateAccountReceivable(
-//       customer.currencyCode,
-//       {},
-//       trx
-//     );
-//     // Retrieves the customer opening balance ledger.
-//     const ledger = this.customerGLEntries.getCustomerOpeningLedger(
-//       ARAccount.id,
-//       incomeAccount.id,
-//       customer
-//     );
-//     // Commits the ledger entries to the storage.
-//     await this.ledegrRepository.commit(tenantId, ledger, trx);
-//   };
+    // Find or create the A/R account.
+    const ARAccount =
+      await this.accountRepository.findOrCreateAccountReceivable(
+        customer.currencyCode,
+        {},
+        trx,
+      );
+    // Retrieves the customer opening balance ledger.
+    const ledger = this.customerGLEntries.getCustomerOpeningLedger(
+      ARAccount.id,
+      incomeAccount.id,
+      customer,
+    );
+    // Commits the ledger entries to the storage.
+    await this.ledgerStorage.commit(ledger, trx);
+  };
 
-//   /**
-//    * Reverts the customer opening balance GL entries.
-//    * @param {number} tenantId
-//    * @param {number} customerId
-//    * @param {Knex.Transaction} trx
-//    */
-//   public revertCustomerOpeningBalance = async (
-//     tenantId: number,
-//     customerId: number,
-//     trx?: Knex.Transaction
-//   ) => {
-//     await this.ledegrRepository.deleteByReference(
-//       tenantId,
-//       customerId,
-//       'CustomerOpeningBalance',
-//       trx
-//     );
-//   };
+  /**
+   * Reverts the customer opening balance GL entries.
+   */
+  public revertCustomerOpeningBalance = async (
+    customerId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    await this.ledgerStorage.deleteByReference(
+      customerId,
+      'CustomerOpeningBalance',
+      trx,
+    );
+  };
 
-//   /**
-//    * Writes the customer opening balance GL entries.
-//    * @param {number} tenantId
-//    * @param {number} customerId
-//    * @param {Knex.Transaction} trx
-//    */
-//   public rewriteCustomerOpeningBalance = async (
-//     tenantId: number,
-//     customerId: number,
-//     trx?: Knex.Transaction
-//   ) => {
-//     // Reverts the customer opening balance entries.
-//     await this.revertCustomerOpeningBalance(tenantId, customerId, trx);
+  /**
+   * Writes the customer opening balance GL entries.
+   */
+  public rewriteCustomerOpeningBalance = async (
+    customerId: number,
+    trx?: Knex.Transaction,
+  ) => {
+    // Reverts the customer opening balance entries.
+    await this.revertCustomerOpeningBalance(customerId, trx);
 
-//     // Write the customer opening balance entries.
-//     await this.writeCustomerOpeningBalance(tenantId, customerId, trx);    
-//   };
-// }
+    // Write the customer opening balance entries.
+    await this.writeCustomerOpeningBalance(customerId, trx);
+  };
+}

packages/server/src/modules/Customers/Customers.controller.ts

@@ -9,10 +9,7 @@ import {
   Query,
 } from '@nestjs/common';
 import { CustomersApplication } from './CustomersApplication.service';
-import {
-  ICustomerOpeningBalanceEditDTO,
-  ICustomersFilter,
-} from './types/Customers.types';
+import { CustomerOpeningBalanceEditDto } from './dtos/CustomerOpeningBalanceEdit.dto';
 import {
   ApiOperation,
   ApiResponse,
@@ -106,7 +103,7 @@ export class CustomersController {
   })
   editOpeningBalance(
     @Param('id') customerId: number,
-    @Body() openingBalanceDTO: ICustomerOpeningBalanceEditDTO,
+    @Body() openingBalanceDTO: CustomerOpeningBalanceEditDto,
   ) {
     return this.customersApplication.editOpeningBalance(
       customerId,

packages/server/src/modules/Customers/Customers.module.ts

@@ -18,9 +18,19 @@ import { GetCustomers } from './queries/GetCustomers.service';
 import { DynamicListModule } from '../DynamicListing/DynamicList.module';
 import { BulkDeleteCustomersService } from './BulkDeleteCustomers.service';
 import { ValidateBulkDeleteCustomersService } from './ValidateBulkDeleteCustomers.service';
+import { LedgerModule } from '../Ledger/Ledger.module';
+import { AccountsModule } from '../Accounts/Accounts.module';
+import { CustomerGLEntries } from './CustomerGLEntries';
+import { CustomerGLEntriesStorage } from './CustomerGLEntriesStorage';
+import { CustomerWriteGLOpeningBalanceSubscriber } from './subscribers/CustomerGLEntriesSubscriber';
 
 @Module({
-  imports: [TenancyDatabaseModule, DynamicListModule],
+  imports: [
+    TenancyDatabaseModule,
+    DynamicListModule,
+    LedgerModule,
+    AccountsModule,
+  ],
   controllers: [CustomersController],
   providers: [
     ActivateCustomer,
@@ -41,6 +51,9 @@ import { ValidateBulkDeleteCustomersService } from './ValidateBulkDeleteCustomer
     GetCustomers,
     BulkDeleteCustomersService,
     ValidateBulkDeleteCustomersService,
+    CustomerGLEntries,
+    CustomerGLEntriesStorage,
+    CustomerWriteGLOpeningBalanceSubscriber,
   ],
 })
 export class CustomersModule {}

packages/server/src/modules/Customers/CustomersApplication.service.ts

@@ -4,10 +4,7 @@ import { CreateCustomer } from './commands/CreateCustomer.service';
 import { EditCustomer } from './commands/EditCustomer.service';
 import { DeleteCustomer } from './commands/DeleteCustomer.service';
 import { EditOpeningBalanceCustomer } from './commands/EditOpeningBalanceCustomer.service';
-import {
-  ICustomerOpeningBalanceEditDTO,
-  ICustomersFilter,
-} from './types/Customers.types';
+import { CustomerOpeningBalanceEditDto } from './dtos/CustomerOpeningBalanceEdit.dto';
 import { CreateCustomerDto } from './dtos/CreateCustomer.dto';
 import { EditCustomerDto } from './dtos/EditCustomer.dto';
 import { GetCustomers } from './queries/GetCustomers.service';
@@ -18,12 +15,12 @@ import { ValidateBulkDeleteCustomersService } from './ValidateBulkDeleteCustomer
 @Injectable()
 export class CustomersApplication {
   constructor(
-    private getCustomerService: GetCustomerService,
-    private createCustomerService: CreateCustomer,
-    private editCustomerService: EditCustomer,
-    private deleteCustomerService: DeleteCustomer,
-    private editOpeningBalanceService: EditOpeningBalanceCustomer,
-    private getCustomersService: GetCustomers,
+    private readonly getCustomerService: GetCustomerService,
+    private readonly createCustomerService: CreateCustomer,
+    private readonly editCustomerService: EditCustomer,
+    private readonly deleteCustomerService: DeleteCustomer,
+    private readonly editOpeningBalanceService: EditOpeningBalanceCustomer,
+    private readonly getCustomersService: GetCustomers,
     private readonly bulkDeleteCustomersService: BulkDeleteCustomersService,
     private readonly validateBulkDeleteCustomersService: ValidateBulkDeleteCustomersService,
   ) {}
@@ -72,7 +69,7 @@ export class CustomersApplication {
    */
   public editOpeningBalance = (
     customerId: number,
-    openingBalanceEditDTO: ICustomerOpeningBalanceEditDTO,
+    openingBalanceEditDTO: CustomerOpeningBalanceEditDto,
   ) => {
     return this.editOpeningBalanceService.changeOpeningBalance(
       customerId,
@@ -82,7 +79,7 @@ export class CustomersApplication {
 
   /**
    * Retrieve customers paginated list.
-   * @param {ICustomersFilter} filter - Cusotmers filter.
+   * @param {GetCustomersQueryDto} filter - Cusotmers filter.
    */
   public getCustomers = (filterDTO: GetCustomersQueryDto) => {
     return this.getCustomersService.getCustomersList(filterDTO);

packages/server/src/modules/Customers/commands/CreateCustomer.service.ts

@@ -31,7 +31,7 @@ export class CreateCustomer {
 
   /**
    * Creates a new customer.
-   * @param  {ICustomerNewDTO} customerDTO
+   * @param {CreateCustomerDto} customerDTO
    * @return {Promise<ICustomer>}
    */
   public async createCustomer(

packages/server/src/modules/Customers/commands/EditOpeningBalanceCustomer.service.ts

@@ -1,10 +1,10 @@
 import { Inject, Injectable } from '@nestjs/common';
 import { Knex } from 'knex';
 import {
-  ICustomerOpeningBalanceEditDTO,
   ICustomerOpeningBalanceEditedPayload,
   ICustomerOpeningBalanceEditingPayload,
 } from '../types/Customers.types';
+import { CustomerOpeningBalanceEditDto } from '../dtos/CustomerOpeningBalanceEdit.dto';
 import { EventEmitter2 } from '@nestjs/event-emitter';
 import { UnitOfWork } from '@/modules/Tenancy/TenancyDB/UnitOfWork.service';
 import { Customer } from '../models/Customer';
@@ -29,11 +29,11 @@ export class EditOpeningBalanceCustomer {
   /**
    * Changes the opening balance of the given customer.
    * @param {number} customerId - Customer ID.
-   * @param {ICustomerOpeningBalanceEditDTO} openingBalanceEditDTO
+   * @param {CustomerOpeningBalanceEditDto} openingBalanceEditDTO
    */
   public async changeOpeningBalance(
     customerId: number,
-    openingBalanceEditDTO: ICustomerOpeningBalanceEditDTO,
+    openingBalanceEditDTO: CustomerOpeningBalanceEditDto,
   ): Promise<Customer> {
     // Retrieves the old customer or throw not found error.
     const oldCustomer = await this.customerModel()

packages/server/src/modules/Customers/dtos/CreateCustomer.dto.ts

@@ -4,6 +4,7 @@ import {
   IsNotEmpty,
   IsNumber,
   IsString,
+  ValidateIf,
 } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
 import { IsOptional, ToNumber } from '@/common/decorators/Validators';
@@ -40,10 +41,11 @@ export class CreateCustomerDto extends ContactAddressDto {
 
   @ApiProperty({
     required: false,
-    description: 'Opening balance date',
+    description: 'Opening balance date (required when openingBalance is provided)',
     example: '2024-01-01',
   })
-  @IsOptional()
+  @ValidateIf((o) => o.openingBalance != null)
+  @IsNotEmpty({ message: 'openingBalanceAt is required when openingBalance is provided' })
   @IsString()
   openingBalanceAt?: string;
 

packages/server/src/modules/Customers/dtos/CustomerOpeningBalanceEdit.dto.ts

@@ -0,0 +1,44 @@
+import { IsNotEmpty, IsNumber, IsString } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+import { IsOptional, ToNumber } from '@/common/decorators/Validators';
+
+export class CustomerOpeningBalanceEditDto {
+  @ApiProperty({
+    required: true,
+    description: 'Opening balance',
+    example: 5000.0,
+  })
+  @IsNumber()
+  @IsNotEmpty()
+  @ToNumber()
+  openingBalance: number;
+
+  @ApiProperty({
+    required: false,
+    description: 'Opening balance date',
+    example: '2024-01-01',
+  })
+  @IsOptional()
+  @IsString()
+  openingBalanceAt?: string;
+
+  @ApiProperty({
+    required: false,
+    description: 'Opening balance exchange rate',
+    example: 1.0,
+  })
+  @IsOptional()
+  @IsNumber()
+  @ToNumber()
+  openingBalanceExchangeRate?: number;
+
+  @ApiProperty({
+    required: false,
+    description: 'Opening balance branch ID',
+    example: 101,
+  })
+  @IsOptional()
+  @IsNumber()
+  @ToNumber()
+  openingBalanceBranchId?: number;
+}

packages/server/src/modules/Customers/subscribers/CustomerGLEntriesSubscriber.ts

@@ -1,91 +1,63 @@
-// import { Service, Inject } from 'typedi';
-// import {
-//   ICustomerEventCreatedPayload,
-//   ICustomerEventDeletedPayload,
-//   ICustomerOpeningBalanceEditedPayload,
-// } from '@/interfaces';
-// import events from '@/subscribers/events';
-// import { CustomerGLEntriesStorage } from '../CustomerGLEntriesStorage';
+import { Injectable } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+import {
+  ICustomerEventCreatedPayload,
+  ICustomerEventDeletedPayload,
+  ICustomerOpeningBalanceEditedPayload,
+} from '../types/Customers.types';
+import { events } from '@/common/events/events';
+import { CustomerGLEntriesStorage } from '../CustomerGLEntriesStorage';
 
-// @Service()
-// export class CustomerWriteGLOpeningBalanceSubscriber {
-//   @Inject()
-//   private customerGLEntries: CustomerGLEntriesStorage;
+@Injectable()
+export class CustomerWriteGLOpeningBalanceSubscriber {
+  constructor(private readonly customerGLEntries: CustomerGLEntriesStorage) { }
 
-//   /**
-//    * Attaches events with handlers.
-//    */
-//   public attach(bus) {
-//     bus.subscribe(
-//       events.customers.onCreated,
-//       this.handleWriteOpenBalanceEntries
-//     );
-//     bus.subscribe(
-//       events.customers.onDeleted,
-//       this.handleRevertOpeningBalanceEntries
-//     );
-//     bus.subscribe(
-//       events.customers.onOpeningBalanceChanged,
-//       this.handleRewriteOpeningEntriesOnChanged
-//     );
-//   }
+  /**
+   * Handles the writing opening balance journal entries once the customer created.
+   */
+  @OnEvent(events.customers.onCreated)
+  public async handleWriteOpenBalanceEntries({
+    customer,
+    trx,
+  }: ICustomerEventCreatedPayload) {
+    // Writes the customer opening balance journal entries.
+    if (customer.openingBalance) {
+      await this.customerGLEntries.writeCustomerOpeningBalance(
+        customer.id,
+        trx,
+      );
+    }
+  }
 
-//   /**
-//    * Handles the writing opening balance journal entries once the customer created.
-//    * @param {ICustomerEventCreatedPayload} payload -
-//    */
-//   private handleWriteOpenBalanceEntries = async ({
-//     tenantId,
-//     customer,
-//     trx,
-//   }: ICustomerEventCreatedPayload) => {
-//     // Writes the customer opening balance journal entries.
-//     if (customer.openingBalance) {
-//       await this.customerGLEntries.writeCustomerOpeningBalance(
-//         tenantId,
-//         customer.id,
-//         trx
-//       );
-//     }
-//   };
+  /**
+   * Handles the deleting opening balance journal entries once the customer deleted.
+   */
+  @OnEvent(events.customers.onDeleted)
+  public async handleRevertOpeningBalanceEntries({
+    customerId,
+    trx,
+  }: ICustomerEventDeletedPayload) {
+    await this.customerGLEntries.revertCustomerOpeningBalance(customerId, trx);
+  }
 
-//   /**
-//    * Handles the deleting opeing balance journal entrise once the customer deleted.
-//    * @param {ICustomerEventDeletedPayload} payload -
-//    */
-//   private handleRevertOpeningBalanceEntries = async ({
-//     tenantId,
-//     customerId,
-//     trx,
-//   }: ICustomerEventDeletedPayload) => {
-//     await this.customerGLEntries.revertCustomerOpeningBalance(
-//       tenantId,
-//       customerId,
-//       trx
-//     );
-//   };
-
-//   /**
-//    * Handles the rewrite opening balance entries once opening balnace changed.
-//    * @param {ICustomerOpeningBalanceEditedPayload} payload -
-//    */
-//   private handleRewriteOpeningEntriesOnChanged = async ({
-//     tenantId,
-//     customer,
-//     trx,
-//   }: ICustomerOpeningBalanceEditedPayload) => {
-//     if (customer.openingBalance) {
-//       await this.customerGLEntries.rewriteCustomerOpeningBalance(
-//         tenantId,
-//         customer.id,
-//         trx
-//       );
-//     } else {
-//       await this.customerGLEntries.revertCustomerOpeningBalance(
-//         tenantId,
-//         customer.id,
-//         trx
-//       );
-//     }
-//   };
-// }
+  /**
+   * Handles the rewrite opening balance entries once opening balance changed.
+   */
+  @OnEvent(events.customers.onOpeningBalanceChanged)
+  public async handleRewriteOpeningEntriesOnChanged({
+    customer,
+    trx,
+  }: ICustomerOpeningBalanceEditedPayload) {
+    if (customer.openingBalance) {
+      await this.customerGLEntries.rewriteCustomerOpeningBalance(
+        customer.id,
+        trx,
+      );
+    } else {
+      await this.customerGLEntries.revertCustomerOpeningBalance(
+        customer.id,
+        trx,
+      );
+    }
+  }
+}

packages/server/src/modules/Customers/types/Customers.types.ts

@@ -4,6 +4,7 @@ import { IContactAddressDTO } from '@/modules/Contacts/types/Contacts.types';
 import { IDynamicListFilter } from '@/modules/DynamicListing/DynamicFilter/DynamicFilter.types';
 import { IFilterMeta, IPaginationMeta } from '@/interfaces/Model';
 import { CreateCustomerDto } from '../dtos/CreateCustomer.dto';
+import { CustomerOpeningBalanceEditDto } from '../dtos/CustomerOpeningBalanceEdit.dto';
 import { EditCustomerDto } from '../dtos/EditCustomer.dto';
 
 // Customer Interfaces.
@@ -113,23 +114,16 @@ export enum VendorAction {
   View = 'View',
 }
 
-export interface ICustomerOpeningBalanceEditDTO {
-  openingBalance: number;
-  openingBalanceAt: Date | string;
-  openingBalanceExchangeRate: number;
-  openingBalanceBranchId?: number;
-}
-
 export interface ICustomerOpeningBalanceEditingPayload {
   oldCustomer: Customer;
-  openingBalanceEditDTO: ICustomerOpeningBalanceEditDTO;
+  openingBalanceEditDTO: CustomerOpeningBalanceEditDto;
   trx?: Knex.Transaction;
 }
 
 export interface ICustomerOpeningBalanceEditedPayload {
   customer: Customer;
   oldCustomer: Customer;
-  openingBalanceEditDTO: ICustomerOpeningBalanceEditDTO;
+  openingBalanceEditDTO: CustomerOpeningBalanceEditDto;
   trx: Knex.Transaction;
 }
 

packages/server/src/modules/DynamicListing/DynamicList.service.ts

@@ -16,7 +16,7 @@ export class DynamicListService {
     private dynamicListSearch: DynamicListSearch,
     private dynamicListSortBy: DynamicListSortBy,
     private dynamicListView: DynamicListCustomView,
-  ) {}
+  ) { }
 
   /**
    * Parses filter DTO.
@@ -31,9 +31,9 @@ export class DynamicListService {
       // Merges the default properties with filter object.
       ...(model.defaultSort
         ? {
-            sortOrder: model.defaultSort.sortOrder,
-            columnSortBy: model.defaultSort.sortOrder,
-          }
+          sortOrder: model.defaultSort.sortOrder,
+          columnSortBy: model.defaultSort.sortOrder,
+        }
         : {}),
       ...filterDTO,
     };
@@ -93,7 +93,7 @@ export class DynamicListService {
    * Parses stringified filter roles.
    * @param {string} stringifiedFilterRoles - Stringified filter roles.
    */
-  public parseStringifiedFilter<T extends IDynamicListFilter>(
+  public parseStringifiedFilter<T extends { stringifiedFilterRoles?: string }>(
     filterRoles: T,
   ): T {
     return {

packages/server/src/modules/FinancialStatements/common/FinancialSheetCommon.module.ts

@@ -4,14 +4,15 @@ import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
 import { TableSheetPdf } from './TableSheetPdf';
 import { TemplateInjectableModule } from '@/modules/TemplateInjectable/TemplateInjectable.module';
 import { ChromiumlyTenancyModule } from '@/modules/ChromiumlyTenancy/ChromiumlyTenancy.module';
+import { InventoryCostModule } from '@/modules/InventoryCost/InventoryCost.module';
 
 @Module({
-  imports: [TemplateInjectableModule, ChromiumlyTenancyModule],
-  providers: [
-    FinancialSheetMeta,
-    TenancyContext,
-    TableSheetPdf,
+  imports: [
+    TemplateInjectableModule,
+    ChromiumlyTenancyModule,
+    InventoryCostModule,
   ],
+  providers: [FinancialSheetMeta, TenancyContext, TableSheetPdf],
   exports: [FinancialSheetMeta, TableSheetPdf],
 })
 export class FinancialSheetCommonModule {}

packages/server/src/modules/FinancialStatements/common/FinancialSheetMeta.ts

@@ -1,10 +1,14 @@
 import { Injectable } from '@nestjs/common';
 import { IFinancialSheetCommonMeta } from '../types/Report.types';
 import { TenancyContext } from '@/modules/Tenancy/TenancyContext.service';
+import { InventoryComputeCostService } from '@/modules/InventoryCost/commands/InventoryComputeCost.service';
 
 @Injectable()
 export class FinancialSheetMeta {
-  constructor(private readonly tenancyContext: TenancyContext) {}
+  constructor(
+    private readonly tenancyContext: TenancyContext,
+    private readonly inventoryComputeCostService: InventoryComputeCostService,
+  ) {}
 
   /**
    * Retrieves the common meta data of the financial sheet.
@@ -17,10 +21,8 @@ export class FinancialSheetMeta {
     const baseCurrency = tenantMetadata.baseCurrency;
     const dateFormat = tenantMetadata.dateFormat;
 
-    // const isCostComputeRunning =
-    //   this.inventoryService.isItemsCostComputeRunning();
-
-    const isCostComputeRunning = false;
+    const isCostComputeRunning =
+      await this.inventoryComputeCostService.isItemsCostComputeRunning();
 
     return {
       organizationName,

packages/server/src/modules/FinancialStatements/modules/APAgingSummary/APAgingSummary.controller.ts

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 @ApiTags('Reports')
 @ApiCommonHeaders()
 export class APAgingSummaryController {
-  constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) {}
+  constructor(private readonly APAgingSummaryApp: APAgingSummaryApplication) { }
 
   @Get()
   @ApiOperation({ summary: 'Get payable aging summary' })
@@ -37,12 +37,13 @@ export class APAgingSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.APAgingSummaryApp.table(filter);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const csv = await this.APAgingSummaryApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class APAgingSummaryController {
 
       res.send(csv);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.APAgingSummaryApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class APAgingSummaryController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.APAgingSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/ARAgingSummary/ARAgingSummary.controller.ts

@@ -38,8 +38,9 @@ export class ARAgingSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the xlsx format.
-    if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.ARAgingSummaryApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -49,11 +50,11 @@ export class ARAgingSummaryController {
       );
       res.send(buffer);
       // Retrieves the table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.ARAgingSummaryApp.table(filter);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.ARAgingSummaryApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -61,7 +62,7 @@ export class ARAgingSummaryController {
 
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.ARAgingSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/BalanceSheet/BalanceSheet.controller.ts

@@ -43,13 +43,14 @@ export class BalanceSheetStatementController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       const table = await this.balanceSheetApp.table(query);
 
       return table;
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.balanceSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -57,7 +58,7 @@ export class BalanceSheetStatementController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.balanceSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -67,7 +68,7 @@ export class BalanceSheetStatementController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.balanceSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/Cashflow.controller.ts

@@ -16,7 +16,7 @@ import { ApiCommonHeaders } from '@/common/decorators/ApiCommonHeaders';
 @ApiTags('Reports')
 @ApiCommonHeaders()
 export class CashflowController {
-  constructor(private readonly cashflowSheetApp: CashflowSheetApplication) {}
+  constructor(private readonly cashflowSheetApp: CashflowSheetApplication) { }
 
   @Get()
   @ApiResponse({
@@ -37,11 +37,12 @@ export class CashflowController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.cashflowSheetApp.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.cashflowSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class CashflowController {
 
       res.status(200).send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.cashflowSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class CashflowController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.cashflowSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/CustomerBalanceSummary/CustomerBalanceSummary.controller.ts

@@ -34,8 +34,9 @@ export class CustomerBalanceSummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the xlsx format.
-    if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.customerBalanceSummaryApp.xlsx(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
       res.setHeader(
@@ -44,18 +45,18 @@ export class CustomerBalanceSummaryController {
       );
       res.send(buffer);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.customerBalanceSummaryApp.csv(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
       res.setHeader('Content-Type', 'text/csv');
 
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.customerBalanceSummaryApp.table(filter);
 
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const buffer = await this.customerBalanceSummaryApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/GeneralLedger/GeneralLedger.controller.ts

@@ -39,11 +39,12 @@ export class GeneralLedgerController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.generalLedgerApplication.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.generalLedgerApplication.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -51,7 +52,7 @@ export class GeneralLedgerController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.generalLedgerApplication.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -61,7 +62,7 @@ export class GeneralLedgerController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.generalLedgerApplication.pdf(query);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/InventoryItemDetails/InventoryItemDetails.controller.ts

@@ -21,7 +21,8 @@ export class InventoryItemDetailsController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    const accept = acceptHeader || '';
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.inventoryItemDetailsApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -29,7 +30,7 @@ export class InventoryItemDetailsController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.inventoryItemDetailsApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -39,10 +40,10 @@ export class InventoryItemDetailsController {
       );
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.inventoryItemDetailsApp.table(query);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const buffer = await this.inventoryItemDetailsApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/InventoryValuationSheet/InventoryValuation.controller.ts

@@ -37,11 +37,12 @@ export class InventoryValuationController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.inventoryValuationApp.table(query);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.inventoryValuationApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -49,7 +50,7 @@ export class InventoryValuationController {
 
       res.send(buffer);
       // Retrieves the xslx buffer format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.inventoryValuationApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -59,7 +60,7 @@ export class InventoryValuationController {
       );
       res.send(buffer);
       // Retrieves the pdf format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.inventoryValuationApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.controller.ts

@@ -37,12 +37,13 @@ export class JournalSheetController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.journalSheetApp.table(query);
 
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.journalSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -50,7 +51,7 @@ export class JournalSheetController {
 
       res.send(buffer);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.journalSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -60,7 +61,7 @@ export class JournalSheetController {
       );
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.journalSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/JournalSheet/JournalSheet.ts

@@ -10,6 +10,7 @@ import {
 import { FinancialSheet } from '../../common/FinancialSheet';
 import { JournalSheetRepository } from './JournalSheetRepository';
 import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
+import { getTransactionTypeLabel } from '@/modules/BankingTransactions/utils';
 
 export class JournalSheet extends FinancialSheet {
   readonly query: IJournalReportQuery;
@@ -97,10 +98,13 @@ export class JournalSheet extends FinancialSheet {
 
       transactionType: groupEntry.transactionType,
       referenceId: groupEntry.transactionId,
-      referenceTypeFormatted: this.i18n.t(groupEntry.transactionType),
-
+      referenceTypeFormatted: this.i18n.t(
+        getTransactionTypeLabel(
+          groupEntry.transactionType,
+          groupEntry.transactionSubType,
+        ),
+      ),
       entries: this.entriesMapper(entriesGroup),
-
       currencyCode: this.baseCurrency,
 
       credit: totalCredit,

packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheet.controller.ts

@@ -45,8 +45,9 @@ export class ProfitLossSheetController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the csv format.
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const sheet = await this.profitLossSheetApp.csv(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -54,11 +55,11 @@ export class ProfitLossSheetController {
 
       res.send(sheet);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.profitLossSheetApp.table(query);
 
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const sheet = await this.profitLossSheetApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -68,7 +69,7 @@ export class ProfitLossSheetController {
       );
       res.send(sheet);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.profitLossSheetApp.pdf(query);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/PurchasesByItems/PurchasesByItems.controller.ts

@@ -22,11 +22,12 @@ export class PurchasesByItemReportController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // JSON table response format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.purchasesByItemsApp.table(filter);
       // CSV response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.purchasesByItemsApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -34,7 +35,7 @@ export class PurchasesByItemReportController {
 
       res.send(buffer);
       // Xlsx response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.purchasesByItemsApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -44,7 +45,7 @@ export class PurchasesByItemReportController {
       );
       res.send(buffer);
       // PDF response format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.purchasesByItemsApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/SalesByItems/SalesByItems.controller.ts

@@ -31,8 +31,9 @@ export class SalesByItemsController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the csv format.
-    if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.salesByItemsApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -40,10 +41,10 @@ export class SalesByItemsController {
 
       res.send(buffer);
       // Retrieves the json table format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    } else if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.salesByItemsApp.table(filter);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = this.salesByItemsApp.xlsx(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -53,7 +54,7 @@ export class SalesByItemsController {
       );
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.salesByItemsApp.pdf(filter);
 
       res.set({

packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummary.controller.ts

@@ -37,11 +37,12 @@ export class SalesTaxLiabilitySummaryController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.salesTaxLiabilitySummaryApp.table(query);
       // Retrieves the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.salesTaxLiabilitySummaryApp.xlsx(query);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
@@ -51,14 +52,14 @@ export class SalesTaxLiabilitySummaryController {
       );
       res.send(buffer);
       // Retrieves the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const buffer = await this.salesTaxLiabilitySummaryApp.csv(query);
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
       res.setHeader('Content-Type', 'text/csv');
 
       res.send(buffer);
       // Retrieves the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.salesTaxLiabilitySummaryApp.pdf(query);
       res.set({
         'Content-Type': 'application/pdf',

packages/server/src/modules/FinancialStatements/modules/SalesTaxLiabilitySummary/SalesTaxLiabilitySummaryRepository.ts

@@ -9,17 +9,18 @@ import { TaxRateModel } from '@/modules/TaxRates/models/TaxRate.model';
 import { AccountTransaction } from '@/modules/Accounts/models/AccountTransaction.model';
 import { Account } from '@/modules/Accounts/models/Account.model';
 import { ModelObject } from 'objection';
+import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 
 @Injectable({ scope: Scope.TRANSIENT })
 export class SalesTaxLiabilitySummaryRepository {
   @Inject(TaxRateModel.name)
-  private readonly taxRateModel: typeof TaxRateModel;
+  private readonly taxRateModel: TenantModelProxy<typeof TaxRateModel>;
 
   @Inject(AccountTransaction.name)
-  private readonly accountTransactionModel: typeof AccountTransaction;
+  private readonly accountTransactionModel: TenantModelProxy<typeof AccountTransaction>;
 
   @Inject(Account.name)
-  private readonly accountModel: typeof Account;
+  private readonly accountModel: TenantModelProxy<typeof Account>;
 
   /**
    * @param {SalesTaxLiabilitySummarySalesById}
@@ -77,7 +78,7 @@ export class SalesTaxLiabilitySummaryRepository {
    * @returns {Promise<TaxRate[]>}
    */
   public getTaxRates = () => {
-    return this.taxRateModel.query().orderBy('name', 'desc');
+    return this.taxRateModel().query().orderBy('name', 'desc');
   };
 
   /**
@@ -86,13 +87,13 @@ export class SalesTaxLiabilitySummaryRepository {
    */
   public async getTaxesPayableSumGroupedByRateId(): Promise<SalesTaxLiabilitySummaryPayableById> {
     // Retrieves tax payable accounts.
-    const taxPayableAccounts = await this.accountModel
+    const taxPayableAccounts = await this.accountModel()
       .query()
       .whereIn('accountType', [ACCOUNT_TYPE.TAX_PAYABLE]);
 
     const payableAccountsIds = taxPayableAccounts.map((account) => account.id);
 
-    const groupedTaxesById = await this.accountTransactionModel
+    const groupedTaxesById = await this.accountTransactionModel()
       .query()
       .whereIn('account_id', payableAccountsIds)
       .whereNot('tax_rate_id', null)
@@ -110,7 +111,7 @@ export class SalesTaxLiabilitySummaryRepository {
    */
   public taxesSalesSumGroupedByRateId =
     async (): Promise<SalesTaxLiabilitySummarySalesById> => {
-      const incomeAccounts = await this.accountModel
+      const incomeAccounts = await this.accountModel()
         .query()
         .whereIn('accountType', [
           ACCOUNT_TYPE.INCOME,
@@ -118,7 +119,7 @@ export class SalesTaxLiabilitySummaryRepository {
         ]);
       const incomeAccountsIds = incomeAccounts.map((account) => account.id);
 
-      const groupedTaxesById = await this.accountTransactionModel
+      const groupedTaxesById = await this.accountTransactionModel()
         .query()
         .whereIn('account_id', incomeAccountsIds)
         .whereNot('tax_rate_id', null)

packages/server/src/modules/FinancialStatements/modules/TransactionsByCustomer/TransactionsByCustomer.controller.ts

@@ -23,12 +23,13 @@ export class TransactionsByCustomerController {
     @Res({ passthrough: true }) res: Response,
     @Headers('accept') acceptHeader: string,
   ) {
+    const accept = acceptHeader || '';
     // Retrieves the json table format.
-    if (acceptHeader.includes(AcceptType.ApplicationJsonTable)) {
+    if (accept.includes(AcceptType.ApplicationJsonTable)) {
       return this.transactionsByCustomersApp.table(filter);
 
       // Retrieve the csv format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationCsv)) {
+    } else if (accept.includes(AcceptType.ApplicationCsv)) {
       const csv = await this.transactionsByCustomersApp.csv(filter);
 
       res.setHeader('Content-Disposition', 'attachment; filename=output.csv');
@@ -37,7 +38,7 @@ export class TransactionsByCustomerController {
       res.send(csv);
 
       // Retrieve the xlsx format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationXlsx)) {
+    } else if (accept.includes(AcceptType.ApplicationXlsx)) {
       const buffer = await this.transactionsByCustomersApp.xlsx(filter);
       res.setHeader('Content-Disposition', 'attachment; filename=output.xlsx');
       res.setHeader(
@@ -47,7 +48,7 @@ export class TransactionsByCustomerController {
       res.send(buffer);
 
       // Retrieve the json format.
-    } else if (acceptHeader.includes(AcceptType.ApplicationPdf)) {
+    } else if (accept.includes(AcceptType.ApplicationPdf)) {
       const pdfContent = await this.transactionsByCustomersApp.pdf(filter);
       res.set({
         'Content-Type': 'application/pdf',