Merge pull request #2561 from mariiaKraievska/WEB-255/disable-automatic-interest-refund-calculation

WEB-255: Disable automatic Interest Refund calculation

Author: alberto-art3ch

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

@@ -118,6 +118,10 @@
             <mat-label> {{ 'labels.inputs.Note' | translate }}</mat-label>
             <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
           </mat-form-field>
+
+          <mat-checkbox formControlName="skipInterestRefund" *ngIf="showInterestRefundCheckbox()">
+            {{ 'labels.inputs.Skip Interest Refund Transaction Posting' | translate }}
+          </mat-checkbox>
         </div>
 
         <mat-card-actions class="layout-row align-center gap-5px responsive-column">

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

@@ -92,7 +92,8 @@ export class MakeRepaymentComponent implements OnInit {
       ],
       externalId: '',
       paymentTypeId: '',
-      note: ''
+      note: '',
+      skipInterestRefund: [false]
     });
 
     if (this.isCapitalizedIncome()) {
@@ -157,6 +158,11 @@ export class MakeRepaymentComponent implements OnInit {
     ].includes(this.command);
   }
 
+  showInterestRefundCheckbox(): boolean {
+    const code = this.dataObject?.type?.code?.toLowerCase() || '';
+    return code.includes('merchantissuedrefund') || code.includes('payoutrefund');
+  }
+
   /** Submits the repayment form */
   submit() {
     const repaymentLoanFormData = this.repaymentLoanForm.value;
@@ -166,12 +172,16 @@ export class MakeRepaymentComponent implements OnInit {
     if (repaymentLoanFormData.transactionDate instanceof Date) {
       repaymentLoanFormData.transactionDate = this.dateUtils.formatDate(prevTransactionDate, dateFormat);
     }
-    const data = {
+    const data: any = {
       ...repaymentLoanFormData,
       dateFormat,
       locale
     };
     data['transactionAmount'] = data['transactionAmount'] * 1;
+    if (repaymentLoanFormData.skipInterestRefund) {
+      data.interestRefundCalculation = false;
+    }
+    delete data.skipInterestRefund;
     this.loanService.submitLoanActionButton(this.loanId, data, this.command).subscribe((response: any) => {
       this.router.navigate(['../../transactions'], { relativeTo: this.route });
     });

src/app/standalone-shared.module.ts

@@ -12,6 +12,7 @@ import { MatSelect } from '@angular/material/select';
 import { MatOption } from '@angular/material/core';
 import { MatDatepickerInput, MatDatepickerToggle, MatDatepicker } from '@angular/material/datepicker';
 import { MatButton } from '@angular/material/button';
+import { MatCheckbox } from '@angular/material/checkbox';
 import { DateFormatPipe } from '@pipes/date-format.pipe';
 import { TranslatePipe as NgxTranslatePipe } from '@ngx-translate/core';
 import { TranslatePipe } from '@pipes/translate.pipe';
@@ -39,6 +40,7 @@ export const STANDALONE_SHARED_IMPORTS = [
   MatDatepickerToggle,
   MatDatepicker,
   MatButton,
+  MatCheckbox,
   DateFormatPipe,
   HasPermissionDirective,
 

src/assets/translations/cs-CS.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Typ příjmu z poplatku za odkup",
       "Buy down fees": "Poplatky za odkup",
       "Income from Buy down fees": "Příjmy z poplatků za odkup",
-      "Buy down fee Expense": "Náklady na poplatek za odkup"
+      "Buy down fee Expense": "Náklady na poplatek za odkup",
+      "Skip Interest Refund Transaction Posting": "Přeskočit zaúčtování vrácení úroků"
     },
     "links": {
       "Community": "Společenství",

src/assets/translations/de-DE.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Einnahmeart der Buy-Down-Gebühr",
       "Buy down fees": "Buy-Down-Gebühren",
       "Income from Buy down fees": "Einnahmen aus Buy-Down-Gebühren",
-      "Buy down fee Expense": "Aufwendungen aus Buy-Down-Gebühren"
+      "Buy down fee Expense": "Aufwendungen aus Buy-Down-Gebühren",
+      "Skip Interest Refund Transaction Posting": "Buchung der Zinsrückerstattung überspringen"
     },
     "links": {
       "Community": "Gemeinschaft",

src/assets/translations/en-US.json

@@ -2494,7 +2494,8 @@
       "Buy down fee income type": "Buy down fee income type",
       "Buy down fees": "Buy down fees",
       "Income from Buy down fees": "Income from Buy down fees",
-      "Buy down fee Expense": "Buy down fee Expense"
+      "Buy down fee Expense": "Buy down fee Expense",
+      "Skip Interest Refund Transaction Posting": "Skip Interest Refund Transaction Posting"
     },
     "links": {
       "Community": "Community",

src/assets/translations/es-CL.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Tipo de ingreso de comisión de compra anticipada",
       "Buy down fees": "Tarifas de compra anticipada",
       "Income from Buy down fees": "Ingresos por comisiones de compra inicial",
-      "Buy down fee Expense": "Gastos por comisiones de compra inicial"
+      "Buy down fee Expense": "Gastos por comisiones de compra inicial",
+      "Skip Interest Refund Transaction Posting": "Omitir el registro de la devolución de intereses"
     },
     "links": {
       "Community": "Comunidad",

src/assets/translations/es-MX.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Tipo de ingreso de comisión de compra anticipada",
       "Buy down fees": "Tarifas de compra anticipada",
       "Income from Buy down fees": "Ingresos por comisiones de compra inicial",
-      "Buy down fee Expense": "Gastos por comisiones de compra inicial"
+      "Buy down fee Expense": "Gastos por comisiones de compra inicial",
+      "Skip Interest Refund Transaction Posting": "Omitir el registro de la devolución de intereses"
     },
     "links": {
       "Community": "Comunidad",

src/assets/translations/fr-FR.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Type de revenu des frais de rachat",
       "Buy down fees": "Frais d'achat",
       "Income from Buy down fees": "Revenus des commissions de rachat",
-      "Buy down fee Expense": "Charges des commissions de rachat"
+      "Buy down fee Expense": "Charges des commissions de rachat",
+      "Skip Interest Refund Transaction Posting": "Ignorer la comptabilisation du remboursement des intérêts"
     },
     "links": {
       "Community": "Communauté",

src/assets/translations/it-IT.json

@@ -2487,7 +2487,8 @@
       "Buy down fee income type": "Tipo di ricavo da commissione di buy down",
       "Buy down fees": "Commissioni di acquisto",
       "Income from Buy down fees": "Proventi da commissioni di buy down",
-      "Buy down fee Expense": "Spese da commissioni di buy down"
+      "Buy down fee Expense": "Spese da commissioni di buy down",
+      "Skip Interest Refund Transaction Posting": "Salta la registrazione del rimborso degli interessi"
     },
     "links": {
       "Community": "Comunità",