@tomei/finance 0.6.5 → 0.6.7

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

@@ -1,125 +1,125 @@
-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) {
-        const selectPaymentItem = `SELECT * FROM finance_PaymentItem WHERE PayForObjectId = '${this.PayForObjectId}' AND PayForObjectType = 'Document'`;
-        const documentPaymentItems: any[] = await sequelize.query(
-          selectPaymentItem,
-          {
-            type: QueryTypes.SELECT,
-            raw: true,
-            transaction: dbTransaction,
-          },
-        );
-        let amountPreviouslyPaid = 0;
-        documentPaymentItems.forEach((paymentItem) => {
-          const amount =
-            typeof paymentItem.Amount === 'string'
-              ? parseFloat(paymentItem.Amount).toFixed(2)
-              : paymentItem.Amount;
-          amountPreviouslyPaid += amount;
-        });
-        if (invoice[0].Amount === amountPreviouslyPaid) {
-          paidStatus = 'Paid';
-        } else {
-          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');
-    }
-  }
-}
+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) {
+        const selectPaymentItem = `SELECT * FROM finance_PaymentItem WHERE PayForObjectId = '${this.PayForObjectId}' AND PayForObjectType = 'Document'`;
+        const documentPaymentItems: any[] = await sequelize.query(
+          selectPaymentItem,
+          {
+            type: QueryTypes.SELECT,
+            raw: true,
+            transaction: dbTransaction,
+          },
+        );
+        let amountPreviouslyPaid = 0;
+        documentPaymentItems.forEach((paymentItem) => {
+          const amount =
+            typeof paymentItem.Amount === 'string'
+              ? parseFloat(paymentItem.Amount).toFixed(2)
+              : paymentItem.Amount;
+          amountPreviouslyPaid += amount;
+        });
+        if (invoice[0].Amount === amountPreviouslyPaid) {
+          paidStatus = 'Paid';
+        } else {
+          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);
+  }
+}

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

