diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
index 18eb4ffb9..2c22e4558 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.html
@@ -1,5 +1,5 @@
-
+
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
index 7a713283f..4eec2a8eb 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/recurring-deposits-account-actions.component.ts
@@ -12,6 +12,7 @@ export class RecurringDepositsAccountActionsComponent {
/** Flag object to store possible actions and render appropriate UI to the user */
actions: {
'Activate': boolean
+ 'Undo Activation': boolean
'Undo Approval': boolean
'Approve': boolean
'Reject': boolean
@@ -23,6 +24,7 @@ export class RecurringDepositsAccountActionsComponent {
'Withdrawal': boolean
} = {
'Activate': false,
+ 'Undo Activation': false,
'Undo Approval': false,
'Approve': false,
'Reject': false,
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.ts
index 9a31db2f2..b4b9af3c5 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-actions/undo-approval-recurring-deposits-account/undo-approval-recurring-deposits-account.component.ts
@@ -20,6 +20,9 @@ export class UndoApprovalRecurringDepositsAccountComponent implements OnInit {
undoApprovalRecurringDepositsAccountForm: UntypedFormGroup;
/** Recurring Deposits Account Id */
accountId: any;
+ /** Action to be Undo */
+ undoAction: string;
+ undoCommand: string;
/**
* @param {FormBuilder} formBuilder Form Builder
@@ -31,6 +34,11 @@ export class UndoApprovalRecurringDepositsAccountComponent implements OnInit {
private recurringDepositsService: RecurringDepositsService,
private route: ActivatedRoute,
private router: Router) {
+ this.undoCommand = 'undoapproval'; // Default command
+ this.undoAction = this.route.snapshot.params['name'];
+ if (this.undoAction === 'Undo Activation') {
+ this.undoCommand = 'undoactivate';
+ }
this.accountId = this.route.parent.snapshot.params['recurringDepositAccountId'];
}
@@ -58,9 +66,15 @@ export class UndoApprovalRecurringDepositsAccountComponent implements OnInit {
const data = {
...this.undoApprovalRecurringDepositsAccountForm.value,
};
- this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'undoapproval', data).subscribe(() => {
- this.router.navigate(['../../'], { relativeTo: this.route });
- });
+ if (this.undoAction === 'Undo Activation') {
+ this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, this.undoCommand, data).subscribe(() => {
+ this.router.navigate(['../../'], { relativeTo: this.route });
+ });
+ } else {
+ this.recurringDepositsService.executeRecurringDepositsAccountCommand(this.accountId, 'undoapproval', data).subscribe(() => {
+ this.router.navigate(['../../'], { relativeTo: this.route });
+ });
+ }
}
}
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html
index 2ab03c61a..44c2b2dc3 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.html
@@ -71,10 +71,7 @@
@@ -105,7 +102,7 @@
[active]="IRC.isActive">
{{"labels.inputs.Interest Rate Chart" | translate }}
-
+
{{"labels.inputs.Transactions" | translate }}
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
index 0760ea6a4..5dcf0f50a 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-account-view.component.ts
@@ -39,6 +39,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
isprematureAllowed: any;
entityType: string;
currency: Currency;
+ showTransactions = false;
/**
* Fetches recurringDeposits account data from `resolve`
* @param {ActivatedRoute} route Activated Route
@@ -64,6 +65,8 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
} else if (this.router.url.includes('centers')) {
this.entityType = 'Center';
}
+ const status: any = data.recurringDepositsAccountData.status;
+ this.showTransactions = (status.id >= 300);
});
}
@@ -156,6 +159,7 @@ export class RecurringDepositsAccountViewComponent implements OnInit {
doAction(name: string) {
switch (name) {
case 'Activate':
+ case 'Undo Activation':
case 'Approve':
case 'Reject':
case 'Undo Approval':
diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
index f9f2d6f2d..73ea7d235 100644
--- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
+++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/recurring-deposits-buttons.config.ts
@@ -44,6 +44,11 @@ export class RecurringDepositsButtonsConfiguration {
name: 'Calculate Interest',
icon: 'calculator',
taskPermissionName: 'CALCULATEINTEREST_RECURRINGDEPOSITACCOUNT'
+ },
+ {
+ name: 'Undo Activation',
+ icon: 'fa fa-undo',
+ taskPermissionName: 'UNDO_ACTIVATE_RECURRINGDEPOSITACCOUNT'
}
];
break;
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
index c4207981f..d8da231ff 100644
--- a/src/assets/translations/cs-CS.json
+++ b/src/assets/translations/cs-CS.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Typ rodiče",
"Parent officeData": "Data mateřské kanceláře",
"Password": "Heslo",
+ "Password never expires": "Heslo Nikdy nevyprší",
"Passwords": "Hesla",
"Passwords should be": "Hesla by měla být",
"Past Due Days": "Dny po splatnosti",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Vyberte příslušné kanceláře",
"Selected Products": "Vybrané produkty",
"Send": "Poslat",
+ "Send password to email address": "Odeslat heslo na e -mailovou adresu",
"Server": "Server",
"Server Key": "Klíč serveru",
"Settlement": "Vyrovnání",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Odblokujte účet",
"Unblock Deposit": "Odblokovat vklad",
"Unblock Withdrawal": "Odblokovat výběr",
+ "Undo Activation": "Znovu aktivace",
"Undo Approval": "Zrušit schválení",
"Undo Disbursal": "Zrušit výplatu",
"User Management": "správa uživatelů",
diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
index ab7f27455..d49ebc918 100644
--- a/src/assets/translations/de-DE.json
+++ b/src/assets/translations/de-DE.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Übergeordneter Typ",
"Parent officeData": "Daten des übergeordneten Büros",
"Password": "Passwort",
+ "Password never expires": "Passwort verfällt niemals",
"Passwords": "Passwörter",
"Passwords should be": "Passwörter sollten sein",
"Past Due Days": "Überfällige Tage",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Wählen Sie die entsprechenden Büros aus",
"Selected Products": "Ausgewählte Produkte",
"Send": "Schicken",
+ "Send password to email address": "Senden Sie Passwort an E -Mail -Adresse",
"Server": "Server",
"Server Key": "Serverschlüssel",
"Settlement": "Siedlung",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Konto entsperren",
"Unblock Deposit": "Entsperren Sie die Einzahlung",
"Unblock Withdrawal": "Entsperren Sie die Auszahlung",
+ "Undo Activation": "Aktivierung rückgängig",
"Undo Approval": "Genehmigung rückgängig machen",
"Undo Disbursal": "Auszahlung rückgängig machen",
"User Management": "Benutzerverwaltung",
diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
index 7e9ba2387..6616d885d 100644
--- a/src/assets/translations/en-US.json
+++ b/src/assets/translations/en-US.json
@@ -2151,6 +2151,7 @@
"Unblock Account": "Unblock Account",
"Unblock Deposit": "Unblock Deposit",
"Unblock Withdrawal": "Unblock Withdrawal",
+ "Undo Activation": "Undo Activation",
"Undo Approval": "Undo Approval",
"Undo Disbursal": "Undo Disbursal",
"User Management": "User Management",
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
index c8eb8034d..a1a7b4a82 100644
--- a/src/assets/translations/es-MX.json
+++ b/src/assets/translations/es-MX.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Tipo de padre",
"Parent officeData": "Oficina matrizDatos",
"Password": "Contraseña",
+ "Password never expires": "La contraseña nunca expira",
"Passwords": "Contraseñas",
"Passwords should be": "Las contraseñas deben ser",
"Past Due Days": "Días vencidos",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Seleccione las oficinas aplicables",
"Selected Products": "Productos seleccionados",
"Send": "Enviar",
+ "Send password to email address": "Enviar contraseña al correo electrónico",
"Server": "Servidor",
"Server Key": "Clave del servidor",
"Settlement": "Asentamiento",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Desbloquear cuenta",
"Unblock Deposit": "Desbloquear depósito",
"Unblock Withdrawal": "Desbloquear retiro",
+ "Undo Activation": "Deshacer la activación",
"Undo Approval": "Deshacer aprobación",
"Undo Disbursal": "Deshacer desembolso",
"User Management": "Gestión de usuarios",
diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
index 8f86f643f..4103af9b0 100644
--- a/src/assets/translations/fr-FR.json
+++ b/src/assets/translations/fr-FR.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Type de parent",
"Parent officeData": "Bureau parentDonnées",
"Password": "Mot de passe",
+ "Password never expires": "Le mot de passe n'expire jamais",
"Passwords": "Mots de passe",
"Passwords should be": "Les mots de passe doivent être",
"Past Due Days": "Jours en souffrance",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Sélectionnez les bureaux concernés",
"Selected Products": "Produits sélectionnés",
"Send": "Envoyer",
+ "Send password to email address": "Envoyer un mot de passe à l'adresse e-mail",
"Server": "Serveur",
"Server Key": "Clé du serveur",
"Settlement": "Règlement",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Débloquer le compte",
"Unblock Deposit": "Débloquer le dépôt",
"Unblock Withdrawal": "Débloquer le retrait",
+ "Undo Activation": "Annuler l'activation",
"Undo Approval": "Annuler l'approbation",
"Undo Disbursal": "Annuler le décaissement",
"User Management": "Gestion des utilisateurs",
diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
index 85bb1d80d..6df4778b0 100644
--- a/src/assets/translations/it-IT.json
+++ b/src/assets/translations/it-IT.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Tipo genitore",
"Parent officeData": "Dati della sede principale",
"Password": "Parola d'ordine",
+ "Password never expires": "La password non ha scadenza",
"Passwords": "Le password",
"Passwords should be": "Le password dovrebbero essere",
"Past Due Days": "Giorni scaduti",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Seleziona gli uffici applicabili",
"Selected Products": "Prodotti selezionati",
"Send": "Inviare",
+ "Send password to email address": "Invia password all'indirizzo e -mail",
"Server": "server",
"Server Key": "Chiave del server",
"Settlement": "Insediamento",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Sblocca conto",
"Unblock Deposit": "Sblocca deposito",
"Unblock Withdrawal": "Sblocca il ritiro",
+ "Undo Activation": "Annullare l'attivazione",
"Undo Approval": "Annulla l'approvazione",
"Undo Disbursal": "Annullare l'esborso",
"User Management": "Gestione utenti",
diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
index 0bb9f9afe..3b22b6026 100644
--- a/src/assets/translations/ko-KO.json
+++ b/src/assets/translations/ko-KO.json
@@ -1662,6 +1662,7 @@
"Parent Type": "상위 유형",
"Parent officeData": "본사데이터",
"Password": "비밀번호",
+ "Password never expires": "암호는 만료되지 않습니다",
"Passwords": "비밀번호",
"Passwords should be": "비밀번호는 다음과 같아야 합니다.",
"Past Due Days": "연체일",
@@ -1850,6 +1851,7 @@
"Select applicable offices": "해당 사무소를 선택하세요",
"Selected Products": "선택된 제품",
"Send": "보내다",
+ "Send password to email address": "이메일 주소로 비밀번호를 보냅니다",
"Server": "섬기는 사람",
"Server Key": "서버 키",
"Settlement": "합의",
@@ -2150,6 +2152,7 @@
"Unblock Account": "계정 차단 해제",
"Unblock Deposit": "입금 차단 해제",
"Unblock Withdrawal": "출금 차단 해제",
+ "Undo Activation": "실행 취소 활성화",
"Undo Approval": "승인 취소",
"Undo Disbursal": "지급 취소",
"User Management": "사용자 관리",
diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
index c0bb16bc0..438b604db 100644
--- a/src/assets/translations/lt-LT.json
+++ b/src/assets/translations/lt-LT.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Tėvų tipas",
"Parent officeData": "Tėvų biurasDuomenys",
"Password": "Slaptažodis",
+ "Password never expires": "Slaptažodis niekada nesibaigia",
"Passwords": "Slaptažodžiai",
"Passwords should be": "Slaptažodžiai turėtų būti",
"Past Due Days": "Praėjusios termino dienos",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Pasirinkite atitinkamus biurus",
"Selected Products": "Atrinkti produktai",
"Send": "Siųsti",
+ "Send password to email address": "Siųsti slaptažodį į el. Pašto adresą",
"Server": "Serveris",
"Server Key": "Serverio raktas",
"Settlement": "Atsiskaitymas",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Atblokuoti paskyrą",
"Unblock Deposit": "Atblokuoti indėlį",
"Unblock Withdrawal": "Atblokuoti išėmimą",
+ "Undo Activation": "Anuliuoti aktyvaciją",
"Undo Approval": "Anuliuoti patvirtinimą",
"Undo Disbursal": "Anuliuoti išmokėjimą",
"User Management": "Vartotojo valdymas",
diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
index 786c46aca..4579bb91b 100644
--- a/src/assets/translations/lv-LV.json
+++ b/src/assets/translations/lv-LV.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Vecāku veids",
"Parent officeData": "Vecāku birojsDati",
"Password": "Parole",
+ "Password never expires": "Parole nekad nav derīga",
"Passwords": "Paroles",
"Passwords should be": "Parolēm jābūt",
"Past Due Days": "Pagājušās dienas",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Izvēlieties atbilstošos birojus",
"Selected Products": "Izvēlētie produkti",
"Send": "Sūtīt",
+ "Send password to email address": "Nosūtiet paroli uz e -pasta adresi",
"Server": "Serveris",
"Server Key": "Servera atslēga",
"Settlement": "Norēķins",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Atbloķēt kontu",
"Unblock Deposit": "Atbloķēt depozītu",
"Unblock Withdrawal": "Atbloķēt izņemšanu",
+ "Undo Activation": "Atsaukt aktivizēšanu",
"Undo Approval": "Atsaukt apstiprinājumu",
"Undo Disbursal": "Atsaukt izmaksu",
"User Management": "Lietotāju pārvaldība",
diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
index e5301be9c..6e46ea8a5 100644
--- a/src/assets/translations/ne-NE.json
+++ b/src/assets/translations/ne-NE.json
@@ -1661,6 +1661,7 @@
"Parent Type": "अभिभावक प्रकार",
"Parent officeData": "अभिभावक कार्यालय डाटा",
"Password": "पासवर्ड",
+ "Password never expires": "पासवर्ड कहिले समाप्त हुँदैन",
"Passwords": "पासवर्डहरू",
"Passwords should be": "पासवर्ड हुनुपर्छ",
"Past Due Days": "विगतका दिनहरू",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "लागू हुने कार्यालयहरू छान्नुहोस्",
"Selected Products": "चयन गरिएका उत्पादनहरू",
"Send": "पठाउनुहोस्",
+ "Send password to email address": "ईमेल ठेगानामा पासवर्ड पठाउनुहोस्",
"Server": "सर्भर",
"Server Key": "सर्भर कुञ्जी",
"Settlement": "बस्ती",
@@ -2150,6 +2152,7 @@
"Unblock Account": "खाता अनब्लक गर्नुहोस्",
"Unblock Deposit": "निक्षेप अनब्लक गर्नुहोस्",
"Unblock Withdrawal": "निकासी अनब्लक गर्नुहोस्",
+ "Undo Activation": "अन्डु सक्रियता",
"Undo Approval": "अनुमोदन अनडू गर्नुहोस्",
"Undo Disbursal": "वितरण पूर्ववत गर्नुहोस्",
"User Management": "प्रयोगकर्ता व्यवस्थापन",
diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
index c3dc0d10a..16e0ea188 100644
--- a/src/assets/translations/pt-PT.json
+++ b/src/assets/translations/pt-PT.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Tipo pai",
"Parent officeData": "Dados da matriz",
"Password": "Senha",
+ "Password never expires": "A senha nunca expira",
"Passwords": "Senhas",
"Passwords should be": "As senhas devem ser",
"Past Due Days": "Dias vencidos",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Selecione os escritórios aplicáveis",
"Selected Products": "Produtos Selecionados",
"Send": "Enviar",
+ "Send password to email address": "Envie a senha para o endereço de e -mail",
"Server": "Servidor",
"Server Key": "Chave do servidor",
"Settlement": "Povoado",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Desbloquear conta",
"Unblock Deposit": "Desbloquear depósito",
"Unblock Withdrawal": "Desbloquear retirada",
+ "Undo Activation": "Desfazer ativação",
"Undo Approval": "Desfazer aprovação",
"Undo Disbursal": "Desfazer desembolso",
"User Management": "Gerenciamento de usuários",
diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
index fab5ca509..1e46a8587 100644
--- a/src/assets/translations/sw-SW.json
+++ b/src/assets/translations/sw-SW.json
@@ -1661,6 +1661,7 @@
"Parent Type": "Aina ya Mzazi",
"Parent officeData": "Ofisi ya mzaziData",
"Password": "Nenosiri",
+ "Password never expires": "Nenosiri halijamalizika",
"Passwords": "Nywila",
"Passwords should be": "Nywila zinapaswa kuwa",
"Past Due Days": "Siku Zilizopita",
@@ -1849,6 +1850,7 @@
"Select applicable offices": "Chagua ofisi zinazotumika",
"Selected Products": "Bidhaa Zilizochaguliwa",
"Send": "Tuma",
+ "Send password to email address": "Tuma nywila kwa anwani ya barua pepe",
"Server": "Seva",
"Server Key": "Ufunguo wa Seva",
"Settlement": "Suluhu",
@@ -2150,6 +2152,7 @@
"Unblock Account": "Fungua Akaunti",
"Unblock Deposit": "Ondoa kizuizi cha Amana",
"Unblock Withdrawal": "Ondoa kizuizi cha Uondoaji",
+ "Undo Activation": "Uanzishaji",
"Undo Approval": "Tendua Uidhinishaji",
"Undo Disbursal": "Tendua Utoaji",
"User Management": "Usimamizi wa Mtumiaji",