fix: Invalid bill payment amount on editing bill payment

CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to Bigcapital server-side will be in this file.
 
+## [0.14.0] - 30-01-2024
+
+* feat: purchases by items exporting by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/327
+* fix: expense amounts should not be rounded by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/339
+* feat: get latest exchange rate from third party services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/340
+* fix(webapp): inconsistency in currency of universal search items by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/335
+* hotfix: editing sales and expense transactions don't reflect GL entries by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/342
+
 ## [0.13.3] - 22-01-2024
 
 * hotfix(server): Unhandled thrown errors of services by @abouolia in https://github.com/bigcapitalhq/bigcapital/pull/329

packages/server/src/api/controllers/Purchases/Bills.ts

@@ -560,6 +560,16 @@ export default class BillsController extends BaseController {
           errors: [{ type: 'ITEM_ENTRY_TAX_RATE_ID_NOT_FOUND', code: 1900 }],
         });
       }
+      if (error.errorType === 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT') {
+        return res.boom.badRequest(null, {
+          errors: [
+            {
+              type: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
+              code: 2000,
+            },
+          ],
+        });
+      }
     }
     next(error);
   }

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

@@ -10,7 +10,6 @@ import {
 import TenancyService from '@/services/Tenancy/TenancyService';
 import { ServiceError } from '@/exceptions';
 import { ACCOUNT_TYPE } from '@/data/AccountTypes';
-import { BillPayment } from '@/models';
 import { ERRORS } from './constants';
 
 @Service()
@@ -18,19 +17,6 @@ export class BillPaymentValidators {
   @Inject()
   private tenancy: TenancyService;
 
-  /**
-   * Validates the payment existance.
-   * @param {BillPayment | undefined | null} payment
-   * @throws {ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND)}
-   */
-  public async validateBillPaymentExistance(
-    payment: BillPayment | undefined | null
-  ) {
-    if (!payment) {
-      throw new ServiceError(ERRORS.PAYMENT_MADE_NOT_FOUND);
-    }
-  }
-
   /**
    * Validates the bill payment existance.
    * @param {Request} req

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

@@ -1,6 +1,5 @@
 import { Knex } from 'knex';
 import UnitOfWork from '@/services/UnitOfWork';
-import { BillPaymentValidators } from './BillPaymentValidators';
 import { EventPublisher } from '@/lib/EventPublisher/EventPublisher';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
@@ -21,9 +20,6 @@ export class DeleteBillPayment {
   @Inject()
   private uow: UnitOfWork;
 
-  @Inject()
-  private validators: BillPaymentValidators;
-
   /**
    * Deletes the bill payment and associated transactions.
    * @param  {number} tenantId - Tenant id.
@@ -36,10 +32,8 @@ export class DeleteBillPayment {
     // Retrieve the bill payment or throw not found service error.
     const oldBillPayment = await BillPayment.query()
       .withGraphFetched('entries')
-      .findById(billPaymentId);
-
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(oldBillPayment);
+      .findById(billPaymentId)
+      .throwIfNotFound();
 
     // Deletes the bill transactions with associated transactions under
     // unit-of-work envirement.

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

@@ -57,12 +57,12 @@ export class EditBillPayment {
 
     const tenantMeta = await TenantMetadata.query().findOne({ tenantId });
 
-    const oldBillPayment = await BillPayment.query().findById(billPaymentId);
+    const oldBillPayment = await BillPayment.query()
+      .findById(billPaymentId)
+      .withGraphFetched('entries')
+      .throwIfNotFound();
 
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(oldBillPayment);
-
-    //
+    // Retrieves the bill payment vendor or throw not found error.
     const vendor = await Contact.query()
       .modify('vendor')
       .findById(billPaymentDTO.vendorId)
@@ -126,7 +126,7 @@ export class EditBillPayment {
         trx,
       } as IBillPaymentEditingPayload);
 
-      // Deletes the bill payment transaction graph from the storage.
+      // Edits the bill payment transaction graph on the storage.
       const billPayment = await BillPayment.query(trx).upsertGraphAndFetch({
         id: billPaymentId,
         ...billPaymentObj,

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

@@ -1,12 +1,8 @@
 import { IBillPayment } from '@/interfaces';
 import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { Inject, Service } from 'typedi';
-import { ERRORS } from './constants';
-import { ServiceError } from '@/exceptions';
 import { BillPaymentTransformer } from './BillPaymentTransformer';
 import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable';
-import { BillsValidators } from '../Bills/BillsValidators';
-import { BillPaymentValidators } from './BillPaymentValidators';
 
 @Service()
 export class GetBillPayment {
@@ -16,9 +12,6 @@ export class GetBillPayment {
   @Inject()
   private transformer: TransformerInjectable;
 
-  @Inject()
-  private validators: BillPaymentValidators;
-
   /**
    * Retrieve bill payment.
    * @param {number} tenantId
@@ -37,10 +30,8 @@ export class GetBillPayment {
       .withGraphFetched('paymentAccount')
       .withGraphFetched('transactions')
       .withGraphFetched('branch')
-      .findById(billPyamentId);
-
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(billPayment);
+      .findById(billPyamentId)
+      .throwIfNotFound();
 
     return this.transformer.transform(
       tenantId,

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

@@ -18,10 +18,9 @@ export class GetPaymentBills {
   public async getPaymentBills(tenantId: number, billPaymentId: number) {
     const { Bill, BillPayment } = this.tenancy.models(tenantId);
 
-    const billPayment = await BillPayment.query().findById(billPaymentId);
-
-    // Validates the bill payment existance.
-    this.validators.validateBillPaymentExistance(billPayment);
+    const billPayment = await BillPayment.query()
+      .findById(billPaymentId)
+      .throwIfNotFound();
 
     const paymentBillsIds = billPayment.entries.map((entry) => entry.id);
 

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

@@ -21,6 +21,20 @@ export class BillsValidators {
     }
   }
 
+  /**
+   * Validates the bill amount is bigger than paid amount.
+   * @param {number} billAmount 
+   * @param {number} paidAmount 
+   */
+  public validateBillAmountBiggerPaidAmount(
+    billAmount: number,
+    paidAmount: number,
+  ) {
+    if (billAmount < paidAmount) {
+      throw new ServiceError(ERRORS.BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT);
+    }
+  }
+
   /**
    * Validates the bill number existance.
    */

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

@@ -103,6 +103,7 @@ export class EditBill {
       tenantId,
       billDTO.entries
     );
+    
     // Transforms the bill DTO to model object.
     const billObj = await this.transformerDTO.billDTOToModel(
       tenantId,
@@ -111,6 +112,11 @@ export class EditBill {
       authorizedUser,
       oldBill
     );
+    // Validate bill total amount should be bigger than paid amount.
+    this.validators.validateBillAmountBiggerPaidAmount(
+      billObj.amount,
+      oldBill.paymentAmount
+    );
     // Validate landed cost entries that have allocated cost could not be deleted.
     await this.entriesService.validateLandedCostEntriesNotDeleted(
       oldBill.entries,

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

@@ -18,6 +18,7 @@ export const ERRORS = {
   LANDED_COST_ENTRIES_SHOULD_BE_INVENTORY_ITEMS:
     'LANDED_COST_ENTRIES_SHOULD_BE_INVENTORY_ITEMS',
   BILL_HAS_APPLIED_TO_VENDOR_CREDIT: 'BILL_HAS_APPLIED_TO_VENDOR_CREDIT',
+  BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
 };
 
 export const DEFAULT_VIEW_COLUMNS = [];

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

@@ -61,7 +61,8 @@ export class EditPaymentReceive {
     // Validate the payment receive existance.
     const oldPaymentReceive = await PaymentReceive.query()
       .withGraphFetched('entries')
-      .findById(paymentReceiveId);
+      .findById(paymentReceiveId)
+      .throwIfNotFound();
 
     // Validates the payment existance.
     this.validators.validatePaymentExistance(oldPaymentReceive);

packages/webapp/src/constants/errors.tsx

@@ -9,6 +9,8 @@ export const ERROR = {
   SALE_INVOICE_NO_NOT_UNIQUE: 'SALE_INVOICE_NO_NOT_UNIQUE',
   SALE_ESTIMATE_IS_ALREADY_CONVERTED_TO_INVOICE:
     'SALE_ESTIMATE_IS_ALREADY_CONVERTED_TO_INVOICE',
+  INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT:
+    'INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT',
 
   // Sales Receipts
   SALE_RECEIPT_NUMBER_NOT_UNIQUE: 'SALE_RECEIPT_NUMBER_NOT_UNIQUE',
@@ -17,6 +19,6 @@ export const ERROR = {
   // Bills
   BILL_NUMBER_EXISTS: 'BILL.NUMBER.EXISTS',
   SALE_INVOICE_NO_IS_REQUIRED: 'SALE_INVOICE_NO_IS_REQUIRED',
-  ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:"ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED",
-
+  ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:
+    'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED',
 };

packages/webapp/src/containers/Purchases/Bills/BillForm/utils.tsx

@@ -67,6 +67,7 @@ export const ERRORS = {
   BILL_NUMBER_EXISTS: 'BILL.NUMBER.EXISTS',
   ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED:
     'ENTRIES_ALLOCATED_COST_COULD_NOT_DELETED',
+  BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT: 'BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT',
 };
 /**
  * Transformes the bill to initial values of edit form.
@@ -200,6 +201,14 @@ export const handleErrors = (errors, { setErrors }) => {
       }),
     );
   }
+  if (
+    errors.some((e) => e.type === ERRORS.BILL_AMOUNT_SMALLER_THAN_PAID_AMOUNT)
+  ) {
+    AppToaster.show({
+      intent: Intent.DANGER,
+      message: intl.get('bill.total_smaller_than_paid_amount'),
+    });
+  }
 };
 
 export const useSetPrimaryBranchToForm = () => {

packages/webapp/src/containers/Purchases/PaymentMades/PaymentForm/PaymentMadeEntriesTable.tsx

@@ -30,6 +30,7 @@ export default function PaymentMadeEntriesTable({
   // Formik context.
   const {
     values: { vendor_id },
+    errors,
   } = useFormikContext();
 
   // Handle update data.
@@ -63,7 +64,7 @@ export default function PaymentMadeEntriesTable({
         data={entries}
         spinnerProps={false}
         payload={{
-          errors: [],
+          errors: errors?.entries || [],
           updateData: handleUpdateData,
           currencyCode,
         }}

packages/webapp/src/containers/Sales/Invoices/InvoiceForm/utils.tsx

@@ -112,6 +112,16 @@ export const transformErrors = (errors, { setErrors }) => {
       intent: Intent.DANGER,
     });
   }
+  if (
+    errors.some(
+      ({ type }) => type === ERROR.INVOICE_AMOUNT_SMALLER_THAN_PAYMENT_AMOUNT,
+    )
+  ) {
+    AppToaster.show({
+      message: intl.get('sale_invoice.total_smaller_than_paid_amount'),
+      intent: Intent.DANGER,
+    });
+  }
   if (
     errors.some((error) => error.type === ERROR.SALE_INVOICE_NO_IS_REQUIRED)
   ) {

packages/webapp/src/containers/Sales/PaymentReceives/PaymentReceiveForm/PaymentReceiveItemsTable.tsx

@@ -28,6 +28,7 @@ export default function PaymentReceiveItemsTable({
   // Formik context.
   const {
     values: { customer_id },
+    errors,
   } = useFormikContext();
 
   // No results message.
@@ -58,7 +59,7 @@ export default function PaymentReceiveItemsTable({
         data={entries}
         spinnerProps={false}
         payload={{
-          errors: [],
+          errors: errors?.entries || [],
           updateData: handleUpdateData,
           currencyCode,
         }}

packages/webapp/src/lang/en/index.json

@@ -653,7 +653,9 @@
   "invoice_number_is_not_unqiue": "Invoice number is not unqiue",
   "sale_receipt_number_not_unique": "Receipt number is not unique",
   "sale_invoice_number_is_exists": "Sale invoice number is exists",
+  "sale_invoice.total_smaller_than_paid_amount": "The invoice total is smaller than the invoice paid amount.",
   "bill_number_exists": "Bill number exists",
+  "bill.total_smaller_than_paid_amount": "The bill total is smaller than the bill paid amount.",
   "ok": "Ok!",
   "quantity_cannot_be_zero_or_empty": "Quantity cannot be zero or empty.",
   "customer_email": "Customer email",