@tomei/finance 0.3.7 → 0.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.3.7",
+  "version": "0.3.9",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {

package/src/customer/customer.ts

@@ -46,33 +46,35 @@ export default abstract class FinanceCustomerBase
   RepositoryBase: IRepositoryBase<any>;
 
   constructor(
-    custSystemRefId: string,
-    custSystemCode: string,
-    sFinanceCompanyId: string,
+    custSystemRefId?: string,
+    custSystemCode?: string,
+    sFinanceCompanyId?: string,
   ) {
     super();
-    const financeCustomerData =
-      FinanceCustomerBase._FinanceCustomerRepository.findOne({
-        where: {
-          CompanyId: sFinanceCompanyId,
-          CustSystemCode: custSystemCode,
-          CustSystemRefId: custSystemRefId,
-        },
-      });
-    if (financeCustomerData) {
-      this.CompanyId = sFinanceCompanyId;
-      this.CustSystemCode = custSystemCode;
-      this.CustSystemRefId = custSystemRefId;
-    } else {
-      const notFoundError = new RecordNotFoundError('No Record Found');
-      throw notFoundError;
+    if (custSystemRefId && custSystemCode && sFinanceCompanyId) {
+      const financeCustomerData =
+        FinanceCustomerBase._FinanceCustomerRepository.findOne({
+          where: {
+            CompanyId: sFinanceCompanyId,
+            CustSystemCode: custSystemCode,
+            CustSystemRefId: custSystemRefId,
+          },
+        });
+      if (financeCustomerData) {
+        this.CompanyId = sFinanceCompanyId;
+        this.CustSystemCode = custSystemCode;
+        this.CustSystemRefId = custSystemRefId;
+      } else {
+        const notFoundError = new RecordNotFoundError('No Record Found');
+        throw notFoundError;
+      }
     }
   }
 
   /*
    * Get the billing address for a person.
    **/
-  abstract getBillingAddress(): Promise<IAddress>;
+  abstract getBillingAddress(params: any): Promise<IAddress>;
 
   init(person: LoginUserBase) {
     this.FullName = person.FullName;
@@ -85,8 +87,12 @@ export default abstract class FinanceCustomerBase
 
   async save(
     customerId: string,
+    custSystemCode: string,
+    custSystemRefId: string,
     dbTransaction?: any,
   ): Promise<FinanceCustomerModel> {
+    this.CustSystemCode = custSystemCode;
+    this.CustSystemRefId = custSystemRefId;
     const data = await FinanceCustomerBase._FinanceCustomerRepository.create(
       {
         CustomerId: customerId,

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

@@ -39,7 +39,7 @@ export default class FinanceCompany extends ObjectBase {
   private static _FinanceCustomerRepository = new FinanceCustomerRepository();
   private static _LedgerTransactionRepository =
     new LedgerTransactionRepository();
-  AccountingSystem: IAccountSystem;
+  private _AccountingSystem: IAccountSystem;
 
   get CompSystemCode(): string {
     return this._CompSystemCode;
@@ -85,6 +85,14 @@ export default class FinanceCompany extends ObjectBase {
     return 'finance_Company';
   }
 
+  get AccountingSystem(): IAccountSystem {
+    return this._AccountingSystem;
+  }
+
+  set AccountingSystem(system: IAccountSystem) {
+    this._AccountingSystem = system;
+  }
+
   constructor(
     compSystemCode: string,
     compSystemRefId: string,
@@ -165,6 +173,7 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Retrieve and store the CompanyId from the result*/
       financeCompany.ObjectId = company.CompanyId;
+      financeCompany._CompanyId = company.CompanyId;
 
       /*Add the details into the hashtable*/
       const sKey = `${compSystemCode}-${compSystemRefId}-${accSystemCode}`;
@@ -249,11 +258,9 @@ export default class FinanceCompany extends ObjectBase {
       const financeCustomerData =
         await FinanceCompany._FinanceCustomerRepository.findOne({
           where: {
-            /*todo:verify SystemCode*/
-            // SystemCode: this.SystemCode,
-            AccSystemCode: this.AccSystemCode,
-            AccSystemCustomerId: custSystemCode,
-            CustomerRefId: custSystemRefId,
+            CompanyId: this._CompanyId,
+            CustSystemCode: custSystemCode,
+            CustSystemRefId: custSystemRefId,
           },
         });
 
@@ -266,7 +273,12 @@ export default class FinanceCompany extends ObjectBase {
         customer,
       });
 
-      const newCustomer = await customer.save(customerId, dbTransaction);
+      const newCustomer = await customer.save(
+        customerId,
+        custSystemCode,
+        custSystemRefId,
+        dbTransaction,
+      );
 
       const payload = {
         Action: 'Create',