@tomei/finance 0.4.0 → 0.4.1

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

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

package/src/document/document.repository.ts

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

package/src/document/interfaces/document-attr.interface.ts

@@ -1,28 +1,28 @@
-import { DocType, DocumentStatus } from '../../enum';
-
-export class IDocumentAttr {
-  DocNo: string;
-  DocType: DocType;
-  DocDate: Date;
-  CompanyId: string;
-  Currency: string;
-  Amount: number;
-  Description: string;
-  Status: DocumentStatus;
-  IssuedById: string;
-  IssuedToId: string;
-  IssuedToType: string;
-  RelatedObjectId?: string;
-  RelatedObjectType?: string;
-  CreatedById: string;
-  CreatedAt: Date;
-  UpdatedById?: string;
-  UpdatedAt?: Date;
-  DocPDFFileMediaId?: string;
-  DocHTMLFileMediaId?: string;
-  AccSystemRefId?: string;
-  PostedToAccSystemYN: string;
-  PostedById?: string;
-  PostedDateTime?: Date;
-  UseAccSystemDocYN: string;
-}
+import { DocType, DocumentStatus } from '../../enum';
+
+export class IDocumentAttr {
+  DocNo: string;
+  DocType: DocType;
+  DocDate: Date;
+  CompanyId: string;
+  Currency: string;
+  Amount: number;
+  Description: string;
+  Status: DocumentStatus;
+  IssuedById: string;
+  IssuedToId: string;
+  IssuedToType: string;
+  RelatedObjectId?: string;
+  RelatedObjectType?: string;
+  CreatedById: string;
+  CreatedAt: Date;
+  UpdatedById?: string;
+  UpdatedAt?: Date;
+  DocPDFFileMediaId?: string;
+  DocHTMLFileMediaId?: string;
+  AccSystemRefId?: string;
+  PostedToAccSystemYN: string;
+  PostedById?: string;
+  PostedDateTime?: Date;
+  UseAccSystemDocYN: string;
+}

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

@@ -1,22 +1,22 @@
-export class IDocumentItemAttr {
-  DocumentItemId: string;
-  DocNo: string;
-  Name: string;
-  NameBM: string;
-  Description?: string;
-  ItemId?: string;
-  ItemType?: string;
-  ItemSKU?: string;
-  ItemSerialNo?: string;
-  Currency: string;
-  UnitPrice?: number;
-  Quantity?: number;
-  QuantityUOM?: string;
-  Amount: number;
-  TaxCode?: string;
-  TaxAmount?: number;
-  TaxRate?: number;
-  TaxInclusiveYN?: string;
-  DtAccountNo?: string;
-  CtAccountNo?: string;
-}
+export class IDocumentItemAttr {
+  DocumentItemId: string;
+  DocNo: string;
+  Name: string;
+  NameBM: string;
+  Description?: string;
+  ItemId?: string;
+  ItemType?: string;
+  ItemSKU?: string;
+  ItemSerialNo?: string;
+  Currency: string;
+  UnitPrice?: number;
+  Quantity?: number;
+  QuantityUOM?: string;
+  Amount: number;
+  TaxCode?: string;
+  TaxAmount?: number;
+  TaxRate?: number;
+  TaxInclusiveYN?: string;
+  DtAccountNo?: string;
+  CtAccountNo?: string;
+}

package/src/document/interfaces/document-item.repository.interface.ts

@@ -1,4 +1,4 @@
-import { IRepositoryBase } from '@tomei/general';
-import DocumentItemModel from '../../models/document-item.entity';
-
-export type IDocumentItemRepository = IRepositoryBase<DocumentItemModel>;
+import { IRepositoryBase } from '@tomei/general';
+import DocumentItemModel from '../../models/document-item.entity';
+
+export type IDocumentItemRepository = IRepositoryBase<DocumentItemModel>;

package/src/enum/doc-type.enum.ts

@@ -1,8 +1,8 @@
-export enum DocType {
-  INVOICE = 'Invoice',
-  DEBIT_NOTE = 'Debit Note',
-  CREDIT_NOTE = 'Credit Note',
-  QUOTATION = 'Quotation',
-  PURCHASEORDER = 'Purchase Order',
-  RECEIPT = 'Receipt',
-}
+export enum DocType {
+  INVOICE = 'Invoice',
+  DEBIT_NOTE = 'Debit Note',
+  CREDIT_NOTE = 'Credit Note',
+  QUOTATION = 'Quotation',
+  PURCHASEORDER = 'Purchase Order',
+  RECEIPT = 'Receipt',
+}

