docs: update .all-contributorsrc [skip ci]

Fix: Enhance Dropzone visual feedback for dropzone

.all-contributorsrc

@@ -150,6 +150,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "Champetaman",
+      "name": "Camilo Oviedo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/64604272?v=4",
+      "profile": "https://www.camilooviedo.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,

README.md

@@ -129,6 +129,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/oleynikd"><img src="https://avatars.githubusercontent.com/u/3976868?v=4?s=100" width="100px;" alt="Denis"/><br /><sub><b>Denis</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Aoleynikd" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://myself.vercel.app/"><img src="https://avatars.githubusercontent.com/u/42431274?v=4?s=100" width="100px;" alt="Sachin Mittal"/><br /><sub><b>Sachin Mittal</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/issues?q=author%3Amittalsam98" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.camilooviedo.com/"><img src="https://avatars.githubusercontent.com/u/64604272?v=4?s=100" width="100px;" alt="Camilo Oviedo"/><br /><sub><b>Camilo Oviedo</b></sub></a><br /><a href="https://github.com/bigcapitalhq/bigcapital/commits?author=Champetaman" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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

@@ -1,9 +1,10 @@
 import { Inject, Service } from 'typedi';
 import { NextFunction, Request, Response, Router } from 'express';
+import { param, query } from 'express-validator';
 import BaseController from '@/api/controllers/BaseController';
 import { GetBankAccountSummary } from '@/services/Banking/BankAccounts/GetBankAccountSummary';
 import { BankAccountsApplication } from '@/services/Banking/BankAccounts/BankAccountsApplication';
