Merge pull request #1545 from josehernandezfintecheandomx/enhancement/loan_account_with_transaction_processing

Support for Loan Transaction Processing Strategy Code

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html

@@ -120,11 +120,6 @@
 
     <ng-container *ngIf="loansAccountTemplate?.isLoanProductLinkedToFloatingRate">
 
-      <!-- <mat-form-field fxFlex="48%">
-        <mat-label>Interest Rate Differential</mat-label>
-        <input matInput formControlName="interestRateDifferential">
-      </mat-form-field> -->
-
       <div fxFlex="48%" fxLayout="row wrap" fxLayoutGap="2%" fxLayout.lt-md="column">
 
         <mat-form-field fxFlex="48%">
@@ -185,13 +180,12 @@
 
     <mat-form-field fxFlex="48%">
       <mat-label>Repayment strategy</mat-label>
-      <mat-select required formControlName="transactionProcessingStrategyId">
-        <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyData"
-          [value]="transactionProcessingStrategy.id">
+      <mat-select formControlName="transactionProcessingStrategyCode">
+        <mat-option *ngFor="let transactionProcessingStrategy of transactionProcessingStrategyOptions" [value]="transactionProcessingStrategy.code">
           {{ transactionProcessingStrategy.name }}
         </mat-option>
       </mat-select>
-      <mat-error *ngIf="loansAccountTermsForm.controls.transactionProcessingStrategyId.hasError('required')">
+      <mat-error *ngIf="loansAccountTermsForm.controls.transactionProcessingStrategyCode.hasError('required')">
         Repayment Strategy is <strong>required</strong>
       </mat-error>
     </mat-form-field>

src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts

@@ -10,6 +10,7 @@ import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.componen
 import { DatepickerBase } from 'app/shared/form-dialog/formfield/model/datepicker-base';
 import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base';
 import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base';
+import { any } from 'cypress/types/bluebird';
 
 /**
  * Create Loans Account Terms Step
@@ -54,13 +55,13 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
   amortizationTypeData: any;
   /** Interest Calculation Period Type Data */
   interestCalculationPeriodTypeData: any;
-  /** Transaction Processing Strategy Data */
-  transactionProcessingStrategyData: any;
   /** Client Active Loan Data */
   clientActiveLoanData: any;
   /** Multi Disbursement Data */
   disbursementDataSource: {}[] = [];
   currencyDisplaySymbol = '$';
+  /** Loan Transaction strategies */
+  transactionProcessingStrategyOptions: any = [];
 
   /** Check if value of collateral added  is more than principal amount */
   isCollateralSufficient = false;
@@ -122,10 +123,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         'graceOnPrincipalPayment': this.loansAccountTermsData.graceOnPrincipalPayment,
         'graceOnInterestPayment': this.loansAccountTermsData.graceOnInterestPayment,
         'graceOnArrearsAgeing': this.loansAccountTermsData.graceOnArrearsAgeing,
-        'transactionProcessingStrategyId': this.loansAccountTermsData.transactionProcessingStrategyId,
         'graceOnInterestCharged': this.loansAccountTermsData.graceOnInterestCharged,
         'fixedEmiAmount': this.loansAccountTermsData.fixedEmiAmount,
-        'maxOutstandingLoanBalance': this.loansAccountTermsData.maxOutstandingLoanBalance
+        'maxOutstandingLoanBalance': this.loansAccountTermsData.maxOutstandingLoanBalance,
+        'transactionProcessingStrategyCode': this.loansAccountTermsData.transactionProcessingStrategyCode
       });
 
       this.multiDisburseLoan = this.loansAccountTermsData.multiDisburseLoan;
@@ -157,8 +158,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       if (!allowAttributeOverrides.inArrearsTolerance) {
         this.loansAccountTermsForm.controls.inArrearsTolerance.disable();
       }
-      if (!allowAttributeOverrides.transactionProcessingStrategyId) {
-        this.loansAccountTermsForm.controls.transactionProcessingStrategyId.disable();
+      if (!allowAttributeOverrides.transactionProcessingStrategyCode) {
+        this.loansAccountTermsForm.controls.transactionProcessingStrategyCode.disable();
       }
       if (!allowAttributeOverrides.graceOnPrincipalAndInterestPayment) {
         this.loansAccountTermsForm.controls.graceOnPrincipalPayment.disable();
@@ -204,10 +205,10 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
         'graceOnPrincipalPayment': this.loansAccountTermsData.graceOnPrincipalPayment,
         'graceOnInterestPayment': this.loansAccountTermsData.graceOnInterestPayment,
         'graceOnArrearsAgeing': this.loansAccountTermsData.graceOnArrearsAgeing,
-        'transactionProcessingStrategyId': this.loansAccountTermsData.transactionProcessingStrategyId,
         'graceOnInterestCharged': this.loansAccountTermsData.graceOnInterestCharged,
         'fixedEmiAmount': this.loansAccountTermsData.fixedEmiAmount,
-        'maxOutstandingLoanBalance': this.loansAccountTermsData.maxOutstandingLoanBalance
+        'maxOutstandingLoanBalance': this.loansAccountTermsData.maxOutstandingLoanBalance,
+        'transactionProcessingStrategyCode': this.loansAccountTermsData.transactionProcessingStrategyCode
       });
     }
     this.createloansAccountTermsForm();
@@ -261,14 +262,14 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
       'allowPartialPeriodInterestCalcualtion': [''],
       'inArrearsTolerance': [''],
       'graceOnInterestCharged': [''],
-      'transactionProcessingStrategyId': ['', Validators.required],
       'graceOnPrincipalPayment': [''],
       'graceOnInterestPayment': [''],
       'graceOnArrearsAgeing': [''],
       'loanIdToClose': [''],
       'fixedEmiAmount': [''],
       'isTopup': [''],
-      'maxOutstandingLoanBalance': ['']
+      'maxOutstandingLoanBalance': [''],
+      'transactionProcessingStrategyCode': ['', Validators.required]
     });
   }
 
@@ -404,8 +405,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges {
     this.interestTypeData = this.loansAccountProductTemplate.interestTypeOptions;
     this.amortizationTypeData = this.loansAccountProductTemplate.amortizationTypeOptions;
     this.interestCalculationPeriodTypeData = this.loansAccountProductTemplate.interestCalculationPeriodTypeOptions;
-    this.transactionProcessingStrategyData = this.loansAccountProductTemplate.transactionProcessingStrategyOptions;
     this.clientActiveLoanData = this.loansAccountProductTemplate.clientActiveLoanOptions;
+    this.transactionProcessingStrategyOptions = this.loansAccountProductTemplate.transactionProcessingStrategyOptions;
   }
 
   /**