@tomei/finance 0.3.80 → 0.3.82

package/package.json

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

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

@@ -360,12 +360,20 @@ export default class FinanceCompany extends ObjectBase {
 
       const newJournalEntry = await journalEntry.save('test', dbTransaction);
 
-      const allLedgerTransactions =
-        await FinanceCompany._LedgerTransactionRepository.findAll({});
+      for (const ledgerTransaction of debitTransactions) {
+        const dt = await ledgerTransaction.newLedgerTransaction(
+          TransactionTypeOptions.DEBIT,
+          newJournalEntry.JournalEntryId,
+        );
+        await dt.save();
+      }
 
-      for (const ledgerTransaction of allLedgerTransactions) {
-        ledgerTransaction.JournalEntryId = newJournalEntry.JournalEntryId;
-        await ledgerTransaction.save();
+      for (const ledgerTransaction of creditTransactions) {
+        const ct = await ledgerTransaction.newLedgerTransaction(
+          TransactionTypeOptions.CREDIT,
+          newJournalEntry.JournalEntryId,
+        );
+        await ct.save();
       }
 
       await this.AccountingSystem.postJournalEntry(newJournalEntry);
@@ -1142,12 +1150,16 @@ export default class FinanceCompany extends ObjectBase {
             Amount: paymentPaidWithItem.Amount,
             Status: paymentPaidWithItem.Status,
             TransactionId: paymentPaidWithItem.TransactionId,
-            // TransactionApprovalCode:
-            //   paymentPaidWithItem.TransactionApprovalCode,
-            // TransactionApprovalName:
-            //   paymentPaidWithItem.TransactionApprovalName,
-            // TransactionAccountNo: paymentPaidWithItem.TransactionAccountNo,
+            RefBank: paymentPaidWithItem.RefBank,
+            RefName: paymentPaidWithItem.RefName,
+            RefNo: paymentPaidWithItem.RefNo,
+            RefOther1: paymentPaidWithItem.RefOther1,
+            RefOther2: paymentPaidWithItem.RefOther2,
+            RefOther3: paymentPaidWithItem.RefOther3,
+            RefOther4: paymentPaidWithItem.RefOther4,
+            RefOther5: paymentPaidWithItem.RefOther5,
             Remarks: paymentPaidWithItem.Remarks,
+            PaymentMediaId: paymentPaidWithItem.PaymentMediaId,
           },
           { transaction: dbTransaction },
         );

package/src/ledger-transaction/ledger-transaction.ts

@@ -2,6 +2,7 @@ import * as cuid from 'cuid';
 import { ILedgerTransactionAttr } from './interfaces/ledger-transaction-attr.interface';
 import { TransactionTypeOptions } from '../enum/transaction-type.enum';
 import { LedgerTransactionRepository } from './ledger-transaction.repository';
+import JournalEntryModel from '../models/journal-entry.entity';
 
 export default class LedgerTransaction {
   TransactionId = 'New';
@@ -104,18 +105,17 @@ export default class LedgerTransaction {
       TransactionId: cuid(),
       TransactionType: transactionType,
       JournalEntryId: journalEntryId,
-      //TODO: AccountNo should be Filled In. Not sure with What
-      Name: '',
-      AccountNo: '',
-      Date: new Date(),
-      Description: '',
-      Currency: 'MYR',
-      DebitAmount: 0,
-      CreditAmount: 0,
-      RelatedObjectId: '',
-      RelatedObjectType: '',
-      RelatedDocNo: '',
-      RelatedPaymentId: '',
+      // Name: journalEntry.Name,
+      // AccountNo: '',
+      // Date: new Date(),
+      // Description: journalEntry.Description,
+      // Currency: 'MYR',
+      // DebitAmount: 0,
+      // CreditAmount: 0,
+      // RelatedObjectId: '',
+      // RelatedObjectType: '',
+      // RelatedDocNo: '',
+      // RelatedPaymentId: '',
     });
 
     if (transactionType === TransactionTypeOptions.DEBIT) {