fix: sale invoices payment amount once invoice created, edited or deleted.

server/src/services/Contacts/CustomersService.ts

@@ -66,7 +66,9 @@ export default class CustomersService {
     const customer = await this.contactService.newContact(tenantId, contactDTO, 'customer');
 
     this.logger.info('[customer] created successfully.', { tenantId, customerDTO });
-    await this.eventDispatcher.dispatch(events.customers.onCreated);
+    await this.eventDispatcher.dispatch(events.customers.onCreated, {
+      customer, tenantId, customerId: customer.id,
+    });
 
     return customer;
   }
@@ -89,7 +91,9 @@ export default class CustomersService {
     const customer = this.contactService.editContact(tenantId, customerId, contactDTO, 'customer');
 
     this.eventDispatcher.dispatch(events.customers.onEdited);
-    this.logger.info('[customer] edited successfully.', { tenantId, customerId });
+    this.logger.info('[customer] edited successfully.', {
+      tenantId, customerId, customer,
+    });
 
     return customer;
   }
@@ -109,7 +113,7 @@ export default class CustomersService {
 
     await Contact.query().findById(customerId).delete();
 
-    await this.eventDispatcher.dispatch(events.customers.onDeleted);
+    await this.eventDispatcher.dispatch(events.customers.onDeleted, { tenantId, customerId });
     this.logger.info('[customer] deleted successfully.', { tenantId, customerId });
   }
 

server/src/services/Purchases/BillPayments.ts

@@ -23,7 +23,7 @@ import JournalCommands from 'services/Accounting/JournalCommands';
 import JournalPosterService from 'services/Sales/JournalPosterService';
 import TenancyService from 'services/Tenancy/TenancyService';
 import DynamicListingService from 'services/DynamicListing/DynamicListService';
-import { formatDateFields } from 'utils';
+import { entriesAmountDiff, formatDateFields } from 'utils';
 import { ServiceError } from 'exceptions';
 
 const ERRORS = {
@@ -271,7 +271,7 @@ export default class BillPaymentsService {
         entries: billPaymentDTO.entries,
       });
 
-    await this.eventDispatcher.dispatch(events.billPayments.onCreated, {
+    await this.eventDispatcher.dispatch(events.billPayment.onCreated, {
       tenantId, billPayment, billPaymentId: billPayment.id,
     });
     this.logger.info('[payment_made] inserted successfully.', { tenantId, billPaymentId: billPayment.id, });
@@ -332,7 +332,7 @@ export default class BillPaymentsService {
         ...omit(billPaymentObj, ['entries']),
         entries: billPaymentDTO.entries,
       });
-    await this.eventDispatcher.dispatch(events.billPayments.onEdited, {
+    await this.eventDispatcher.dispatch(events.billPayment.onEdited, {
       tenantId, billPaymentId, billPayment, oldPaymentMade,
     });
     this.logger.info('[bill_payment] edited successfully.', { tenantId, billPaymentId, billPayment, oldPaymentMade });
@@ -355,7 +355,7 @@ export default class BillPaymentsService {
     await BillPaymentEntry.query().where('bill_payment_id', billPaymentId).delete();
     await BillPayment.query().where('id', billPaymentId).delete();
 
-    await this.eventDispatcher.dispatch(events.billPayments.onDeleted, { tenantId, billPaymentId, oldPaymentMade });
+    await this.eventDispatcher.dispatch(events.billPayment.onDeleted, { tenantId, billPaymentId, oldPaymentMade });
     this.logger.info('[bill_payment] deleted successfully.', { tenantId, billPaymentId });
   }
 
@@ -477,4 +477,34 @@ export default class BillPaymentsService {
     }
     return billPayment;
   }
+
+  /**
+   * Saves bills payment amount changes different.
+   * @param {number} tenantId -
+   * @param {IBillPaymentEntryDTO[]} paymentMadeEntries -
+   * @param {IBillPaymentEntryDTO[]} oldPaymentMadeEntries -
+   */
+  public async saveChangeBillsPaymentAmount(
+    tenantId: number,
+    paymentMadeEntries: IBillPaymentEntryDTO[],
+    oldPaymentMadeEntries: IBillPaymentEntryDTO[],
+  ): Promise<void> {
+    const { Bill } = this.tenancy.models(tenantId);
+    const opers: Promise<void>[] = [];
+
+    const diffEntries = entriesAmountDiff(
+      paymentMadeEntries,
+      oldPaymentMadeEntries,
+      'paymentAmount',
+      'billId',
+    );
+    diffEntries.forEach((diffEntry: { paymentAmount: number, billId: number }) => {
+      const oper = Bill.changePaymentAmount(
+        diffEntry.billId,
+        diffEntry.paymentAmount,
+      );
+      opers.push(oper);
+    });
+    await Promise.all(opers);
+  }
 }

server/src/services/Purchases/Bills.ts

@@ -201,7 +201,7 @@ export default class BillsService extends SalesInvoicesCost {
       });
 
     // Triggers `onBillCreated` event. 
