@tomei/finance 0.6.59 → 0.6.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.6.59",
+  "version": "0.6.60",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {
@@ -35,11 +35,11 @@
     "@nestjs/platform-express": ">=9.0.8",
     "@nestjs/sequelize": ">=9.0.0",
     "@nestjs/swagger": ">=6.1.4",
-    "@tomei/activity-history": "^0.2.7",
+    "@tomei/activity-history": "^0.2.11",
     "@tomei/config": "^0.3.6",
-    "@tomei/general": "^0.6.0",
-    "@tomei/media": ">=0.6.13",
-    "@tomei/sso": "^0.13.1",
+    "@tomei/general": "^0.10.6",
+    "@tomei/media": "^0.6.19",
+    "@tomei/sso": "^0.16.1",
     "axios": "^1.6.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",

package/src/customer/customer.ts

@@ -8,7 +8,6 @@ import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record
 import FinanceCustomerModel from '../models/customer.entity';
 import { AccountSystemEntity } from '../account-system-entity/account-system-entity';
 import { FinanceCustomerRepository } from './finance-customer.repository';
-import * as cuid from 'cuid';
 import Account from '../account/account';
 import { AccountRepository } from '../account/account.repository';
 import { type } from '../helpers/typeof';
@@ -227,7 +226,7 @@ export default abstract class FinanceCustomerBase
     const data = await FinanceCustomerBase._FinanceCustomerRepository.create(
       {
         CompanyId: this.CompanyId,
-        CustomerId: cuid(),
+        CustomerId: this.createId(),
         CustSystemCode: this.CustSystemCode,
         CustSystemRefId: this.CustSystemRefId,
         AccSystemRefId: this.AccSystemRefId,

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

@@ -1,5 +1,4 @@
 import axios from 'axios';
-import * as cuid from 'cuid';
 import {
   ClassError,
   HashTable,
@@ -325,7 +324,7 @@ export default class FinanceCompany extends ObjectBase {
       );
 
       const activity = new Activity();
-      activity.ActivityId = cuid();
+      activity.ActivityId = this.createId();
       activity.Action = ActionEnum.ADD;
       activity.Description = 'Add Finance Customer';
       activity.EntityType = 'FinanceCustomer';
@@ -612,7 +611,7 @@ export default class FinanceCompany extends ObjectBase {
       for (const documentItem of documentItems) {
         await FinanceCompany._DocumentItemRepository.create(
           {
-            DocumentItemId: cuid(),
+            DocumentItemId: this.createId(),
             DocNo: invoice.DocNo,
             Name: documentItem.Name,
             NameBM: documentItem.NameBM,
@@ -783,7 +782,7 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Set up the document type*/
       invoice.DocType = DocType.DEBIT_NOTE;
-      // invoice.DocNo = cuid();
+      // invoice.DocNo = this.createId();
 
       /*Saving the document and document items to the database*/
       await FinanceCompany._DocumentRepository.create(
@@ -822,7 +821,7 @@ export default class FinanceCompany extends ObjectBase {
       documentItems.forEach(async (documentItem) => {
         await FinanceCompany._DocumentItemRepository.create(
           {
-            DocumentItemId: cuid(),
+            DocumentItemId: this.createId(),
             DocNo: documentItem.DocNo,
             Name: documentItem.Name,
             NameBM: documentItem.NameBM,
@@ -1039,7 +1038,7 @@ export default class FinanceCompany extends ObjectBase {
       for (const docItem of documentItems) {
         await FinanceCompany._DocumentItemRepository.create(
           {
-            DocumentItemId: cuid(),
+            DocumentItemId: this.createId(),
             DocNo: docItem.DocNo,
             Name: docItem.Name,
             NameBM: docItem.NameBM,
@@ -1204,7 +1203,7 @@ export default class FinanceCompany extends ObjectBase {
       }
 
       /*Saving payment, payment items, and payment paid with details to the database*/
-      payment.PaymentId = cuid();
+      payment.PaymentId = this.createId();
       payment.PaymentType = PaymentType.PAYMENT_RECEIVED;
       payment.ReceivedBy = loginUser.ObjectId;
       payment.IssuedBy = loginUser.ObjectId;
@@ -1329,7 +1328,7 @@ export default class FinanceCompany extends ObjectBase {
         );
       }
 
-      payment.PaymentId = cuid();
+      payment.PaymentId = this.createId();
       payment.PaymentType = PaymentType.PAYOUT;
       payment.ReceivedBy = loginUser.ObjectId;
       payment.IssuedBy = loginUser.ObjectId;
@@ -1798,7 +1797,7 @@ export default class FinanceCompany extends ObjectBase {
       //Part 4: Saving Payment, Payment Items and Payment Paid with Details to the Database
 
       //Set below Payment attributes:
-      payment.PaymentId = cuid();
+      payment.PaymentId = this.createId();
       payment.PaymentType = PaymentType.PAYMENT_RECEIVED;
       payment.ReceivedBy = loginUser.ObjectId;
       payment.IssuedBy = loginUser.ObjectId;
@@ -2078,7 +2077,7 @@ export default class FinanceCompany extends ObjectBase {
           for (const receiptItem of receiptItems) {
             await FinanceCompany._DocumentItemRepository.create(
               {
-                DocumentItemId: cuid(),
+                DocumentItemId: this.createId(),
                 DocNo: receipt.DocNo,
                 Name: receiptItem.Name,
                 NameBM: receiptItem.NameBM,

package/src/journal-entry/journal-entry.ts

@@ -1,4 +1,4 @@
-import * as cuid from 'cuid';
+
 import { IJournalEntryAttr } from './interfaces/journal-entry-attr.interface';
 import { TransactionTypeOptions } from '../enum';
 import JournalEntryModel from '../models/journal-entry.entity';

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

@@ -1,11 +1,15 @@
-import * as cuid from 'cuid';
+
 import { ILedgerTransactionAttr } from './interfaces/ledger-transaction-attr.interface';
 import { TransactionTypeOptions } from '../enum/transaction-type.enum';
 import { LedgerTransactionRepository } from './ledger-transaction.repository';
 import LedgerTransactionModel from '../models/ledger-transaction.entity';
+import { ObjectBase } from '@tomei/general';
 
-export default class LedgerTransaction {
-  LedgerNo = 'New';
+export default class LedgerTransaction extends ObjectBase {
+  ObjectName: string;
+  TableName: string;
+  ObjectType = 'LedgerTransaction';
+  ObjectId = 'New';
   TransactionType = TransactionTypeOptions.DEBIT;
   JournalEntryId = '';
   AccountNo = '';
@@ -19,22 +23,26 @@ export default class LedgerTransaction {
   RelatedObjectType = '';
   RelatedDocNo = '';
   RelatedPaymentId = '';
-  private _ObjectType: 'LedgerTransaction';
+
+  get LedgerNo() {
+    return this.ObjectId;
+  }
+
+  set LedgerNo(id: string) {
+    this.ObjectId = id;
+  }
 
   private _DbTransaction: any;
 
   private static _LedgerTransactionRepository =
     new LedgerTransactionRepository();
 
-  get ObjectType() {
-    return this._ObjectType;
-  }
-
   constructor(
     transactionType: TransactionTypeOptions,
     dbTransaction?: any,
     LedgerNo?: string,
   ) {
+    super();
     this.TransactionType = transactionType;
     if (dbTransaction) {
       this._DbTransaction = dbTransaction;
@@ -143,7 +151,7 @@ export default class LedgerTransaction {
     journalEntryId?: string,
   ): Promise<any> {
     this.init({
-      LedgerNo: cuid(),
+      LedgerNo: this.createId(),
       TransactionType: transactionType,
       JournalEntryId: journalEntryId,
       // Name: journalEntry.Name,

package/src/payment/payment.ts

@@ -1,6 +1,6 @@
-import { ClassError, LoginUserBase, ObjectBase } from '@tomei/general';
+import { ObjectBase } from '@tomei/general';
 import { RecordNotFoundError } from '@tomei/general/dist/class/exceptions/record-not-found.error';
-import { PaymentType, TransactionTypeOptions } from '../enum';
+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';
@@ -145,7 +145,7 @@ export default class Payment extends AccountSystemEntity {
               ObjectName: this.ObjectName,
               TableName: this.TableName,
               ObjectType: this.ObjectType,
-            },
+            } as ObjectBase,
           );
           pi.PayForObjectType = paymentItem.PayForObjectType;
           pi.PayForObjectId = paymentItem.PayForObjectId;

package/src/tax/tax.ts

@@ -1,7 +1,10 @@
+import { ObjectBase } from '@tomei/general';
 import { ITaxAttr } from './interfaces/tax-attr.interface';
 
-export class Tax {
-  private _TaxCode = 'New';
+export class Tax extends ObjectBase {
+  ObjectName: string;
+  TableName: string;
+  ObjectId = 'New';
   private _Description: string;
   private _CompanyId: string;
   private _TaxRate = 0;
@@ -9,14 +12,21 @@ export class Tax {
   private _CreatedAt: Date;
   private _UpdatedById: string;
   private _UpdatedAt: Date;
-  private _ObjectType = 'Tax';
-  get ObjectType() {
-    return this._ObjectType;
+  ObjectType = 'Tax';
+
+  get TaxCode(): string {
+    return this.ObjectId;
+  }
+
+  set TaxCode(code: string) {
+    this.ObjectId = code;
   }
 
+
   constructor(taxAttr?: ITaxAttr) {
+    super();
     if (taxAttr) {
-      this._TaxCode = taxAttr.TaxCode;
+      this.TaxCode = taxAttr.TaxCode;
       this._Description = taxAttr.Description;
       this._CompanyId = taxAttr.CompanyId;
       this._TaxRate = taxAttr.TaxRate;
@@ -27,10 +37,6 @@ export class Tax {
     }
   }
 
-  get TaxCode(): string {
-    return this._TaxCode;
-  }
-
   get Description(): string {
     return this._Description;
   }