package/src/enum/index.ts

@@ -1,17 +1,17 @@
-import { ClientScopes } from './quick-book-client-scopes.enum';
-import { PaymentType } from './payment-type.enum';
-import { PaymentMethod } from './payment-method.enum';
-import { TransactionTypeOptions } from './transaction-type.enum';
-import { DocType } from './doc-type.enum';
-import { DocumentStatus } from './document-status.enum';
-import { PaymentStatus } from './payment-status.enum';
-
-export {
-  ClientScopes,
-  PaymentType,
-  PaymentMethod,
-  TransactionTypeOptions,
-  DocType,
-  DocumentStatus,
-  PaymentStatus,
-};
+import { ClientScopes } from './quick-book-client-scopes.enum';
+import { PaymentType } from './payment-type.enum';
+import { PaymentMethod } from './payment-method.enum';
+import { TransactionTypeOptions } from './transaction-type.enum';
+import { DocType } from './doc-type.enum';
+import { DocumentStatus } from './document-status.enum';
+import { PaymentStatus } from './payment-status.enum';
+
+export {
+  ClientScopes,
+  PaymentType,
+  PaymentMethod,
+  TransactionTypeOptions,
+  DocType,
+  DocumentStatus,
+  PaymentStatus,
+};

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

@@ -1,3 +1,3 @@
-export enum PaymentMethod {
-  Cash = 'Cash', // example
-}
+export enum PaymentMethod {
+  Cash = 'Cash', // example
+}

package/src/enum/payment-type.enum.ts

@@ -1,4 +1,4 @@
-export enum PaymentType {
-  PAYMENT_RECEIVED = 'Payment Received',
-  PAYOUT = 'Payout',
-}
+export enum PaymentType {
+  PAYMENT_RECEIVED = 'Payment Received',
+  PAYOUT = 'Payout',
+}

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

@@ -1,11 +1,11 @@
-import { RepositoryBase, IRepositoryBase } from '@tomei/general';
-import FinanceCompanyModel from '../models/finance-company.entity';
-
-export class FinanceCompanyRepository
-  extends RepositoryBase<FinanceCompanyModel>
-  implements IRepositoryBase<FinanceCompanyModel>
-{
-  constructor() {
-    super(FinanceCompanyModel);
-  }
-}
+import { RepositoryBase, IRepositoryBase } from '@tomei/general';
+import FinanceCompanyModel from '../models/finance-company.entity';
+
+export class FinanceCompanyRepository
+  extends RepositoryBase<FinanceCompanyModel>
+  implements IRepositoryBase<FinanceCompanyModel>
+{
+  constructor() {
+    super(FinanceCompanyModel);
+  }
+}

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

