Merge branch 'upstream_master' into advancly

Author: Jose Alberto Hernandez

src/app/account-transfers/edit-standing-instructions/edit-standing-instructions.component.ts

@@ -39,7 +39,7 @@ export class EditStandingInstructionsComponent implements OnInit {
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
   /** Maximum date allowed. */
-  maxDate = new Date(2100,0,1);
+  maxDate = new Date(2100, 0, 1);
 
   /**
    * Retrieves the standing instructions template from `resolve`.

src/app/clients/clients-routing.module.ts

@@ -251,7 +251,7 @@ const routes: Routes = [
             loadChildren: () => import('../savings/savings.module').then(m => m.SavingsModule)
           },
           {
-            path: 'recurringdeposits',
+            path: 'recurring-deposits-accounts',
             loadChildren: () => import('../deposits/recurring-deposits/recurring-deposits.module').then(m => m.RecurringDepositsModule)
           },
           {

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

@@ -115,7 +115,7 @@ <h3 fxFlex="95%">
         <button mat-menu-item *mifosxHasPermission="'CREATE_SHAREACCOUNT'"
           [routerLink]="['shares-accounts', 'create']">{{"labels.buttons.New Share Account" | translate}}</button>
         <button mat-menu-item *mifosxHasPermission="'CREATE_RECURRINGDEPOSITACCOUNT'"
-          [routerLink]="['recurringdeposits', 'create-recurring-deposits-account']">{{"labels.buttons.New Recurring Deposit Account" | translate}}</button>
+          [routerLink]="['recurring-deposits-accounts', 'create-recurring-deposits-account']">{{"labels.buttons.New Recurring Deposit Account" | translate}}</button>
         <button mat-menu-item *mifosxHasPermission="'CREATE_FIXEDDEPOSITACCOUNT'"
           [routerLink]="['fixed-deposits-accounts', 'create']">{{"labels.buttons.New Fixed Deposits Account" | translate}}</button>
       </mat-menu>

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

@@ -476,20 +476,20 @@ <h3>{{"labels.heading.Recurring Deposit Accounts" | translate}}</h3>
       <td mat-cell class="center" *matCellDef="let element">
         <ng-container *ngIf="element.status.submittedAndPendingApproval">
           <button class="account-action-button" mat-raised-button *mifosxHasPermission="'APPROVE_SAVINGSACCOUNT'"
-          [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Approve']" color="primary">
+          [routerLink]="['../','recurring-deposits-accounts', element.id, 'actions', 'Approve']" color="primary">
             <i class="fa fa-check"></i>
           </button>
         </ng-container>
         <ng-container *ngIf="!element.status.submittedAndPendingApproval && !element.status.active">
           <button
             class="account-action-button" mat-raised-button color="primary" (click)="routeEdit($event)"
             *mifosxHasPermission="'APPROVALUNDO_SAVINGSACCOUNT'"
-            [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Undo Approval']">
+            [routerLink]="['../','recurring-deposits-accounts', element.id, 'actions', 'Undo Approval']">
             <i class="fa fa-undo"></i>
           </button>
           <button class="account-action-button" mat-raised-button color="primary" (click)="routeEdit($event)"
             *mifosxHasPermission="'ACTIVATE_SAVINGSACCOUNT'"
-            [routerLink]="['../','recurringdeposits', element.id, 'actions', 'Activate']">
+            [routerLink]="['../','recurring-deposits-accounts', element.id, 'actions', 'Activate']">
             <i class="fa fa-check-circle"></i>
           </button>
         </ng-container>
@@ -498,7 +498,7 @@ <h3>{{"labels.heading.Recurring Deposit Accounts" | translate}}</h3>
 
     <tr mat-header-row *matHeaderRowDef="openSavingsColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: openSavingsColumns;"
-      [routerLink]="['../', 'recurringdeposits', row.id, 'general']" class="select-row"></tr>
+      [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']" class="select-row"></tr>
 
   </table>
 
@@ -525,7 +525,7 @@ <h3>{{"labels.heading.Recurring Deposit Accounts" | translate}}</h3>
 
     <tr mat-header-row *matHeaderRowDef="closedSavingsColumns"></tr>
     <tr mat-row *matRowDef="let row; columns: closedSavingsColumns;"
-    [routerLink]="['../', 'recurringdeposits', row.id, 'general']" class="select-row"></tr>
+    [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']" class="select-row"></tr>
   </table>
 
   <!-- Shares overview Table -->

src/app/deposits/recurring-deposits/recurring-deposits-account-view/charges-tab/charges-tab.component.ts

@@ -211,7 +211,7 @@ export class ChargesTabComponent implements OnInit {
   private reload() {
     const clientId = this.recurringDepositsAccountData.clientId;
     const url: string = this.router.url;
-    this.router.navigateByUrl(`/clients/${clientId}/recurringdeposits`, { skipLocationChange: true })
+    this.router.navigateByUrl(`/clients/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 

src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html

@@ -37,6 +37,7 @@ <h4 class="table-headers">{{"labels.inputs.Account Details" | translate }}</h4>
         <tr>
         </tr>
         <tr>
+          <td>{{"labels.inputs.Deposit Frequency" | translate }}</td>
           <td><span>{{recurringDepositsAccountData.recurringFrequency}}
               &nbsp;{{recurringDepositsAccountData.recurringFrequencyType.value}}
             </span></td>

src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts

@@ -148,7 +148,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
   reload() {
     const clientId = this.recurringDepositsAccountData.clientId;
     const url: string = this.router.url;
-    this.router.navigateByUrl(`/clients/${clientId}/recurringdeposits`, { skipLocationChange: true })
+    this.router.navigateByUrl(`/clients/${clientId}/recurring-deposits-accounts`, { skipLocationChange: true })
       .then(() => this.router.navigate([url]));
   }
 

src/app/notifications/notifications-page/notifications-page.component.ts

@@ -33,7 +33,7 @@ export class NotificationsPageComponent implements OnInit {
     'center' : '/centers/',
     'shareAccount' : '/shares-accounts/',
     'fixedDeposit' : '/fixed-deposits-accounts/',
-    'recurringDepositAccount': '/recurringdeposits/',
+    'recurringDepositAccount': '/recurring-deposits-accounts/',
     'savingsAccount' : '/savings-accounts/',
     'shareProduct': '/products/share-products/',
     'loanProduct' : '/products/loan-products/'

src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html

@@ -356,6 +356,18 @@ <h3 class="mat-h3" fxFlexFill>Loan Schedule</h3>
     </span>
   </div>
 
+  <div fxFlexFill *ngIf="isAdvancedPaymentAllocation">
+    <span fxFlex="47%">Advanced Credit Allocation Transactions:</span>
+    <span  fxFlex="53%">
+      <mat-accordion>
+        <mifosx-view-advance-paymeny-allocation *ngFor="let creditAllocation of creditAllocations"
+          [creditAllocation]="creditAllocation"
+          [advancePaymentAllocationData]="advancePaymentAllocationData">
+        </mifosx-view-advance-paymeny-allocation>
+      </mat-accordion>
+    </span>
+  </div>
+
   <h3 class="mat-h3" fxFlexFill>Down Payments</h3>
 
   <mat-divider [inset]="true"></mat-divider>

src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnChanges, OnInit, SimpleChanges } from '@angular/core';
 import { DelinquencyBucket, LoanProduct } from '../../models/loan-product.model';
 import { AccountingMapping, Charge, ChargeToIncomeAccountMapping, GLAccount, PaymentChannelToFundSourceMapping, PaymentType, PaymentTypeOption } from '../../../../shared/models/general.model';
-import { AdvancePaymentAllocationData, PaymentAllocation } from '../../loan-product-stepper/loan-product-payment-strategy-step/payment-allocation-model';
+import { AdvancePaymentAllocationData, CreditAllocation, PaymentAllocation } from '../../loan-product-stepper/loan-product-payment-strategy-step/payment-allocation-model';
 import { LoanProducts } from '../../loan-products';
 import { CodeName, OptionData } from '../../../../shared/models/option-data.model';
 
@@ -17,6 +17,7 @@ export class LoanProductSummaryComponent implements OnInit, OnChanges {
   @Input() loanProductsTemplate: any | null;
   @Input() useDueForRepaymentsConfigurations: boolean;
   @Input() paymentAllocations: PaymentAllocation | null;
+  @Input() creditAllocations: CreditAllocation | null;
 
   variationsDisplayedColumns: string[] = ['valueConditionType', 'borrowerCycleNumber', 'minValue', 'defaultValue', 'maxValue'];
   chargesDisplayedColumns: string[] = ['name', 'chargeCalculationType', 'amount', 'chargeTimeType'];
@@ -185,15 +186,23 @@ export class LoanProductSummaryComponent implements OnInit, OnChanges {
     }
 
     if (this.loanProduct.advancedPaymentAllocationTransactionTypes) {
+      const advancedAllocationTransactionTypes: OptionData[] = this.loanProduct.advancedPaymentAllocationTransactionTypes
+        .concat(this.loanProduct.creditAllocationTransactionTypes);
+      const advancedPaymentAllocationTypes: OptionData[] = this.loanProduct.advancedPaymentAllocationTypes
+        .concat(this.loanProduct.creditAllocationAllocationTypes);
       this.advancePaymentAllocationData = {
-        transactionTypes: this.loanProduct.advancedPaymentAllocationTransactionTypes,
-        allocationTypes: this.loanProduct.advancedPaymentAllocationTypes,
+        transactionTypes: advancedAllocationTransactionTypes,
+        allocationTypes: advancedPaymentAllocationTypes,
         futureInstallmentAllocationRules: this.loanProduct.advancedPaymentAllocationFutureInstallmentAllocationRules
       };
     } else {
+      const advancedAllocationTransactionTypes: OptionData[] = this.loanProductsTemplate.advancedPaymentAllocationTransactionTypes
+        .concat(this.loanProductsTemplate.creditAllocationTransactionTypes);
+      const advancedPaymentAllocationTypes: OptionData[] = this.loanProductsTemplate.advancedPaymentAllocationTypes
+        .concat(this.loanProductsTemplate.creditAllocationAllocationTypes);
       this.advancePaymentAllocationData = {
-        transactionTypes: this.loanProductsTemplate.advancedPaymentAllocationTransactionTypes,
-        allocationTypes: this.loanProductsTemplate.advancedPaymentAllocationTypes,
+        transactionTypes: advancedAllocationTransactionTypes,
+        allocationTypes: advancedPaymentAllocationTypes,
         futureInstallmentAllocationRules: this.loanProductsTemplate.advancedPaymentAllocationFutureInstallmentAllocationRules
       };
     }

src/app/products/loan-products/create-loan-product/create-loan-product.component.html

@@ -65,9 +65,13 @@
 
       <mifosx-loan-product-payment-strategy-step
       [advancedPaymentAllocations]="advancedPaymentAllocations"
+      [advancedCreditAllocations]="advancedCreditAllocations"
       [advancedPaymentAllocationTransactionTypes]="loanProductsTemplate.advancedPaymentAllocationTransactionTypes"
       [paymentAllocationOrderDefault]="loanProductsTemplate.advancedPaymentAllocationTypes"
+      [advancedCreditAllocationTransactionTypes]="loanProductsTemplate.creditAllocationTransactionTypes"
+      [creditAllocationOrderDefault]="loanProductsTemplate.creditAllocationAllocationTypes"
       (setPaymentAllocation)="setPaymentAllocation($event)"
+      (setCreditAllocation)="setCreditAllocation($event)"
       >
       </mifosx-loan-product-payment-strategy-step>
 

src/app/products/loan-products/create-loan-product/create-loan-product.component.ts

@@ -35,7 +35,9 @@ export class CreateLoanProductComponent implements OnInit {
 
   isAdvancedPaymentStrategy = false;
   paymentAllocation: PaymentAllocation[] = [];
+  creditAllocation: PaymentAllocation[] = [];
   advancedPaymentAllocations: AdvancedPaymentAllocation[] = [];
+  advancedCreditAllocations: AdvancedPaymentAllocation[] = [];
 
    /**
     * @param {ActivatedRoute} route Activated Route.
@@ -90,6 +92,10 @@ export class CreateLoanProductComponent implements OnInit {
     this.paymentAllocation = paymentAllocation;
   }
 
+  setCreditAllocation(paymentAllocation: PaymentAllocation[]): void {
+    this.creditAllocation = paymentAllocation;
+  }
+
   get loanProductSettingsForm() {
     return this.loanProductSettingsStep.loanProductSettingsForm;
   }
@@ -119,6 +125,7 @@ export class CreateLoanProductComponent implements OnInit {
     };
     if (this.isAdvancedPaymentStrategy) {
       loanProduct['paymentAllocation'] = this.paymentAllocation;
+      loanProduct['creditAllocation'] = this.creditAllocation;
     }
     return loanProduct;
   }

src/app/products/loan-products/edit-loan-product/edit-loan-product.component.html

@@ -65,9 +65,13 @@
 
         <mifosx-loan-product-payment-strategy-step
           [advancedPaymentAllocations]="advancedPaymentAllocations"
+          [advancedCreditAllocations]="advancedCreditAllocations"
           [advancedPaymentAllocationTransactionTypes]="loanProductAndTemplate.advancedPaymentAllocationTransactionTypes"
           [paymentAllocationOrderDefault]="loanProductAndTemplate.advancedPaymentAllocationTypes"
+          [advancedCreditAllocationTransactionTypes]="loanProductAndTemplate.creditAllocationTransactionTypes"
+          [creditAllocationOrderDefault]="loanProductAndTemplate.creditAllocationAllocationTypes"
           (setPaymentAllocation)="setPaymentAllocation($event)"
+          (setCreditAllocation)="setCreditAllocation($event)"
         >
         </mifosx-loan-product-payment-strategy-step>
 

src/app/products/loan-products/edit-loan-product/edit-loan-product.component.ts

@@ -14,7 +14,7 @@ import { LoanProductAccountingStepComponent } from '../loan-product-stepper/loan
 import { ProductsService } from 'app/products/products.service';
 import { GlobalConfiguration } from 'app/system/configurations/global-configurations-tab/configuration.model';
 import { LoanProducts } from '../loan-products';
-import { AdvancedPaymentAllocation, AdvancedPaymentStrategy, PaymentAllocation, PaymentAllocationOrder, PaymentAllocationTransactionTypes } from '../loan-product-stepper/loan-product-payment-strategy-step/payment-allocation-model';
+import { AdvancedPaymentAllocation, AdvancedPaymentStrategy, CreditAllocation, PaymentAllocation, PaymentAllocationOrder, PaymentAllocationTransactionTypes } from '../loan-product-stepper/loan-product-payment-strategy-step/payment-allocation-model';
 
 @Component({
   selector: 'mifosx-edit-loan-product',
@@ -37,7 +37,9 @@ export class EditLoanProductComponent implements OnInit {
   isAdvancedPaymentStrategy = false;
   wasPaymentAllocationChanged = false;
   paymentAllocation: PaymentAllocation[] = [];
+  creditAllocation: CreditAllocation[] = [];
   advancedPaymentAllocations: AdvancedPaymentAllocation[] = [];
+  advancedCreditAllocations: AdvancedPaymentAllocation[] = [];
 
   /**
    * @param {ActivatedRoute} route Activated Route.
@@ -68,6 +70,7 @@ export class EditLoanProductComponent implements OnInit {
     this.advancePaymentStrategy(this.loanProductAndTemplate.transactionProcessingStrategyCode);
     if (this.isAdvancedPaymentStrategy) {
       this.paymentAllocation = this.loanProductAndTemplate.paymentAllocation;
+      this.creditAllocation = this.loanProductAndTemplate.creditAllocation;
     }
   }
 
@@ -93,13 +96,20 @@ export class EditLoanProductComponent implements OnInit {
 
   buildAdvancedPaymentAllocation(): void {
     this.advancedPaymentAllocations = this.advancedPaymentStrategy.buildAdvancedPaymentAllocationList(this.loanProductAndTemplate);
+    this.advancedCreditAllocations = this.advancedPaymentStrategy.buildAdvancedCreditAllocationList(this.loanProductAndTemplate);
+    console.log(this.advancedCreditAllocations);
   }
 
   setPaymentAllocation(paymentAllocation: PaymentAllocation[]): void {
     this.paymentAllocation = paymentAllocation;
     this.wasPaymentAllocationChanged = true;
   }
 
+  setCreditAllocation(creditAllocation: CreditAllocation[]): void {
+    this.creditAllocation = creditAllocation;
+    this.wasPaymentAllocationChanged = true;
+  }
+
   paymentAllocationChanged(value: boolean): void {
     this.wasPaymentAllocationChanged = value;
   }
@@ -138,8 +148,10 @@ export class EditLoanProductComponent implements OnInit {
     };
     // Default empty array
     loanProduct['paymentAllocation'] = [];
+    loanProduct['creditAllocation'] = [];
     if (this.isAdvancedPaymentStrategy) {
       loanProduct['paymentAllocation'] = this.paymentAllocation;
+      loanProduct['creditAllocation'] = this.creditAllocation;
     }
     return loanProduct;
   }

src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html

@@ -8,9 +8,9 @@ <h4 class="m-b-15 right" fxFlex="90%">You can drag and drop the rows to set a Pa
     </button>
   </div>
 
-  <div class="mat-elevation-z8 container m-t-15">
+  <div class="mat-elevation-z8 container m-t-15" *ngIf="paymentAllocationsData">
     <table mat-table [dataSource]="paymentAllocationsData" #table cdkDropList
-      [cdkDropListData]="paymentAllocationsData" (cdkDropListDropped)="dropTable($event)">
+      [cdkDropListData]="paymentAllocationsData" (cdkDropListDropped)="dropTable($event, false)">
 
       <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef> </th>
@@ -20,12 +20,12 @@ <h4 class="m-b-15 right" fxFlex="90%">You can drag and drop the rows to set a Pa
       </ng-container>
 
       <ng-container matColumnDef="order">
-        <th mat-header-cell *matHeaderCellDef> Order </th>
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Order' | translate }}</th>
         <td mat-cell *matCellDef="let paymentAllocation; let rowIndex = index"> {{ (rowIndex + 1) }} </td>
       </ng-container>
 
       <ng-container matColumnDef="paymentAllocation">
-        <th mat-header-cell *matHeaderCellDef> Payment Allocation </th>
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Payment Allocation' | translate }}</th>
         <td mat-cell *matCellDef="let paymentAllocation"> {{ paymentAllocation.value }} </td>
       </ng-container>
 
@@ -34,12 +34,38 @@ <h4 class="m-b-15 right" fxFlex="90%">You can drag and drop the rows to set a Pa
     </table>
   </div>
 
-  <mat-form-field fxFlex="33%" class="m-t-20">
-    <mat-label>Future Installment Allocation Rule</mat-label>
+  <div class="mat-elevation-z8 container m-t-15" *ngIf="creditAllocationsData">
+    <table mat-table [dataSource]="creditAllocationsData" #table cdkDropList
+      [cdkDropListData]="creditAllocationsData" (cdkDropListDropped)="dropTable($event, true)">
+
+      <ng-container matColumnDef="actions">
+        <th mat-header-cell *matHeaderCellDef> </th>
+        <td mat-cell *matCellDef="let creditAllocation">
+            <fa-icon icon="bars"></fa-icon>
+        </td>
+      </ng-container>
+
+      <ng-container matColumnDef="order">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Order' | translate }}</th>
+        <td mat-cell *matCellDef="let creditAllocation; let rowIndex = index"> {{ (rowIndex + 1) }} </td>
+      </ng-container>
+
+      <ng-container matColumnDef="paymentAllocation">
+        <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Payment Allocation' | translate }}</th>
+        <td mat-cell *matCellDef="let creditAllocation"> {{ creditAllocation.value }} </td>
+      </ng-container>
+
+      <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+      <tr mat-row cdkDrag [cdkDragData]="row" *matRowDef="let row; columns: displayedColumns;"></tr>
+    </table>
+  </div>
+
+  <mat-form-field fxFlex="33%" class="m-t-20" *ngIf="advancedPaymentAllocation && advancedPaymentAllocation.futureInstallmentAllocationRules">
+    <mat-label>{{ 'labels.inputs.Future Installment Allocation Rule' | translate }}</mat-label>
     <mat-select [formControl]="futureInstallmentAllocationRule">
       <mat-option *ngFor="let futureInstallmentAllocationRule of advancedPaymentAllocation.futureInstallmentAllocationRules"
         [value]="futureInstallmentAllocationRule.code">
-        {{ futureInstallmentAllocationRule.value | translate}}
+        {{ futureInstallmentAllocationRule.value | translate }}
       </mat-option>
     </mat-select>
   </mat-form-field>