Update docker-compose.prod.yml

agregar worker

docker-compose.prod.yml

@@ -9,8 +9,8 @@ services:
       - server
       - webapp
     ports:
-      - '${PUBLIC_PROXY_PORT:-80}:80'
-      - '${PUBLIC_PROXY_SSL_PORT:-443}:443'
+      - '8085:80'
+      - '8443:443'
     tty: true
     volumes:
       - ./docker/envoy/envoy.yaml:/etc/envoy/envoy.yaml
@@ -42,8 +42,8 @@ services:
     environment:
       # Mail
       - MAIL_HOST=${MAIL_HOST}
-      - MAIL_USERNAME=${MAIL_USERNAME}
-      - MAIL_PASSWORD=${MAIL_PASSWORD}
+      #- MAIL_USERNAME=${MAIL_USERNAME}
+      #- MAIL_PASSWORD=${MAIL_PASSWORD}
       - MAIL_PORT=${MAIL_PORT}
       - MAIL_SECURE=${MAIL_SECURE}
       - MAIL_FROM_NAME=${MAIL_FROM_NAME}
@@ -145,7 +145,28 @@ services:
       - mysql
     networks:
       - bigcapital_network
-
+  
+  #worker
+  worker:
+    container_name: bigcapital-worker
+    image: bigcapitalhq/server:latest
+    command: ["node", "dist/main.js", "queue"]
+    depends_on:
+      - redis
+      - mysql
+    environment:
+      - MAIL_HOST=${MAIL_HOST}
+      - MAIL_PORT=${MAIL_PORT}
+      - MAIL_SECURE=${MAIL_SECURE}
+      - MAIL_FROM_NAME=${MAIL_FROM_NAME}
+      - MAIL_FROM_ADDRESS=${MAIL_FROM_ADDRESS}
+      - REDIS_HOST=redis
+      - REDIS_PORT=6379
+      - QUEUE_HOST=redis
+      - QUEUE_PORT=6379
+    networks:
+      - bigcapital_network
+  
   mysql:
     container_name: bigcapital-mysql
     restart: on-failure

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 "pnpm run system:migrate:latest && pnpm run 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"

packages/server/Dockerfile

@@ -75,6 +75,9 @@ COPY --from=builder --chown=nodejs:nodejs /app/packages/server/src/i18n ./packag
 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

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/**/*", "exclude": "**/*.ts", "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

@@ -19,6 +19,7 @@ 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,
@@ -42,4 +43,5 @@ export const config = [
   throttle,
   redis,
   queue,
+  bullBoard,
 ];

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/modules/App/App.module.ts

@@ -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';
@@ -143,6 +146,24 @@ import { AppThrottleModule } from './AppThrottle.module';
       }),
       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: {

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/Auth/processors/SendResetPasswordMail.processor.ts

@@ -1,10 +1,6 @@
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
-import {
-  SendResetPasswordMailJob,
-  SendResetPasswordMailQueue,
-} from '../Auth.constants';
-import { Process } from '@nestjs/bull';
+import { SendResetPasswordMailQueue } from '../Auth.constants';
 import { Job } from 'bullmq';
 import { AuthenticationMailMesssages } from '../AuthMailMessages.esrvice';
 import { MailTransporter } from '@/modules/Mail/MailTransporter.service';
@@ -23,7 +19,6 @@ export class SendResetPasswordMailProcessor extends WorkerHost {
     super();
   }
 
-  @Process(SendResetPasswordMailJob)
   async process(job: Job<SendResetPasswordMailJobPayload>) {
     try {
       await this.authMailMesssages.sendResetPasswordMail(

packages/server/src/modules/Auth/processors/SendSignupVerificationMail.processor.ts

@@ -1,11 +1,7 @@
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
-import { Process } from '@nestjs/bull';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
-import {
-  SendSignupVerificationMailJob,
-  SendSignupVerificationMailQueue,
-} from '../Auth.constants';
+import { SendSignupVerificationMailQueue } from '../Auth.constants';
 import { MailTransporter } from '@/modules/Mail/MailTransporter.service';
 import { AuthenticationMailMesssages } from '../AuthMailMessages.esrvice';
 
@@ -21,7 +17,6 @@ export class SendSignupVerificationMailProcessor extends WorkerHost {
     super();
   }
 
-  @Process(SendSignupVerificationMailJob)
   async process(job: Job<SendSignupVerificationMailJobPayload>) {
     try {
       await this.authMailMesssages.sendSignupVerificationMail(

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/BankingPlaid/jobs/PlaidFetchTransactionsJob.ts

@@ -1,11 +1,9 @@
-import { Process } from '@nestjs/bull';
 import { UseCls } from 'nestjs-cls';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
 import {
   PlaidFetchTransitonsEventPayload,
-  UpdateBankingPlaidTransitionsJob,
   UpdateBankingPlaidTransitionsQueueJob,
 } from '../types/BankingPlaid.types';
 import { PlaidUpdateTransactions } from '../command/PlaidUpdateTransactions';
@@ -28,7 +26,6 @@ export class PlaidFetchTransactionsProcessor extends WorkerHost {
   /**
    * Triggers the function.
    */
