@tomei/finance 0.3.76 → 0.3.78

package/migrations/finance-document-migration.js

@@ -9,7 +9,7 @@ module.exports = {
         allowNull: false,
       },
       DocType: {
-        type: Sequelize.ENUM(['Invoice', 'Debit Note', 'Credit Note', 'Quotation', 'Receipt']),
+        type: Sequelize.ENUM(['Invoice', 'Debit Note', 'Credit Note', 'Quotation', 'Receipt', 'Purchase Order']),
         allowNull: false,
       },
       DocDate: {
@@ -39,7 +39,7 @@ module.exports = {
         allowNull: false,
       },
       Status: {
-        type: Sequelize.STRING(20),
+        type: Sequelize.ENUM(['Unpaid', 'Paid', 'Partial Paid', 'Cancelled']),
         allowNull: false,
       },
       IssuedById: {

package/package.json

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

package/src/enum/document-status.enum.ts

@@ -1,5 +1,6 @@
 export enum DocumentStatus {
   UNPAID = 'Unpaid',
+  PARTIALPAID = 'Partial Paid',
   PAID = 'Paid',
   CANCELLED = 'Cancelled',
 }

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

@@ -61,6 +61,7 @@ export default class FinanceCompany extends ObjectBase {
 
   private _AccountingSystem: IAccountSystem;
 
+  private _DbTransaction: any;
   private _PaymentMethods = [];
 
   get CompSystemCode(): string {
@@ -1326,11 +1327,54 @@ export default class FinanceCompany extends ObjectBase {
     }
   }
 
-  get PaymentMethods() {
-    if (this._PaymentMethods === null || this._PaymentMethods.length === 0) {
-      this.LoadPaymentMethods();
-    }
-    return this._PaymentMethods;
+  get PaymentMethods(): Promise<PaymentMethod[]> {
+    return new Promise((resolve, reject) => {
+      if (this.CompanyId !== 'New') {
+        FinanceCompany._PaymentMethodRepository
+          .findAll({
+            where: {
+              CompanyId: this.CompanyId,
+            },
+            transaction: this._DbTransaction,
+          })
+          .then((paymentMethod) => {
+            const paymentMethodObjects = paymentMethod.map(
+              (paymentMethodData) => {
+                return new Promise((resolve, reject) => {
+                  FinanceCompany._PaymentMethodTypeRepository
+                    .findAll({
+                      where: {
+                        MethodId: paymentMethodData.MethodId,
+                      },
+                      transaction: this._DbTransaction,
+                      raw: true,
+                    })
+                    .then((paymentMethodTypes) => {
+                      const paymentMethodObjects = {
+                        ...paymentMethodData.get({ plain: true }),
+                        Types: paymentMethodTypes,
+                      };
+                      resolve(paymentMethodObjects);
+                    })
+                    .catch((err) => {
+                      reject(err);
+                    });
+                }).then((paymentMethods) => paymentMethods);
+              },
+            );
+            return Promise.all(paymentMethodObjects);
+          })
+          .then((paymentMethodObjects) => {
+            this._PaymentMethods = paymentMethodObjects;
+            resolve(this._PaymentMethods);
+          })
+          .catch((err) => {
+            reject(err);
+          });
+      } else {
+        resolve(this._PaymentMethods);
+      }
+    });
   }
 
   /**

package/src/payment/payment.ts

@@ -195,8 +195,8 @@ export default class Payment extends AccountSystemEntity {
     return paymentItem;
   }
 
-  newPaymentPaidWIth(paymentMethodId: string) {
-    const paymentPaidWith = new PaymentPaidWith(this, paymentMethodId);
+  newPaymentPaidWith(paymentMethodTypeId: string) {
+    const paymentPaidWith = new PaymentPaidWith(this, paymentMethodTypeId);
     this._PaymentPaidWith.push(paymentPaidWith);
     return paymentPaidWith;
   }