fix: Getting the sheet columns in import sheet

fix: Typo one-click demo page

packages/server/package.json

@@ -37,6 +37,7 @@
     "agendash": "^3.1.0",
     "app-root-path": "^3.0.0",
     "async": "^3.2.0",
+    "async-mutex": "^0.5.0",
     "axios": "^1.6.0",
     "babel-loader": "^9.1.2",
     "bcryptjs": "^2.4.3",

packages/server/src/api/controllers/Banking/ExcludeBankTransactionsController.ts

@@ -46,6 +46,10 @@ export class ExcludeBankTransactionsController extends BaseController {
         query('account_id').optional().isNumeric().toInt(),
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
+        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+        query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
       ],
       this.validationResult,
       this.getExcludedBankTransactions.bind(this)

packages/server/src/api/controllers/Banking/RecognizedTransactionsController.ts

@@ -21,6 +21,10 @@ export class RecognizedTransactionsController extends BaseController {
         query('page').optional().isNumeric().toInt(),
         query('page_size').optional().isNumeric().toInt(),
         query('account_id').optional().isNumeric().toInt(),
+        query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+        query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+        query('max_amount').optional({ nullable: true }).isFloat().isFloat(),
       ],
       this.validationResult,
       this.getRecognizedTransactions.bind(this)

packages/server/src/api/controllers/Cashflow/NewCashflowTransaction.ts

@@ -84,6 +84,10 @@ export default class NewCashflowTransactionController extends BaseController {
       param('id').exists().isNumeric().toInt(),
       query('page').optional().isNumeric().toInt(),
       query('page_size').optional().isNumeric().toInt(),
+      query('min_date').optional({ nullable: true }).isISO8601().toDate(),
+      query('max_date').optional({ nullable: true }).isISO8601().toDate(),
+      query('min_amount').optional({ nullable: true }).isFloat().toFloat(),
+      query('max_amount').optional({ nullable: true }).isFloat().toFloat(),
     ];
   }
 

packages/server/src/api/controllers/Subscription/SubscriptionController.ts

