@tomei/finance 0.3.33 → 0.3.35

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

@@ -29,6 +29,7 @@ import { DocumentItemRepository } from '../document/document-item.repository';
 import { PaymentMethodRepository } from '../payment-method/payment-method.repository';
 import { PaymentMethodTypeRepository } from '../payment-method-type/payment-method-type.repository';
 import PaymentMethod from '../payment-method/payment-method';
+import { PaymentPaidWithRepository } from 'src/payment-paid-with/payment-paid-with.repository';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const getConfig = require('../config');
@@ -45,6 +46,7 @@ export default class FinanceCompany extends ObjectBase {
   private static _financeCompanyRepository = new FinanceCompanyRepository();
   private static _PaymentRepository = new PaymentRepository();
   private static _PaymentItemRepository = new PaymentItemRepository();
+  private static _PaymentPaidWithRepository = new PaymentPaidWithRepository();
   private static _PaymentMethodRepository = new PaymentMethodRepository();
   private static _PaymentMethodTypeRepository =
     new PaymentMethodTypeRepository();
@@ -482,6 +484,7 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Set up the document type*/
       invoice.DocType = DocType.INVOICE;
+      invoice.DocNo = cuid();
 
       /*Saving the document and document items to the database*/
       await FinanceCompany._DocumentRepository.create(
@@ -514,37 +517,35 @@ export default class FinanceCompany extends ObjectBase {
         },
       );
 
-      // Q: IS THIS ONE BELOW NECESSARY? WHY WOULD WE CREATE THE SAME DOCUMENT ITEM
-
-      // documentItems.forEach(async (documentItem) => {
-      //   await FinanceCompany._DocumentItemRepository.create(
-      //     {
-      //       DocumentItemId: cuid(),
-      //       DocNo: documentItem.DocNo,
-      //       Name: documentItem.Name,
-      //       NameBM: documentItem.NameBM,
-      //       Description: documentItem.Description,
-      //       ItemId: documentItem.ItemId,
-      //       ItemType: documentItem.ItemType,
-      //       ItemSKU: documentItem.ItemSKU,
-      //       ItemSerialNo: documentItem.ItemSerialNo,
-      //       Currency: documentItem.Currency,
-      //       UnitPrice: documentItem.UnitPrice,
-      //       Quantity: documentItem.Quantity,
-      //       QuantityUOM: documentItem.QuantityUOM,
-      //       Amount: documentItem.Amount,
-      //       TaxCode: documentItem.TaxCode,
-      //       TaxAmount: documentItem.TaxAmount,
-      //       TaxRate: documentItem.TaxRate,
-      //       TaxInclusiveYN: documentItem.TaxInclusiveYN,
-      //       DtAccountNo: documentItem.DtAccountNo,
-      //       CtAccountNo: documentItem.CtAccountNo,
-      //     },
-      //     {
-      //       transaction: dbTransaction,
-      //     },
-      //   );
-      // });
+      documentItems.forEach(async (documentItem) => {
+        await FinanceCompany._DocumentItemRepository.create(
+          {
+            DocumentItemId: cuid(),
+            DocNo: documentItem.DocNo,
+            Name: documentItem.Name,
+            NameBM: documentItem.NameBM,
+            Description: documentItem.Description,
+            ItemId: documentItem.ItemId,
+            ItemType: documentItem.ItemType,
+            ItemSKU: documentItem.ItemSKU,
+            ItemSerialNo: documentItem.ItemSerialNo,
+            Currency: documentItem.Currency,
+            UnitPrice: documentItem.UnitPrice,
+            Quantity: documentItem.Quantity,
+            QuantityUOM: documentItem.QuantityUOM,
+            Amount: documentItem.Amount,
+            TaxCode: documentItem.TaxCode,
+            TaxAmount: documentItem.TaxAmount,
+            TaxRate: documentItem.TaxRate,
+            TaxInclusiveYN: documentItem.TaxInclusiveYN,
+            DtAccountNo: documentItem.DtAccountNo,
+            CtAccountNo: documentItem.CtAccountNo,
+          },
+          {
+            transaction: dbTransaction,
+          },
+        );
+      });
 
       /*Generating the invoice*/
       if (invoice.UseAccSystemDocYN === 'Y') {
@@ -557,57 +558,70 @@ export default class FinanceCompany extends ObjectBase {
         invoice.generateInvoice(invoice.IssuedById);
       }
 
-      const journalEntry = new JournalEntry(dbTransaction);
       const transactionDate = new Date();
+      const htCreditAccountAmount = new HashTable();
+      const htCreditAccountCurrency = new HashTable();
+
+      documentItems.forEach((invoiceItem) => {
+        if (!htCreditAccountAmount.exists(invoiceItem.CtAccountNo)) {
+          //add the credit account to the hash table
+          htCreditAccountAmount.add(
+            invoiceItem.CtAccountNo,
+            invoiceItem.Amount,
+          );
 
-      const ledgerTransaction = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.DEBIT,
-      );
+          htCreditAccountCurrency.add(
+            invoiceItem.CtAccountNo,
+            invoiceItem.Currency,
+          );
+        } else {
+          //update the credit account amount
+          const d = htCreditAccountAmount.get(invoiceItem.CtAccountNo);
+          htCreditAccountAmount.add(
+            invoiceItem.CtAccountNo,
+            d + invoiceItem.Amount,
+          );
+        }
+      });
 
-      if (dtAccountNo) {
-        /*Transacting using AR account provided*/
-        ledgerTransaction.AccountNo = dtAccountNo;
-      } else {
-        /*Transacting based on default customer AR account*/
-        ledgerTransaction.AccountNo = customer.CustSystemCode + '-AR';
-      }
+      const savedItems = htCreditAccountAmount.list();
 
-      ledgerTransaction.Currency = invoice.Currency;
-      ledgerTransaction.DebitAmount = invoice.Amount;
-      ledgerTransaction.Date = transactionDate;
-      ledgerTransaction.Name = invoice.DocNo;
+      for (let i = 0; i < savedItems.length; i++) {
+        const journalEntry = new JournalEntry(dbTransaction);
+        const account = new Account(dbTransaction, savedItems[i].key);
+        const creditAmount = savedItems[i].value;
+        const currency = htCreditAccountCurrency.get(savedItems[i].key);
 
-      for (const invoiceItem of documentItems) {
-        const itemLedger = await journalEntry.newLedgerTransaction(
-          TransactionTypeOptions.CREDIT,
+        const dt = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.DEBIT,
         );
-        itemLedger.AccountNo = invoiceItem.CtAccountNo;
-        itemLedger.Currency = invoiceItem.Currency;
-        itemLedger.CreditAmount = invoiceItem.Amount;
-        itemLedger.Date = transactionDate;
-        itemLedger.Name = invoiceItem.Name;
-      }
 
-      this.postJournal(dbTransaction, journalEntry);
+        if (dtAccountNo) {
+          /*Transacting using AR account provided*/
+          dt.AccountNo = dtAccountNo;
+        } else {
+          /*Transacting based on default customer AR account*/
+          dt.AccountNo = (await customer.AccountReceivable).AccountNo;
+        }
 
-      /*todo: uncomment below later*/
-
-      // const payload = {
-      //   Action: 'Create',
-      //   Activity: 'Issuing an Invoice',
-      //   Description: `Ledger Transaction (ID: ${ledgerTransaction.TransactionId}) has been created`,
-      //   EntityType: 'LedgerTransaction',
-      //   EntityValueBefore: JSON.stringify({}),
-      //   EntityValueAfter: JSON.stringify(ledgerTransaction),
-      //   PerformedById: 'test',
-      //   PerformedAt: new Date(),
-      //   EntityId: ledgerTransaction.TransactionId,
-      // };
-
-      // await axios.post(
-      //   `${process.env.COMMON_API_URL}/activity-histories`,
-      //   payload,
-      // );
+        dt.Currency = currency ? currency : 'MYR';
+        dt.DebitAmount = creditAmount ? creditAmount : 0.0;
+        dt.Date = transactionDate;
+        dt.Description = account.Name;
+        dt.RelatedDocNo = invoice.DocNo;
+
+        const ct = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.CREDIT,
+        );
+        ct.AccountNo = savedItems[i].key;
+        ct.Currency = currency ? currency : 'MYR';
+        ct.CreditAmount = creditAmount ? creditAmount : 0.0;
+        ct.Date = transactionDate;
+        ct.Description = account.Name;
+        ct.RelatedDocNo = invoice.DocNo;
+
+        await this.postJournal(dbTransaction, journalEntry);
+      }
 
       return invoice;
     } catch (err) {
@@ -668,6 +682,7 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Set up the document type*/
       invoice.DocType = DocType.DEBIT_NOTE;
+      invoice.DocNo = cuid();
 
       /*Saving the document and document items to the database*/
       await FinanceCompany._DocumentRepository.create(
@@ -741,55 +756,70 @@ export default class FinanceCompany extends ObjectBase {
         invoice.generateInvoice(loginUser.IDNo, customer);
       }
 
-      const journalEntry = new JournalEntry(dbTransaction);
       const transactionDate = new Date();
+      const htCreditAccountAmount = new HashTable();
+      const htCreditAccountCurrency = new HashTable();
+
+      documentItems.forEach((invoiceItem) => {
+        if (!htCreditAccountAmount.exists(invoiceItem.CtAccountNo)) {
+          //add the credit account to the hash table
+          htCreditAccountAmount.add(
+            invoiceItem.CtAccountNo,
+            invoiceItem.Amount,
+          );
 
-      const debitTransaction = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.DEBIT,
-      );
+          htCreditAccountCurrency.add(
+            invoiceItem.CtAccountNo,
+            invoiceItem.Currency,
+          );
+        } else {
+          //update the credit account amount
+          const d = htCreditAccountAmount.get(invoiceItem.CtAccountNo);
+          htCreditAccountAmount.add(
+            invoiceItem.CtAccountNo,
+            d + invoiceItem.Amount,
+          );
+        }
+      });
 
-      if (dtAccountNo) {
-        /*Transacting using AR account provided*/
-        debitTransaction.AccountNo = dtAccountNo;
-      } else {
-        /*Transacting based on default customer AR account*/
-        debitTransaction.AccountNo = customer.CustSystemCode + '-AR';
-      }
+      const savedItems = htCreditAccountAmount.list();
 
-      debitTransaction.Currency = invoice.Currency;
-      debitTransaction.DebitAmount = invoice.Amount;
-      debitTransaction.Date = transactionDate;
-      debitTransaction.Name = invoice.DocNo;
+      for (let i = 0; i < savedItems.length; i++) {
+        const journalEntry = new JournalEntry(dbTransaction);
+        const account = new Account(dbTransaction, savedItems[i].key);
+        const creditAmount = savedItems[i].value;
+        const currency = htCreditAccountCurrency.get(savedItems[i].key);
 
-      for (const invoiceItem of documentItems) {
-        const itemLedger = await journalEntry.newLedgerTransaction(
-          TransactionTypeOptions.CREDIT,
+        const dt = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.DEBIT,
         );
-        itemLedger.AccountNo = invoiceItem.CtAccountNo;
-        itemLedger.Currency = invoiceItem.Currency;
-        itemLedger.CreditAmount = invoiceItem.Amount;
-        itemLedger.Date = transactionDate;
-        itemLedger.Name = invoiceItem.Name;
-      }
 
-      this.postJournal(dbTransaction, journalEntry);
+        if (dtAccountNo) {
+          /*Transacting using AR account provided*/
+          dt.AccountNo = dtAccountNo;
+        } else {
+          /*Transacting based on default customer AR account*/
+          dt.AccountNo = (await customer.AccountReceivable).AccountNo;
+        }
 
-      const payload = {
-        Action: 'Create',
-        Activity: 'Issuing a Debit Note',
-        Description: `Debit Transaction (ID: ${debitTransaction.TransactionId}) has been created`,
-        EntityType: 'DebitTransaction',
-        EntityValueBefore: JSON.stringify({}),
-        EntityValueAfter: JSON.stringify(debitTransaction),
-        PerformedById: 'test',
-        PerformedAt: new Date(),
-        EntityId: debitTransaction.TransactionId,
-      };
+        dt.Currency = currency ? currency : 'MYR';
+        dt.DebitAmount = creditAmount ? creditAmount : 0.0;
+        dt.Date = transactionDate;
+        dt.Description = account.Name;
+        dt.RelatedDocNo = invoice.DocNo;
 
-      await axios.post(
-        `${process.env.COMMON_API_URL}/activity-histories`,
-        payload,
-      );
+        const ct = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.CREDIT,
+        );
+        ct.AccountNo = savedItems[i].key;
+        ct.Currency = currency ? currency : 'MYR';
+        ct.CreditAmount = creditAmount ? creditAmount : 0.0;
+        ct.Date = transactionDate;
+        ct.Description = account.Name;
+        ct.RelatedDocNo = invoice.DocNo;
+
+        await this.postJournal(dbTransaction, journalEntry);
+      }
 
       return invoice;
     } catch (err) {
@@ -940,7 +970,7 @@ export default class FinanceCompany extends ObjectBase {
       creditTransaction.Currency = creditNote.Currency;
       creditTransaction.CreditAmount = creditNote.Amount;
       creditTransaction.Date = transactionDate;
-      creditTransaction.Name = creditNote.DocNo;
+      creditTransaction.Description = creditNote.DocNo;
 
       for (const invoiceItem of documentItems) {
         const itemLedger = await journalEntry.newLedgerTransaction(
@@ -950,7 +980,7 @@ export default class FinanceCompany extends ObjectBase {
         itemLedger.Currency = invoiceItem.Currency;
         itemLedger.DebitAmount = invoiceItem.Amount;
         itemLedger.Date = transactionDate;
-        itemLedger.Name = invoiceItem.Name;
+        itemLedger.Description = invoiceItem.Description;
       }
 
       this.postJournal(dbTransaction, journalEntry);
@@ -998,38 +1028,36 @@ export default class FinanceCompany extends ObjectBase {
     customer: FinanceCustomerBase,
     ctAccountNo?: string,
   ): Promise<Payment> {
-    let paymentMethodType: PaymentMethodType;
     try {
-      paymentMethodType = new PaymentMethodType(
-        dbTransaction,
-        payment.MethodTypeId,
-      );
-
+      /*validation 1: Make sure that the payment has at least 1 payment item*/
       const paymentItems = await payment.PaymentItems;
       if (paymentItems.length < 1) {
         throw new Error(
-          'Atleast one payment item is required to identify what payment is being paid for',
+          'Atleast one payment item is required to identify what payment is being paid for.',
+        );
+      }
+
+      /*validation 2: Make sure that the payment has at least 1 payment method*/
+      const paymentPaidWithItems = await payment.PaymentPaidWith;
+      if (paymentPaidWithItems.length < 1) {
+        throw new Error(
+          'Atleast one payment paid with item is required to identify how the payment was made.',
         );
       }
 
       payment.PaymentId = cuid();
       payment.PaymentType = PaymentType.PAYMENT_RECEIVED;
+      payment.ReceivedBy = loginUser.ObjectId;
 
       await FinanceCompany._PaymentRepository.create(
         {
           PaymentId: payment.PaymentId,
           PaymentType: payment.PaymentType,
           PaymentDate: payment.PaymentDate,
-          CompanyId: this.CompanyId,
-          MethodTypeId: payment.MethodTypeId,
+          Description: payment.Description,
           Currency: payment.Currency,
           Amount: payment.Amount,
           Status: PaymentStatus.SUCCESSFUL,
-          TransactionId: payment.TransactionId,
-          TransactionApprovalCode: payment.TransactionApprovalCode,
-          TransactionAccountName: payment.TransactionAccountName,
-          TransactionAccountNo: payment.TransactionAccountNo,
-          ReceivedBy: payment.ReceivedBy,
           PostedToAccSystemYN: 'N',
           UpdatedAt: new Date(),
           UpdatedBy: loginUser.ObjectId,
@@ -1047,53 +1075,89 @@ export default class FinanceCompany extends ObjectBase {
             PayForObjectType: paymentItem.PayForObjectType,
             Currency: paymentItem.Currency,
             Amount: paymentItem.Amount,
+            Name: paymentItem.Name,
+            Description: paymentItem.Description,
           },
           { transaction: dbTransaction },
         );
       });
 
-      const journalEntry = new JournalEntry(dbTransaction);
-      //Temporary fix to successfully save journal entry in PostJournal
-      journalEntry.init({
-        CompanyId: this.CompanyId,
-        Name: 'Collect-payments for ' + payment.PaymentId,
+      paymentPaidWithItems.forEach(async (paymentPaidWithItem) => {
+        await FinanceCompany._PaymentPaidWithRepository.create(
+          {
+            PaymentId: payment.PaymentId,
+            MethodTypeId: paymentPaidWithItem.MethodTypeId,
+            Currency: paymentPaidWithItem.Currency,
+            Amount: paymentPaidWithItem.Amount,
+            Status: paymentPaidWithItem.Status,
+            TransactionId: paymentPaidWithItem.TransactionId,
+            TransactionApprovalCode:
+              paymentPaidWithItem.TransactionApprovalCode,
+            TransactionApprovalName:
+              paymentPaidWithItem.TransactionApprovalName,
+            TransactionAccountNo: paymentPaidWithItem.TransactionAccountNo,
+            Remarks: paymentPaidWithItem.Remarks,
+          },
+          { transaction: dbTransaction },
+        );
       });
+
+      /*Registering the Journal Entries for the transaction*/
       const transactionDate = new Date();
 
-      const debitLT = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.DEBIT,
-      );
-      debitLT.AccountNo = paymentMethodType.AccountNo;
-      debitLT.Currency = payment.Currency;
-      debitLT.DebitAmount = payment.Amount;
-      debitLT.Date = transactionDate;
-      debitLT.Name = customer.FullName;
+      for (const paymentPaidWith of paymentPaidWithItems) {
+        let paymentMethodType: PaymentMethodType;
 
-      const creditLT = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.CREDIT,
-      );
+        try {
+          paymentMethodType = new PaymentMethodType(
+            dbTransaction,
+            paymentPaidWith.MethodTypeId,
+          );
+        } catch (error) {
+          if (error instanceof RecordNotFoundError) {
+            throw new Error('Invalid Payment Method Type Id');
+          } else {
+            throw error;
+          }
+        }
+        const journalEntry = new JournalEntry(dbTransaction);
+        //Temporary fix to successfully save journal entry in PostJournal
+        journalEntry.init({
+          CompanyId: this.CompanyId,
+          Name: 'Collect-payments for ' + payment.PaymentId,
+        });
 
-      if (ctAccountNo) {
-        creditLT.AccountNo = ctAccountNo;
-      } else {
-        creditLT.AccountNo = (await customer.AccountReceivable).AccountNo;
-      }
-      creditLT.Currency = payment.Currency;
-      creditLT.CreditAmount = payment.Amount;
-      creditLT.Date = transactionDate;
-      creditLT.Name = paymentMethodType.Name;
+        const debitLT = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.DEBIT,
+        );
+        debitLT.AccountNo = paymentMethodType.AccountNo;
+        debitLT.Currency = payment.Currency;
+        debitLT.DebitAmount = payment.Amount;
+        debitLT.Date = transactionDate;
+        debitLT.Description = customer.FullName;
 
-      await this.postJournal(dbTransaction, journalEntry);
+        const creditLT = await journalEntry.newLedgerTransaction(
+          TransactionTypeOptions.CREDIT,
+        );
+
+        if (ctAccountNo) {
+          creditLT.AccountNo = ctAccountNo;
+        } else {
+          creditLT.AccountNo = (await customer.AccountReceivable).AccountNo;
+        }
+        creditLT.Currency = payment.Currency;
+        creditLT.CreditAmount = payment.Amount;
+        creditLT.Date = transactionDate;
+        creditLT.Description = paymentMethodType.Name;
+
+        await this.postJournal(dbTransaction, journalEntry);
+      }
 
       /*todo: saving a record into the activity history table*/
 
       return payment;
     } catch (error) {
-      if (error instanceof RecordNotFoundError) {
-        throw new Error('Invalid PaymentMethodType id');
-      } else {
-        throw error;
-      }
+      throw error;
     }
   }
 
@@ -1106,7 +1170,7 @@ export default class FinanceCompany extends ObjectBase {
    * @param customer - The customer who is receiving the payment.
    * @param ctAccountNo - The account number of the customer's Account Payable account to transact, else the default customer account payable will be used.
    *
-   * @returns {Payment} - Payment object representing the full detals of the payment collection recorded
+   * @returns {Payment} - Payment object representing the full details of the payment collection recorded
    */
   async makePayment(
     dbTransaction: any,
@@ -1117,10 +1181,7 @@ export default class FinanceCompany extends ObjectBase {
   ): Promise<Payment> {
     let paymentMethodType: PaymentMethodType;
     try {
-      paymentMethodType = new PaymentMethodType(
-        dbTransaction,
-        payment.MethodTypeId,
-      );
+      paymentMethodType = new PaymentMethodType(dbTransaction);
 
       const paymentItems = await payment.PaymentItems;
       if (paymentItems.length < 1) {
@@ -1131,22 +1192,17 @@ export default class FinanceCompany extends ObjectBase {
 
       payment.PaymentId = cuid();
       payment.PaymentType = PaymentType.PAYOUT;
+      payment.ReceivedBy = loginUser.ObjectId;
 
       await FinanceCompany._PaymentRepository.create(
         {
           PaymentId: payment.PaymentId,
           PaymentType: payment.PaymentType,
           PaymentDate: payment.PaymentDate,
-          CompanyId: this.CompanyId,
-          MethodTypeId: payment.MethodTypeId,
+          Description: payment.Description,
           Currency: payment.Currency,
           Amount: payment.Amount,
           Status: PaymentStatus.SUCCESSFUL,
-          TransactionId: payment.TransactionId,
-          TransactionApprovalCode: payment.TransactionApprovalCode,
-          TransactionAccountName: payment.TransactionAccountName,
-          TransactionAccountNo: payment.TransactionAccountNo,
-          ReceivedBy: payment.ReceivedBy,
           PostedToAccSystemYN: 'N',
           UpdatedAt: new Date(),
           UpdatedBy: loginUser.ObjectId,
@@ -1164,6 +1220,8 @@ export default class FinanceCompany extends ObjectBase {
             PayForObjectType: paymentItem.PayForObjectType,
             Currency: paymentItem.Currency,
             Amount: paymentItem.Amount,
+            Name: paymentItem.Name,
+            Description: paymentItem.Description,
           },
           { transaction: dbTransaction },
         );
@@ -1184,7 +1242,7 @@ export default class FinanceCompany extends ObjectBase {
       creditLT.Currency = payment.Currency;
       creditLT.CreditAmount = payment.Amount;
       creditLT.Date = transactionDate;
-      creditLT.Name = customer.FullName;
+      creditLT.Description = customer.FullName;
 
       const debitLT = await journalEntry.newLedgerTransaction(
         TransactionTypeOptions.DEBIT,
@@ -1197,7 +1255,7 @@ export default class FinanceCompany extends ObjectBase {
       debitLT.Currency = payment.Currency;
       debitLT.DebitAmount = payment.Amount;
       debitLT.Date = transactionDate;
-      debitLT.Name = paymentMethodType.Name;
+      debitLT.Description = paymentMethodType.Name;
 
       await this.postJournal(dbTransaction, journalEntry);
 

package/src/index.ts

@@ -9,6 +9,7 @@ import Payment from './payment/payment';
 import PaymentItem from './payment-item/payment-item';
 import PaymentMethod from './payment-method/payment-method';
 import PaymentMethodType from './payment-method-type/payment-method-type';
+import PaymentPaidWith from './payment-paid-with/payment-paid-with';
 
 export {
   FinanceCompany,
@@ -22,6 +23,7 @@ export {
   PaymentItem,
   PaymentMethod,
   PaymentMethodType,
+  PaymentPaidWith,
 };
 export * as FinanceEnum from './enum';
 export * as FinanceInterfaces from './interfaces';

package/src/ledger-transaction/interfaces/ledger-transaction-attr.interface.ts

@@ -6,11 +6,12 @@ export interface ILedgerTransactionAttr {
   JournalEntryId: string;
   AccountNo: string;
   Date: Date;
-  Name: string;
   Description: string;
   Currency: string;
   DebitAmount: number;
   CreditAmount: number;
   RelatedObjectId: string;
   RelatedObjectType: string;
+  RelatedDocNo: string;
+  RelatedPaymentId: string;
 }

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

@@ -9,13 +9,14 @@ export default class LedgerTransaction {
   JournalEntryId = '';
   AccountNo = '';
   Date = new Date();
-  Name = '';
   Description = '';
   Currency = 'MYR';
   DebitAmount = 0;
   CreditAmount = 0;
   RelatedObjectId = '';
   RelatedObjectType = '';
+  RelatedDocNo = '';
+  RelatedPaymentId = '';
 
   private _DbTransaction: any;
 
@@ -37,7 +38,6 @@ export default class LedgerTransaction {
     if (params.JournalEntryId) this.JournalEntryId = params.JournalEntryId;
     if (params.AccountNo) this.AccountNo = params.AccountNo;
     if (params.Date) this.Date = params.Date;
-    if (params.Name) this.Name = params.Name;
     if (params.Description) this.Description = params.Description;
     if (params.Currency) this.Currency = params.Currency;
     if (params.DebitAmount) this.DebitAmount = params.DebitAmount;
@@ -54,13 +54,14 @@ export default class LedgerTransaction {
       JournalEntryId: this.JournalEntryId,
       AccountNo: this.AccountNo,
       Date: this.Date,
-      Name: this.Name,
       Description: this.Description,
       Currency: this.Currency,
       DebitAmount: this.DebitAmount,
       CreditAmount: this.CreditAmount,
       RelatedObjectId: this.RelatedObjectId,
       RelatedObjectType: this.RelatedObjectType,
+      RelatedDocNo: this.RelatedDocNo,
+      RelatedPaymentId: this.RelatedPaymentId,
     };
   }
 
@@ -82,13 +83,14 @@ export default class LedgerTransaction {
       //TODO: AccountNo should be Filled In. Not sure with What
       AccountNo: '',
       Date: new Date(),
-      Name: '',
       Description: '',
       Currency: 'MYR',
       DebitAmount: 0,
       CreditAmount: 0,
       RelatedObjectId: '',
       RelatedObjectType: '',
+      RelatedDocNo: '',
+      RelatedPaymentId: '',
     });
 
     if (transactionType === TransactionTypeOptions.DEBIT) {