Merging all changes in main branch of the last weeks into dev branch (#2444)

* fixed identities tab

* fix: Loan Product capitalized income form validation

* Loan account with Capitalized Income transaction

* fix: Use first API url from url list

* Loan Product with Capitalized Income GL accounting mappings

* fix: Loan Product capitalized income with Income Type

* Loan account details - income capitalization type

* fix: Loan Product Cash accounting view

* fix: Loan Id updated in Loan views after url changed

* fix: Charge management minimum and maximum cap values validation

* build(deps-dev): bump http-proxy-middleware from 2.0.7 to 2.0.9 (#2421)

Bumps [http-proxy-middleware](https://github.com/chimurai/http-proxy-middleware) from 2.0.7 to 2.0.9.
- [Release notes](https://github.com/chimurai/http-proxy-middleware/releases)
- [Changelog](https://github.com/chimurai/http-proxy-middleware/blob/v2.0.9/CHANGELOG.md)
- [Commits](chimurai/http-proxy-middleware@v2.0.7...v2.0.9)

---
updated-dependencies:
- dependency-name: http-proxy-middleware
  dependency-version: 2.0.9
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* docs: Improve contributing guidelines (#2440)

The CONTRIBUTING.md file has been updated to clarify that
we use the dev branch for development. In addition to
that, I have slightly shortened and restructured the text.

FIXES: WEB-165

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Craig-Rosario <[email protected]>
Co-authored-by: Jose Alberto Hernandez <[email protected]>
Co-authored-by: Jose Alberto Hernandez <[email protected]>
Co-authored-by: adam.magyari <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Author: 6 people

CONTRIBUTING.md

@@ -1,48 +1,52 @@
 # Getting Started
 
 - View the [README](./README.md) or [watch this video](https://youtu.be/OnxxC3K2oro) to get your development environment up and running.
-- Learn how to [format pull requests](#submitting-a-pull-request).
-- Read how to [rebase/merge upstream branches](#configuring-remotes).
-- Understand our [commit message conventions](./.github/COMMIT_MESSAGE.md).
-- Sign our [Mifos CLA](http://mifos.org/about-us/financial-legal/mifos-contributor-agreement/).
-- Follow our [code of conduct](https://mifos.org/resources/community/code-of-conduct/).
-- [Find a Jira ticket to work on](https://mifosforge.jira.com/browse/WEB) and start smashing!
-- [Ask a question on Slack](https://app.slack.com/client/T0F5GHE8Y/CJJGJLN10).
+- Sign the [Contribution License Agreement](http://mifos.org/about-us/financial-legal/mifos-contributor-agreement/).
+- Always follow the [code of conduct](https://mifos.org/resources/community/code-of-conduct/) - this is important to us. We are proud to be open, tolerant and providing a positive environment.
+- Introduce yourself or ask a question on the [#webapp channel on Slack](https://app.slack.com/client/T0F5GHE8Y/CJJGJLN10).
+- Find a [Jira](https://mifosforge.jira.com/browse/WEB) ticket to work on and start smashing!
+- Sign up to the [mailing list](https://sourceforge.net/projects/mifos/lists/mifos-developer).
 - Learn more at our [getting started guide](https://mifosforge.jira.com/wiki/spaces/RES/pages/464322561/New+Contributor+Getting+Started+Guide).
 - Have a look at our [Wiki](https://github.com/openMF/web-app/wiki).
 
-Please outline the change you wish to make via a Jira ticket _before_ you start contributing. And please do not create Jira tickets for general support questions, as we want to keep Jira for bug reports and feature requests. If you have got any questions, the quickest way to get an answer is to join the above Slack channel. You can also write an email on our [mailing list](https://sourceforge.net/projects/mifos/lists/mifos-developer). Mifos has quite a few active repositories, and each has its own Slack channel to direct questions to.
+Tips for working with the web app repository:
 
-Mifos is an inclusive community, committed to creating a safe, positive environment. Read the above Code of Conduct, and please follow it in all your interactions with the project.
+- Learn how to [format pull requests](#submitting-a-pull-request).
+- Read how to [rebase/merge upstream branches](#configuring-remotes).
+- Understand our [commit message conventions](./.github/COMMIT_MESSAGE.md).
 
-## Submitting or Requesting an Issue/Enhancement
+## Our processes
 
-### Best Practices for reporting or requesting for Issues/Enhancements:
+### Reporting or requesting Issues/Enhancements
 
-- Before you submit an issue, please search Jira. Maybe an issue for your problem already exists, and the discussion might inform you of workarounds readily available.
-- Include screenshots if any (specially for UI related issues).
+- Before you submit an issue in Jira, please browse existing issues or ask on Slack. Maybe an issue for your problem already exists, or the discussion might inform you of workarounds readily available.
+- Include screenshots if helpful (specially for UI related issues).
 - For UI enhancements include mockups to provide a clear idea to the reader.
 
-### Best Practices for getting assigned to work on an Issue/Enhancement:
+### Getting assigned and working on an Issue/Enhancement
 
-- If you would like to work on an issue, make sure it is not assigned to someone else.
-- If you don't work on a Jira ticket, please unassign yourself.
-- Please be sure that you are able to reproduce the issue, before working on it. If not, please ask for clarification by commenting or asking the issue creator.
+- Always outline the change you wish to make via a Jira ticket _before_ contributing.
+- Do not create Jira tickets for support questions. Jira is for bug reports and feature requests. (If you have questions, ask in the above Slack channel or write an email on the named mailing list.)
+- If you would like to work on a Jira issue, make sure it is not assigned to someone else. (We do not appreciate pull requests for issues that are assigned to someone else or do not refer to a Jira ticket.)
+- If you want to take over a ticket, ask the assignee in a comment (utilizing the "@" prefix), if you can. Wait 3 days, before you assign the ticket to yourself.
+- If you don't work on a Jira ticket, unassign yourself.
 
-**Note:** Please do not work on an issue which is assigned to someone else. We don't encourage creating multiple pull requests for the same issue. Also, please allow the assigned person at least 3 days to work on an issue. If there is no progress after this deadline, comment on the issue asking the contributor whether he/she is still working on it. Only if there is no reply after a couple of days, assign the ticket to you and work on it.
+## Jira
 
-### Jira ticket life cycle
+Our Jira tickets follow the following life cycle:
 
-- To Do: The issue is not prioritized yet. Make sure it make sense working on it by asking in Slack.
+- To Do: The issue is not prioritized yet. Make sure it makes sense working on it by asking in Slack.
 - On Deck: The issue can be worked on, but work hasn't been started. Often the issue has already someone assigned to it.
 - In Progress: The issue is being worked on.
 - In Review: There is a Pull Request on GitHub or the ticket is on hold, because someone needs to review made changes.
 - Done: The Pull Request got merged on GitHub.
 - Canceled: The ticket is unnecessary and for some reason (probably in the comments) work on it became unnecessary.
 
-## Submitting a Pull Request
+Updating the Jira ticket is the responsibility of the person working on it. Make in particular sure the Status field is up-to-date.
 
-### Best Practices to send Pull Requests:
+## Git and Github
+
+### Best Practices to send Pull Requests
 
 - Fork the [project](https://github.com/openMF/web-app) on GitHub
 - Clone the project locally into your system.
@@ -51,10 +55,10 @@ Mifos is an inclusive community, committed to creating a safe, positive environm
 git clone https://github.com/your-username/web-app.git
 ```
 
-- Make sure you are in the `main` branch.
+- We use the `main` branch for releases, hotfixes and special purposes. All regular work on releases flows into the `dev` branch.
 
 ```
-git checkout main
+git checkout dev
 ```
 
 - Create a new branch with a meaningful name before adding and committing your changes.
@@ -63,7 +67,7 @@ git checkout main
 git checkout -b branch-name
 ```
 
-- Add the files you changed. (avoid using `git add .`)
+- Add the files you changed. (Better don't use `git add .`)
 
 ```
 git add file-name
@@ -81,7 +85,7 @@ git commit
 git commit --amend
 ```
 
-- Squash multiple commits to a single commit. (example: squash last two commits done on this branch into one)
+- Squash multiple commits to a single commit. (Example: squash last two commits done on this branch into one.)
 
 ```
 git rebase --interactive HEAD~2
@@ -90,7 +94,7 @@ git rebase --interactive HEAD~2
 - Push this branch to your remote repository on GitHub.
 
 ```
-git push origin branch-name
+git push --set-upstream origin branch-name
 ```
 
 - If any of the squashed commits have already been pushed to your remote repository, you need to do a force push.
@@ -99,13 +103,13 @@ git push origin branch-name
 git push origin remote-branch-name --force
 ```
 
-- Follow the Pull request template and submit a pull request with a motive for your change and the method you used to achieve it to be merged with the `main` branch.
-- If you can, please submit the pull request with the fix or improvements including tests.
-- During review, if you are requested to make changes, rebase your branch and squash the multiple commits into one again. Once you push these changes, the pull request will edit automatically.
+- Follow the Pull request template and submit a pull request with a motive for your change and the method you used to achieve it to be merged with the `dev` branch.
+- If possible, please submit the pull request along with tests.
+- During review, if you are requested to make changes, rebase your branch and squash commits into one again. Once you push these changes, the pull request will edit automatically.
 
-## Configuring remotes
+### Configuring remotes
 
-When a repository is cloned, it has a default remote called `origin` that points to your fork on GitHub, not the original repository it was forked from. To keep track of the original repository, you should add another remote called `upstream`.
+When a repository is cloned, it has a default remote called `origin` that points to your fork on GitHub, not the original repository it was forked from. To keep track of the original repository, you can add another remote called `upstream`.
 
 1. Set the `upstream`.
 
@@ -122,18 +126,18 @@ git remote add upstream https://github.com/openMF/web-app.git
   > upstream  https://github.com/openMF/web-app.git (push)
 ```
 
-3. To update your local copy with remote changes, run the following: (This will give you an exact copy of the current remote. You should not have any local changes on your main branch, if you do, use rebase instead.)
+3. To update your local copy with remote changes, run the following: (This will give you an exact copy of the current remote. You should not have any local changes on your dev branch, if you do, use rebase instead.)
 
 ```
 git fetch upstream
-git checkout main
-git merge upstream/main
+git checkout dev
+git merge upstream/dev
 ```
 
-4. Push these merged changes to the main branch on your fork. Ensure to pull in upstream changes regularly to keep your forked repository up to date.
+4. Push these merged changes to the dev branch on your fork. (Ensure to pull in upstream changes regularly to keep your forked repository up to date. Or you use the "Sync fork" button on top of the Github page of your fork, followed by `git pull`.)
 
 ```
-git push origin main
+git push origin dev
 ```
 
 5. Switch to the branch you are using for some piece of work.
@@ -145,7 +149,7 @@ git checkout branch-name
 6. Rebase your branch, which means, take in all latest changes and replay your work in the branch on top of this - this produces cleaner versions/history.
 
 ```
-git rebase main
+git rebase dev
 ```
 
 7. Push the final changes when you're ready.
@@ -154,20 +158,20 @@ git rebase main
 git push origin branch-name
 ```
 
-## After your Pull Request is merged
+### After your Pull Request is merged
 
-After your pull request is merged, you can safely delete your branch and pull the changes from the main (upstream) repository.
+After your pull request is merged, you can safely delete your branch and pull the changes from the dev (upstream) repository.
 
 1. Delete the remote branch on GitHub.
 
 ```
 git push origin --delete branch-name
 ```
 
-2. Checkout the main branch.
+2. Checkout the dev branch.
 
 ```
-git checkout main
+git checkout dev
 ```
 
 3. Delete the local branch.
@@ -176,14 +180,14 @@ git checkout main
 git branch -D branch-name
 ```
 
-4. Update your main branch with the latest upstream version.
+4. Update your dev branch with the latest upstream version.
 
 ```
-git pull upstream main
+git pull upstream dev
 ```
 
-## Skipping a Travis CI Build
+### Skipping a Travis CI Build
 
 If running a build is not required for a particular commit (in some cases like an update to README.md), add [ci skip] or [skip ci] to the git commit message. Commits that have [ci skip] or [skip ci] anywhere in the commit messages are ignored by Travis CI.
 
-That's it! Thank you for your contribution!
+**_Thank you for contributing!_**

package-lock.json

@@ -92,7 +92,6 @@ export class GlAccountTreeService {
     // and rest as children to respective parent nodes.
     for (const glAccount of glAccountData) {
       if (glAccount.parentId === 0) {
-        console.log(glAccount.type.value);
         if (glAccount.type.value === 'ASSET') {
           glAccountTree[0].children[0].children.push(glAccounts[glAccount.id]);
         } else if (glAccount.type.value === 'EQUITY') {

src/app/accounting/chart-of-accounts/gl-account-tree.service.ts

@@ -46,7 +46,6 @@ export class EditFinancialActivityMappingComponent implements OnInit {
   ) {
     this.route.data.subscribe((data: { financialActivityAccountAndTemplate: any }) => {
       this.financialActivityAccountId = data.financialActivityAccountAndTemplate.id;
-      console.log(data.financialActivityAccountAndTemplate.financialActivityData);
       this.financialActivityId = data.financialActivityAccountAndTemplate.financialActivityData.id;
       this.glAccountId = data.financialActivityAccountAndTemplate.glAccountData.id;
       this.glAccountOptions = data.financialActivityAccountAndTemplate.glAccountOptions;

src/app/accounting/financial-activity-mappings/edit-financial-activity-mapping/edit-financial-activity-mapping.component.ts

@@ -1,17 +1,21 @@
 <div class="tab-container mat-typography">
-  <h3>{{ 'labels.heading.Identities' | translate }}</h3>
+  <div class="header-row" fxLayout="row" fxLayoutAlign="space-between">
+    <h3 class="mat-subheading-2">
+      {{ 'labels.heading.Identities' | translate }}
+    </h3>
 
-  <button
-    mat-raised-button
-    class="f-right"
-    color="primary"
-    (click)="addIdentifier()"
-    *mifosxHasPermission="'CREATE_CLIENTIDENTIFIER'"
-  >
-    <fa-icon icon="plus" class="m-r-10"></fa-icon> {{ 'labels.buttons.Add' | translate }}
-  </button>
+    <button
+      mat-raised-button
+      color="primary"
+      (click)="addIdentifier()"
+      *mifosxHasPermission="'CREATE_CLIENTIDENTIFIER'"
+    >
+      <fa-icon icon="plus" class="m-r-10"></fa-icon>
+      {{ 'labels.buttons.Add' | translate }}
+    </button>
+  </div>
 
-  <table mat-table #identifiersTable [dataSource]="clientIdentities">
+  <table mat-table #identifiersTable [dataSource]="clientIdentities" [ngStyle]="{ 'margin-top': '3%' }">
     <ng-container matColumnDef="id">
       <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Id' | translate }}</th>
       <td mat-cell *matCellDef="let identity">{{ identity.id }}</td>

src/app/clients/clients-view/identities-tab/identities-tab.component.html

@@ -3,7 +3,7 @@
   margin: 1%;
 
   h3 {
-    margin: 1% auto;
+    margin: 0;
   }
 
   table {

src/app/clients/clients-view/identities-tab/identities-tab.component.scss

@@ -41,7 +41,7 @@ export class Accounting {
         'ACCRUAL (UPFRONT)'
       ].includes(value)) {
       return 'Accrual (upfront)';
-    } else if (value === 'CASH BASED') {
+    } else if (value.startsWith('CASH')) {
       return 'Cash';
     } else if (value === 'NONE') {
       return 'NONE';

src/app/core/utils/accounting.ts

@@ -68,7 +68,6 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges
         depositPeriod: this.fixedDepositsAccountTemplate.depositPeriod,
         depositPeriodFrequencyId: this.fixedDepositsAccountTemplate.depositPeriodFrequency.id
       });
-      console.log(this.fixedDepositAccountTermsForm.value);
     }
   }
 

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts

@@ -31,8 +31,7 @@ export class LoanActionButtonResolver implements Resolve<Object> {
       return this.loansService.getLoanActionTemplate(loanId, 'repayment');
     } else if (loanActionButton === 'Goodwill Credit') {
       return this.loansService.getLoanActionTemplate(loanId, 'goodwillCredit');
-    }
-    if (loanActionButton === 'Interest Payment Waiver') {
+    } else if (loanActionButton === 'Interest Payment Waiver') {
       return this.loansService.getLoanActionTemplate(loanId, 'interestPaymentWaiver');
     } else if (loanActionButton === 'Payout Refund') {
       return this.loansService.getLoanActionTemplate(loanId, 'payoutRefund');
@@ -74,6 +73,8 @@ export class LoanActionButtonResolver implements Resolve<Object> {
       return this.loansService.getLoanForeclosureActionTemplate(loanId);
     } else if (loanActionButton === 'Charge-Off') {
       return this.loansService.getLoanActionTemplate(loanId, 'charge-off');
+    } else if (loanActionButton === 'Capitalized Income') {
+      return this.loansService.getLoanActionTemplate(loanId, 'capitalizedIncome');
     } else {
       return undefined;
     }

src/app/loans/common-resolvers/loan-action-button.resolver.ts

@@ -94,6 +94,11 @@ <h3>{{ 'labels.heading.Loan Details' | translate }}</h3>
       <span fxFlex="50%"> {{ loanDetails.capitalizedIncomeStrategy?.value | translateKey: 'catalogs' }} </span>
     </div>
 
+    <div fxFlexFill *ngIf="loanDetails.enableIncomeCapitalization">
+      <span fxFlex="50%"> {{ 'labels.inputs.Income capitalization type' | translate }}</span>
+      <span fxFlex="50%"> {{ loanDetails.capitalizedIncomeType?.value | translateKey: 'catalogs' }} </span>
+    </div>
+
     <div fxFlexFill>
       <span fxFlex="50%"> {{ 'labels.inputs.Grace: On Principal Payment' | translate }}</span>
       <span fxFlex="50%"> {{ loanDetails.graceOnPrincipalPayment }} </span>

src/app/loans/loans-view/account-details/account-details.component.html

@@ -6,7 +6,7 @@ import { ActivatedRoute } from '@angular/router';
   templateUrl: './datatable-tab.component.html',
   styleUrls: ['./datatable-tab.component.scss']
 })
-export class DatatableTabComponent {
+export class DatatableTabComponent implements OnInit {
   entityId: string;
   /** Loan Datatable */
   entityDatatable: any = null;
@@ -25,4 +25,10 @@ export class DatatableTabComponent {
       this.multiRowDatatableFlag = this.entityDatatable.columnHeaders[0].columnName === 'id' ? true : false;
     });
   }
+
+  ngOnInit() {
+    this.route.parent.parent.params.subscribe((params) => {
+      this.entityId = params['loanId'];
+    });
+  }
 }

src/app/loans/loans-view/datatable-tab/datatable-tab.component.ts

@@ -7,6 +7,7 @@
 <mifosx-foreclosure [dataObject]="actionButtonData" *ngIf="actions['Foreclosure']"></mifosx-foreclosure>
 <mifosx-prepay-loan [dataObject]="actionButtonData" *ngIf="actions['Prepay Loan']"></mifosx-prepay-loan>
 <mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Make Repayment']"></mifosx-make-repayment>
+<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Capitalized Income']"></mifosx-make-repayment>
 <mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Goodwill Credit']"></mifosx-make-repayment>
 <mifosx-make-repayment
   [dataObject]="actionButtonData"

src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html

@@ -51,6 +51,7 @@ export class LoanAccountActionsComponent {
     'Re-Amortize': boolean;
     'Interest Payment Waiver': boolean;
     'Add Interest Pause': boolean;
+    'Capitalized Income': boolean;
   } = {
     Close: false,
     'Undo Approval': false,
@@ -86,7 +87,8 @@ export class LoanAccountActionsComponent {
     'Re-Age': false,
     'Re-Amortize': false,
     'Interest Payment Waiver': false,
-    'Add Interest Pause': false
+    'Add Interest Pause': false,
+    'Capitalized Income': false
   };
 
   actionButtonData: any;

src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts

@@ -21,7 +21,7 @@
             </mat-error>
           </mat-form-field>
 
-          <div fxLayout="row wrap" class="content">
+          <div fxLayout="row wrap" class="content" *ngIf="showDetails()">
             <div fxFlex="50%" class="mat-body-strong">
               {{ 'Principal' | translate }}
             </div>