- Payment Type
+ {{ 'Payment Type' | translate }}
@@ -85,7 +87,7 @@
- Account No.
+ {{ 'Account No.' | translate }}
@@ -93,7 +95,7 @@
- Cheque Number
+ {{ 'Cheque Number' | translate }}
@@ -101,7 +103,7 @@
- Routing Code
+ {{ 'Routing Code' | translate }}
@@ -109,7 +111,7 @@
- Receipt No.
+ {{ 'Receipt No.' | translate }}
@@ -117,7 +119,7 @@
- Bank No.
+ {{ 'Bank No.' | translate }}
diff --git a/src/app/search/search-page/search-page.component.ts b/src/app/search/search-page/search-page.component.ts
index 0a121b8dd..ecfdca9d1 100644
--- a/src/app/search/search-page/search-page.component.ts
+++ b/src/app/search/search-page/search-page.component.ts
@@ -60,7 +60,7 @@ export class SearchPageComponent {
this.router.navigate(['clients', entity.parentId, 'shares-accounts', entity.entityId]);
break;
case 'SAVING':
- this.router.navigate(['clients', entity.parentId, 'savings-accounts', entity.entityId, 'general']);
+ this.router.navigate(['clients', entity.parentId, 'savings-accounts', entity.entityId, 'transactions']);
break;
case 'LOAN':
this.router.navigate(['clients', entity.parentId, 'loans-accounts', entity.entityId, 'general']);
diff --git a/src/app/shared/external-identifier/external-identifier.component.ts b/src/app/shared/external-identifier/external-identifier.component.ts
index af2f0d69a..ce1595171 100644
--- a/src/app/shared/external-identifier/external-identifier.component.ts
+++ b/src/app/shared/external-identifier/external-identifier.component.ts
@@ -1,5 +1,6 @@
import { Component, Input, OnInit } from '@angular/core';
import { Clipboard } from '@angular/cdk/clipboard';
+import { AlertService } from 'app/core/alert/alert.service';
@Component({
selector: 'mifosx-external-identifier',
@@ -15,7 +16,8 @@ export class ExternalIdentifierComponent implements OnInit {
displayL = false;
displayR = true;
- constructor(private clipboard: Clipboard) { }
+ constructor(private clipboard: Clipboard,
+ private alertService: AlertService) { }
ngOnInit(): void {
this.displayL = (this.display === 'left');
@@ -31,6 +33,7 @@ export class ExternalIdentifierComponent implements OnInit {
copyValue(): void {
this.clipboard.copy(this.externalId);
+ this.alertService.alert({ type: 'Clipboard', message: 'Copied: ' + this.externalId });
}
mouseEnter() {
diff --git a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
index 3287b8149..7dd25f174 100644
--- a/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
+++ b/src/app/system/configurations/global-configurations-tab/global-configurations-tab.component.ts
@@ -54,7 +54,9 @@ export class GlobalConfigurationsTabComponent implements OnInit, AfterViewInit {
private router: Router,
private configurationWizardService: ConfigurationWizardService,
private popoverService: PopoverService) {
- this.configurationData = this.systemService.getConfigurations();
+ this.route.data.subscribe((data: { configurations: any }) => {
+ this.configurationData = data.configurations;
+ });
}
/**
diff --git a/src/app/system/system-routing.module.ts b/src/app/system/system-routing.module.ts
index 1ca1197db..cef234943 100644
--- a/src/app/system/system-routing.module.ts
+++ b/src/app/system/system-routing.module.ts
@@ -475,7 +475,9 @@ const routes: Routes = [
{
path: '',
component: ConfigurationsComponent,
- resolve: {}
+ resolve: {
+ configurations: GlobalConfigurationsResolver
+ }
},
{
path: ':id/edit',