@tomei/finance 0.6.60 → 0.6.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.6.60",
+  "version": "0.6.62",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {

package/src/finance-company/finance-company.ts

@@ -1976,6 +1976,7 @@ export default class FinanceCompany extends ObjectBase {
       }
 
       payment.Remarks = remarks;
+      let receiptDocNo = null;
       switch (status) {
         case PaymentStatus.REJECTED:
           payment.Status = PaymentStatus.REJECTED;
@@ -2109,6 +2110,7 @@ export default class FinanceCompany extends ObjectBase {
           }
           //Set the receipt doc no to the payment
           payment.ReceiptDocNo = receipt.DocNo;
+          receiptDocNo = receipt.DocNo;
 
           /*Registering the Journal Entries for the transaction*/
           const transactionDate = new Date();
@@ -2159,21 +2161,6 @@ export default class FinanceCompany extends ObjectBase {
             creditLT.RelatedObjectType = type(payment);
             creditLT.RelatedPaymentId = payment.PaymentId;
 
-            await FinanceCompany._PaymentRepository.update(
-              {
-                ReceiptDocNo: receipt.DocNo,
-                Status: payment.Status,
-                UpdatedAt: new Date(),
-                UpdatedBy: loginUser.ObjectId,
-              },
-              {
-                where: {
-                  PaymentId: payment.PaymentId,
-                },
-                transaction: dbTransaction,
-              }
-            );
-
             await this.postJournal(dbTransaction, journalEntry, loginUser);
           }
           break;
@@ -2185,6 +2172,21 @@ export default class FinanceCompany extends ObjectBase {
           );
       }
 
+      await FinanceCompany._PaymentRepository.update(
+        {
+          ReceiptDocNo: receiptDocNo,
+          Status: payment.Status,
+          UpdatedAt: new Date(),
+          UpdatedBy: loginUser.ObjectId,
+        },
+        {
+          where: {
+            PaymentId: payment.PaymentId,
+          },
+          transaction: dbTransaction,
+        }
+      );
+
     } catch (error) {
       throw error;
     }