@tomei/finance 0.6.36 → 0.6.38

package/package.json

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

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

@@ -1157,7 +1157,7 @@ export default class FinanceCompany extends ObjectBase {
   ): Promise<Payment> {
     try {
       /*validation 1: Make sure that the payment has at least 1 payment item*/
-      const paymentItems = await payment.PaymentItems;
+      const paymentItems = await payment.getPaymentItems();
       if (paymentItems.length < 1) {
         throw new Error(
           'Atleast one payment item is required to identify what payment is being paid for.',
@@ -1165,7 +1165,7 @@ export default class FinanceCompany extends ObjectBase {
       }
 
       /*validation 2: Make sure that the payment has at least 1 payment method*/
-      const paymentPaidWithItems = await payment.PaymentPaidWith;
+      const paymentPaidWithItems = await payment.getPaymentPaidWith();
       if (paymentPaidWithItems.length < 1) {
         throw new Error(
           'Atleast one payment paid with item is required to identify how the payment was made.',
@@ -1452,7 +1452,7 @@ export default class FinanceCompany extends ObjectBase {
   ): Promise<Payment> {
     let paymentMethodType: PaymentMethodType;
     try {
-      const paymentPaidWith = await payment.PaymentPaidWith;
+      const paymentPaidWith = await payment.getPaymentPaidWith();
       if (paymentPaidWith.length < 1) {
         throw new Error(
           'Atleast one payment paid with item is required to identify how the payment was made.',
@@ -1463,7 +1463,7 @@ export default class FinanceCompany extends ObjectBase {
         paymentPaidWith[0].MethodTypeId,
       );
 
-      const paymentItems = await payment.PaymentItems;
+      const paymentItems = await payment.getPaymentItems();
       if (paymentItems.length < 1) {
         throw new Error(
           'Atleast one payment item is required to identify what payment is being paid for',
@@ -1892,7 +1892,7 @@ export default class FinanceCompany extends ObjectBase {
 
       //Part 2: Validation
       //Make sure that the payment has at least 1 payment item
-      const paymentItems = await payment.PaymentItems;
+      const paymentItems = await payment.getPaymentItems();
       if (paymentItems.length < 1) {
         throw new Error(
           'Atleast one payment item is required to identify what payment is being paid for.',
@@ -1900,7 +1900,7 @@ export default class FinanceCompany extends ObjectBase {
       }
 
       //Make sure that the payment has at least 1 payment method
-      const paymentPaidWithItems = await payment.PaymentPaidWith;
+      const paymentPaidWithItems = await payment.getPaymentPaidWith();
       if (paymentPaidWithItems.length < 1) {
         throw new Error(
           'Atleast one payment paid with item is required to identify how the payment was made.',

package/src/models/payment.entity.ts

@@ -12,6 +12,7 @@ import { ForeignKey } from 'sequelize-typescript/dist/associations/foreign-key/f
 import { PaymentType, PaymentStatus } from '../enum';
 import DocumentModel from './document.entity';
 import PaymentItemModel from './payment-item.entity';
+import PaymentPaidWithModel from './payment-paid-with.entity';
 
 @Table({
   tableName: 'finance_Payment',
@@ -156,6 +157,9 @@ export default class PaymentModel extends Model {
   @HasMany(() => PaymentItemModel)
   PaymentItems: PaymentItemModel[];
 
+  @HasMany(() => PaymentPaidWithModel)
+  PaymentPaidWiths: PaymentPaidWithModel[];
+
   @BelongsTo(() => DocumentModel)
   Document: DocumentModel;
 }

package/src/payment/payment.ts

@@ -123,75 +123,86 @@ export default class Payment extends AccountSystemEntity {
     }
   }
 
-  get PaymentItems(): Promise<PaymentItem[]> {
-    return new Promise((resolve, reject) => {
+  async getPaymentItems(): Promise<PaymentItem[]> {
+    try {
       if (this.PaymentId !== 'New') {
-        Payment._PaymentItemRepository
-          .findAll({
-            where: {
-              PaymentId: this.PaymentId,
+        const paymentItems = await Payment._PaymentItemRepository.findAll({
+          where: {
+            PaymentId: this.PaymentId,
+          },
+          transaction: this._DbTransaction,
+        });
+        const paymentItemObjects = paymentItems.map((paymentItem) => {
+          const pi = new PaymentItem(
+            new Payment(this._DbTransaction, paymentItem.PaymentId),
+            {
+              ObjectId: this.ObjectId,
+              ObjectName: this.ObjectName,
+              TableName: this.TableName,
             },
-            transaction: this._DbTransaction,
-          })
-          .then((paymentItems) => {
-            const paymentItemObjects = paymentItems.map((paymentItem) => {
-              new PaymentItem(
-                new Payment(this._DbTransaction, paymentItem.PaymentId),
-                {
-                  ObjectId: this.ObjectId,
-                  ObjectName: this.ObjectName,
-                  TableName: this.TableName,
-                },
-              );
-            });
-            return Promise.all(paymentItemObjects);
-          })
-          .then((paymentItemObjects) => {
-            this._PaymentItems = paymentItemObjects;
-            resolve(this._PaymentItems);
-          })
-          .catch((err) => {
-            reject(err);
-          });
+          );
+          pi.PayForObjectType = paymentItem.PayForObjectType;
+          pi.PayForObjectId = paymentItem.PayForObjectId;
+          pi.Currency = paymentItem.Currency;
+          pi.Amount = paymentItem.Amount;
+          pi.Name = paymentItem.Name;
+          pi.Description = paymentItem.Description;
+
+          return pi;
+        });
+
+        this._PaymentItems = paymentItemObjects;
+      } else {
+        return this._PaymentItems;
       }
-      resolve(this._PaymentItems);
-    });
+    } catch (error) {
+      throw error;
+    }
   }
 
-  get PaymentPaidWith(): Promise<PaymentPaidWith[]> {
-    return new Promise((resolve, reject) => {
+  async getPaymentPaidWith(): Promise<PaymentPaidWith[]> {
+    try {
       if (this.PaymentId !== 'New') {
-        Payment._PaymentPaidWithRepository
-          .findAll({
+        const paymentPaidWithItems =
+          await Payment._PaymentPaidWithRepository.findAll({
             where: {
               PaymentId: this.PaymentId,
             },
             transaction: this._DbTransaction,
-          })
-          .then((paymentPaidWithItems) => {
-            const paymentPaidWithObjects = paymentPaidWithItems.map(
-              (paymentPaidWithItem) => {
-                new PaymentPaidWith(
-                  new Payment(
-                    this._DbTransaction,
-                    paymentPaidWithItem.PaymentId,
-                  ),
-                  paymentPaidWithItem.MethodTypeId,
-                );
-              },
-            );
-            return Promise.all(paymentPaidWithObjects);
-          })
-          .then((paymentPaidWithObjects) => {
-            this._PaymentPaidWith = paymentPaidWithObjects;
-            resolve(this._PaymentPaidWith);
-          })
-          .catch((err) => {
-            reject(err);
           });
+        const paymentPaidWithObjects = paymentPaidWithItems.map(
+          (paymentPaidWithItem) => {
+            const ppw = new PaymentPaidWith(
+              new Payment(this._DbTransaction, paymentPaidWithItem.PaymentId),
+              paymentPaidWithItem.MethodTypeId,
+            );
+
+            ppw.Currency = paymentPaidWithItem.Currency;
+            ppw.Amount = paymentPaidWithItem.Amount;
+            ppw.Status = paymentPaidWithItem.Status;
+            ppw.TransactionId = paymentPaidWithItem.TransactionId;
+            ppw.RefBank = paymentPaidWithItem.RefBank;
+            ppw.RefName = paymentPaidWithItem.RefName;
+            ppw.RefNo = paymentPaidWithItem.RefNo;
+            ppw.RefOther1 = paymentPaidWithItem.RefOther1;
+            ppw.RefOther2 = paymentPaidWithItem.RefOther2;
+            ppw.RefOther3 = paymentPaidWithItem.RefOther3;
+            ppw.RefOther4 = paymentPaidWithItem.RefOther4;
+            ppw.RefOther5 = paymentPaidWithItem.RefOther5;
+            ppw.Remarks = paymentPaidWithItem.Remarks;
+            ppw.PaymentMediaId = paymentPaidWithItem.PaymentMediaId;
+
+            return ppw;
+          },
+        );
+
+        this._PaymentPaidWith = paymentPaidWithObjects;
+      } else {
+        return this._PaymentPaidWith;
       }
-      resolve(this._PaymentPaidWith);
-    });
+    } catch (error) {
+      throw error;
+    }
   }
 
   newPaymentItem(objectBeingPaidFor: ObjectBase): PaymentItem {