-import { param } from 'express-validator';
+import { GetPendingBankAccountTransactions } from '@/services/Cashflow/GetPendingBankAccountTransaction';
 
 @Service()
 export class BankAccountsController extends BaseController {
@@ -13,6 +14,9 @@ export class BankAccountsController extends BaseController {
   @Inject()
   private bankAccountsApp: BankAccountsApplication;
 
+  @Inject()
+  private getPendingTransactionsService: GetPendingBankAccountTransactions;
+
   /**
    * Router constructor.
    */
@@ -20,6 +24,16 @@ export class BankAccountsController extends BaseController {
     const router = Router();
 
     router.get('/:bankAccountId/meta', this.getBankAccountSummary.bind(this));
+    router.get(
+      '/pending_transactions',
+      [
+        query('account_id').optional().isNumeric().toInt(),
+        query('page').optional().isNumeric().toInt(),
+        query('page_size').optional().isNumeric().toInt(),
+      ],
+      this.validationResult,
+      this.getBankAccountsPendingTransactions.bind(this)
+    );
     router.post(
       '/:bankAccountId/disconnect',
       this.disconnectBankAccount.bind(this)
@@ -27,17 +41,13 @@ export class BankAccountsController extends BaseController {
     router.post('/:bankAccountId/update', this.refreshBankAccount.bind(this));
     router.post(
       '/:bankAccountId/pause_feeds',
-      [
+      [param('bankAccountId').exists().isNumeric().toInt()],
-        param('bankAccountId').exists().isNumeric().toInt(),
-      ],
       this.validationResult,
       this.pauseBankAccountFeeds.bind(this)
     );
     router.post(
       '/:bankAccountId/resume_feeds',
-      [
+      [param('bankAccountId').exists().isNumeric().toInt()],
-        param('bankAccountId').exists().isNumeric().toInt(),
-      ],
       this.validationResult,
       this.resumeBankAccountFeeds.bind(this)
     );
@@ -72,6 +82,32 @@ export class BankAccountsController extends BaseController {
     }
   }
 
+  /**
+   * Retrieves the bank account pending transactions.
+   * @param {Request} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   */
+  async getBankAccountsPendingTransactions(
+    req: Request,
+    res: Response,
+    next: NextFunction
+  ) {
+    const { tenantId } = req;
+    const query = this.matchedQueryData(req);
+
+    try {
+      const data =
+        await this.getPendingTransactionsService.getPendingTransactions(
+          tenantId,
+          query
+        );
+      return res.status(200).send(data);
+    } catch (error) {
+      next(error);
+    }
+  }
+
   /**
    * Disonnect the given bank account.
    * @param {Request} req

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

@@ -33,7 +33,16 @@ export class BankingRulesController extends BaseController {
       body('conditions.*.field').exists().isIn(['description', 'amount']),
       body('conditions.*.comparator')
         .exists()
-        .isIn(['equals', 'contains', 'not_contain'])
+        .isIn([
+          'equals',
+          'equal',
+          'contains',
+          'not_contain',
+          'bigger',
+          'bigger_or_equal',
+          'smaller',
+          'smaller_or_equal',
+        ])
         .default('contain')
         .trim(),
       body('conditions.*.value').exists().trim(),

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

@@ -1,5 +1,5 @@
 import { Service, Inject } from 'typedi';
-import { ValidationChain, check, param, query } from 'express-validator';
+import { ValidationChain, body, check, param, query } from 'express-validator';
 import { Router, Request, Response, NextFunction } from 'express';
 import { omit } from 'lodash';
 import BaseController from '../BaseController';
@@ -43,6 +43,16 @@ export default class NewCashflowTransactionController extends BaseController {
       this.asyncMiddleware(this.newCashflowTransaction),
       this.catchServiceErrors
     );
+    router.post(
+      '/transactions/uncategorize/bulk',
+      [
+        body('ids').isArray({ min: 1 }),
+        body('ids.*').exists().isNumeric().toInt(),
+      ],
+      this.validationResult,
+      this.uncategorizeBulkTransactions.bind(this),
+      this.catchServiceErrors
+    );
     router.post(
       '/transactions/:id/uncategorize',
       this.revertCategorizedCashflowTransaction,
@@ -184,6 +194,34 @@ export default class NewCashflowTransactionController extends BaseController {
     }
   };
 
+  /**
+   * Uncategorize the given transactions in bulk.
+   * @param {Request<{}>} req
+   * @param {Response} res
+   * @param {NextFunction} next
+   * @returns {Promise<Response | null>}
+   */
+  private uncategorizeBulkTransactions = async (
+    req: Request<{}>,
+    res: Response,
+    next: NextFunction
+  ) => {
+    const { tenantId } = req;
+    const { ids: uncategorizedTransactionIds } = this.matchedBodyData(req);
+
+    try {
+      await this.cashflowApplication.uncategorizeTransactions(
+        tenantId,
+        uncategorizedTransactionIds
+      );
+      return res.status(200).send({
+        message: 'The given transactions have been uncategorized successfully.',
+      });
+    } catch (error) {
+      next(error);
+    }
+  };
+
   /**
    * Categorize the cashflow transaction.
    * @param {Request} req

packages/server/src/api/controllers/Sales/PaymentReceives.ts

@@ -9,9 +9,9 @@ import {
 } from '@/interfaces';
 import BaseController from '@/api/controllers/BaseController';
 import asyncMiddleware from '@/api/middleware/asyncMiddleware';
-import PaymentReceivesPages from '@/services/Sales/PaymentReceives/PaymentReceivesPages';
+import PaymentsReceivedPages from '@/services/Sales/PaymentReceived/PaymentsReceivedPages';
+import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceived/PaymentReceivedApplication';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
-import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication';
 import CheckPolicies from '@/api/middleware/CheckPolicies';
 import { ServiceError } from '@/exceptions';
 import { ACCEPT_TYPE } from '@/interfaces/Http';
@@ -22,7 +22,7 @@ export default class PaymentReceivesController extends BaseController {
   private paymentReceiveApplication: PaymentReceivesApplication;
 
   @Inject()
-  private PaymentReceivesPages: PaymentReceivesPages;
+  private PaymentsReceivedPages: PaymentsReceivedPages;
 
   @Inject()
   private dynamicListService: DynamicListingService;
@@ -229,7 +229,7 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const storedPaymentReceive =
-        await this.paymentReceiveApplication.createPaymentReceive(
+        await this.paymentReceiveApplication.createPaymentReceived(
           tenantId,
           paymentReceive,
           user
@@ -376,7 +376,7 @@ export default class PaymentReceivesController extends BaseController {
     const { customerId } = this.matchedQueryData(req);
 
     try {
-      const entries = await this.PaymentReceivesPages.getNewPageEntries(
+      const entries = await this.PaymentsReceivedPages.getNewPageEntries(
         tenantId,
         customerId
       );
@@ -404,7 +404,7 @@ export default class PaymentReceivesController extends BaseController {
 
     try {
       const { paymentReceive, entries } =
-        await this.PaymentReceivesPages.getPaymentReceiveEditPage(
+        await this.PaymentsReceivedPages.getPaymentReceiveEditPage(
           tenantId,
           paymentReceiveId,
           user

packages/server/src/database/migrations/20240811121028_add_pending_column_to_uncategorized_transactions_table.js

@@ -0,0 +1,13 @@
+exports.up = function (knex) {
+  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
+    table.boolean('pending').defaultTo(false);
+    table.string('pending_plaid_transaction_id').nullable();
+  });
+};
+
+exports.down = function (knex) {
+  return knex.schema.table('uncategorized_cashflow_transactions', (table) => {
+    table.dropColumn('pending');
+    table.dropColumn('pending_plaid_transaction_id');
+  });
+};

packages/server/src/interfaces/CashFlow.ts

@@ -268,6 +268,8 @@ export interface CreateUncategorizedTransactionDTO {
   description?: string;
   referenceNo?: string | null;
   plaidTransactionId?: string | null;
+  pending?: boolean;
+  pendingPlaidTransactionId?: string | null;
   batch?: string;
 }
 
@@ -283,3 +285,17 @@ export interface IUncategorizedTransactionCreatedEventPayload {
   createUncategorizedTransactionDTO: CreateUncategorizedTransactionDTO;
   trx: Knex.Transaction;
 }
+
+export interface IPendingTransactionRemovingEventPayload {
+  tenantId: number;
+  uncategorizedTransactionId: number;
+  pendingTransaction: IUncategorizedCashflowTransaction;
+  trx?: Knex.Transaction;
+}
+
+export interface IPendingTransactionRemovedEventPayload {
+  tenantId: number;
+  uncategorizedTransactionId: number;
+  pendingTransaction: IUncategorizedCashflowTransaction;
+  trx?: Knex.Transaction;
+}

packages/server/src/interfaces/GeneralLedgerSheet.ts

@@ -30,7 +30,7 @@ export interface IGeneralLedgerSheetAccountTransaction {
   currencyCode: string;
   note?: string;
 
-  transactionType?: string;
+  transactionTypeFormatted: string;
   transactionNumber: string;
 
   referenceId?: number;

packages/server/src/interfaces/PaymentReceive.ts

@@ -8,7 +8,7 @@ import { ILedgerEntry } from './Ledger';
 import { ISaleInvoice } from './SaleInvoice';
 import { AttachmentLinkDTO } from './Attachments';
 
-export interface IPaymentReceive {
+export interface IPaymentReceived {
   id?: number;
   customerId: number;
   paymentDate: Date;
@@ -19,14 +19,14 @@ export interface IPaymentReceive {
   depositAccountId: number;
   paymentReceiveNo: string;
   statement: string;
-  entries: IPaymentReceiveEntry[];
+  entries: IPaymentReceivedEntry[];
   userId: number;
   createdAt: Date;
   updatedAt: Date;
   localAmount?: number;
   branchId?: number;
 }
-export interface IPaymentReceiveCreateDTO {
+export interface IPaymentReceivedCreateDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -35,13 +35,13 @@ export interface IPaymentReceiveCreateDTO {
   depositAccountId: number;
   paymentReceiveNo?: string;
   statement: string;
-  entries: IPaymentReceiveEntryDTO[];
+  entries: IPaymentReceivedEntryDTO[];
 
   branchId?: number;
   attachments?: AttachmentLinkDTO[];
 }
 
-export interface IPaymentReceiveEditDTO {
+export interface IPaymentReceivedEditDTO {
   customerId: number;
   paymentDate: Date;
   amount: number;
@@ -50,12 +50,12 @@ export interface IPaymentReceiveEditDTO {
   depositAccountId: number;
   paymentReceiveNo?: string;
   statement: string;
-  entries: IPaymentReceiveEntryDTO[];
+  entries: IPaymentReceivedEntryDTO[];
   branchId?: number;
   attachments?: AttachmentLinkDTO[];
 }
 
-export interface IPaymentReceiveEntry {
+export interface IPaymentReceivedEntry {
   id?: number;
   paymentReceiveId: number;
   invoiceId: number;
@@ -64,7 +64,7 @@ export interface IPaymentReceiveEntry {
   invoice?: ISaleInvoice;
 }
 
-export interface IPaymentReceiveEntryDTO {
+export interface IPaymentReceivedEntryDTO {
   id?: number;
   index: number;
   paymentReceiveId: number;
@@ -72,7 +72,7 @@ export interface IPaymentReceiveEntryDTO {
   paymentAmount: number;
 }
 
-export interface IPaymentReceivesFilter extends IDynamicListFilterDTO {
+export interface IPaymentsReceivedFilter extends IDynamicListFilterDTO {
   stringifiedFilterRoles?: string;
 }
 
@@ -88,65 +88,65 @@ export interface IPaymentReceivePageEntry {
   date: Date | string;
 }
 
-export interface IPaymentReceiveEditPage {
+export interface IPaymentReceivedEditPage {
-  paymentReceive: IPaymentReceive;
+  paymentReceive: IPaymentReceived;
   entries: IPaymentReceivePageEntry[];
 }
 
-export interface IPaymentsReceiveService {
+export interface IPaymentsReceivedService {
   validateCustomerHasNoPayments(
     tenantId: number,
     customerId: number
   ): Promise<void>;
 }
 
-export interface IPaymentReceiveSmsDetails {
+export interface IPaymentReceivedSmsDetails {
   customerName: string;
   customerPhoneNumber: string;
   smsMessage: string;
 }
 
-export interface IPaymentReceiveCreatingPayload {
+export interface IPaymentReceivedCreatingPayload {
   tenantId: number;
-  paymentReceiveDTO: IPaymentReceiveCreateDTO;
+  paymentReceiveDTO: IPaymentReceivedCreateDTO;
   trx: Knex.Transaction;
 }
 
-export interface IPaymentReceiveCreatedPayload {
+export interface IPaymentReceivedCreatedPayload {
   tenantId: number;
-  paymentReceive: IPaymentReceive;
+  paymentReceive: IPaymentReceived;
   paymentReceiveId: number;
   authorizedUser: ISystemUser;
-  paymentReceiveDTO: IPaymentReceiveCreateDTO;
+  paymentReceiveDTO: IPaymentReceivedCreateDTO;
   trx: Knex.Transaction;
 }
 
-export interface IPaymentReceiveEditedPayload {
+export interface IPaymentReceivedEditedPayload {
   tenantId: number;
   paymentReceiveId: number;
-  paymentReceive: IPaymentReceive;
+  paymentReceive: IPaymentReceived;
-  oldPaymentReceive: IPaymentReceive;
+  oldPaymentReceive: IPaymentReceived;
-  paymentReceiveDTO: IPaymentReceiveEditDTO;
+  paymentReceiveDTO: IPaymentReceivedEditDTO;
   authorizedUser: ISystemUser;
   trx: Knex.Transaction;
 }
 
-export interface IPaymentReceiveEditingPayload {
+export interface IPaymentReceivedEditingPayload {
   tenantId: number;
-  oldPaymentReceive: IPaymentReceive;
+  oldPaymentReceive: IPaymentReceived;
-  paymentReceiveDTO: IPaymentReceiveEditDTO;
+  paymentReceiveDTO: IPaymentReceivedEditDTO;
   trx: Knex.Transaction;
 }
 
-export interface IPaymentReceiveDeletingPayload {
+export interface IPaymentReceivedDeletingPayload {
   tenantId: number;
-  oldPaymentReceive: IPaymentReceive;
+  oldPaymentReceive: IPaymentReceived;
   trx: Knex.Transaction;
 }
-export interface IPaymentReceiveDeletedPayload {
+export interface IPaymentReceivedDeletedPayload {
   tenantId: number;
   paymentReceiveId: number;
-  oldPaymentReceive: IPaymentReceive;
+  oldPaymentReceive: IPaymentReceived;
   authorizedUser: ISystemUser;
   trx: Knex.Transaction;
 }

packages/server/src/loaders/events.ts

@@ -34,4 +34,4 @@
 // import 'services/Sales/SaleInvoiceWriteoffSubscriber';
 // import 'subscribers/SaleInvoices/SendSmsNotificationToCustomer';
 // import 'subscribers/SaleReceipt/SendNotificationToCustomer';
-// import 'services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber';
+// import 'services/Sales/PaymentReceived/PaymentReceiveSmsSubscriber';

packages/server/src/loaders/jobs.ts

@@ -9,7 +9,7 @@ import { SendSaleInvoiceMailJob } from '@/services/Sales/Invoices/SendSaleInvoic
 import { SendSaleInvoiceReminderMailJob } from '@/services/Sales/Invoices/SendSaleInvoiceMailReminderJob';
 import { SendSaleEstimateMailJob } from '@/services/Sales/Estimates/SendSaleEstimateMailJob';
 import { SaleReceiptMailNotificationJob } from '@/services/Sales/Receipts/SaleReceiptMailNotificationJob';
-import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob';
+import { PaymentReceivedMailNotificationJob } from '@/services/Sales/PaymentReceived/PaymentReceivedMailNotificationJob';
 import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob';
 import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob';
 import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob';
@@ -28,7 +28,7 @@ export default ({ agenda }: { agenda: Agenda }) => {
   new SendSaleInvoiceReminderMailJob(agenda);
   new SendSaleEstimateMailJob(agenda);
   new SaleReceiptMailNotificationJob(agenda);
-  new PaymentReceiveMailNotificationJob(agenda);
+  new PaymentReceivedMailNotificationJob(agenda);
   new PlaidFetchTransactionsJob(agenda);
   new ImportDeleteExpiredFilesJobs(agenda);
   new SendVerifyMailJob(agenda);

packages/server/src/models/BillPayment.ts

@@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel';
 import ModelSetting from './ModelSetting';
 import BillPaymentSettings from './BillPayment.Settings';
 import CustomViewBaseModel from './CustomViewBaseModel';
-import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceives/constants';
+import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceived/constants';
 import ModelSearchable from './ModelSearchable';
 
 export default class BillPayment extends mixin(TenantModel, [

packages/server/src/models/PaymentReceive.ts

@@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel';
 import ModelSetting from './ModelSetting';
 import PaymentReceiveSettings from './PaymentReceive.Settings';
 import CustomViewBaseModel from './CustomViewBaseModel';
-import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceives/constants';
+import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceived/constants';
 import ModelSearchable from './ModelSearchable';
 
 export default class PaymentReceive extends mixin(TenantModel, [

packages/server/src/models/TaxRate.settings.ts

@@ -0,0 +1,69 @@
+export default {
+  defaultSort: {
+    sortOrder: 'DESC',
+    sortField: 'created_at',
+  },
+  exportable: true,
+  importable: true,
+  print: {
+    pageTitle: 'Tax Rates',
+  },
+  columns: {
+    name: {
+      name: 'Tax Rate Name',
+      type: 'text',
+      accessor: 'name',
+    },
+    code: {
+      name: 'Code',
+      type: 'text',
+      accessor: 'code',
+    },
+    rate: {
+      name: 'Rate',
+      type: 'text',
+    },
+    description: {
+      name: 'Description',
+      type: 'text',
+    },
+    isNonRecoverable: {
+      name: 'Is Non Recoverable',
+      type: 'boolean',
+    },
+    active: {
+      name: 'Active',
+      type: 'boolean',
+    },
+  },
+  field: {},
+  fields2: {
+    name: {
+      name: 'Tax name',
+      fieldType: 'name',
+      required: true,
+    },
+    code: {
+      name: 'Code',
+      fieldType: 'code',
+      required: true,
+    },
+    rate: {
+      name: 'Rate',
+      fieldType: 'number',
+      required: true,
+    },
+    description: {
+      name: 'Description',
+      fieldType: 'text',
+    },
+    isNonRecoverable: {
+      name: 'Is Non Recoverable',
+      fieldType: 'boolean',
+    },
+    active: {
+      name: 'Active',
+      fieldType: 'boolean',
+    },
+  },
+};

packages/server/src/models/TaxRate.ts

@@ -2,8 +2,13 @@ import { mixin, Model, raw } from 'objection';
 import TenantModel from 'models/TenantModel';
 import ModelSearchable from './ModelSearchable';
 import SoftDeleteQueryBuilder from '@/collection/SoftDeleteQueryBuilder';
+import TaxRateMeta from './TaxRate.settings';
+import ModelSetting from './ModelSetting';
 
-export default class TaxRate extends mixin(TenantModel, [ModelSearchable]) {
+export default class TaxRate extends mixin(TenantModel, [
+  ModelSetting,
+  ModelSearchable,
+]) {
   /**
    * Table name
    */
@@ -25,6 +30,13 @@ export default class TaxRate extends mixin(TenantModel, [ModelSearchable]) {
     return ['createdAt', 'updatedAt'];
   }
 
+  /**
+   * Retrieves the tax rate meta.
+   */
+  static get meta() {
+    return TaxRateMeta;
+  }
+
   /**
    * Virtual attributes.
    */

packages/server/src/models/UncategorizedCashflowTransaction.ts

@@ -21,6 +21,7 @@ export default class UncategorizedCashflowTransaction extends mixin(
   plaidTransactionId!: string;
   recognizedTransactionId!: number;
   excludedAt: Date;
+  pending: boolean;
 
   /**
    * Table name.
@@ -46,7 +47,8 @@ export default class UncategorizedCashflowTransaction extends mixin(
       'isDepositTransaction',
       'isWithdrawalTransaction',
       'isRecognized',
-      'isExcluded'
+      'isExcluded',
+      'isPending',
     ];
   }
 
@@ -99,6 +101,14 @@ export default class UncategorizedCashflowTransaction extends mixin(
     return !!this.excludedAt;
   }
 
+  /**
+   * Detarmines whether the transaction is pending.
+   * @returns {boolean}
+   */
+  public get isPending(): boolean {
+    return !!this.pending;
+  }
+
   /**
    * Model modifiers.
    */
@@ -143,6 +153,20 @@ export default class UncategorizedCashflowTransaction extends mixin(
         query.whereNull('categorizeRefType');
         query.whereNull('categorizeRefId');
       },
+
+      /**
+       * Filters the not pending transactions.
+       */
+      notPending(query) {
+        query.where('pending', false);
+      },
+
+      /**
+       * Filters the pending transactions.
+       */
+      pending(query) {
+        query.where('pending', true);
+      },
     };
   }
 

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

@@ -249,6 +249,7 @@ export default class Ledger implements ILedger {
 
       transactionId: entry.referenceId,
       transactionType: entry.referenceType,
+      transactionSubType: entry.transactionType,
 
       transactionNumber: entry.transactionNumber,
       referenceNumber: entry.referenceNumber,
@@ -262,6 +263,8 @@ export default class Ledger implements ILedger {
 
       taxRateId: entry.taxRateId,
       taxRate: entry.taxRate,
+
+      note: entry.note,
     };
   }
 

packages/server/src/services/Attachments/events/AttachmentsOnPaymentsReceived.ts

@@ -1,10 +1,10 @@
 import { Inject, Service } from 'typedi';
 import { isEmpty } from 'lodash';
 import {
-  IPaymentReceiveCreatedPayload,
+  IPaymentReceivedCreatedPayload,
-  IPaymentReceiveCreatingPayload,
+  IPaymentReceivedCreatingPayload,
-  IPaymentReceiveDeletingPayload,
+  IPaymentReceivedDeletingPayload,
-  IPaymentReceiveEditedPayload,
+  IPaymentReceivedEditedPayload,
 } from '@/interfaces';
 import events from '@/subscribers/events';
 import { LinkAttachment } from '../LinkAttachment';
@@ -50,13 +50,13 @@ export class AttachmentsOnPaymentsReceived {
 
   /**
    * Validates the attachment keys on creating payment.
-   * @param {IPaymentReceiveCreatingPayload}
+   * @param {IPaymentReceivedCreatingPayload}
    * @returns {Promise<void>}
    */
   private async validateAttachmentsOnPaymentCreate({
     paymentReceiveDTO,
     tenantId,
-  }: IPaymentReceiveCreatingPayload): Promise<void> {
+  }: IPaymentReceivedCreatingPayload): Promise<void> {
     if (isEmpty(paymentReceiveDTO.attachments)) {
       return;
     }
@@ -67,7 +67,7 @@ export class AttachmentsOnPaymentsReceived {
 
   /**
    * Handles linking the attachments of the created payment.
-   * @param {IPaymentReceiveCreatedPayload}
+   * @param {IPaymentReceivedCreatedPayload}
    * @returns {Promise<void>}
    */
   private async handleAttachmentsOnPaymentCreated({
@@ -75,7 +75,7 @@ export class AttachmentsOnPaymentsReceived {
     paymentReceiveDTO,
     paymentReceive,
     trx,
-  }: IPaymentReceiveCreatedPayload): Promise<void> {
+  }: IPaymentReceivedCreatedPayload): Promise<void> {
     if (isEmpty(paymentReceiveDTO.attachments)) return;
 
     const keys = paymentReceiveDTO.attachments?.map(
@@ -92,14 +92,14 @@ export class AttachmentsOnPaymentsReceived {
 
   /**
    * Handles unlinking all the unpresented keys of the edited payment.
-   * @param {IPaymentReceiveEditedPayload}
+   * @param {IPaymentReceivedEditedPayload}
    */
   private async handleUnlinkUnpresentedKeysOnPaymentEdited({
     tenantId,
     paymentReceiveDTO,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveEditedPayload) {
+  }: IPaymentReceivedEditedPayload) {
     const keys = paymentReceiveDTO.attachments?.map(
       (attachment) => attachment.key
     );
@@ -114,7 +114,7 @@ export class AttachmentsOnPaymentsReceived {
 
   /**
    * Handles linking all the presented keys of the edited payment.
-   * @param {IPaymentReceiveEditedPayload}
+   * @param {IPaymentReceivedEditedPayload}
    * @returns {Promise<void>}
    */
   private async handleLinkPresentedKeysOnPaymentEdited({
@@ -122,7 +122,7 @@ export class AttachmentsOnPaymentsReceived {
     paymentReceiveDTO,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveEditedPayload) {
+  }: IPaymentReceivedEditedPayload) {
     if (isEmpty(paymentReceiveDTO.attachments)) return;
 
     const keys = paymentReceiveDTO.attachments?.map(
@@ -146,7 +146,7 @@ export class AttachmentsOnPaymentsReceived {
     tenantId,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveDeletingPayload) {
+  }: IPaymentReceivedDeletingPayload) {
     await this.unlinkAttachmentService.unlinkAllModelKeys(
       tenantId,
       'PaymentReceive',

packages/server/src/services/Banking/BankAccounts/GetBankAccountSummary.ts

@@ -52,6 +52,9 @@ export class GetBankAccountSummary {
         q.withGraphJoined('matchedBankTransactions');
         q.whereNull('matchedBankTransactions.id');
 
+        // Exclude the pending transactions.
+        q.modify('notPending');
+
         // Count the results.
         q.count('uncategorized_cashflow_transactions.id as total');
         q.first();
@@ -65,16 +68,32 @@ export class GetBankAccountSummary {
         q.withGraphJoined('recognizedTransaction');
         q.whereNotNull('recognizedTransaction.id');
 
+        // Exclude the pending transactions.
+        q.modify('notPending');
+
         // Count the results.
         q.count('uncategorized_cashflow_transactions.id as total');
         q.first();
       });
-
+    // Retrieves excluded transactions count.
     const excludedTransactionsCount =
       await UncategorizedCashflowTransaction.query().onBuild((q) => {
         q.where('accountId', bankAccountId);
         q.modify('excluded');
 
+        // Exclude the pending transactions.
+        q.modify('notPending');
+
+        // Count the results.
+        q.count('uncategorized_cashflow_transactions.id as total');
+        q.first();
+      });
+    // Retrieves the pending transactions count.
+    const pendingTransactionsCount =
+      await UncategorizedCashflowTransaction.query().onBuild((q) => {
+        q.where('accountId', bankAccountId);
+        q.modify('pending');
+
         // Count the results.
         q.count('uncategorized_cashflow_transactions.id as total');
         q.first();
@@ -83,14 +102,15 @@ export class GetBankAccountSummary {
     const totalUncategorizedTransactions =
       uncategorizedTranasctionsCount?.total || 0;
     const totalRecognizedTransactions = recognizedTransactionsCount?.total || 0;
-
     const totalExcludedTransactions = excludedTransactionsCount?.total || 0;
+    const totalPendingTransactions = pendingTransactionsCount?.total || 0;
 
     return {
       name: bankAccount.name,
       totalUncategorizedTransactions,
       totalRecognizedTransactions,
       totalExcludedTransactions,
+      totalPendingTransactions,
     };
   }
 }

packages/server/src/services/Banking/Matching/GetMatchedTransactions.ts

@@ -64,7 +64,7 @@ export class GetMatchedTransactions {
         .whereIn('id', uncategorizedTransactionIds)
         .throwIfNotFound();
 
-    const totalPending = Math.abs(sumBy(uncategorizedTransactions, 'amount'));
+    const totalPending = sumBy(uncategorizedTransactions, 'amount');
 
     const filtered = filter.transactionType
       ? this.registered.filter((item) => item.type === filter.transactionType)

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts

@@ -1,7 +1,7 @@
 import { Inject, Service } from 'typedi';
 import {
   IBillPaymentEventDeletedPayload,
-  IPaymentReceiveDeletedPayload,
+  IPaymentReceivedDeletedPayload,
 } from '@/interfaces';
 import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
 import events from '@/subscribers/events';
@@ -23,7 +23,7 @@ export class ValidateMatchingOnPaymentMadeDelete {
 
   /**
    * Validates the payment made transaction whether matched with bank transaction on deleting.
-   * @param {IPaymentReceiveDeletedPayload}
+   * @param {IPaymentReceivedDeletedPayload}
    */
   public async validateMatchingOnPaymentMadeDeleting({
     tenantId,

packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts

@@ -1,5 +1,5 @@
 import { Inject, Service } from 'typedi';
-import { IPaymentReceiveDeletedPayload } from '@/interfaces';
+import { IPaymentReceivedDeletedPayload } from '@/interfaces';
 import { ValidateTransactionMatched } from '../ValidateTransactionsMatched';
 import events from '@/subscribers/events';
 
@@ -20,13 +20,13 @@ export class ValidateMatchingOnPaymentReceivedDelete {
 
   /**
    * Validates the payment received transaction whether matched with bank transaction on deleting.
-   * @param {IPaymentReceiveDeletedPayload}
+   * @param {IPaymentReceivedDeletedPayload}
    */
   public async validateMatchingOnPaymentReceivedDeleting({
     tenantId,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveDeletedPayload) {
+  }: IPaymentReceivedDeletedPayload) {
     await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking(
       tenantId,
       'PaymentReceive',

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

@@ -25,6 +25,7 @@ import { Knex } from 'knex';
 import uniqid from 'uniqid';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
+import { RemovePendingUncategorizedTransaction } from '@/services/Cashflow/RemovePendingUncategorizedTransaction';
 
 const CONCURRENCY_ASYNC = 10;
 
@@ -40,7 +41,7 @@ export class PlaidSyncDb {
   private cashflowApp: CashflowApplication;
 
   @Inject()
-  private deleteCashflowTransactionService: DeleteCashflowTransaction;
+  private removePendingTransaction: RemovePendingUncategorizedTransaction;
 
   @Inject()
   private eventPublisher: EventPublisher;
@@ -185,21 +186,22 @@ export class PlaidSyncDb {
     plaidTransactionsIds: string[],
     trx?: Knex.Transaction
   ) {
-    const { CashflowTransaction } = this.tenancy.models(tenantId);
+    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
 
-    const cashflowTransactions = await CashflowTransaction.query(trx).whereIn(
+    const uncategorizedTransactions =
-      'plaidTransactionId',
+      await UncategorizedCashflowTransaction.query(trx).whereIn(
-      plaidTransactionsIds
+        'plaidTransactionId',
-    );
+        plaidTransactionsIds
-    const cashflowTransactionsIds = cashflowTransactions.map(
+      );
+    const uncategorizedTransactionsIds = uncategorizedTransactions.map(
       (trans) => trans.id
     );
     await bluebird.map(
-      cashflowTransactionsIds,
+      uncategorizedTransactionsIds,
-      (transactionId: number) =>
+      (uncategorizedTransactionId: number) =>
-        this.deleteCashflowTransactionService.deleteCashflowTransaction(
+        this.removePendingTransaction.removePendingTransaction(
           tenantId,
-          transactionId,
+          uncategorizedTransactionId,
           trx
         ),
       { concurrency: CONCURRENCY_ASYNC }

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

@@ -73,6 +73,12 @@ export class PlaidUpdateTransactions {
       item,
       trx
     );
+    // Sync removed transactions.
+    await this.plaidSync.syncRemoveTransactions(
+      tenantId,
+      removed?.map((r) => r.transaction_id),
+      trx
+    );
     // Sync bank account transactions.
     await this.plaidSync.syncAccountsTransactions(
       tenantId,

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

@@ -3,11 +3,11 @@ import {
   Item as PlaidItem,
   Institution as PlaidInstitution,
   AccountBase as PlaidAccount,
+  TransactionBase as PlaidTransactionBase,
 } from 'plaid';
 import {
   CreateUncategorizedTransactionDTO,
   IAccountCreateDTO,
-  PlaidTransaction,
 } from '@/interfaces';
 
 /**
@@ -48,7 +48,7 @@ export const transformPlaidAccountToCreateAccount = R.curry(
 export const transformPlaidTrxsToCashflowCreate = R.curry(
   (
     cashflowAccountId: number,
-    plaidTranasction: PlaidTransaction
+    plaidTranasction: PlaidTransactionBase
   ): CreateUncategorizedTransactionDTO => {
     return {
       date: plaidTranasction.date,
@@ -64,6 +64,8 @@ export const transformPlaidTrxsToCashflowCreate = R.curry(
       accountId: cashflowAccountId,
       referenceNo: plaidTranasction.payment_meta?.reference_number,
       plaidTransactionId: plaidTranasction.transaction_id,
+      pending: plaidTranasction.pending,
+      pendingPlaidTransactionId: plaidTranasction.pending_transaction_id,
     };
   }
 );

packages/server/src/services/Banking/RegonizeTranasctions/_utils.ts

@@ -33,17 +33,29 @@ const matchNumberCondition = (
   transaction: UncategorizedCashflowTransaction,
   condition: IBankRuleCondition
 ) => {
+  const conditionValue = parseFloat(condition.value);
+  const transactionAmount =
+    condition.field === 'amount'
+      ? Math.abs(transaction[condition.field])
+      : (transaction[condition.field] as unknown as number);
+
   switch (condition.comparator) {
     case BankRuleConditionComparator.Equals:
-      return transaction[condition.field] === condition.value;
+    case BankRuleConditionComparator.Equal:
-    case BankRuleConditionComparator.Contains:
+      return transactionAmount === conditionValue;
-      return transaction[condition.field]
+
-        ?.toString()
+    case BankRuleConditionComparator.BiggerOrEqual:
-        .includes(condition.value.toString());
+      return transactionAmount >= conditionValue;
-    case BankRuleConditionComparator.NotContain:
+
-      return !transaction[condition.field]
+    case BankRuleConditionComparator.Bigger:
-        ?.toString()
+      return transactionAmount > conditionValue;
-        .includes(condition.value.toString());
+
+    case BankRuleConditionComparator.Smaller:
+      return transactionAmount < conditionValue;
+
+    case BankRuleConditionComparator.SmallerOrEqual:
+      return transactionAmount <= conditionValue;
+
     default:
       return false;
   }
@@ -53,18 +65,19 @@ const matchTextCondition = (
   transaction: UncategorizedCashflowTransaction,
   condition: IBankRuleCondition
 ): boolean => {
+  const transactionValue = transaction[condition.field] as string;
+
   switch (condition.comparator) {
     case BankRuleConditionComparator.Equals:
-      return transaction[condition.field] === condition.value;
+    case BankRuleConditionComparator.Equal:
+      return transactionValue === condition.value;
     case BankRuleConditionComparator.Contains:
-      const fieldValue = lowerCase(transaction[condition.field]);
+      const fieldValue = lowerCase(transactionValue);
       const conditionValue = lowerCase(condition.value);
 
       return fieldValue.includes(conditionValue);
     case BankRuleConditionComparator.NotContain:
-      return !transaction[condition.field]?.includes(
+      return !transactionValue?.includes(condition.value.toString());
-        condition.value.toString()
-      );
     default:
       return false;
   }
@@ -101,8 +114,8 @@ const determineFieldType = (field: string): string => {
     case 'amount':
       return 'number';
     case 'description':
-      return 'text';
+    case 'payee':
     default:
-      return 'unknown';
+      return 'text';
   }
 };

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

@@ -1,4 +1,5 @@
 import { Inject, Service } from 'typedi';
+import { isEqual, omit } from 'lodash';
 import events from '@/subscribers/events';
 import {
   IBankRuleEventCreatedPayload,
@@ -55,10 +56,22 @@ export class TriggerRecognizedTransactions {
   private async recognizedTransactionsOnRuleEdited({
     tenantId,
     editRuleDTO,
+    oldBankRule,
+    bankRule,
     ruleId,
   }: IBankRuleEventEditedPayload) {
     const payload = { tenantId, ruleId };
 
+    // Cannot continue if the new and old bank rule values are the same,
+    // after excluding `createdAt` and `updatedAt` dates.
+    if (
+      isEqual(
+        omit(bankRule, ['createdAt', 'updatedAt']),
+        omit(oldBankRule, ['createdAt', 'updatedAt'])
+      )
+    ) {
+      return;
+    }
     await this.agenda.now(
       'rerecognize-uncategorized-transactions-job',
       payload

packages/server/src/services/Banking/Rules/EditBankRule.ts

@@ -47,6 +47,7 @@ export class EditBankRuleService {
 
     const oldBankRule = await BankRule.query()
       .findById(ruleId)
+      .withGraphFetched('conditions')
       .throwIfNotFound();
 
     const tranformDTO = this.transformDTO(editRuleDTO);
@@ -64,15 +65,15 @@ export class EditBankRuleService {
         } as IBankRuleEventEditingPayload);
 
         // Updates the given bank rule.
-        await BankRule.query(trx).upsertGraphAndFetch({
+        const bankRule = await BankRule.query(trx).upsertGraphAndFetch({
           ...tranformDTO,
           id: ruleId,
         });
-
         // Triggers `onBankRuleEdited` event.
         await this.eventPublisher.emitAsync(events.bankRules.onEdited, {
           tenantId,
           oldBankRule,
+          bankRule,
           ruleId,
           editRuleDTO,
           trx,

packages/server/src/services/Banking/Rules/types.ts

@@ -1,15 +1,20 @@
 import { Knex } from 'knex';
 
 export enum BankRuleConditionField {
-  Amount = 'Amount',
+  Amount = 'amount',
-  Description = 'Description',
+  Description = 'description',
-  Payee = 'Payee',
+  Payee = 'payee',
 }
 
 export enum BankRuleConditionComparator {
   Contains = 'contains',
   Equals = 'equals',
+  Equal = 'equal',
   NotContain = 'not_contain',
+  Bigger = 'bigger',
+  BiggerOrEqual = 'bigger_or_equal',
+  Smaller = 'smaller',
+  SmallerOrEqual = 'smaller_or_equal',
 }
 
 export interface IBankRuleCondition {
@@ -56,7 +61,15 @@ export enum BankRuleAssignCategory {
 export interface IBankRuleConditionDTO {
   id?: number;
   field: string;
-  comparator: string;
+  comparator:
+    | 'contains'
+    | 'equals'
+    | 'not_contains'
+    | 'equal'
+    | 'bigger'
+    | 'bigger_or_equal'
+    | 'smaller'
+    | 'smaller_or_equal';
   value: number;
 }
 
@@ -99,6 +112,8 @@ export interface IBankRuleEventEditingPayload {
 export interface IBankRuleEventEditedPayload {
   tenantId: number;
   ruleId: number;
+  oldBankRule: IBankRule;
+  bankRule: IBankRule;
   editRuleDTO: IEditBankRuleDTO;
   trx?: Knex.Transaction;
 }

packages/server/src/services/Branches/Subscribers/Validators/PaymentReceiveBranchSubscriber.ts

@@ -1,8 +1,8 @@
 import { Inject, Service } from 'typedi';
 import events from '@/subscribers/events';
 import {
-  IPaymentReceiveCreatingPayload,
+  IPaymentReceivedCreatingPayload,
-  IPaymentReceiveEditingPayload,
+  IPaymentReceivedEditingPayload,
 } from '@/interfaces';
 import { ValidateBranchExistance } from '../../Integrations/ValidateBranchExistance';
 
@@ -28,12 +28,12 @@ export class PaymentReceiveBranchValidateSubscriber {
 
   /**
    * Validate branch existance on estimate creating.
-   * @param {IPaymentReceiveCreatingPayload} payload
+   * @param {IPaymentReceivedCreatingPayload} payload
    */
   private validateBranchExistanceOnPaymentCreating = async ({
     tenantId,
     paymentReceiveDTO,
-  }: IPaymentReceiveCreatingPayload) => {
+  }: IPaymentReceivedCreatingPayload) => {
     await this.validateBranchExistance.validateTransactionBranchWhenActive(
       tenantId,
       paymentReceiveDTO.branchId
@@ -42,12 +42,12 @@ export class PaymentReceiveBranchValidateSubscriber {
 
   /**
    * Validate branch existance once estimate editing.
-   * @param {IPaymentReceiveEditingPayload} payload
+   * @param {IPaymentReceivedEditingPayload} payload
    */
   private validateBranchExistanceOnPaymentEditing = async ({
     paymentReceiveDTO,
     tenantId,
-  }: IPaymentReceiveEditingPayload) => {
+  }: IPaymentReceivedEditingPayload) => {
     await this.validateBranchExistance.validateTransactionBranchWhenActive(
       tenantId,
       paymentReceiveDTO.branchId

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

@@ -21,6 +21,7 @@ import GetCashflowAccountsService from './GetCashflowAccountsService';
 import { GetCashflowTransactionService } from './GetCashflowTransactionsService';
 import { GetRecognizedTransactionsService } from './GetRecongizedTransactions';
 import { GetRecognizedTransactionService } from './GetRecognizedTransaction';
+import { UncategorizeCashflowTransactionsBulk } from './UncategorizeCashflowTransactionsBulk';
 
 @Service()
 export class CashflowApplication {
@@ -39,6 +40,9 @@ export class CashflowApplication {
   @Inject()
   private uncategorizeTransactionService: UncategorizeCashflowTransaction;
 
+  @Inject()
+  private uncategorizeTransasctionsService: UncategorizeCashflowTransactionsBulk;
+
   @Inject()
   private categorizeTransactionService: CategorizeCashflowTransaction;
 
@@ -155,6 +159,22 @@ export class CashflowApplication {
     );
   }
 
+  /**
+   * Uncategorize the given transactions in bulk.
+   * @param {number} tenantId 
+   * @param {number | Array<number>} transactionId 
+   * @returns 
+   */
+  public uncategorizeTransactions(
+    tenantId: number,
+    transactionId: number | Array<number>
+  ) {
+    return this.uncategorizeTransasctionsService.uncategorizeBulk(
+      tenantId,
+      transactionId
+    );
+  }
+
   /**
    * Categorize the given cashflow transaction.
    * @param {number} tenantId

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

@@ -0,0 +1,53 @@
+import { Inject } from 'typedi';
+import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
+import HasTenancyService from '../Tenancy/TenancyService';
+import { GetPendingBankAccountTransactionTransformer } from './GetPendingBankAccountTransactionTransformer';
+
+export class GetPendingBankAccountTransactions {
+  @Inject()
+  private tenancy: HasTenancyService;
+
+  @Inject()
+  private transformer: TransformerInjectable;
+
+  /**
+   * Retrieves the given bank accounts pending transaction.
+   * @param {number} tenantId - Tenant id.
+   * @param {GetPendingTransactionsQuery} filter - Pending transactions query.
+   */
+  async getPendingTransactions(
+    tenantId: number,
+    filter?: GetPendingTransactionsQuery
+  ) {
+    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
+
+    const _filter = {
+      page: 1,
+      pageSize: 20,
+      ...filter,
+    };
+    const { results, pagination } =
+      await UncategorizedCashflowTransaction.query()
+        .onBuild((q) => {
+          q.modify('pending');
+
+          if (_filter?.accountId) {
+            q.where('accountId', _filter.accountId);
+          }
+        })
+        .pagination(_filter.page - 1, _filter.pageSize);
+
+    const data = await this.transformer.transform(
+      tenantId,
+      results,
+      new GetPendingBankAccountTransactionTransformer()
+    );
+    return { data, pagination };
+  }
+}
+
+interface GetPendingTransactionsQuery {
+  page?: number;
+  pageSize?: number;
+  accountId?: number;
+}

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

@@ -0,0 +1,73 @@
+import { Transformer } from '@/lib/Transformer/Transformer';
+import { formatNumber } from '@/utils';
+
+export class GetPendingBankAccountTransactionTransformer extends Transformer {
+  /**
+   * Include these attributes to sale invoice object.
+   * @returns {string[]}
+   */
+  public includeAttributes = (): string[] => {
+    return [
+      'formattedAmount',
+      'formattedDate',
+      'formattedDepositAmount',
+      'formattedWithdrawalAmount',
+    ];
+  };
+
+  /**
+   * Exclude all attributes.
+   * @returns {Array<string>}
+   */
+  public excludeAttributes = (): string[] => {
+    return [];
+  };
+
+  /**
+   * Formattes the transaction date.
+   * @param transaction
+   * @returns {string}
+   */
+  public formattedDate(transaction) {
+    return this.formatDate(transaction.date);
+  }
+
+  /**
+   * Formatted amount.
+   * @param transaction
+   * @returns {string}
+   */
+  public formattedAmount(transaction) {
+    return formatNumber(transaction.amount, {
+      currencyCode: transaction.currencyCode,
+    });
+  }
+
+  /**
+   * Formatted deposit amount.
+   * @param transaction
+   * @returns {string}
+   */
+  protected formattedDepositAmount(transaction) {
+    if (transaction.isDepositTransaction) {
+      return formatNumber(transaction.deposit, {
+        currencyCode: transaction.currencyCode,
+      });
+    }
+    return '';
+  }
+
+  /**
+   * Formatted withdrawal amount.
+   * @param transaction
+   * @returns {string}
+   */
+  protected formattedWithdrawalAmount(transaction) {
+    if (transaction.isWithdrawalTransaction) {
+      return formatNumber(transaction.withdrawal, {
+        currencyCode: transaction.currencyCode,
+      });
+    }
+    return '';
+  }
+}

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

@@ -34,8 +34,13 @@ export class GetRecognizedTransactionsService {
           q.withGraphFetched('recognizedTransaction.assignAccount');
           q.withGraphFetched('recognizedTransaction.bankRule');
           q.whereNotNull('recognizedTransactionId');
+
+          // Exclude the excluded transactions.
           q.modify('notExcluded');
 
+          // Exclude the pending transactions.
+          q.modify('notPending');
+
           if (_filter.accountId) {
             q.where('accountId', _filter.accountId);
           }

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

@@ -51,7 +51,9 @@ export class GetUncategorizedTransactions {
         .onBuild((q) => {
           q.where('accountId', accountId);
           q.where('categorized', false);
+
           q.modify('notExcluded');
+          q.modify('notPending');
 
           q.withGraphFetched('account');
           q.withGraphFetched('recognizedTransaction.assignAccount');

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

@@ -0,0 +1,72 @@
+import { Knex } from 'knex';
+import { Inject, Service } from 'typedi';
+import HasTenancyService from '../Tenancy/TenancyService';
+import UnitOfWork from '../UnitOfWork';
+import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
+import events from '@/subscribers/events';
+import { ServiceError } from '@/exceptions';
+import { ERRORS } from './constants';
+import {
+  IPendingTransactionRemovedEventPayload,
+  IPendingTransactionRemovingEventPayload,
+} from '@/interfaces';
+
+@Service()
+export class RemovePendingUncategorizedTransaction {
+  @Inject()
+  private tenancy: HasTenancyService;
+
+  @Inject()
+  private uow: UnitOfWork;
+
+  @Inject()
+  private eventPublisher: EventPublisher;
+
+  /**
+   * REmoves the pending uncategorized transaction.
+   * @param {number} tenantId -
+   * @param {number} uncategorizedTransactionId -
+   * @param {Knex.Transaction} trx -
+   * @returns {Promise<void>}
+   */
+  public async removePendingTransaction(
+    tenantId: number,
+    uncategorizedTransactionId: number,
+    trx?: Knex.Transaction
+  ): Promise<void> {
+    const { UncategorizedCashflowTransaction } = this.tenancy.models(tenantId);
+
+    const pendingTransaction = await UncategorizedCashflowTransaction.query(trx)
+      .findById(uncategorizedTransactionId)
+      .throwIfNotFound();
+
+    if (!pendingTransaction.isPending) {
+      throw new ServiceError(ERRORS.TRANSACTION_NOT_PENDING);
+    }
+    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+      await this.eventPublisher.emitAsync(
+        events.bankTransactions.onPendingRemoving,
+        {
+          tenantId,
+          uncategorizedTransactionId,
+          pendingTransaction,
+          trx,
+        } as IPendingTransactionRemovingEventPayload
+      );
+      // Removes the pending uncategorized transaction.
+      await UncategorizedCashflowTransaction.query(trx)
+        .findById(uncategorizedTransactionId)
+        .delete();
+
+      await this.eventPublisher.emitAsync(
+        events.bankTransactions.onPendingRemoved,
+        {
+          tenantId,
+          uncategorizedTransactionId,
+          pendingTransaction,
+          trx,
+        } as IPendingTransactionRemovedEventPayload
+      );
+    });
+  }
+}

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

@@ -0,0 +1,37 @@
+import PromisePool from '@supercharge/promise-pool';
+import { castArray } from 'lodash';
+import { Service, Inject } from 'typedi';
+import HasTenancyService from '../Tenancy/TenancyService';
+import { UncategorizeCashflowTransaction } from './UncategorizeCashflowTransaction';
+
+@Service()
+export class UncategorizeCashflowTransactionsBulk {
+  @Inject()
+  private tenancy: HasTenancyService;
+
+  @Inject()
+  private uncategorizeTransaction: UncategorizeCashflowTransaction;
+
+  /**
+   * Uncategorize the given bank transactions in bulk.
+   * @param {number} tenantId
+   * @param {number} uncategorizedTransactionId
+   */
+  public async uncategorizeBulk(
+    tenantId: number,
+    uncategorizedTransactionId: number | Array<number>
+  ) {
+    const uncategorizedTransactionIds = castArray(uncategorizedTransactionId);
+
+    const result = await PromisePool.withConcurrency(MIGRATION_CONCURRENCY)
+      .for(uncategorizedTransactionIds)
+      .process(async (_uncategorizedTransactionId: number, index, pool) => {
+        await this.uncategorizeTransaction.uncategorize(
+          tenantId,
+          _uncategorizedTransactionId
+        );
+      });
+  }
+}
+
+const MIGRATION_CONCURRENCY = 1;

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

@@ -15,10 +15,10 @@ export const ERRORS = {
     'UNCATEGORIZED_TRANSACTION_TYPE_INVALID',
   CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED:
     'CANNOT_DELETE_TRANSACTION_CONVERTED_FROM_UNCATEGORIZED',
-
+  CANNOT_CATEGORIZE_EXCLUDED_TRANSACTION:
-  CANNOT_CATEGORIZE_EXCLUDED_TRANSACTION: 'CANNOT_CATEGORIZE_EXCLUDED_TRANSACTION',
+    'CANNOT_CATEGORIZE_EXCLUDED_TRANSACTION',
-  TRANSACTION_NOT_CATEGORIZED: 'TRANSACTION_NOT_CATEGORIZED'
+  TRANSACTION_NOT_CATEGORIZED: 'TRANSACTION_NOT_CATEGORIZED',
-
+  TRANSACTION_NOT_PENDING: 'TRANSACTION_NOT_PENDING',
 };
 
 export enum CASHFLOW_DIRECTION {

packages/server/src/services/Cashflow/subscribers/DecrementUncategorizedTransactionOnCategorize.ts

@@ -1,11 +1,11 @@
 import { Inject, Service } from 'typedi';
+import PromisePool from '@supercharge/promise-pool';
 import events from '@/subscribers/events';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import {
   ICashflowTransactionCategorizedPayload,
   ICashflowTransactionUncategorizedPayload,
 } from '@/interfaces';
-import PromisePool from '@supercharge/promise-pool';
 
 @Service()
 export class DecrementUncategorizedTransactionOnCategorize {
@@ -36,13 +36,17 @@ export class DecrementUncategorizedTransactionOnCategorize {
   public async decrementUnCategorizedTransactionsOnCategorized({
     tenantId,
     uncategorizedTransactions,
-    trx
+    trx,
   }: ICashflowTransactionCategorizedPayload) {
     const { Account } = this.tenancy.models(tenantId);
 
     await PromisePool.withConcurrency(1)
       .for(uncategorizedTransactions)
       .process(async (uncategorizedTransaction) => {
+        // Cannot continue if the transaction is still pending.
+        if (uncategorizedTransaction.isPending) {
+          return;
+        }
         await Account.query(trx)
           .findById(uncategorizedTransaction.accountId)
           .decrement('uncategorizedTransactions', 1);
@@ -56,13 +60,17 @@ export class DecrementUncategorizedTransactionOnCategorize {
   public async incrementUnCategorizedTransactionsOnUncategorized({
     tenantId,
     uncategorizedTransactions,
-    trx
+    trx,
   }: ICashflowTransactionUncategorizedPayload) {
     const { Account } = this.tenancy.models(tenantId);
 
     await PromisePool.withConcurrency(1)
       .for(uncategorizedTransactions)
       .process(async (uncategorizedTransaction) => {
+        // Cannot continue if the transaction is still pending.
+        if (uncategorizedTransaction.isPending) {
+          return;
+        }
         await Account.query(trx)
           .findById(uncategorizedTransaction.accountId)
           .increment('uncategorizedTransactions', 1);
@@ -82,6 +90,9 @@ export class DecrementUncategorizedTransactionOnCategorize {
 
     if (!uncategorizedTransaction.accountId) return;
 
+    // Cannot continue if the transaction is still pending.
+    if (uncategorizedTransaction.isPending) return;
+
     await Account.query(trx)
       .findById(uncategorizedTransaction.accountId)
       .increment('uncategorizedTransactions', 1);

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

@@ -9,7 +9,7 @@ import {
 } from '@/interfaces';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import UnitOfWork from '@/services/UnitOfWork';
-import { PaymentReceiveValidators } from '../Sales/PaymentReceives/PaymentReceiveValidators';
+import { PaymentReceivedValidators } from '../Sales/PaymentReceived/PaymentReceivedValidators';
 import BaseCreditNotes from './CreditNotes';
 import {
   IApplyCreditToInvoicesDTO,
@@ -26,7 +26,7 @@ export default class CreditNoteApplyToInvoices extends BaseCreditNotes {
   private tenancy: HasTenancyService;
 
   @Inject()
-  private paymentReceiveValidators: PaymentReceiveValidators;
+  private paymentReceiveValidators: PaymentReceivedValidators;
 
   @Inject()
   private uow: UnitOfWork;

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

@@ -9,12 +9,13 @@ import { SaleInvoicesExportable } from '../Sales/Invoices/SaleInvoicesExportable
 import { SaleEstimatesExportable } from '../Sales/Estimates/SaleEstimatesExportable';
 import { SaleReceiptsExportable } from '../Sales/Receipts/SaleReceiptsExportable';
 import { BillsExportable } from '../Purchases/Bills/BillsExportable';
-import { PaymentsReceivedExportable } from '../Sales/PaymentReceives/PaymentsReceivedExportable';
+import { PaymentsReceivedExportable } from '../Sales/PaymentReceived/PaymentsReceivedExportable';
 import { BillPaymentExportable } from '../Purchases/BillPayments/BillPaymentExportable';
 import { ManualJournalsExportable } from '../ManualJournals/ManualJournalExportable';
 import { CreditNotesExportable } from '../CreditNotes/CreditNotesExportable';
 import { VendorCreditsExportable } from '../Purchases/VendorCredits/VendorCreditsExportable';
 import { ItemCategoriesExportable } from '../ItemCategories/ItemCategoriesExportable';
+import { TaxRatesExportable } from '../TaxRates/TaxRatesExportable';
 
 @Service()
 export class ExportableResources {
@@ -46,6 +47,7 @@ export class ExportableResources {
     { resource: 'ManualJournal', exportable: ManualJournalsExportable },
     { resource: 'CreditNote', exportable: CreditNotesExportable },
     { resource: 'VendorCredit', exportable: VendorCreditsExportable },
+    { resource: 'TaxRate', exportable: TaxRatesExportable },
   ];
 
   /**

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

@@ -15,6 +15,7 @@ import { FinancialSheetStructure } from '../FinancialSheetStructure';
 import { flatToNestedArray } from '@/utils';
 import Ledger from '@/services/Accounting/Ledger';
 import { calculateRunningBalance } from './_utils';
+import { getTransactionTypeLabel } from '@/utils/transactions-types';
 
 /**
  * General ledger sheet.
@@ -90,11 +91,13 @@ export default class GeneralLedgerSheet extends R.compose(
       date: entry.date,
       dateFormatted: moment(entry.date).format('YYYY MMM DD'),
 
-      transactionNumber: entry.transactionNumber,
+      referenceType: entry.transactionType,
-      referenceType: entry.referenceType,
+      referenceId: entry.transactionId,
-      referenceId: entry.referenceId,
-      referenceTypeFormatted: this.i18n.__(entry.referenceTypeFormatted),
 
+      transactionNumber: entry.transactionNumber,
+      transactionTypeFormatted: this.i18n.__(
+        getTransactionTypeLabel(entry.transactionType, entry.transactionSubType)
+      ),
       contactName: get(contact, 'displayName'),
       contactType: get(contact, 'contactService'),
 

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

@@ -67,7 +67,7 @@ export class GeneralLedgerTable extends R.compose(
     return [
       { key: 'date', accessor: 'dateFormatted' },
       { key: 'account_name', accessor: 'account.name' },
-      { key: 'reference_type', accessor: 'referenceTypeFormatted' },
+      { key: 'reference_type', accessor: 'transactionTypeFormatted' },
       { key: 'reference_number', accessor: 'transactionNumber' },
       { key: 'description', accessor: 'note' },
       { key: 'credit', accessor: 'formattedCredit' },

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

@@ -13,9 +13,10 @@ import { SaleInvoicesImportable } from '../Sales/Invoices/SaleInvoicesImportable
 import { SaleEstimatesImportable } from '../Sales/Estimates/SaleEstimatesImportable';
 import { BillPaymentsImportable } from '../Purchases/BillPayments/BillPaymentsImportable';
 import { VendorCreditsImportable } from '../Purchases/VendorCredits/VendorCreditsImportable';
-import { PaymentReceivesImportable } from '../Sales/PaymentReceives/PaymentReceivesImportable';
+import { PaymentsReceivedImportable } from '../Sales/PaymentReceived/PaymentsReceivedImportable';
 import { CreditNotesImportable } from '../CreditNotes/CreditNotesImportable';
 import { SaleReceiptsImportable } from '../Sales/Receipts/SaleReceiptsImportable';
+import { TaxRatesImportable } from '../TaxRates/TaxRatesImportable';
 
 @Service()
 export class ImportableResources {
@@ -44,10 +45,11 @@ export class ImportableResources {
     { resource: 'SaleInvoice', importable: SaleInvoicesImportable },
     { resource: 'SaleEstimate', importable: SaleEstimatesImportable },
     { resource: 'BillPayment', importable: BillPaymentsImportable },
-    { resource: 'PaymentReceive', importable: PaymentReceivesImportable },
+    { resource: 'PaymentReceive', importable: PaymentsReceivedImportable },
     { resource: 'VendorCredit', importable: VendorCreditsImportable },
     { resource: 'CreditNote', importable: CreditNotesImportable },
-    { resource: 'SaleReceipt', importable: SaleReceiptsImportable }
+    { resource: 'SaleReceipt', importable: SaleReceiptsImportable },
+    { resource: 'TaxRate', importable: TaxRatesImportable },
   ];
 
   public get registry() {

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

@@ -6,7 +6,7 @@ import SaleNotifyBySms from '../SaleNotifyBySms';
 import SmsNotificationsSettingsService from '@/services/Settings/SmsNotificationsSettings';
 import {
   ICustomer,
-  IPaymentReceiveSmsDetails,
+  IPaymentReceivedSmsDetails,
   ISaleEstimate,
   SMS_NOTIFICATION_KEY,
 } from '@/interfaces';
@@ -173,12 +173,12 @@ export class SaleEstimateNotifyBySms {
    * Retrieve the SMS details of the given payment receive transaction.
    * @param {number} tenantId
    * @param {number} saleEstimateId
-   * @returns {Promise<IPaymentReceiveSmsDetails>}
+   * @returns {Promise<IPaymentReceivedSmsDetails>}
    */
   public smsDetails = async (
     tenantId: number,
     saleEstimateId: number
-  ): Promise<IPaymentReceiveSmsDetails> => {
+  ): Promise<IPaymentReceivedSmsDetails> => {
     const { SaleEstimate } = this.tenancy.models(tenantId);
 
     // Retrieve the sale invoice or throw not found service error.

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

@@ -3,7 +3,7 @@ import { CreateSaleEstimate } from './CreateSaleEstimate';
 import {
   IFilterMeta,
   IPaginationMeta,
-  IPaymentReceiveSmsDetails,
+  IPaymentReceivedSmsDetails,
   ISaleEstimate,
   ISaleEstimateDTO,
   ISalesEstimatesFilter,
@@ -191,12 +191,12 @@ export class SaleEstimatesApplication {
    * Retrieve the SMS details of the given payment receive transaction.
    * @param {number} tenantId
    * @param {number} saleEstimateId
-   * @returns {Promise<IPaymentReceiveSmsDetails>}
+   * @returns {Promise<IPaymentReceivedSmsDetails>}
    */
   public getSaleEstimateSmsDetails = (
     tenantId: number,
     saleEstimateId: number
-  ): Promise<IPaymentReceiveSmsDetails> => {
+  ): Promise<IPaymentReceivedSmsDetails> => {
     return this.saleEstimateNotifyBySmsService.smsDetails(
       tenantId,
       saleEstimateId

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

@@ -2,7 +2,7 @@ import { Knex } from 'knex';
 import async from 'async';
 import { Inject, Service } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { PaymentReceiveGLEntries } from '../PaymentReceives/PaymentReceiveGLEntries';
+import { PaymentReceivedGLEntries } from '../PaymentReceived/PaymentReceivedGLEntries';
 
 @Service()
 export class InvoicePaymentsGLEntriesRewrite {
@@ -10,7 +10,7 @@ export class InvoicePaymentsGLEntriesRewrite {
   public tenancy: HasTenancyService;
 
   @Inject()
-  public paymentGLEntries: PaymentReceiveGLEntries;
+  public paymentGLEntries: PaymentReceivedGLEntries;
 
   /**
    * Rewrites the payment GL entries task.

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

@@ -2,23 +2,23 @@ import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import {
   ICustomer,
-  IPaymentReceiveCreateDTO,
+  IPaymentReceivedCreateDTO,
-  IPaymentReceiveCreatedPayload,
+  IPaymentReceivedCreatedPayload,
-  IPaymentReceiveCreatingPayload,
+  IPaymentReceivedCreatingPayload,
   ISystemUser,
 } from '@/interfaces';
-import { PaymentReceiveValidators } from './PaymentReceiveValidators';
+import { PaymentReceivedValidators } from './PaymentReceivedValidators';
 import events from '@/subscribers/events';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import UnitOfWork from '@/services/UnitOfWork';
-import { PaymentReceiveDTOTransformer } from './PaymentReceiveDTOTransformer';
+import { PaymentReceiveDTOTransformer } from './PaymentReceivedDTOTransformer';
 import { TenantMetadata } from '@/system/models';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 
 @Service()
-export class CreatePaymentReceive {
+export class CreatePaymentReceived {
   @Inject()
-  private validators: PaymentReceiveValidators;
+  private validators: PaymentReceivedValidators;
 
   @Inject()
   private eventPublisher: EventPublisher;
@@ -37,11 +37,11 @@ export class CreatePaymentReceive {
    * with associated invoices payment and journal transactions.
    * @async
    * @param {number} tenantId - Tenant id.
-   * @param {IPaymentReceive} paymentReceive
+   * @param {IPaymentReceived} paymentReceive
    */
-  public async createPaymentReceive(
+  public async createPaymentReceived(
     tenantId: number,
-    paymentReceiveDTO: IPaymentReceiveCreateDTO,
+    paymentReceiveDTO: IPaymentReceivedCreateDTO,
     authorizedUser: ISystemUser,
     trx?: Knex.Transaction
   ) {
@@ -97,7 +97,7 @@ export class CreatePaymentReceive {
           trx,
           paymentReceiveDTO,
           tenantId,
-        } as IPaymentReceiveCreatingPayload);
+        } as IPaymentReceivedCreatingPayload);
 
         // Inserts the payment receive transaction.
         const paymentReceive = await PaymentReceive.query(
@@ -113,7 +113,7 @@ export class CreatePaymentReceive {
           paymentReceiveDTO,
           authorizedUser,
           trx,
-        } as IPaymentReceiveCreatedPayload);
+        } as IPaymentReceivedCreatedPayload);
 
         return paymentReceive;
       },
@@ -125,13 +125,13 @@ export class CreatePaymentReceive {
    * Transform the create payment receive DTO.
    * @param {number} tenantId
    * @param {ICustomer} customer
-   * @param {IPaymentReceiveCreateDTO} paymentReceiveDTO
+   * @param {IPaymentReceivedCreateDTO} paymentReceiveDTO
    * @returns
    */
   private transformCreateDTOToModel = async (
     tenantId: number,
     customer: ICustomer,
-    paymentReceiveDTO: IPaymentReceiveCreateDTO
+    paymentReceiveDTO: IPaymentReceivedCreateDTO
   ) => {
     return this.transformer.transformPaymentReceiveDTOToModel(
       tenantId,

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

@@ -1,8 +1,8 @@
 import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import {
-  IPaymentReceiveDeletedPayload,
+  IPaymentReceivedDeletedPayload,
-  IPaymentReceiveDeletingPayload,
+  IPaymentReceivedDeletingPayload,
   ISystemUser,
 } from '@/interfaces';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -11,7 +11,7 @@ import events from '@/subscribers/events';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 
 @Service()
-export class DeletePaymentReceive {
+export class DeletePaymentReceived {
   @Inject()
   private eventPublisher: EventPublisher;
 
@@ -33,7 +33,7 @@ export class DeletePaymentReceive {
    * @async
    * @param {number} tenantId - Tenant id.
    * @param {Integer} paymentReceiveId - Payment receive id.
-   * @param {IPaymentReceive} paymentReceive - Payment receive object.
+   * @param {IPaymentReceived} paymentReceive - Payment receive object.
    */
   public async deletePaymentReceive(
     tenantId: number,
@@ -56,7 +56,7 @@ export class DeletePaymentReceive {
         tenantId,
         oldPaymentReceive,
         trx,
-      } as IPaymentReceiveDeletingPayload);
+      } as IPaymentReceivedDeletingPayload);
 
       // Deletes the payment receive associated entries.
       await PaymentReceiveEntry.query(trx)
@@ -73,7 +73,7 @@ export class DeletePaymentReceive {
         oldPaymentReceive,
         authorizedUser,
         trx,
-      } as IPaymentReceiveDeletedPayload);
+      } as IPaymentReceivedDeletedPayload);
     });
   }
 }

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

@@ -2,14 +2,14 @@ import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import {
   ICustomer,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceiveEditDTO,
+  IPaymentReceivedEditDTO,
-  IPaymentReceiveEditedPayload,
+  IPaymentReceivedEditedPayload,
-  IPaymentReceiveEditingPayload,
+  IPaymentReceivedEditingPayload,
   ISystemUser,
 } from '@/interfaces';
-import { PaymentReceiveDTOTransformer } from './PaymentReceiveDTOTransformer';
+import { PaymentReceiveDTOTransformer } from './PaymentReceivedDTOTransformer';
-import { PaymentReceiveValidators } from './PaymentReceiveValidators';
+import { PaymentReceivedValidators } from './PaymentReceivedValidators';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import events from '@/subscribers/events';
 import UnitOfWork from '@/services/UnitOfWork';
@@ -17,12 +17,12 @@ import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { TenantMetadata } from '@/system/models';
 
 @Service()
-export class EditPaymentReceive {
+export class EditPaymentReceived {
   @Inject()
   private transformer: PaymentReceiveDTOTransformer;
 
   @Inject()
-  private validators: PaymentReceiveValidators;
+  private validators: PaymentReceivedValidators;
 
   @Inject()
   private eventPublisher: EventPublisher;
@@ -46,12 +46,12 @@ export class EditPaymentReceive {
    * @async
    * @param {number} tenantId -
    * @param {Integer} paymentReceiveId -
-   * @param {IPaymentReceive} paymentReceive -
+   * @param {IPaymentReceived} paymentReceive -
    */
   public async editPaymentReceive(
     tenantId: number,
     paymentReceiveId: number,
-    paymentReceiveDTO: IPaymentReceiveEditDTO,
+    paymentReceiveDTO: IPaymentReceivedEditDTO,
     authorizedUser: ISystemUser
   ) {
     const { PaymentReceive, Contact } = this.tenancy.models(tenantId);
@@ -131,7 +131,7 @@ export class EditPaymentReceive {
         tenantId,
         oldPaymentReceive,
         paymentReceiveDTO,
-      } as IPaymentReceiveEditingPayload);
+      } as IPaymentReceivedEditingPayload);
 
       // Update the payment receive transaction.
       const paymentReceive = await PaymentReceive.query(
@@ -149,7 +149,7 @@ export class EditPaymentReceive {
         paymentReceiveDTO,
         authorizedUser,
         trx,
-      } as IPaymentReceiveEditedPayload);
+      } as IPaymentReceivedEditedPayload);
 
       return paymentReceive;
     });
@@ -159,15 +159,15 @@ export class EditPaymentReceive {
    * Transform the edit payment receive DTO.
    * @param {number} tenantId
    * @param {ICustomer} customer
-   * @param {IPaymentReceiveEditDTO} paymentReceiveDTO
+   * @param {IPaymentReceivedEditDTO} paymentReceiveDTO
-   * @param {IPaymentReceive} oldPaymentReceive
+   * @param {IPaymentReceived} oldPaymentReceive
    * @returns
    */
   private transformEditDTOToModel = async (
     tenantId: number,
     customer: ICustomer,
-    paymentReceiveDTO: IPaymentReceiveEditDTO,
+    paymentReceiveDTO: IPaymentReceivedEditDTO,
-    oldPaymentReceive: IPaymentReceive
+    oldPaymentReceive: IPaymentReceived
   ) => {
     return this.transformer.transformPaymentReceiveDTOToModel(
       tenantId,

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

@@ -1,13 +1,13 @@
 import { ServiceError } from '@/exceptions';
-import { IPaymentReceive } from '@/interfaces';
+import { IPaymentReceived } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
 import { ERRORS } from './constants';
-import { PaymentReceiveTransfromer } from './PaymentReceiveTransformer';
+import { PaymentReceiveTransfromer } from './PaymentReceivedTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 
 @Service()
-export class GetPaymentReceive {
+export class GetPaymentReceived {
   @Inject()
   private tenancy: HasTenancyService;
 
@@ -18,12 +18,12 @@ export class GetPaymentReceive {
    * Retrieve payment receive details.
    * @param {number} tenantId - Tenant id.
    * @param {number} paymentReceiveId - Payment receive id.
-   * @return {Promise<IPaymentReceive>}
+   * @return {Promise<IPaymentReceived>}
    */
   public async getPaymentReceive(
     tenantId: number,
     paymentReceiveId: number
-  ): Promise<IPaymentReceive> {
+  ): Promise<IPaymentReceived> {
     const { PaymentReceive } = this.tenancy.models(tenantId);
 
     const paymentReceive = await PaymentReceive.query()

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

@@ -1,14 +1,14 @@
 import { Inject, Service } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
-import { PaymentReceiveValidators } from './PaymentReceiveValidators';
+import { PaymentReceivedValidators } from './PaymentReceivedValidators';
 
 @Service()
-export class GetPaymentReceiveInvoices {
+export class GetPaymentReceivedInvoices {
   @Inject()
   private tenancy: HasTenancyService;
 
   @Inject()
-  private validators: PaymentReceiveValidators;
+  private validators: PaymentReceivedValidators;
 
   /**
    * Retrieve sale invoices that assocaited to the given payment receive.

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

@@ -1,10 +1,10 @@
 import { Inject, Service } from 'typedi';
 import { ChromiumlyTenancy } from '@/services/ChromiumlyTenancy/ChromiumlyTenancy';
 import { TemplateInjectable } from '@/services/TemplateInjectable/TemplateInjectable';
-import { GetPaymentReceive } from './GetPaymentReceive';
+import { GetPaymentReceived } from './GetPaymentReceived';
 
 @Service()
-export default class GetPaymentReceivePdf {
+export default class GetPaymentReceivedPdf {
   @Inject()
   private chromiumlyTenancy: ChromiumlyTenancy;
 
@@ -12,12 +12,12 @@ export default class GetPaymentReceivePdf {
   private templateInjectable: TemplateInjectable;
 
   @Inject()
-  private getPaymentService: GetPaymentReceive;
+  private getPaymentService: GetPaymentReceived;
 
   /**
    * Retrieve sale invoice pdf content.
    * @param {number} tenantId -
-   * @param {IPaymentReceive} paymentReceive -
+   * @param {IPaymentReceived} paymentReceive -
    * @returns {Promise<Buffer>}
    */
   async getPaymentReceivePdf(

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

@@ -3,10 +3,10 @@ import * as R from 'ramda';
 import {
   IFilterMeta,
   IPaginationMeta,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceivesFilter,
+  IPaymentsReceivedFilter,
 } from '@/interfaces';
-import { PaymentReceiveTransfromer } from './PaymentReceiveTransformer';
+import { PaymentReceiveTransfromer } from './PaymentReceivedTransformer';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
 import DynamicListingService from '@/services/DynamicListing/DynamicListService';
@@ -25,13 +25,13 @@ export class GetPaymentReceives {
   /**
    * Retrieve payment receives paginated and filterable list.
    * @param {number} tenantId
-   * @param {IPaymentReceivesFilter} paymentReceivesFilter
+   * @param {IPaymentsReceivedFilter} paymentReceivesFilter
    */
   public async getPaymentReceives(
     tenantId: number,
-    filterDTO: IPaymentReceivesFilter
+    filterDTO: IPaymentsReceivedFilter
   ): Promise<{
-    paymentReceives: IPaymentReceive[];
+    paymentReceives: IPaymentReceived[];
     pagination: IPaginationMeta;
     filterMeta: IFilterMeta;
   }> {

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

@@ -1,44 +1,44 @@
 import {
   IFilterMeta,
   IPaginationMeta,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceiveCreateDTO,
+  IPaymentReceivedCreateDTO,
-  IPaymentReceiveEditDTO,
+  IPaymentReceivedEditDTO,
-  IPaymentReceiveSmsDetails,
+  IPaymentReceivedSmsDetails,
-  IPaymentReceivesFilter,
+  IPaymentsReceivedFilter,
   ISystemUser,
   PaymentReceiveMailOptsDTO,
 } from '@/interfaces';
 import { Inject, Service } from 'typedi';
-import { CreatePaymentReceive } from './CreatePaymentReceive';
+import { CreatePaymentReceived } from './CreatePaymentReceived';
-import { EditPaymentReceive } from './EditPaymentReceive';
+import { EditPaymentReceived } from './EditPaymentReceived';
-import { DeletePaymentReceive } from './DeletePaymentReceive';
+import { DeletePaymentReceived } from './DeletePaymentReceived';
-import { GetPaymentReceives } from './GetPaymentReceives';
+import { GetPaymentReceives } from './GetPaymentsReceived';
-import { GetPaymentReceive } from './GetPaymentReceive';
+import { GetPaymentReceived } from './GetPaymentReceived';
-import { GetPaymentReceiveInvoices } from './GetPaymentReceiveInvoices';
+import { GetPaymentReceivedInvoices } from './GetPaymentReceivedInvoices';
-import { PaymentReceiveNotifyBySms } from './PaymentReceiveSmsNotify';
+import { PaymentReceiveNotifyBySms } from './PaymentReceivedSmsNotify';
-import GetPaymentReceivePdf from './GetPaymentReeceivePdf';
+import GetPaymentReceivedPdf from './GetPaymentReceivedPdf';
-import { SendPaymentReceiveMailNotification } from './PaymentReceiveMailNotification';
+import { SendPaymentReceiveMailNotification } from './PaymentReceivedMailNotification';
 
 @Service()
 export class PaymentReceivesApplication {
   @Inject()
-  private createPaymentReceiveService: CreatePaymentReceive;
+  private createPaymentReceivedService: CreatePaymentReceived;
 
   @Inject()
-  private editPaymentReceiveService: EditPaymentReceive;
+  private editPaymentReceivedService: EditPaymentReceived;
 
   @Inject()
-  private deletePaymentReceiveService: DeletePaymentReceive;
+  private deletePaymentReceivedService: DeletePaymentReceived;
 
   @Inject()
-  private getPaymentReceivesService: GetPaymentReceives;
+  private getPaymentsReceivedService: GetPaymentReceives;
 
   @Inject()
-  private getPaymentReceiveService: GetPaymentReceive;
+  private getPaymentReceivedService: GetPaymentReceived;
 
   @Inject()
-  private getPaymentReceiveInvoicesService: GetPaymentReceiveInvoices;
+  private getPaymentReceiveInvoicesService: GetPaymentReceivedInvoices;
 
   @Inject()
   private paymentSmsNotify: PaymentReceiveNotifyBySms;
@@ -47,21 +47,21 @@ export class PaymentReceivesApplication {
   private paymentMailNotify: SendPaymentReceiveMailNotification;
 
   @Inject()
-  private getPaymentReceivePdfService: GetPaymentReceivePdf;
+  private getPaymentReceivePdfService: GetPaymentReceivedPdf;
 
   /**
    * Creates a new payment receive.
    * @param {number} tenantId
-   * @param {IPaymentReceiveCreateDTO} paymentReceiveDTO
+   * @param {IPaymentReceivedCreateDTO} paymentReceiveDTO
    * @param {ISystemUser} authorizedUser
    * @returns
    */
-  public createPaymentReceive(
+  public createPaymentReceived(
     tenantId: number,
-    paymentReceiveDTO: IPaymentReceiveCreateDTO,
+    paymentReceiveDTO: IPaymentReceivedCreateDTO,
     authorizedUser: ISystemUser
   ) {
-    return this.createPaymentReceiveService.createPaymentReceive(
+    return this.createPaymentReceivedService.createPaymentReceived(
       tenantId,
       paymentReceiveDTO,
       authorizedUser
@@ -72,17 +72,17 @@ export class PaymentReceivesApplication {
    * Edit details the given payment receive with associated entries.
    * @param {number} tenantId
    * @param {number} paymentReceiveId
-   * @param {IPaymentReceiveEditDTO} paymentReceiveDTO
+   * @param {IPaymentReceivedEditDTO} paymentReceiveDTO
    * @param {ISystemUser} authorizedUser
    * @returns
    */
   public editPaymentReceive(
     tenantId: number,
     paymentReceiveId: number,
-    paymentReceiveDTO: IPaymentReceiveEditDTO,
+    paymentReceiveDTO: IPaymentReceivedEditDTO,
     authorizedUser: ISystemUser
   ) {
-    return this.editPaymentReceiveService.editPaymentReceive(
+    return this.editPaymentReceivedService.editPaymentReceive(
       tenantId,
       paymentReceiveId,
       paymentReceiveDTO,
@@ -102,7 +102,7 @@ export class PaymentReceivesApplication {
     paymentReceiveId: number,
     authorizedUser: ISystemUser
   ) {
-    return this.deletePaymentReceiveService.deletePaymentReceive(
+    return this.deletePaymentReceivedService.deletePaymentReceive(
       tenantId,
       paymentReceiveId,
       authorizedUser
@@ -112,18 +112,18 @@ export class PaymentReceivesApplication {
   /**
    * Retrieve payment receives paginated and filterable.
    * @param {number} tenantId
-   * @param {IPaymentReceivesFilter} filterDTO
+   * @param {IPaymentsReceivedFilter} filterDTO
    * @returns
    */
   public async getPaymentReceives(
     tenantId: number,
-    filterDTO: IPaymentReceivesFilter
+    filterDTO: IPaymentsReceivedFilter
   ): Promise<{
-    paymentReceives: IPaymentReceive[];
+    paymentReceives: IPaymentReceived[];
     pagination: IPaginationMeta;
     filterMeta: IFilterMeta;
   }> {
-    return this.getPaymentReceivesService.getPaymentReceives(
+    return this.getPaymentsReceivedService.getPaymentReceives(
       tenantId,
       filterDTO
     );
@@ -133,13 +133,13 @@ export class PaymentReceivesApplication {
    * Retrieves the given payment receive.
    * @param {number} tenantId
    * @param {number} paymentReceiveId
-   * @returns  {Promise<IPaymentReceive>}
+   * @returns  {Promise<IPaymentReceived>}
    */
   public async getPaymentReceive(
     tenantId: number,
     paymentReceiveId: number
-  ): Promise<IPaymentReceive> {
+  ): Promise<IPaymentReceived> {
-    return this.getPaymentReceiveService.getPaymentReceive(
+    return this.getPaymentReceivedService.getPaymentReceive(
       tenantId,
       paymentReceiveId
     );
@@ -175,7 +175,7 @@ export class PaymentReceivesApplication {
   public getPaymentSmsDetails = async (
     tenantId: number,
     paymentReceiveId: number
-  ): Promise<IPaymentReceiveSmsDetails> => {
+  ): Promise<IPaymentReceivedSmsDetails> => {
     return this.paymentSmsNotify.smsDetails(tenantId, paymentReceiveId);
   };
 

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

@@ -3,22 +3,22 @@ import { Inject, Service } from 'typedi';
 import { omit, sumBy } from 'lodash';
 import {
   ICustomer,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceiveCreateDTO,
+  IPaymentReceivedCreateDTO,
-  IPaymentReceiveEditDTO,
+  IPaymentReceivedEditDTO,
 } from '@/interfaces';
-import { PaymentReceiveValidators } from './PaymentReceiveValidators';
+import { PaymentReceivedValidators } from './PaymentReceivedValidators';
-import { PaymentReceiveIncrement } from './PaymentReceiveIncrement';
+import { PaymentReceivedIncrement } from './PaymentReceivedIncrement';
 import { BranchTransactionDTOTransform } from '@/services/Branches/Integrations/BranchTransactionDTOTransform';
 import { formatDateFields } from '@/utils';
 
 @Service()
 export class PaymentReceiveDTOTransformer {
   @Inject()
-  private validators: PaymentReceiveValidators;
+  private validators: PaymentReceivedValidators;
 
   @Inject()
-  private increments: PaymentReceiveIncrement;
+  private increments: PaymentReceivedIncrement;
 
   @Inject()
   private branchDTOTransform: BranchTransactionDTOTransform;
@@ -26,16 +26,16 @@ export class PaymentReceiveDTOTransformer {
   /**
    * Transformes the create payment receive DTO to model object.
    * @param {number} tenantId
-   * @param {IPaymentReceiveCreateDTO|IPaymentReceiveEditDTO} paymentReceiveDTO - Payment receive DTO.
+   * @param {IPaymentReceivedCreateDTO|IPaymentReceivedEditDTO} paymentReceiveDTO - Payment receive DTO.
-   * @param {IPaymentReceive} oldPaymentReceive -
+   * @param {IPaymentReceived} oldPaymentReceive -
-   * @return {IPaymentReceive}
+   * @return {IPaymentReceived}
    */
   public async transformPaymentReceiveDTOToModel(
     tenantId: number,
     customer: ICustomer,
-    paymentReceiveDTO: IPaymentReceiveCreateDTO | IPaymentReceiveEditDTO,
+    paymentReceiveDTO: IPaymentReceivedCreateDTO | IPaymentReceivedEditDTO,
-    oldPaymentReceive?: IPaymentReceive
+    oldPaymentReceive?: IPaymentReceived
-  ): Promise<IPaymentReceive> {
+  ): Promise<IPaymentReceived> {
     const amount =
       paymentReceiveDTO.amount ??
       sumBy(paymentReceiveDTO.entries, 'paymentAmount');
@@ -65,7 +65,7 @@ export class PaymentReceiveDTOTransformer {
       })),
     };
     return R.compose(
-      this.branchDTOTransform.transformDTO<IPaymentReceive>(tenantId)
+      this.branchDTOTransform.transformDTO<IPaymentReceived>(tenantId)
     )(initialDTO);
   }
 }

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

@@ -2,7 +2,7 @@ import { Transformer } from '@/lib/Transformer/Transformer';
 import { SaleInvoiceTransformer } from '../Invoices/SaleInvoiceTransformer';
 import { formatNumber } from '@/utils';
 
-export class PaymentReceiveEntryTransfromer extends Transformer {
+export class PaymentReceivedEntryTransfromer extends Transformer {
   /**
    * Include these attributes to payment receive entry object.
    * @returns {Array}

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

@@ -4,7 +4,7 @@ import { Knex } from 'knex';
 import Ledger from '@/services/Accounting/Ledger';
 import TenancyService from '@/services/Tenancy/TenancyService';
 import {
-  IPaymentReceive,
+  IPaymentReceived,
   ILedgerEntry,
   AccountNormal,
   IPaymentReceiveGLCommonEntry,
@@ -13,7 +13,7 @@ import LedgerStorageService from '@/services/Accounting/LedgerStorageService';
 import { TenantMetadata } from '@/system/models';
 
 @Service()
-export class PaymentReceiveGLEntries {
+export class PaymentReceivedGLEntries {
   @Inject()
   private tenancy: TenancyService;
 
@@ -93,14 +93,14 @@ export class PaymentReceiveGLEntries {
   /**
    * Retrieves the payment receive general ledger.
    * @param   {number} tenantId -
-   * @param   {IPaymentReceive} paymentReceive -
+   * @param   {IPaymentReceived} paymentReceive -
    * @param   {string} baseCurrencyCode -
    * @param   {Knex.Transaction} trx -
    * @returns {Ledger}
    */
   public getPaymentReceiveGLedger = async (
     tenantId: number,
-    paymentReceive: IPaymentReceive,
+    paymentReceive: IPaymentReceived,
     baseCurrencyCode: string,
     trx?: Knex.Transaction
   ): Promise<Ledger> => {
@@ -132,7 +132,7 @@ export class PaymentReceiveGLEntries {
    * @returns {number}
    */
   private getPaymentExGainOrLoss = (
-    paymentReceive: IPaymentReceive
+    paymentReceive: IPaymentReceived
   ): number => {
     return sumBy(paymentReceive.entries, (entry) => {
       const paymentLocalAmount =
@@ -145,11 +145,11 @@ export class PaymentReceiveGLEntries {
 
   /**
    * Retrieves the common entry of payment receive.
-   * @param   {IPaymentReceive} paymentReceive
+   * @param   {IPaymentReceived} paymentReceive
    * @returns {}
    */
   private getPaymentReceiveCommonEntry = (
-    paymentReceive: IPaymentReceive
+    paymentReceive: IPaymentReceived
   ): IPaymentReceiveGLCommonEntry => {
     return {
       debit: 0,
@@ -174,14 +174,14 @@ export class PaymentReceiveGLEntries {
 
   /**
    * Retrieves the payment exchange gain/loss entry.
-   * @param   {IPaymentReceive} paymentReceive -
+   * @param   {IPaymentReceived} paymentReceive -
    * @param   {number} ARAccountId -
    * @param   {number} exchangeGainOrLossAccountId -
    * @param   {string} baseCurrencyCode -
    * @returns {ILedgerEntry[]}
    */
   private getPaymentExchangeGainLossEntry = (
-    paymentReceive: IPaymentReceive,
+    paymentReceive: IPaymentReceived,
     ARAccountId: number,
     exchangeGainOrLossAccountId: number,
     baseCurrencyCode: string
@@ -219,11 +219,11 @@ export class PaymentReceiveGLEntries {
 
   /**
    * Retrieves the payment deposit GL entry.
-   * @param   {IPaymentReceive} paymentReceive
+   * @param   {IPaymentReceived} paymentReceive
    * @returns {ILedgerEntry}
    */
   private getPaymentDepositGLEntry = (
-    paymentReceive: IPaymentReceive
+    paymentReceive: IPaymentReceived
   ): ILedgerEntry => {
     const commonJournal = this.getPaymentReceiveCommonEntry(paymentReceive);
 
@@ -238,12 +238,12 @@ export class PaymentReceiveGLEntries {
 
   /**
    * Retrieves the payment receivable entry.
-   * @param   {IPaymentReceive} paymentReceive
+   * @param   {IPaymentReceived} paymentReceive
    * @param   {number} ARAccountId
    * @returns {ILedgerEntry}
    */
   private getPaymentReceivableEntry = (
-    paymentReceive: IPaymentReceive,
+    paymentReceive: IPaymentReceived,
     ARAccountId: number
   ): ILedgerEntry => {
     const commonJournal = this.getPaymentReceiveCommonEntry(paymentReceive);
@@ -267,14 +267,14 @@ export class PaymentReceiveGLEntries {
    * - Payment account [current asset] -> Credit
    *
    * @param   {number} tenantId
-   * @param   {IPaymentReceive} paymentRecieve - Payment receive model.
+   * @param   {IPaymentReceived} paymentRecieve - Payment receive model.
    * @param   {number} ARAccountId - A/R account id.
    * @param   {number} exGainOrLossAccountId - Exchange gain/loss account id.
    * @param   {string} baseCurrency - Base currency code.
    * @returns {Promise<ILedgerEntry>}
    */
   public getPaymentReceiveGLEntries = (
-    paymentReceive: IPaymentReceive,
+    paymentReceive: IPaymentReceived,
     ARAccountId: number,
     exGainOrLossAccountId: number,
     baseCurrency: string

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

@@ -2,7 +2,7 @@ import { Inject, Service } from 'typedi';
 import AutoIncrementOrdersService from '../AutoIncrementOrdersService';
 
 @Service()
-export class PaymentReceiveIncrement {
+export class PaymentReceivedIncrement {
   @Inject()
   private autoIncrementOrdersService: AutoIncrementOrdersService;
 

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

@@ -1,11 +1,11 @@
 import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
-import { IPaymentReceiveEntryDTO } from '@/interfaces';
+import { IPaymentReceivedEntryDTO } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { entriesAmountDiff } from '@/utils';
 
 @Service()
-export class PaymentReceiveInvoiceSync {
+export class PaymentReceivedInvoiceSync {
   @Inject()
   private tenancy: HasTenancyService;
 
@@ -19,8 +19,8 @@ export class PaymentReceiveInvoiceSync {
    */
   public async saveChangeInvoicePaymentAmount(
     tenantId: number,
-    newPaymentReceiveEntries: IPaymentReceiveEntryDTO[],
+    newPaymentReceiveEntries: IPaymentReceivedEntryDTO[],
-    oldPaymentReceiveEntries?: IPaymentReceiveEntryDTO[],
+    oldPaymentReceiveEntries?: IPaymentReceivedEntryDTO[],
     trx?: Knex.Transaction
   ): Promise<void> {
     const { SaleInvoice } = this.tenancy.models(tenantId);

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

@@ -11,7 +11,7 @@ import {
   DEFAULT_PAYMENT_MAIL_CONTENT,
   DEFAULT_PAYMENT_MAIL_SUBJECT,
 } from './constants';
-import { GetPaymentReceive } from './GetPaymentReceive';
+import { GetPaymentReceived } from './GetPaymentReceived';
 import { ContactMailNotification } from '@/services/MailNotification/ContactMailNotification';
 import { parseAndValidateMailOptions } from '@/services/MailNotification/utils';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
@@ -23,7 +23,7 @@ export class SendPaymentReceiveMailNotification {
   private tenancy: HasTenancyService;
 
   @Inject()
-  private getPaymentService: GetPaymentReceive;
+  private getPaymentService: GetPaymentReceived;
 
   @Inject()
   private contactMailNotification: ContactMailNotification;

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

@@ -1,8 +1,8 @@
 import Container, { Service } from 'typedi';
-import { SendPaymentReceiveMailNotification } from './PaymentReceiveMailNotification';
+import { SendPaymentReceiveMailNotification } from './PaymentReceivedMailNotification';
 
 @Service()
-export class PaymentReceiveMailNotificationJob {
+export class PaymentReceivedMailNotificationJob {
   /**
    * Constructor method.
    */

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

@@ -2,17 +2,17 @@ import { Service, Inject } from 'typedi';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import events from '@/subscribers/events';
 import {
-  IPaymentReceiveSmsDetails,
+  IPaymentReceivedSmsDetails,
   SMS_NOTIFICATION_KEY,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceiveEntry,
+  IPaymentReceivedEntry,
 } from '@/interfaces';
 import SmsNotificationsSettingsService from '@/services/Settings/SmsNotificationsSettings';
 import { formatNumber, formatSmsMessage } from 'utils';
 import { TenantMetadata } from '@/system/models';
 import SaleNotifyBySms from '../SaleNotifyBySms';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
-import { PaymentReceiveValidators } from './PaymentReceiveValidators';
+import { PaymentReceivedValidators } from './PaymentReceivedValidators';
 
 @Service()
 export class PaymentReceiveNotifyBySms {
@@ -29,7 +29,7 @@ export class PaymentReceiveNotifyBySms {
   private saleSmsNotification: SaleNotifyBySms;
 
   @Inject()
-  private validators: PaymentReceiveValidators;
+  private validators: PaymentReceivedValidators;
 
   /**
    * Notify customer via sms about payment receive details.
@@ -71,12 +71,12 @@ export class PaymentReceiveNotifyBySms {
   /**
    * Sends the payment details sms notification of the given customer.
    * @param {number} tenantId
-   * @param {IPaymentReceive} paymentReceive
+   * @param {IPaymentReceived} paymentReceive
    * @param {ICustomer} customer
    */
   private sendSmsNotification = async (
     tenantId: number,
-    paymentReceive: IPaymentReceive
+    paymentReceive: IPaymentReceived
   ) => {
     const smsClient = this.tenancy.smsClient(tenantId);
     const tenantMetadata = await TenantMetadata.query().findOne({ tenantId });
@@ -116,12 +116,12 @@ export class PaymentReceiveNotifyBySms {
   /**
    * Formates the payment receive details sms message.
    * @param {number} tenantId -
-   * @param {IPaymentReceive} payment -
+   * @param {IPaymentReceived} payment -
    * @param {ICustomer} customer -
    */
   private formattedPaymentDetailsMessage = (
     tenantId: number,
-    payment: IPaymentReceive,
+    payment: IPaymentReceived,
     tenantMetadata: TenantMetadata
   ) => {
     const notification = this.smsNotificationsSettings.getSmsNotificationMeta(
@@ -138,14 +138,14 @@ export class PaymentReceiveNotifyBySms {
   /**
    * Formattes the payment details sms notification messafge.
    * @param {string} smsMessage
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceived} payment
    * @param {ICustomer} customer
    * @param {TenantMetadata} tenantMetadata
    * @returns {string}
    */
   private formatPaymentDetailsMessage = (
     smsMessage: string,
-    payment: IPaymentReceive,
+    payment: IPaymentReceived,
     tenantMetadata: any
   ): string => {
     const invoiceNumbers = this.stringifyPaymentInvoicesNumber(payment);
@@ -167,12 +167,12 @@ export class PaymentReceiveNotifyBySms {
 
   /**
    * Stringify payment receive invoices to numbers as string.
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceived} payment
    * @returns {string}
    */
-  private stringifyPaymentInvoicesNumber(payment: IPaymentReceive) {
+  private stringifyPaymentInvoicesNumber(payment: IPaymentReceived) {
     const invoicesNumberes = payment.entries.map(
-      (entry: IPaymentReceiveEntry) => entry.invoice.invoiceNo
+      (entry: IPaymentReceivedEntry) => entry.invoice.invoiceNo
     );
     return invoicesNumberes.join(', ');
   }
@@ -185,7 +185,7 @@ export class PaymentReceiveNotifyBySms {
   public smsDetails = async (
     tenantId: number,
     paymentReceiveid: number
-  ): Promise<IPaymentReceiveSmsDetails> => {
+  ): Promise<IPaymentReceivedSmsDetails> => {
     const { PaymentReceive } = this.tenancy.models(tenantId);
 
     // Retrieve the payment receive or throw not found service error.

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

@@ -1,8 +1,7 @@
 import { Container } from 'typedi';
 import { On, EventSubscriber } from 'event-dispatch';
 import events from '@/subscribers/events';
-import SaleReceiptNotifyBySms from '@/services/Sales/SaleReceiptNotifyBySms';
+import { PaymentReceiveNotifyBySms } from './PaymentReceivedSmsNotify';
-import PaymentReceiveNotifyBySms from './PaymentReceiveSmsNotify';
 
 @EventSubscriber()
 export default class SendSmsNotificationPaymentReceive {

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

@@ -1,7 +1,7 @@
-import { IPaymentReceive, IPaymentReceiveEntry } from '@/interfaces';
+import { IPaymentReceived, IPaymentReceivedEntry } from '@/interfaces';
 import { Transformer } from '@/lib/Transformer/Transformer';
 import { formatNumber } from 'utils';
-import { PaymentReceiveEntryTransfromer } from './PaymentReceiveEntryTransformer';
+import { PaymentReceivedEntryTransfromer } from './PaymentReceivedEntryTransformer';
 
 export class PaymentReceiveTransfromer extends Transformer {
   /**
@@ -24,25 +24,25 @@ export class PaymentReceiveTransfromer extends Transformer {
    * @param {ISaleInvoice} invoice
    * @returns {String}
    */
-  protected formattedPaymentDate = (payment: IPaymentReceive): string => {
+  protected formattedPaymentDate = (payment: IPaymentReceived): string => {
     return this.formatDate(payment.paymentDate);
   };
 
   /**
    * Retrieves the formatted created at date.
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceived} payment
    * @returns {string}
    */
-  protected formattedCreatedAt = (payment: IPaymentReceive): string => {
+  protected formattedCreatedAt = (payment: IPaymentReceived): string => {
     return this.formatDate(payment.createdAt);
   };
 
   /**
    * Retrieve the formatted payment subtotal.
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceived} payment
    * @returns {string}
    */
-  protected subtotalFormatted = (payment: IPaymentReceive): string => {
+  protected subtotalFormatted = (payment: IPaymentReceived): string => {
     return formatNumber(payment.amount, {
       currencyCode: payment.currencyCode,
       money: false,
@@ -54,25 +54,25 @@ export class PaymentReceiveTransfromer extends Transformer {
    * @param {ISaleInvoice} invoice
    * @returns {string}
    */
-  protected formattedAmount = (payment: IPaymentReceive): string => {
+  protected formattedAmount = (payment: IPaymentReceived): string => {
     return formatNumber(payment.amount, { currencyCode: payment.currencyCode });
   };
 
   /**
    * Retrieve the formatted exchange rate.
-   * @param   {IPaymentReceive} payment
+   * @param   {IPaymentReceived} payment
    * @returns {string}
    */
-  protected formattedExchangeRate = (payment: IPaymentReceive): string => {
+  protected formattedExchangeRate = (payment: IPaymentReceived): string => {
     return formatNumber(payment.exchangeRate, { money: false });
   };
 
   /**
    * Retrieves the payment entries.
-   * @param {IPaymentReceive} payment
+   * @param {IPaymentReceived} payment
-   * @returns {IPaymentReceiveEntry[]}
+   * @returns {IPaymentReceivedEntry[]}
    */
-  protected entries = (payment: IPaymentReceive): IPaymentReceiveEntry[] => {
+  protected entries = (payment: IPaymentReceived): IPaymentReceivedEntry[] => {
-    return this.item(payment.entries, new PaymentReceiveEntryTransfromer());
+    return this.item(payment.entries, new PaymentReceivedEntryTransfromer());
   };
 }

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

@@ -2,10 +2,10 @@ import { Inject, Service } from 'typedi';
 import { difference, sumBy } from 'lodash';
 import {
   IAccount,
-  IPaymentReceive,
+  IPaymentReceived,
-  IPaymentReceiveEditDTO,
+  IPaymentReceivedEditDTO,
-  IPaymentReceiveEntry,
+  IPaymentReceivedEntry,
-  IPaymentReceiveEntryDTO,
+  IPaymentReceivedEntryDTO,
   ISaleInvoice,
 } from '@/interfaces';
 import { ServiceError } from '@/exceptions';
@@ -15,7 +15,7 @@ import { ACCOUNT_TYPE } from '@/data/AccountTypes';
 import { PaymentReceive } from '@/models';
 
 @Service()
-export class PaymentReceiveValidators {
+export class PaymentReceivedValidators {
   @Inject()
   private tenancy: HasTenancyService;
 
@@ -58,7 +58,7 @@ export class PaymentReceiveValidators {
    * Validates the invoices IDs existance.
    * @param {number} tenantId -
    * @param {number} customerId -
-   * @param {IPaymentReceiveEntryDTO[]} paymentReceiveEntries -
+   * @param {IPaymentReceivedEntryDTO[]} paymentReceiveEntries -
    */
   public async validateInvoicesIDsExistance(
     tenantId: number,
@@ -100,12 +100,12 @@ export class PaymentReceiveValidators {
    */
   public async validateInvoicesPaymentsAmount(
     tenantId: number,
-    paymentReceiveEntries: IPaymentReceiveEntryDTO[],
+    paymentReceiveEntries: IPaymentReceivedEntryDTO[],
-    oldPaymentEntries: IPaymentReceiveEntry[] = []
+    oldPaymentEntries: IPaymentReceivedEntry[] = []
   ) {
     const { SaleInvoice } = this.tenancy.models(tenantId);
     const invoicesIds = paymentReceiveEntries.map(
-      (e: IPaymentReceiveEntryDTO) => e.invoiceId
+      (e: IPaymentReceivedEntryDTO) => e.invoiceId
     );
 
     const storedInvoices = await SaleInvoice.query().whereIn('id', invoicesIds);
@@ -124,7 +124,7 @@ export class PaymentReceiveValidators {
     const hasWrongPaymentAmount: any[] = [];
 
     paymentReceiveEntries.forEach(
-      (entry: IPaymentReceiveEntryDTO, index: number) => {
+      (entry: IPaymentReceivedEntryDTO, index: number) => {
         const entryInvoice = storedInvoicesMap.get(entry.invoiceId);
         const { dueAmount } = entryInvoice;
 
@@ -140,9 +140,9 @@ export class PaymentReceiveValidators {
 
   /**
    * Validate the payment receive number require.
-   * @param {IPaymentReceive} paymentReceiveObj
+   * @param {IPaymentReceived} paymentReceiveObj
    */
-  public validatePaymentReceiveNoRequire(paymentReceiveObj: IPaymentReceive) {
+  public validatePaymentReceiveNoRequire(paymentReceiveObj: IPaymentReceived) {
     if (!paymentReceiveObj.paymentReceiveNo) {
       throw new ServiceError(ERRORS.PAYMENT_RECEIVE_NO_IS_REQUIRED);
     }
@@ -152,12 +152,12 @@ export class PaymentReceiveValidators {
    * Validate the payment receive entries IDs existance.
    * @param {number} tenantId
    * @param {number} paymentReceiveId
-   * @param {IPaymentReceiveEntryDTO[]} paymentReceiveEntries
+   * @param {IPaymentReceivedEntryDTO[]} paymentReceiveEntries
    */
   public async validateEntriesIdsExistance(
     tenantId: number,
     paymentReceiveId: number,
-    paymentReceiveEntries: IPaymentReceiveEntryDTO[]
+    paymentReceiveEntries: IPaymentReceivedEntryDTO[]
   ) {
     const { PaymentReceiveEntry } = this.tenancy.models(tenantId);
 
@@ -189,12 +189,12 @@ export class PaymentReceiveValidators {
 
   /**
    * Validate the payment customer whether modified.
-   * @param {IPaymentReceiveEditDTO} paymentReceiveDTO
+   * @param {IPaymentReceivedEditDTO} paymentReceiveDTO
-   * @param {IPaymentReceive} oldPaymentReceive
+   * @param {IPaymentReceived} oldPaymentReceive
    */
   public validateCustomerNotModified(
-    paymentReceiveDTO: IPaymentReceiveEditDTO,
+    paymentReceiveDTO: IPaymentReceivedEditDTO,
-    oldPaymentReceive: IPaymentReceive
+    oldPaymentReceive: IPaymentReceived
   ) {
     if (paymentReceiveDTO.customerId !== oldPaymentReceive.customerId) {
       throw new ServiceError(ERRORS.PAYMENT_CUSTOMER_SHOULD_NOT_UPDATE);
@@ -230,7 +230,7 @@ export class PaymentReceiveValidators {
   async getPaymentReceiveOrThrowError(
     tenantId: number,
     paymentReceiveId: number
-  ): Promise<IPaymentReceive> {
+  ): Promise<IPaymentReceived> {
     const { PaymentReceive } = this.tenancy.models(tenantId);
     const paymentReceive = await PaymentReceive.query()
       .withGraphFetched('entries')

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

@@ -1,7 +1,7 @@
 import { Inject, Service } from 'typedi';
-import { IAccountsStructureType, IPaymentReceivesFilter } from '@/interfaces';
+import { IAccountsStructureType, IPaymentsReceivedFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
-import { PaymentReceivesApplication } from './PaymentReceivesApplication';
+import { PaymentReceivesApplication } from './PaymentReceivedApplication';
 
 @Service()
 export class PaymentsReceivedExportable extends Exportable {
@@ -11,17 +11,17 @@ export class PaymentsReceivedExportable extends Exportable {
   /**
    * Retrieves the accounts data to exportable sheet.
    * @param {number} tenantId
-   * @param {IPaymentReceivesFilter} query -
+   * @param {IPaymentsReceivedFilter} query -
    * @returns
    */
-  public exportable(tenantId: number, query: IPaymentReceivesFilter) {
+  public exportable(tenantId: number, query: IPaymentsReceivedFilter) {
     const parsedQuery = {
       sortOrder: 'desc',
       columnSortBy: 'created_at',
       inactiveMode: false,
       ...query,
       structure: IAccountsStructureType.Flat,
-    } as IPaymentReceivesFilter;
+    } as IPaymentsReceivedFilter;
 
     return this.paymentReceivedApp
       .getPaymentReceives(tenantId, parsedQuery)

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

@@ -1,14 +1,14 @@
 import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
-import { IPaymentReceiveCreateDTO } from '@/interfaces';
+import { IPaymentReceivedCreateDTO } from '@/interfaces';
 import { Importable } from '@/services/Import/Importable';
-import { CreatePaymentReceive } from './CreatePaymentReceive';
+import { CreatePaymentReceived } from './CreatePaymentReceived';
 import { PaymentsReceiveSampleData } from './constants';
 
 @Service()
-export class PaymentReceivesImportable extends Importable {
+export class PaymentsReceivedImportable extends Importable {
   @Inject()
-  private createPaymentReceiveService: CreatePaymentReceive;
+  private createPaymentReceiveService: CreatePaymentReceived;
 
   /**
    * Importing to account service.
@@ -18,10 +18,10 @@ export class PaymentReceivesImportable extends Importable {
    */
   public importable(
     tenantId: number,
-    createPaymentDTO: IPaymentReceiveCreateDTO,
+    createPaymentDTO: IPaymentReceivedCreateDTO,
     trx?: Knex.Transaction
   ) {
-    return this.createPaymentReceiveService.createPaymentReceive(
+    return this.createPaymentReceiveService.createPaymentReceived(
       tenantId,
       createPaymentDTO,
       {},

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

@@ -3,7 +3,7 @@ import { omit } from 'lodash';
 import {
   ISaleInvoice,
   IPaymentReceivePageEntry,
-  IPaymentReceive,
+  IPaymentReceived,
   ISystemUser,
 } from '@/interfaces';
 import TenancyService from '@/services/Tenancy/TenancyService';
@@ -14,12 +14,9 @@ import { ERRORS } from './constants';
  * Payment receives edit/new pages service.
  */
 @Service()
-export default class PaymentReceivesPages {
+export default class PaymentsReceivedPages {
   @Inject()
-  tenancy: TenancyService;
+  private tenancy: TenancyService;
-
-  @Inject('logger')
-  logger: any;
 
   /**
    * Retrive page invoices entries from the given sale invoices models.
@@ -68,7 +65,7 @@ export default class PaymentReceivesPages {
     tenantId: number,
     paymentReceiveId: number
   ): Promise<{
-    paymentReceive: Omit<IPaymentReceive, 'entries'>;
+    paymentReceive: Omit<IPaymentReceived, 'entries'>;
     entries: IPaymentReceivePageEntry[];
   }> {
     const { PaymentReceive, SaleInvoice } = this.tenancy.models(tenantId);

packages/server/src/services/TaxRates/CommandTaxRatesValidators.ts

@@ -1,9 +1,10 @@
-import { ServiceError } from '@/exceptions';
+import { Knex } from 'knex';
 import { Inject, Service } from 'typedi';
+import { difference } from 'lodash';
+import { ServiceError } from '@/exceptions';
 import HasTenancyService from '../Tenancy/TenancyService';
 import { IItemEntryDTO, ITaxRate } from '@/interfaces';
 import { ERRORS } from './constants';
-import { difference } from 'lodash';
 
 @Service()
 export class CommandTaxRatesValidators {
@@ -44,11 +45,16 @@ export class CommandTaxRatesValidators {
    * Validates the tax code uniquiness.
    * @param {number} tenantId
    * @param {string} taxCode
+   * @param {Knex.Transaction} trx -
    */
-  public async validateTaxCodeUnique(tenantId: number, taxCode: string) {
+  public async validateTaxCodeUnique(
+    tenantId: number,
+    taxCode: string,
+    trx?: Knex.Transaction
+  ) {
     const { TaxRate } = this.tenancy.models(tenantId);
 
-    const foundTaxCode = await TaxRate.query().findOne({ code: taxCode });
+    const foundTaxCode = await TaxRate.query(trx).findOne({ code: taxCode });
 
     if (foundTaxCode) {
       throw new ServiceError(ERRORS.TAX_CODE_NOT_UNIQUE);

packages/server/src/services/TaxRates/CreateTaxRate.ts

@@ -1,3 +1,4 @@
+import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import {
   ICreateTaxRateDTO,
@@ -7,7 +8,6 @@ import {
 import UnitOfWork from '../UnitOfWork';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import HasTenancyService from '../Tenancy/TenancyService';
-import { Inject, Service } from 'typedi';
 import events from '@/subscribers/events';
 import { CommandTaxRatesValidators } from './CommandTaxRatesValidators';
 
@@ -32,36 +32,41 @@ export class CreateTaxRate {
    */
   public async createTaxRate(
     tenantId: number,
-    createTaxRateDTO: ICreateTaxRateDTO
+    createTaxRateDTO: ICreateTaxRateDTO,
+    trx?: Knex.Transaction
   ) {
     const { TaxRate } = this.tenancy.models(tenantId);
 
     // Validates the tax code uniquiness.
     await this.validators.validateTaxCodeUnique(
       tenantId,
-      createTaxRateDTO.code
+      createTaxRateDTO.code,
+      trx
     );
-    return this.uow.withTransaction(tenantId, async (trx: Knex.Transaction) => {
+    return this.uow.withTransaction(
-      // Triggers `onTaxRateCreating` event.
+      tenantId,
-      await this.eventPublisher.emitAsync(events.taxRates.onCreating, {
+      async (trx: Knex.Transaction) => {
-        createTaxRateDTO,
+        // Triggers `onTaxRateCreating` event.
-        tenantId,
+        await this.eventPublisher.emitAsync(events.taxRates.onCreating, {
-        trx,
+          createTaxRateDTO,
-      } as ITaxRateCreatingPayload);
+          tenantId,
+          trx,
+        } as ITaxRateCreatingPayload);
 
-      const taxRate = await TaxRate.query(trx).insertAndFetch({
+        const taxRate = await TaxRate.query(trx).insertAndFetch({
-        ...createTaxRateDTO,
+          ...createTaxRateDTO,
-      });
+        });
+        // Triggers `onTaxRateCreated` event.
+        await this.eventPublisher.emitAsync(events.taxRates.onCreated, {
+          createTaxRateDTO,
+          taxRate,
+          tenantId,
+          trx,
+        } as ITaxRateCreatedPayload);
 
-      // Triggers `onTaxRateCreated` event.
+        return taxRate;
-      await this.eventPublisher.emitAsync(events.taxRates.onCreated, {
+      },
-        createTaxRateDTO,
+      trx
-        taxRate,
+    );
-        tenantId,
-        trx,
-      } as ITaxRateCreatedPayload);
-
-      return taxRate;
-    });
   }
 }

packages/server/src/services/TaxRates/TaxRatesExportable.ts

@@ -0,0 +1,18 @@
+import { Inject, Service } from 'typedi';
+import { Exportable } from '../Export/Exportable';
+import { TaxRatesApplication } from './TaxRatesApplication';
+
+@Service()
+export class TaxRatesExportable extends Exportable {
+  @Inject()
+  private taxRatesApplication: TaxRatesApplication;
+
+  /**
+   * Retrieves the accounts data to exportable sheet.
+   * @param {number} tenantId
+   * @returns
+   */
+  public exportable(tenantId: number) {
+    return this.taxRatesApplication.getTaxRates(tenantId);
+  }
+}

packages/server/src/services/TaxRates/TaxRatesImportable.SampleData.ts

@@ -0,0 +1,18 @@
+export const TaxRatesSampleData = [
+  {
+    'Tax Name': 'Value Added Tax',
+    Code: 'VAT-STD',
+    Rate: '20',
+    Description: 'Standard VAT rate applied to most goods and services.',
+    'Is Non Recoverable': 'F',
+    Active: 'T',
+  },
+  {
+    'Tax Name': 'Luxury Goods Tax',
+    Code: 'TAX-LUXURY',
+    Rate: '25',
+    Description: 'Tax imposed on the sale of luxury items.',
+    'Is Non Recoverable': 'T',
+    Active: 'T',
+  },
+];

packages/server/src/services/TaxRates/TaxRatesImportable.ts

@@ -0,0 +1,46 @@
+import { Inject, Service } from 'typedi';
+import { Knex } from 'knex';
+import { ICreateTaxRateDTO } from '@/interfaces';
+import { CreateTaxRate } from './CreateTaxRate';
+import { Importable } from '../Import/Importable';
+import { TaxRatesSampleData } from './TaxRatesImportable.SampleData';
+
+@Service()
+export class TaxRatesImportable extends Importable {
+  @Inject()
+  private createTaxRateService: CreateTaxRate;
+
+  /**
+   * Importing to tax rate creating service.
+   * @param {number} tenantId -
+   * @param {ICreateTaxRateDTO} ICreateTaxRateDTO -
+   * @param {Knex.Transaction} trx -
+   * @returns
+   */
+  public importable(
+    tenantId: number,
+    createAccountDTO: ICreateTaxRateDTO,
+    trx?: Knex.Transaction
+  ) {
+    return this.createTaxRateService.createTaxRate(
+      tenantId,
+      createAccountDTO,
+      trx
+    );
+  }
+
+  /**
+   * Concurrrency controlling of the importing process.
+   * @returns {number}
+   */
+  public get concurrency() {
+    return 1;
+  }
+
+  /**
+   * Retrieves the sample data that used to download accounts sample sheet.
+   */
+  public sampleData(): any[] {
+    return TaxRatesSampleData;
+  }
+}

packages/server/src/services/TransactionsLocking/SalesTransactionLockingGuardSubscriber.ts

@@ -5,9 +5,9 @@ import {
   ISaleInvoiceCreatingPaylaod,
   ISaleReceiptDeletingPayload,
   ICreditNoteDeletingPayload,
-  IPaymentReceiveCreatingPayload,
+  IPaymentReceivedCreatingPayload,
   IRefundCreditNoteDeletingPayload,
-  IPaymentReceiveDeletingPayload,
+  IPaymentReceivedDeletingPayload,
   ISaleEstimateDeletingPayload,
   ISaleEstimateCreatingPayload,
   ISaleEstimateEditingPayload,
@@ -17,7 +17,7 @@ import {
   ISaleInvoiceWrittenOffCancelPayload,
   ICreditNoteEditingPayload,
   ISaleReceiptEditingPayload,
-  IPaymentReceiveEditingPayload,
+  IPaymentReceivedEditingPayload,
   ISaleReceiptEventClosingPayload,
   ICreditNoteCreatingPayload,
 } from '@/interfaces';
@@ -454,13 +454,13 @@ export default class SalesTransactionLockingGuardSubscriber {
 
   /**
    * Transaction locking guard on payment receive editing.
-   * @param {IPaymentReceiveEditingPayload}
+   * @param {IPaymentReceivedEditingPayload}
    */
   private transactionLockingGuardOnPaymentEditing = async ({
     tenantId,
     oldPaymentReceive,
     paymentReceiveDTO,
-  }: IPaymentReceiveEditingPayload) => {
+  }: IPaymentReceivedEditingPayload) => {
     // Validate the old payment date.
     await this.salesLockingGuard.transactionLockingGuard(
       tenantId,
@@ -475,12 +475,12 @@ export default class SalesTransactionLockingGuardSubscriber {
 
   /**
    * Transaction locking guard on payment creating.
-   * @param {IPaymentReceiveCreatingPayload}
+   * @param {IPaymentReceivedCreatingPayload}
    */
   private transactionLockingGuardOnPaymentCreating = async ({
     tenantId,
     paymentReceiveDTO,
-  }: IPaymentReceiveCreatingPayload) => {
+  }: IPaymentReceivedCreatingPayload) => {
     await this.salesLockingGuard.transactionLockingGuard(
       tenantId,
       paymentReceiveDTO.paymentDate
@@ -489,12 +489,12 @@ export default class SalesTransactionLockingGuardSubscriber {
 
   /**
    * Transaction locking guard on payment deleting.
-   * @param {IPaymentReceiveDeletingPayload} payload -
+   * @param {IPaymentReceivedDeletingPayload} payload -
    */
   private transactionLockingGuardPaymentDeleting = async ({
     oldPaymentReceive,
     tenantId,
-  }: IPaymentReceiveDeletingPayload) => {
+  }: IPaymentReceivedDeletingPayload) => {
     await this.salesLockingGuard.transactionLockingGuard(
       tenantId,
       oldPaymentReceive.paymentDate

packages/server/src/subscribers/PaymentReceive/AutoSerialIncrement.ts

@@ -1,13 +1,13 @@
 import { Service, Inject } from 'typedi';
 import events from '@/subscribers/events';
 import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher';
-import { PaymentReceiveIncrement } from '@/services/Sales/PaymentReceives/PaymentReceiveIncrement';
+import { PaymentReceivedIncrement } from '@/services/Sales/PaymentReceived/PaymentReceivedIncrement';
-import { IPaymentReceiveCreatedPayload } from '@/interfaces';
+import { IPaymentReceivedCreatedPayload } from '@/interfaces';
 
 @Service()
 export default class PaymentReceiveAutoSerialSubscriber extends EventSubscriber {
   @Inject()
-  private paymentIncrement: PaymentReceiveIncrement;
+  private paymentIncrement: PaymentReceivedIncrement;
 
   /**
    * Attaches the events with handles.
@@ -22,13 +22,13 @@ export default class PaymentReceiveAutoSerialSubscriber extends EventSubscriber
 
   /**
    * Handles increment next number of payment receive once be created.
-   * @param {IPaymentReceiveCreatedPayload} payload -
+   * @param {IPaymentReceivedCreatedPayload} payload -
    */
   private handlePaymentNextNumberIncrement = async ({
     tenantId,
     paymentReceiveId,
     trx,
-  }: IPaymentReceiveCreatedPayload) => {
+  }: IPaymentReceivedCreatedPayload) => {
     await this.paymentIncrement.incrementNextPaymentReceiveNumber(tenantId);
   };
 }

packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts

@@ -1,16 +1,16 @@
 import { Inject, Service } from 'typedi';
 import events from '@/subscribers/events';
-import { PaymentReceiveInvoiceSync } from '@/services/Sales/PaymentReceives/PaymentReceiveInvoiceSync';
+import { PaymentReceivedInvoiceSync } from '@/services/Sales/PaymentReceived/PaymentReceivedInvoiceSync';
 import {
-  IPaymentReceiveCreatedPayload,
+  IPaymentReceivedCreatedPayload,
-  IPaymentReceiveDeletedPayload,
+  IPaymentReceivedDeletedPayload,
-  IPaymentReceiveEditedPayload,
+  IPaymentReceivedEditedPayload,
 } from '@/interfaces';
 
 @Service()
 export default class PaymentReceiveSyncInvoicesSubscriber {
   @Inject()
-  private paymentSyncInvoice: PaymentReceiveInvoiceSync;
+  private paymentSyncInvoice: PaymentReceivedInvoiceSync;
 
   /**
    * Attaches the events to handles.
@@ -39,7 +39,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber {
     tenantId,
     paymentReceive,
     trx,
-  }: IPaymentReceiveCreatedPayload) => {
+  }: IPaymentReceivedCreatedPayload) => {
     await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount(
       tenantId,
       paymentReceive.entries,
@@ -57,7 +57,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber {
     paymentReceive,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveEditedPayload) => {
+  }: IPaymentReceivedEditedPayload) => {
     await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount(
       tenantId,
       paymentReceive.entries,
@@ -74,7 +74,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber {
     paymentReceiveId,
     oldPaymentReceive,
     trx,
-  }: IPaymentReceiveDeletedPayload) => {
+  }: IPaymentReceivedDeletedPayload) => {
     await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount(
       tenantId,
       oldPaymentReceive.entries.map((entry) => ({

packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts

@@ -1,7 +1,7 @@
 import { Service, Inject } from 'typedi';
 import events from '@/subscribers/events';
-import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceives/PaymentReceiveSmsNotify';
+import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceived/PaymentReceivedSmsNotify';
-import { IPaymentReceiveCreatedPayload } from '@/interfaces';
+import { IPaymentReceivedCreatedPayload } from '@/interfaces';
 import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks';
 
 @Service()
@@ -26,7 +26,7 @@ export default class SendSmsNotificationPaymentReceive {
     tenantId,
     paymentReceiveId,
     trx,
-  }: IPaymentReceiveCreatedPayload) => {
+  }: IPaymentReceivedCreatedPayload) => {
     // Notify via Sms after transactions complete running.
     runAfterTransaction(trx, async () => {
       try {
@@ -34,7 +34,7 @@ export default class SendSmsNotificationPaymentReceive {
           tenantId,
           paymentReceiveId
         );
-      } catch (error) {}
+      } catch (error) { }
     });
   };
 }

packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts

@@ -1,16 +1,16 @@
 import { Inject, Service } from 'typedi';
 import {
-  IPaymentReceiveCreatedPayload,
+  IPaymentReceivedCreatedPayload,
-  IPaymentReceiveDeletedPayload,
+  IPaymentReceivedDeletedPayload,
-  IPaymentReceiveEditedPayload,
+  IPaymentReceivedEditedPayload,
 } from '@/interfaces';
 import events from '@/subscribers/events';
-import { PaymentReceiveGLEntries } from '@/services/Sales/PaymentReceives/PaymentReceiveGLEntries';
+import { PaymentReceivedGLEntries } from '@/services/Sales/PaymentReceived/PaymentReceivedGLEntries';
 
 @Service()
 export default class PaymentReceivesWriteGLEntriesSubscriber {
   @Inject()
-  private paymentReceiveGLEntries: PaymentReceiveGLEntries;
+  private paymentReceiveGLEntries: PaymentReceivedGLEntries;
 
   /**
    * Attaches events with handlers.
@@ -37,7 +37,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber {
     tenantId,
     paymentReceiveId,
     trx,
-  }: IPaymentReceiveCreatedPayload) => {
+  }: IPaymentReceivedCreatedPayload) => {
     await this.paymentReceiveGLEntries.writePaymentGLEntries(
       tenantId,
       paymentReceiveId,
@@ -52,7 +52,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber {
     tenantId,
     paymentReceive,
     trx,
-  }: IPaymentReceiveEditedPayload) => {
+  }: IPaymentReceivedEditedPayload) => {
     await this.paymentReceiveGLEntries.rewritePaymentGLEntries(
       tenantId,
       paymentReceive.id,
@@ -67,7 +67,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber {
     tenantId,
     paymentReceiveId,
     trx,
-  }: IPaymentReceiveDeletedPayload) => {
+  }: IPaymentReceivedDeletedPayload) => {
     await this.paymentReceiveGLEntries.revertPaymentGLEntries(
       tenantId,
       paymentReceiveId,

packages/server/src/subscribers/events.ts

@@ -659,6 +659,9 @@ export default {
 
     onUnexcluding: 'onBankTransactionUnexcluding',
     onUnexcluded: 'onBankTransactionUnexcluded',
+
+    onPendingRemoving: 'onBankTransactionPendingRemoving',
+    onPendingRemoved: 'onBankTransactionPendingRemoved',
   },
 
   bankAccount: {

packages/webapp/package.json

@@ -121,7 +121,7 @@
     "yup": "^0.28.1"
   },
   "scripts": {
-    "dev": "PORT=4000 craco start",
+    "dev": "cross-env PORT=4000 craco start",
     "build": "craco build",
     "test": "node scripts/test.js",
     "storybook": "start-storybook -p 6006"

packages/webapp/src/components/Customers/CustomersSelect.tsx

@@ -1,9 +1,11 @@
 // @ts-nocheck
 import React from 'react';
 import * as R from 'ramda';
+import { useFormikContext } from 'formik';
 import { createNewItemFromQuery, createNewItemRenderer } from './utils';
 import { FSelect } from '../Forms';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';
+import { useCreateAutofillListener } from '@/hooks/state/autofill';
 import { DRAWERS } from '@/constants/drawers';
 
 /**
@@ -17,6 +19,7 @@ function CustomerSelectRoot({
   // #ownProps
   items,
   allowCreate,
+  name,
   ...props
 }) {
   // Maybe inject create new item props to suggest component.
@@ -24,14 +27,21 @@ function CustomerSelectRoot({
   const maybeCreateNewItemFromQuery = allowCreate
     ? createNewItemFromQuery
     : null;
+  const { setFieldValue } = useFormikContext();
 
+  // Creates autofill listener once the quick customer drawer submit the form.
+  const autofillRef = useCreateAutofillListener((payload: any) => {
+    setFieldValue(name, payload.customerId);
+  });
   // Handles the create item click.
-  const handleCreateItemClick = () => {
+  const handleCreateItemClick = (item) => {
-    openDrawer(DRAWERS.QUICK_CREATE_CUSTOMER);
+    const displayName = item.name;
+    openDrawer(DRAWERS.QUICK_CREATE_CUSTOMER, { autofillRef, displayName });
   };
 
   return (
     <FSelect
+      name={name}
       items={items}
       textAccessor={'display_name'}
       labelAccessor={'formatted_balance'}

packages/webapp/src/components/Details/index.tsx

@@ -1,6 +1,6 @@
 // @ts-nocheck
 import React from 'react';
-import classNames from 'classnames';
+import clsx from 'classnames';
 
 import '@/style/components/Details.scss';
 
@@ -24,7 +24,7 @@ export function DetailsMenu({
 }) {
   return (
     <div
-      className={classNames(
+      className={clsx(
         'details-menu',
         {
           'details-menu--vertical': direction === DIRECTION.VERTICAL,
@@ -44,16 +44,24 @@ export function DetailsMenu({
 /**
  * Detail item.
  */
-export function DetailItem({ label, children, name, align, className }) {
+export function DetailItem({
+  label,
+  children,
+  name,
+  align,
+  multiline,
+  className,
+}) {
   const { minLabelSize } = useDetailsMenuContext();
 
   return (
     <div
-      className={classNames(
+      className={clsx(
         'detail-item',
         {
           [`detail-item--${name}`]: name,
           [`align-${align}`]: align,
+          [`detail-item--multilines`]: multiline,
         },
         className,
       )}
@@ -66,7 +74,7 @@ export function DetailItem({ label, children, name, align, className }) {
       >
         {label}
       </div>
-      <div>{children}</div>
+      <div className={clsx('detail-item__content')}>{children}</div>
     </div>
   );
 }

packages/webapp/src/components/DialogsContainer.tsx

@@ -49,7 +49,7 @@ import InvoiceExchangeRateChangeDialog from '@/containers/Sales/Invoices/Invoice
 import InvoiceMailDialog from '@/containers/Sales/Invoices/InvoiceMailDialog/InvoiceMailDialog';
 import EstimateMailDialog from '@/containers/Sales/Estimates/EstimateMailDialog/EstimateMailDialog';
 import ReceiptMailDialog from '@/containers/Sales/Receipts/ReceiptMailDialog/ReceiptMailDialog';
-import PaymentMailDialog from '@/containers/Sales/PaymentReceives/PaymentMailDialog/PaymentMailDialog';
+import PaymentMailDialog from '@/containers/Sales/PaymentsReceived/PaymentMailDialog/PaymentMailDialog';
 import { ExportDialog } from '@/containers/Dialogs/ExportDialog';
 import { RuleFormDialog } from '@/containers/Banking/Rules/RuleFormDialog/RuleFormDialog';
 import { DisconnectBankAccountDialog } from '@/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialog';

packages/webapp/src/components/DrawersContainer.tsx

@@ -39,7 +39,7 @@ export default function DrawersContainer() {
       <InvoiceDetailDrawer name={DRAWERS.INVOICE_DETAILS} />
       <EstimateDetailDrawer name={DRAWERS.ESTIMATE_DETAILS} />
       <ReceiptDetailDrawer name={DRAWERS.RECEIPT_DETAILS} />
-      <PaymentReceiveDetailDrawer name={DRAWERS.PAYMENT_RECEIVE_DETAILS} />
+      <PaymentReceiveDetailDrawer name={DRAWERS.PAYMENT_RECEIVED_DETAILS} />
       <PaymentMadeDetailDrawer name={DRAWERS.PAYMENT_MADE_DETAILS} />
       <ItemDetailDrawer name={DRAWERS.ITEM_DETAILS} />
       <CustomerDetailsDrawer name={DRAWERS.CUSTOMER_DETAILS} />

packages/webapp/src/components/Dropzone/Dropzone.module.css

@@ -1,5 +1,3 @@
-
-
 .root {
   padding: 20px;
   border: 2px dotted #c5cbd3;
@@ -9,4 +7,14 @@
   flex-direction: column;
   background: #fff;
   position: relative;
+  transition: background-color 0.3s ease, border-color 0.3s ease;
+
+  &.dropzoneAccept {
+    border-color: rgb(0, 82, 204);
+    background: rgba(0, 82, 204, 0.05);
+  }
+  &.dropzoneReject {
+    border-color: #AC2F33;
+    background: rgba(172, 47, 51, 0.05)
+  }
 }

packages/webapp/src/components/Dropzone/Dropzone.tsx

@@ -235,7 +235,14 @@ export const Dropzone = (_props: DropzoneProps) => {
     >
       <Box
         {...getRootProps({
-          className: clsx(styles.root, classNames?.root),
+          className: clsx(
+            styles.root,
+            {
+              [styles.dropzoneAccept]: isDragAccept,
+              [styles.dropzoneReject]: isDragReject
+            },
+            classNames?.root
+          ),
         })}
         // {...getStyles('root', { focusable: true })}
         {...others}
@@ -253,7 +260,7 @@ export const Dropzone = (_props: DropzoneProps) => {
         <input {...getInputProps(inputProps)} name={name} />
         <div
           data-enable-pointer-events={enablePointerEvents || undefined}
-          className={classNames?.content}
+          className={clsx(styles.content, classNames?.content)}
         >
           {children}
         </div>
@@ -268,8 +275,6 @@ Dropzone.Idle = DropzoneIdle;
 Dropzone.Reject = DropzoneReject;
 
 
-
-
 type PossibleRef<T> = Ref<T> | undefined;
 
 export function assignRef<T>(ref: PossibleRef<T>, value: T) {

packages/webapp/src/components/Vendors/VendorsSelect.tsx

@@ -1,9 +1,11 @@
 // @ts-nocheck
 import React from 'react';
 import * as R from 'ramda';
+import { useFormikContext } from 'formik';
 import withDrawerActions from '@/containers/Drawer/withDrawerActions';
 import { createNewItemFromQuery, createNewItemRenderer } from './utils';
 import { FSelect } from '../Forms';
+import { useCreateAutofillListener } from '@/hooks/state/autofill';
 import { DRAWERS } from '@/constants/drawers';
 
 /**
@@ -15,6 +17,7 @@ function VendorsSelectRoot({
   openDrawer,
 
   // #ownProps
+  name,
   items,
   allowCreate,
 
@@ -25,14 +28,24 @@ function VendorsSelectRoot({
   const maybeCreateNewItemFromQuery = allowCreate
     ? createNewItemFromQuery
     : null;
+  const { setFieldValue } = useFormikContext();
+
+  // Creates a new autofill listener once the quick vendor drawer submits the form.
+  const autofillRef = useCreateAutofillListener((payload: any) => {
+    setFieldValue(name, payload.vendorId);
+  });
 
   // Handles the create item click.
-  const handleCreateItemClick = () => {
+  const handleCreateItemClick = (item) => {
-    openDrawer(DRAWERS.QUICK_WRITE_VENDOR);
+    openDrawer(DRAWERS.QUICK_WRITE_VENDOR, {
+      autofillRef,
+      displayName: item.name,
+    });
   };
 
   return (
     <FSelect
+      name={name}
       items={items}
       textAccessor={'display_name'}
       labelAccessor={'formatted_balance'}

packages/webapp/src/constants/drawers.ts

@@ -6,7 +6,7 @@ export enum DRAWERS {
   BILL_DETAILS = 'bill-drawer',
   INVOICE_DETAILS = 'invoice-detail-drawer',
   RECEIPT_DETAILS = 'receipt-detail-drawer',
-  PAYMENT_RECEIVE_DETAILS = 'payment-receive-detail-drawer',
+  PAYMENT_RECEIVED_DETAILS = 'payment-receive-detail-drawer',
   PAYMENT_MADE_DETAILS = 'payment-made-drawer',
   ESTIMATE_DETAILS = 'estimate-detail-drawer',
   ITEM_DETAILS = 'item-detail-drawer',

packages/webapp/src/constants/homepageOptions.tsx

@@ -55,7 +55,7 @@ export const accountsReceivable = [
         description: (
           <T id={'manage_payment_transactions_from_your_customers'} />
         ),
-        link: '/payment-receives',
+        link: '/payments-received',
         subject: AbilitySubject.PaymentReceive,
         ability: PaymentReceiveAction.View,
       },
@@ -88,7 +88,7 @@ export const accountsPayable = [
       {
         title: <T id={'vendors_payments'} />,
         description: <T id={'manage_payments_transactions_to_your_vendors'} />,
-        link: '/payment-mades',
+        link: '/payments-made',
         subject: AbilitySubject.PaymentMade,
         ability: PaymentMadeAction.View,
       },

packages/webapp/src/constants/query-keys/banking.ts

@@ -7,4 +7,7 @@ export const BANK_QUERY_KEY = {
     'RECOGNIZED_BANK_TRANSACTIONS_INFINITY',
   BANK_ACCOUNT_SUMMARY_META: 'BANK_ACCOUNT_SUMMARY_META',
   AUTOFILL_CATEGORIZE_BANK_TRANSACTION: 'AUTOFILL_CATEGORIZE_BANK_TRANSACTION',
+  PENDING_BANK_ACCOUNT_TRANSACTIONS: 'PENDING_BANK_ACCOUNT_TRANSACTIONS',
+  PENDING_BANK_ACCOUNT_TRANSACTIONS_INFINITY:
+    'PENDING_BANK_ACCOUNT_TRANSACTIONS_INFINITY',
 };

packages/webapp/src/constants/sidebarMenu.tsx

@@ -74,7 +74,7 @@ export const SidebarMenu = [
                 },
               },
               {
-                text: <T id={'category_list'} />,
+                text: <T id={'categories_list'} />,
                 href: '/items/categories',
                 type: ISidebarMenuItemType.Link,
                 permission: {
@@ -179,8 +179,8 @@ export const SidebarMenu = [
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'sidebar.payment_receives'} />,
+            text: <T id={'sidebar.payments_received'} />,
-            href: '/payment-receives',
+            href: '/payments-received',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentReceive,
@@ -226,8 +226,8 @@ export const SidebarMenu = [
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'sidebar.new_payment_receive'} />,
+            text: <T id={'sidebar.new_payment_received'} />,
-            href: '/payment-receives/new',
+            href: '/payment-received/new',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentReceive,
@@ -265,8 +265,8 @@ export const SidebarMenu = [
             type: ISidebarMenuItemType.Link,
           },
           {
-            text: <T id={'payment_mades'} />,
+            text: <T id={'payments_made'} />,
-            href: '/payment-mades',
+            href: '/payments-made',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentMade,
@@ -299,7 +299,7 @@ export const SidebarMenu = [
           },
           {
             text: <T id={'sidebar.new_payment_made'} />,
-            href: '/payment-mades/new',
+            href: '/payments-made/new',
             type: ISidebarMenuItemType.Link,
             permission: {
               subject: AbilitySubject.PaymentMade,

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

@@ -15,6 +15,8 @@ export function MakeJournalFormFooterLeft() {
         <FEditableText
           name={'description'}
           placeholder={intl.get('make_jorunal.decscrption.placeholder')}
+          multiline
+          fastField
         />
       </DescriptionFormGroup>
     </React.Fragment>

packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx

@@ -21,7 +21,7 @@ import { DRAWERS } from '@/constants/drawers';
 /**
  * Payment receive delete alert.
  */
-function PaymentReceiveDeleteAlert({
+function PaymentReceivedDeleteAlert({
   name,
 
   // #withAlertStoreConnect
@@ -48,11 +48,11 @@ function PaymentReceiveDeleteAlert({
       .then(() => {
         AppToaster.show({
           message: intl.get(
-            'the_payment_receive_has_been_deleted_successfully',
+            'the_payment_received_has_been_deleted_successfully',
           ),
           intent: Intent.SUCCESS,
         });
-        closeDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS);
+        closeDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS);
       })
       .catch(
         ({
@@ -81,7 +81,7 @@ function PaymentReceiveDeleteAlert({
     >
       <p>
         <FormattedHTMLMessage
-          id={'once_delete_this_payment_receive_you_will_able_to_restore_it'}
+          id={'once_delete_this_payment_received_you_will_able_to_restore_it'}
         />
       </p>
     </Alert>
@@ -92,4 +92,4 @@ export default compose(
   withAlertStoreConnect(),
   withAlertActions,
   withDrawerActions,
-)(PaymentReceiveDeleteAlert);
+)(PaymentReceivedDeleteAlert);

packages/webapp/src/containers/AlertsContainer/registered.tsx

@@ -6,9 +6,9 @@ import InventoryAdjustmentsAlerts from '@/containers/InventoryAdjustments/Invent
 import EstimatesAlerts from '@/containers/Sales/Estimates/EstimatesAlerts';
 import InvoicesAlerts from '@/containers/Sales/Invoices/InvoicesAlerts';
 import ReceiptsAlerts from '@/containers/Sales/Receipts/ReceiptsAlerts';
-import PaymentReceiveAlerts from '@/containers/Sales/PaymentReceives/PaymentReceiveAlerts';
+import PaymentsReceivedAlerts from '@/containers/Sales/PaymentsReceived/PaymentsReceivedAlerts';
 import BillsAlerts from '@/containers/Purchases/Bills/BillsLanding/BillsAlerts';
-import PaymentMadesAlerts from '@/containers/Purchases/PaymentMades/PaymentMadesAlerts';
+import PaymentsMadeAlerts from '@/containers/Purchases/PaymentsMade/PaymentsMadeAlerts';
 import CustomersAlerts from '@/containers/Customers/CustomersAlerts';
 import VendorsAlerts from '@/containers/Vendors/VendorsAlerts';
 import ManualJournalsAlerts from '@/containers/Accounting/JournalsLanding/ManualJournalsAlerts';
@@ -38,9 +38,9 @@ export default [
   ...EstimatesAlerts,
   ...InvoicesAlerts,
   ...ReceiptsAlerts,
-  ...PaymentReceiveAlerts,
+  ...PaymentsReceivedAlerts,
   ...BillsAlerts,
-  ...PaymentMadesAlerts,
+  ...PaymentsMadeAlerts,
   ...CustomersAlerts,
   ...VendorsAlerts,
   ...ManualJournalsAlerts,

packages/webapp/src/containers/Banking/Rules/RuleFormDialog/RuleFormContentForm.tsx

@@ -1,6 +1,7 @@
 // @ts-nocheck
 import { useCallback, useMemo } from 'react';
 import { Form, Formik, FormikHelpers, useFormikContext } from 'formik';
+import { get } from 'lodash';
 import { Button, Classes, Intent, Radio, Tag } from '@blueprintjs/core';
 import * as R from 'ramda';
 import { CreateRuleFormSchema } from './RuleFormContentForm.schema';
@@ -17,11 +18,12 @@ import {
 } from '@/components';
 import { useCreateBankRule, useEditBankRule } from '@/hooks/query/bank-rules';
 import {
-  FieldCondition,
   Fields,
   RuleFormValues,
   TransactionTypeOptions,
   getAccountRootFromMoneyCategory,
+  getDefaultFieldConditionByFieldKey,
+  getFieldConditionsByFieldKey,
   initialValues,
 } from './_utils';
 import { useRuleFormDialogBoot } from './RuleFormBoot';
@@ -175,6 +177,13 @@ function RuleFormConditions() {
     setFieldValue('conditions', _conditions);
   };
 
+  const handleConditionFieldChange = R.curry((index, item) => {
+    const defaultComparator = getDefaultFieldConditionByFieldKey(item.value);
+
+    setFieldValue(`conditions[${index}].field`, item.value);
+    setFieldValue(`conditions[${index}].comparator`, defaultComparator);
+  });
+
   return (
     <Box style={{ marginBottom: 15 }}>
       <Stack spacing={15}>
@@ -190,6 +199,7 @@ function RuleFormConditions() {
                 name={`conditions[${index}].field`}
                 items={Fields}
                 popoverProps={{ minimal: true, inline: false }}
+                onItemChange={handleConditionFieldChange(index)}
                 fastField
               />
             </FFormGroup>
@@ -202,8 +212,13 @@ function RuleFormConditions() {
             >
               <FSelect
                 name={`conditions[${index}].comparator`}
-                items={FieldCondition}
+                items={getFieldConditionsByFieldKey(
+                  get(values, `conditions[${index}].field`),
+                )}
                 popoverProps={{ minimal: true, inline: false }}
+                shouldUpdateDeps={{
+                  fieldKey: get(values, `conditions[${index}].field`),
+                }}
                 fastField
               />
             </FFormGroup>