-    await this.eventDispatcher.dispatch(events.bills.onCreated, {
+    await this.eventDispatcher.dispatch(events.bill.onCreated, {
       tenantId, bill, billId: bill.id,
     });
     this.logger.info('[bill] bill inserted successfully.', { tenantId, billId: bill.id });
@@ -255,7 +255,7 @@ export default class BillsService extends SalesInvoicesCost {
       }))
     });
     // Triggers event `onBillEdited`.
-    await this.eventDispatcher.dispatch(events.bills.onEdited, { tenantId, billId, oldBill, bill });
+    await this.eventDispatcher.dispatch(events.bill.onEdited, { tenantId, billId, oldBill, bill });
     this.logger.info('[bill] bill upserted successfully.', { tenantId, billId });
 
     return bill;
@@ -283,7 +283,7 @@ export default class BillsService extends SalesInvoicesCost {
     await Promise.all([deleteBillEntriesOper, deleteBillOper]);
 
     // Triggers `onBillDeleted` event.
-    await this.eventDispatcher.dispatch(events.bills.onDeleted, { tenantId, billId, oldBill });
+    await this.eventDispatcher.dispatch(events.bill.onDeleted, { tenantId, billId, oldBill });
   }
 
   /**

server/src/services/Sales/PaymentsReceives.ts

@@ -22,7 +22,7 @@ import JournalEntry from 'services/Accounting/JournalEntry';
 import JournalPosterService from 'services/Sales/JournalPosterService';
 import TenancyService from 'services/Tenancy/TenancyService';
 import DynamicListingService from 'services/DynamicListing/DynamicListService';
-import { formatDateFields } from 'utils';
+import { formatDateFields, entriesAmountDiff } from 'utils';
 import { ServiceError } from 'exceptions';
 import CustomersService from 'services/Contacts/CustomersService';
 import ItemsEntriesService from 'services/Items/ItemsEntriesService';
@@ -218,7 +218,7 @@ export default class PaymentReceiveService {
         })),
       });
 
-    await this.eventDispatcher.dispatch(events.paymentReceipts.onCreated, {
+    await this.eventDispatcher.dispatch(events.paymentReceive.onCreated, {
       tenantId, paymentReceive, paymentReceiveId: paymentReceive.id,
     });
     this.logger.info('[payment_receive] updated successfully.', { tenantId, paymentReceive });
@@ -282,7 +282,7 @@ export default class PaymentReceiveService {
         entries: paymentReceiveDTO.entries,
       });
 
-    await this.eventDispatcher.dispatch(events.paymentReceipts.onEdited, {
+    await this.eventDispatcher.dispatch(events.paymentReceive.onEdited, {
       tenantId, paymentReceiveId, paymentReceive, oldPaymentReceive
     });
     this.logger.info('[payment_receive] upserted successfully.', { tenantId, paymentReceiveId });
@@ -313,7 +313,7 @@ export default class PaymentReceiveService {
     // Deletes the payment receive transaction.
     await PaymentReceive.query().findById(paymentReceiveId).delete();
 
-    await this.eventDispatcher.dispatch(events.paymentReceipts.onDeleted, {
+    await this.eventDispatcher.dispatch(events.paymentReceive.onDeleted, {
       tenantId, paymentReceiveId, oldPaymentReceive,
     });
     this.logger.info('[payment_receive] deleted successfully.', { tenantId, paymentReceiveId });
@@ -457,21 +457,15 @@ export default class PaymentReceiveService {
     const { SaleInvoice } = this.tenancy.models(tenantId);
     const opers: Promise<T>[] = [];
 
-    const oldEntriesTable = chain(oldPaymentReceiveEntries)
-      .groupBy('invoiceId')
-      .mapValues((group) => (sumBy(group, 'paymentAmount') || 0) * -1)
-      .value();
-
-    const diffEntries = chain(newPaymentReceiveEntries)
-      .groupBy('invoiceId')
-      .mapValues((group) => (sumBy(group, 'paymentAmount') || 0))
-      .mapValues((value, key) => value - (oldEntriesTable[key] || 0))
-      .mapValues((value, key) => ({ invoiceId: key, paymentAmount: value }))
-      .filter((entry) => entry.paymentAmount != 0)
-      .values()
-      .value();
-
+    const diffEntries = entriesAmountDiff(
+      newPaymentReceiveEntries,
+      oldPaymentReceiveEntries,
+      'paymentAmount',
+      'invoiceId',
+    );
     diffEntries.forEach((diffEntry: any) => {
+      if (diffEntry.paymentAmount === 0) { return; }
+
       const oper = SaleInvoice.changePaymentAmount(
         diffEntry.invoiceId,
         diffEntry.paymentAmount

server/src/services/Sales/SalesEstimate.ts

@@ -120,7 +120,7 @@ export default class SaleEstimateService {
       });
 
     this.logger.info('[sale_estimate] insert sale estimated success.');
-    await this.eventDispatcher.dispatch(events.saleEstimates.onCreated);
+    await this.eventDispatcher.dispatch(events.saleEstimate.onCreated);
 
     return saleEstimate;
   }
@@ -169,7 +169,7 @@ export default class SaleEstimateService {
         })),
       });
 
-    await this.eventDispatcher.dispatch(events.saleEstimates.onEdited, {
+    await this.eventDispatcher.dispatch(events.saleEstimate.onEdited, {
       tenantId, estimateId, saleEstimate, oldSaleEstimate,
     });
     this.logger.info('[sale_estiamte] edited successfully', { tenantId, estimateId });
@@ -199,7 +199,7 @@ export default class SaleEstimateService {
     await SaleEstimate.query().where('id', estimateId).delete();
     this.logger.info('[sale_estimate] deleted successfully.', { tenantId, estimateId });
 
-    await this.eventDispatcher.dispatch(events.saleEstimates.onDeleted, {
+    await this.eventDispatcher.dispatch(events.saleEstimate.onDeleted, {
       tenantId, saleEstimateId: estimateId, oldSaleEstimate,
     });
   }

server/src/services/Sales/SalesInvoices.ts

@@ -137,7 +137,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
 
     this.logger.info('[sale_invoice] inserting sale invoice to the storage.');
     const saleInvoice = await SaleInvoice.query()
-      .insertGraph({
+      .insertGraphAndFetch({
         ...omit(saleInvoiceObj, ['entries']),
 
         entries: saleInvoiceObj.entries.map((entry) => ({
@@ -190,7 +190,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
 
     this.logger.info('[sale_invoice] trying to update sale invoice.');
     const saleInvoice: ISaleInvoice = await SaleInvoice.query()
-      .upsertGraph({
+      .upsertGraphAndFetch({
         id: saleInvoiceId,
         ...omit(saleInvoiceObj, ['entries', 'invLotNumber']),
 

server/src/services/Sales/SalesReceipts.ts

@@ -105,7 +105,7 @@ export default class SalesReceiptService {
           ...omit(entry, ['id', 'amount']),
         }))
       });
-    await this.eventDispatcher.dispatch(events.saleReceipts.onCreated, { tenantId, saleReceipt });
+    await this.eventDispatcher.dispatch(events.saleReceipt.onCreated, { tenantId, saleReceipt });
 
     this.logger.info('[sale_receipt] sale receipt inserted successfully.', { tenantId });
 
@@ -144,7 +144,7 @@ export default class SalesReceiptService {
       });
 
     this.logger.info('[sale_receipt] edited successfully.', { tenantId, saleReceiptId });
-    await this.eventDispatcher.dispatch(events.saleReceipts.onEdited, {
+    await this.eventDispatcher.dispatch(events.saleReceipt.onEdited, {
       oldSaleReceipt, tenantId, saleReceiptId, saleReceipt,
     });
     return saleReceipt;
@@ -166,7 +166,7 @@ export default class SalesReceiptService {
     await SaleReceipt.query().where('id', saleReceiptId).delete();
 
     this.logger.info('[sale_receipt] deleted successfully.', { tenantId, saleReceiptId });
-    await this.eventDispatcher.dispatch(events.saleReceipts.onDeleted);
+    await this.eventDispatcher.dispatch(events.saleReceipt.onDeleted);
   }
 
   /**