@tomei/finance 0.3.87 → 0.3.89

package/package.json

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

package/src/account/account.ts

@@ -201,27 +201,51 @@ export default class Account extends AccountSystemEntity {
     dbTransaction?: any,
   ): Promise<AccountModel> {
     this.AccSystemRefId = AccSystemRefId;
-    const data = await this.RepositoryBase.create(
-      {
+    const data = await this.RepositoryBase.findOne({
+      where: {
         AccountNo: this.AccountNo,
-        AccSystemRefId: this.AccSystemRefId,
-        Name: this.Name,
-        Description: this.Description,
-        AccountType: this.AccountType,
-        AccountSubtype: this.AccountSubtype,
-        CompanyId: CompanyId,
-        OwnerId: this.OwnerId,
-        OwnerType: this.OwnerType,
-        RelatedObjectId: this.RelatedObjectId,
-        RelatedObjectType: this.RelatedObjectType,
-        PostedToAccSystemYN: this.PostedToAccSystemYN,
-        CreatedAt: new Date(),
-        CreatedById: userId,
       },
-      {
-        transaction: dbTransaction,
-      },
-    );
+      transaction: dbTransaction,
+    });
+    if (data) {
+      this.AccountNo = data.AccountNo;
+      this.AccSystemRefId = data.AccSystemRefId;
+      this.Name = data.Name;
+      this.Description = data.Description;
+      this.AccountType = data.AccountType;
+      this.AccountSubtype = data.AccountSubType;
+      this.CompanyId = data.CompanyId;
+      this.OwnerId = data.OwnerId;
+      this.OwnerType = data.OwnerType;
+      this.RelatedObjectId = data.RelatedObjectId;
+      this.RelatedObjectType = data.RelatedObjectType;
+      this.PostedToAccSystemYN = data.PostedToAccSystemYN;
+      this.CreatedAt = data.CreatedAt;
+      this.CreatedById = data.CreatedById;
+    } else {
+      await this.RepositoryBase.create(
+        {
+          AccountNo: this.AccountNo,
+          AccSystemRefId: this.AccSystemRefId,
+          Name: this.Name,
+          Description: this.Description,
+          AccountType: this.AccountType,
+          AccountSubtype: this.AccountSubtype,
+          CompanyId: CompanyId,
+          OwnerId: this.OwnerId,
+          OwnerType: this.OwnerType,
+          RelatedObjectId: this.RelatedObjectId,
+          RelatedObjectType: this.RelatedObjectType,
+          PostedToAccSystemYN: this.PostedToAccSystemYN,
+          CreatedAt: new Date(),
+          CreatedById: userId,
+        },
+        {
+          transaction: dbTransaction,
+        },
+      );
+    }
+
     return data;
   }
 }

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

@@ -1205,8 +1205,8 @@ export default class FinanceCompany extends ObjectBase {
           TransactionTypeOptions.DEBIT,
         );
         debitLT.AccountNo = paymentMethodType.AccountNo;
-        debitLT.Currency = payment.Currency;
-        debitLT.DebitAmount = payment.Amount;
+        debitLT.Currency = paymentPaidWith.Currency;
+        debitLT.DebitAmount = paymentPaidWith.Amount;
         debitLT.Date = transactionDate;
         debitLT.Description = customer.FullName;
         debitLT.Name = customer.FullName;
@@ -1220,8 +1220,8 @@ export default class FinanceCompany extends ObjectBase {
         } else {
           creditLT.AccountNo = (await customer.AccountReceivable).AccountNo;
         }
-        creditLT.Currency = payment.Currency;
-        creditLT.CreditAmount = payment.Amount;
+        creditLT.Currency = paymentPaidWith.Currency;
+        creditLT.CreditAmount = paymentPaidWith.Amount;
         creditLT.Date = transactionDate;
         creditLT.Description = paymentMethodType.Name;
         creditLT.Name = paymentMethodType.Name;