@@ -680,6 +680,8 @@ export default class FinanceCompany extends ObjectBase {
         dt.Description = `${purpose}`;
         dt.Name = `${purpose}`;
         dt.RelatedDocNo = invoice.DocNo;
+        dt.RelatedObjectId = invoice.RelatedObjectId;
+        dt.RelatedObjectType = invoice.RelatedObjectType;
 
         const ct = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.CREDIT,
@@ -691,6 +693,8 @@ export default class FinanceCompany extends ObjectBase {
         ct.Description = customer.FullName;
         ct.Name = customer.FullName;
         ct.RelatedDocNo = invoice.DocNo;
+        ct.RelatedObjectId = invoice.RelatedObjectId;
+        ct.RelatedObjectType = invoice.RelatedObjectType;
 
         await this.postJournal(dbTransaction, journalEntry, loginUser);
       }
@@ -833,6 +837,7 @@ export default class FinanceCompany extends ObjectBase {
       const transactionDate = new Date();
       const htCreditAccountAmount = new HashTable();
       const htCreditAccountCurrency = new HashTable();
+      const htCreditAccountPurpose = new HashTable();
 
       documentItems.forEach((invoiceItem) => {
         if (!htCreditAccountAmount.exists(invoiceItem.CtAccountNo)) {
@@ -846,6 +851,8 @@ export default class FinanceCompany extends ObjectBase {
             invoiceItem.CtAccountNo,
             invoiceItem.Currency,
           );
+
+          htCreditAccountPurpose.add(invoiceItem.CtAccountNo, invoiceItem.Name);
         } else {
           //update the credit account amount
           const d = htCreditAccountAmount.get(invoiceItem.CtAccountNo);
@@ -858,19 +865,17 @@ export default class FinanceCompany extends ObjectBase {
 
       const savedItems = htCreditAccountAmount.list();
 
-      for (let i = 0; i < savedItems.length; i++) {
+      for (const item of savedItems) {
         const journalEntry = new JournalEntry(dbTransaction);
         //Temporary fix to successfully save journal entry in PostJournal
         journalEntry.init({
           CompanyId: this.CompanyId,
           Name: 'issue Invoice ' + invoice.DocNo,
         });
-        const account = await Account.initAccount(
-          dbTransaction,
-          savedItems[i].value[0],
-        );
-        const creditAmount = savedItems[i].value[1];
-        const currency = htCreditAccountCurrency.get(savedItems[i].value[0]);
+        // const account = await Account.initAccount(dbTransaction, item.value[0]);
+        const creditAmount = item.value[1];
+        const currency = htCreditAccountCurrency.get(item.value[0]);
+        const purpose = htCreditAccountPurpose.get(item.value[0]);
 
         const dt = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.DEBIT,
@@ -887,20 +892,24 @@ export default class FinanceCompany extends ObjectBase {
         dt.Currency = currency ? currency : 'MYR';
         dt.DebitAmount = creditAmount ? creditAmount : 0.0;
         dt.Date = transactionDate;
-        dt.Description = account.Name;
-        dt.Name = account.Name;
+        dt.Description = `${purpose}`;
+        dt.Name = `${purpose}`;
         dt.RelatedDocNo = invoice.DocNo;
+        dt.RelatedObjectId = invoice.RelatedObjectId;
+        dt.RelatedObjectType = invoice.RelatedObjectType;
 
         const ct = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.CREDIT,
         );
-        ct.AccountNo = savedItems[i].key;
+        ct.AccountNo = item.value[0];
         ct.Currency = currency ? currency : 'MYR';
         ct.CreditAmount = creditAmount ? creditAmount : 0.0;
         ct.Date = transactionDate;
-        ct.Description = account.Name;
-        ct.Name = account.Name;
+        ct.Description = customer.FullName;
+        ct.Name = customer.FullName;
         ct.RelatedDocNo = invoice.DocNo;
+        ct.RelatedObjectId = invoice.RelatedObjectId;
+        ct.RelatedObjectType = invoice.RelatedObjectType;
 
         await this.postJournal(dbTransaction, journalEntry, loginUser);
       }
@@ -1064,6 +1073,9 @@ export default class FinanceCompany extends ObjectBase {
       creditTransaction.Date = transactionDate;
       creditTransaction.Description = creditNote.DocNo;
       creditTransaction.Name = creditNote.DocNo;
+      creditTransaction.RelatedDocNo = creditNote.DocNo;
+      creditTransaction.RelatedObjectId = creditNote.RelatedObjectId;
+      creditTransaction.RelatedObjectType = creditNote.RelatedObjectType;
 
       for (const invoiceItem of documentItems) {
         const itemLedger = await journalEntry.newLedgerTransaction(
@@ -1075,6 +1087,7 @@ export default class FinanceCompany extends ObjectBase {
         itemLedger.Date = transactionDate;
         itemLedger.Description = invoiceItem.Description;
         itemLedger.Name = invoiceItem.Name;
+        itemLedger.RelatedDocNo = invoiceItem.DocNo;
       }
 
       this.postJournal(dbTransaction, journalEntry, loginUser);

package/src/helpers/typeof.ts

@@ -1,29 +1,29 @@
-export default function type(value: any): string {
-  if (value === null) {
-    return 'null';
-  }
-  const baseType = typeof value;
-
-  if (!['object', 'function'].includes(baseType)) {
-    return baseType;
-  }
-
-  const tag = value[Symbol.toStringTag];
-  if (typeof tag === 'string') {
-    return tag;
-  }
-
-  if (
-    baseType === 'function' &&
-    Function.prototype.toString.call(value).startsWith('class')
-  ) {
-    return Function.prototype.toString.call(value).split(' ')[1];
-  }
-
-  const className = value.constructor.name;
-  if (typeof className === 'string' && className !== '') {
-    return className;
-  }
-
-  return baseType;
-}
+export default function type(value: any): string {
+  if (value === null) {
+    return 'null';
+  }
+  const baseType = typeof value;
+
+  if (!['object', 'function'].includes(baseType)) {
+    return baseType;
+  }
+
+  const tag = value[Symbol.toStringTag];
+  if (typeof tag === 'string') {
+    return tag;
+  }
+
+  if (
+    baseType === 'function' &&
+    Function.prototype.toString.call(value).startsWith('class')
+  ) {
+    return Function.prototype.toString.call(value).split(' ')[1];
+  }
+
+  const className = value.constructor.name;
+  if (typeof className === 'string' && className !== '') {
+    return className;
+  }
+
+  return baseType;
+}

package/src/index.ts

@@ -1,30 +1,30 @@
-import Account from './account/account';
-import FinanceCompany from './finance-company/finance-company';
-import FinanceCustomerBase from './customer/customer';
-import Document from './document/document';
-import DocumentItem from './document/document-item';
-import JournalEntry from './journal-entry/journal-entry';
-import LedgerTransaction from './ledger-transaction/ledger-transaction';
-import Payment from './payment/payment';
-import PaymentItem from './payment-item/payment-item';
-import PaymentMethod from './payment-method/payment-method';
-import PaymentMethodType from './payment-method-type/payment-method-type';
-import PaymentPaidWith from './payment-paid-with/payment-paid-with';
-
-export {
-  FinanceCompany,
-  Account,
-  FinanceCustomerBase,
-  Document,
-  DocumentItem,
-  JournalEntry,
-  LedgerTransaction,
-  Payment,
-  PaymentItem,
-  PaymentMethod,
-  PaymentMethodType,
-  PaymentPaidWith,
-};
-export * as FinanceEnum from './enum';
-export * as FinanceInterfaces from './interfaces';
-export * as FinanceDb from './database';
+import Account from './account/account';
+import FinanceCompany from './finance-company/finance-company';
+import FinanceCustomerBase from './customer/customer';
+import Document from './document/document';
+import DocumentItem from './document/document-item';
+import JournalEntry from './journal-entry/journal-entry';
+import LedgerTransaction from './ledger-transaction/ledger-transaction';
+import Payment from './payment/payment';
+import PaymentItem from './payment-item/payment-item';
+import PaymentMethod from './payment-method/payment-method';
+import PaymentMethodType from './payment-method-type/payment-method-type';
+import PaymentPaidWith from './payment-paid-with/payment-paid-with';
+
+export {
+  FinanceCompany,
+  Account,
+  FinanceCustomerBase,
+  Document,
+  DocumentItem,
+  JournalEntry,
+  LedgerTransaction,
+  Payment,
+  PaymentItem,
+  PaymentMethod,
+  PaymentMethodType,
+  PaymentPaidWith,
+};
+export * as FinanceEnum from './enum';
+export * as FinanceInterfaces from './interfaces';
+export * as FinanceDb from './database';

package/src/interfaces/account-system.interface.ts

@@ -1,20 +1,20 @@
-import Payment from '../payment/payment';
-import FinanceCustomerBase from '../customer/customer';
-
-export interface IAccountSystem {
-  createAccount(payload: any): Promise<any>;
-  createInvoice(payload: any): Promise<any>;
-  createDebitNote(payload: any): Promise<any>;
-  createCreditNote(payload: any): Promise<any>;
-  postTransaction(payload: any): Promise<any>;
-  createCustomer(payload: any): Promise<any>;
-  makePayment(
-    customer: FinanceCustomerBase,
-    paymentInfo: Payment,
-  ): Promise<any>;
-  collectPayments(
-    customer: FinanceCustomerBase,
-    paymentInfo: Payment,
-  ): Promise<any>;
-  postJournalEntry(payload: any): Promise<any>;
-}
+import Payment from '../payment/payment';
+import FinanceCustomerBase from '../customer/customer';
+
+export interface IAccountSystem {
+  createAccount(payload: any): Promise<any>;
+  createInvoice(payload: any): Promise<any>;
+  createDebitNote(payload: any): Promise<any>;
+  createCreditNote(payload: any): Promise<any>;
+  postTransaction(payload: any): Promise<any>;
+  createCustomer(payload: any): Promise<any>;
+  makePayment(
+    customer: FinanceCustomerBase,
+    paymentInfo: Payment,
+  ): Promise<any>;
+  collectPayments(
+    customer: FinanceCustomerBase,
+    paymentInfo: Payment,
+  ): Promise<any>;
+  postJournalEntry(payload: any): Promise<any>;
+}

package/src/interfaces/index.ts

@@ -1,3 +1,3 @@
-import { IAccountSystem } from '../interfaces/account-system.interface';
-
-export { IAccountSystem };
+import { IAccountSystem } from '../interfaces/account-system.interface';
+
+export { IAccountSystem };