From b380f7f630837fcc3263d74255059b2ed6d41984 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Sat, 27 Apr 2024 14:26:59 -0500 Subject: [PATCH] Charges with translations --- .../identities-tab.component.html | 2 +- .../identities-tab.component.ts | 21 +- src/app/core/utils/accounting.ts | 6 +- .../tellers/cashiers/cashiers.component.html | 4 +- .../transactions/transactions.component.html | 2 +- .../view-cashier/view-cashier.component.html | 5 +- src/app/pipes/format-number.pipe.ts | 4 +- src/app/pipes/pipes.module.ts | 43 ++- src/app/pipes/translate-catalog.pipe.ts | 15 + .../products/charges/charges.component.html | 6 +- .../create-charge.component.html | 10 +- .../edit-charge/edit-charge.component.html | 10 +- .../view-charge/view-charge.component.html | 30 +- .../loan-product-summary.component.html | 311 +++++++++--------- .../loan-product-summary.component.ts | 4 + .../loan-product-charges-step.component.html | 12 +- ...ance-payment-allocation-tab.component.html | 6 +- .../loan-product-settings-step.component.html | 34 +- .../loan-product-terms-step.component.html | 32 +- .../loan-product-terms-step.component.ts | 28 +- ...saving-product-charges-step.component.html | 6 +- ...saving-product-preview-step.component.html | 32 +- .../saving-product-preview-step.component.ts | 3 +- ...aving-product-settings-step.component.html | 2 +- .../saving-product-terms-step.component.html | 8 +- .../saving-product-general-tab.component.html | 24 +- ...avings-account-charges-step.component.html | 4 +- .../savings-account-charges-step.component.ts | 21 +- ...avings-account-preview-step.component.html | 22 +- .../savings-account-preview-step.component.ts | 6 +- .../savings-account-terms-step.component.html | 10 +- .../charges-tab/charges-tab.component.html | 32 +- .../charges-tab/charges-tab.component.ts | 10 +- .../general-tab/general-tab.component.html | 40 ++- .../savings-account-view.component.html | 2 +- .../transactions-tab.component.html | 9 +- .../transactions-tab.component.ts | 2 +- .../view-charge/view-charge.component.html | 26 +- ...-savings-accounting-details.component.html | 2 +- ...ew-savings-accounting-details.component.ts | 2 +- .../entity-documents-tab.component.ts | 2 +- .../entity-notes-tab.component.html | 8 +- .../global-configurations-tab.component.html | 2 +- src/assets/env.js | 2 +- src/assets/translations/cs-CS.json | 136 ++++++++ src/assets/translations/de-DE.json | 136 ++++++++ src/assets/translations/en-US.json | 150 ++++++++- src/assets/translations/es-MX.json | 182 ++++++++-- src/assets/translations/fr-FR.json | 136 ++++++++ src/assets/translations/it-IT.json | 136 ++++++++ src/assets/translations/ko-KO.json | 136 ++++++++ src/assets/translations/lt-LT.json | 136 ++++++++ src/assets/translations/lv-LV.json | 136 ++++++++ src/assets/translations/ne-NE.json | 136 ++++++++ src/assets/translations/pt-PT.json | 136 ++++++++ src/assets/translations/sw-SW.json | 136 ++++++++ 56 files changed, 2139 insertions(+), 415 deletions(-) create mode 100644 src/app/pipes/translate-catalog.pipe.ts diff --git a/src/app/clients/clients-view/identities-tab/identities-tab.component.html b/src/app/clients/clients-view/identities-tab/identities-tab.component.html index 5d9068754..ddf82d470 100644 --- a/src/app/clients/clients-view/identities-tab/identities-tab.component.html +++ b/src/app/clients/clients-view/identities-tab/identities-tab.component.html @@ -19,7 +19,7 @@ - {{"labels.inputs.Key" | translate}} + {{"labels.inputs.Document Key" | translate}} {{identity.documentKey}} diff --git a/src/app/clients/clients-view/identities-tab/identities-tab.component.ts b/src/app/clients/clients-view/identities-tab/identities-tab.component.ts index 46321f9af..0de2a1407 100644 --- a/src/app/clients/clients-view/identities-tab/identities-tab.component.ts +++ b/src/app/clients/clients-view/identities-tab/identities-tab.component.ts @@ -16,6 +16,7 @@ import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.componen /** Custom Services */ import { ClientsService } from '../../clients.service'; +import { TranslateService } from '@ngx-translate/core'; /** * Identities Tab Component @@ -45,8 +46,9 @@ export class IdentitiesTabComponent { * @param {ClientsService} clientService Clients Service */ constructor(private route: ActivatedRoute, - public dialog: MatDialog, - private clientService: ClientsService) { + private dialog: MatDialog, + private clientService: ClientsService, + private translateService: TranslateService) { this.clientId = this.route.parent.snapshot.paramMap.get('clientId'); this.route.data.subscribe((data: { clientIdentities: any, clientIdentifierTemplate: any }) => { this.clientIdentities = data.clientIdentities; @@ -73,7 +75,7 @@ export class IdentitiesTabComponent { const formfields: FormfieldBase[] = [ new SelectBase({ controlName: 'documentTypeId', - label: 'Document Type', + label: this.translateService.instant('labels.inputs.Document Type'), value: '', options: { label: 'name', value: 'id', data: this.clientIdentifierTemplate.allowedDocumentTypes }, required: true, @@ -81,15 +83,18 @@ export class IdentitiesTabComponent { }), new SelectBase({ controlName: 'status', - label: 'Status', + label: this.translateService.instant('labels.inputs.Status'), value: '2', - options: { label: 'value', value: 'value', data: [{ value: 'Active' }, { value: 'Inactive' }] }, + options: { label: 'label', value: 'value', data: [ + { label: this.translateService.instant('labels.catalogs.Active'), value: 'Active' }, + { label: this.translateService.instant('labels.catalogs.Inactive'), value: 'Inactive' } + ] }, required: true, order: 2 }), new InputBase({ controlName: 'documentKey', - label: 'Unique Id', + label: this.translateService.instant('labels.inputs.Document Key'), value: '', type: 'text', required: true, @@ -97,14 +102,14 @@ export class IdentitiesTabComponent { }), new InputBase({ controlName: 'description', - label: 'Description', + label: this.translateService.instant('labels.inputs.Description'), value: '', type: 'text', order: 4 }) ]; const data = { - title: 'Add Client Identifier', + title: this.translateService.instant('labels.heading.Add Client Identifier'), formfields: formfields }; const addIdentifierDialogRef = this.dialog.open(FormDialogComponent, { data }); diff --git a/src/app/core/utils/accounting.ts b/src/app/core/utils/accounting.ts index 283380be5..cae90c465 100644 --- a/src/app/core/utils/accounting.ts +++ b/src/app/core/utils/accounting.ts @@ -17,14 +17,14 @@ import { OptionData } from 'app/shared/models/option-data.model'; } public getAccountRuleName(value: string): string { - if (value === 'ACCRUAL PERIODIC') { + if (['ACCRUAL PERIODIC', 'ACCRUAL (PERIODIC)'].includes(value)) { return 'Accrual (periodic)'; - } else if (value === 'ACCRUAL UPFRONT') { + } else if (['ACCRUAL UPFRONT', 'ACCRUAL (UPFRONT)'].includes(value)) { return 'Accrual (upfront)'; } else if (value === 'CASH BASED') { return 'Cash'; } else if (value === 'NONE') { - return 'None'; + return 'NONE'; } return ''; } diff --git a/src/app/organization/tellers/cashiers/cashiers.component.html b/src/app/organization/tellers/cashiers/cashiers.component.html index 0de1f3c4b..d71480248 100644 --- a/src/app/organization/tellers/cashiers/cashiers.component.html +++ b/src/app/organization/tellers/cashiers/cashiers.component.html @@ -22,7 +22,7 @@ {{ 'labels.inputs.Period' | translate }} - {{ cashier.startDate | dateFormat }} - {{ cashier.endDate | dateFormat }} + {{ cashier.startDate | dateFormat }} - {{ cashier.endDate | dateFormat }} @@ -32,7 +32,7 @@ {{ 'labels.inputs.Full Day/Time' | translate }} - {{ cashier.isFullDay ? 'Yes' : 'No' }} + {{ cashier.isFullDay | yesNo }} diff --git a/src/app/organization/tellers/cashiers/transactions/transactions.component.html b/src/app/organization/tellers/cashiers/transactions/transactions.component.html index 31783e6eb..1a5bdac1f 100644 --- a/src/app/organization/tellers/cashiers/transactions/transactions.component.html +++ b/src/app/organization/tellers/cashiers/transactions/transactions.component.html @@ -1,5 +1,5 @@
- diff --git a/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html b/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html index 3b0b52d2b..e2d96f997 100644 --- a/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html +++ b/src/app/organization/tellers/cashiers/view-cashier/view-cashier.component.html @@ -59,7 +59,7 @@
- {{'labels.inputs.Full Day?' | translate}} + {{'labels.inputs.Full Day/Time' | translate}}
@@ -69,8 +69,9 @@
+ - + diff --git a/src/app/pipes/format-number.pipe.ts b/src/app/pipes/format-number.pipe.ts index 9d8e27aea..26f2de00d 100644 --- a/src/app/pipes/format-number.pipe.ts +++ b/src/app/pipes/format-number.pipe.ts @@ -11,9 +11,9 @@ export class FormatNumberPipe implements PipeTransform { private settingsService: SettingsService) { } - transform(value: string | number, ...args: unknown[]): string { + transform(value: string | number, defaultValue: any): string { if (!value) { - return ''; + return defaultValue ? defaultValue : ''; } const locale = this.settingsService.language.code; const decimals = this.settingsService.decimals; diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts index 3afde20ad..f7818c29c 100644 --- a/src/app/pipes/pipes.module.ts +++ b/src/app/pipes/pipes.module.ts @@ -12,13 +12,50 @@ import { ExternalIdentifierPipe } from './external-identifier.pipe'; import { FormatNumberPipe } from './format-number.pipe'; import { YesnoPipe } from './yesno.pipe'; import { PrettyPrintPipe } from './pretty-print.pipe'; +import { TranslateCatalogPipe } from './translate-catalog.pipe'; @NgModule({ imports: [ CommonModule ], - declarations: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe, YesnoPipe, PrettyPrintPipe ], - providers: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe, YesnoPipe, PrettyPrintPipe ], - exports: [StatusLookupPipe, AccountsFilterPipe, ChargesFilterPipe, ChargesPenaltyFilterPipe, FindPipe, UrlToStringPipe, DateFormatPipe, DatetimeFormatPipe, ExternalIdentifierPipe, FormatNumberPipe, YesnoPipe, PrettyPrintPipe ] + declarations: [StatusLookupPipe, + AccountsFilterPipe, + ChargesFilterPipe, + ChargesPenaltyFilterPipe, + FindPipe, + UrlToStringPipe, + DateFormatPipe, + DatetimeFormatPipe, + ExternalIdentifierPipe, + FormatNumberPipe, + YesnoPipe, + PrettyPrintPipe, + TranslateCatalogPipe], + providers: [StatusLookupPipe, + AccountsFilterPipe, + ChargesFilterPipe, + ChargesPenaltyFilterPipe, + FindPipe, + UrlToStringPipe, + DateFormatPipe, + DatetimeFormatPipe, + ExternalIdentifierPipe, + FormatNumberPipe, + YesnoPipe, + PrettyPrintPipe, + TranslateCatalogPipe], + exports: [StatusLookupPipe, + AccountsFilterPipe, + ChargesFilterPipe, + ChargesPenaltyFilterPipe, + FindPipe, + UrlToStringPipe, + DateFormatPipe, + DatetimeFormatPipe, + ExternalIdentifierPipe, + FormatNumberPipe, + YesnoPipe, + PrettyPrintPipe, + TranslateCatalogPipe] }) export class PipesModule { } diff --git a/src/app/pipes/translate-catalog.pipe.ts b/src/app/pipes/translate-catalog.pipe.ts new file mode 100644 index 000000000..4242d802c --- /dev/null +++ b/src/app/pipes/translate-catalog.pipe.ts @@ -0,0 +1,15 @@ +import { Pipe, PipeTransform } from '@angular/core'; +import { TranslateService } from '@ngx-translate/core'; + +@Pipe({ + name: 'translateCatalog' +}) +export class TranslateCatalogPipe implements PipeTransform { + + constructor(private translateService: TranslateService) { } + + transform(attributeValue: any, suffix?: string): string { + return this.translateService.instant('labels.catalogs.' + attributeValue); + } + +} diff --git a/src/app/products/charges/charges.component.html b/src/app/products/charges/charges.component.html index f00e79b62..4586bb2ad 100644 --- a/src/app/products/charges/charges.component.html +++ b/src/app/products/charges/charges.component.html @@ -27,17 +27,17 @@ {{"labels.inputs.Applies To" | translate}} - {{ charge.chargeAppliesTo.value }} + {{ charge.chargeAppliesTo.value | translateCatalog }} {{"labels.inputs.Time" | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }} {{"labels.inputs.Calculation" | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} diff --git a/src/app/products/charges/create-charge/create-charge.component.html b/src/app/products/charges/create-charge/create-charge.component.html index 6c6094d4a..f1922ec4a 100644 --- a/src/app/products/charges/create-charge/create-charge.component.html +++ b/src/app/products/charges/create-charge/create-charge.component.html @@ -13,7 +13,7 @@ - {{ chargeAppliesTo.value }} + {{ chargeAppliesTo.value | translateCatalog }} @@ -50,7 +50,7 @@ {{"labels.inputs.Charge Time Type" | translate}} - {{ chargeTimeType.value }} + {{ chargeTimeType.value | translateCatalog }} @@ -63,7 +63,7 @@ - {{ chargeCalculationType.value }} + {{ chargeCalculationType.value | translateCatalog }} @@ -76,7 +76,7 @@ - {{ chargePaymentMode.value }} + {{ chargePaymentMode.value | translateCatalog }} @@ -110,7 +110,7 @@ - {{ feeFrequency.value }} + {{ feeFrequency.value | translateCatalog }} diff --git a/src/app/products/charges/edit-charge/edit-charge.component.html b/src/app/products/charges/edit-charge/edit-charge.component.html index b7d857d57..77a4317cf 100644 --- a/src/app/products/charges/edit-charge/edit-charge.component.html +++ b/src/app/products/charges/edit-charge/edit-charge.component.html @@ -13,7 +13,7 @@ - {{ chargeAppliesTo.value }} + {{ chargeAppliesTo.value | translateCatalog }} @@ -47,7 +47,7 @@ {{"labels.inputs.Charge Time Type" | translate}} - {{ chargeTime.value }} + {{ chargeTime.value | translateCatalog }} @@ -60,7 +60,7 @@ {{"labels.inputs.Charge Calculation" | translate}} - {{ chargeCalculation.value }} + {{ chargeCalculation.value | translateCatalog }} @@ -73,7 +73,7 @@ - {{ chargePaymentMode.value }} + {{ chargePaymentMode.value | translateCatalog }} @@ -152,7 +152,7 @@ {{"labels.inputs.Charge Frequency" | translate}} - {{ chargeFrequency.value }} + {{ chargeFrequency.value | translateCatalog }} diff --git a/src/app/products/charges/view-charge/view-charge.component.html b/src/app/products/charges/view-charge/view-charge.component.html index 3dc6fcbb0..540841fc9 100644 --- a/src/app/products/charges/view-charge/view-charge.component.html +++ b/src/app/products/charges/view-charge/view-charge.component.html @@ -26,11 +26,19 @@
- {{"labels.inputs.Charge Type" | translate}} + {{"labels.inputs.Charge Applies To" | translate}}
- {{ chargeData.penalty === true ? 'Penalty' : 'Charge' }} + {{ chargeData.chargeAppliesTo.value | translateCatalog }} +
+ +
+ {{"labels.inputs.Penalty" | translate}} +
+ +
+ {{ chargeData.penalty === true | yesNo }}
@@ -46,7 +54,7 @@
- {{ chargeData.amount }} + {{ chargeData.amount | formatNumber }}
@@ -70,15 +78,7 @@
- {{ chargeData.chargeTimeType.value }} -
- -
- {{"labels.inputs.Charge Applies To" | translate}} -
- -
- {{ chargeData.chargeAppliesTo.value }} + {{ chargeData.chargeTimeType.value | translateCatalog }}
@@ -86,7 +86,7 @@
- {{ chargeData.chargeCalculationType.value }} + {{ chargeData.chargeCalculationType.value | translateCatalog }}
@@ -94,7 +94,7 @@
- {{ chargeData.chargePaymentMode.value }} + {{ chargeData.chargePaymentMode.value | translateCatalog }}
@@ -111,7 +111,7 @@
- {{ chargeData.feeFrequency.value }} + {{ chargeData.feeFrequency.value | translateCatalog }}
diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html index cbb2f9216..191b41802 100644 --- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html +++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html @@ -1,79 +1,79 @@
-

Details

+

{{ 'labels.heading.Details' | translate}}

- Name: + {{ 'labels.inputs.Name' | translate}}: {{ loanProduct.name }}
- Short Name: + {{ 'labels.inputs.Short Name' | translate}}: {{ loanProduct.shortName }}
- Fund Name: + {{ 'labels.inputs.Fund Name' | translate}}: {{ loanProduct.fundName }}
- Include in Customer Loan Counter: + {{ 'labels.inputs.Include in Customer Loan Counter' | translate}}: {{ loanProduct.includeInBorrowerCycle | yesNo }}
- Start Date: + {{ 'labels.inputs.Start Date' | translate}}: {{ loanProduct.startDate | dateFormat }}
- Close Date: + {{ 'labels.inputs.Close Date' | translate}}: {{ loanProduct.closeDate | dateFormat }}
- Description: + {{ 'labels.inputs.Description' | translate}}: {{ loanProduct.description }}
-

Currency

+

{{ 'labels.inputs.Currency' | translate}}

- Currency: + {{ 'labels.inputs.Currency' | translate}}: {{ loanProduct.currency.code }}
- Currency: + {{ 'labels.inputs.Currency' | translate}}: {{ loanProduct.currency.displayLabel }}
- Decimal Places: + {{ 'labels.inputs.Decimal Places' | translate}}: {{ loanProduct.currency.decimalPlaces }}
- Currency in multiples of: + {{ 'labels.inputs.Currency in multiples of' | translate}}: {{ loanProduct.currency.inMultiplesOf }}
- Installment in multiples of: + {{ 'labels.inputs.Installment in multiples of' | translate}}: {{ loanProduct.installmentAmountInMultiplesOf }}
-

Terms

+

{{ 'labels.heading.Terms' | translate}}

- Principal: + {{ 'labels.inputs.Principal' | translate}}: {{ loanProduct.principal | formatNumber }} (Min {{ (loanProduct.minPrincipal ? loanProduct.minPrincipal : loanProduct.principal) | formatNumber }} : Max {{ (loanProduct.maxPrincipal ? loanProduct.maxPrincipal : loanProduct.principal) | formatNumber }}) @@ -81,27 +81,26 @@
- Allow Approved / Disbursed Amounts Over Applied: + {{ 'labels.inputs.Allow Approved / Disbursed Amounts Over Applied' | translate}}: {{ loanProduct.allowApprovedDisbursedAmountsOverApplied | yesNo }}
- Over Applied Amount: + {{ 'labels.inputs.Over Applied Amount' | translate}}: {{ loanProduct.overAppliedNumber - | formatNumber + | formatNumber:0 }} % {{ loanProduct.overAppliedNumber | - formatNumber }} {{ - loanProduct.currencyCode }} + formatNumber }} {{ loanProduct.currencyCode }}
- Installment day calculation from: - {{ loanProduct.repaymentStartDateType?.value }} + {{ 'labels.inputs.Installment day calculation from' | translate}}: + {{ loanProduct.repaymentStartDateType?.value | translateCatalog }}
- Number of Repayments: + {{ 'labels.inputs.Number of Repayments' | translate}}: {{ loanProduct.numberOfRepayments + ' (Min: ' + (loanProduct.minNumberOfRepayments ? loanProduct.minNumberOfRepayments : loanProduct.numberOfRepayments) + ', Max: ' + (loanProduct.maxNumberOfRepayments ? loanProduct.maxNumberOfRepayments : loanProduct.numberOfRepayments) + ')' @@ -109,26 +108,26 @@
- Linked to floating interest rates: + {{ 'labels.inputs.Linked to floating interest rates' | translate}}: {{ loanProduct.isLinkedToFloatingInterestRates | yesNo }}
- Nominal interest rate: + {{ 'labels.inputs.Nominal interest rate' | translate}}: {{ loanProduct.interestRatePerPeriod + ' (Min: ' + (loanProduct.minInterestRatePerPeriod ? loanProduct.minInterestRatePerPeriod : loanProduct.interestRatePerPeriod) + ', Max: ' + (loanProduct.maxInterestRatePerPeriod ? loanProduct.maxInterestRatePerPeriod : loanProduct.interestRatePerPeriod) - + ')' + ' ' + loanProduct.interestRateFrequencyType?.value }} + + ')'}} {{ loanProduct.interestRateFrequencyType?.value | translateCatalog }}
- Floating Lending Interest Rate: + {{ 'labels.inputs.Floating Lending Interest Rate' | translate}}: {{ loanProduct.floatingRateName }} - Interest Rate Differential: + {{ 'labels.inputs.Interest Rate Differential' | translate}}: {{ loanProduct.interestRateDifferential }} - Floating Interest Rate Calculation Allowed: + {{ 'labels.inputs.Floating Interest Rate Calculation Allowed' | translate}}: {{ loanProduct.isFloatingInterestRateCalculationAllowed | yesNo }} - Floating Interest Rate: + {{ 'labels.inputs.Floating Interest Rate' | translate}}: {{ loanProduct.defaultDifferentialLendingRate + ' (Min: ' + (loanProduct.minDifferentialLendingRate ? loanProduct.minDifferentialLendingRate : loanProduct.defaultDifferentialLendingRate) + ', Max: ' + (loanProduct.maxDifferentialLendingRate ? @@ -136,48 +135,48 @@
- Terms vary based on loan cycle: + {{ 'labels.inputs.Terms vary based on loan cycle' | translate}}: {{ loanProduct.useBorrowerCycle | yesNo }}
-

Principal by loan cycle

+

{{ 'labels.inputs.Principal by loan cycle' | translate}}

- + - + - + - + - + @@ -190,41 +189,41 @@
-

Number of Repayments by loan cycle

+

{{ 'labels.inputs.Number of Repayments by loan cycle' | translate}}

Condition {{ 'labels.inputs.Condition' | translate}} - {{ variation.valueConditionType.value }} + {{ variation.valueConditionType.value | translateCatalog }} Loan Cycle {{ 'labels.inputs.Loan Cycle' | translate}} {{ variation.borrowerCycleNumber }} Minimum {{ 'labels.inputs.Minimum' | translate}} - {{ variation.minValue }} + {{ variation.minValue | formatNumber }} Default {{ 'labels.inputs.Default' | translate}} - {{ variation.defaultValue }} + {{ variation.defaultValue | formatNumber }} Maximum {{ 'labels.inputs.Maximum' | translate}} - {{ variation.maxValue }} + {{ variation.maxValue | formatNumber }}
- + - + - + - + - + @@ -239,41 +238,41 @@
-

Nominal Interest Rate by loan cycle

+

{{ 'labels.inputs.Nominal Interest Rate by loan cycle' | translate}}

Condition {{ 'labels.inputs.Condition' | translate}} - {{ variation.valueConditionType.value }} + {{ variation.valueConditionType.value | translateCatalog }} Loan Cycle {{ 'labels.inputs.Loan Cycle' | translate}} {{ variation.borrowerCycleNumber }} Minimum {{ 'labels.inputs.Minimum' | translate}} {{ variation.minValue }} Default {{ 'labels.inputs.Default' | translate}} {{ variation.defaultValue }} Maximum {{ 'labels.inputs.Maximum' | translate}} {{ variation.maxValue }}
- + - + - + - + - + @@ -287,70 +286,70 @@
- Repay Every: - {{ loanProduct.repaymentEvery + ' ' + loanProduct.repaymentFrequencyType.value }} + {{ 'labels.inputs.Repay Every' | translate}}: + {{ loanProduct.repaymentEvery }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}
- Fixed Length: - {{ loanProduct.fixedLength + ' ' + loanProduct.repaymentFrequencyType.value }} + {{ 'labels.inputs.Fixed Length' | translate}}: + {{ loanProduct.fixedLength }} {{ loanProduct.repaymentFrequencyType.value | translateCatalog }}
- Minimum days between disbursal and first repayment date: - {{ loanProduct.minimumDaysBetweenDisbursalAndFirstRepayment }} + {{ 'labels.inputs.Minimum days between disbursal and first repayment date' | translate}}: + {{ loanProduct.minimumDaysBetweenDisbursalAndFirstRepayment | formatNumber }}
-

Settings

+

{{ 'labels.heading.Settings' | translate}}

- Amortization: - {{ loanProduct.amortizationType.value }} + {{ 'labels.inputs.Amortization' | translate}}: + {{ loanProduct.amortizationType.value | translateCatalog }}
- Is Equal Amortization: + {{ 'labels.inputs.Is Equal Amortization' | translate}}: {{ loanProduct.isEqualAmortization | yesNo }}
- Interest Method: - {{ loanProduct.interestType?.value }} + {{ 'labels.inputs.Interest Method' | translate}}: + {{ loanProduct.interestType?.value | translateCatalog }}
- Interest Calculation Period: - {{ loanProduct.interestCalculationPeriodType?.value }} + {{ 'labels.inputs.Interest Calculation Period' | translate}}: + {{ loanProduct.interestCalculationPeriodType?.value | translateCatalog }}
- Allow Partial Interest Calculation with same as repayment: + {{ 'labels.inputs.Allow Partial Interest Calculation with same as repayment' | translate}}: {{ loanProduct.allowPartialPeriodInterestCalculation | yesNo }}
-

Loan Schedule

+

{{ 'labels.inputs.Loan Schedule' | translate}}

- Loan Schedule Type: - {{ loanProduct.loanScheduleType.value }} + {{ 'labels.inputs.Loan Schedule Type' | translate}}: + {{ loanProduct.loanScheduleType.value | translateCatalog }}
- Repayment Strategy: + {{ 'labels.inputs.Repayment Strategy' | translate}}: {{ loanProduct.transactionProcessingStrategyName }}
- Loan Schedule Processing Type: + {{ 'labels.inputs.Loan Schedule Processing Type' | translate}}: {{ loanProduct.loanScheduleProcessingType.value }}
- Advanced Payment Allocation Transactions: + {{ 'labels.inputs.Advanced Payment Allocation Transactions' | translate}}:
- Advanced Credit Allocation Transactions: + {{ 'labels.inputs.Advanced Credit Allocation Transactions' | translate}}:
-

Down Payments

+

{{ 'labels.inputs.Down Payments' | translate}}

- Enable Down Payments: + {{ 'labels.inputs.Enable Down Payments' | translate}}: {{ loanProduct.enableDownPayment | yesNo }}
- Disbursed Amount Percentage Down Payment (%): + {{ 'labels.inputs.Disbursed Amount Percentage Down Payment' | translate}} (%): {{ loanProduct.disbursedAmountPercentageForDownPayment }} %
- Enable Auto Repayment for Down Payment: + {{ 'labels.inputs.Enable Auto Repayment for Down Payment' | translate}}: {{ loanProduct.enableAutoRepaymentForDownPayment | yesNo }}
-

Moratorium

+

{{ 'labels.heading.Moratorium' | translate}}

- Delinquency Bucket: + {{ 'labels.inputs.Delinquency Bucket' | translate}}: {{ loanProduct.delinquencyBucket.name }} {{ 'labels.inputs.Unassigned' | translate }}
- Delinquency Bucket: + {{ 'labels.inputs.Delinquency Bucket' | translate}}: {{ 'labels.inputs.Unassigned' | translate }}
- Enable installment level Delinquency: + {{ 'labels.inputs.Enable installment level Delinquency' | translate}}: {{ loanProduct.enableInstallmentLevelDelinquency | yesNo }}
- Grace on principal payment: + {{ 'labels.inputs.Grace on principal payment' | translate}}: {{ loanProduct.graceOnPrincipalPayment }}
- Grace on interest payment: + {{ 'labels.inputs.Grace on interest payment' | translate}}: {{ loanProduct.graceOnInterestPayment }}
- Interest free period: + {{ 'labels.inputs.Interest free period' | translate}}: {{ loanProduct.graceOnInterestCharged }}
- Arrears tolerance: + {{ 'labels.inputs.Arrears tolerance' | translate}}: {{ loanProduct.inArrearsTolerance }}
- Days in year: - {{ loanProduct.daysInYearType?.value }} + {{ 'labels.inputs.Days in year' | translate}}: + {{ loanProduct.daysInYearType?.value | translateCatalog }}
- Days in month: - {{ loanProduct.daysInMonthType?.value }} + {{ 'labels.inputs.Days in month' | translate}}: + {{ loanProduct.daysInMonthType?.value | translateCatalog }}
- Allow fixing of the installment amount: + {{ 'labels.inputs.Allow fixing of the installment amount' | translate}}: {{ loanProduct.canDefineInstallmentAmount | yesNo }}
- Number of days a loan may be overdue before moving into arrears: + {{ 'labels.inputs.Number of days a loan may be overdue before moving into arrears' | translate}}: {{ loanProduct.graceOnArrearsAgeing }}
- Maximum number of days a loan may be overdue before becoming a NPA (non performing asset): + {{ 'labels.inputs.Maximum number of days a loan may be overdue before becoming a NPA (non performing asset)' | translate}}: {{ loanProduct.overdueDaysForNPA }}
- Account moves out of NPA only after all arrears have been cleared: + {{ 'labels.inputs.Account moves out of NPA only after all arrears have been cleared' | translate}}: {{ loanProduct.accountMovesOutOfNPAOnlyOnArrearsCompletion | yesNo }}
- Principal Threshold (%) for Last Instalment: + {{ 'labels.inputs.Principal Threshold (%) for Last Instalment' | translate}}: {{ loanProduct.principalThresholdForLastInstallment }}
- Variable Installments allowed: + {{ 'labels.inputs.Variable Installments allowed' | translate}}: {{ loanProduct.allowVariableInstallments | yesNo }}
- Variable Installments: + {{ 'labels.inputs.Variable Installments' | translate}}: {{ '(Min: ' + loanProduct.minimumGap + ', Max: ' + (loanProduct.maximumGap ? loanProduct.maximumGap : loanProduct.minimumGap) + ')' }}
- Allowed to be used for providing Topup Loans: + {{ 'labels.inputs.Allowed to be used for providing Topup Loans' | translate}}: {{ loanProduct.canUseForTopup | yesNo }}
-

Interest Recalculation

+

{{ 'labels.heading.Interest Recalculation' | translate}}

- Recalculate Interest: + {{ 'labels.inputs.Recalculate Interest' | translate}}: {{ loanProduct.isInterestRecalculationEnabled | yesNo }}
- Pre-closure interest calculation rule: + {{ 'labels.inputs.Pre-closure interest calculation rule' | translate}}: {{ loanProduct.interestRecalculationData.preClosureInterestCalculationStrategy.value }} - Advance payments adjustment type: + {{ 'labels.inputs.Advance payments adjustment type' | translate}}: {{ loanProduct.interestRecalculationData.rescheduleStrategyType.value }} - Interest recalculation compounding on: + {{ 'labels.inputs.Interest recalculation compounding on' | translate}}: {{ loanProduct.interestRecalculationData.interestRecalculationCompoundingType.value }}
- Frequency for compounding: + {{ 'labels.inputs.Frequency for compounding' | translate}}: {{ loanProduct.interestRecalculationData.recalculationCompoundingFrequencyType.value }}
- Frequency Interval for compounding: + {{ 'labels.inputs.Frequency Interval for compounding' | translate}}: {{ loanProduct.interestRecalculationData.recalculationCompoundingFrequencyInterval }}
- Frequency for recalculate Outstanding Principal: + {{ 'labels.inputs.Frequency for recalculate Outstanding Principal' | translate}}: {{ loanProduct.interestRecalculationData.recalculationRestFrequencyType.value }}
- Frequency Interval for recalculation: + {{ 'labels.inputs.Frequency Interval for recalculation' | translate}}: {{ loanProduct.interestRecalculationData.recalculationRestFrequencyInterval }}
Rest Frequency Date: @@ -543,103 +542,103 @@
- Is Arrears recognization based on original schedule: + {{ 'labels.inputs.Is Arrears recognization based on original schedule' | translate}}: {{ loanProduct.isArrearsBasedOnOriginalSchedule | yesNo }}
-

Guarantee Requirements

+

{{ 'labels.heading.Guarantee Requirements' | translate}}

- Place Guarantee Funds On-Hold: + {{ 'labels.inputs.Place Guarantee Funds On-Hold' | translate}}: {{ loanProduct.holdGuaranteeFunds | yesNo }}
- Mandatory Guarantee(%): + {{ 'labels.inputs.Mandatory Guarantee' | translate}} (%): {{ loanProduct.productGuaranteeData.mandatoryGuarantee }}
- Minimum Guarantee from Own Funds(%): + {{ 'labels.inputs.Minimum Guarantee from Own Funds' | translate}} (%): {{ loanProduct.productGuaranteeData.minimumGuaranteeFromOwnFunds }}
- Minimum Guarantee from Guarantor Funds(%): + {{ 'labels.inputs.Minimum Guarantee from Guarantor Funds' | translate}} (%): {{ loanProduct.productGuaranteeData.minimumGuaranteeFromGuarantor }}
-

Loan Tranche Details

+

{{ 'labels.heading.Loan Tranche Details' | translate }}

- Enable Multiple Disbursals: + {{ 'labels.inputs.Enable Multiple Disbursals' | translate }}: {{ loanProduct.multiDisburseLoan | yesNo }}
- Maximum Tranche count: + {{ 'labels.inputs.Maximum Tranche count' | translate }}: {{ loanProduct.maxTrancheCount }}
- Maximum allowed outstanding balance: + {{ 'labels.inputs.Maximum allowed outstanding balance' | translate }}: {{ loanProduct.outstandingLoanBalance }}
- Disallow Expected Disbursements: + {{ 'labels.inputs.Disallow Expected Disbursements' | translate }}: {{ loanProduct.disallowExpectedDisbursements | yesNo }}
-

Event Settings

+

{{ 'labels.heading.Event Settings' | translate }}

- Use the Global Configurations values to the Repayment Event (notifications): + {{ 'labels.inputs.Use the Global Configurations values to the Repayment Event (notifications)' | translate }}: {{ useDueForRepaymentsConfigurations | yesNo }}
- Due days for repayment event: + {{ 'labels.inputs.Due days for repayment event' | translate }}: {{ loanProduct.dueDaysForRepaymentEvent | number }}
- OverDue days for repayment event: + {{ 'labels.inputs.OverDue days for repayment event' | translate }}: {{ loanProduct.overDueDaysForRepaymentEvent | number }}
-

Configurable Terms and Settings

+

{{ 'labels.inputs.Configurable Terms and Settings' | translate }}

- Allow overriding select terms and settings in loan accounts: + {{ 'labels.inputs.Allow overriding select terms and settings in loan accounts' | translate }}: {{ loanProduct.allowAttributeConfiguration | yesNo }}
- Amortization: + {{ 'labels.inputs.Amortization' | translate }}: {{ loanProduct.allowAttributeOverrides.amortizationType | yesNo }} - Interest method: + {{ 'labels.inputs.Interest method' | translate }}: {{ loanProduct.allowAttributeOverrides.interestType | yesNo }} - Repayment strategy: + {{ 'labels.inputs.Repayment strategy' | translate }}: {{ loanProduct.allowAttributeOverrides.transactionProcessingStrategyCode | yesNo }} - Interest calculation period: + {{ 'labels.inputs.Interest calculation period' | translate }}: {{ loanProduct.allowAttributeOverrides.interestCalculationPeriodType | yesNo }} - Arrears tolerance: + {{ 'labels.inputs.Arrears tolerance' | translate }}: {{ loanProduct.allowAttributeOverrides.inArrearsTolerance | yesNo }} - Repaid every: + {{ 'labels.inputs.Repaid every' | translate }}: {{ loanProduct.allowAttributeOverrides.repaymentEvery | yesNo }} - Moratorium: + {{ 'labels.inputs.Moratorium' | translate }}: {{ loanProduct.allowAttributeOverrides.graceOnPrincipalAndInterestPayment | yesNo }} - Number of days a loan may be overdue before moving into arrears: + {{ 'labels.inputs.Number of days a loan may be overdue before moving into arrears' | translate }}: {{ loanProduct.allowAttributeOverrides.graceOnArrearsAgeing | yesNo }}
-

Charges

+

{{ 'labels.heading.Charges' | translate }}

@@ -647,30 +646,30 @@ [dataSource]="loanProduct.charges | chargesPenaltyFilter:false"> -
+ - + - + - + @@ -679,37 +678,37 @@
Condition {{ 'labels.inputs.Condition' | translate}} - {{ variation.valueConditionType.value }} + {{ variation.valueConditionType.value | translateCatalog }} Loan Cycle {{ 'labels.inputs.Loan Cycle' | translate}} {{ variation.borrowerCycleNumber }} Minimum {{ 'labels.inputs.Minimum' | translate}} {{ variation.minValue }} Default {{ 'labels.inputs.Default' | translate}} {{ variation.defaultValue }} Maximum {{ 'labels.inputs.Maximum' | translate}} {{ variation.maxValue }} Name {{ 'labels.inputs.Name' | translate }} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{ 'labels.inputs.Charge Type' | translate }} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} Amount {{ 'labels.inputs.Amount' | translate }} - {{ charge.amount }} + {{ charge.amount | formatNumber }} Collected On {{ 'labels.inputs.Collected On' | translate }} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }}
-

Overdue Charges

+

{{ 'labels.inputs.Overdue Charges' | translate }}

- + - + - + - + @@ -720,19 +719,19 @@ -

Accounting

+

{{ 'labels.heading.Accounting' | translate }}

- Type: - {{ accountingRuleData[accountingRule() - 1] }} + {{'labels.inputs.Type' | translate}}: + {{ 'labels.accounting.' + getAccountingRuleName(accountingRuleData[accountingRule() - 1]) | translate }}
-

Assets / Liabilities

+

{{'labels.heading.Assets' | translate}} / {{'labels.heading.Liabilities' | translate}}

0); } + getAccountingRuleName(value: string): string { + return this.accounting.getAccountRuleName(value.toUpperCase()); + } + } diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html index 1d33beacd..92a7370a7 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-charges-step/loan-product-charges-step.component.html @@ -31,21 +31,21 @@
@@ -100,21 +100,21 @@ diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html index ca73b5d13..001934ab8 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-payment-strategy-step/advance-payment-allocation-tab/advance-payment-allocation-tab.component.html @@ -26,7 +26,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - {{ futureInstallmentAllocationRule.value | translate }} + {{ futureInstallmentAllocationRule.value | translateCatalog }} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html index cf176dac4..655eedd5e 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-settings-step/loan-product-settings-step.component.html @@ -18,7 +18,7 @@ {{'labels.inputs.Interest Method' | translate}} - {{ interestType.value }} + {{ interestType.value | translateCatalog }} @@ -31,7 +31,7 @@ - {{ interestCalculationPeriodType.value }} + {{ interestCalculationPeriodType.value | translateCatalog }} @@ -58,7 +58,7 @@ {{'labels.inputs.Loan Schedule Type' | translate}} - {{ loanScheduleType.value }} + {{ loanScheduleType.value | translateCatalog }} @@ -68,7 +68,7 @@ - {{ transactionProcessingStrategy.name }} + {{ transactionProcessingStrategy.name | translateCatalog }} @@ -80,7 +80,7 @@ {{'labels.inputs.Loan Schedule Processing Type' | translate}} - {{ loanScheduleProcessingType.value }} + {{ loanScheduleProcessingType.value | translateCatalog }} @@ -189,7 +189,7 @@ {{'labels.inputs.Days in year' | translate}} - {{ daysInYearType.value }} + {{ daysInYearType.value | translateCatalog }} @@ -201,7 +201,7 @@ {{'labels.inputs.Days in month' | translate}} - {{ daysInMonthType.value }} + {{ daysInMonthType.value | translateCatalog }} @@ -282,7 +282,7 @@ {{'labels.inputs.Pre-closure interest calculation rule' | translate}} - {{ preClosureInterestCalculationStrategy.value }} + {{ preClosureInterestCalculationStrategy.value | translateCatalog }} @@ -294,7 +294,7 @@ {{'labels.inputs.Advance payments adjustment type' | translate}} - {{ rescheduleStrategyType.value }} + {{ rescheduleStrategyType.value | translateCatalog }} @@ -306,7 +306,7 @@ {{'labels.inputs.Interest recalculation compounding on' | translate}} - {{ interestRecalculationCompoundingType.value }} + {{ interestRecalculationCompoundingType.value | translateCatalog }} @@ -352,7 +352,7 @@ - {{ interestRecalculationNthDayType.value }} + {{ interestRecalculationNthDayType.value | translateCatalog }} @@ -365,7 +365,7 @@ - {{ interestRecalculationDayOfWeekType.value }} + {{ interestRecalculationDayOfWeekType.value | translateCatalog }} @@ -391,7 +391,7 @@ {{'labels.inputs.Frequency for recalculate Outstanding Principal' | translate}} - {{ interestRecalculationFrequencyType.value }} + {{ interestRecalculationFrequencyType.value | translateCatalog }} @@ -404,7 +404,7 @@ - {{ interestRecalculationNthDayType.value }} + {{ interestRecalculationNthDayType.value | translateCatalog }} @@ -417,7 +417,7 @@ - {{ interestRecalculationDayOfWeekType.value }} + {{ interestRecalculationDayOfWeekType.value | translateCatalog }} @@ -496,9 +496,9 @@ -

{{'labels.inputs.Configurable Terms and Settings' | translate}}

+

{{'labels.inputs.Configurable Terms and Settings' | translate}}

- + {{'labels.inputs.Allow overriding select terms and settings in loan accounts' | translate}} diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html index dd247f1b4..b2226a945 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.html @@ -37,7 +37,7 @@ {{'labels.inputs.Over Amount Calculation Type' | translate}} - {{ overAppliedCalculationType.value }} + {{ overAppliedCalculationType.value | translateCatalog }} @@ -127,7 +127,7 @@ {{'labels.inputs.Frequency' | translate}} - {{ interestRateFrequencyType.value }} + {{ interestRateFrequencyType.value | translateCatalog }} @@ -201,9 +201,9 @@
-

{{'labels.inputs.Principal by loan cycle' | translate}}

+

{{'labels.inputs.Principal by loan cycle' | translate}}

-
+
Name {{ 'labels.inputs.Name' | translate }} {{ overdueCharge.name + ', ' + overdueCharge.currency.displaySymbol }} Type {{ 'labels.inputs.Charge Type' | translate }} - {{ overdueCharge.chargeCalculationType.value }} + {{ overdueCharge.chargeCalculationType.value | translateCatalog }} Amount {{ 'labels.inputs.Amount' | translate }} - {{ overdueCharge.amount }} + {{ overdueCharge.amount | formatNumber }} Collected On {{ 'labels.inputs.Collected On' | translate }} - {{ overdueCharge.chargeTimeType.value }} + {{ overdueCharge.chargeTimeType.value | translateCatalog }} {{'labels.inputs.Type' | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} {{'labels.inputs.Amount' | translate}} - {{ charge.amount }} + {{ charge.amount | formatNumber }} {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }} {{'labels.inputs.Type' | translate}} - {{ overdueCharge.chargeCalculationType.value }} + {{ overdueCharge.chargeCalculationType.value | translateCatalog }} {{'labels.inputs.Amount' | translate}} - {{ overdueCharge.amount }} + {{ overdueCharge.amount | formatNumber }} {{'labels.inputs.Collected On' | translate}} - {{ overdueCharge.chargeTimeType.value }} + {{ overdueCharge.chargeTimeType.value | translateCatalog }} {{ 'labels.inputs.Payment Allocation Rule' | translate }} {{ paymentAllocation.value }} {{ paymentAllocation.value | translateCatalog }}
{{ 'labels.inputs.Credit Allocation Rule' | translate }} {{ creditAllocation.value }} {{ creditAllocation.value | translateCatalog }}
-

{{'labels.inputs.Number of repayments by loan cycle' | translate}}

+

{{'labels.inputs.Number of repayments by loan cycle' | translate}}

-
+
diff --git a/src/app/savings/savings-account-view/savings-account-view.component.html b/src/app/savings/savings-account-view/savings-account-view.component.html index d933ea6f4..b4f997636 100644 --- a/src/app/savings/savings-account-view/savings-account-view.component.html +++ b/src/app/savings/savings-account-view/savings-account-view.component.html @@ -102,7 +102,7 @@ - {{'labels.inputs.Savings Documents' | translate}} + {{'labels.inputs.Documents' | translate}} diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html index 9da92b05d..872f41c92 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.html @@ -34,9 +34,16 @@ {{ transaction.date | dateFormat }} + + {{"labels.inputs.External Id" | translate}} + + + + + {{"labels.inputs.Transaction Type" | translate}} - {{ transaction.transactionType.value }} + {{ transaction.transactionType.value | translateCatalog }} diff --git a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts index c047921b3..81311776b 100644 --- a/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts +++ b/src/app/savings/savings-account-view/transactions-tab/transactions-tab.component.ts @@ -30,7 +30,7 @@ export class TransactionsTabComponent implements OnInit { hideAccrualsParam: UntypedFormControl; hideReversedParam: UntypedFormControl; /** Columns to be displayed in transactions table. */ - displayedColumns: string[] = ['row', 'id', 'date', 'transactionType', 'debit', 'credit', 'balance', 'actions']; + displayedColumns: string[] = ['row', 'id', 'date', 'externalId', 'transactionType', 'debit', 'credit', 'balance', 'actions']; /** Data source for transactions table. */ dataSource: MatTableDataSource; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; diff --git a/src/app/savings/savings-account-view/view-charge/view-charge.component.html b/src/app/savings/savings-account-view/view-charge/view-charge.component.html index c42b23f3d..51871e06b 100644 --- a/src/app/savings/savings-account-view/view-charge/view-charge.component.html +++ b/src/app/savings/savings-account-view/view-charge/view-charge.component.html @@ -39,7 +39,7 @@
- Name + {{ 'labels.inputs.Name' | translate }}
@@ -47,15 +47,15 @@
- Charge Type + {{ 'labels.inputs.Charge Type' | translate }}
- {{ chargeData.penalty ? 'Penalty' : 'Fees' }} + {{ chargeData.penalty ? 'Penalty' : 'Fee' | translateCatalog }}
- Currency + {{ 'labels.inputs.Currency' | translate }}
@@ -63,15 +63,15 @@
- Payment due at + {{ 'labels.inputs.Payment due at' | translate }}
- {{ chargeData.chargeTimeType.value }} + {{ chargeData.chargeTimeType.value | translateCatalog }}
- Payment due as of + {{ 'labels.inputs.Payment due as of' | translate }}
@@ -79,15 +79,15 @@
- Calculation Type + {{ 'labels.inputs.Calculation Type' | translate }}
- {{ chargeData.chargeCalculationType.value }} + {{ chargeData.chargeCalculationType.value | translateCatalog }}
- Due + {{ 'labels.inputs.Due' | translate }}
@@ -95,7 +95,7 @@
- Paid + {{ 'labels.inputs.Paid' | translate }}
@@ -103,7 +103,7 @@
- Waived + {{ 'labels.inputs.Waived' | translate }}
@@ -111,7 +111,7 @@
- Outstanding + {{ 'labels.inputs.Outstanding' | translate }}
diff --git a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html index 01f821ee2..190bbb35d 100644 --- a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html +++ b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html @@ -1,6 +1,6 @@
-
+
{{'labels.inputs.Type' | translate}}: {{'labels.accounting.' + getAccountingRuleName(accountingRule.value) | translate}}
diff --git a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.ts b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.ts index 2c031d73f..30ed10a31 100644 --- a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.ts +++ b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.ts @@ -32,7 +32,7 @@ export class ViewSavingsAccountingDetailsComponent implements OnInit { } getAccountingRuleName(value: string): string { - return this.accounting.getAccountRuleName(value); + return this.accounting.getAccountRuleName(value.toUpperCase()); } } diff --git a/src/app/shared/tabs/entity-documents-tab/entity-documents-tab.component.ts b/src/app/shared/tabs/entity-documents-tab/entity-documents-tab.component.ts index 45bc21233..8d9254f01 100644 --- a/src/app/shared/tabs/entity-documents-tab/entity-documents-tab.component.ts +++ b/src/app/shared/tabs/entity-documents-tab/entity-documents-tab.component.ts @@ -65,7 +65,7 @@ export class EntityDocumentsTabComponent implements OnInit { uploadDocument() { const uploadDocumentDialogRef = this.dialog.open(UploadDocumentDialogComponent, { - data: { documentIdentifier: false, entityType: 'Loan' } + data: { documentIdentifier: false, entityType: '' } }); uploadDocumentDialogRef.afterClosed().subscribe((dialogResponse: any) => { if (dialogResponse) { diff --git a/src/app/shared/tabs/entity-notes-tab/entity-notes-tab.component.html b/src/app/shared/tabs/entity-notes-tab/entity-notes-tab.component.html index fab896c85..77418f325 100644 --- a/src/app/shared/tabs/entity-notes-tab/entity-notes-tab.component.html +++ b/src/app/shared/tabs/entity-notes-tab/entity-notes-tab.component.html @@ -5,8 +5,8 @@
- - + +