@tomei/finance 0.3.28 → 0.3.30

package/src/ledger-transaction/interfaces/ledger-transaction-attr.interface.ts

@@ -1,6 +1,8 @@
+import { TransactionTypeOptions } from 'src/enum';
+
 export interface ILedgerTransactionAttr {
   TransactionId: string;
-  TransactionType: string;
+  TransactionType: TransactionTypeOptions;
   JournalEntryId: string;
   AccountNo: string;
   Date: Date;

package/src/ledger-transaction/ledger-transaction.ts

@@ -4,43 +4,44 @@ import { TransactionTypeOptions } from '../enum/transaction-type.enum';
 import { LedgerTransactionRepository } from './ledger-transaction.repository';
 
 export default class LedgerTransaction {
-  TransactionId: string;
-  JournalEntryId: string;
-  AccountNo: string;
-  Date: Date;
-  Name: string;
-  Description: string;
-  Currency: string;
-  DebitAmount: number;
-  CreditAmount: number;
-  RelatedObjectId: string;
-  RelatedObjectType: string;
+  TransactionId = 'New';
+  TransactionType = TransactionTypeOptions.DEBIT;
+  JournalEntryId = '';
+  AccountNo = '';
+  Date = new Date();
+  Name = '';
+  Description = '';
+  Currency = 'MYR';
+  DebitAmount = 0;
+  CreditAmount = 0;
+  RelatedObjectId = '';
+  RelatedObjectType = '';
 
-  TransactionType: string;
   private _DbTransaction: any;
 
   private static _LedgerTransactionRepository =
     new LedgerTransactionRepository();
 
   constructor(dbTransaction?: any, transactionId?: string) {
-    if(dbTransaction){
+    if (dbTransaction) {
       this._DbTransaction = dbTransaction;
     }
   }
 
   init(params?: ILedgerTransactionAttr) {
-    this.TransactionId = params.TransactionId;
-    this.TransactionType = params.TransactionType;
-    this.JournalEntryId = params.JournalEntryId;
-    this.AccountNo = params.AccountNo;
-    this.Date = params.Date;
-    this.Name = params.Name;
-    this.Description = params.Description;
-    this.Currency = params.Currency;
-    this.DebitAmount = params.DebitAmount;
-    this.CreditAmount = params.CreditAmount;
-    this.RelatedObjectId = params.RelatedObjectId;
-    this.RelatedObjectType = params.RelatedObjectType;
+    if (params.TransactionId) this.TransactionId = params.TransactionId;
+    if (params.TransactionType) this.TransactionType = params.TransactionType;
+    if (params.JournalEntryId) this.JournalEntryId = params.JournalEntryId;
+    if (params.AccountNo) this.AccountNo = params.AccountNo;
+    if (params.Date) this.Date = params.Date;
+    if (params.Name) this.Name = params.Name;
+    if (params.Description) this.Description = params.Description;
+    if (params.Currency) this.Currency = params.Currency;
+    if (params.DebitAmount) this.DebitAmount = params.DebitAmount;
+    if (params.CreditAmount) this.CreditAmount = params.CreditAmount;
+    if (params.RelatedObjectId) this.RelatedObjectId = params.RelatedObjectId;
+    if (params.RelatedObjectType)
+      this.RelatedObjectType = params.RelatedObjectType;
   }
 
   getData() {
@@ -61,7 +62,10 @@ export default class LedgerTransaction {
   }
 
   async create() {
-    return await  LedgerTransaction._LedgerTransactionRepository.create(this.getData, {transaction: this._DbTransaction});
+    return await LedgerTransaction._LedgerTransactionRepository.create(
+      this.getData,
+      { transaction: this._DbTransaction },
+    );
   }
 
   async newLedgerTransaction(
@@ -85,9 +89,9 @@ export default class LedgerTransaction {
     });
 
     if (transactionType === TransactionTypeOptions.DEBIT) {
-      this.TransactionType = 'Debit';
+      this.TransactionType = TransactionTypeOptions.DEBIT;
     } else if (transactionType === TransactionTypeOptions.CREDIT) {
-      this.TransactionType = 'Credit';
+      this.TransactionType = TransactionTypeOptions.CREDIT;
     }
 
     if (journalEntryId) {

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

@@ -1,6 +1,15 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { Column, DataType, HasMany, Model, Table } from 'sequelize-typescript';
+import {
+  ForeignKey,
+  BelongsTo,
+  Column,
+  DataType,
+  HasMany,
+  Model,
+  Table,
+} from 'sequelize-typescript';
 import PaymentMethodTypeModel from './payment-method-type.entity';
+import FinanceCompanyModel from './finance-company.entity';
 
 @Table({
   tableName: 'finance_PaymentMethod',
@@ -16,13 +25,27 @@ export default class PaymentMethodModel extends Model {
   })
   MethodId: string;
 
-  @ApiProperty({ example: 'Cash' })
+  @ApiProperty({ example: 'cash' })
   @Column({
     allowNull: false,
     type: DataType.STRING(100),
   })
   Name: string;
 
+  @ApiProperty({
+    example: 'EZC',
+    description: 'CompanyId',
+  })
+  @ForeignKey(() => FinanceCompanyModel)
+  @Column({
+    allowNull: false,
+    type: DataType.STRING(30),
+  })
+  CompanyId: string;
+
   @HasMany(() => PaymentMethodTypeModel)
   PaymentMethodType: PaymentMethodTypeModel[];
+
+  @BelongsTo(() => FinanceCompanyModel)
+  FinanceCompany: FinanceCompanyModel;
 }

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

@@ -1,4 +1,5 @@
 export interface IPaymentMethodAttr {
   MethodId: string;
   Name: string;
+  CompanyId: string;
 }

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

@@ -5,8 +5,8 @@ import { PaymentMethodTypeRepository } from '../payment-method-type/payment-meth
 
 export default class PaymentMethod extends ObjectBase {
   MethodId = 'New';
-  CompanyId = '';
   Name = '';
+  CompanyId = '';
 
   private static _RepositoryBase = new PaymentMethodRepository();
   private static _PaymentMethodTypeRepository =
@@ -87,10 +87,17 @@ export default class PaymentMethod extends ObjectBase {
     });
   }
 
-  get NewPaymentMethodType(): PaymentMethodType {
-    const newPaymentMethodType = new PaymentMethodType();
-    newPaymentMethodType.MethodId = this.MethodId;
-    this._PaymentMethodTypes.push(newPaymentMethodType);
-    return newPaymentMethodType;
+  async newPaymentMethodType(
+    paymentMethodTypePayload,
+  ): Promise<PaymentMethodType[]> {
+    const paymentMethodType = new PaymentMethodType();
+    await PaymentMethod._PaymentMethodTypeRepository.create({
+      ...paymentMethodTypePayload,
+      AccountNo: paymentMethodType.AccountNo,
+      ProcessingFeeRate: paymentMethodType.ProcessingFeeRate,
+      ProcessingFeeAccountNo: paymentMethodType.ProcessingFeeAccountNo,
+    });
+
+    return await this.PaymentMethodTypes;
   }
 }