@@ -113,7 +113,7 @@ export class SubscriptionController extends BaseController {
     const { tenantId } = req;
 
     try {
-      await this.subscriptionApp.cancelSubscription(tenantId, '455610');
+      await this.subscriptionApp.cancelSubscription(tenantId);
 
       return res.status(200).send({
         status: 200,

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

@@ -35,7 +35,7 @@ export class Webhooks extends BaseController {
    */
   public async lemonWebhooks(req: Request, res: Response, next: NextFunction) {
     const data = req.body;
-    const signature = req.headers['x-signature'] ?? '';
+    const signature = req.headers['x-signature'] as string ?? '';
     const rawBody = req.rawBody;
 
     try {

packages/server/src/config/index.ts

@@ -246,8 +246,11 @@ module.exports = {
     apiKey: process.env.LOOPS_API_KEY,
   },
 
-  oneClickDemoAccounts: parseBoolean(
+  /**
-    process.env.ONE_CLICK_DEMO_ACCOUNTS,
+   * One-click demo accounts.
-    false
+   */
-  ),
+  oneClickDemoAccounts: {
+    enable: parseBoolean(process.env.ONE_CLICK_DEMO_ACCOUNTS, false),
+    demoUrl: process.env.ONE_CLICK_DEMO_ACCOUNTS_URL || '',
+  },
 };

packages/server/src/database/seeds/core/20200810121809_seed_settings.ts

@@ -15,6 +15,7 @@ export default class SeedSettings extends TenantSeeder {
 
       // Manual journals settings.
       { group: 'manual_journals', key: 'next_number', value: '00001' },
+      { group: 'manual_journals', key: 'number_prefix', value: 'J-' },
       { group: 'manual_journals', key: 'auto_increment', value: true },
 
       // Sale invoices settings.

packages/server/src/interfaces/Authentication.ts

@@ -76,6 +76,10 @@ export interface IAuthSendedResetPassword {
 
 export interface IAuthGetMetaPOJO {
   signupDisabled: boolean;
+  oneClickDemo: {
+    enable: boolean;
+    demoUrl: string;
+  };
 }
 
 export interface IAuthSignUpVerifingEventPayload {

packages/server/src/interfaces/CashflowService.ts

@@ -167,11 +167,18 @@ export interface CategorizeTransactionAsExpenseDTO {
 export interface IGetUncategorizedTransactionsQuery {
   page?: number;
   pageSize?: number;
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
 }
 
-
 export interface IGetRecognizedTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
 }

packages/server/src/interfaces/Import.ts

@@ -3,6 +3,6 @@ import { ImportFilePreviewPOJO } from "@/services/Import/interfaces";
 
 export interface IImportFileCommitedEventPayload {
   tenantId: number;
-  importId: number;
+  importId: string;
   meta: ImportFilePreviewPOJO;
 }

packages/server/src/interfaces/Subscription.ts

@@ -0,0 +1,8 @@
+export interface SubscriptionPayload {
+  lemonSqueezyId?: string;
+}
+
+export enum SubscriptionPaymentStatus {
+  Succeed = 'succeed',
+  Failed = 'failed',
+}

packages/server/src/interfaces/index.ts

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

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

@@ -2,6 +2,7 @@ import moment from 'moment';
 import * as R from 'ramda';
 import { includes, isFunction, isObject, isUndefined, omit } from 'lodash';
 import { formatNumber, sortObjectKeysAlphabetically } from 'utils';
+import { EXPORT_DTE_FORMAT } from '@/services/Export/constants';
 
 export class Transformer {
   public context: any;
@@ -156,22 +157,34 @@ export class Transformer {
   }
 
   /**
-   *
+   * Format date.
-   * @param date
+   * @param {} date
-   * @returns
+   * @param {string} format -
+   * @returns {}
    */
-  protected formatDate(date) {
+  protected formatDate(date, format?: string) {
-    return date ? moment(date).format(this.dateFormat) : '';
+    // Use the export date format if the async operation is in exporting,
+    // otherwise use the given or default format.
+    const _format = this.context.exportAls.isExport
+      ? EXPORT_DTE_FORMAT
+      : format || this.dateFormat;
+
+    return date ? moment(date).format(_format) : '';
   }
 
-  protected formatDateFromNow(date){
+  /**
+   *
+   * @param date
+   * @returns {}
+   */
+  protected formatDateFromNow(date) {
     return date ? moment(date).fromNow(true) : '';
   }
 
   /**
    *
    * @param number
-   * @returns
+   * @returns {}
    */
   protected formatNumber(number, props?) {
     return formatNumber(number, { money: false, ...props });
@@ -181,7 +194,7 @@ export class Transformer {
    *
    * @param money
    * @param options
-   * @returns
+   * @returns {}
    */
   protected formatMoney(money, options?) {
     return formatNumber(money, {

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

@@ -3,12 +3,17 @@ import { isNull } from 'lodash';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { TenantMetadata } from '@/system/models';
 import { Transformer } from './Transformer';
+import { ImportAls } from '@/services/Import/ImportALS';
+import { ExportAls } from '@/services/Export/ExportAls';
 
 @Service()
 export class TransformerInjectable {
   @Inject()
   private tenancy: HasTenancyService;
 
+  @Inject()
+  private exportAls: ExportAls;
+
   /**
    * Retrieves the application context of all tenant transformers.
    * @param   {number} tenantId
@@ -17,10 +22,12 @@ export class TransformerInjectable {
   async getApplicationContext(tenantId: number) {
     const i18n = this.tenancy.i18n(tenantId);
     const organization = await TenantMetadata.query().findOne({ tenantId });
+    const exportAls = this.exportAls;
 
     return {
       organization,
       i18n,
+      exportAls,
     };
   }
 

packages/server/src/loaders/eventEmitter.ts

@@ -117,6 +117,7 @@ import { DisconnectPlaidItemOnAccountDeleted } from '@/services/Banking/BankAcco
 import { LoopsEventsSubscriber } from '@/services/Loops/LoopsEventsSubscriber';
 import { DeleteUncategorizedTransactionsOnAccountDeleting } from '@/services/Banking/BankAccounts/events/DeleteUncategorizedTransactionsOnAccountDeleting';
 import { SeedInitialDemoAccountDataOnOrgBuild } from '@/services/OneClickDemo/events/SeedInitialDemoAccountData';
+import { TriggerInvalidateCacheOnSubscriptionChange } from '@/services/Subscription/events/TriggerInvalidateCacheOnSubscriptionChange';
 
 export default () => {
   return new EventPublisher();
@@ -247,8 +248,10 @@ export const susbcribers = () => {
     DeleteCashflowTransactionOnUncategorize,
     PreventDeleteTransactionOnDelete,
 
+    // Subscription
     SubscribeFreeOnSignupCommunity,
     SendVerfiyMailOnSignUp,
+    TriggerInvalidateCacheOnSubscriptionChange,
 
     // Attachments
     AttachmentsOnSaleInvoiceCreated,
@@ -282,9 +285,9 @@ export const susbcribers = () => {
     DeleteUncategorizedTransactionsOnAccountDeleting,
 
     // Loops
-    LoopsEventsSubscriber
+    LoopsEventsSubscriber,
 
     // Demo Account
-    SeedInitialDemoAccountDataOnOrgBuild
+    SeedInitialDemoAccountDataOnOrgBuild,
   ];
 };

packages/server/src/models/Customer.Settings.ts

@@ -95,6 +95,11 @@ export default {
     },
   },
   columns: {
+    customerType: {
+      name: 'Customer Type',
+      type: 'text',
+      accessor: 'formattedCustomerType',
+    },
     firstName: {
       name: 'vendor.field.first_name',
       type: 'text',
@@ -135,116 +140,117 @@ export default {
     openingBalance: {
       name: 'vendor.field.opening_balance',
       type: 'number',
-      printable: false
+      printable: false,
     },
     openingBalanceAt: {
       name: 'vendor.field.opening_balance_at',
       type: 'date',
-      printable: false
+      printable: false,
+      accessor: 'formattedOpeningBalanceAt'
     },
     currencyCode: {
       name: 'vendor.field.currency',
       type: 'text',
-      printable: false
+      printable: false,
     },
     status: {
       name: 'vendor.field.status',
-      printable: false
+      printable: false,
     },
     note: {
       name: 'vendor.field.note',
-      printable: false
+      printable: false,
     },
     // Billing Address
     billingAddress1: {
       name: 'Billing Address 1',
       column: 'billing_address1',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddress2: {
       name: 'Billing Address 2',
       column: 'billing_address2',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddressCity: {
       name: 'Billing Address City',
       column: 'billing_address_city',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddressCountry: {
       name: 'Billing Address Country',
       column: 'billing_address_country',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddressPostcode: {
       name: 'Billing Address Postcode',
       column: 'billing_address_postcode',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddressState: {
       name: 'Billing Address State',
       column: 'billing_address_state',
       type: 'text',
-      printable: false
+      printable: false,
     },
     billingAddressPhone: {
       name: 'Billing Address Phone',
       column: 'billing_address_phone',
       type: 'text',
-      printable: false
+      printable: false,
     },
     // Shipping Address
     shippingAddress1: {
       name: 'Shipping Address 1',
       column: 'shipping_address1',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddress2: {
       name: 'Shipping Address 2',
       column: 'shipping_address2',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddressCity: {
       name: 'Shipping Address City',
       column: 'shipping_address_city',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddressCountry: {
       name: 'Shipping Address Country',
       column: 'shipping_address_country',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddressPostcode: {
       name: 'Shipping Address Postcode',
       column: 'shipping_address_postcode',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddressPhone: {
       name: 'Shipping Address Phone',
       column: 'shipping_address_phone',
       type: 'text',
-      printable: false
+      printable: false,
     },
     shippingAddressState: {
       name: 'Shipping Address State',
       column: 'shipping_address_state',
       type: 'text',
-      printable: false
+      printable: false,
     },
     createdAt: {
       name: 'vendor.field.created_at',
       type: 'date',
-      printable: false
+      printable: false,
     },
   },
   fields2: {

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -1,8 +1,8 @@
 /* eslint-disable global-require */
+import moment from 'moment';
 import { Model, mixin } from 'objection';
 import TenantModel from 'models/TenantModel';
 import ModelSettings from './ModelSetting';
-import Account from './Account';
 import UncategorizedCashflowTransactionMeta from './UncategorizedCashflowTransaction.meta';
 
 export default class UncategorizedCashflowTransaction extends mixin(
@@ -166,6 +166,28 @@ export default class UncategorizedCashflowTransaction extends mixin(
       pending(query) {
         query.where('pending', true);
       },
+
+      minAmount(query, minAmount) {
+        query.where('amount', '>=', minAmount);
+      },
+
+      maxAmount(query, maxAmount) {
+        query.where('amount', '<=', maxAmount);
+      },
+
+      toDate(query, toDate) {
+        const dateFormat = 'YYYY-MM-DD';
+        const _toDate = moment(toDate).endOf('day').format(dateFormat);
+
+        query.where('date', '<=', _toDate);
+      },
+
+      fromDate(query, fromDate) {
+        const dateFormat = 'YYYY-MM-DD';
+        const _fromDate = moment(fromDate).startOf('day').format(dateFormat);
+
+        query.where('date', '>=', _fromDate);
+      },
     };
   }
 

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { AccountsApplication } from './AccountsApplication';
 import { Exportable } from '../Export/Exportable';
 import { IAccountsFilter, IAccountsStructureType } from '@/interfaces';
+import { EXPORT_SIZE_LIMIT } from '../Export/constants';
 
 @Service()
 export class AccountsExportable extends Exportable {
@@ -20,7 +21,7 @@ export class AccountsExportable extends Exportable {
       inactiveMode: false,
       ...query,
       structure: IAccountsStructureType.Flat,
-      pageSize: 12000,
+      pageSize: EXPORT_SIZE_LIMIT,
       page: 1,
     } as IAccountsFilter;
 

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

@@ -11,6 +11,10 @@ export class GetAuthMeta {
   public async getAuthMeta(): Promise<IAuthGetMetaPOJO> {
     return {
       signupDisabled: config.signupRestrictions.disabled,
+      oneClickDemo: {
+        enable: config.oneClickDemoAccounts.enable,
+        demoUrl: config.oneClickDemoAccounts.demoUrl,
+      },
     };
   }
 }

packages/server/src/services/Banking/Exclude/GetExcludedBankTransactions.ts

@@ -1,5 +1,6 @@
-import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
+import moment from 'moment';
+import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { ExcludedBankTransactionsQuery } from './_types';
 import { UncategorizedTransactionTransformer } from '@/services/Cashflow/UncategorizedTransactionTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
@@ -39,6 +40,18 @@ export class GetExcludedBankTransactionsService {
           if (_query.accountId) {
             q.where('account_id', _query.accountId);
           }
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Banking/Exclude/_types.ts

@@ -4,6 +4,10 @@ export interface ExcludedBankTransactionsQuery {
   page?: number;
   pageSize?: number;
   accountId?: number;
+  minDate?: Date;
+  maxDate?: Date;
+  minAmount?: number;
+  maxAmount?: number;
 }
 
 export interface IBankTransactionUnexcludingEventPayload {

packages/server/src/services/Banking/RegonizeTranasctions/events/TriggerRecognizedTransactions.ts

@@ -100,7 +100,6 @@ export class TriggerRecognizedTransactions {
   private async triggerRecognizeTransactionsOnImportCommitted({
     tenantId,
     importId,
-    meta,
   }: IImportFileCommitedEventPayload) {
     const importFile = await Import.query().findOne({ importId });
     const batch = importFile.paramsParsed.batch;

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

@@ -23,7 +23,7 @@ export class GetRecognizedTransactionsService {
   ) {
     const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const _filter = {
+    const _query = {
       page: 1,
       pageSize: 20,
       ...filter,
@@ -41,11 +41,26 @@ export class GetRecognizedTransactionsService {
           // Exclude the pending transactions.
           q.modify('notPending');
 
-          if (_filter.accountId) {
+          if (_query.accountId) {
-            q.where('accountId', _filter.accountId);
+            q.where('accountId', _query.accountId);
+          }
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
+          if (_query.accountId) {
+            q.where('accountId', _query.accountId);
           }
         })
-        .pagination(_filter.page - 1, _filter.pageSize);
+        .pagination(_query.page - 1, _query.pageSize);
 
     const data = await this.transformer.transform(
       tenantId,

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

@@ -62,6 +62,19 @@ export class GetUncategorizedTransactions {
 
           q.whereNull('matchedBankTransactions.id');
           q.orderBy('date', 'DESC');
+
+          if (_query.minDate) {
+            q.modify('fromDate', _query.minDate);
+          }
+          if (_query.maxDate) {
+            q.modify('toDate', _query.maxDate);
+          }
+          if (_query.minAmount) {
+            q.modify('minAmount', _query.minAmount);
+          }
+          if (_query.maxAmount) {
+            q.modify('maxAmount', _query.maxAmount);
+          }
         })
         .pagination(_query.page - 1, _query.pageSize);
 

packages/server/src/services/Contacts/Customers/CustomersExportable.ts

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { IItemsFilter } from '@/interfaces';
 import { CustomersApplication } from './CustomersApplication';
 import { Exportable } from '@/services/Export/Exportable';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class CustomersExportable extends Exportable {
@@ -17,9 +18,9 @@ export class CustomersExportable extends Exportable {
     const parsedQuery = {
       sortOrder: 'DESC',
       columnSortBy: 'created_at',
-      page: 1,
       ...query,
-      pageSize: 12,
+      page: 1,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IItemsFilter;
 
     return this.customersApplication

packages/server/src/services/Contacts/Vendors/VendorsExportable.ts

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { IItemsFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { VendorsApplication } from './VendorsApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class VendorsExportable extends Exportable {
@@ -17,9 +18,9 @@ export class VendorsExportable extends Exportable {
     const parsedQuery = {
       sortOrder: 'DESC',
       columnSortBy: 'created_at',
-      page: 1,
       ...query,
-      pageSize: 12,
+      page: 1,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IItemsFilter;
 
     return this.vendorsApplication

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { Exportable } from '../Export/Exportable';
 import { IExpensesFilter } from '@/interfaces';
 import { ExpensesApplication } from './ExpensesApplication';
+import { EXPORT_SIZE_LIMIT } from '../Export/constants';
 
 @Service()
 export class ExpensesExportable extends Exportable {
@@ -19,7 +20,7 @@ export class ExpensesExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 12000,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IExpensesFilter;
 
     return this.expensesApplication

packages/server/src/services/Export/ExportAls.ts

@@ -0,0 +1,48 @@
+import { Service } from 'typedi';
+import { AsyncLocalStorage } from 'async_hooks';
+
+@Service()
+export class ExportAls {
+  private als: AsyncLocalStorage<Map<string, any>>;
+
+  constructor() {
+    this.als = new AsyncLocalStorage();
+  }
+
+  /**
+   * Runs a callback function within the context of a new AsyncLocalStorage store.
+   * @param callback The function to be executed within the AsyncLocalStorage context.
+   * @returns The result of the callback function.
+   */
+  public run<T>(callback: () => T): T {
+    return this.als.run<T>(new Map(), () => {
+      this.markAsExport();
+
+      return callback();
+    });
+  }
+
+  /**
+   * Retrieves the current AsyncLocalStorage store.
+   * @returns The current store or undefined if not in a valid context.
+   */
+  public getStore(): Map<string, any> | undefined {
+    return this.als.getStore();
+  }
+
+  /**
+   * Marks the current context as an export operation.
+   * @param flag Boolean flag to set or unset the export status. Defaults to true.
+   */
+  public markAsExport(flag: boolean = true): void {
+    const store = this.getStore();
+    store?.set('isExport', flag);
+  }
+  /**
+   * Checks if the current context is an export operation.
+   * @returns {boolean} True if the context is an export operation, false otherwise.
+   */
+  public get isExport(): boolean {
+    return !!this.getStore()?.get('isExport');
+  }
+}

packages/server/src/services/Export/ExportService.ts

@@ -10,6 +10,7 @@ import { Errors, ExportFormat } from './common';
 import { IModelMeta, IModelMetaColumn } from '@/interfaces';
 import { flatDataCollections, getDataAccessor } from './utils';
 import { ExportPdf } from './ExportPdf';
+import { ExportAls } from './ExportAls';
 
 @Service()
 export class ExportResourceService {
@@ -22,13 +23,33 @@ export class ExportResourceService {
   @Inject()
   private exportPdf: ExportPdf;
 
+  @Inject()
+  private exportAls: ExportAls;
+
+  /**
+   *
+   * @param {number} tenantId
+   * @param {string} resourceName
+   * @param {ExportFormat} format
+   * @returns
+   */
+  public async export(
+    tenantId: number,
+    resourceName: string,
+    format: ExportFormat = ExportFormat.Csv
+  ) {
+    return this.exportAls.run(() =>
+      this.exportAlsRun(tenantId, resourceName, format)
+    );
+  }
+
   /**
    * Exports the given resource data through csv, xlsx or pdf.
    * @param {number} tenantId - Tenant id.
    * @param {string} resourceName - Resource name.
    * @param {ExportFormat} format - File format.
    */
-  public async export(
+  public async exportAlsRun(
     tenantId: number,
     resourceName: string,
     format: ExportFormat = ExportFormat.Csv

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

@@ -0,0 +1,2 @@
+export const EXPORT_SIZE_LIMIT = 9999999;
+export const EXPORT_DTE_FORMAT = 'YYYY-MM-DD';

packages/server/src/services/Import/ImportALS.ts

@@ -0,0 +1,105 @@
+import { Service } from 'typedi';
+import { AsyncLocalStorage } from 'async_hooks';
+
+@Service()
+export class ImportAls {
+  private als: AsyncLocalStorage<Map<string, any>>;
+
+  constructor() {
+    this.als = new AsyncLocalStorage();
+  }
+
+  /**
+   * Runs a callback function within the context of a new AsyncLocalStorage store.
+   * @param callback The function to be executed within the AsyncLocalStorage context.
+   * @returns The result of the callback function.
+   */
+  public run<T>(callback: () => T): T {
+    return this.als.run<T>(new Map(), callback);
+  }
+
+  /**
+   * Runs a callback function in preview mode within the AsyncLocalStorage context.
+   * @param callback The function to be executed in preview mode.
+   * @returns The result of the callback function.
+   */
+  public runPreview<T>(callback: () => T): T {
+    return this.run(() => {
+      this.markAsImport();
+      this.markAsImportPreview();
+      return callback();
+    });
+  }
+
+  /**
+   * Runs a callback function in commit mode within the AsyncLocalStorage context.
+   * @param {() => T} callback - The function to be executed in commit mode.
+   * @returns {T} The result of the callback function.
+   */
+  public runCommit<T>(callback: () => T): T {
+    return this.run(() => {
+      this.markAsImport();
+      this.markAsImportCommit();
+      return callback();
+    });
+  }
+
+  /**
+   * Retrieves the current AsyncLocalStorage store.
+   * @returns The current store or undefined if not in a valid context.
+   */
+  public getStore(): Map<string, any> | undefined {
+    return this.als.getStore();
+  }
+
+  /**
+   * Marks the current context as an import operation.
+   * @param flag Boolean flag to set or unset the import status. Defaults to true.
+   */
+  public markAsImport(flag: boolean = true): void {
+    const store = this.getStore();
+    store?.set('isImport', flag);
+  }
+
+  /**
+   * Marks the current context as an import commit operation.
+   * @param flag Boolean flag to set or unset the import commit status. Defaults to true.
+   */
+  public markAsImportCommit(flag: boolean = true): void {
+    const store = this.getStore();
+    store?.set('isImportCommit', flag);
+  }
+
+  /**
+   * Marks the current context as an import preview operation.
+   * @param {boolean} flag - Boolean flag to set or unset the import preview status. Defaults to true.
+   */
+  public markAsImportPreview(flag: boolean = true): void {
+    const store = this.getStore();
+    store?.set('isImportPreview', flag);
+  }
+
+  /**
+   * Checks if the current context is an import operation.
+   * @returns {boolean} True if the context is an import operation, false otherwise.
+   */
+  public get isImport(): boolean {
+    return !!this.getStore()?.get('isImport');
+  }
+
+  /**
+   * Checks if the current context is an import commit operation.
+   * @returns {boolean} True if the context is an import commit operation, false otherwise.
+   */
+  public get isImportCommit(): boolean {
+    return !!this.getStore()?.get('isImportCommit');
+  }
+
+  /**
+   * Checks if the current context is an import preview operation.
+   * @returns {boolean} True if the context is an import preview operation, false otherwise.
+   */
+  public get isImportPreview(): boolean {
+    return !!this.getStore()?.get('isImportPreview');
+  }
+}

packages/server/src/services/Import/ImportFileCommon.ts

@@ -1,4 +1,3 @@
-import XLSX from 'xlsx';
 import bluebird from 'bluebird';
 import * as R from 'ramda';
 import { Inject, Service } from 'typedi';
@@ -28,22 +27,6 @@ export class ImportFileCommon {
   @Inject()
   private resource: ResourceService;
   
-  /**
-   * Maps the columns of the imported data based on the provided mapping attributes.
-   * @param {Record<string, any>[]} body - The array of data objects to map.
-   * @param {ImportMappingAttr[]} map - The mapping attributes.
-   * @returns {Record<string, any>[]} - The mapped data objects.
-   */
-  public parseXlsxSheet(buffer: Buffer): Record<string, unknown>[] {
-    const workbook = XLSX.read(buffer, { type: 'buffer', raw: true });
-
-    const firstSheetName = workbook.SheetNames[0];
-    const worksheet = workbook.Sheets[firstSheetName];
-
-    return XLSX.utils.sheet_to_json(worksheet, {});
-  }
-
-
   /**
    * Imports the given parsed data to the resource storage through registered importable service.
    * @param {number} tenantId -

packages/server/src/services/Import/ImportFilePreview.ts

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import HasTenancyService from '../Tenancy/TenancyService';
 import { ImportFilePreviewPOJO } from './interfaces';
 import { ImportFileProcess } from './ImportFileProcess';
+import { ImportAls } from './ImportALS';
 
 @Service()
 export class ImportFilePreview {
@@ -11,13 +12,31 @@ export class ImportFilePreview {
   @Inject()
   private importFile: ImportFileProcess;
 
+  @Inject()
+  private importAls: ImportAls;
+
+  /**
+   * Preview the imported file results before commiting the transactions.
+   * @param {number} tenantId - 
+   * @param {string} importId - 
+   * @returns {Promise<ImportFilePreviewPOJO>}
+   */
+  public async preview(
+    tenantId: number,
+    importId: string
+  ): Promise<ImportFilePreviewPOJO> {
+    return this.importAls.runPreview<Promise<ImportFilePreviewPOJO>>(() =>
+      this.previewAlsRun(tenantId, importId)
+    );
+  }
+
   /**
    * Preview the imported file results before commiting the transactions.
    * @param {number} tenantId
    * @param {number} importId
    * @returns {Promise<ImportFilePreviewPOJO>}
    */
-  public async preview(
+  public async previewAlsRun(
     tenantId: number,
     importId: string
   ): Promise<ImportFilePreviewPOJO> {

packages/server/src/services/Import/ImportFileProcess.ts

@@ -2,18 +2,14 @@ import { Inject, Service } from 'typedi';
 import { chain } from 'lodash';
 import { Knex } from 'knex';
 import { ServiceError } from '@/exceptions';
-import {
+import { ERRORS, getUnmappedSheetColumns, readImportFile } from './_utils';
-  ERRORS,
-  getSheetColumns,
-  getUnmappedSheetColumns,
-  readImportFile,
-} from './_utils';
 import { ImportFileCommon } from './ImportFileCommon';
 import { ImportFileDataTransformer } from './ImportFileDataTransformer';
 import ResourceService from '../Resource/ResourceService';
 import UnitOfWork from '../UnitOfWork';
 import { ImportFilePreviewPOJO } from './interfaces';
 import { Import } from '@/system/models';
+import { parseSheetData } from './sheet_utils';
 
 @Service()
 export class ImportFileProcess {
@@ -49,10 +45,10 @@ export class ImportFileProcess {
     if (!importFile.isMapped) {
       throw new ServiceError(ERRORS.IMPORT_FILE_NOT_MAPPED);
     }
-    // Read the imported file.
+    // Read the imported file and parse the given buffer to get columns
+    // and sheet data in json format.
     const buffer = await readImportFile(importFile.filename);
-    const sheetData = this.importCommon.parseXlsxSheet(buffer);
+    const [sheetData, sheetColumns] = parseSheetData(buffer);
-    const header = getSheetColumns(sheetData);
 
     const resource = importFile.resource;
     const resourceFields = this.resource.getResourceFields2(tenantId, resource);
@@ -87,7 +83,7 @@ export class ImportFileProcess {
       .flatten()
       .value();
 
-    const unmappedColumns = getUnmappedSheetColumns(header, mapping);
+    const unmappedColumns = getUnmappedSheetColumns(sheetColumns, mapping);
     const totalCount = allData.length;
 
     const createdCount = successedImport.length;

packages/server/src/services/Import/ImportFileProcessCommit.ts

@@ -5,6 +5,7 @@ import { ImportFileProcess } from './ImportFileProcess';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import { IImportFileCommitedEventPayload } from '@/interfaces/Import';
+import { ImportAls } from './ImportALS';
 
 @Service()
 export class ImportFileProcessCommit {
@@ -14,16 +15,34 @@ export class ImportFileProcessCommit {
   @Inject()
   private importFile: ImportFileProcess;
 
+  @Inject()
+  private importAls: ImportAls;
+
   @Inject()
   private eventPublisher: EventPublisher;
 
+  /**
+   * Commits the imported file under ALS.
+   * @param {number} tenantId
+   * @param {string} importId
+   * @returns {Promise<ImportFilePreviewPOJO>}
+   */
+  public commit(
+    tenantId: number,
+    importId: string
+  ): Promise<ImportFilePreviewPOJO> {
+    return this.importAls.runCommit<Promise<ImportFilePreviewPOJO>>(() =>
+      this.commitAlsRun(tenantId, importId)
+    );
+  }
+
   /**
    * Commits the imported file.
    * @param {number} tenantId
    * @param {number} importId
    * @returns {Promise<ImportFilePreviewPOJO>}
    */
-  public async commit(
+  public async commitAlsRun(
     tenantId: number,
     importId: string
   ): Promise<ImportFilePreviewPOJO> {

packages/server/src/services/Import/ImportFileUpload.ts

@@ -11,6 +11,7 @@ import { ImportFileCommon } from './ImportFileCommon';
 import { ImportFileDataValidator } from './ImportFileDataValidator';
 import { ImportFileUploadPOJO } from './interfaces';
 import { Import } from '@/system/models';
+import { parseSheetData } from './sheet_utils';
 
 @Service()
 export class ImportFileUploadService {
@@ -77,14 +78,12 @@ export class ImportFileUploadService {
     const buffer = await readImportFile(filename);
 
     // Parse the buffer file to array data.
-    const sheetData = this.importFileCommon.parseXlsxSheet(buffer);
+    const [sheetData, sheetColumns] = parseSheetData(buffer);
+    const coumnsStringified = JSON.stringify(sheetColumns);
 
     // Throws service error if the sheet data is empty.
     validateSheetEmpty(sheetData);
 
-    const sheetColumns = this.importFileCommon.parseSheetColumns(sheetData);
-    const coumnsStringified = JSON.stringify(sheetColumns);
-
     try {
       // Validates the params Yup schema.
       await this.importFileCommon.validateParamsSchema(resource, params);

packages/server/src/services/Import/sheet_utils.ts

@@ -0,0 +1,56 @@
+import XLSX from 'xlsx';
+import { first } from 'lodash';
+
+/**
+ * Parses the given sheet buffer to worksheet.
+ * @param {Buffer} buffer
+ * @returns {XLSX.WorkSheet}
+ */
+export function parseFirstSheet(buffer: Buffer): XLSX.WorkSheet {
+  const workbook = XLSX.read(buffer, { type: 'buffer', raw: true });
+
+  const firstSheetName = workbook.SheetNames[0];
+  const worksheet = workbook.Sheets[firstSheetName];
+
+  return worksheet;
+}
+
+/**
+ * Extracts the given worksheet to columns.
+ * @param {XLSX.WorkSheet} worksheet
+ * @returns {Array<string>}
+ */
+export function extractSheetColumns(worksheet: XLSX.WorkSheet): Array<string> {
+  // By default, sheet_to_json scans the first row and uses the values as headers.
+  // With the header: 1 option, the function exports an array of arrays of values.
+  const sheetCells = XLSX.utils.sheet_to_json(worksheet, { header: 1 });
+  const sheetCols = first(sheetCells) as Array<string>;
+
+  return sheetCols.filter((col) => col);
+}
+
+/**
+ * Parses the given worksheet to json values. the keys are columns labels.
+ * @param {XLSX.WorkSheet} worksheet
+ * @returns {Array<Record<string, string>>}
+ */
+export function parseSheetToJson(
+  worksheet: XLSX.WorkSheet
+): Array<Record<string, string>> {
+  return XLSX.utils.sheet_to_json(worksheet, {});
+}
+
+/**
+ * Parses the given sheet buffer then retrieves the sheet data and columns.
+ * @param {Buffer} buffer
+ */
+export function parseSheetData(
+  buffer: Buffer
+): [Array<Record<string, string>>, string[]] {
+  const worksheet = parseFirstSheet(buffer);
+
+  const columns = extractSheetColumns(worksheet);
+  const data = parseSheetToJson(worksheet);
+
+  return [data, columns];
+}

packages/server/src/services/Inventory/Inventory.ts

@@ -139,24 +139,25 @@ export default class InventoryService {
   ) {
     const agenda = Container.get('agenda');
 
+    const commonJobsQuery = {
+      name: 'compute-item-cost',
+      lastRunAt: { $exists: false },
+      'data.tenantId': tenantId,
+      'data.itemId': itemId,
+    };
     // Cancel any `compute-item-cost` in the queue has upper starting date
     // with the same given item.
     await agenda.cancel({
-      name: 'compute-item-cost',
+      ...commonJobsQuery,
-      nextRunAt: { $ne: null },
+      'data.startingDate': { $lte: startingDate },
-      'data.tenantId': tenantId,
-      'data.itemId': itemId,
-      'data.startingDate': { $gt: startingDate },
     });
     // Retrieve any `compute-item-cost` in the queue has lower starting date
     // with the same given item.
     const dependsJobs = await agenda.jobs({
-      name: 'compute-item-cost',
+      ...commonJobsQuery,
-      nextRunAt: { $ne: null },
+      'data.startingDate': { $gte: startingDate },
-      'data.tenantId': tenantId,
-      'data.itemId': itemId,
-      'data.startingDate': { $lte: startingDate },
     });
+    // If the depends jobs cleared.
     if (dependsJobs.length === 0) {
       await agenda.schedule(
         config.scheduleComputeItemCost,
@@ -172,6 +173,13 @@ export default class InventoryService {
         events.inventory.onComputeItemCostJobScheduled,
         { startingDate, itemId, tenantId } as IInventoryItemCostScheduledPayload
       );
+    } else {
+      // Re-schedule the jobs that have higher date from current moment.
+      await Promise.all(
+        dependsJobs.map((job) =>
+          job.schedule(config.scheduleComputeItemCost).save()
+        )
+      );
     }
   }
 

packages/server/src/services/Items/ItemsExportable.ts

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { Exportable } from '../Export/Exportable';
 import { IItemsFilter } from '@/interfaces';
 import { ItemsApplication } from './ItemsApplication';
+import { EXPORT_SIZE_LIMIT } from '../Export/constants';
 
 @Service()
 export class ItemsExportable extends Exportable {
@@ -19,7 +20,7 @@ export class ItemsExportable extends Exportable {
       columnSortBy: 'created_at',
       page: 1,
       ...query,
-      pageSize: 12,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IItemsFilter;
 
     return this.itemsApplication

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { IManualJournalsFilter } from '@/interfaces';
 import { Exportable } from '../Export/Exportable';
 import { ManualJournalsApplication } from './ManualJournalsApplication';
+import { EXPORT_SIZE_LIMIT } from '../Export/constants';
 
 @Service()
 export class ManualJournalsExportable extends Exportable {
@@ -19,7 +20,7 @@ export class ManualJournalsExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 12000,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IManualJournalsFilter;
 
     return this.manualJournalsApplication

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

@@ -1,6 +1,7 @@
 import { Inject, Service } from 'typedi';
 import { Exportable } from '@/services/Export/Exportable';
 import { BillPaymentsApplication } from './BillPaymentsApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class BillPaymentExportable extends Exportable {
@@ -14,11 +15,11 @@ export class BillPaymentExportable extends Exportable {
    */
   public exportable(tenantId: number, query: any) {
     const parsedQuery = {
-      page: 1,
-      pageSize: 12,
-      ...query,
       sortOrder: 'desc',
       columnSortBy: 'created_at',
+      ...query,
+      page: 1,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as any;
 
     return this.billPaymentsApplication

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { IBillsFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { BillsApplication } from './BillsApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class BillsExportable extends Exportable {
@@ -19,7 +20,7 @@ export class BillsExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 12000,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IBillsFilter;
 
     return this.billsApplication

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { ISalesInvoicesFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { SaleEstimatesApplication } from './SaleEstimatesApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class SaleEstimatesExportable extends Exportable {
@@ -19,7 +20,7 @@ export class SaleEstimatesExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 12000,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as ISalesInvoicesFilter;
 
     return this.saleEstimatesApplication

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { ISalesInvoicesFilter } from '@/interfaces';
 import { SaleInvoiceApplication } from './SaleInvoicesApplication';
 import { Exportable } from '@/services/Export/Exportable';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class SaleInvoicesExportable extends Exportable {
@@ -19,7 +20,7 @@ export class SaleInvoicesExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 120000,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as ISalesInvoicesFilter;
 
     return this.saleInvoicesApplication

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

@@ -1,3 +1,4 @@
+import { Mutex } from 'async-mutex';
 import { Container, Service, Inject } from 'typedi';
 import { chain } from 'lodash';
 import moment from 'moment';
@@ -34,17 +35,26 @@ export class SaleInvoicesCost {
     inventoryItemsIds: number[],
     startingDate: Date
   ): Promise<void> {
-    const asyncOpers: Promise<[]>[] = [];
+    const mutex = new Mutex();
 
-    inventoryItemsIds.forEach((inventoryItemId: number) => {
+    const asyncOpers = inventoryItemsIds.map(
-      const oper: Promise<[]> = this.inventoryService.scheduleComputeItemCost(
+      async (inventoryItemId: number) => {
-        tenantId,
+        // @todo refactor the lock acquire to be distrbuted using Redis
-        inventoryItemId,
+        // and run the cost schedule job after running invoice transaction.
-        startingDate
+        const release = await mutex.acquire();
-      );
+
-      asyncOpers.push(oper);
+        try {
-    });
+          await this.inventoryService.scheduleComputeItemCost(
-    await Promise.all([...asyncOpers]);
+            tenantId,
+            inventoryItemId,
+            startingDate
+          );
+        } finally {
+          release();
+        }
+      }
+    );
+    await Promise.all(asyncOpers);
   }
 
   /**
@@ -86,17 +96,22 @@ export class SaleInvoicesCost {
     tenantId: number,
     inventoryTransactions: IInventoryTransaction[]
   ) {
-    const asyncOpers: Promise<[]>[] = [];
+    const mutex = new Mutex();
     const reducedTransactions = this.getMaxDateInventoryTransactions(
       inventoryTransactions
     );
-    reducedTransactions.forEach((transaction) => {
+    const asyncOpers = reducedTransactions.map(async (transaction) => {
-      const oper: Promise<[]> = this.inventoryService.scheduleComputeItemCost(
+      const release = await mutex.acquire();
-        tenantId,
+
-        transaction.itemId,
+      try {
-        transaction.date
+        await this.inventoryService.scheduleComputeItemCost(
-      );
+          tenantId,
-      asyncOpers.push(oper);
+          transaction.itemId,
+          transaction.date
+        );
+      } finally {
+        release();
+      }
     });
     await Promise.all([...asyncOpers]);
   }

packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedExportable.ts

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { IAccountsStructureType, IPaymentsReceivedFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { PaymentReceivesApplication } from './PaymentReceivedApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class PaymentsReceivedExportable extends Exportable {
@@ -21,6 +22,8 @@ export class PaymentsReceivedExportable extends Exportable {
       inactiveMode: false,
       ...query,
       structure: IAccountsStructureType.Flat,
+      page: 1,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as IPaymentsReceivedFilter;
 
     return this.paymentReceivedApp

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

@@ -2,6 +2,7 @@ import { Inject, Service } from 'typedi';
 import { ISalesReceiptsFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
 import { SaleReceiptApplication } from './SaleReceiptApplication';
+import { EXPORT_SIZE_LIMIT } from '@/services/Export/constants';
 
 @Service()
 export class SaleReceiptsExportable extends Exportable {
@@ -19,7 +20,7 @@ export class SaleReceiptsExportable extends Exportable {
       columnSortBy: 'created_at',
       ...query,
       page: 1,
-      pageSize: 12,
+      pageSize: EXPORT_SIZE_LIMIT,
     } as ISalesReceiptsFilter;
 
     return this.saleReceiptsApp

packages/server/src/services/Subscription/LemonCancelSubscription.ts

@@ -4,8 +4,8 @@ import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import { ERRORS, IOrganizationSubscriptionCancel } from './types';
 import events from '@/subscribers/events';
-import { ERRORS, IOrganizationSubscriptionCanceled } from './types';
 
 @Service()
 export class LemonCancelSubscription {
@@ -18,12 +18,15 @@ export class LemonCancelSubscription {
    * @param {number} subscriptionId
    * @returns {Promise<void>}
    */
-  public async cancelSubscription(tenantId: number) {
+  public async cancelSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     if (!subscription) {
       throw new ServiceError(ERRORS.SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT);
@@ -35,13 +38,10 @@ export class LemonCancelSubscription {
     if (cancelledSub.error) {
       throw new Error(cancelledSub.error.message);
     }
-    await PlanSubscription.query().findById(subscriptionId).patch({
+    // Triggers `onSubscriptionCancelled` event.
-      canceledAt: new Date(),
-    });
-    // Triggers `onSubscriptionCanceled` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionCanceled,
+      events.subscription.onSubscriptionCancel,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionCanceled
+      { tenantId, subscriptionId } as IOrganizationSubscriptionCancel
     );
   }
 }

packages/server/src/services/Subscription/LemonChangeSubscriptionPlan.ts

@@ -18,25 +18,30 @@ export class LemonChangeSubscriptionPlan {
    * @param {number} newVariantId - New variant id.
    * @returns {Promise<void>}
    */
-  public async changeSubscriptionPlan(tenantId: number, newVariantId: number) {
+  public async changeSubscriptionPlan(
+    tenantId: number,
+    newVariantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     const lemonSubscriptionId = subscription.lemonSubscriptionId;
 
     // Send request to Lemon Squeezy to change the subscription.
     const updatedSub = await updateSubscription(lemonSubscriptionId, {
       variantId: newVariantId,
+      invoiceImmediately: true,
     });
     if (updatedSub.error) {
       throw new ServiceError('SOMETHING_WENT_WRONG');
     }
     // Triggers `onSubscriptionPlanChanged` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionPlanChanged,
+      events.subscription.onSubscriptionPlanChange,
       {
         tenantId,
         lemonSubscriptionId,

packages/server/src/services/Subscription/LemonResumeSubscription.ts

@@ -1,11 +1,11 @@
 import { Inject, Service } from 'typedi';
+import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import { configureLemonSqueezy } from './utils';
 import { PlanSubscription } from '@/system/models';
 import { ServiceError } from '@/exceptions';
-import { ERRORS, IOrganizationSubscriptionResumed } from './types';
+import { ERRORS, IOrganizationSubscriptionResume } from './types';
-import { updateSubscription } from '@lemonsqueezy/lemonsqueezy.js';
 
 @Service()
 export class LemonResumeSubscription {
@@ -14,15 +14,19 @@ export class LemonResumeSubscription {
 
   /**
    * Resumes the main subscription of the given tenant.
-   * @param {number} tenantId -
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Subscription slug by default main subscription.
    * @returns {Promise<void>}
    */
-  public async resumeSubscription(tenantId: number) {
+  public async resumeSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
     configureLemonSqueezy();
 
     const subscription = await PlanSubscription.query().findOne({
       tenantId,
-      slug: 'main',
+      slug: subscriptionSlug,
     });
     if (!subscription) {
       throw new ServiceError(ERRORS.SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT);
@@ -33,16 +37,12 @@ export class LemonResumeSubscription {
       cancelled: false,
     });
     if (returnedSub.error) {
-      throw new ServiceError('');
+      throw new ServiceError(ERRORS.SOMETHING_WENT_WRONG_WITH_LS);
     }
-    // Update the subscription of the organization.
+    // Triggers `onSubscriptionResume` event.
-    await PlanSubscription.query().findById(subscriptionId).patch({
-      canceledAt: null,
-    });
-    // Triggers `onSubscriptionCanceled` event.
     await this.eventPublisher.emitAsync(
-      events.subscription.onSubscriptionResumed,
+      events.subscription.onSubscriptionResume,
-      { tenantId, subscriptionId } as IOrganizationSubscriptionResumed
+      { tenantId, subscriptionId } as IOrganizationSubscriptionResume
     );
   }
 }

packages/server/src/services/Subscription/LemonSqueezyWebhooks.ts

@@ -59,11 +59,25 @@ export class LemonSqueezyWebhooks {
 
     const userId = eventBody.meta.custom_data?.user_id;
     const tenantId = eventBody.meta.custom_data?.tenant_id;
+    const subscriptionSlug = 'main';
 
     if (!webhookHasMeta(eventBody)) {
       throw new Error("Event body is missing the 'meta' property.");
     } else if (webhookHasData(eventBody)) {
       if (webhookEvent.startsWith('subscription_payment_')) {
+        // Marks the main subscription payment as succeed.
+        if (webhookEvent === 'subscription_payment_success') {
+          await this.subscriptionService.markSubscriptionPaymentSucceed(
+            tenantId,
+            subscriptionSlug
+          );
+          // Marks the main subscription payment as failed.
+        } else if (webhookEvent === 'subscription_payment_failed') {
+          await this.subscriptionService.markSubscriptionPaymentFailed(
+            tenantId,
+            subscriptionSlug
+          );
+        }
         // Save subscription invoices; eventBody is a SubscriptionInvoice
         // Not implemented.
       } else if (webhookEvent.startsWith('subscription_')) {
@@ -74,16 +88,39 @@ export class LemonSqueezyWebhooks {
         // We assume that the Plan table is up to date.
         const plan = await Plan.query().findOne('lemonVariantId', variantId);
 
+        // Update the subscription in the database.
+        const priceId = attributes.first_subscription_item.price_id;
+        const subscriptionId = eventBody.data.id;
+
+        // Throw error early if the given lemon variant id is not associated to any plan.
         if (!plan) {
           throw new Error(`Plan with variantId ${variantId} not found.`);
-        } else {
+        }
-          // Update the subscription in the database.
+        // Create a new subscription of the tenant.
-          const priceId = attributes.first_subscription_item.price_id;
+        if (webhookEvent === 'subscription_created') {
-
+          await this.subscriptionService.newSubscribtion(
-          // Create a new subscription of the tenant.
+            tenantId,
-          if (webhookEvent === 'subscription_created') {
+            plan.slug,
-            await this.subscriptionService.newSubscribtion(tenantId, plan.slug);
+            subscriptionSlug,
-          }
+            { lemonSqueezyId: subscriptionId }
+          );
+          // Cancel the given subscription of the organization.
+        } else if (webhookEvent === 'subscription_cancelled') {
+          await this.subscriptionService.cancelSubscription(
+            tenantId,
+            subscriptionSlug
+          );
+        } else if (webhookEvent === 'subscription_plan_changed') {
+          await this.subscriptionService.subscriptionPlanChanged(
+            tenantId,
+            plan.slug,
+            subscriptionSlug
+          );
+        } else if (webhookEvent === 'subscription_resumed') {
+          await this.subscriptionService.resumeSubscription(
+            tenantId,
+            subscriptionSlug
+          );
         }
       } else if (webhookEvent.startsWith('order_')) {
         // Save orders; eventBody is a "Order"

packages/server/src/services/Subscription/Subscription.ts

@@ -1,22 +1,29 @@
-import { Service } from 'typedi';
+import { Inject, Service } from 'typedi';
-import { NotAllowedChangeSubscriptionPlan } from '@/exceptions';
+import { NotAllowedChangeSubscriptionPlan, ServiceError } from '@/exceptions';
-import { Plan, Tenant } from '@/system/models';
+import { Plan, PlanSubscription, Tenant } from '@/system/models';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import events from '@/subscribers/events';
+import { SubscriptionPayload, SubscriptionPaymentStatus } from '@/interfaces';
+import { ERRORS } from './types';
 
 @Service()
 export class Subscription {
+  @Inject()
+  private eventPublisher: EventPublisher;
+
   /**
    * Give the tenant a new subscription.
    * @param {number} tenantId - Tenant id.
-   * @param {string} planSlug - Plan slug.
+   * @param {string} planSlug - Plan slug of the new subscription.
-   * @param {string} invoiceInterval
+   * @param {string} subscriptionSlug - Subscription slug by default takes main subscription
-   * @param {number} invoicePeriod
+   * @param {SubscriptionPayload} payload - Subscription payload.
-   * @param {string} subscriptionSlug
    */
   public async newSubscribtion(
     tenantId: number,
     planSlug: string,
-    subscriptionSlug: string = 'main'
+    subscriptionSlug: string = 'main',
-  ) {
+    payload?: SubscriptionPayload
+  ): Promise<void> {
     const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
     const plan = await Plan.query().findOne('slug', planSlug).throwIfNotFound();
 
@@ -45,8 +52,169 @@ export class Subscription {
         plan.id,
         invoiceInterval,
         invoicePeriod,
-        subscriptionSlug
+        subscriptionSlug,
+        payload
       );
     }
   }
+
+  /**
+   * Cancels the given tenant subscription.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Subscription slug.
+   */
+  async cancelSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    // Throw error early if the subscription is not exist.
+    if (!subscription) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_NOT_EXIST);
+    }
+    // Throw error early if the subscription is already canceled.
+    if (subscription.canceled()) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_ALREADY_CANCELED);
+    }
+    await subscription.$query().patch({ canceledAt: new Date() });
+
+    // Triggers `onSubscriptionCancelled` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionCancelled,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Resumes the given tenant subscription.
+   * @param {number} tenantId
+   * @param {string} subscriptionSlug  - Subscription slug by deafult main subscription.
+   * @returns {Promise<void>}
+   */
+  async resumeSubscription(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    // Throw error early if the subscription is not exist.
+    if (!subscription) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_NOT_EXIST);
+    }
+    // Throw error early if the subscription is not cancelled.
+    if (!subscription.canceled()) {
+      throw new ServiceError(ERRORS.SUBSCRIPTION_ALREADY_ACTIVE);
+    }
+    await subscription.$query().patch({ canceledAt: null });
+
+    // Triggers `onSubscriptionResumed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionResumed,
+      { tenantId, subscriptionSlug }
+    );
+  }
+
+  /**
+   * Mark the given subscription payment of the tenant as succeed.
+   * @param {number} tenantId
+   * @param {string} newPlanSlug
+   * @param {string} subscriptionSlug
+   */
+  async subscriptionPlanChanged(
+    tenantId: number,
+    newPlanSlug: string,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const tenant = await Tenant.query().findById(tenantId).throwIfNotFound();
+    const newPlan = await Plan.query()
+      .findOne('slug', newPlanSlug)
+      .throwIfNotFound();
+
+    const subscription = await PlanSubscription.query().findOne({
+      tenantId,
+      slug: subscriptionSlug,
+    });
+    if (subscription.planId === newPlan.id) {
+      throw new ServiceError('');
+    }
+    await subscription.$query().patch({ planId: newPlan.id });
+
+    // Triggers `onSubscriptionPlanChanged` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPlanChanged,
+      {
+        tenantId,
+        newPlanSlug,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Marks the subscription payment as succeed.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Given subscription slug by default main subscription.
+   * @returns {Promise<void>}
+   */
+  async markSubscriptionPaymentSucceed(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const subscription = await PlanSubscription.query()
+      .findOne({ tenantId, slug: subscriptionSlug })
+      .throwIfNotFound();
+
+    await subscription
+      .$query()
+      .patch({ paymentStatus: SubscriptionPaymentStatus.Succeed });
+
+    // Triggers `onSubscriptionSucceed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPaymentSucceed,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
+
+  /**
+   * Marks the given subscription payment of the tenant as failed.
+   * @param {number} tenantId - Tenant id.
+   * @param {string} subscriptionSlug - Given subscription slug.
+   * @returns {Prmise<void>}
+   */
+  async markSubscriptionPaymentFailed(
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ): Promise<void> {
+    const subscription = await PlanSubscription.query()
+      .findOne({ tenantId, slug: subscriptionSlug })
+      .throwIfNotFound();
+
+    await subscription
+      .$query()
+      .patch({ paymentStatus: SubscriptionPaymentStatus.Failed });
+
+    // Triggers `onSubscriptionPaymentFailed` event.
+    await this.eventPublisher.emitAsync(
+      events.subscription.onSubscriptionPaymentFailed,
+      {
+        tenantId,
+        subscriptionSlug,
+      }
+    );
+  }
 }

packages/server/src/services/Subscription/SubscriptionApplication.ts

@@ -20,8 +20,14 @@ export class SubscriptionApplication {
    * @param {string} id
    * @returns {Promise<void>}
    */
-  public cancelSubscription(tenantId: number, id: string) {
+  public cancelSubscription(
-    return this.cancelSubscriptionService.cancelSubscription(tenantId, id);
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    return this.cancelSubscriptionService.cancelSubscription(
+      tenantId,
+      subscriptionSlug
+    );
   }
 
   /**
@@ -29,8 +35,14 @@ export class SubscriptionApplication {
    * @param {number} tenantId
    * @returns {Promise<void>}
    */
-  public resumeSubscription(tenantId: number) {
+  public resumeSubscription(
-    return this.resumeSubscriptionService.resumeSubscription(tenantId);
+    tenantId: number,
+    subscriptionSlug: string = 'main'
+  ) {
+    return this.resumeSubscriptionService.resumeSubscription(
+      tenantId,
+      subscriptionSlug
+    );
   }
 
   /**

packages/server/src/services/Subscription/events/SubscribeFreeOnSignupCommunity.tsx

@@ -1,8 +1,8 @@
+import { Inject, Service } from 'typedi';
 import { IAuthSignedUpEventPayload } from '@/interfaces';
 import events from '@/subscribers/events';
 import config from '@/config';
 import { Subscription } from '../Subscription';
-import { Inject, Service } from 'typedi';
 
 @Service()
 export class SubscribeFreeOnSignupCommunity {

packages/server/src/services/Subscription/events/TriggerInvalidateCacheOnSubscriptionChange.tsx

@@ -0,0 +1,29 @@
+import events from '@/subscribers/events';
+import Container from 'typedi';
+
+export class TriggerInvalidateCacheOnSubscriptionChange {
+  /**
+   * Attaches events with handlers.
+   */
+  public attach = (bus) => {
+    bus.subscribe(
+      events.subscription.onSubscriptionCancelled,
+      this.triggerInvalidateCache.bind(this)
+    );
+    bus.subscribe(
+      events.subscription.onSubscriptionResumed,
+      this.triggerInvalidateCache.bind(this)
+    );
+    bus.subscribe(
+      events.subscription.onSubscriptionPlanChanged,
+      this.triggerInvalidateCache.bind(this)
+    );
+  };
+
+  private triggerInvalidateCache() {
+    const io = Container.get('socket');
+
+    // Notify the frontend to reflect the new transactions changes.
+    io.emit('SUBSCRIPTION_CHANGED', { subscriptionSlug: 'main' });
+  }
+}

packages/server/src/services/Subscription/types.ts

@@ -1,6 +1,10 @@
 export const ERRORS = {
   SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT:
     'SUBSCRIPTION_ID_NOT_ASSOCIATED_TO_TENANT',
+  SUBSCRIPTION_NOT_EXIST: 'SUBSCRIPTION_NOT_EXIST',
+  SUBSCRIPTION_ALREADY_CANCELED: 'SUBSCRIPTION_ALREADY_CANCELED',
+  SUBSCRIPTION_ALREADY_ACTIVE: 'SUBSCRIPTION_ALREADY_ACTIVE',
+  SOMETHING_WENT_WRONG_WITH_LS: 'SOMETHING_WENT_WRONG_WITH_LS',
 };
 
 export interface IOrganizationSubscriptionChanged {
@@ -9,11 +13,20 @@ export interface IOrganizationSubscriptionChanged {
   newVariantId: number;
 }
 
-export interface IOrganizationSubscriptionCanceled {
+export interface IOrganizationSubscriptionCancel {
   tenantId: number;
   subscriptionId: string;
 }
 
+export interface IOrganizationSubscriptionCancelled {
+  tenantId: number;
+  subscriptionId: string;
+}
+
+export interface IOrganizationSubscriptionResume {
+  tenantId: number;
+  subscriptionId: number;
+}
 export interface IOrganizationSubscriptionResumed {
   tenantId: number;
   subscriptionId: number;

packages/server/src/subscribers/Inventory/Inventory.ts

@@ -10,6 +10,7 @@ import {
 } from '@/interfaces';
 import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks';
 import { SaleInvoicesCost } from '@/services/Sales/Invoices/SalesInvoicesCost';
+import { ImportAls } from '@/services/Import/ImportALS';
 
 @Service()
 export default class InventorySubscriber {
@@ -25,6 +26,9 @@ export default class InventorySubscriber {
   @Inject('agenda')
   private agenda: any;
 
+  @Inject()
+  private importAls: ImportAls;
+
   /**
    * Attaches events with handlers.
    */
@@ -86,20 +90,17 @@ export default class InventorySubscriber {
   private handleScheduleItemsCostOnInventoryTransactionsCreated = async ({
     tenantId,
     inventoryTransactions,
-    trx
+    trx,
   }: IInventoryTransactionsCreatedPayload) => {
-    const inventoryItemsIds = map(inventoryTransactions, 'itemId');
+    const inImportPreviewScope = this.importAls.isImportPreview;
 
-    runAfterTransaction(trx, async () => {
+    // Avoid running the cost items job if the async process is in import preview.
-      try {
+    if (inImportPreviewScope) return;
-        await this.saleInvoicesCost.computeItemsCostByInventoryTransactions(
+
-          tenantId,
+    await this.saleInvoicesCost.computeItemsCostByInventoryTransactions(
-          inventoryTransactions
+      tenantId,
-        );
+      inventoryTransactions
-      } catch (error) {
+    );
-        console.error(error);
-      }
-    });
   };
 
   /**

packages/server/src/subscribers/events.ts

@@ -46,10 +46,19 @@ export default {
    * Organization subscription.
    */
   subscription: {
-    onSubscriptionCanceled: 'onSubscriptionCanceled',
+    onSubscriptionCancel: 'onSubscriptionCancel',
+    onSubscriptionCancelled: 'onSubscriptionCancelled',
+
+    onSubscriptionResume: 'onSubscriptionResume',
     onSubscriptionResumed: 'onSubscriptionResumed',
+
+    onSubscriptionPlanChange: 'onSubscriptionPlanChange',
     onSubscriptionPlanChanged: 'onSubscriptionPlanChanged',
-    onSubscribed: 'onOrganizationSubscribed',
+
+    onSubscriptionSubscribed: 'onSubscriptionSubscribed',
+
+    onSubscriptionPaymentSucceed: 'onSubscriptionPaymentSucceed',
+    onSubscriptionPaymentFailed: 'onSubscriptionPaymentFailed'
   },
 
   /**

packages/server/src/system/migrations/20240824151006_add_payment_status_to_subscriptions_table.js

@@ -0,0 +1,19 @@
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.up = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.string('payment_status');
+  });
+};
+
+/**
+ * @param { import("knex").Knex } knex
+ * @returns { Promise<void> }
+ */
+exports.down = function (knex) {
+  return knex.schema.table('subscription_plan_subscriptions', (table) => {
+    table.dropColumn('payment_status');
+  });
+};

packages/server/src/system/models/Subscriptions/Plan.ts

@@ -3,6 +3,10 @@ import SystemModel from '@/system/models/SystemModel';
 import { PlanSubscription } from '..';
 
 export default class Plan extends mixin(SystemModel) {
+  price: number;
+  invoiceInternal: number;
+  invoicePeriod: string;
+  
   /**
    * Table name.
    */

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

@@ -198,14 +198,16 @@ export default class Tenant extends BaseModel {
     planId,
     invoiceInterval,
     invoicePeriod,
-    subscriptionSlug
+    subscriptionSlug,
+    payload?,
   ) {
     return Tenant.newSubscription(
       this.id,
       planId,
       invoiceInterval,
       invoicePeriod,
-      subscriptionSlug
+      subscriptionSlug,
+      payload
     );
   }
 
@@ -217,7 +219,8 @@ export default class Tenant extends BaseModel {
     planId: number,
     invoiceInterval: 'month' | 'year',
     invoicePeriod: number,
-    subscriptionSlug: string
+    subscriptionSlug: string,
+    payload?: { lemonSqueezyId: string }
   ) {
     const period = new SubscriptionPeriod(invoiceInterval, invoicePeriod);
 
@@ -227,6 +230,7 @@ export default class Tenant extends BaseModel {
       planId,
       startsAt: period.getStartDate(),
       endsAt: period.getEndDate(),
+      lemonSubscriptionId: payload?.lemonSqueezyId || null,
     });
   }
 }

packages/webapp/src/components/App.tsx

@@ -1,4 +1,5 @@
 // @ts-nocheck
+import { lazy, Suspense } from 'react';
 import { Router, Switch, Route } from 'react-router';
 import { createBrowserHistory } from 'history';
 import { QueryClientProvider, QueryClient } from 'react-query';
@@ -11,26 +12,27 @@ import 'moment/locale/es-us';
 import AppIntlLoader from './AppIntlLoader';
 import { EnsureAuthenticated } from '@/components/Guards/EnsureAuthenticated';
 import GlobalErrors from '@/containers/GlobalErrors/GlobalErrors';
-import DashboardPrivatePages from '@/components/Dashboard/PrivatePages';
-import { Authentication } from '@/containers/Authentication/Authentication';
 
-import LazyLoader from '@/components/LazyLoader';
 import { SplashScreen, DashboardThemeProvider } from '../components';
 import { queryConfig } from '../hooks/query/base';
-import { EnsureUserEmailVerified } from './Guards/EnsureUserEmailVerified';
-import { EnsureAuthNotAuthenticated } from './Guards/EnsureAuthNotAuthenticated';
 import { EnsureUserEmailNotVerified } from './Guards/EnsureUserEmailNotVerified';
-import { EnsureOneClickDemoAccountEnabled } from '@/containers/OneClickDemo/EnsureOneClickDemoAccountEnabled';
 
-const EmailConfirmation = LazyLoader({
+const DashboardPrivatePages = lazy(
-  loader: () => import('@/containers/Authentication/EmailConfirmation'),
+  () => import('@/components/Dashboard/PrivatePages'),
-});
+);
-const RegisterVerify = LazyLoader({
+const AuthenticationPage = lazy(
-  loader: () => import('@/containers/Authentication/RegisterVerify'),
+  () => import('@/containers/Authentication/AuthenticationPage'),
-});
+);
-const OneClickDemoPage = LazyLoader({
+const EmailConfirmation = lazy(
-  loader: () => import('@/containers/OneClickDemo/OneClickDemoPage'),
+  () => import('@/containers/Authentication/EmailConfirmation'),
-});
+);
+const RegisterVerify = lazy(
+  () => import('@/containers/Authentication/RegisterVerify'),
+);
+const OneClickDemoPage = lazy(
+  () => import('@/containers/OneClickDemo/OneClickDemoPage'),
+);
+
 /**
  * App inner.
  */
@@ -38,42 +40,27 @@ function AppInsider({ history }) {
   return (
     <div className="App">
       <DashboardThemeProvider>
-        <Router history={history}>
+        <Suspense fallback={'Loading...'}>
-          <Switch>
+          <Router history={history}>
-            <Route path={'/one_click_demo'}>
+            <Switch>
-              <EnsureOneClickDemoAccountEnabled>
+              <Route path={'/one_click_demo'} children={<OneClickDemoPage />} />
-                <EnsureAuthNotAuthenticated>
+              <Route path={'/auth/register/verify'}>
-                  <OneClickDemoPage />
+                <EnsureAuthenticated>
-                </EnsureAuthNotAuthenticated>
+                  <EnsureUserEmailNotVerified>
-              </EnsureOneClickDemoAccountEnabled>
+                    <RegisterVerify />
-            </Route>
+                  </EnsureUserEmailNotVerified>
-            <Route path={'/auth/register/verify'}>
+                </EnsureAuthenticated>
-              <EnsureAuthenticated>
+              </Route>
-                <EnsureUserEmailNotVerified>
-                  <RegisterVerify />
-                </EnsureUserEmailNotVerified>
-              </EnsureAuthenticated>
-            </Route>
 
-            <Route path={'/auth/email_confirmation'}>
+              <Route
-              <EmailConfirmation />
+                path={'/auth/email_confirmation'}
-            </Route>
+                children={<EmailConfirmation />}
-
+              />
-            <Route path={'/auth'}>
+              <Route path={'/auth'} children={<AuthenticationPage />} />
-              <EnsureAuthNotAuthenticated>
+              <Route path={'/'} children={<DashboardPrivatePages />} />
-                <Authentication />
+            </Switch>
-              </EnsureAuthNotAuthenticated>
+          </Router>
-            </Route>
+        </Suspense>
-
-            <Route path={'/'}>
-              <EnsureAuthenticated>
-                <EnsureUserEmailVerified>
-                  <DashboardPrivatePages />
-                </EnsureUserEmailVerified>
-              </EnsureAuthenticated>
-            </Route>
-          </Switch>
-        </Router>
 
         <GlobalErrors />
       </DashboardThemeProvider>

packages/webapp/src/components/Dashboard/DashboardSockets.tsx

@@ -23,6 +23,9 @@ export function DashboardSockets() {
         intent: Intent.SUCCESS,
       });
     });
+    socket.current.on('SUBSCRIPTION_CHANGED', () => {
+      client.invalidateQueries('GetSubscriptions');
+    });
     return () => {
       socket.current.removeAllListeners();
       socket.current.close();

packages/webapp/src/components/Dashboard/PrivatePages.tsx

@@ -1,35 +1,37 @@
 // @ts-nocheck
-import React from 'react';
+import React, { lazy } from 'react';
 import { Switch, Route } from 'react-router';
 
 import Dashboard from '@/components/Dashboard/Dashboard';
-import SetupWizardPage from '@/containers/Setup/WizardSetupPage';
 
-import EnsureOrganizationIsReady from '../Guards/EnsureOrganizationIsReady';
-import EnsureOrganizationIsNotReady from '../Guards/EnsureOrganizationIsNotReady';
 import { PrivatePagesProvider } from './PrivatePagesProvider';
+import EnsureOrganizationIsReady from '../Guards/EnsureOrganizationIsReady';
+import { EnsureAuthenticated } from '../Guards/EnsureAuthenticated';
+import { EnsureUserEmailVerified } from '../Guards/EnsureUserEmailVerified';
 
 import '@/style/pages/Dashboard/Dashboard.scss';
 
+const SetupWizardPage = lazy(
+  () => import('@/containers/Setup/WizardSetupPage'),
+);
 /**
  * Dashboard inner private pages.
  */
 export default function DashboardPrivatePages() {
   return (
-    <PrivatePagesProvider>
+    <EnsureAuthenticated>
-      <Switch>
+      <EnsureUserEmailVerified>
-        <Route path={'/setup'}>
+        <PrivatePagesProvider>
-          <EnsureOrganizationIsNotReady>
+          <Switch>
-            <SetupWizardPage />
+            <Route path={'/setup'} children={<SetupWizardPage />} />
-          </EnsureOrganizationIsNotReady>
+            <Route path="/">
-        </Route>
+              <EnsureOrganizationIsReady>
-
+                <Dashboard />
-        <Route path="/">
+              </EnsureOrganizationIsReady>
-          <EnsureOrganizationIsReady>
+            </Route>
-            <Dashboard />
+          </Switch>
-          </EnsureOrganizationIsReady>
+        </PrivatePagesProvider>
-        </Route>
+      </EnsureUserEmailVerified>
-      </Switch>
+    </EnsureAuthenticated>
-    </PrivatePagesProvider>
   );
 }

packages/webapp/src/components/Dashboard/PrivatePagesProvider.tsx

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import React from 'react';
 import { useApplicationBoot } from '@/components';
+import { useAuthMetadata } from '@/hooks/query/authentication';
 
 /**
  * Private pages provider.
@@ -9,7 +10,10 @@ export function PrivatePagesProvider({
   // #ownProps
   children,
 }) {
-  const { isLoading } = useApplicationBoot();
+  const { isLoading: isAppBootLoading } = useApplicationBoot();
+  const { isLoading: isAuthMetaLoading } = useAuthMetadata();
+
+  const isLoading = isAppBootLoading || isAuthMetaLoading;
 
   return <React.Fragment>{!isLoading ? children : null}</React.Fragment>;
 }

packages/webapp/src/components/LazyLoader.tsx

@@ -1,22 +0,0 @@
-// @ts-nocheck
-import * as React from 'react';
-import * as Loadable from 'react-loadable';
-
-const Loader = (config) =>
-  Loadable({
-    loading: (props) => {
-      if (props.error) {
-        /* tslint:disable */
-        console.error(`======= DefaultLoader Error =======`);
-        console.error(props.error);
-        console.error(`======= DefaultLoader Error =======`);
-        /* tslint:enable */
-        return null;
-      }
-      return null;
-    },
-    delay: 250,
-    ...config
-  });
-
-export default Loader;

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

@@ -1,21 +1,33 @@
 // @ts-nocheck
-import React from 'react';
+import React, { Suspense } from 'react';
 import { Route, Switch } from 'react-router-dom';
-import preferencesRoutes from '@/routes/preferences';
+import { getPreferenceRoutes } from '@/routes/preferences';
+import { Spinner } from '@blueprintjs/core';
+import { Box } from '../Layout';
 
 export default function DashboardContentRoute() {
+  const preferencesRoutes = getPreferenceRoutes();
+
   return (
     <Route pathname="/preferences">
-      <Switch>
+      <Suspense
-        {preferencesRoutes.map((route, index) => (
+        fallback={
-          <Route
+          <Box style={{ padding: 20 }}>
-            key={index}
+            <Spinner size={20} />
-            path={`${route.path}`}
+          </Box>
-            exact={route.exact}
+        }
-            component={route.component}
+      >
-          />
+        <Switch>
-        ))}
+          {preferencesRoutes.map((route, index) => (
-      </Switch>
+            <Route
+              key={index}
+              path={`${route.path}`}
+              exact={route.exact}
+              component={route.component}
+            />
+          ))}
+        </Switch>
+      </Suspense>
     </Route>
   );
 }

packages/webapp/src/components/TagsControl/TagsControl.module.scss

@@ -2,7 +2,6 @@
   display: flex;
   flex-direction: row;
   gap: 10px;
-  margin-bottom: 14px;
 }
 
 .tag{

packages/webapp/src/config.ts

@@ -1,6 +0,0 @@
-export const Config = {
-  oneClickDemo: {
-    enable: process.env.REACT_APP_ONE_CLICK_DEMO_ENABLE === 'true',
-    demoUrl: process.env.REACT_APP_DEMO_ACCOUNT_URL || '',
-  },
-};

packages/webapp/src/constants/preferencesMenu.tsx

@@ -54,9 +54,9 @@ export default [
     disabled: false,
     href: '/preferences/items',
   },
-  {
+  // {
-    text: <T id={'sms_integration.label'} />,
+  //   text: <T id={'sms_integration.label'} />,
-    disabled: false,
+  //   disabled: false,
-    href: '/preferences/sms-message',
+  //   href: '/preferences/sms-message',
-  },
+  // },
 ];

packages/webapp/src/containers/Authentication/Authentication.tsx

@@ -2,10 +2,12 @@
 import { Route, Switch, useLocation } from 'react-router-dom';
 import BodyClassName from 'react-body-classname';
 import styled from 'styled-components';
+import { Suspense } from 'react';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
+import { Spinner } from '@blueprintjs/core';
 
 import authenticationRoutes from '@/routes/authentication';
-import { Icon, FormattedMessage as T } from '@/components';
+import { Box, Icon, FormattedMessage as T } from '@/components';
 import { AuthMetaBootProvider } from './AuthMetaBoot';
 
 import '@/style/pages/Authentication/Auth.scss';
@@ -20,7 +22,15 @@ export function Authentication() {
           </AuthLogo>
 
           <AuthMetaBootProvider>
-            <AuthenticationRoutes />
+            <Suspense
+              fallback={
+                <Box style={{ marginTop: '5rem' }}>
+                  <Spinner size={30} />
+                </Box>
+              }
+            >
+              <AuthenticationRoutes />
+            </Suspense>
           </AuthMetaBootProvider>
         </AuthInsider>
       </AuthPage>

packages/webapp/src/containers/Authentication/AuthenticationPage.tsx

@@ -0,0 +1,10 @@
+import { EnsureAuthNotAuthenticated } from "@/components/Guards/EnsureAuthNotAuthenticated";
+import { Authentication } from "./Authentication";
+
+export default function AuthenticationPage() {
+  return (
+    <EnsureAuthNotAuthenticated>
+      <Authentication />
+    </EnsureAuthNotAuthenticated>
+  );
+}

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDateFilter.module.scss

@@ -0,0 +1,5 @@
+
+
+.dateFieldGroup{
+  margin-bottom: 0;
+}

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDateFilter.tsx

@@ -0,0 +1,235 @@
+// @ts-nocheck
+import { Button, FormGroup, Intent, Position } from '@blueprintjs/core';
+import * as Yup from 'yup';
+import moment from 'moment';
+import { Form, Formik, FormikConfig, useFormikContext } from 'formik';
+import {
+  FDateInput,
+  FFormGroup,
+  FSelect,
+  Group,
+  Icon,
+  Stack,
+} from '@/components';
+
+const defaultValues = {
+  period: 'all_dates',
+  fromDate: '',
+  toDate: '',
+};
+
+const validationSchema = Yup.object().shape({
+  fromDate: Yup.date()
+    .nullable()
+    .required('From Date is required')
+    .max(Yup.ref('toDate'), 'From Date cannot be after To Date'),
+  toDate: Yup.date()
+    .nullable()
+    .required('To Date is required')
+    .min(Yup.ref('fromDate'), 'To Date cannot be before From Date'),
+});
+
+interface AccountTransactionsDateFilterFormValues {
+  period: string;
+  fromDate: string;
+  toDate: string;
+}
+
+interface UncategorizedTransactionsDateFilterProps {
+  initialValues?: AccountTransactionsDateFilterFormValues;
+  onSubmit?: FormikConfig<AccountTransactionsDateFilterFormValues>['onSubmit'];
+}
+
+export function AccountTransactionsDateFilterForm({
+  initialValues = {},
+  onSubmit,
+}: UncategorizedTransactionsDateFilterProps) {
+  const handleSubmit = (values, bag) => {
+    return onSubmit && onSubmit(values, bag);
+  };
+
+  const formInitialValues = {
+    ...defaultValues,
+    ...initialValues,
+  };
+
+  return (
+    <Formik
+      initialValues={formInitialValues}
+      onSubmit={handleSubmit}
+      validationSchema={validationSchema}
+    >
+      <Form>
+        <Stack spacing={15}>
+          <Group spacing={10}>
+            <AccountTransactionDatePeriodField />
+
+            <FFormGroup
+              name={'fromDate'}
+              label={'From Date'}
+              style={{ marginBottom: 0, flex: '1' }}
+            >
+              <FDateInput
+                name={'fromDate'}
+                popoverProps={{ position: Position.BOTTOM, minimal: true }}
+                formatDate={(date) => date.toLocaleDateString()}
+                parseDate={(str) => new Date(str)}
+                inputProps={{
+                  fill: true,
+                  placeholder: 'MM/DD/YYY',
+                  leftElement: <Icon icon={'date-range'} />,
+                }}
+              />
+            </FFormGroup>
+
+            <FormGroup
+              label={'To Date'}
+              name={'toDate'}
+              style={{ marginBottom: 0, flex: '1' }}
+            >
+              <FDateInput
+                name={'toDate'}
+                popoverProps={{ position: Position.BOTTOM, minimal: true }}
+                formatDate={(date) => date.toLocaleDateString()}
+                parseDate={(str) => new Date(str)}
+                inputProps={{
+                  fill: true,
+                  placeholder: 'MM/DD/YYY',
+                  leftElement: <Icon icon={'date-range'} />,
+                }}
+              />
+            </FormGroup>
+          </Group>
+
+          <AccountTransactionsDateFilterFooter />
+        </Stack>
+      </Form>
+    </Formik>
+  );
+}
+
+function AccountTransactionsDateFilterFooter() {
+  const { submitForm, setValues } = useFormikContext();
+
+  const handleFilterBtnClick = () => {
+    submitForm();
+  };
+  const handleClearBtnClick = () => {
+    setValues({
+      ...defaultValues,
+    });
+    submitForm();
+  };
+
+  return (
+    <Group spacing={10}>
+      <Button
+        small
+        intent={Intent.PRIMARY}
+        onClick={handleFilterBtnClick}
+        style={{ minWidth: 75 }}
+      >
+        Filter
+      </Button>
+
+      <Button
+        intent={Intent.DANGER}
+        small
+        onClick={handleClearBtnClick}
+        minimal
+      >
+        Clear
+      </Button>
+    </Group>
+  );
+}
+
+function AccountTransactionDatePeriodField() {
+  const { setFieldValue } = useFormikContext();
+
+  const handleItemChange = (item) => {
+    const { fromDate, toDate } = getDateRangePeriod(item.value);
+
+    setFieldValue('fromDate', fromDate);
+    setFieldValue('toDate', toDate);
+    setFieldValue('period', item.value);
+  };
+
+  return (
+    <FFormGroup
+      name={'period'}
+      label={'Date'}
+      style={{ marginBottom: 0, flex: '0 28%' }}
+    >
+      <FSelect
+        name={'period'}
+        items={periodOptions}
+        onItemSelect={handleItemChange}
+        popoverProps={{ captureDismiss: true }}
+      />
+    </FFormGroup>
+  );
+}
+
+const periodOptions = [
+  { text: 'All Dates', value: 'all_dates' },
+  { text: 'Custom', value: 'custom' },
+  { text: 'Today', value: 'today' },
+  { text: 'Yesterday', value: 'yesterday' },
+  { text: 'This week', value: 'this_week' },
+  { text: 'This year', value: 'this_year' },
+  { text: 'This month', value: 'this_month' },
+  { text: 'last week', value: 'last_week' },
+  { text: 'Last year', value: 'last_year' },
+  { text: 'Last month', value: 'last_month' },
+  { text: 'Last month', value: 'last_month' },
+];
+
+const getDateRangePeriod = (period: string) => {
+  switch (period) {
+    case 'today':
+      return {
+        fromDate: moment().startOf('day').toDate(),
+        toDate: moment().endOf('day').toDate(),
+      };
+    case 'yesterday':
+      return {
+        fromDate: moment().subtract(1, 'days').startOf('day').toDate(),
+        toDate: moment().subtract(1, 'days').endOf('day').toDate(),
+      };
+    case 'this_week':
+      return {
+        fromDate: moment().startOf('week').toDate(),
+        toDate: moment().endOf('week').toDate(),
+      };
+    case 'this_month':
+      return {
+        fromDate: moment().startOf('month').toDate(),
+        toDate: moment().endOf('month').toDate(),
+      };
+    case 'this_year':
+      return {
+        fromDate: moment().startOf('year').toDate(),
+        toDate: moment().endOf('year').toDate(),
+      };
+    case 'last_week':
+      return {
+        fromDate: moment().subtract(1, 'weeks').startOf('week').toDate(),
+        toDate: moment().subtract(1, 'weeks').endOf('week').toDate(),
+      };
+    case 'last_month':
+      return {
+        fromDate: moment().subtract(1, 'months').startOf('month').toDate(),
+        toDate: moment().subtract(1, 'months').endOf('month').toDate(),
+      };
+    case 'last_year':
+      return {
+        fromDate: moment().subtract(1, 'years').startOf('year').toDate(),
+        toDate: moment().subtract(1, 'years').endOf('year').toDate(),
+      };
+    case 'all_dates':
+    case 'custom':
+    default:
+      return { fromDate: null, toDate: null };
+  }
+};

packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizeFilter.tsx

@@ -1,10 +1,12 @@
 // @ts-nocheck
-import * as R from 'ramda';
 import { useMemo } from 'react';
+import * as R from 'ramda';
 import { useAppQueryString } from '@/hooks';
-import { Group } from '@/components';
+import { Group, Stack, } from '@/components';
 import { useAccountTransactionsContext } from './AccountTransactionsProvider';
 import { TagsControl } from '@/components/TagsControl';
+import { AccountUncategorizedDateFilter } from './UncategorizedTransactions/AccountUncategorizedDateFilter';
+import { Divider } from '@blueprintjs/core';
 
 export function AccountTransactionsUncategorizeFilter() {
   const { bankAccountMetaSummary } = useAccountTransactionsContext();
@@ -54,12 +56,17 @@ export function AccountTransactionsUncategorizeFilter() {
   );
 
   return (
-    <Group position={'apart'}>
+    <Group position={'apart'} style={{ marginBottom: 14 }}>
-      <TagsControl
+      <Group align={'stretch'} spacing={10}>
-        options={options}
+        <TagsControl
-        value={locationQuery?.uncategorizedFilter || 'all'}
+          options={options}
-        onValueChange={handleTabsChange}
+          value={locationQuery?.uncategorizedFilter || 'all'}
-      />
+          onValueChange={handleTabsChange}
+        />
+        <Divider />
+        <AccountUncategorizedDateFilter />
+      </Group>
+
       <TagsControl
         options={[{ value: 'excluded', label: 'Excluded' }]}
         value={locationQuery?.uncategorizedFilter || 'all'}

packages/webapp/src/containers/CashFlow/AccountTransactions/AllTransactionsUncategorizedBoot.tsx

@@ -2,9 +2,11 @@
 
 import React from 'react';
 import { flatten, map } from 'lodash';
+import * as R from 'ramda';
 import { IntersectionObserver } from '@/components';
 import { useAccountUncategorizedTransactionsInfinity } from '@/hooks/query';
 import { useAccountTransactionsContext } from './AccountTransactionsProvider';
+import { withBanking } from '../withBanking';
 
 const AccountUncategorizedTransactionsContext = React.createContext();
 
@@ -13,9 +15,15 @@ function flattenInfinityPagesData(data) {
 }
 
 /**
- * Account uncategorized transctions provider.
+ * Account un-categorized transactions provider.
  */
-function AccountUncategorizedTransactionsBoot({ children }) {
+function AccountUncategorizedTransactionsBootRoot({
+  // #withBanking
+  uncategorizedTransactionsFilter,
+
+  // #ownProps
+  children,
+}) {
   const { accountId } = useAccountTransactionsContext();
 
   // Fetches the uncategorized transactions.
@@ -29,6 +37,8 @@ function AccountUncategorizedTransactionsBoot({ children }) {
     hasNextPage: hasUncategorizedTransactionsNextPage,
   } = useAccountUncategorizedTransactionsInfinity(accountId, {
     page_size: 50,
+    min_date: uncategorizedTransactionsFilter?.fromDate || null,
+    max_date: uncategorizedTransactionsFilter?.toDate || null,
   });
   // Memorized the cashflow account transactions.
   const uncategorizedTransactions = React.useMemo(
@@ -69,6 +79,12 @@ function AccountUncategorizedTransactionsBoot({ children }) {
   );
 }
 
+const AccountUncategorizedTransactionsBoot = R.compose(
+  withBanking(({ uncategorizedTransactionsFilter }) => ({
+    uncategorizedTransactionsFilter,
+  })),
+)(AccountUncategorizedTransactionsBootRoot);
+
 const useAccountUncategorizedTransactionsContext = () =>
   React.useContext(AccountUncategorizedTransactionsContext);
 

packages/webapp/src/containers/CashFlow/AccountTransactions/ExcludedTransactions/ExcludedTransactionsTableBoot.tsx

@@ -1,9 +1,11 @@
 // @ts-nocheck
 import React from 'react';
 import { flatten, map } from 'lodash';
+import * as R from 'ramda';
 import { IntersectionObserver } from '@/components';
 import { useAccountTransactionsContext } from '../AccountTransactionsProvider';
 import { useExcludedBankTransactionsInfinity } from '@/hooks/query/bank-rules';
+import { withBanking } from '../../withBanking';
 
 interface ExcludedBankTransactionsContextValue {
   isExcludedTransactionsLoading: boolean;
@@ -27,7 +29,11 @@ interface ExcludedBankTransactionsTableBootProps {
 /**
  * Account uncategorized transctions provider.
  */
-function ExcludedBankTransactionsTableBoot({
+function ExcludedBankTransactionsTableBootRoot({
+  // #withBanking
+  uncategorizedTransactionsFilter,
+
+  // #ownProps
   children,
 }: ExcludedBankTransactionsTableBootProps) {
   const { accountId } = useAccountTransactionsContext();
@@ -44,6 +50,8 @@ function ExcludedBankTransactionsTableBoot({
   } = useExcludedBankTransactionsInfinity({
     page_size: 50,
     account_id: accountId,
+    min_date: uncategorizedTransactionsFilter?.fromDate || null,
+    max_date: uncategorizedTransactionsFilter.toDate || null,
   });
   // Memorized the cashflow account transactions.
   const excludedBankTransactions = React.useMemo(
@@ -84,6 +92,12 @@ function ExcludedBankTransactionsTableBoot({
   );
 }
 
+const ExcludedBankTransactionsTableBoot = R.compose(
+  withBanking(({ uncategorizedTransactionsFilter }) => ({
+    uncategorizedTransactionsFilter,
+  })),
+)(ExcludedBankTransactionsTableBootRoot);
+
 const useExcludedTransactionsBoot = () =>
   React.useContext(ExcludedTransactionsContext);
 

packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/RecognizedTransactionsTableBoot.tsx

@@ -1,9 +1,11 @@
 // @ts-nocheck
 import React from 'react';
 import { flatten, map } from 'lodash';
-import { IntersectionObserver } from '@/components';
+import * as R from 'ramda';
+import { IntersectionObserver, NumericInputCell } from '@/components';
 import { useAccountTransactionsContext } from '../AccountTransactionsProvider';
 import { useRecognizedBankTransactionsInfinity } from '@/hooks/query/bank-rules';
+import { withBanking } from '../../withBanking';
 
 interface RecognizedTransactionsContextValue {
   isRecongizedTransactionsLoading: boolean;
@@ -27,7 +29,10 @@ interface RecognizedTransactionsTableBootProps {
 /**
  * Account uncategorized transctions provider.
  */
-function RecognizedTransactionsTableBoot({
+function RecognizedTransactionsTableBootRoot({
+  // #withBanking
+  uncategorizedTransactionsFilter,
+
   children,
 }: RecognizedTransactionsTableBootProps) {
   const { accountId } = useAccountTransactionsContext();
@@ -44,6 +49,8 @@ function RecognizedTransactionsTableBoot({
   } = useRecognizedBankTransactionsInfinity({
     page_size: 50,
     account_id: accountId,
+    min_date: uncategorizedTransactionsFilter.fromDate || null,
+    max_date: uncategorizedTransactionsFilter?.toDate || null,
   });
   // Memorized the cashflow account transactions.
   const recognizedTransactions = React.useMemo(
@@ -84,6 +91,12 @@ function RecognizedTransactionsTableBoot({
   );
 }
 
+const RecognizedTransactionsTableBoot = R.compose(
+  withBanking(({ uncategorizedTransactionsFilter }) => ({
+    uncategorizedTransactionsFilter,
+  })),
+)(RecognizedTransactionsTableBootRoot);
+
 const useRecognizedTransactionsBoot = () =>
   React.useContext(RecognizedTransactionsContext);
 

packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/AccountUncategorizedDateFilter.tsx

@@ -0,0 +1,105 @@
+// @ts-nocheck
+import { useState } from 'react';
+import * as R from 'ramda';
+import moment from 'moment';
+import { Box, Icon } from '@/components';
+import { Classes, Popover, Position } from '@blueprintjs/core';
+import { withBankingActions } from '../../withBankingActions';
+import { withBanking } from '../../withBanking';
+import { AccountTransactionsDateFilterForm } from '../AccountTransactionsDateFilter';
+import { TagButton } from './TagButton';
+
+function AccountUncategorizedDateFilterRoot({
+  uncategorizedTransactionsFilter,
+}) {
+  const fromDate = uncategorizedTransactionsFilter?.fromDate;
+  const toDate = uncategorizedTransactionsFilter?.toDate;
+
+  const fromDateFormatted = moment(fromDate).isSame(
+    moment().format('YYYY'),
+    'year',
+  )
+    ? moment(fromDate).format('MMM, DD')
+    : moment(fromDate).format('MMM, DD, YYYY');
+  const toDateFormatted = moment(toDate).isSame(moment().format('YYYY'), 'year')
+    ? moment(toDate).format('MMM, DD')
+    : moment(toDate).format('MMM, DD, YYYY');
+
+  const buttonText =
+    fromDate && toDate
+      ? `Date: ${fromDateFormatted} → ${toDateFormatted}`
+      : 'Date Filter';
+
+  // Popover open state.
+  const [isOpen, setIsOpen] = useState<boolean>(false);
+
+  // Handle the filter form submitting.
+  const handleSubmit = () => {
+    setIsOpen(false);
+  };
+
+  return (
+    <Popover
+      content={
+        <Box style={{ padding: 18 }}>
+          <UncategorizedTransactionsDateFilter onSubmit={handleSubmit} />
+        </Box>
+      }
+      position={Position.RIGHT}
+      popoverClassName={Classes.POPOVER_CONTENT}
+      isOpen={isOpen}
+      onClose={() => setIsOpen(false)}
+    >
+      <TagButton
+        outline
+        icon={<Icon icon={'date-range'} />}
+        onClick={() => setIsOpen(!isOpen)}
+      >
+        {buttonText}
+      </TagButton>
+    </Popover>
+  );
+}
+
+export const AccountUncategorizedDateFilter = R.compose(
+  withBanking(({ uncategorizedTransactionsFilter }) => ({
+    uncategorizedTransactionsFilter,
+  })),
+)(AccountUncategorizedDateFilterRoot);
+
+export const UncategorizedTransactionsDateFilter = R.compose(
+  withBankingActions,
+  withBanking(({ uncategorizedTransactionsFilter }) => ({
+    uncategorizedTransactionsFilter,
+  })),
+)(
+  ({
+    // #withBankingActions
+    setUncategorizedTransactionsFilter,
+
+    // #withBanking
+    uncategorizedTransactionsFilter,
+
+    // #ownProps
+    onSubmit,
+  }) => {
+    const initialValues = {
+      ...uncategorizedTransactionsFilter,
+    };
+
+    const handleSubmit = (values) => {
+      setUncategorizedTransactionsFilter({
+        fromDate: values.fromDate,
+        toDate: values.toDate,
+      });
+      onSubmit && onSubmit(values);
+    };
+
+    return (
+      <AccountTransactionsDateFilterForm
+        initialValues={initialValues}
+        onSubmit={handleSubmit}
+      />
+    );
+  },
+);

packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/TagButton.module.scss

@@ -0,0 +1,11 @@
+.root{
+  min-height: 26px;
+  border-radius: 15px;
+  font-size: 13px;
+  padding: 0 10px;
+
+  &:global(.bp4-button:not([class*=bp4-intent-]):not(.bp4-minimal)) {
+    background: #fff;
+    border: 1px solid #e1e2e8;
+  }
+}

packages/webapp/src/containers/CashFlow/AccountTransactions/UncategorizedTransactions/TagButton.tsx

@@ -0,0 +1,9 @@
+// @ts-nocheck
+import { Button } from "@blueprintjs/core"
+import styles from './TagButton.module.scss';
+
+
+
+export const TagButton = (props) => {
+  return <Button  {...props} className={styles.root} />
+}

packages/webapp/src/containers/CashFlow/withBanking.ts

@@ -25,6 +25,8 @@ export const withBanking = (mapState) => {
 
       categorizedTransactionsSelected:
         state.plaid.categorizedTransactionsSelected,
+
+      uncategorizedTransactionsFilter: state.plaid.uncategorizedFilter
     };
     return mapState ? mapState(mapped, state, props) : mapped;
   };

packages/webapp/src/containers/CashFlow/withBankingActions.ts

@@ -15,6 +15,8 @@ import {
   removeTransactionsToCategorizeSelected,
   setCategorizedTransactionsSelected,
   resetCategorizedTransactionsSelected,
+  setUncategorizedTransactionsFilter,
+  resetUncategorizedTranasctionsFilter,
 } from '@/store/banking/banking.reducer';
 
 export interface WithBankingActionsProps {
@@ -40,6 +42,9 @@ export interface WithBankingActionsProps {
 
   setCategorizedTransactionsSelected: (ids: Array<string | number>) => void;
   resetCategorizedTransactionsSelected: () => void;
+
+  setUncategorizedTransactionsFilter: (filter: any) => void;
+  resetUncategorizedTranasctionsFilter: () => void;
 }
 
 const mapDipatchToProps = (dispatch: any): WithBankingActionsProps => ({
@@ -138,6 +143,19 @@ const mapDipatchToProps = (dispatch: any): WithBankingActionsProps => ({
    */
   resetCategorizedTransactionsSelected: () =>
     dispatch(resetCategorizedTransactionsSelected()),
+
+  /**
+   * Sets the uncategorized transactions filter.
+   * @param {any} filter -
+   */
+  setUncategorizedTransactionsFilter: (filter: any) =>
+    dispatch(setUncategorizedTransactionsFilter({ filter })),
+
+  /**
+   * Resets the uncategorized transactions filter.
+   */
+  resetUncategorizedTranasctionsFilter: () =>
+    dispatch(resetUncategorizedTranasctionsFilter()),
 });
 
 export const withBankingActions = connect<

packages/webapp/src/containers/OneClickDemo/EnsureOneClickDemoAccountEnabled.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Redirect } from 'react-router-dom';
-import { Config } from '@/config';
+import { useOneClickDemoBoot } from './OneClickDemoBoot';
 
 interface EnsureOneClickDemoAccountEnabledProps {
   children: React.ReactNode;
@@ -11,9 +11,10 @@ export const EnsureOneClickDemoAccountEnabled = ({
   children,
   redirectTo = '/',
 }: EnsureOneClickDemoAccountEnabledProps) => {
-  const enabeld = Config.oneClickDemo.enable || false;
+  const { authMeta } = useOneClickDemoBoot();
+  const enabled = authMeta?.meta?.one_click_demo?.enable || false;
 
-  if (!enabeld) {
+  if (!enabled) {
     return <Redirect to={{ pathname: redirectTo }} />;
   }
   return <>{children}</>;

packages/webapp/src/containers/OneClickDemo/OneClickDemoBoot.tsx

@@ -0,0 +1,45 @@
+import React, { createContext, useContext, ReactNode } from 'react';
+import { useAuthMetadata } from '@/hooks/query/authentication';
+
+interface OneClickDemoContextType {
+  authMeta: any;
+}
+
+const OneClickDemoContext = createContext<OneClickDemoContextType>(
+  {} as OneClickDemoContextType,
+);
+
+export const useOneClickDemoBoot = () => {
+  const context = useContext(OneClickDemoContext);
+
+  if (!context) {
+    throw new Error(
+      'useOneClickDemo must be used within a OneClickDemoProvider',
+    );
+  }
+  return context;
+};
+
+interface OneClickDemoBootProps {
+  children: ReactNode;
+}
+
+export const OneClickDemoBoot: React.FC<OneClickDemoBootProps> = ({
+  children,
+}) => {
+  const { isLoading: isAuthMetaLoading, data: authMeta } = useAuthMetadata();
+
+  const value = {
+    isAuthMetaLoading,
+    authMeta,
+  };
+
+  if (isAuthMetaLoading) {
+    return null;
+  }
+  return (
+    <OneClickDemoContext.Provider value={value}>
+      {children}
+    </OneClickDemoContext.Provider>
+  );
+};

packages/webapp/src/containers/OneClickDemo/OneClickDemoPage.tsx

@@ -1,97 +1,16 @@
-// @ts-nocheck
+import { EnsureAuthNotAuthenticated } from '@/components/Guards/EnsureAuthNotAuthenticated';
-import { Button, Intent, ProgressBar, Text } from '@blueprintjs/core';
+import { EnsureOneClickDemoAccountEnabled } from './EnsureOneClickDemoAccountEnabled';
-import { useEffect, useState } from 'react';
+import { OneClickDemoBoot } from './OneClickDemoBoot';
-import {
+import { OneClickDemoPageContent } from './OneClickDemoPageContent';
-  useCreateOneClickDemo,
-  useOneClickDemoSignin,
-} from '@/hooks/query/oneclick-demo';
-import { Box, Icon, Stack } from '@/components';
-import { useJob } from '@/hooks/query';
-import style from './OneClickDemoPage.module.scss';
 
 export default function OneClickDemoPage() {
-  const {
-    mutateAsync: createOneClickDemo,
-    isLoading: isCreateOneClickLoading,
-  } = useCreateOneClickDemo();
-  const {
-    mutateAsync: oneClickDemoSignIn,
-    isLoading: isOneclickDemoSigningIn,
-  } = useOneClickDemoSignin();
-
-  // Job states.
-  const [demoId, setDemoId] = useState<string>('');
-  const [buildJobId, setBuildJobId] = useState<string>('');
-  const [isJobDone, setIsJobDone] = useState<boolean>(false);
-
-  const {
-    data: { running, completed },
-  } = useJob(buildJobId, {
-    refetchInterval: 2000,
-    enabled: !isJobDone && !!buildJobId,
-  });
-
-  useEffect(() => {
-    if (completed) {
-      setIsJobDone(true);
-    }
-  }, [completed, setIsJobDone]);
-
-  // One the job done request sign-in using the demo id.
-  useEffect(() => {
-    if (isJobDone) {
-      oneClickDemoSignIn({ demoId }).then((res) => {
-        debugger;
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isJobDone]);
-
-  const handleCreateAccountBtnClick = () => {
-    createOneClickDemo({})
-      .then(({ data: { data } }) => {
-        setBuildJobId(data?.build_job?.job_id);
-        setDemoId(data?.demo_id);
-      })
-      .catch(() => {});
-  };
-  const isLoading = running || isOneclickDemoSigningIn;
-
   return (
-    <Box className={style.root}>
+    <EnsureAuthNotAuthenticated>
-      <Box className={style.inner}>
+      <OneClickDemoBoot>
-        <Stack align={'center'} spacing={40}>
+        <EnsureOneClickDemoAccountEnabled>
-          <Icon icon="bigcapital" height={37} width={228} />
+          <OneClickDemoPageContent />
-
+        </EnsureOneClickDemoAccountEnabled>
-          {isLoading && (
+      </OneClickDemoBoot>
-            <Stack align={'center'} spacing={15}>
+    </EnsureAuthNotAuthenticated>
-              <ProgressBar stripes value={null} className={style.progressBar} />
-              {isOneclickDemoSigningIn && (
-                <Text className={style.waitingText}>
-                  It's signin-in to your demo account, Just a second!
-                </Text>
-              )}
-              {running && (
-                <Text className={style.waitingText}>
-                  We're preparing temporary environment for trial, It typically
-                  take few seconds. Do not close or refresh the page.
-                </Text>
-              )}
-            </Stack>
-          )}
-        </Stack>
-
-        {!isLoading && (
-          <Button
-            className={style.oneClickBtn}
-            intent={Intent.NONE}
-            onClick={handleCreateAccountBtnClick}
-            loading={isCreateOneClickLoading}
-          >
-            Create Demo Account
-          </Button>
-        )}
-      </Box>
-    </Box>
   );
 }

packages/webapp/src/containers/OneClickDemo/OneClickDemoPageContent.tsx

@@ -0,0 +1,98 @@
+// @ts-nocheck
+import { Button, Intent, ProgressBar, Text } from '@blueprintjs/core';
+import { useEffect, useState } from 'react';
+import {
+  useCreateOneClickDemo,
+  useOneClickDemoSignin,
+} from '@/hooks/query/oneclick-demo';
+import { Box, Icon, Stack } from '@/components';
+import { useJob } from '@/hooks/query';
+import style from './OneClickDemoPage.module.scss';
+
+export function OneClickDemoPageContent() {
+  const {
+    mutateAsync: createOneClickDemo,
+    isLoading: isCreateOneClickLoading,
+  } = useCreateOneClickDemo();
+  const {
+    mutateAsync: oneClickDemoSignIn,
+    isLoading: isOneclickDemoSigningIn,
+  } = useOneClickDemoSignin();
+
+  // Job states.
+  const [demoId, setDemoId] = useState<string>('');
+  const [buildJobId, setBuildJobId] = useState<string>('');
+  const [isJobDone, setIsJobDone] = useState<boolean>(false);
+
+  const {
+    data: { running, completed },
+  } = useJob(buildJobId, {
+    refetchInterval: 2000,
+    enabled: !isJobDone && !!buildJobId,
+  });
+
+  useEffect(() => {
+    if (completed) {
+      setIsJobDone(true);
+    }
+  }, [completed, setIsJobDone]);
+
+  // One the job done request sign-in using the demo id.
+  useEffect(() => {
+    if (isJobDone) {
+      oneClickDemoSignIn({ demoId }).then((res) => {
+        debugger;
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isJobDone]);
+
+  const handleCreateAccountBtnClick = () => {
+    createOneClickDemo({})
+      .then(({ data: { data } }) => {
+        setBuildJobId(data?.build_job?.job_id);
+        setDemoId(data?.demo_id);
+      })
+      .catch(() => {});
+  };
+  const isLoading = running || isOneclickDemoSigningIn;
+
+  return (
+    <Box className={style.root}>
+      <Box className={style.inner}>
+        <Stack align={'center'} spacing={40}>
+          <Icon icon="bigcapital" height={37} width={228} />
+
+          {isLoading && (
+            <Stack align={'center'} spacing={15}>
+              <ProgressBar stripes value={null} className={style.progressBar} />
+              {isOneclickDemoSigningIn && (
+                <Text className={style.waitingText}>
+                  It's signin-in to your demo account, Just a second!
+                </Text>
+              )}
+              {running && (
+                <Text className={style.waitingText}>
+                  We're preparing the temporary environment for trial. It
+                  typically takes a few seconds. Do not close or refresh the
+                  page.
+                </Text>
+              )}
+            </Stack>
+          )}
+        </Stack>
+
+        {!isLoading && (
+          <Button
+            className={style.oneClickBtn}
+            intent={Intent.NONE}
+            onClick={handleCreateAccountBtnClick}
+            loading={isCreateOneClickLoading}
+          >
+            Create Demo Account
+          </Button>
+        )}
+      </Box>
+    </Box>
+  );
+}

packages/webapp/src/containers/Setup/SetupLeftSection.module.scss

@@ -2,9 +2,9 @@
   width: 100%;
   margin-bottom: 2rem;
   background: transparent;
-  color: rgba(255, 255, 255, 0.75);
+  color: rgba(255, 255, 255, 0.6);
-  border: 1px solid rgb(255, 255, 255, 0.3);
+  border: 1px solid rgb(255, 255, 255, 0.2);
-  padding: 10px;
+  padding: 8px;
   font-size: 13px;
   font-weight: 500;
   border-radius: 5px;
@@ -12,11 +12,11 @@
   transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
 
   &:hover {
-    color: rgba(255, 255, 255, 0.95);
+    color: rgba(255, 255, 255, 0.7);
-    border: 1px solid rgb(255, 255, 255, 0.6);   
+    border: 1px solid rgb(255, 255, 255, 0.3);   
   }
 }
 .demoButtonLabel{
-  color: rgba(255, 255, 255, 0.75);
+  color: rgba(255, 255, 255, 0.5);
   font-size: 13px;
 }

packages/webapp/src/containers/Setup/SetupLeftSection.tsx

@@ -6,7 +6,7 @@ import { Icon, For, FormattedMessage as T, Stack } from '@/components';
 import { getFooterLinks } from '@/constants/footerLinks';
 import { useAuthActions } from '@/hooks/state';
 import style from './SetupLeftSection.module.scss';
-import { Config } from '@/config';
+import { useAuthMetadata } from '@/hooks/query';
 
 /**
  * Footer item link.
@@ -28,13 +28,16 @@ function SetupLeftSectionFooter() {
   // Retrieve the footer links.
   const footerLinks = getFooterLinks();
 
+  const { data: authMeta } = useAuthMetadata();
+  const demoUrl = authMeta?.meta?.one_click_demo?.demo_url;
+
   const handleDemoBtnClick = () => {
-    window.open(Config.oneClickDemo.demoUrl);
+    window.open(demoUrl);
   };
 
   return (
     <div className={'content__footer'}>
-      {Config.oneClickDemo.demoUrl && (
+      {demoUrl && (
         <Stack spacing={16}>
           <Text className={style.demoButtonLabel}>Not Now?</Text>
           <button className={style.demoButton} onClick={handleDemoBtnClick}>

packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansOfferChecks.module.scss

@@ -0,0 +1,20 @@
+.container {
+  text-align: center;
+  margin-bottom: 1.15rem;
+}
+
+.iconText {
+  display: inline-flex;
+  font-size: 14px;
+  margin-right: 16px;
+  color: #00824d;
+
+  &:last-child {
+    margin-right: 0; /* Remove the margin on the last item */
+  }
+  
+}
+
+.icon {
+  margin-right: 2px;
+}

packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansOfferChecks.tsx

@@ -0,0 +1,35 @@
+import styles from './SubscriptionPlansOfferChecks.module.scss';
+
+export function SubscriptionPlansOfferChecks() {
+  return (
+    <div className={styles.container}>
+      <span className={styles.iconText}>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          height="18px"
+          width="18px"
+          viewBox="0 -960 960 960"
+          fill="rgb(0, 130, 77)"
+          className={styles.icon}
+        >
+          <path d="M378-225 133-470l66-66 179 180 382-382 66 65-448 448Z"></path>
+        </svg>
+        14-day free trial
+      </span>
+
+      <span className={styles.iconText}>
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          height="18px"
+          width="18px"
+          viewBox="0 -960 960 960"
+          fill="rgb(0, 130, 77)"
+          className={styles.icon}
+        >
+          <path d="M378-225 133-470l66-66 179 180 382-382 66 65-448 448Z"></path>
+        </svg>
+        24/7 online support
+      </span>
+    </div>
+  );
+}

packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansPeriodSwitcher.tsx

@@ -24,7 +24,7 @@ function SubscriptionPlansPeriodSwitcherRoot({
     );
   };
   return (
-    <Group position={'center'} spacing={10} style={{ marginBottom: '1.2rem' }}>
+    <Group position={'center'} spacing={10} style={{ marginBottom: '1.6rem' }}>
       <Text>Pay Monthly</Text>
       <Switch
         large

packages/webapp/src/containers/Setup/SetupSubscription/SubscriptionPlansSection.tsx

@@ -1,6 +1,7 @@
 import { Callout } from '@blueprintjs/core';
 import { SubscriptionPlans } from './SubscriptionPlans';
 import { SubscriptionPlansPeriodSwitcher } from './SubscriptionPlansPeriodSwitcher';
+import { SubscriptionPlansOfferChecks } from './SubscriptionPlansOfferChecks';
 
 /**
  * Billing plans.
@@ -14,6 +15,7 @@ export function SubscriptionPlansSection() {
         include applicable taxes.
       </Callout>
 
+      <SubscriptionPlansOfferChecks />
       <SubscriptionPlansPeriodSwitcher />
       <SubscriptionPlans />
     </section>

packages/webapp/src/containers/Setup/WizardSetupPage.tsx

@@ -2,14 +2,17 @@
 import React from 'react';
 import SetupRightSection from './SetupRightSection';
 import SetupLeftSection from './SetupLeftSection';
+import EnsureOrganizationIsNotReady from '@/components/Guards/EnsureOrganizationIsNotReady';
 
 import '@/style/pages/Setup/SetupPage.scss';
 
 export default function WizardSetupPage() {
   return (
-    <div class="setup-page">
+    <EnsureOrganizationIsNotReady>
-      <SetupLeftSection />
+      <div class="setup-page">
-      <SetupRightSection />
+        <SetupLeftSection />
-    </div>
+        <SetupRightSection />
+      </div>
+    </EnsureOrganizationIsNotReady>
   );
-};
+}

packages/webapp/src/hooks/query/authentication.tsx

@@ -100,7 +100,7 @@ export const useAuthResetPassword = (props) => {
 /**
  * Fetches the authentication page metadata.
  */
-export const useAuthMetadata = (props) => {
+export const useAuthMetadata = (props = {}) => {
   return useRequestQuery(
     [t.AUTH_METADATA_PAGE],
     {

packages/webapp/src/hooks/query/cashflowAccounts.tsx

@@ -152,7 +152,7 @@ export function useAccountUncategorizedTransactionsInfinity(
   const apiRequest = useApiRequest();
 
   return useInfiniteQuery(
-    [t.CASHFLOW_ACCOUNT_UNCATEGORIZED_TRANSACTIONS_INFINITY, accountId],
+    [t.CASHFLOW_ACCOUNT_UNCATEGORIZED_TRANSACTIONS_INFINITY, accountId, query],
     async ({ pageParam = 1 }) => {
       const response = await apiRequest.http({
         ...axios,

packages/webapp/src/hooks/query/subscription.tsx

@@ -12,7 +12,7 @@ import useApiRequest from '../useRequest';
 import { transformToCamelCase } from '@/utils';
 
 const QueryKeys = {
-  Subscriptions: 'Subscriptions',
+  Subscriptions: 'GetSubscriptions',
 };
 
 interface CancelMainSubscriptionValues {}

packages/webapp/src/routes/authentication.tsx

@@ -1,43 +1,35 @@
 // @ts-nocheck
-import LazyLoader from '@/components/LazyLoader';
+import { lazy } from 'react';
 
 const BASE_URL = '/auth';
 
 export default [
   {
     path: `${BASE_URL}/login`,
-    component: LazyLoader({
+    component: lazy(() => import('@/containers/Authentication/Login')),
-      loader: () => import('@/containers/Authentication/Login'),
-    }),
   },
   {
     path: `${BASE_URL}/send_reset_password`,
-    component: LazyLoader({
+    component: lazy(
-      loader: () => import('@/containers/Authentication/SendResetPassword'),
+      () => import('@/containers/Authentication/SendResetPassword'),
-    }),
+    ),
   },
   {
     path: `${BASE_URL}/reset_password/:token`,
-    component: LazyLoader({
+    component: lazy(() => import('@/containers/Authentication/ResetPassword')),
-      loader: () => import('@/containers/Authentication/ResetPassword'),
-    }),
   },
   {
     path: `${BASE_URL}/invite/:token/accept`,
-    component: LazyLoader({
+    component: lazy(() => import('@/containers/Authentication/InviteAccept')),
-      loader: () => import('@/containers/Authentication/InviteAccept'),
-    }),
   },
   {
     path: `${BASE_URL}/register/email_confirmation`,
-    component: LazyLoader({
+    component: lazy(
-      loader: () => import('@/containers/Authentication/EmailConfirmation'),
+      () => import('@/containers/Authentication/EmailConfirmation'),
-    }),
+    ),
   },
   {
     path: `${BASE_URL}/register`,
-    component: LazyLoader({
+    component: lazy(() => import('@/containers/Authentication/Register')),
-      loader: () => import('@/containers/Authentication/Register'),
-    }),
   },
 ];

packages/webapp/src/routes/preferences.tsx

@@ -1,103 +1,111 @@
 // @ts-nocheck
 import { lazy } from 'react';
-import General from '@/containers/Preferences/General/General';
-import Users from '../containers/Preferences/Users/Users';
-import Roles from '../containers/Preferences/Users/Roles/RolesForm/RolesFormPage';
-import Accountant from '@/containers/Preferences/Accountant/Accountant';
-import Currencies from '@/containers/Preferences/Currencies/Currencies';
-import Item from '@/containers/Preferences/Item';
-import SMSIntegration from '../containers/Preferences/SMSIntegration';
-import DefaultRoute from '../containers/Preferences/DefaultRoute';
-import Warehouses from '../containers/Preferences/Warehouses';
-import Branches from '../containers/Preferences/Branches';
-import Invoices from '../containers/Preferences/Invoices/PreferencesInvoices';
-import { PreferencesCreditNotes } from '../containers/Preferences/CreditNotes/PreferencesCreditNotes';
-import { PreferencesEstimates } from '@/containers/Preferences/Estimates/PreferencesEstimates';
-import { PreferencesReceipts } from '@/containers/Preferences/Receipts/PreferencesReceipts';
-
-import BillingPage from '@/containers/Subscriptions/BillingPage';
 
 const BASE_URL = '/preferences';
 
-export default [
+export const getPreferenceRoutes = () => [
   {
     path: `${BASE_URL}/general`,
-    component: General,
+    component: lazy(() => import('@/containers/Preferences/General/General')),
     exact: true,
   },
   {
     path: `${BASE_URL}/users`,
-    component: Users,
+    component: lazy(() => import('../containers/Preferences/Users/Users')),
     exact: true,
   },
   {
     path: `${BASE_URL}/invoices`,
-    component: Invoices,
+    component: lazy(
+      () => import('../containers/Preferences/Invoices/PreferencesInvoices'),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/credit-notes`,
-    component: PreferencesCreditNotes,
+    component: lazy(() =>
+      import(
+        '../containers/Preferences/CreditNotes/PreferencesCreditNotes'
+      ).then((module) => ({ default: module.PreferencesCreditNotes })),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/estimates`,
-    component: PreferencesEstimates,
+    component: lazy(() =>
+      import('@/containers/Preferences/Estimates/PreferencesEstimates').then(
+        (module) => ({ default: module.PreferencesEstimates }),
+      ),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/receipts`,
-    component: PreferencesReceipts,
+    component: lazy(() =>
+      import('@/containers/Preferences/Receipts/PreferencesReceipts').then(
+        (module) => ({ default: module.PreferencesReceipts }),
+      ),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/roles`,
-    component: Roles,
+    component: lazy(
+      () =>
+        import('../containers/Preferences/Users/Roles/RolesForm/RolesFormPage'),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/roles/:id`,
-    component: Roles,
+    component: lazy(
+      () =>
+        import('../containers/Preferences/Users/Roles/RolesForm/RolesFormPage'),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/currencies`,
-    component: Currencies,
+    component: lazy(
+      () => import('@/containers/Preferences/Currencies/Currencies'),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/warehouses`,
-    component: Warehouses,
+    component: lazy(() => import('../containers/Preferences/Warehouses')),
     exact: true,
   },
   {
     path: `${BASE_URL}/branches`,
-    component: Branches,
+    component: lazy(() => import('../containers/Preferences/Branches')),
     exact: true,
   },
   {
     path: `${BASE_URL}/accountant`,
-    component: Accountant,
+    component: lazy(
+      () => import('@/containers/Preferences/Accountant/Accountant'),
+    ),
     exact: true,
   },
   {
     path: `${BASE_URL}/items`,
-    component: Item,
+    component: lazy(() => import('@/containers/Preferences/Item')),
-    exact: true,
-  },
-  {
-    path: `${BASE_URL}/sms-message`,
-    component: SMSIntegration,
     exact: true,
   },
+  // {
+  //   path: `${BASE_URL}/sms-message`,
+  //   component: SMSIntegration,
+  //   exact: true,
+  // },
   {
     path: `${BASE_URL}/billing`,
-    component: BillingPage,
+    component: lazy(() => import('@/containers/Subscriptions/BillingPage')),
     exact: true,
   },
   {
     path: `${BASE_URL}/`,
-    component: DefaultRoute,
+    component: lazy(() => import('../containers/Preferences/DefaultRoute')),
     exact: true,
   },
 ];