@tomei/finance 0.4.15 → 0.4.17

package/src/payment/payment.ts

@@ -1,211 +1,211 @@
-import { ObjectBase, RecordNotFoundError } from '@tomei/general';
-import { PaymentType } 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';
-import { PaymentRepository } from './payment.repository';
-import { PaymentItemRepository } from '../payment-item/payment-item.repository';
-// import PaymentItemModel from '../models/payment-item.entity';
-import PaymentItem from '../payment-item/payment-item';
-import PaymentPaidWith from '../payment-paid-with/payment-paid-with';
-import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-with.repository';
-
-export default class Payment extends AccountSystemEntity {
-  private _PaymentId = 'New';
-  PaymentType: PaymentType;
-  PaymentDate: Date;
-  MethodTypeId: string;
-  Description = '';
-  Currency = 'MYR';
-  Amount = 0;
-  Status: PaymentStatus;
-  TransactionId: string;
-  TransactionApprovalCode: string;
-  TransactionAccountName: string;
-  TransactionAccountNo: string;
-  ReceivedBy = '';
-  IssuedBy = '';
-  UpdatedBy = '';
-  UpdatedAt: Date;
-  Remarks = '';
-  RelatedObjectId = '';
-  RelatedObjectType = '';
-
-  private static _RepositoryBase = new PaymentRepository();
-  private static _PaymentItemRepository = new PaymentItemRepository();
-  private static _PaymentPaidWithRepository = new PaymentPaidWithRepository();
-
-  private _DbTransaction: any;
-  private _PaymentItems = [];
-  private _PaymentPaidWith = [];
-
-  paymentItemRepository: PaymentItemRepository;
-
-  public get PaymentId() {
-    return this._PaymentId;
-  }
-
-  public set PaymentId(id: string) {
-    this._PaymentId = id;
-  }
-
-  /* AccountSystemEntity Implementation */
-  get RepositoryBase() {
-    return Payment._RepositoryBase;
-  }
-
-  /* ObjectBase Implementation */
-  get ObjectId() {
-    return this.PaymentId;
-  }
-
-  get ObjectName() {
-    return this.PaymentId;
-  }
-
-  get TableName() {
-    return 'finance_Payment';
-  }
-
-  constructor(dbTransaction?: any, paymentId?: string) {
-    super();
-    if (dbTransaction) {
-      this._DbTransaction = dbTransaction;
-    }
-    if (paymentId) {
-      this.PaymentId = paymentId;
-    }
-  }
-
-  static async initPayment(
-    dbTransaction: any,
-    paymentId: string,
-  ): Promise<Payment> {
-    try {
-      const paymentData = await this._RepositoryBase.findOne({
-        where: {
-          PaymentId: paymentId,
-        },
-        transaction: dbTransaction,
-      });
-      if (paymentData) {
-        const payment = new Payment(dbTransaction, paymentId);
-        payment.PaymentType = paymentData.PaymentType;
-        payment.PaymentDate = paymentData.PaymentDate;
-        payment.Description = paymentData.Description;
-        payment.Currency = paymentData.Currency;
-        payment.Amount = paymentData.Amount;
-        payment.Status = paymentData.Status;
-        payment.ReceivedBy = paymentData.ReceivedBy;
-        payment.IssuedBy = paymentData.IssuedBy;
-        payment.UpdatedAt = paymentData.UpdatedAt;
-        payment.UpdatedBy = paymentData.UpdatedBy;
-        payment.Remarks = paymentData.Remarks;
-        payment.RelatedObjectId = paymentData.RelatedObjectId;
-        payment.RelatedObjectType = paymentData.RelatedObjectType;
-        payment.AccSystemRefId = paymentData.AccSystemRefId;
-        payment.PostedToAccSystemYN = paymentData.PostedToAccSystemYN;
-        payment.PostedById = paymentData.PostedById;
-        payment.PostedDateTime = paymentData.PostedDateTime;
-        return payment;
-      } else {
-        const notFoundError = new RecordNotFoundError('No Record Found.');
-        throw notFoundError;
-      }
-    } catch (error) {
-      console.log('Payment Class constructor err: ', error);
-    }
-  }
-
-  get PaymentItems(): Promise<PaymentItem[]> {
-    return new Promise((resolve, reject) => {
-      if (this.PaymentId !== 'New') {
-        Payment._PaymentItemRepository
-          .findAll({
-            where: {
-              PaymentId: this.PaymentId,
-            },
-            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);
-          });
-      }
-      resolve(this._PaymentItems);
-    });
-  }
-
-  get PaymentPaidWith(): Promise<PaymentPaidWith[]> {
-    return new Promise((resolve, reject) => {
-      if (this.PaymentId !== 'New') {
-        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);
-          });
-      }
-      resolve(this._PaymentPaidWith);
-    });
-  }
-
-  newPaymentItem(objectBeingPaidFor: ObjectBase): PaymentItem {
-    const paymentItem = new PaymentItem(this, objectBeingPaidFor);
-    this._PaymentItems.push(paymentItem);
-    return paymentItem;
-  }
-
-  newPaymentPaidWith(paymentMethodTypeId: string) {
-    const paymentPaidWith = new PaymentPaidWith(
-      this,
-      paymentMethodTypeId,
-      this._DbTransaction,
-    );
-    this._PaymentPaidWith.push(paymentPaidWith);
-    return paymentPaidWith;
-  }
-
-  init(Params: IPaymentParams): void {
-    if (Params.Currency) this.Currency = Params.Currency;
-    if (Params.PaymentType) this.PaymentType = Params.PaymentType;
-  }
-}
+import { ObjectBase, RecordNotFoundError } from '@tomei/general';
+import { PaymentType } 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';
+import { PaymentRepository } from './payment.repository';
+import { PaymentItemRepository } from '../payment-item/payment-item.repository';
+// import PaymentItemModel from '../models/payment-item.entity';
+import PaymentItem from '../payment-item/payment-item';
+import PaymentPaidWith from '../payment-paid-with/payment-paid-with';
+import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-with.repository';
+
+export default class Payment extends AccountSystemEntity {
+  private _PaymentId = 'New';
+  PaymentType: PaymentType;
+  PaymentDate: Date;
+  MethodTypeId: string;
+  Description = '';
+  Currency = 'MYR';
+  Amount = 0;
+  Status: PaymentStatus;
+  TransactionId: string;
+  TransactionApprovalCode: string;
+  TransactionAccountName: string;
+  TransactionAccountNo: string;
+  ReceivedBy = '';
+  IssuedBy = '';
+  UpdatedBy = '';
+  UpdatedAt: Date;
+  Remarks = '';
+  RelatedObjectId = '';
+  RelatedObjectType = '';
+
+  private static _RepositoryBase = new PaymentRepository();
+  private static _PaymentItemRepository = new PaymentItemRepository();
+  private static _PaymentPaidWithRepository = new PaymentPaidWithRepository();
+
+  private _DbTransaction: any;
+  private _PaymentItems = [];
+  private _PaymentPaidWith = [];
+
+  paymentItemRepository: PaymentItemRepository;
+
+  public get PaymentId() {
+    return this._PaymentId;
+  }
+
+  public set PaymentId(id: string) {
+    this._PaymentId = id;
+  }
+
+  /* AccountSystemEntity Implementation */
+  get RepositoryBase() {
+    return Payment._RepositoryBase;
+  }
+
+  /* ObjectBase Implementation */
+  get ObjectId() {
+    return this.PaymentId;
+  }
+
+  get ObjectName() {
+    return this.PaymentId;
+  }
+
+  get TableName() {
+    return 'finance_Payment';
+  }
+
+  constructor(dbTransaction?: any, paymentId?: string) {
+    super();
+    if (dbTransaction) {
+      this._DbTransaction = dbTransaction;
+    }
+    if (paymentId) {
+      this.PaymentId = paymentId;
+    }
+  }
+
+  static async initPayment(
+    dbTransaction: any,
+    paymentId: string,
+  ): Promise<Payment> {
+    try {
+      const paymentData = await this._RepositoryBase.findOne({
+        where: {
+          PaymentId: paymentId,
+        },
+        transaction: dbTransaction,
+      });
+      if (paymentData) {
+        const payment = new Payment(dbTransaction, paymentId);
+        payment.PaymentType = paymentData.PaymentType;
+        payment.PaymentDate = paymentData.PaymentDate;
+        payment.Description = paymentData.Description;
+        payment.Currency = paymentData.Currency;
+        payment.Amount = paymentData.Amount;
+        payment.Status = paymentData.Status;
+        payment.ReceivedBy = paymentData.ReceivedBy;
+        payment.IssuedBy = paymentData.IssuedBy;
+        payment.UpdatedAt = paymentData.UpdatedAt;
+        payment.UpdatedBy = paymentData.UpdatedBy;
+        payment.Remarks = paymentData.Remarks;
+        payment.RelatedObjectId = paymentData.RelatedObjectId;
+        payment.RelatedObjectType = paymentData.RelatedObjectType;
+        payment.AccSystemRefId = paymentData.AccSystemRefId;
+        payment.PostedToAccSystemYN = paymentData.PostedToAccSystemYN;
+        payment.PostedById = paymentData.PostedById;
+        payment.PostedDateTime = paymentData.PostedDateTime;
+        return payment;
+      } else {
+        const notFoundError = new RecordNotFoundError('No Record Found.');
+        throw notFoundError;
+      }
+    } catch (error) {
+      console.log('Payment Class constructor err: ', error);
+    }
+  }
+
+  get PaymentItems(): Promise<PaymentItem[]> {
+    return new Promise((resolve, reject) => {
+      if (this.PaymentId !== 'New') {
+        Payment._PaymentItemRepository
+          .findAll({
+            where: {
+              PaymentId: this.PaymentId,
+            },
+            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);
+          });
+      }
+      resolve(this._PaymentItems);
+    });
+  }
+
+  get PaymentPaidWith(): Promise<PaymentPaidWith[]> {
+    return new Promise((resolve, reject) => {
+      if (this.PaymentId !== 'New') {
+        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);
+          });
+      }
+      resolve(this._PaymentPaidWith);
+    });
+  }
+
+  newPaymentItem(objectBeingPaidFor: ObjectBase): PaymentItem {
+    const paymentItem = new PaymentItem(this, objectBeingPaidFor);
+    this._PaymentItems.push(paymentItem);
+    return paymentItem;
+  }
+
+  newPaymentPaidWith(paymentMethodTypeId: string) {
+    const paymentPaidWith = new PaymentPaidWith(
+      this,
+      paymentMethodTypeId,
+      this._DbTransaction,
+    );
+    this._PaymentPaidWith.push(paymentPaidWith);
+    return paymentPaidWith;
+  }
+
+  init(Params: IPaymentParams): void {
+    if (Params.Currency) this.Currency = Params.Currency;
+    if (Params.PaymentType) this.PaymentType = Params.PaymentType;
+  }
+}