@@ -17,33 +17,49 @@ export default class PaymentMethod extends ObjectBase {
   private _DbTransaction: any;
   private _PaymentMethodTypes = [];
 
-  constructor(dbTransaction?: any, methodId?: string) {
+  constructor(
+    dbTransaction?: any,
+    methodId?: string,
+    companyId?: string,
+    name?: string,
+  ) {
     super();
     if (dbTransaction) {
       this._DbTransaction = dbTransaction;
     }
     if (methodId) {
       this.MethodId = methodId;
-      PaymentMethod._RepositoryBase
-        .findOne({
-          where: {
-            MethodId: methodId,
-          },
-          transaction: dbTransaction,
-        })
-        .then((methodData) => {
-          if (methodData) {
-            this.Name = methodData.Name;
-          } else {
-            throw new RecordNotFoundError(
-              'PaymentMethodErrMsg',
-              'No record found.',
-            );
-          }
-        })
-        .catch((err) => {
-          console.log('Payment method constructor err: ', err);
-        });
+    }
+    if (companyId) {
+      this.CompanyId = companyId;
+    }
+    if (name) {
+      this.Name = name;
+    }
+  }
+
+  static async initPaymentMethod(dbTransaction?: any, methodId?: string) {
+    if (methodId) {
+      const methodData = await PaymentMethod._RepositoryBase.findOne({
+        where: {
+          MethodId: methodId,
+        },
+        transaction: dbTransaction,
+      });
+
+      if (methodData) {
+        new PaymentMethod(
+          dbTransaction,
+          methodData.MethodId,
+          methodData.CompanyId,
+          methodData.Name,
+        );
+      } else {
+        throw new RecordNotFoundError(
+          'PaymentMethodErrMsg',
+          'No record found.',
+        );
+      }
     }
   }
 
@@ -102,10 +118,15 @@ export default class PaymentMethod extends ObjectBase {
    *
    * @returns {void}
    */
-  async newPaymentMethodType(payload: IPaymentMethodTypeAttr): Promise<any> {
+  async newPaymentMethodType(
+    payload: IPaymentMethodTypeAttr,
+    transaction?: any,
+  ): Promise<any> {
     try {
       const newPaymentMethodType =
-        await PaymentMethod._PaymentMethodTypeRepository.create(payload);
+        await PaymentMethod._PaymentMethodTypeRepository.create(payload, {
+          transaction: transaction,
+        });
 
       this._PaymentMethodTypes.push(newPaymentMethodType);
     } catch (err) {

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

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

package/src/test-document.ts

@@ -1,25 +1,25 @@
-export class TestDocument {
-  static test(classPath, className) {
-    // tslint:disable-next-line:no-console
-    console.log('inside test() #1');
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unused-vars,
-    const module = require(classPath);
-    // tslint:disable-next-line:no-console
-    console.log('inside test() #1: %o', module);
-    console.log(`module.${className}`);
-    // tslint:disable-next-line:no-eval
-    const classConstructor = eval(`module.${className}`);
-    // tslint:disable-next-line:no-console
-    console.log('inside test() #2: %o', classConstructor);
-
-    const docGen = new classConstructor('RECEIPT001');
-    // tslint:disable-next-line:no-console
-    console.log('inside test() #3');
-
-    docGen.generateReceipt();
-    // tslint:disable-next-line:no-console
-    console.log('inside test() #4');
-  }
-}
+export class TestDocument {
+  static test(classPath, className) {
+    // tslint:disable-next-line:no-console
+    console.log('inside test() #1');
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unused-vars,
+    const module = require(classPath);
+    // tslint:disable-next-line:no-console
+    console.log('inside test() #1: %o', module);
+    console.log(`module.${className}`);
+    // tslint:disable-next-line:no-eval
+    const classConstructor = eval(`module.${className}`);
+    // tslint:disable-next-line:no-console
+    console.log('inside test() #2: %o', classConstructor);
+
+    const docGen = new classConstructor('RECEIPT001');
+    // tslint:disable-next-line:no-console
+    console.log('inside test() #3');
+
+    docGen.generateReceipt();
+    // tslint:disable-next-line:no-console
+    console.log('inside test() #4');
+  }
+}

package/tsconfig.build.json

@@ -1,4 +1,4 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
-}
+{
+  "extends": "./tsconfig.json",
+  "exclude": ["node_modules", "test", "dist", "**/*spec.ts"]
+}

package/tsconfig.json

@@ -1,22 +1,22 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "declaration": true,
-    "removeComments": true,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "moduleResolution": "node",
-    "target": "es6",
-    "sourceMap": true,
-    "outDir": "./dist",
-    "baseUrl": "./",
-    "incremental": true,
-    "skipLibCheck": true,
-    "strictNullChecks": false,
-    "noImplicitAny": false,
-    "strictBindCallApply": false,
-    "forceConsistentCasingInFileNames": false,
-    "noFallthroughCasesInSwitch": false,
-  }
-}
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "declaration": true,
+    "removeComments": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "allowSyntheticDefaultImports": true,
+    "moduleResolution": "node",
+    "target": "es6",
+    "sourceMap": true,
+    "outDir": "./dist",
+    "baseUrl": "./",
+    "incremental": true,
+    "skipLibCheck": true,
+    "strictNullChecks": false,
+    "noImplicitAny": false,
+    "strictBindCallApply": false,
+    "forceConsistentCasingInFileNames": false,
+    "noFallthroughCasesInSwitch": false,
+  }
+}

package/tslint.json

@@ -1,18 +1,18 @@
-{
-  "defaultSeverity": "error",
-  "extends": ["tslint:recommended"],
-  "jsRules": {
-    "no-unused-expression": true
-  },
-  "rules": {
-    "quotemark": [true, "single"],
-    "member-access": [false],
-    "ordered-imports": [false],
-    "max-line-length": [true, 150],
-    "member-ordering": [false],
-    "interface-name": [false],
-    "arrow-parens": false,
-    "object-literal-sort-keys": false
-  },
-  "rulesDirectory": []
-}
+{
+  "defaultSeverity": "error",
+  "extends": ["tslint:recommended"],
+  "jsRules": {
+    "no-unused-expression": true
+  },
+  "rules": {
+    "quotemark": [true, "single"],
+    "member-access": [false],
+    "ordered-imports": [false],
+    "max-line-length": [true, 150],
+    "member-ordering": [false],
+    "interface-name": [false],
+    "arrow-parens": false,
+    "object-literal-sort-keys": false
+  },
+  "rulesDirectory": []
+}