@tomei/finance 0.6.53 → 0.6.55

package/package.json

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

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

@@ -2014,7 +2014,7 @@ export default class FinanceCompany extends ObjectBase {
           receipt.CreatedById = loginUser.ObjectId;
           receipt.UpdatedById = loginUser.ObjectId;
 
-          const paymentItems = await payment.getPaymentItems();
+          const paymentItems = await payment.getPaymentItems(dbTransaction);
           for (const paymentItem of paymentItems) {
             const receiptItem = new DocumentItem(dbTransaction, receipt);
             receiptItem.Name = `Payment for ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
@@ -2110,7 +2110,7 @@ export default class FinanceCompany extends ObjectBase {
 
           /*Registering the Journal Entries for the transaction*/
           const transactionDate = new Date();
-          const paymentPaidWithItems = await payment.getPaymentPaidWith();
+          const paymentPaidWithItems = await payment.getPaymentPaidWith(dbTransaction);
 
           for (const paymentPaidWith of paymentPaidWithItems) {
             let paymentMethodType = await PaymentMethodType.initMethodType(
@@ -2157,8 +2157,22 @@ export default class FinanceCompany extends ObjectBase {
             creditLT.RelatedObjectType = type(payment);
             creditLT.RelatedPaymentId = payment.PaymentId;
 
-            await
-              await this.postJournal(dbTransaction, journalEntry, loginUser);
+            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;
         default:

package/src/payment/payment.ts

@@ -1,6 +1,6 @@
 import { ClassError, LoginUserBase, ObjectBase } from '@tomei/general';
 import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
-import { PaymentType } from '../enum';
+import { PaymentType, TransactionTypeOptions } from '../enum';
 import { IPaymentParams } from './interfaces/payment-params.interface';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
 import { PaymentStatus } from '../enum/payment-status.enum';
@@ -12,6 +12,8 @@ import PaymentPaidWith from '../payment-paid-with/payment-paid-with';
 import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-with.repository';
 import FinanceCustomerBase from 'src/customer/customer';
 import { ApplicationConfig } from '@tomei/config';
+import JournalEntry from 'src/journal-entry/journal-entry';
+import PaymentMethodType from 'src/payment-method-type/payment-method-type';
 
 export default class Payment extends AccountSystemEntity {
   private _PaymentId = 'New';
@@ -130,14 +132,14 @@ export default class Payment extends AccountSystemEntity {
     }
   }
 
-  async getPaymentItems(): Promise<PaymentItem[]> {
+  async getPaymentItems(dbTransaction?: any): Promise<PaymentItem[]> {
     try {
       if (this.PaymentId !== 'New') {
         const paymentItems = await Payment._PaymentItemRepository.findAll({
           where: {
             PaymentId: this.PaymentId,
           },
-          transaction: this._DbTransaction,
+          transaction: dbTransaction || this._DbTransaction,
         });
         const paymentItemObjects = paymentItems.map((paymentItem) => {
           const pi = new PaymentItem(
@@ -169,7 +171,7 @@ export default class Payment extends AccountSystemEntity {
     }
   }
 
-  async getPaymentPaidWith(): Promise<PaymentPaidWith[]> {
+  async getPaymentPaidWith(dbTransaction?: any): Promise<PaymentPaidWith[]> {
     try {
       if (this.PaymentId !== 'New') {
         const paymentPaidWithItems =
@@ -177,7 +179,7 @@ export default class Payment extends AccountSystemEntity {
             where: {
               PaymentId: this.PaymentId,
             },
-            transaction: this._DbTransaction,
+            transaction: dbTransaction || this._DbTransaction,
           });
         const paymentPaidWithObjects = paymentPaidWithItems.map(
           (paymentPaidWithItem) => {
@@ -235,40 +237,4 @@ export default class Payment extends AccountSystemEntity {
     if (Params.Currency) this.Currency = Params.Currency;
     if (Params.PaymentType) this.PaymentType = Params.PaymentType;
   }
-
-  async confirmPayment(
-    dbTransaction: any,
-    loginUser: LoginUserBase,
-    customer: FinanceCustomerBase,
-    status: PaymentStatus,
-    remarks?: string,
-    ctAccountNo?: string,
-  ): Promise<void> {
-    try {
-      const systemCode =
-        ApplicationConfig.getComponentConfigValue('system-code');
-
-      const isPrivileged = await loginUser.checkPrivileges(
-        systemCode,
-        'Payment - Update',
-      );
-      if (!isPrivileged) {
-        throw new ClassError(
-          'Payment',
-          'PaymentChangeStatusErrMsg00',
-          `You do not have 'Payment - Update' privilege.`,
-        );
-      }
-
-      if (this.PaymentId === 'New') {
-        throw new ClassError(
-          'Payment',
-          'PaymentChangeStatusErrMsg01',
-          `Payment not found.`,
-        );
-      }
-    } catch (error) {
-      throw error;
-    }
-  }
 }