package/src/payment-item/interfaces/payment-item-attr.interface.ts

@@ -1,10 +1,10 @@
-export class IPaymentItemAttr {
-  PaymentId: string;
-  PayForObjectId: string;
-  PayForObjectType: string;
-  Currency: string;
-  Amount: number;
-  Name?: string;
-  Description: string;
-  Remarks?: string;
-}
+export class IPaymentItemAttr {
+  PaymentId: string;
+  PayForObjectId: string;
+  PayForObjectType: string;
+  Currency: string;
+  Amount: number;
+  Name?: string;
+  Description: string;
+  Remarks?: string;
+}

package/src/payment-item/payment-item.repository.ts

@@ -1,11 +1,11 @@
-import { RepositoryBase, IRepositoryBase } from '@tomei/general';
-import PaymentItemModel from '../models/payment-item.entity';
-
-export class PaymentItemRepository
-  extends RepositoryBase<PaymentItemModel>
-  implements IRepositoryBase<PaymentItemModel>
-{
-  constructor() {
-    super(PaymentItemModel);
-  }
-}
+import { RepositoryBase, IRepositoryBase } from '@tomei/general';
+import PaymentItemModel from '../models/payment-item.entity';
+
+export class PaymentItemRepository
+  extends RepositoryBase<PaymentItemModel>
+  implements IRepositoryBase<PaymentItemModel>
+{
+  constructor() {
+    super(PaymentItemModel);
+  }
+}