@@ -1257,15 +1257,15 @@ export default class FinanceCompany extends ObjectBase {
   ): Promise<Payment> {
     let paymentMethodType: PaymentMethodType;
     try {
-      const PaymentPaidWith = await payment.PaymentPaidWith;
-      if (PaymentPaidWith.length < 1) {
+      const paymentPaidWith = await payment.PaymentPaidWith;
+      if (paymentPaidWith.length < 1) {
         throw new Error(
           'Atleast one payment paid with item is required to identify how the payment was made.',
         );
       }
       paymentMethodType = await PaymentMethodType.initMethodType(
         dbTransaction,
-        PaymentPaidWith[0].MethodTypeId,
+        paymentPaidWith[0].MethodTypeId,
       );
 
       const paymentItems = await payment.PaymentItems;
@@ -1313,40 +1313,77 @@ export default class FinanceCompany extends ObjectBase {
         );
       });
 
-      const journalEntry = new JournalEntry(dbTransaction);
-      //Temporary fix to successfully save journal entry in PostJournal
-      journalEntry.init({
-        CompanyId: this.CompanyId,
-        Name: 'Make Payment for ' + payment.PaymentId,
-      });
+      for (const paymentPaidWithItem of paymentPaidWith) {
+        await FinanceCompany._PaymentPaidWithRepository.create(
+          {
+            PaymentId: payment.PaymentId,
+            MethodTypeId: paymentPaidWithItem.MethodTypeId,
+            Currency: paymentPaidWithItem.Currency,
+            Amount: paymentPaidWithItem.Amount,
+            Status: paymentPaidWithItem.Status,
+            TransactionId: paymentPaidWithItem.TransactionId,
+            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 },
+        );
+      }
       const transactionDate = new Date();
+      for (const paymentPaidWithItem of paymentPaidWith) {
+        try {
+          paymentMethodType = await PaymentMethodType.initMethodType(
+            dbTransaction,
+            paymentPaidWithItem.MethodTypeId,
+          );
 
-      const creditLT = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.CREDIT,
-      );
-      creditLT.AccountNo = paymentMethodType.AccountNo;
-      creditLT.Currency = payment.Currency;
-      creditLT.CreditAmount = payment.Amount;
-      creditLT.Date = transactionDate;
-      creditLT.Description = customer.FullName;
-      creditLT.Name = customer.FullName;
-
-      const debitLT = await journalEntry.newLedgerTransaction(
-        TransactionTypeOptions.DEBIT,
-      );
-      if (dtAccountNo) {
-        debitLT.AccountNo = dtAccountNo;
-      } else {
-        debitLT.AccountNo = (await customer.AccountPayable).AccountNo;
-      }
-      debitLT.Currency = payment.Currency;
-      debitLT.DebitAmount = payment.Amount;
-      debitLT.Date = transactionDate;
-      debitLT.Description = paymentMethodType.Name;
-      debitLT.Name = paymentMethodType.Name;
+          const journalEntry = new JournalEntry(dbTransaction);
+          //Temporary fix to successfully save journal entry in PostJournal
+          journalEntry.init({
+            CompanyId: this.CompanyId,
+            Name: 'Make Payment for ' + payment.PaymentId,
+          });
 
-      await this.postJournal(dbTransaction, journalEntry);
+          const creditLT = await journalEntry.newLedgerTransaction(
+            TransactionTypeOptions.CREDIT,
+          );
+          creditLT.AccountNo = paymentMethodType.AccountNo;
+          creditLT.Currency = paymentPaidWithItem.Currency;
+          creditLT.CreditAmount = paymentPaidWithItem.Amount;
+          creditLT.Date = transactionDate;
+          creditLT.Description = customer.FullName;
+          creditLT.Name = customer.FullName;
+
+          const debitLT = await journalEntry.newLedgerTransaction(
+            TransactionTypeOptions.DEBIT,
+          );
+          if (dtAccountNo) {
+            debitLT.AccountNo = dtAccountNo;
+          } else {
+            debitLT.AccountNo = (await customer.AccountPayable).AccountNo;
+          }
+          debitLT.Currency = paymentPaidWithItem.Currency;
+          debitLT.DebitAmount = paymentPaidWithItem.Amount;
+          debitLT.Date = transactionDate;
+          debitLT.Description = paymentMethodType.Name;
+          debitLT.Name = paymentMethodType.Name;
 
+          await this.postJournal(dbTransaction, journalEntry);
+        } catch (error) {
+          if (error instanceof RecordNotFoundError) {
+            throw new Error('Invalid Payment Method Type Id');
+          } else {
+            throw error;
+          }
+        }
+      }
       /*todo: saving a record into the activity history table*/
 
       return payment;