From 539a7c2e23bfe9c1a0ead8a2ffcde8910daa8db5 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Mon, 25 Aug 2025 11:08:08 -0500 Subject: [PATCH] WEB-292: Backdated Interest modification (for progressive) on closed or overpaid loans --- README.md | 1 + docs/coding-guides/sass.md | 1 + e2e/testRigor/README.md | 6 ++++++ .../approve-loan/approve-loan.component.ts | 10 ++++------ .../disburse-to-savings-account.component.ts | 14 +++----------- .../disburse/disburse.component.ts | 14 +++----------- src/app/loans/loans-view/loans-view.component.html | 4 +++- src/app/loans/loans-view/loans-view.component.ts | 14 +++++++++++--- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index 578214be4..790070b28 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,7 @@ Mifos X Web App is a modern single-page application (SPA) built on top of the Mi Before installing the web app, you need to set up the Fineract backend server: 1. **Choose ONE of these backend options:** + - **Option A: Use existing remote server** - Use the sandbox (MariaDB) at https://sandbox.mifos.community ** System is restored every 6 hours ** - Use the demo (MariaDB) at https://demo.mifos.community diff --git a/docs/coding-guides/sass.md b/docs/coding-guides/sass.md index 6481176bd..cb2f869dc 100644 --- a/docs/coding-guides/sass.md +++ b/docs/coding-guides/sass.md @@ -47,6 +47,7 @@ Also keep in mind this general rules: ## Best practices - Use object-oriented CSS (OOCSS): + - Factorize common code in base class, and extend it, for example: ```scss diff --git a/e2e/testRigor/README.md b/e2e/testRigor/README.md index e3cc9009e..8635a0e33 100644 --- a/e2e/testRigor/README.md +++ b/e2e/testRigor/README.md @@ -11,14 +11,17 @@ This document provides step-by-step instructions for setting up test automation ## Creating an Account on testRigor 1. **Visit the testRigor website:** + - Go to [testRigor](https://www.testrigor.com/). 2. **Sign up for a new account:** + - Click on the "Sign Up" button on the top right corner. - Select the "Public Open Source" version. - Fill in the required details and follow the instructions to complete the registration. 3. **Verify your email and log in:** + - Check your email inbox for a verification email from testRigor. - Click on the verification link to activate your account. - Once your account is activated, log in. @@ -29,6 +32,7 @@ This document provides step-by-step instructions for setting up test automation ## Running Tests with the CLI 1. **Install testRigor CLI:** + - Ensure you have Node.js installed on your machine (version 18 or higher). - Install the testRigor CLI globally using npm: ```bash @@ -36,10 +40,12 @@ This document provides step-by-step instructions for setting up test automation ``` 2. **Obtain Required Parameters:** + - **Test Suite ID:** You can obtain the Test Suite ID in the URL of your test suite. If the URL is `https://app.testrigor.com/test-suites/12345`, then `12345` is your Test Suite ID. - **Auth Token:** You can obtain your token from the "CI/CD integration" section on testRigor. Look for "auth-token" and copy the value next to it, which will be in the format `########-####-####-####-############`. 3. **Set Parameters in `run_testrigor_tests.sh`:** + - Before running the tests, create a .env file on the testRigor directory and set the following variables to the parameters you obtained: - `MIFOS_TEST_SUITE_ID`: Set this variable to your Test Suite ID. - `MIFOS_AUTH_TOKEN`: Set this variable to your auth token. diff --git a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts index 9c6515511..a8fbf82e1 100644 --- a/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/approve-loan/approve-loan.component.ts @@ -1,7 +1,7 @@ /** Angular Imports. */ -import { Component, OnInit, Input } from '@angular/core'; -import { UntypedFormGroup, UntypedFormBuilder, Validators, FormControl, ReactiveFormsModule } from '@angular/forms'; -import { ActivatedRoute, Router, RouterLink } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; import { Dates } from 'app/core/utils/dates'; /** Custom Services. */ @@ -12,7 +12,6 @@ import { InputAmountComponent } from '../../../../shared/input-amount/input-amou import { CdkTextareaAutosize } from '@angular/cdk/text-field'; import { FormatNumberPipe } from '../../../../pipes/format-number.pipe'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; -import { MatIcon } from '@angular/material/icon'; /** * Approve Loan component. @@ -25,8 +24,7 @@ import { MatIcon } from '@angular/material/icon'; ...STANDALONE_SHARED_IMPORTS, InputAmountComponent, CdkTextareaAutosize, - FormatNumberPipe, - MatIcon + FormatNumberPipe ] }) export class ApproveLoanComponent implements OnInit { diff --git a/src/app/loans/loans-view/loan-account-actions/disburse-to-savings-account/disburse-to-savings-account.component.ts b/src/app/loans/loans-view/loan-account-actions/disburse-to-savings-account/disburse-to-savings-account.component.ts index 6c9e609dc..a58dc832a 100644 --- a/src/app/loans/loans-view/loan-account-actions/disburse-to-savings-account/disburse-to-savings-account.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/disburse-to-savings-account/disburse-to-savings-account.component.ts @@ -1,12 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; -import { - UntypedFormBuilder, - UntypedFormControl, - UntypedFormGroup, - Validators, - ReactiveFormsModule -} from '@angular/forms'; -import { ActivatedRoute, Router, RouterLink } from '@angular/router'; +import { UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; import { Dates } from 'app/core/utils/dates'; import { LoansService } from 'app/loans/loans.service'; import { SettingsService } from 'app/settings/settings.service'; @@ -15,7 +9,6 @@ import { InputAmountComponent } from '../../../../shared/input-amount/input-amou import { CdkTextareaAutosize } from '@angular/cdk/text-field'; import { FormatNumberPipe } from '../../../../pipes/format-number.pipe'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; -import { MatIcon } from '@angular/material/icon'; @Component({ selector: 'mifosx-disburse-to-savings-account', @@ -25,8 +18,7 @@ import { MatIcon } from '@angular/material/icon'; ...STANDALONE_SHARED_IMPORTS, InputAmountComponent, CdkTextareaAutosize, - FormatNumberPipe, - MatIcon + FormatNumberPipe ] }) export class DisburseToSavingsAccountComponent implements OnInit { diff --git a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts index ec0ddb3bd..068e822ae 100644 --- a/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts +++ b/src/app/loans/loans-view/loan-account-actions/disburse/disburse.component.ts @@ -1,13 +1,7 @@ /** Angular Imports */ import { Component, OnInit, Input } from '@angular/core'; -import { - UntypedFormGroup, - UntypedFormBuilder, - Validators, - UntypedFormControl, - ReactiveFormsModule -} from '@angular/forms'; -import { ActivatedRoute, Router, RouterLink } from '@angular/router'; +import { UntypedFormGroup, UntypedFormBuilder, Validators, UntypedFormControl } from '@angular/forms'; +import { ActivatedRoute, Router } from '@angular/router'; /** Custom Services */ import { LoansService } from 'app/loans/loans.service'; @@ -19,7 +13,6 @@ import { MatSlideToggle } from '@angular/material/slide-toggle'; import { CdkTextareaAutosize } from '@angular/cdk/text-field'; import { FormatNumberPipe } from '../../../../pipes/format-number.pipe'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; -import { MatIcon } from '@angular/material/icon'; /** * Disburse Loan Option @@ -33,8 +26,7 @@ import { MatIcon } from '@angular/material/icon'; InputAmountComponent, MatSlideToggle, CdkTextareaAutosize, - FormatNumberPipe, - MatIcon + FormatNumberPipe ] }) export class DisburseComponent implements OnInit { diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html index 70028750d..c531dbc73 100644 --- a/src/app/loans/loans-view/loans-view.component.html +++ b/src/app/loans/loans-view/loans-view.component.html @@ -307,7 +307,9 @@ {{ 'labels.inputs.Charges' | translate }} - +