package/src/payment-item/payment-item.ts

@@ -1,82 +1,104 @@
-import { ObjectBase } from '@tomei/general';
-import Payment from '../payment/payment';
-import type from '../helpers/typeof';
-import { QueryTypes } from 'sequelize';
-import { FinanceDb } from '../';
-import { Next } from '@nestjs/common/decorators';
-
-export default class PaymentItem extends ObjectBase {
-  private _PaymentId = '';
-  private _PayForObjectId = '';
-  private _PayForObjectType = '';
-  Currency = 'MYR';
-  Amount = 0;
-  Name = '';
-  Description = '';
-  Remarks = '';
-
-  get PaymentId() {
-    return this._PaymentId;
-  }
-
-  private set PaymentId(id: string) {
-    this._PaymentId = id;
-  }
-
-  get PayForObjectId() {
-    return this._PayForObjectId;
-  }
-
-  private set PayForObjectId(id: string) {
-    this._PayForObjectId = id;
-  }
-
-  get PayForObjectType(): string {
-    return this._PayForObjectType;
-  }
-
-  private set PayForObjectType(type: string) {
-    this._PayForObjectType = type;
-  }
-
-  /* ObjectBase Implementation */
-  get ObjectId() {
-    return '';
-  }
-
-  get ObjectName() {
-    return '';
-  }
-
-  get TableName() {
-    return 'finance_PaymentItem';
-  }
-
-  constructor(payment: Payment, objectBeingPaidFor: ObjectBase) {
-    super();
-    this.PaymentId = payment.PaymentId;
-    this.PayForObjectId = objectBeingPaidFor.ObjectId;
-    this.PayForObjectType = type(objectBeingPaidFor);
-  }
-
-  async paid(dbTransaction: any) {
-    const sequelize = FinanceDb.getConnection();
-    if (this.PayForObjectType === 'Document') {
-      const query = `
-        UPDATE finance_Document
-        SET Status = 'Paid'
-        WHERE DocNo = '${this.PayForObjectId}'
-      `;
-      // const replacements = { docNo: this.PayForObjectId };
-      await sequelize.query(query, {
-        type: QueryTypes.UPDATE,
-        raw: true,
-        transaction: dbTransaction,
-      });
-    } else if (this.PayForObjectType === 'LoanSchedule') {
-      Next();
-    } else {
-      throw new Error('Unknown type');
-    }
-  }
-}
+import { ObjectBase } from '@tomei/general';
+import Payment from '../payment/payment';
+import type from '../helpers/typeof';
+import { QueryTypes } from 'sequelize';
+import { FinanceDb } from '../';
+import { Next } from '@nestjs/common/decorators';
+
+export default class PaymentItem extends ObjectBase {
+  private _PaymentId = '';
+  private _PayForObjectId = '';
+  private _PayForObjectType = '';
+  Currency = 'MYR';
+  Amount = 0;
+  Name = '';
+  Description = '';
+  Remarks = '';
+
+  get PaymentId() {
+    return this._PaymentId;
+  }
+
+  private set PaymentId(id: string) {
+    this._PaymentId = id;
+  }
+
+  get PayForObjectId() {
+    return this._PayForObjectId;
+  }
+
+  private set PayForObjectId(id: string) {
+    this._PayForObjectId = id;
+  }
+
+  get PayForObjectType(): string {
+    return this._PayForObjectType;
+  }
+
+  private set PayForObjectType(type: string) {
+    this._PayForObjectType = type;
+  }
+
+  /* ObjectBase Implementation */
+  get ObjectId() {
+    return '';
+  }
+
+  get ObjectName() {
+    return '';
+  }
+
+  get TableName() {
+    return 'finance_PaymentItem';
+  }
+
+  constructor(payment: Payment, objectBeingPaidFor: ObjectBase) {
+    super();
+    this.PaymentId = payment.PaymentId;
+    this.PayForObjectId = objectBeingPaidFor.ObjectId;
+    this.PayForObjectType = type(objectBeingPaidFor);
+  }
+
+  async paid(dbTransaction: any) {
+    const sequelize = FinanceDb.getConnection();
+    if (this.PayForObjectType === 'Document') {
+      const selectQuery = `SELECT Amount FROM finance_Document WHERE DocNo = ${this.PayForObjectId}`;
+      const invoice: any[] = await sequelize.query(selectQuery, {
+        type: QueryTypes.SELECT,
+        raw: true,
+        transaction: dbTransaction,
+      });
+
+      let paidStatus = '';
+      if (invoice[0].Amount > this.Amount) {
+        paidStatus = 'Partial Paid';
+      } else if (invoice[0].Amount === this.Amount) {
+        paidStatus = 'Paid';
+      } else {
+        throw new Error(
+          'Payment Item amount cannot be greater than its PayForObject amount.',
+        );
+      }
+
+      const updateQuery = `
+        UPDATE finance_Document
+        SET Status = '${paidStatus}'
+        WHERE DocNo = '${this.PayForObjectId}'
+      `;
+      // const replacements = { docNo: this.PayForObjectId };
+      await sequelize.query(updateQuery, {
+        type: QueryTypes.UPDATE,
+        raw: true,
+        transaction: dbTransaction,
+      });
+    } else if (
+      this.PayForObjectType === 'LoanSchedule' ||
+      this.PayForObjectType === 'SimpleLoans' ||
+      this.PayForObjectType === 'Loans'
+    ) {
+      Next();
+    } else {
+      throw new Error('Unknown type');
+    }
+  }
+}

package/src/payment-method/payment-method.repository.ts

@@ -1,11 +1,11 @@
-import { RepositoryBase, IRepositoryBase } from '@tomei/general';
-import PaymentMethodModel from '../models/payment-method.entity';
-
-export class PaymentMethodRepository
-  extends RepositoryBase<PaymentMethodModel>
-  implements IRepositoryBase<PaymentMethodModel>
-{
-  constructor() {
-    super(PaymentMethodModel);
-  }
-}
+import { RepositoryBase, IRepositoryBase } from '@tomei/general';
+import PaymentMethodModel from '../models/payment-method.entity';
+
+export class PaymentMethodRepository
+  extends RepositoryBase<PaymentMethodModel>
+  implements IRepositoryBase<PaymentMethodModel>
+{
+  constructor() {
+    super(PaymentMethodModel);
+  }
+}