-  @Process(UpdateBankingPlaidTransitionsJob)
   @UseCls()
   async process(job: Job<PlaidFetchTransitonsEventPayload>) {
     const { plaidItemId } = job.data;

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/BankingTranasctionsRegonize/jobs/RecognizeTransactionsJob.ts

@@ -7,7 +7,6 @@ import {
   RecognizeUncategorizedTransactionsJobPayload,
   RecognizeUncategorizedTransactionsQueue,
 } from '../_types';
-import { Process } from '@nestjs/bull';
 
 @Processor({
   name: RecognizeUncategorizedTransactionsQueue,
@@ -28,7 +27,6 @@ export class RegonizeTransactionsPrcessor extends WorkerHost {
   /**
    * Triggers sending invoice mail.
    */
-  @Process(RecognizeUncategorizedTransactionsQueue)
   @UseCls()
   async process(job: Job<RecognizeUncategorizedTransactionsJobPayload>) {
     const { ruleId, transactionsCriteria } = job.data;

packages/server/src/modules/Bills/dtos/BillResponse.dto.ts

@@ -1,6 +1,8 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
 import { ItemEntryDto } from '@/modules/TransactionItemEntry/dto/ItemEntry.dto';
 import { AttachmentLinkDto } from '@/modules/Attachments/dtos/Attachment.dto';
+import { BranchResponseDto } from '@/modules/Branches/dtos/BranchResponse.dto';
 import { DiscountType } from '@/common/types/Discount';
 
 export class BillResponseDto {
@@ -89,6 +91,14 @@ export class BillResponseDto {
   })
   branchId?: number;
 
+  @ApiProperty({
+    description: 'Branch details',
+    type: () => BranchResponseDto,
+    required: false,
+  })
+  @Type(() => BranchResponseDto)
+  branch?: BranchResponseDto;
+
   @ApiProperty({
     description: 'The ID of the project',
     example: 301,

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

@@ -30,6 +30,7 @@ export class BillTransformer extends Transformer {
       'taxes',
       'entries',
       'attachments',
+      'branch',
     ];
   };
 

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

@@ -31,6 +31,12 @@ import { ValidateBranchExistance } from './integrations/ValidateBranchExistance'
 import { ManualJournalBranchesValidator } from './integrations/ManualJournals/ManualJournalsBranchesValidator';
 import { CashflowTransactionsActivateBranches } from './integrations/Cashflow/CashflowActivateBranches';
 import { ExpensesActivateBranches } from './integrations/Expense/ExpensesActivateBranches';
+import { BillActivateBranches } from './integrations/Purchases/BillBranchesActivate';
+import { VendorCreditActivateBranches } from './integrations/Purchases/VendorCreditBranchesActivate';
+import { BillPaymentsActivateBranches } from './integrations/Purchases/PaymentMadeBranchesActivate';
+import { BillBranchesActivateSubscriber } from './subscribers/Activate/BillBranchesActivateSubscriber';
+import { VendorCreditBranchesActivateSubscriber } from './subscribers/Activate/VendorCreditBranchesActivateSubscriber';
+import { PaymentMadeActivateBranchesSubscriber } from './subscribers/Activate/PaymentMadeBranchesActivateSubscriber';
 import { FeaturesModule } from '../Features/Features.module';
 
 @Module({
@@ -66,7 +72,13 @@ import { FeaturesModule } from '../Features/Features.module';
     ValidateBranchExistance,
     ManualJournalBranchesValidator,
     CashflowTransactionsActivateBranches,
-    ExpensesActivateBranches
+    ExpensesActivateBranches,
+    BillActivateBranches,
+    VendorCreditActivateBranches,
+    BillPaymentsActivateBranches,
+    BillBranchesActivateSubscriber,
+    VendorCreditBranchesActivateSubscriber,
+    PaymentMadeActivateBranchesSubscriber
   ],
   exports: [
     BranchesSettingsService,

packages/server/src/modules/Branches/integrations/Purchases/BillBranchesActivate.ts

@@ -1,11 +1,14 @@
 import { Knex } from 'knex';
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { Bill } from '@/modules/Bills/models/Bill';
 
 @Injectable()
 export class BillActivateBranches {
-  constructor(private readonly billModel: TenantModelProxy<typeof Bill>) {}
+  constructor(
+    @Inject(Bill.name)
+    private readonly billModel: TenantModelProxy<typeof Bill>,
+  ) {}
 
   /**
    * Updates all bills transactions with the primary branch.
@@ -17,7 +20,7 @@ export class BillActivateBranches {
     primaryBranchId: number,
     trx?: Knex.Transaction,
   ) => {
-    // Updates the sale invoice with primary branch.
-    await Bill.query(trx).update({ branchId: primaryBranchId });
+    // Updates the bills with primary branch.
+    await this.billModel().query(trx).update({ branchId: primaryBranchId });
   };
 }

packages/server/src/modules/Branches/integrations/Purchases/PaymentMadeBranchesActivate.ts

@@ -1,11 +1,12 @@
 import { Knex } from 'knex';
+import { Inject, Injectable } from '@nestjs/common';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { BillPayment } from '@/modules/BillPayments/models/BillPayment';
-import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class BillPaymentsActivateBranches {
   constructor(
+    @Inject(BillPayment.name)
     private readonly billPaymentModel: TenantModelProxy<typeof BillPayment>,
   ) {}
 

packages/server/src/modules/Branches/integrations/Purchases/VendorCreditBranchesActivate.ts

@@ -1,11 +1,12 @@
 import { Knex } from 'knex';
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
 import { VendorCredit } from '@/modules/VendorCredit/models/VendorCredit';
 
 @Injectable()
 export class VendorCreditActivateBranches {
   constructor(
+    @Inject(VendorCredit.name)
     private readonly vendorCreditModel: TenantModelProxy<typeof VendorCredit>,
   ) {}
 

packages/server/src/modules/Branches/subscribers/Activate/BillBranchesActivateSubscriber.ts

@@ -0,0 +1,28 @@
+import { IBranchesActivatedPayload } from '../../Branches.types';
+import { events } from '@/common/events/events';
+import { Injectable } from '@nestjs/common';
+import { BillActivateBranches } from '../../integrations/Purchases/BillBranchesActivate';
+import { OnEvent } from '@nestjs/event-emitter';
+
+@Injectable()
+export class BillBranchesActivateSubscriber {
+  constructor(
+    private readonly billActivateBranches: BillActivateBranches,
+  ) { }
+
+  /**
+   * Updates bills transactions with the primary branch once
+   * the multi-branches is activated.
+   * @param {IBranchesActivatedPayload}
+   */
+  @OnEvent(events.branch.onActivated)
+  async updateBillsWithBranchOnActivated({
+    primaryBranch,
+    trx,
+  }: IBranchesActivatedPayload) {
+    await this.billActivateBranches.updateBillsWithBranch(
+      primaryBranch.id,
+      trx,
+    );
+  }
+}

packages/server/src/modules/Branches/subscribers/Activate/VendorCreditBranchesActivateSubscriber.ts

@@ -0,0 +1,28 @@
+import { IBranchesActivatedPayload } from '../../Branches.types';
+import { events } from '@/common/events/events';
+import { Injectable } from '@nestjs/common';
+import { VendorCreditActivateBranches } from '../../integrations/Purchases/VendorCreditBranchesActivate';
+import { OnEvent } from '@nestjs/event-emitter';
+
+@Injectable()
+export class VendorCreditBranchesActivateSubscriber {
+  constructor(
+    private readonly vendorCreditActivateBranches: VendorCreditActivateBranches,
+  ) { }
+
+  /**
+   * Updates vendor credits transactions with the primary branch once
+   * the multi-branches is activated.
+   * @param {IBranchesActivatedPayload}
+   */
+  @OnEvent(events.branch.onActivated)
+  async updateVendorCreditsWithBranchOnActivated({
+    primaryBranch,
+    trx,
+  }: IBranchesActivatedPayload) {
+    await this.vendorCreditActivateBranches.updateVendorCreditsWithBranch(
+      primaryBranch.id,
+      trx,
+    );
+  }
+}

packages/server/src/modules/CLI/commands/BaseCommand.ts

@@ -22,6 +22,7 @@ export abstract class BaseCommand extends CommandRunner {
       },
       migrations: {
         directory: this.configService.get('systemDatabase.migrationDir'),
+        loadExtensions: ['.js'],
       },
       seeds: {
         directory: this.configService.get('systemDatabase.seedsDir'),
@@ -43,6 +44,7 @@ export abstract class BaseCommand extends CommandRunner {
       },
       migrations: {
         directory: this.configService.get('tenantDatabase.migrationsDir') || './src/database/migrations',
+        loadExtensions: ['.js'],
       },
       seeds: {
         directory: this.configService.get('tenantDatabase.seedsDir') || './src/database/seeds/core',

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

@@ -24,14 +24,14 @@ export class BalanceSheetQueryDto extends FinancialSheetBranchesQueryDto {
   displayColumnsType: 'total' | 'date_periods' = 'total';
 
   @ApiProperty({
-    enum: ['day', 'month', 'year'],
+    enum: ['day', 'month', 'year', 'quarter'],
     default: 'year',
     description: 'Time period for column display',
   })
   @IsString()
   @IsOptional()
-  @IsEnum(['day', 'month', 'year'])
-  displayColumnsBy: 'day' | 'month' | 'year' = 'year';
+  @IsEnum(['day', 'month', 'year', 'quarter'])
+  displayColumnsBy: 'day' | 'month' | 'year' | 'quarter' = 'year';
 
   @ApiProperty({
     description: 'Start date for the balance sheet period',

packages/server/src/modules/FinancialStatements/modules/CashFlowStatement/CashFlowStatementQuery.dto.ts

@@ -34,13 +34,13 @@ export class CashFlowStatementQueryDto extends FinancialSheetBranchesQueryDto {
   @ApiProperty({
     description: 'Display columns by time period',
     required: false,
-    enum: ['day', 'month', 'year'],
+    enum: ['day', 'month', 'year', 'quarter'],
     default: 'year',
   })
   @IsString()
   @IsOptional()
-  @IsEnum(['day', 'month', 'year'])
-  displayColumnsBy: 'day' | 'month' | 'year' = 'year';
+  @IsEnum(['day', 'month', 'year', 'quarter'])
+  displayColumnsBy: 'day' | 'month' | 'year' | 'quarter' = 'year';
 
   @ApiProperty({
     description: 'Type of column display',

packages/server/src/modules/FinancialStatements/modules/ProfitLossSheet/ProfitLossSheetQuery.dto.ts

@@ -64,10 +64,10 @@ export class ProfitLossSheetQueryDto extends FinancialSheetBranchesQueryDto {
   displayColumnsType: 'total' | 'date_periods';
 
   @IsString()
-  @IsEnum(['day', 'month', 'year'])
+  @IsEnum(['day', 'month', 'year', 'quarter'])
   @IsOptional()
   @ApiProperty({ description: 'How to display columns' })
-  displayColumnsBy: 'day' | 'month' | 'year' = 'year';
+  displayColumnsBy: 'day' | 'month' | 'year' | 'quarter' = 'year';
 
   @Transform(({ value }) => parseBoolean(value, false))
   @IsBoolean()

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

@@ -16,6 +16,8 @@ import {
   ComputeItemCostQueue,
   WriteInventoryTransactionsGLEntriesQueue,
 } from './types/InventoryCost.types';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import { BullModule } from '@nestjs/bullmq';
 import { InventoryAverageCostMethodService } from './commands/InventoryAverageCostMethod.service';
 import { InventoryItemCostService } from './commands/InventoryCosts.service';
@@ -39,6 +41,14 @@ const models = [
     BullModule.registerQueue({
       name: WriteInventoryTransactionsGLEntriesQueue,
     }),
+    BullBoardModule.forFeature({
+      name: ComputeItemCostQueue,
+      adapter: BullMQAdapter,
+    }),
+    BullBoardModule.forFeature({
+      name: WriteInventoryTransactionsGLEntriesQueue,
+      adapter: BullMQAdapter,
+    }),
     forwardRef(() => SaleInvoicesModule),
     ImportModule,
   ],
@@ -56,7 +66,7 @@ const models = [
     InventoryItemCostService,
     InventoryItemOpeningAvgCostService,
     InventoryCostSubscriber,
-    GetItemsInventoryValuationListService
+    GetItemsInventoryValuationListService,
   ],
   exports: [
     ...models,
@@ -64,6 +74,6 @@ const models = [
     InventoryItemCostService,
     InventoryComputeCostService,
   ],
-  controllers: [InventoryCostController]
+  controllers: [InventoryCostController],
 })
 export class InventoryCostModule {}

packages/server/src/modules/InventoryCost/processors/ComputeItemCost.processor.ts

@@ -7,11 +7,7 @@ import * as moment from 'moment';
 import { TenantJobPayload } from '@/interfaces/Tenant';
 import { InventoryComputeCostService } from '../commands/InventoryComputeCost.service';
 import { events } from '@/common/events/events';
-import {
-  ComputeItemCostQueue,
-  ComputeItemCostQueueJob,
-} from '../types/InventoryCost.types';
-import { Process } from '@nestjs/bull';
+import { ComputeItemCostQueue } from '../types/InventoryCost.types';
 
 interface ComputeItemCostJobPayload extends TenantJobPayload {
   itemId: number;
@@ -39,7 +35,6 @@ export class ComputeItemCostProcessor extends WorkerHost {
    * Process the compute item cost job.
    * @param {Job<ComputeItemCostJobPayload>} job - The job to process
    */
-  @Process(ComputeItemCostQueueJob)
   @UseCls()
   async process(job: Job<ComputeItemCostJobPayload>) {
     const { itemId, startingDate, organizationId, userId } = job.data;

packages/server/src/modules/InventoryCost/processors/WriteInventoryTransactionsGLEntries.processor.ts

@@ -1,8 +1,4 @@
-import { Process } from '@nestjs/bull';
-import {
-  WriteInventoryTransactionsGLEntriesQueue,
-  WriteInventoryTransactionsGLEntriesQueueJob,
-} from '../types/InventoryCost.types';
+import { WriteInventoryTransactionsGLEntriesQueue } from '../types/InventoryCost.types';
 import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 
@@ -15,6 +11,5 @@ export class WriteInventoryTransactionsGLEntriesProcessor extends WorkerHost {
     super();
   }
 
-  @Process(WriteInventoryTransactionsGLEntriesQueueJob)
   async process() {}
 }

packages/server/src/modules/Items/Item.controller.ts

@@ -34,6 +34,7 @@ import {
   BulkDeleteItemsDto,
   ValidateBulkDeleteItemsResponseDto,
 } from './dtos/BulkDeleteItems.dto';
+import { ItemApiErrorResponseDto } from './dtos/ItemErrorResponse.dto';
 
 @Controller('/items')
 @ApiTags('Items')
@@ -45,6 +46,7 @@ import {
 @ApiExtraModels(ItemEstimatesResponseDto)
 @ApiExtraModels(ItemReceiptsResponseDto)
 @ApiExtraModels(ValidateBulkDeleteItemsResponseDto)
+@ApiExtraModels(ItemApiErrorResponseDto)
 @ApiCommonHeaders()
 export class ItemsController extends TenantController {
   constructor(private readonly itemsApplication: ItemsApplicationService) {
@@ -147,6 +149,13 @@ export class ItemsController extends TenantController {
     status: 200,
     description: 'The item has been successfully updated.',
   })
+  @ApiResponse({
+    status: 400,
+    description: 'Validation error. Possible error types: ITEM_NAME_EXISTS, INVENTORY_ACCOUNT_CANNOT_MODIFIED, TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS, etc.',
+    schema: {
+      $ref: getSchemaPath(ItemApiErrorResponseDto),
+    },
+  })
   @ApiResponse({ status: 404, description: 'The item not found.' })
   @ApiParam({
     name: 'id',
@@ -204,6 +213,13 @@ export class ItemsController extends TenantController {
     status: 200,
     description: 'The item has been successfully created.',
   })
+  @ApiResponse({
+    status: 400,
+    description: 'Validation error. Possible error types: ITEM_NAME_EXISTS, ITEM_CATEOGRY_NOT_FOUND, COST_ACCOUNT_NOT_COGS, SELL_ACCOUNT_NOT_INCOME, INVENTORY_ACCOUNT_NOT_INVENTORY, INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM, COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM, etc.',
+    schema: {
+      $ref: getSchemaPath(ItemApiErrorResponseDto),
+    },
+  })
   // @UsePipes(new ZodValidationPipe(createItemSchema))
   async createItem(
     @Body() createItemDto: CreateItemDto,
@@ -219,6 +235,13 @@ export class ItemsController extends TenantController {
     status: 200,
     description: 'The item has been successfully deleted.',
   })
+  @ApiResponse({
+    status: 400,
+    description: 'Cannot delete item. Possible error types: ITEM_HAS_ASSOCIATED_TRANSACTINS, ITEM_HAS_ASSOCIATED_INVENTORY_ADJUSTMENT, etc.',
+    schema: {
+      $ref: getSchemaPath(ItemApiErrorResponseDto),
+    },
+  })
   @ApiResponse({ status: 404, description: 'The item not found.' })
   @ApiParam({
     name: 'id',

packages/server/src/modules/Items/dtos/ItemErrorResponse.dto.ts

@@ -0,0 +1,112 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+/**
+ * Item API Error Types
+ * These error types are returned when item operations fail validation
+ */
+export enum ItemErrorType {
+  /** Item name already exists in the system */
+  ItemNameExists = 'ITEM_NAME_EXISTS',
+  
+  /** Item category was not found */
+  ItemCategoryNotFound = 'ITEM_CATEOGRY_NOT_FOUND',
+  
+  /** Cost account is not a Cost of Goods Sold account */
+  CostAccountNotCogs = 'COST_ACCOUNT_NOT_COGS',
+  
+  /** Cost account was not found */
+  CostAccountNotFound = 'COST_ACCOUNT_NOT_FOUMD',
+  
+  /** Sell account was not found */
+  SellAccountNotFound = 'SELL_ACCOUNT_NOT_FOUND',
+  
+  /** Sell account is not an income account */
+  SellAccountNotIncome = 'SELL_ACCOUNT_NOT_INCOME',
+  
+  /** Inventory account was not found */
+  InventoryAccountNotFound = 'INVENTORY_ACCOUNT_NOT_FOUND',
+  
+  /** Account is not an inventory type account */
+  InventoryAccountNotInventory = 'INVENTORY_ACCOUNT_NOT_INVENTORY',
+  
+  /** Multiple items have associated transactions */
+  ItemsHaveAssociatedTransactions = 'ITEMS_HAVE_ASSOCIATED_TRANSACTIONS',
+  
+  /** Item has associated transactions (singular) */
+  ItemHasAssociatedTransactions = 'ITEM_HAS_ASSOCIATED_TRANSACTINS',
+  
+  /** Item has associated inventory adjustments */
+  ItemHasAssociatedInventoryAdjustment = 'ITEM_HAS_ASSOCIATED_INVENTORY_ADJUSTMENT',
+  
+  /** Cannot change item type to inventory */
+  ItemCannotChangeInventoryType = 'ITEM_CANNOT_CHANGE_INVENTORY_TYPE',
+  
+  /** Cannot change type when item has transactions */
+  TypeCannotChangeWithItemHasTransactions = 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS',
+  
+  /** Inventory account cannot be modified */
+  InventoryAccountCannotModified = 'INVENTORY_ACCOUNT_CANNOT_MODIFIED',
+  
+  /** Purchase tax rate was not found */
+  PurchaseTaxRateNotFound = 'PURCHASE_TAX_RATE_NOT_FOUND',
+  
+  /** Sell tax rate was not found */
+  SellTaxRateNotFound = 'SELL_TAX_RATE_NOT_FOUND',
+  
+  /** Income account is required for sellable items */
+  IncomeAccountRequiredWithSellableItem = 'INCOME_ACCOUNT_REQUIRED_WITH_SELLABLE_ITEM',
+  
+  /** Cost account is required for purchasable items */
+  CostAccountRequiredWithPurchasableItem = 'COST_ACCOUNT_REQUIRED_WITH_PURCHASABLE_ITEM',
+  
+  /** Item not found */
+  NotFound = 'NOT_FOUND',
+  
+  /** Items not found */
+  ItemsNotFound = 'ITEMS_NOT_FOUND',
+}
+
+/**
+ * Item API Error Response
+ * Returned when an item operation fails
+ */
+export class ItemErrorResponseDto {
+  @ApiProperty({
+    description: 'HTTP status code',
+    example: 400,
+  })
+  statusCode: number;
+
+  @ApiProperty({
+    description: 'Error type identifier',
+    enum: ItemErrorType,
+    example: ItemErrorType.ItemNameExists,
+  })
+  type: ItemErrorType;
+
+  @ApiProperty({
+    description: 'Human-readable error message',
+    example: 'The item name is already exist.',
+    required: false,
+    nullable: true,
+  })
+  message: string | null;
+
+  @ApiProperty({
+    description: 'Additional error payload data',
+    required: false,
+    nullable: true,
+  })
+  payload: any;
+}
+
+/**
+ * Item API Error Response Wrapper
+ */
+export class ItemApiErrorResponseDto {
+  @ApiProperty({
+    description: 'Array of error details',
+    type: [ItemErrorResponseDto],
+  })
+  errors: ItemErrorResponseDto[];
+}

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

@@ -3,6 +3,8 @@ import { GetCurrentOrganizationService } from './queries/GetCurrentOrganization.
 import { BuildOrganizationService } from './commands/BuildOrganization.service';
 import { UpdateOrganizationService } from './commands/UpdateOrganization.service';
 import { OrganizationController } from './Organization.controller';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullMQAdapter } from '@bull-board/api/bullMQAdapter';
 import { BullModule } from '@nestjs/bullmq';
 import { OrganizationBuildQueue } from './Organization.types';
 import { OrganizationBuildProcessor } from './processors/OrganizationBuild.processor';
@@ -25,10 +27,14 @@ import { GetBuildOrganizationBuildJob } from './commands/GetBuildOrganizationJob
     OrganizationBaseCurrencyLocking,
     SyncSystemUserToTenantService,
     SyncSystemUserToTenantSubscriber,
-    GetBuildOrganizationBuildJob
+    GetBuildOrganizationBuildJob,
   ],
   imports: [
     BullModule.registerQueue({ name: OrganizationBuildQueue }),
+    BullBoardModule.forFeature({
+      name: OrganizationBuildQueue,
+      adapter: BullMQAdapter,
+    }),
     TenantDBManagerModule,
   ],
   controllers: [OrganizationController],

packages/server/src/modules/Organization/processors/OrganizationBuild.processor.ts

@@ -2,10 +2,8 @@ import { Processor, WorkerHost } from '@nestjs/bullmq';
 import { Scope } from '@nestjs/common';
 import { Job } from 'bullmq';
 import { ClsService, UseCls } from 'nestjs-cls';
-import { Process } from '@nestjs/bull';
 import {
   OrganizationBuildQueue,
-  OrganizationBuildQueueJob,
   OrganizationBuildQueueJobPayload,
 } from '../Organization.types';
 import { BuildOrganizationService } from '../commands/BuildOrganization.service';
@@ -22,7 +20,6 @@ export class OrganizationBuildProcessor extends WorkerHost {
     super();
   }
 
-  @Process(OrganizationBuildQueueJob)
   @UseCls()
   async process(job: Job<OrganizationBuildQueueJobPayload>) {
     console.log('Processing organization build job:', job.id);

packages/server/src/modules/PaymentReceived/PaymentsReceived.module.ts

@@ -1,4 +1,6 @@
 import { Module } from '@nestjs/common';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullAdapter } from '@bull-board/api/bullAdapter';
 import { BullModule } from '@nestjs/bull';
 import { PaymentReceivesController } from './PaymentsReceived.controller';
 import { PaymentReceivesApplication } from './PaymentReceived.application';
@@ -95,6 +97,10 @@ import { ValidateBulkDeletePaymentReceivedService } from './ValidateBulkDeletePa
     DynamicListModule,
     MailModule,
     BullModule.registerQueue({ name: SEND_PAYMENT_RECEIVED_MAIL_QUEUE }),
+    BullBoardModule.forFeature({
+      name: SEND_PAYMENT_RECEIVED_MAIL_QUEUE,
+      adapter: BullAdapter,
+    }),
   ],
 })
 export class PaymentsReceivedModule {}

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

@@ -1,4 +1,6 @@
 import { Module } from '@nestjs/common';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullAdapter } from '@bull-board/api/bullAdapter';
 import { BullModule } from '@nestjs/bull';
 import { TenancyContext } from '../Tenancy/TenancyContext.service';
 import { TenancyDatabaseModule } from '../Tenancy/TenancyDB/TenancyDB.module';
@@ -54,6 +56,10 @@ import { SendSaleEstimateMailProcess } from './processes/SendSaleEstimateMail.pr
     TemplateInjectableModule,
     PdfTemplatesModule,
     BullModule.registerQueue({ name: SendSaleEstimateMailQueue }),
+    BullBoardModule.forFeature({
+      name: SendSaleEstimateMailQueue,
+      adapter: BullAdapter,
+    }),
   ],
   controllers: [SaleEstimatesController],
   providers: [
@@ -99,4 +105,4 @@ import { SendSaleEstimateMailProcess } from './processes/SendSaleEstimateMail.pr
     GetSaleEstimateMailTemplateService,
   ],
 })
-export class SaleEstimatesModule { }
+export class SaleEstimatesModule {}

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

@@ -45,6 +45,8 @@ import { SendSaleInvoiceMailCommon } from './commands/SendInvoiceInvoiceMailComm
 import { DynamicListModule } from '../DynamicListing/DynamicList.module';
 import { MailNotificationModule } from '../MailNotification/MailNotification.module';
 import { SendSaleInvoiceMailProcessor } from './processors/SendSaleInvoiceMail.processor';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullAdapter } from '@bull-board/api/bullAdapter';
 import { BullModule } from '@nestjs/bull';
 import { SendSaleInvoiceQueue } from './constants';
 import { InvoicePaymentIntegrationSubscriber } from './subscribers/InvoicePaymentIntegrationSubscriber';
@@ -81,6 +83,10 @@ import { ValidateBulkDeleteSaleInvoicesService } from './ValidateBulkDeleteSaleI
     forwardRef(() => PaymentLinksModule),
     DynamicListModule,
     BullModule.registerQueue({ name: SendSaleInvoiceQueue }),
+    BullBoardModule.forFeature({
+      name: SendSaleInvoiceQueue,
+      adapter: BullAdapter,
+    }),
   ],
   controllers: [SaleInvoicesController],
   providers: [
@@ -139,4 +145,4 @@ import { ValidateBulkDeleteSaleInvoicesService } from './ValidateBulkDeleteSaleI
     SaleInvoicesImportable,
   ],
 })
-export class SaleInvoicesModule { }
+export class SaleInvoicesModule {}

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

@@ -1,4 +1,6 @@
 import { Module } from '@nestjs/common';
+import { BullBoardModule } from '@bull-board/nestjs';
+import { BullAdapter } from '@bull-board/api/bullAdapter';
 import { BullModule } from '@nestjs/bull';
 import { SaleReceiptApplication } from './SaleReceiptApplication.service';
 import { CreateSaleReceipt } from './commands/CreateSaleReceipt.service';
@@ -62,6 +64,10 @@ import { ValidateBulkDeleteSaleReceiptsService } from './ValidateBulkDeleteSaleR
     MailModule,
     MailNotificationModule,
     BullModule.registerQueue({ name: SendSaleReceiptMailQueue }),
+    BullBoardModule.forFeature({
+      name: SendSaleReceiptMailQueue,
+      adapter: BullAdapter,
+    }),
   ],
   providers: [
     TenancyContext,
@@ -95,4 +101,4 @@ import { ValidateBulkDeleteSaleReceiptsService } from './ValidateBulkDeleteSaleR
     ValidateBulkDeleteSaleReceiptsService,
   ],
 })
-export class SaleReceiptsModule { }
+export class SaleReceiptsModule {}

packages/server/src/modules/System/SystemDB/SystemDB.module.ts

@@ -22,6 +22,7 @@ const providers = [
       },
       migrations: {
         directory: configService.get('systemDatabase.migrationDir'),
+        loadExtensions: ['.js'],
       },
       seeds: {
         directory: configService.get('systemDatabase.seedsDir'),

packages/server/src/modules/Tenancy/TenancyDB/TenancyDB.module.ts

@@ -33,6 +33,7 @@ export const TenancyDatabaseProxyProvider = ClsModule.forFeatureAsync({
       },
       migrations: {
         directory: configService.get('tenantDatabase.migrationsDir'),
+        loadExtensions: ['.js'],
       },
       seeds: {
         directory: configService.get('tenantDatabase.seedsDir'),

packages/webapp/src/components/FinancialSheet/ReportDataTable.tsx

@@ -4,7 +4,12 @@ import styled from 'styled-components';
 import { DataTable } from '../Datatable';
 
 export const ReportDataTable = styled(DataTable)`
+  --x-table-no-results-border-color: #ddd;
+
+  .bp4-dark & {
+    --x-table-no-results-border-color: var(--color-dark-gray5);
+  }
   .table .tbody .tr.no-results:last-of-type .td {
-    border-bottom: 1px solid #ddd;
+    border-bottom: 1px solid var(--x-table-no-results-border-color);
   }
 `;

packages/webapp/src/components/Preferences/PreferencesSidebar.tsx

@@ -3,7 +3,7 @@ import React from 'react';
 import { Menu, MenuItem, MenuDivider } from '@blueprintjs/core';
 import { useHistory, useLocation } from 'react-router-dom';
 import { FormattedMessage as T } from '@/components';
-import preferencesMenu from '@/constants/preferencesMenu';
+import { PreferencesMenu } from '@/constants/preferencesMenu';
 import PreferencesSidebarContainer from './PreferencesSidebarContainer';
 
 import '@/style/pages/Preferences/Sidebar.scss';
@@ -15,7 +15,7 @@ export default function PreferencesSidebar() {
   const history = useHistory();
   const location = useLocation();
 
-  const items = preferencesMenu.map((item) =>
+  const items = PreferencesMenu.map((item) =>
     item.divider ? (
       <MenuDivider title={item.title} />
     ) : (

packages/webapp/src/constants/allocateLandedCostType.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import intl from 'react-intl-universal';
 
-export default [
+export const AllocateLandedCostType = [
   { name: intl.get('bills'), value: 'Bill' },
   { name: intl.get('expenses'), value: 'Expense' },
 ];

packages/webapp/src/constants/app.tsx

@@ -1,5 +1,5 @@
 // @ts-nocheck
-export default {
+export const App = {
   "app_name": "BigCapital",
   "app_version": "0.0.1 (build 12344)",
 }

packages/webapp/src/constants/contactsOptions.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import intl from 'react-intl-universal';
 
-export default [
+export const ContactsOptions = [
   { name: intl.get('customer'), path: 'customers' },
   { name: intl.get('vendor'), path: 'vendors' },
 ];

packages/webapp/src/constants/keyboardShortcutsOptions.tsx

@@ -16,7 +16,7 @@ import {
   VendorAction,
 } from './abilityOption';
 
-export default [
+export const KeyboardShortcutsOptions = [
   {
     shortcut_key: 'Shift + I',
     description: intl.get('jump_to_the_invoices'),

packages/webapp/src/constants/preferencesMenu.tsx

@@ -2,7 +2,7 @@
 import React from 'react';
 import { FormattedMessage as T } from '@/components';
 
-export default [
+export const PreferencesMenu = [
   {
     text: <T id={'general'} />,
     disabled: false,
@@ -13,10 +13,10 @@ export default [
     disabled: false,
     href: '/preferences/branding',
   },
-  {
-    text: 'Billing',
-    href: '/preferences/billing',
-  },
+  // {
+  //   text: 'Billing',
+  //   href: '/preferences/billing',
+  // },
   {
     text: <T id={'users'} />,
     href: '/preferences/users',
@@ -63,11 +63,11 @@ export default [
     disabled: false,
     href: '/preferences/items',
   },
-  {
-    text: 'Integrations',
-    disabled: false,
-    href: '/preferences/integrations'
-  },
+  // {
+  //   text: 'Integrations',
+  //   disabled: false,
+  //   href: '/preferences/integrations'
+  // },
   {
     text: 'API Keys',
     disabled: false,

packages/webapp/src/containers/Accounts/utils.tsx

@@ -8,6 +8,11 @@ import { If, AppToaster } from '@/components';
 import { NormalCell, BalanceCell, BankBalanceCell } from './components';
 import { transformTableStateToQuery, isBlank } from '@/utils';
 
+export const DeleteAccountTypeError = {
+  AccountPredefined: 'account_predefined',
+  AccountHasAssociatedTransactions: 'account_has_associated_transactions',
+};
+
 /**
  * Account name accessor.
  */
@@ -26,13 +31,13 @@ export const accountNameAccessor = (account) => {
  * Handle delete errors in bulk and singular.
  */
 export const handleDeleteErrors = (errors) => {
-  if (errors.find((e) => e.type === 'ACCOUNT.PREDEFINED')) {
+  if (errors.find((e) => e.type === DeleteAccountTypeError.AccountPredefined)) {
     AppToaster.show({
       message: intl.get('cannot_delete_predefined_accounts'),
       intent: Intent.DANGER,
     });
   }
-  if (errors.find((e) => e.type === 'ACCOUNT.HAS.ASSOCIATED.TRANSACTIONS')) {
+  if (errors.find((e) => e.type === DeleteAccountTypeError.AccountHasAssociatedTransactions)) {
     AppToaster.show({
       message: intl.get('cannot_delete_account_has_associated_transactions'),
       intent: Intent.DANGER,

packages/webapp/src/containers/Dialogs/AllocateLandedCostDialog/AllocateLandedCostFormFields.tsx

@@ -16,7 +16,7 @@ import { FormattedMessage as T, If, FFormGroup, FSelect, FRadioGroup, FInputGrou
 import { handleStringChange } from '@/utils';
 import { FieldRequiredHint } from '@/components';
 import { CLASSES } from '@/constants/classes';
-import allocateLandedCostType from '@/constants/allocateLandedCostType';
+import { AllocateLandedCostType } from '@/constants/allocateLandedCostType';
 
 import AllocateLandedCostFormBody from './AllocateLandedCostFormBody';
 import {
@@ -81,7 +81,7 @@ export default function AllocateLandedCostFormFields() {
       >
         <FSelect
           name={'transaction_type'}
-          items={allocateLandedCostType}
+          items={AllocateLandedCostType}
           onItemChange={handleTransactionTypeChange}
           filterable={false}
           valueAccessor={'value'}

packages/webapp/src/containers/Dialogs/ContactDuplicateDialog/ContactDuplicateForm.tsx

@@ -9,7 +9,7 @@ import { FormattedMessage as T } from '@/components';
 import { useHistory } from 'react-router-dom';
 import { useContactDuplicateFromContext } from './ContactDuplicateProvider';
 
-import Contacts from '@/constants/contactsOptions';
+import { ContactsOptions } from '@/constants/contactsOptions';
 
 import { withDialogActions } from '@/containers/Dialog/withDialogActions';
 import { compose } from '@/utils';
@@ -66,7 +66,7 @@ function ContactDuplicateForm({
             >
               <FSelect
                 name={'contact_type'}
-                items={Contacts}
+                items={ContactsOptions}
                 placeholder={<T id={'select_contact'} />}
                 textAccessor={'name'}
                 valueAccessor={'path'}

packages/webapp/src/containers/FinancialStatements/GeneralLedger/dynamicColumns.ts

@@ -1,8 +1,20 @@
 // @ts-nocheck
+import React from 'react';
 import { getColumnWidth } from '@/utils';
 import * as R from 'ramda';
 import { useGeneralLedgerContext } from './GeneralLedgerProvider';
-import { Align } from '@/constants';
+import { Align, CLASSES } from '@/constants';
+
+/**
+ * Description cell – wraps value in a div with muted text class.
+ */
+function DescriptionCell({ cell: { value } }) {
+  return React.createElement(
+    'div',
+    { className: `cell ${CLASSES.TEXT_MUTED}` },
+    value,
+  );
+}
 
 const getTableCellValueAccessor = (index) => `cells[${index}].value`;
 
@@ -75,6 +87,16 @@ const transactionIdColumnAccessor = (column) => {
   };
 };
 
+/**
+ * Description column accessor (muted text in wrapped cell).
+ */
+const descriptionColumnAccessor = (column) => {
+  return {
+    ...column,
+    Cell: DescriptionCell,
+  };
+};
+
 const dynamiColumnMapper = R.curry((data, column) => {
   const _numericColumnAccessor = numericColumnAccessor(data);
 
@@ -88,6 +110,7 @@ const dynamiColumnMapper = R.curry((data, column) => {
       R.pathEq(['key'], 'reference_number'),
       transactionIdColumnAccessor,
     ),
+    R.when(R.pathEq(['key'], 'description'), descriptionColumnAccessor),
     R.when(R.pathEq(['key'], 'credit'), _numericColumnAccessor),
     R.when(R.pathEq(['key'], 'debit'), _numericColumnAccessor),
     R.when(R.pathEq(['key'], 'amount'), _numericColumnAccessor),

packages/webapp/src/containers/FinancialStatements/Journal/dynamicColumns.ts

@@ -1,9 +1,21 @@
 // @ts-nocheck
-import { Align } from '@/constants';
+import React from 'react';
+import { Align, CLASSES } from '@/constants';
 import { getColumnWidth } from '@/utils';
 import * as R from 'ramda';
 import { useJournalSheetContext } from './JournalProvider';
 
+/**
+ * Description cell – wraps value in a div with muted text class.
+ */
+function DescriptionCell({ cell: { value } }) {
+  return React.createElement(
+    'span',
+    { className: `cell ${CLASSES.TEXT_MUTED}` },
+    value,
+  );
+}
+
 const getTableCellValueAccessor = (index) => `cells[${index}].value`;
 
 const getReportColWidth = (data, accessor, headerText) => {
@@ -86,6 +98,16 @@ const accountCodeColumnAccessor = (column) => {
   };
 };
 
+/**
+ * Description column accessor (muted text in wrapped cell).
+ */
+const descriptionColumnAccessor = (column) => {
+  return {
+    ...column,
+    Cell: DescriptionCell,
+  };
+};
+
 /**
  * Dynamic column mapper.
  * @param {} data -
@@ -105,6 +127,7 @@ const dynamicColumnMapper = R.curry((data, column) => {
       R.pathEq(['key'], 'transaction_number'),
       transactionNumberColumnAccessor,
     ),
+    R.when(R.pathEq(['key'], 'description'), descriptionColumnAccessor),
     R.when(R.pathEq(['key'], 'account_code'), accountCodeColumnAccessor),
     R.when(R.pathEq(['key'], 'credit'), _numericColumnAccessor),
     R.when(R.pathEq(['key'], 'debit'), _numericColumnAccessor),
@@ -113,7 +136,7 @@ const dynamicColumnMapper = R.curry((data, column) => {
 });
 
 /**
- * Composes the fetched dynamic columns from the server to the columns to pass it 
+ * Composes the fetched dynamic columns from the server to the columns to pass it
  * to the table component.
  */
 export const dynamicColumns = (columns, data) => {

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

@@ -14,6 +14,18 @@ import { useSettingsSelector } from '@/hooks/state';
 import { transformItemFormData } from './ItemForm.schema';
 import { useWatch } from '@/hooks/utils';
 
+/**
+ * Error types for item operations.
+ */
+export const ItemErrorType = {
+  ItemNameExists: 'ITEM_NAME_EXISTS',
+  InventoryAccountCannotModified: 'INVENTORY_ACCOUNT_CANNOT_MODIFIED',
+  TypeCannotChangeWithItemHasTransactions: 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS',
+  ItemHasAssociatedTransactions: 'ITEM_HAS_ASSOCIATED_TRANSACTINS',
+  ItemHasAssociatedInventoryAdjustment: 'ITEM_HAS_ASSOCIATED_INVENTORY_ADJUSTMENT',
+  ItemHasAssociatedTransactionsPlural: 'ITEM_HAS_ASSOCIATED_TRANSACTIONS',
+} as const;
+
 const defaultInitialValues = {
   active: 1,
   name: '',
@@ -74,7 +86,7 @@ export const transitionItemTypeKeyToLabel = (itemTypeKey) => {
 // handle delete errors.
 export const handleDeleteErrors = (errors) => {
   if (
-    errors.find((error) => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTINS')
+    errors.find((error) => error.type === ItemErrorType.ItemHasAssociatedTransactions)
   ) {
     AppToaster.show({
       message: intl.get('the_item_has_associated_transactions'),
@@ -84,7 +96,7 @@ export const handleDeleteErrors = (errors) => {
 
   if (
     errors.find(
-      (error) => error.type === 'ITEM_HAS_ASSOCIATED_INVENTORY_ADJUSTMENT',
+      (error) => error.type === ItemErrorType.ItemHasAssociatedInventoryAdjustment,
     )
   ) {
     AppToaster.show({
@@ -96,7 +108,7 @@ export const handleDeleteErrors = (errors) => {
   }
   if (
     errors.find(
-      (error) => error.type === 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS',
+      (error) => error.type === ItemErrorType.TypeCannotChangeWithItemHasTransactions,
     )
   ) {
     AppToaster.show({
@@ -107,7 +119,7 @@ export const handleDeleteErrors = (errors) => {
     });
   }
   if (
-    errors.find((error) => error.type === 'ITEM_HAS_ASSOCIATED_TRANSACTIONS')
+    errors.find((error) => error.type === ItemErrorType.ItemHasAssociatedTransactionsPlural)
   ) {
     AppToaster.show({
       message: intl.get('item.error.you_could_not_delete_item_has_associated'),
@@ -214,10 +226,10 @@ export const transformSubmitRequestErrors = (error) => {
   } = error;
   const fields = {};
 
-  if (errors.find((e) => e.type === 'ITEM.NAME.ALREADY.EXISTS')) {
+  if (errors.find((e) => e.type === ItemErrorType.ItemNameExists)) {
     fields.name = intl.get('the_name_used_before');
   }
-  if (errors.find((e) => e.type === 'INVENTORY_ACCOUNT_CANNOT_MODIFIED')) {
+  if (errors.find((e) => e.type === ItemErrorType.InventoryAccountCannotModified)) {
     AppToaster.show({
       message: intl.get('cannot_change_item_inventory_account'),
       intent: Intent.DANGER,
@@ -225,7 +237,7 @@ export const transformSubmitRequestErrors = (error) => {
   }
   if (
     errors.find(
-      (e) => e.type === 'TYPE_CANNOT_CHANGE_WITH_ITEM_HAS_TRANSACTIONS',
+      (e) => e.type === ItemErrorType.TypeCannotChangeWithItemHasTransactions,
     )
   ) {
     AppToaster.show({

packages/webapp/src/containers/Preferences/Warehouses/components.tsx

@@ -87,7 +87,7 @@ export function WarehousesGridItemBox({
     <WarehouseBoxRoot>
       <WarehouseHeader>
         <WarehouseTitle>
-          {title} {primary && <Icon icon={'star-18dp'} iconSize={16} />}
+          {title} {primary ? <Icon icon={'star-18dp'} iconSize={16} /> : null}
         </WarehouseTitle>
         <WarehouseCode>{code}</WarehouseCode>
         <WarehouseIcon>
@@ -118,12 +118,21 @@ export const WarehousesList = styled.div`
 `;
 
 export const WarehouseBoxRoot = styled.div`
+  --x-box-border-color: #c8cad0;
+  --x-box-background-color: #fff;
+  --x-box-hover-border-color: #0153cc;
+
+  .bp4-dark & {
+    --x-box-border-color: rgba(255, 255, 255, 0.2);
+    --x-box-background-color: var(--color-dark-gray3);
+    --x-box-hover-border-color: #0153cc;
+  }
   display: flex;
   flex-direction: column;
   flex-shrink: 0;
   border-radius: 5px;
-  border: 1px solid #c8cad0;
-  background: #fff;
+  border: 1px solid var(--x-box-border-color);
+  background: var(--x-box-background-color);
   margin: 5px 5px 8px;
   width: 200px;
   height: 160px;
@@ -132,7 +141,7 @@ export const WarehouseBoxRoot = styled.div`
   position: relative;
 
   &:hover {
-    border-color: #0153cc;
+    border-color: var(--x-box-hover-border-color);
   }
 `;
 
@@ -143,9 +152,16 @@ export const WarehouseHeader = styled.div`
 `;
 
 export const WarehouseTitle = styled.div`
+  --x-title-color: #000;
+  --x-title-icon-color: #e1b31d;
+
+  .bp4-dark & {
+    --x-title-color: var(--color-light-gray5);
+    --x-title-icon-color: #e1b31d;
+  }
   font-size: 14px;
   font-style: inherit;
-  color: #000;
+  color: var(--x-title-color);
   white-space: nowrap;
   font-weight: 500;
   line-height: 1;
@@ -154,14 +170,19 @@ export const WarehouseTitle = styled.div`
     margin: 0;
     margin-left: 2px;
     vertical-align: top;
-    color: #e1b31d;
+    color: var(--x-title-icon-color);
   }
 `;
 
 const WarehouseCode = styled.div`
+  --x-code-color: #6b7176;
+
+  .bp4-dark & {
+    --x-code-color: var(--color-muted-text);
+  }
   display: block;
   font-size: 11px;
-  color: #6b7176;
+  color: var(--x-code-color);
   margin-top: 4px;
 `;
 
@@ -178,8 +199,13 @@ const WarehouseContent = styled.div`
 `;
 
 const WarehouseItem = styled.div`
+  --x-item-color: #000;
+
+  .bp4-dark & {
+    --x-item-color: var(--color-light-gray1);
+  }
   font-size: 11px;
-  color: #000;
+  color: var(--x-item-color);
   text-overflow: ellipsis;
   overflow: hidden;
 

packages/webapp/src/hooks/dashboard/useKeywordShortcuts.tsx

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import React from 'react';
-import keyboardShortcuts from '@/constants/keyboardShortcutsOptions';
+import { KeyboardShortcutsOptions } from '@/constants/keyboardShortcutsOptions';
 import { useAbilitiesFilter } from '../utils/useAbilityContext';
 
 /**
@@ -10,7 +10,7 @@ export const useKeywordShortcuts = () => {
   const abilitiesFilter = useAbilitiesFilter();
 
   return React.useMemo(
-    () => abilitiesFilter(keyboardShortcuts),
+    () => abilitiesFilter(KeyboardShortcutsOptions),
     [abilitiesFilter],
   );
 };

packages/webapp/src/hooks/useQueryRequest.tsx

@@ -3,6 +3,7 @@ import { useQuery } from 'react-query';
 import { castArray, defaultTo } from 'lodash';
 import { useAuthOrganizationId } from './state';
 import useApiRequest from './useRequest';
+import { normalizeApiPath } from '../utils';
 import { useRef } from 'react';
 
 /**
@@ -19,7 +20,11 @@ export function useRequestQuery(query, axios, props) {
 
   const states = useQuery(
     query,
-    () => apiRequest.http({ ...axios, url: `/api/${axios.url}` }),
+    () =>
+      apiRequest.http({
+        ...axios,
+        url: `/api/${normalizeApiPath(axios.url)}`,
+      }),
     props,
   );
   // Momerize the default data.

packages/webapp/src/hooks/useRequest.tsx

@@ -7,7 +7,7 @@ import {
   useSetGlobalErrors,
   useAuthToken,
 } from './state';
-import { getCookie } from '../utils';
+import { getCookie, normalizeApiPath } from '../utils';
 
 export default function useApiRequest() {
   const setGlobalErrors = useSetGlobalErrors();
@@ -93,27 +93,27 @@ export default function useApiRequest() {
       http,
 
       get(resource, params) {
-        return http.get(`/api/${resource}`, params);
+        return http.get(`/api/${normalizeApiPath(resource)}`, params);
       },
 
       post(resource, params, config) {
-        return http.post(`/api/${resource}`, params, config);
+        return http.post(`/api/${normalizeApiPath(resource)}`, params, config);
       },
 
       update(resource, slug, params) {
-        return http.put(`/api/${resource}/${slug}`, params);
+        return http.put(`/api/${normalizeApiPath(resource)}/${slug}`, params);
       },
 
       put(resource, params) {
-        return http.put(`/api/${resource}`, params);
+        return http.put(`/api/${normalizeApiPath(resource)}`, params);
       },
 
       patch(resource, params, config) {
-        return http.patch(`/api/${resource}`, params, config);
+        return http.patch(`/api/${normalizeApiPath(resource)}`, params, config);
       },
 
       delete(resource, params) {
-        return http.delete(`/api/${resource}`, params);
+        return http.delete(`/api/${normalizeApiPath(resource)}`, params);
       },
     }),
     [http],
@@ -130,22 +130,22 @@ export function useAuthApiRequest() {
     () => ({
       http,
       get(resource, params) {
-        return http.get(`/api/${resource}`, params);
+        return http.get(`/api/${normalizeApiPath(resource)}`, params);
       },
       post(resource, params, config) {
-        return http.post(`/api/${resource}`, params, config);
+        return http.post(`/api/${normalizeApiPath(resource)}`, params, config);
       },
       update(resource, slug, params) {
-        return http.put(`/api/${resource}/${slug}`, params);
+        return http.put(`/api/${normalizeApiPath(resource)}/${slug}`, params);
       },
       put(resource, params) {
-        return http.put(`/api/${resource}`, params);
+        return http.put(`/api/${normalizeApiPath(resource)}`, params);
       },
       patch(resource, params, config) {
-        return http.patch(`/api/${resource}`, params, config);
+        return http.patch(`/api/${normalizeApiPath(resource)}`, params, config);
       },
       delete(resource, params) {
-        return http.delete(`/api/${resource}`, params);
+        return http.delete(`/api/${normalizeApiPath(resource)}`, params);
       },
     }),
     [http],

packages/webapp/src/routes/preferences.tsx

@@ -11,7 +11,10 @@ export const getPreferenceRoutes = () => [
   },
   {
     path: `${BASE_URL}/branding`,
-    component: lazy(() => import('../containers/Preferences/Branding/PreferencesBrandingPage')),
+    component: lazy(
+      () =>
+        import('../containers/Preferences/Branding/PreferencesBrandingPage'),
+    ),
     exact: true,
   },
   {
@@ -29,14 +32,20 @@ export const getPreferenceRoutes = () => [
   {
     path: `${BASE_URL}/payment-methods`,
     component: lazy(
-      () => import('../containers/Preferences/PaymentMethods/PreferencesPaymentMethodsPage'),
+      () =>
+        import(
+          '../containers/Preferences/PaymentMethods/PreferencesPaymentMethodsPage'
+        ),
     ),
     exact: true,
   },
   {
     path: `${BASE_URL}/payment-methods/stripe/callback`,
     component: lazy(
-      () => import('../containers/Preferences/PaymentMethods/PreferencesStripeCallback'),
+      () =>
+        import(
+          '../containers/Preferences/PaymentMethods/PreferencesStripeCallback'
+        ),
     ),
     exact: true,
   },
@@ -112,16 +121,6 @@ export const getPreferenceRoutes = () => [
     component: lazy(() => import('@/containers/Preferences/Item')),
     exact: true,
   },
-  // {
-  //   path: `${BASE_URL}/sms-message`,
-  //   component: SMSIntegration,
-  //   exact: true,
-  // },
-  {
-    path: `${BASE_URL}/billing`,
-    component: lazy(() => import('@/containers/Subscriptions/BillingPage')),
-    exact: true,
-  },
   {
     path: `${BASE_URL}/api-keys`,
     component: lazy(() => import('@/containers/Preferences/ApiKeys/ApiKeys')),

packages/webapp/src/style/_variables.scss

@@ -196,7 +196,6 @@ $ns: bp4;
   --color-preferences-sidebar-head-border: #bbcbd0;
   --color-preferences-sidebar-head-text: #3b3b4c;
 
-
   // Preferences - Topbar.
   --color-preferences-topbar-background: #fff;
   --color-preferences-topbar-border: #d2dde2;
@@ -209,7 +208,7 @@ $ns: bp4;
   --color-financial-sheet-title-text: rgb(31, 50, 85);
   --color-financial-sheet-type-text: rgb(31, 50, 85);
   --color-financial-sheet-date-text: rgb(31, 50, 85);
-  --color-financial-sheet-footer-text: rgb(31, 50, 85);
+  --color-financial-sheet-footer-text: var(--color-muted-text);
   --color-financial-sheet-minimal-title-text: #333;
 
   // Transaction locking.
@@ -514,7 +513,7 @@ body.bp4-dark  {
   --color-financial-sheet-title-text: var(--color-light-gray1);
   --color-financial-sheet-type-text: var(--color-light-gray1);
   --color-financial-sheet-date-text: var(--color-light-gray1);
-  --color-financial-sheet-footer-text: var(--color-light-gray1);
+  --color-financial-sheet-footer-text: var(--color-muted-text);
   --color-financial-sheet-minimal-title-text: var(--color-white);
 
   // Transaction locking.

packages/webapp/src/style/components/DataTable/DataTable.scss

@@ -365,7 +365,7 @@
       border-bottom: 1px solid var(--color-datatable-constrant-head-border);
       padding: 0.5rem;
     }
-    
+
     .tbody .tr .td {
       background: transparent;
       padding: 0.5rem 0.5rem;
@@ -375,3 +375,32 @@
     }
   }
 }
+
+// Sticky header: blurred transparent background so body rows don't show through
+.bigcapital-datatable.has-sticky,
+.bigcapital-datatable.has-sticky-header {
+  &.table-constrant .table .thead .th,
+  &.table--constrant .table .thead .th {
+    background: rgba(255, 255, 255, 0.25);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+
+    body.bp4-dark & {
+      background: rgba(28, 33, 39, 0.6);
+    }
+  }
+}
+
+// Sticky cells in table body: blurred transparent background so content doesn't show through
+.bigcapital-datatable.has-sticky {
+  &.table-constrant .table .tbody .tr:not(:hover) .td[data-sticky-td],
+  &.table--constrant .table .tbody .tr:not(:hover) .td[data-sticky-td] {
+    background: rgba(255, 255, 255, 0.25);
+    backdrop-filter: blur(10px);
+    -webkit-backdrop-filter: blur(10px);
+
+    body.bp4-dark & {
+      background: rgba(28, 33, 39, 0.6);
+    }
+  }
+}

packages/webapp/src/utils/index.tsx

@@ -13,6 +13,9 @@ import jsCookie from 'js-cookie';
 import { deepMapKeys } from './map-key-deep';
 export * from './deep';
 
+/** Strips leading slash from a path segment to avoid double slashes when joining with a base (e.g. `/api/` + path). */
+export const normalizeApiPath = (path) => (path || '').replace(/^\//, '');
+
 export const getCookie = (name, defaultValue) =>
   _.defaultTo(jsCookie.get(name), defaultValue);
 

pnpm-lock.yaml

@@ -54,6 +54,15 @@ importers:
       '@bigcapital/utils':
         specifier: '*'
         version: link:../../shared/bigcapital-utils
+      '@bull-board/api':
+        specifier: ^5.22.0
+        version: 5.23.0(@bull-board/ui@5.23.0)
+      '@bull-board/express':
+        specifier: ^5.22.0
+        version: 5.23.0
+      '@bull-board/nestjs':
+        specifier: ^5.22.0
+        version: 5.23.0(@bull-board/api@5.23.0)(@bull-board/express@5.23.0)(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(reflect-metadata@0.2.2)(rxjs@7.8.1)
       '@casl/ability':
         specifier: ^5.4.3
         version: 5.4.4
@@ -4855,6 +4864,51 @@ packages:
       tslib: 2.5.3
     dev: false
 
+  /@bull-board/api@5.23.0(@bull-board/ui@5.23.0):
+    resolution: {integrity: sha512-ZZGsWJ+XBG49GAlNgAL9tTEV6Ms7gMkQnZDbzwUhjGChCKWy62RWuPoZSefNXau9QH9+QzlzHRUeFvt4xr5wiw==}
+    peerDependencies:
+      '@bull-board/ui': 5.23.0
+    dependencies:
+      '@bull-board/ui': 5.23.0
+      redis-info: 3.1.0
+    dev: false
+
+  /@bull-board/express@5.23.0:
+    resolution: {integrity: sha512-t/mHzJMlZBtSKD8v81kbZoexOmtQxKVnHZfHJ0um5vrkHNJJuzKuwbR+n9nf1u89AGdyXoWxqDhBDslxv3zrrQ==}
+    dependencies:
+      '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0)
+      '@bull-board/ui': 5.23.0
+      ejs: 3.1.10
+      express: 4.21.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
+  /@bull-board/nestjs@5.23.0(@bull-board/api@5.23.0)(@bull-board/express@5.23.0)(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)(reflect-metadata@0.2.2)(rxjs@7.8.1):
+    resolution: {integrity: sha512-eRJCz6PqKzrlZfd7akc+6/1eXwNO7Fp468TmSo8avlPcKhStZH3fUmCF6xxfRQpm9kn/eDOp+H18CTnSafmwmw==}
+    peerDependencies:
+      '@bull-board/api': ^5.23.0
+      '@bull-board/express': ^5.23.0
+      '@nestjs/common': ^9.0.0 || ^10.0.0
+      '@nestjs/core': ^9.0.0 || ^10.0.0
+      reflect-metadata: ^0.1.13 || ^0.2.0
+      rxjs: ^7.8.1
+    dependencies:
+      '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0)
+      '@bull-board/express': 5.23.0
+      '@nestjs/bull-shared': 10.2.2(@nestjs/common@10.4.7)(@nestjs/core@10.4.7)
+      '@nestjs/common': 10.4.7(class-transformer@0.5.1)(class-validator@0.14.1)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      '@nestjs/core': 10.4.7(@nestjs/common@10.4.7)(@nestjs/platform-express@10.4.7)(@nestjs/websockets@10.4.20)(reflect-metadata@0.2.2)(rxjs@7.8.1)
+      reflect-metadata: 0.2.2
+      rxjs: 7.8.1
+    dev: false
+
+  /@bull-board/ui@5.23.0:
+    resolution: {integrity: sha512-iI/Ssl8T5ZEn9s899Qz67m92M6RU8thf/aqD7cUHB2yHmkCjqbw7s7NaODTsyArAsnyu7DGJMWm7EhbfFXDNgQ==}
+    dependencies:
+      '@bull-board/api': 5.23.0(@bull-board/ui@5.23.0)
+    dev: false
+
   /@casl/ability@5.4.4:
     resolution: {integrity: sha512-7+GOnMUq6q4fqtDDesymBXTS9LSDVezYhFiSJ8Rn3f0aQLeRm7qHn66KWbej4niCOvm0XzNj9jzpkK0yz6hUww==}
     dependencies:
@@ -15466,7 +15520,6 @@ packages:
     hasBin: true
     dependencies:
       jake: 10.9.1
-    dev: true
 
   /electron-to-chromium@1.4.782:
     resolution: {integrity: sha512-JUfU61e8tr+i5Y1FKXcKs+Xe+rJ+CEqm4cgv1kMihPE2EvYHmYyVr3Im/+1+Z5B29Be2EEGCZCwAc6Tazdl1Yg==}
@@ -16741,7 +16794,6 @@ packages:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.6
-    dev: true
 
   /fill-range@7.1.1:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
@@ -18481,7 +18533,6 @@ packages:
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
-    dev: true
 
   /javascript-natural-sort@0.7.1:
     resolution: {integrity: sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==}
@@ -20042,7 +20093,6 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
   /minimatch@8.0.4:
     resolution: {integrity: sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==}
@@ -23172,6 +23222,12 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
+  /redis-info@3.1.0:
+    resolution: {integrity: sha512-ER4L9Sh/vm63DkIE0bkSjxluQlioBiBgf5w1UuldaW/3vPcecdljVDisZhmnCMvsxHNiARTTDDHGg9cGwTfrKg==}
+    dependencies:
+      lodash: 4.17.21
+    dev: false
+
   /redis-parser@3.0.0:
     resolution: {integrity: sha512-DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==}
     engines: {node: '>=4'}

setup.sh

@@ -2,7 +2,6 @@
 # Initialize the essential variables.
 BRANCH=main
 CURRENT=$PWD
-BIGCAPITAL_INSTALL_DIR=$PWD/bigcapital-$(echo $BRANCH | sed -r 's@(\/|" "|\.)@-@g')
 BIGCAPITAL_CLONE_TEMP_DIR=$(mktemp -d)
 CPU_ARCH=$(uname -m)
 
@@ -20,8 +19,6 @@ else
     COMPOSE_CMD="docker compose"
 fi
 
-REPO=https://github.com/bigcapitalhq/bigcapital
-
 # Prints the Bigcapital logo once running the script.
 function print_logo() {
 clear
@@ -142,8 +139,8 @@ function askForAction() {
 }
 
 function install() {
-    echo "Installing Bigcaoital.........."
-    echo "installing is going to take few mintues..."
+    echo "Installing Bigcapital.........."
+    echo "installing is going to take few minutes..."
     download
     setup_env
 }
@@ -203,10 +200,11 @@ function startServices() {
     done
     printf "\r\033[K"
     echo "   API server started successfully ✅"
-    source "${DOCKER_ENV_PATH}"
+    ACCESS_URL=$(grep -E '^BASE_URL=' "$DOCKER_ENV_PATH" 2>/dev/null | cut -d= -f2-)
+    [ -z "$ACCESS_URL" ] && ACCESS_URL="http://localhost"
     echo "   Bigcapital server started successfully ✅"
     echo ""
-    echo "   You can access the application at $WEB_URL"
+    echo "   You can access the application at $ACCESS_URL"
     echo ""
 
 }
@@ -223,20 +221,19 @@ function restartServices() {
 }
 
 function viewLogs(){
-    ARG_SERVICE_NAME=$2
         echo
         echo "Select a Service you want to view the logs for:"
         echo "   1) Webapp"
         echo "   2) API"
         echo "   3) Migration"
-        echo "   4) Nginx Proxy"
+        echo "   4) Envoy Proxy"
         echo "   5) MariaDB"
         echo "   0) Back to Main Menu"
         echo 
         read -p "Service: " DOCKER_SERVICE_NAME
 
         until (( DOCKER_SERVICE_NAME >= 0 && DOCKER_SERVICE_NAME <= 5 )); do
-            echo "Invalid selection. Please enter a number between 1 and 11."
+            echo "Invalid selection. Please enter a number between 0 and 5."
             read -p "Service: " DOCKER_SERVICE_NAME
         done
 
@@ -248,7 +245,7 @@ function viewLogs(){
                 1) viewSpecificLogs "webapp";;
                 2) viewSpecificLogs "server";;
                 3) viewSpecificLogs "database_migration";;
-                4) viewSpecificLogs "nginx";;
+                4) viewSpecificLogs "proxy";;
                 5) viewSpecificLogs "mysql";;
                 0) askForAction;;
                 *) echo "INVALID SERVICE NAME SUPPLIED";;