Merge branch 'develop' into fix-spelling-a-char

packages/server/src/subscribers/Bills/WriteInventoryTransactions.ts

@@ -1,20 +1,17 @@
 import { Service, Inject } from 'typedi';
 import events from '@/subscribers/events';
-import TenancyService from '@/services/Tenancy/TenancyService';
-import BillsService from '@/services/Purchases/Bills';
 import {
   IBillCreatedPayload,
   IBillEditedPayload,
   IBIllEventDeletedPayload,
+  IBillOpenedPayload,
 } from '@/interfaces';
+import { BillInventoryTransactions } from '@/services/Purchases/Bills/BillInventoryTransactions';
 
 @Service()
 export default class BillWriteInventoryTransactionsSubscriber {
   @Inject()
-  tenancy: TenancyService;
-
-  @Inject()
-  billsService: BillsService;
+  private billsInventory: BillInventoryTransactions;
 
   /**
    * Attaches events with handles.
@@ -24,6 +21,10 @@ export default class BillWriteInventoryTransactionsSubscriber {
       events.bill.onCreated,
       this.handleWritingInventoryTransactions
     );
+    bus.subscribe(
+      events.bill.onOpened,
+      this.handleWritingInventoryTransactions
+    );
     bus.subscribe(
       events.bill.onEdited,
       this.handleOverwritingInventoryTransactions
@@ -36,15 +37,19 @@ export default class BillWriteInventoryTransactionsSubscriber {
 
   /**
    * Handles writing the inventory transactions once bill created.
+   * @param {IBillCreatedPayload | IBillOpenedPayload} payload -
    */
   private handleWritingInventoryTransactions = async ({
     tenantId,
-    billId,
+    bill,
     trx,
-  }: IBillCreatedPayload) => {
-    await this.billsService.recordInventoryTransactions(
+  }: IBillCreatedPayload | IBillOpenedPayload) => {
+    // Can't continue if the bill is not opened yet.
+    if (!bill.openedAt) return null;
+
+    await this.billsInventory.recordInventoryTransactions(
       tenantId,
-      billId,
+      bill.id,
       false,
       trx
     );
@@ -52,13 +57,18 @@ export default class BillWriteInventoryTransactionsSubscriber {
 
   /**
    * Handles the overwriting the inventory transactions once bill edited.
+   * @param {IBillEditedPayload} payload -
    */
   private handleOverwritingInventoryTransactions = async ({
     tenantId,
     billId,
+    bill,
     trx,
   }: IBillEditedPayload) => {
-    await this.billsService.recordInventoryTransactions(
+    // Can't continue if the bill is not opened yet.
+    if (!bill.openedAt) return null;
+
+    await this.billsInventory.recordInventoryTransactions(
       tenantId,
       billId,
       true,
@@ -68,12 +78,17 @@ export default class BillWriteInventoryTransactionsSubscriber {
 
   /**
    * Handles the reverting the inventory transactions once the bill deleted.
+   * @param {IBIllEventDeletedPayload} payload -
    */
   private handleRevertInventoryTransactions = async ({
     tenantId,
     billId,
     trx,
   }: IBIllEventDeletedPayload) => {
-    await this.billsService.revertInventoryTransactions(tenantId, billId, trx);
+    await this.billsInventory.revertInventoryTransactions(
+      tenantId,
+      billId,
+      trx
+    );
   };
 }

packages/server/src/subscribers/Bills/WriteJournalEntries.ts

@@ -19,7 +19,7 @@ export default class BillWriteGLEntriesSubscriber {
   /**
    * Attaches events with handles.
    */
-  attach(bus) {
+  public attach(bus) {
     bus.subscribe(
       events.bill.onCreated,
       this.handlerWriteJournalEntriesOnCreate
@@ -38,8 +38,12 @@ export default class BillWriteGLEntriesSubscriber {
   private handlerWriteJournalEntriesOnCreate = async ({
     tenantId,
     billId,
+    bill,
     trx,
   }: IBillCreatedPayload) => {
+    // Can't continue if the bill is not opened yet.
+    if (!bill.openedAt) return null;
+
     await this.billsService.recordJournalTransactions(
       tenantId,
       billId,
@@ -55,8 +59,12 @@ export default class BillWriteGLEntriesSubscriber {
   private handleOverwriteJournalEntriesOnEdit = async ({
     tenantId,
     billId,
+    bill,
     trx,
   }: IBillEditedPayload) => {
+    // Can't continue if the bill is not opened yet.
+    if (!bill.openedAt) return null;
+
     await this.billsService.recordJournalTransactions(
       tenantId,
       billId,