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
index 5a23d94e3..4c7f4755a 100644
--- 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
@@ -28,4 +28,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts
index 0156d9c4f..7a0100d6b 100644
--- a/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.ts
@@ -45,7 +45,7 @@ export class LoanAccountActionsComponent {
'Undo Charge-Off': boolean,
'Sell Loan': boolean,
'Buy Back Loan': boolean,
- 'Re-Ageing': boolean
+ 'Re-Age': boolean
} = {
'Close': false,
'Undo Approval': false,
@@ -79,7 +79,7 @@ export class LoanAccountActionsComponent {
'Undo Charge-Off': false,
'Sell Loan': false,
'Buy Back Loan': false,
- 'Re-Ageing': false
+ 'Re-Age': false
};
actionButtonData: any;
diff --git a/src/app/loans/loans-view/loans-view.component.ts b/src/app/loans/loans-view/loans-view.component.ts
index a78d6093b..2d091bc86 100644
--- a/src/app/loans/loans-view/loans-view.component.ts
+++ b/src/app/loans/loans-view/loans-view.component.ts
@@ -174,10 +174,16 @@ export class LoansViewComponent implements OnInit {
// Allow Re-Ageing only when there is not any Re-Age transaction
if (!this.loanReAged) {
this.buttonConfig.addButton({
- name: 'Re-Ageing',
+ name: 'Re-Age',
icon: 'calendar',
taskPermissionName: 'REAGE_LOAN',
});
+ } else {
+ this.buttonConfig.addButton({
+ name: 'Undo Re-Age',
+ icon: 'undo',
+ taskPermissionName: 'UNDO_REAGE_LOAN',
+ });
}
}
}
@@ -197,6 +203,9 @@ export class LoansViewComponent implements OnInit {
const queryParams: any = { loanId: this.loanId, accountType: 'fromloans' };
this.router.navigate(['transfer-funds/make-account-transfer'], { relativeTo: this.route, queryParams: queryParams });
break;
+ case 'Undo Re-Age':
+ this.undoReAge();
+ break;
default:
this.router.navigate(['actions', button], { relativeTo: this.route });
break;
@@ -230,6 +239,21 @@ export class LoansViewComponent implements OnInit {
}
}
+ undoReAge(): void {
+ const undoTransactionAccountDialogRef = this.dialog.open(ConfirmationDialogComponent, {
+ data: { heading: this.translateService.instant('labels.heading.Undo Transaction'),
+ dialogContext: this.translateService.instant('labels.dialogContext.Are you sure you want undo the transaction type') + ' ReAge'
+ }
+ });
+ undoTransactionAccountDialogRef.afterClosed().subscribe((response: any) => {
+ if (response.confirm) {
+ this.loansService.executeLoansAccountTransactionsCommand(String(this.loanId), 'undoReAge', {}).subscribe(() => {
+ this.reload();
+ });
+ }
+ });
+ }
+
iconLoanStatusColor() {
if (this.loanDetailsData.chargedOff) {
return 'loanStatusType.chargeoff';
diff --git a/src/app/loans/models/loan-transaction-type.model.ts b/src/app/loans/models/loan-transaction-type.model.ts
index 8c4c4e52a..5f81cf998 100644
--- a/src/app/loans/models/loan-transaction-type.model.ts
+++ b/src/app/loans/models/loan-transaction-type.model.ts
@@ -1,31 +1,33 @@
export interface LoanTransactionType {
- id: number;
- code: string;
- value: string;
+ id: number;
+ code: string;
+ value: string;
- accrual: boolean;
- approveTransfer: boolean;
- chargeAdjustment: boolean;
- chargePayment: boolean;
- chargeRefund: boolean;
- chargeback: boolean;
- chargeoff: boolean;
- contra: boolean;
- creditBalanceRefund: boolean;
- disbursement: boolean;
- downPayment: boolean;
- goodwillCredit: boolean;
- initiateTransfer: boolean;
- merchantIssuedRefund: boolean;
- payoutRefund: boolean;
- recoveryRepayment: boolean;
- refund: boolean;
- refundForActiveLoans: boolean;
- rejectTransfer: boolean;
- repayment: boolean;
+ disbursement: boolean;
repaymentAtDisbursement: boolean;
- waiveCharges: boolean;
- waiveInterest: boolean;
- withdrawTransfer: boolean;
- writeOff: boolean;
+ repayment: boolean;
+ merchantIssuedRefund: boolean;
+ payoutRefund: boolean;
+ goodwillCredit: boolean;
+ chargeRefund: boolean;
+ contra: boolean;
+ waiveInterest: boolean;
+ waiveCharges: boolean;
+ accrual: boolean;
+ writeOff: boolean;
+ recoveryRepayment: boolean;
+ initiateTransfer: boolean;
+ approveTransfer: boolean;
+ withdrawTransfer: boolean;
+ rejectTransfer: boolean;
+ chargePayment: boolean;
+ refund: boolean;
+ refundForActiveLoans: boolean;
+ creditBalanceRefund: boolean;
+ chargeAdjustment: boolean;
+ chargeback: boolean;
+ chargeoff: boolean;
+ downPayment: boolean;
+ reAge: boolean;
+ reAmortize: boolean;
}
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index 0befa27da..6ebfbc24f 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Půjčka před výplatou",
"Products": "produkty",
"Profile": "Profil",
- "Re-Ageing": "Stárnutí",
+ "Re-Age": "Stárnutí",
"Recover From Guarantor": "Vymáhání od ručitele",
"Recovery Payment": "Platba obnovy",
"Reject": "Odmítnout",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Znovu aktivace",
"Undo Approval": "Zrušit schválení",
"Undo Disbursal": "Zrušit výplatu",
+ "Undo Re-Age": "Zrušit Stárnutí",
"User Management": "správa uživatelů",
"User Panel": "Uživatelský panel",
"Users": "Uživatelé",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index ec37f9ca9..4769d3369 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Darlehen mit Vorauszahlung",
"Products": "Produkte",
"Profile": "Profil",
- "Re-Ageing": "Altern",
+ "Re-Age": "Altern",
"Recover From Guarantor": "Rückforderung vom Bürgen",
"Recovery Payment": "Wiederherstellungszahlung",
"Reject": "Ablehnen",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Aktivierung rückgängig",
"Undo Approval": "Genehmigung rückgängig machen",
"Undo Disbursal": "Auszahlung rückgängig machen",
+ "Undo Re-Age": "Altern rückgängig machen",
"User Management": "Benutzerverwaltung",
"User Panel": "Benutzerbereich",
"Users": "Benutzer",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 861805aa2..e1bc7b66d 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -2144,7 +2144,7 @@
"Prepay Loan": "Prepay Loan",
"Products": "Products",
"Profile": "Profile",
- "Re-Ageing": "Re-Ageing",
+ "Re-Age": "Re-Age",
"Recover From Guarantor": "Recover From Guarantor",
"Recovery Payment": "Recovery Payment",
"Reject": "Reject",
@@ -2166,6 +2166,7 @@
"Undo Activation": "Undo Activation",
"Undo Approval": "Undo Approval",
"Undo Disbursal": "Undo Disbursal",
+ "Undo Re-Age": "Undo Re-Age",
"User Management": "User Management",
"User Panel": "User Panel",
"Users": "Users",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index 3db5bb157..946fd5d89 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Prepagar crédito",
"Products": "Productos",
"Profile": "Perfil",
- "Re-Ageing": "Envejecimiento",
+ "Re-Age": "Envejecimiento",
"Recover From Guarantor": "Recuperar del Garante",
"Recovery Payment": "Pago de recuperación",
"Reject": "Rechazar",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Deshacer la activación",
"Undo Approval": "Deshacer aprobación",
"Undo Disbursal": "Deshacer desembolso",
+ "Undo Re-Age": "Deshacer Envejecimiento",
"User Management": "Gestión de usuarios",
"User Panel": "Panel de usuario",
"Users": "Usuarios",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index edacaa0fb..a27f68fdc 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Prêt à remboursement anticipé",
"Products": "Des produits",
"Profile": "Profil",
- "Re-Ageing": "Vieillissement",
+ "Re-Age": "Vieillissement",
"Recover From Guarantor": "Récupération auprès du garant",
"Recovery Payment": "Paiement de récupération",
"Reject": "Rejeter",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Annuler l'activation",
"Undo Approval": "Annuler l'approbation",
"Undo Disbursal": "Annuler le décaissement",
+ "Undo Re-Age": "Annuler le Vieillissement",
"User Management": "Gestion des utilisateurs",
"User Panel": "Panneau utilisateur",
"Users": "Utilisateurs",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 7319dfa23..6bb8e8deb 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Prestito con pagamento anticipato",
"Products": "Prodotti",
"Profile": "Profilo",
- "Re-Ageing": "Invecchiamento",
+ "Re-Age": "Invecchiamento",
"Recover From Guarantor": "Recupero dal garante",
"Recovery Payment": "Pagamento di recupero",
"Reject": "Rifiutare",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Annullare l'attivazione",
"Undo Approval": "Annulla l'approvazione",
"Undo Disbursal": "Annullare l'esborso",
+ "Undo Re-Age": "Annullare l'invecchiamento",
"User Management": "Gestione utenti",
"User Panel": "Pannello Utente",
"Users": "Utenti",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index b0af570b7..ca50ac851 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -2146,7 +2146,7 @@
"Prepay Loan": "선불대출",
"Products": "제품",
"Profile": "프로필",
- "Re-Ageing": "노화",
+ "Re-Age": "노화",
"Recover From Guarantor": "보증인으로부터의 회복",
"Reject": "거부하다",
"Reports": "보고서",
@@ -2167,6 +2167,7 @@
"Undo Activation": "실행 취소 활성화",
"Undo Approval": "승인 취소",
"Undo Disbursal": "지급 취소",
+ "Undo Re-Age": "노화 취소",
"User Management": "사용자 관리",
"User Panel": "사용자 패널",
"Users": "사용자",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index b73655603..60256454a 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Išankstinio mokėjimo paskola",
"Products": "Produktai",
"Profile": "Profilis",
- "Re-Ageing": "Senėjimas",
+ "Re-Age": "Senėjimas",
"Recover From Guarantor": "Išieškojimas iš garanto",
"Recovery Payment": "Išieškojimo mokėjimas",
"Reject": "Atmesti",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Anuliuoti aktyvaciją",
"Undo Approval": "Anuliuoti patvirtinimą",
"Undo Disbursal": "Anuliuoti išmokėjimą",
+ "Undo Re-Age": "Anuliuoti senėjimas",
"User Management": "Vartotojo valdymas",
"User Panel": "Vartotojo skydelis",
"Users": "Vartotojai",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 4a04f7ac3..b31d26d5a 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Priekšapmaksas aizdevums",
"Products": "Produkti",
"Profile": "Profils",
- "Re-Ageing": "Novecošanās",
+ "Re-Age": "Novecošanās",
"Recover From Guarantor": "Atgūšana no galvotāja",
"Recovery Payment": "Atgūšanas maksājums",
"Reject": "Noraidīt",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Atsaukt aktivizēšanu",
"Undo Approval": "Atsaukt apstiprinājumu",
"Undo Disbursal": "Atsaukt izmaksu",
+ "Undo Re-Age": "Atsaukt novecošanās",
"User Management": "Lietotāju pārvaldība",
"User Panel": "Lietotāja panelis",
"Users": "Lietotāji",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index 2f10304b0..1b2ccc8ad 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "पूर्व भुक्तानी ऋण",
"Products": "उत्पादनहरू",
"Profile": "प्रोफाइल",
- "Re-Ageing": "बुढ्यौडो",
+ "Re-Age": "बुढ्यौडो",
"Recover From Guarantor": "ग्यारेन्टरबाट रिकभरी",
"Recovery Payment": "रिकभरी भुक्तानी",
"Reject": "अस्वीकार गर्नुहोस्",
@@ -2167,6 +2167,7 @@
"Undo Activation": "अन्डु सक्रियता",
"Undo Approval": "अनुमोदन अनडू गर्नुहोस्",
"Undo Disbursal": "वितरण पूर्ववत गर्नुहोस्",
+ "Undo Re-Age": "बुढ्यौडो अनडू",
"User Management": "प्रयोगकर्ता व्यवस्थापन",
"User Panel": "प्रयोगकर्ता प्यानल",
"Users": "प्रयोगकर्ताहरू",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index 1c1defc19..400768bb8 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Empréstimo pré-pago",
"Products": "Produtos",
"Profile": "Perfil",
- "Re-Ageing": "Envelhecimento",
+ "Re-Age": "Envelhecimento",
"Recover From Guarantor": "Recuperação do Fiador",
"Recovery Payment": "Pagamento de recuperação",
"Reject": "Rejeitar",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Desfazer ativação",
"Undo Approval": "Desfazer aprovação",
"Undo Disbursal": "Desfazer desembolso",
+ "Undo Re-Age": "Desfazer envelhecimento",
"User Management": "Gerenciamento de usuários",
"User Panel": "Painel do usuário",
"Users": "Usuários",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index e0779992e..85039267f 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -2145,7 +2145,7 @@
"Prepay Loan": "Lipa Mkopo",
"Products": "Bidhaa",
"Profile": "Wasifu",
- "Re-Ageing": "Kuzeeka",
+ "Re-Age": "Kuzeeka",
"Recover From Guarantor": "Urejeshaji Kutoka kwa Mdhamini",
"Recovery Payment": "Malipo ya uokoaji",
"Reject": "Kataa",
@@ -2167,6 +2167,7 @@
"Undo Activation": "Uanzishaji",
"Undo Approval": "Tendua Uidhinishaji",
"Undo Disbursal": "Tendua Utoaji",
+ "Undo Re-Age": "Tendua Kuzeeka",
"User Management": "Usimamizi wa Mtumiaji",
"User Panel": "Jopo la Mtumiaji",
"Users": "Watumiaji",