FINERACT-2092: Payment Waiver - UI changes

openMF · Jun 17, 2024 · 123c2b7 · 123c2b7
1 parent 52da1f5
commit 123c2b7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 3 deletions.
diff --git a/src/app/loans/common-resolvers/loan-action-button.resolver.ts b/src/app/loans/common-resolvers/loan-action-button.resolver.ts
@@ -32,6 +32,8 @@ 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 === 'Payment Waiver') {
+      return this.loansService.getLoanActionTemplate(loanId, 'paymentWaiver');
     } else if (loanActionButton === 'Payout Refund') {
       return this.loansService.getLoanActionTemplate(loanId, 'payoutRefund');
     } else if (loanActionButton === 'Merchant Issued Refund') {

diff --git a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html
@@ -5,6 +5,7 @@
 <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['Goodwill Credit']"></mifosx-make-repayment>
+<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Payment Waiver']"></mifosx-make-repayment>
 <mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Payout Refund']"></mifosx-make-repayment>
 <mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Merchant Issued Refund']"></mifosx-make-repayment>
 <mifosx-loan-credit-balance-refund [dataObject]="actionButtonData" *ngIf="actions['Credit Balance Refund']"></mifosx-loan-credit-balance-refund>
@@ -29,4 +30,4 @@
 <mifosx-undo-command [actionName]="actionName" *ngIf="actions['Undo Charge-Off']"></mifosx-undo-command>
 <mifosx-asset-transfer-loan *ngIf="actions['Sell Loan'] || actions['Buy Back Loan']"></mifosx-asset-transfer-loan>
 <mifosx-loan-reaging [dataObject]="actionButtonData" *ngIf="actions['Re-Age']"></mifosx-loan-reaging>
-<mifosx-loan-reamortize [dataObject]="actionButtonData" *ngIf="actions['Re-Amortize']"></mifosx-loan-reamortize>
+<mifosx-loan-reamortize [dataObject]="actionButtonData" *ngIf="actions['Re-Amortize']"></mifosx-loan-reamortize>
diff --git a/src/app/loans/loans-view/loan-accounts-button-config.ts b/src/app/loans/loans-view/loan-accounts-button-config.ts
@@ -133,6 +133,11 @@ export class LoansAccountButtonConfiguration {
             icon: 'coins',
             taskPermissionName: 'CREATE_GOODWILL_TRANSACTION',
           },
+          {
+            name: 'Payment Waiver',
+            icon: 'coins',
+            taskPermissionName: 'CREATE_PAYMENTWAIVER_TRANSACTION',
+          },
           {
             name: 'Payout Refund',
             icon: 'coins',
@@ -200,6 +205,10 @@ export class LoansAccountButtonConfiguration {
             name: 'Goodwill Credit',
             taskPermissionName: 'CREATE_GOODWILL_TRANSACTION',
           },
+          {
+            name: 'Payment Waiver',
+            taskPermissionName: 'CREATE_PAYMENTWAIVER_TRANSACTION',
+          },
           {
             name: 'Payout Refund',
             taskPermissionName: 'CREATE_PAYOUT_REFUND',

diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
@@ -135,7 +135,7 @@ export class TransactionsTabComponent implements OnInit {
    * REAMORTIZE:30
    */
   showTransactions(transactionsData: LoanTransaction) {
-    if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28, 29, 30].includes(transactionsData.type.id)) {
+    if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28, 29, 30, 31].includes(transactionsData.type.id)) {
       this.router.navigate([transactionsData.id], { relativeTo: this.route });
     }
   }

diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
@@ -124,7 +124,7 @@ export class ViewTransactionComponent implements OnInit {
   }
 
   allowChargebackTransaction(transactionType: LoanTransactionType): boolean {
-    return (transactionType.repayment
+    return (transactionType.repayment || transactionType.paymentWaiver
       || transactionType.goodwillCredit || transactionType.payoutRefund
       || transactionType.merchantIssuedRefund || transactionType.downPayment);
   }

diff --git a/src/app/loans/models/loan-transaction-type.model.ts b/src/app/loans/models/loan-transaction-type.model.ts
@@ -9,6 +9,7 @@ export interface LoanTransactionType {
   merchantIssuedRefund:    boolean;
   payoutRefund:            boolean;
   goodwillCredit:          boolean;
+  paymentWaiver:           boolean;
   chargeRefund:            boolean;
   contra:                  boolean;
   waiveInterest:           boolean;

diff --git a/src/app/products/loan-products/models/loan-account.model.ts b/src/app/products/loan-products/models/loan-account.model.ts
@@ -36,6 +36,7 @@ export interface LoanTransactionType {
     merchantIssuedRefund:    boolean;
     payoutRefund:            boolean;
     goodwillCredit:          boolean;
+    paymentWaiver:           boolean;
     chargeRefund:            boolean;
     contra:                  boolean;
     waiveInterest:           boolean;

diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
@@ -2414,6 +2414,7 @@
             "Navigation": "Navigation",
             "Notifications": "Notifications",
             "Organization": "Organization",
+            "Payment Waiver": "Payment Waiver",
             "Payments": "Payments",
             "Payout Refund": "Payout Refund",
             "Post Interest": "Post Interest",