From d846a8068fee4b684afb41c6e5352cad611d51a0 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Sat, 20 Apr 2024 17:43:21 -0500 Subject: [PATCH] Fixed Deposit products with i18n --- ...eposit-account-preview-step.component.html | 2 +- ...posits-account-preview-step.component.html | 2 +- .../general-tab/general-tab.component.html | 9 - .../loans-account-preview-step.component.html | 2 +- ...reate-fixed-deposit-product.component.html | 16 +- .../edit-fixed-deposit-product.component.html | 16 +- ...sit-product-accounting-step.component.html | 314 +++++++++--------- ...posit-product-accounting-step.component.ts | 4 + ...eposit-product-charges-step.component.html | 20 +- ...posit-product-currency-step.component.html | 16 +- ...eposit-product-details-step.component.html | 16 +- ...ct-interest-rate-chart-step.component.html | 65 ++-- ...duct-interest-rate-chart-step.component.ts | 34 +- ...eposit-product-preview-step.component.html | 132 ++++---- ...posit-product-settings-step.component.html | 46 +-- ...-deposit-product-terms-step.component.html | 30 +- .../fixed-deposit-products.component.html | 26 +- .../fixed-deposit-general-tab.component.html | 137 ++++---- .../view-fixed-deposit-product.component.html | 2 +- ...ct-interest-rate-chart-step.component.html | 8 +- ...avings-account-charges-step.component.html | 45 +-- ...avings-account-details-step.component.html | 18 +- ...avings-account-preview-step.component.html | 105 +++--- .../savings-account-terms-step.component.html | 54 +-- src/assets/translations/es-MX.json | 16 +- 25 files changed, 570 insertions(+), 565 deletions(-) diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html index 0d870ff5c..7079c6ea3 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-preview-step/fixed-deposit-account-preview-step.component.html @@ -349,7 +349,7 @@ {{"labels.buttons.Previous" | translate }} - - - - - - - - - - - - - - - - - - - - - - -
Fees - {{ feesIncome.chargeId | find:chargeData:'id':'name' }} - Income Account - {{ feesIncome.incomeAccountId | find:incomeAccountData:'id':'name' }} - Actions - - -
- -

Map Penalties to Specific Income Accounts

- -
- -
- - - - - - - - - - - - - - - - - - - - - - -
Penalty - {{ penaltyIncome.chargeId | find:penaltyData:'id':'name' }} - Income Account - {{ penaltyIncome.incomeAccountId | find:incomeAccountData:'id':'name' }} - Actions - - -
- -
- + \ No newline at end of file diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts index 1c0cfe8e3..6bb8938b7 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-accounting-step/fixed-deposit-product-accounting-step.component.ts @@ -119,6 +119,10 @@ export class FixedDepositProductAccountingStepComponent implements OnInit { }); } + existCharges(): boolean { + return (this.chargeData.length > 0); + } + setConditionalControls() { this.fixedDepositProductAccountingForm.get('accountingRule').valueChanges .subscribe((accountingRule: any) => { diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.html index 55c491681..f15947943 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-charges-step/fixed-deposit-product-charges-step.component.html @@ -1,7 +1,7 @@
- Charge + {{'labels.inputs.Charge' | translate}} {{ charge.name }} @@ -12,42 +12,42 @@
- + - + - + - + - +
Name {{'labels.inputs.Name' | translate}} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate}} {{ charge.chargeCalculationType.value }} Amount {{'labels.inputs.Amount' | translate}} - {{ charge.amount }} + {{ charge.amount | formatNumber }} Collected On {{'labels.inputs.Collected On' | translate}} {{ charge.chargeTimeType.value }} Actions {{'labels.inputs.Actions' | translate}} diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-currency-step/fixed-deposit-product-currency-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-currency-step/fixed-deposit-product-currency-step.component.html index 19cdba081..f050539be 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-currency-step/fixed-deposit-product-currency-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-currency-step/fixed-deposit-product-currency-step.component.html @@ -3,30 +3,30 @@
- Currency + {{'labels.inputs.Currency' | translate}} {{ currency.name }} - Currency is required + {{'labels.inputs.Currency' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Decimal Places + {{'labels.inputs.Decimal Places' | translate}} - Decimal Places is required + {{'labels.inputs.Decimal Places' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Currency in multiples of + {{'labels.inputs.Currency in multiples of' | translate}} - Currency in multiples of is required + {{'labels.inputs.Currency in multiples of' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} @@ -35,10 +35,10 @@
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-details-step/fixed-deposit-product-details-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-details-step/fixed-deposit-product-details-step.component.html index 41a8b270e..72d2b6f09 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-details-step/fixed-deposit-product-details-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-details-step/fixed-deposit-product-details-step.component.html @@ -3,26 +3,26 @@
- Product Name + {{'labels.inputs.Product Name' | translate}} - Product Name is required + {{'labels.inputs.Product Name' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Short Name + {{'labels.inputs.Short Name' | translate}} - Short Name is required + {{'labels.inputs.Short Name' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Description + {{'labels.inputs.Description' | translate}} - Description is required + {{'labels.inputs.Description' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} @@ -31,10 +31,10 @@
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html index 3b3379bba..23cefbe2d 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.html @@ -2,14 +2,14 @@
-

Interest Rate Chart{{ 'labels.inputs.Interest Rate Chart' | translate}}

-
+
@@ -28,52 +28,55 @@
- Name + {{ 'labels.inputs.Name' | translate}} - Valid from Date + {{ 'labels.inputs.From Date' | translate}} - Valid from Date is required + Valid from Date {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - End Date + {{ 'labels.inputs.End Date' | translate}} - Description + {{ 'labels.inputs.Description' | translate}}
- Is primary grouping by amount? + {{ 'labels.inputs.Is primary grouping by amount?' | translate}} +
+ +
-

It is required to add at least one Slab

+

{{ 'labels.heading.It is required to add at least one Slab' | translate}}

- + + - + - + - + @@ -134,15 +137,15 @@ -

- Incentives +

+ {{ 'labels.heading.Incentives' | translate}}

-
+
@@ -150,28 +153,28 @@ *ngIf="chartSlab.incentives.length"> -
+ - + - + - + + - + - + + + - + - + - + @@ -219,13 +219,13 @@

- Incentives + {{'labels.heading.Incentives' | translate}}

Period {{ 'labels.inputs.Period' | translate}} {{ chartSlab.fromPeriod + ' - ' + chartSlab.toPeriod + ' ' + (chartSlab.periodType | find:periodTypeData:'id':'value') }} @@ -81,28 +84,28 @@ - Amount Range {{ 'labels.inputs.Amount Range' | translate}} {{ chartSlab.amountRangeFrom + ' - ' + chartSlab.amountRangeTo }} Interest {{ 'labels.inputs.Interest' | translate}} {{ chartSlab.annualInterestRate }} % Description {{ 'labels.inputs.Description' | translate}} {{ chartSlab.description }} Actions {{ 'labels.inputs.Actions' | translate}} Entity Type {{ 'labels.inputs.Entity Type' | translate}} {{ incentive.entityType | find:entityTypeData:'id':'value' }} Attribute Name {{ 'labels.inputs.Attribute Name' | translate}} {{ incentive.attributeName | find:attributeNameData:'id':'value' }} Condition Type {{ 'labels.inputs.Condition Type' | translate}} {{ incentive.conditionType | find:conditionTypeData:'id':'value' }} Attribute Value {{ 'labels.inputs.Attribute Value' | translate}} {{ incentive.attributeValue | find:genderData:'id':'name' }} {{ incentive.attributeValue }} @@ -182,21 +185,21 @@ - Incentive Type {{ 'labels.inputs.Incentive Type' | translate}} {{ incentive.incentiveType | find:incentiveTypeData:'id':'value'}} Interest {{ 'labels.inputs.Interest' | translate}} {{ incentive.amount }} Actions {{ 'labels.inputs.Actions' | translate}} diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts index 7ad9261f1..775b54663 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-interest-rate-chart-step/fixed-deposit-product-interest-rate-chart-step.component.ts @@ -18,6 +18,7 @@ import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base'; /** Custom Services */ import { SettingsService } from 'app/settings/settings.service'; import { Dates } from 'app/core/utils/dates'; +import { TranslateService } from '@ngx-translate/core'; @Component({ selector: 'mifosx-fixed-deposit-product-interest-rate-chart-step', @@ -67,7 +68,8 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit constructor(private formBuilder: UntypedFormBuilder, public dialog: MatDialog, private dateUtils: Dates, - private settingsService: SettingsService) { + private settingsService: SettingsService, + private translateService: TranslateService) { this.createFixedDepositProductInterestRateChartForm(); } @@ -314,7 +316,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit getData(formType: string, values?: any) { switch (formType) { - case 'Slab': return { title: 'Slab', formfields: this.getSlabFormfields(values) }; + case 'Slab': return { title: this.translateService.instant('labels.inputs.Slab'), formfields: this.getSlabFormfields(values) }; case 'Incentive': return { values, chartTemplate: this.fixedDepositProductsTemplate.chartTemplate }; } } @@ -323,7 +325,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit const formfields: FormfieldBase[] = [ new SelectBase({ controlName: 'periodType', - label: 'Period Type', + label: this.translateService.instant('labels.inputs.Period Type'), value: values ? values.periodType : this.periodTypeData[0].id, options: { label: 'value', value: 'id', data: this.periodTypeData }, required: true, @@ -331,7 +333,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit }), new InputBase({ controlName: 'fromPeriod', - label: 'Period From', + label: this.translateService.instant('labels.inputs.Period From'), value: values ? values.fromPeriod : undefined, type: 'number', required: true, @@ -339,28 +341,28 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit }), new InputBase({ controlName: 'toPeriod', - label: 'Period To', + label: this.translateService.instant('labels.inputs.Period To'), value: values ? values.toPeriod : undefined, type: 'number', order: 3 }), new InputBase({ controlName: 'amountRangeFrom', - label: 'Amount Range From', + label: this.translateService.instant('labels.inputs.Amount Range From'), value: values ? values.amountRangeFrom : undefined, type: 'number', order: 4 }), new InputBase({ controlName: 'amountRangeTo', - label: 'Amount Range To', + label: this.translateService.instant('labels.inputs.Amount Range To'), value: values ? values.amountRangeTo : undefined, type: 'number', order: 5 }), new InputBase({ controlName: 'annualInterestRate', - label: 'Interest', + label: this.translateService.instant('labels.inputs.Interest'), value: values ? values.annualInterestRate : undefined, type: 'number', required: true, @@ -368,7 +370,7 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit }), new InputBase({ controlName: 'description', - label: 'Description', + label: this.translateService.instant('labels.inputs.Description'), value: values ? values.description : undefined, required: true, order: 7 @@ -380,13 +382,19 @@ export class FixedDepositProductInterestRateChartStepComponent implements OnInit get fixedDepositProductInterestRateChart() { // TODO: Update once language and date settings are setup const locale = this.settingsService.language.code; - const dateFormat = this.settingsService.dateFormat; + const dateFormat = 'YYYY-MM-DD'; const fixedDepositProductInterestRateChart = this.fixedDepositProductInterestRateChartForm.value; for (const chart of fixedDepositProductInterestRateChart.charts) { - chart.dateFormat = dateFormat; chart.locale = locale; - chart.fromDate = this.dateUtils.formatDate(chart.fromDate, dateFormat) || ''; - chart.endDate = this.dateUtils.formatDate(chart.endDate, dateFormat) || ''; + chart.dateFormat = 'yyyy-MM-dd'; + if (chart.fromDate instanceof Date) { + chart.fromDate = this.dateUtils.formatDateAsString(chart.fromDate, dateFormat); + } + if (chart.endDate) { + if (chart.endDate instanceof Date) { + chart.endDate = this.dateUtils.formatDateAsString(chart.endDate, dateFormat); + } + } if (chart.endDate === '') { delete chart.endDate; } diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html index 1c979b41e..0d1109cb7 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-preview-step/fixed-deposit-product-preview-step.component.html @@ -4,46 +4,46 @@ -

Details

+

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

- Short Name: + {{'labels.inputs.Short Name' | translate}}: {{ fixedDepositProduct.shortName }}
- Description: + {{'labels.inputs.Description' | translate}}: {{ fixedDepositProduct.description }}
-

Currency

+

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

- Currency: + {{'labels.inputs.Currency' | translate}}: {{ fixedDepositProduct.currencyCode | find:fixedDepositProductsTemplate.currencyOptions:'code':'name' }}
- Decimal Places: + {{'labels.inputs.Decimal Places' | translate}}: {{ fixedDepositProduct.digitsAfterDecimal }}
- Currency in multiples of: + {{'labels.inputs.Currency in multiples of' | translate}}: {{ fixedDepositProduct.inMultiplesOf }}
-

Terms

+

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

- Deposit Amount: + {{'labels.inputs.Deposit Amount' | translate}}: {{ fixedDepositProduct.depositAmount + ' (Min: ' + (fixedDepositProduct.minDepositAmount ? fixedDepositProduct.minDepositAmount : fixedDepositProduct.depositAmount) + ', Max: ' + (fixedDepositProduct.maxDepositAmount ? fixedDepositProduct.maxDepositAmount : fixedDepositProduct.depositAmount) @@ -51,85 +51,85 @@
- Interest Compounding Period: + {{'labels.inputs.Interest Compounding Period' | translate}}: {{ fixedDepositProduct.interestCompoundingPeriodType | find:fixedDepositProductsTemplate.interestCompoundingPeriodTypeOptions:'id':'value' }}
- Interest Posting Period: + {{'labels.inputs.Interest Posting Period' | translate}}: {{ fixedDepositProduct.interestPostingPeriodType | find:fixedDepositProductsTemplate.interestPostingPeriodTypeOptions:'id':'value' }}
- Interest Calculated using: + {{'labels.inputs.Interest Calculated using' | translate}}: {{ fixedDepositProduct.interestCalculationType | find:fixedDepositProductsTemplate.interestCalculationTypeOptions:'id':'value' }}
- Days in Year: + {{'labels.inputs.Days in Year' | translate}}: {{ fixedDepositProduct.interestCalculationDaysInYearType | find:fixedDepositProductsTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' }}
-

Settings

+

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

- Lock-in Period: + {{'labels.inputs.Lock-in Period' | translate}}: {{ fixedDepositProduct.lockinPeriodFrequency + ' ' + (fixedDepositProduct.lockinPeriodFrequencyType | find:fixedDepositProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') }}
- Minimum Deposit Term: + {{'labels.inputs.Minimum Deposit Term' | translate}}: {{ fixedDepositProduct.minDepositTerm + ' ' + (fixedDepositProduct.minDepositTermTypeId | find:fixedDepositProductsTemplate.periodFrequencyTypeOptions:'id':'value') }}
- And thereafter, in Multiples of: + {{'labels.inputs.And thereafter, in Multiples of' | translate}}: {{ fixedDepositProduct.inMultiplesOfDepositTerm + ' ' + (fixedDepositProduct.inMultiplesOfDepositTermTypeId | find:fixedDepositProductsTemplate.periodFrequencyTypeOptions:'id':'value') }}
- Maximum Deposit Term: + {{'labels.inputs.Maximum Deposit Term' | translate}}: {{ fixedDepositProduct.maxDepositTerm + ' ' + (fixedDepositProduct.maxDepositTermTypeId | find:fixedDepositProductsTemplate.periodFrequencyTypeOptions:'id':'value') }}
- Apply Penal Interest (less): + {{'labels.inputs.Apply Penal Interest (less)' | translate}}: {{ fixedDepositProduct.preClosurePenalApplicable | yesNo }}
- Penal Interest (%): + {{'labels.inputs.Penal Interest' | translate}} (%): {{ fixedDepositProduct.preClosurePenalInterest + '% (' + (fixedDepositProduct.preClosurePenalInterestOnTypeId | find:fixedDepositProductsTemplate.preClosurePenalInterestOnTypeOptions:'id':'value') + ')' }}
- Withhold Tax is Applicable: + {{'labels.inputs.Withhold Tax is Applicable' | translate}}: {{ fixedDepositProduct.withHoldTax | yesNo }}
- Tax Group: + {{'labels.inputs.Tax Group' | translate}}: {{ fixedDepositProduct.taxGroupId | find:fixedDepositProductsTemplate.taxGroupOptions:'id':'name' }}
-

Interest Rate Charts

+

{{'labels.heading.Interest Rate Charts' | translate}}

@@ -137,27 +137,27 @@ fxLayout.lt-md="column">
- Name: + {{'labels.inputs.Name' | translate}}: {{ chart.name }}
- Description: + {{'labels.inputs.Description' | translate}}: {{ chart.description }}
- Valid from Date: + {{'labels.inputs.From Date' | translate}}: {{ chart.fromDate | dateFormat }}
- End Date: + {{'labels.inputs.End Date' | translate}}: {{ chart.endDate | dateFormat }}
- Primary Grouping by Amount: + {{'labels.inputs.Primary Grouping by Amount' | translate}}: {{ fixedDepositProduct.isPrimaryGroupingByAmount | yesNo }}
@@ -165,7 +165,7 @@ *ngIf="chart.chartSlabs.length !== 0" multiTemplateDataRows> -
Period {{'labels.inputs.Period' | translate}} {{ chartSlab.fromPeriod + ' - ' + chartSlab.toPeriod + ' ' + (chartSlab.periodType | find:fixedDepositProductsTemplate.chartTemplate.periodTypes:'id':'value') }} @@ -173,39 +173,39 @@ - Amount Range {{'labels.inputs.Amount Range' | translate}} {{ chartSlab.amountRangeFrom + ' - ' + chartSlab.amountRangeTo }} Interest {{'labels.inputs.Interest' | translate}} {{ chartSlab.annualInterestRate }} Description {{'labels.inputs.Description' | translate}} {{ chartSlab.description }} Actions {{'labels.inputs.Actions' | translate}}
- + + + + + + @@ -301,35 +301,35 @@
-

Charges

+

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

Entity Type {{'labels.inputs.Entity Type' | translate}} {{ incentive.entityType | find:fixedDepositProductsTemplate.chartTemplate.entityTypeOptions:'id':'value' }} @@ -233,7 +233,7 @@ - Attribute Name {{'labels.inputs.Attribute Name' | translate}} {{ incentive.attributeName | find:fixedDepositProductsTemplate.chartTemplate.attributeNameOptions:'id':'value' }} @@ -241,7 +241,7 @@ - Condition Type {{'labels.inputs.Condition Type' | translate}} {{ incentive.conditionType | find:fixedDepositProductsTemplate.chartTemplate.conditionTypeOptions:'id':'value' }} @@ -249,7 +249,7 @@ - Attribute Value {{'labels.inputs.Attribute Value' | translate}} {{ incentive.attributeValue | find:fixedDepositProductsTemplate.chartTemplate.genderOptions:'id':'name' }} @@ -263,7 +263,7 @@ - Incentive Type {{'labels.inputs.Incentive Type' | translate}} {{ incentive.incentiveType | find:fixedDepositProductsTemplate.chartTemplate.incentiveTypeOptions:'id':'value'}} @@ -271,9 +271,9 @@ - Amount {{'labels.inputs.Amount' | translate}} - {{ incentive.amount }} + {{ incentive.amount | formatNumber}}
- + - + - + - + @@ -342,41 +342,39 @@ -

Accounting

+

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

- +
-

Advanced Accounting Rules

+

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

-

Fund Sources for Payment Channels

+

{{'labels.heading.Fund Sources for Payment Channels' | translate}}

Name {{'labels.inputs.Name' | translate}} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate}} {{ charge.chargeCalculationType.value }} Amount {{'labels.inputs.Amount' | translate}} {{ charge.amount }} Collected On {{'labels.inputs.Collected On' | translate}} {{ charge.chargeTimeType.value }}
- + - +
Payment Type {{'labels.inputs.Payment Type' | translate}} {{ paymentFundSource.paymentTypeId | find:fixedDepositProductsTemplate.paymentTypeOptions:'id':'name' }} Fund Source {{'labels.inputs.Fund Source' | translate}} {{ paymentFundSource.fundSourceAccountId | find:fixedDepositProductsTemplate.accountingMappingOptions.assetAccountOptions:'id':'name' }} @@ -393,20 +391,20 @@
-

Fees to Specific Income Accounts

+

{{'labels.heading.Fees to Specific Income Accounts' | translate}}

- + - +
Fees {{'labels.inputs.Fees' | translate}} {{ feesIncome.chargeId | find:fixedDepositProductsTemplate.chargeOptions:'id':'name' }} Income Account {{'labels.inputs.Income Account' | translate}} {{ feesIncome.incomeAccountId | find:fixedDepositProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} @@ -423,20 +421,20 @@
-

Penalties to Specific Income Accounts

+

{{'labels.heading.Penalties to Specific Income Accounts' | translate}}

- + - +
Penalty {{'labels.inputs.Penalty' | translate}} {{ penaltyIncome.chargeId | find:fixedDepositProductsTemplate.penaltyOptions:'id':'name' }} Income Account {{'labels.inputs.Income Account' | translate}} {{ penaltyIncome.incomeAccountId | find:fixedDepositProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }} @@ -457,12 +455,12 @@
-
+ \ No newline at end of file diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-settings-step/fixed-deposit-product-settings-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-settings-step/fixed-deposit-product-settings-step.component.html index 2815423fb..87bf19c5d 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-settings-step/fixed-deposit-product-settings-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-settings-step/fixed-deposit-product-settings-step.component.html @@ -2,15 +2,15 @@
-

Lock-in Period

+

{{'labels.inputs.Lock-in Period' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} {{ lockinPeriodFrequencyType.value }} @@ -18,37 +18,37 @@ -

Minimum Deposit Term

+

{{'labels.inputs.Minimum Deposit Term' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Minimum Deposit Term Frequency is required + {{'labels.inputs.Minimum Deposit Term Frequency' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Frequency Type + {{'labels.inputs.Frequency Type' | translate}} {{ periodFrequencyType.value }} - Minimum Deposit Term Frequency Type is required + {{'labels.inputs.Minimum Deposit Term Frequency Type' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} -

And thereafter, in Multiples of

+

{{'labels.heading.And thereafter, in Multiples of' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} {{ periodFrequencyType.value }} @@ -56,15 +56,15 @@ -

Maximum Deposit Term

+

{{'labels.inputs.Maximum Deposit Term' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} {{ periodFrequencyType.value }} @@ -74,19 +74,19 @@ -

For Pre-mature closure

+

{{'labels.heading.For Pre-mature closure' | translate}}

- Apply Penal Interest (less) + {{'labels.inputs.Apply Penal Interest (less)' | translate}} - Penal Interest (%) + {{'labels.inputs.Penal Interest' | translate}} (%) - Period + {{'labels.inputs.Period' | translate}} {{ preClosurePenalInterestOnType.value }} @@ -97,18 +97,18 @@ - Is Withhold Tax Applicable? + {{'labels.inputs.Is Withhold Tax Applicable' | translate}} - Tax Group + {{'labels.inputs.Tax Group' | translate}} {{ taxGroup.name }} - Tax Group is required + {{'labels.inputs.Tax Group' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} @@ -117,10 +117,10 @@
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html index 5f388634a..69ba2c306 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-product-stepper/fixed-deposit-product-terms-step/fixed-deposit-product-terms-step.component.html @@ -2,23 +2,23 @@
-

Deposit Amount

+

{{'labels.inputs.Deposit Amount' | translate}}

- Minimum + {{'labels.inputs.Minimum' | translate}} - Default + {{'labels.inputs.Default' | translate}} - Default Deposit Amount is required + {{'labels.inputs.Default Deposit Amount' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Maximum + {{'labels.inputs.Maximum' | translate}} @@ -26,50 +26,50 @@ - Interest Compounding Period + {{'labels.inputs.Interest Compounding Period' | translate}} {{ interestCompoundingPeriodType.value }} - Interest Compounding Period is required + {{'labels.inputs.Interest Compounding Period' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Interest Posting Period + {{'labels.inputs.Interest Posting Period' | translate}} {{ interestPostingPeriodType.value }} - Interest Posting Period is required + {{'labels.inputs.Interest Posting Period' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Interest Calculated using + {{'labels.inputs.Interest Calculated using' | translate}} {{ interestCalculationType.value }} - Interest Calculated using is required + {{'labels.inputs.Interest Calculated using' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Days in Year + {{'labels.inputs.Days in Year' | translate}} {{ interestCalculationDaysInYearType.value }} - Days in Year is required + {{'labels.inputs.Days in Year' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} @@ -78,10 +78,10 @@
diff --git a/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html b/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html index e8f6defc7..ccfd0064f 100644 --- a/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html +++ b/src/app/products/fixed-deposit-products/fixed-deposit-products.component.html @@ -2,7 +2,7 @@
@@ -21,12 +21,12 @@ - + - + @@ -45,26 +45,26 @@

Create fixed deposit product

This option allows you to create new fixed deposit product.

- - - + + +

Search bar to filter fixed deposit products.

- - - + + +
-

List of fixed deposit products in the organization. For more details click: Fixed Deposit Products

+

List of fixed deposit products in the organization. For more details click: {{'labels.inputs.Fixed Deposit Products' | translate}}

- - - + + +
diff --git a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html index d946895bb..b492d7e9c 100644 --- a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html +++ b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/fixed-deposit-general-tab/fixed-deposit-general-tab.component.html @@ -1,6 +1,7 @@
@@ -15,45 +16,45 @@ -

Details

+

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

- Short Name: + {{'labels.inputs.Short Name' | translate}}: {{ fixedDepositProductData.shortName }}
- Description: + {{'labels.inputs.Description' | translate}}: {{ fixedDepositProductData.description }}
-

Currency

+

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

- Currency: - {{ fixedDepositProductData.currency.name }} + {{'labels.heading.Currency' | translate}}: + ({{ fixedDepositProductData.currency.code }}) {{ fixedDepositProductData.currency.name }}
- Decimal Places: + {{'labels.inputs.Decimal Places' | translate}}: {{ fixedDepositProductData.currency.decimalPlaces }}
- Currency in Multiples Of: + {{'labels.inputs.Currency in multiples of' | translate}}: {{ fixedDepositProductData.currency.inMultiplesOf | formatNumber}}
-

Terms

+

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

- Deposit Amount: + {{'labels.inputs.Deposit Amount' | translate}}: {{ fixedDepositProductData.depositAmount + ' (Min: ' + (fixedDepositProductData.minDepositAmount ? fixedDepositProductData.minDepositAmount : fixedDepositProductData.depositAmount) + ', Max: ' + (fixedDepositProductData.maxDepositAmount ? @@ -61,38 +62,38 @@
- Interest Compounding Period: + {{'labels.inputs.Interest Compounding Period' | translate}}: {{ fixedDepositProductData.interestCompoundingPeriodType.value }}
- Interest Posting Period: + {{'labels.inputs.Interest Posting Period' | translate}}: {{ fixedDepositProductData.interestPostingPeriodType.value }}
- Interest Calculated Using: + {{'labels.inputs.Interest Calculated Using' | translate}}: {{ fixedDepositProductData.interestCalculationType.value }}
- Days in Years: + {{'labels.inputs.Days in Year' | translate}}: {{ fixedDepositProductData.interestCalculationDaysInYearType.value }}
-

Settings

+

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

- Lock-in Period: + {{'labels.inputs.Lock-in Period' | translate}}: {{ fixedDepositProductData.lockinPeriodFrequency }} {{ fixedDepositProductData.lockinPeriodFrequencyType.value }}
- Minimum Deposit Term: + {{'labels.inputs.Minimum Deposit Term' | translate}}: {{ fixedDepositProductData.minDepositTerm }}   @@ -100,7 +101,7 @@
- Maximum Deposit Term: + {{'labels.inputs.Maximum Deposit Term' | translate}}: {{ fixedDepositProductData.maxDepositTerm }}   @@ -108,69 +109,69 @@
- Deposit Term In multiple of: + {{'labels.inputs.Deposit Term In multiple of' | translate}}: {{ fixedDepositProductData.inMultiplesOfDepositTerm }} - {{ fixedDepositProductData.inMultiplesOfDepositTermType.value }}
- Apply Penal Interest (less): + {{'labels.inputs.Apply Penal Interest (less)' | translate}}: {{ fixedDepositProductData.preClosurePenalApplicable | yesNo }}
- Penal Interest (%): + {{'labels.inputs.Penal Interest' | translate}} (%): {{fixedDepositProductData.preClosurePenalInterest}}     %     On    {{fixedDepositProductData.preClosurePenalInterestOnType.value}}
- Balance Required For Interest Calculation: + {{'labels.inputs.Balance Required For Interest Calculation' | translate}}: {{ fixedDepositProductData.minBalanceForInterestCalculation | formatNumber }}
- Is withhold tax Applicable: + {{'labels.inputs.Withhold Tax is Applicable' | translate}}: {{ fixedDepositProductData.withHoldTax | yesNo }}
- Withhold Tax group: + {{'labels.inputs.Withhold Tax group' | translate}}: {{ fixedDepositProductData.taxGroup.name }}
-

Interest Rate Chart

+

{{'labels.heading.Interest Rate Chart' | translate}}

- Name: + {{'labels.inputs.Name' | translate}}: {{ fixedDepositProductData.activeChart.name }}
- Description: + {{'labels.inputs.Description' | translate}}: {{ fixedDepositProductData.activeChart.description }}
- Valid from Date: + {{'labels.inputs.From Date' | translate}}: {{ fixedDepositProductData.activeChart.fromDate | dateFormat }}
- End Date: + {{'labels.inputs.End Date' | translate}}: {{ fixedDepositProductData.activeChart.endDate | dateFormat }}
- Primary Grouping by Amount: + {{'labels.inputs.Primary Grouping by Amount' | translate}}: {{ fixedDepositProductData.activeChart.isPrimaryGroupingByAmount | yesNo }}
@@ -178,7 +179,7 @@ [dataSource]="fixedDepositProductData.activeChart.chartSlabs" multiTemplateDataRows> -
+ + + - + - + @@ -241,13 +242,13 @@

- Incentives + {{'labels.heading.Incentives' | translate}}

Name {{'labels.inputs.Name' | translate}} {{ fixedDepositProduct.name }} Short Name {{'labels.inputs.Short Name' | translate}} {{ fixedDepositProduct.shortName }} Period {{'labels.inputs.Period' | translate}}
{{ chartSlab.fromPeriod }} - {{ chartSlab.toPeriod }} {{ chartSlab.periodType.value }} @@ -190,7 +191,7 @@ -
Amount Range {{'labels.inputs.Amount Range' | translate}}
{{ chartSlab.amountRangeFrom }} - {{ chartSlab.amountRangeTo }} @@ -203,31 +204,31 @@ -
Interest {{'labels.inputs.Interest' | translate}} {{ chartSlab.annualInterestRate }} % Description {{'labels.inputs.Description' | translate}} {{ chartSlab.description }} Actions {{'labels.inputs.Actions' | translate}}
- + + + + + + @@ -322,35 +323,35 @@
-

Charges

+

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

Entity Type {{'labels.inputs.Entity Type' | translate}} {{ incentive.entityType | find:fixedDepositProductsTemplate.chartTemplate.entityTypeOptions:'id':'value' }} @@ -255,7 +256,7 @@ - Attribute Name {{'labels.inputs.Attribute Name' | translate}} {{ incentive.attributeName | find:fixedDepositProductsTemplate.chartTemplate.attributeNameOptions:'id':'value' }} @@ -263,7 +264,7 @@ - Condition Type {{'labels.inputs.Condition Type' | translate}} {{ incentive.conditionType | find:fixedDepositProductsTemplate.chartTemplate.conditionTypeOptions:'id':'value' }} @@ -271,7 +272,7 @@ - Attribute Value {{'labels.inputs.Attribute Value' | translate}} {{ incentive.attributeValue | find:fixedDepositProductsTemplate.chartTemplate.genderOptions:'id':'name' }} @@ -285,7 +286,7 @@ - Incentive Type {{'labels.inputs.Incentive Type' | translate}} {{ incentive.incentiveType | find:fixedDepositProductsTemplate.chartTemplate.incentiveTypeOptions:'id':'value'}} @@ -293,9 +294,9 @@ - Amount {{'labels.inputs.Amount' | translate}} - {{ incentive.amount }} + {{ incentive.amount | formatNumber }}
- + - + - + - + @@ -363,42 +364,42 @@ -

Accounting

+

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

+ [accountingRule]="fixedDepositProductData.accountingRule" + [accountingMappings]="fixedDepositProductData.accountingMappings">
-

Advanced Accounting Rules

+

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

-
-

Configure Fund Sources for Payment Channels

+
+

{{'labels.inputs.Configure Fund Sources for Payment Channels' | translate}} +

Name {{'labels.inputs.Name' | translate}} {{ charge.name }} Type {{'labels.inputs.Type' | translate}} {{ charge.chargeCalculationType.value }} Amount {{'labels.inputs.Amount' | translate}} {{ charge.amount | formatNumber }} Collected On {{'labels.inputs.Collected On' | translate}} {{ charge.chargeTimeType.value }}
- + - + @@ -414,20 +415,20 @@
-

Fees to Specific Income Accounts

+

{{'labels.inputs.Fees to Specific Income Accounts' | translate}}

Payment Type {{'labels.inputs.Payment Type' | translate}} {{ paymentFundSource.paymentType.name }} Fund Source {{'labels.inputs.Fund Source' | translate}} {{ paymentFundSource.fundSourceAccount.name }}
- + - + @@ -443,20 +444,20 @@
-

Penalties to Specific Income Accounts

+

{{'labels.heading.Penalties to Specific Income Accounts' | translate}}

Fees {{'labels.inputs.Fees' | translate}} {{ feesIncome.charge.name }} Income Account {{'labels.inputs.Income Account' | translate}} {{ feesIncome.incomeAccount.name }}
- + - + @@ -477,4 +478,4 @@ - + \ No newline at end of file diff --git a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/view-fixed-deposit-product.component.html b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/view-fixed-deposit-product.component.html index afc8aaae4..898228d27 100644 --- a/src/app/products/fixed-deposit-products/view-fixed-deposit-product/view-fixed-deposit-product.component.html +++ b/src/app/products/fixed-deposit-products/view-fixed-deposit-product/view-fixed-deposit-product.component.html @@ -5,7 +5,7 @@ + - + - + + - + + + - + + - + - + @@ -135,10 +136,10 @@
-
+ \ No newline at end of file diff --git a/src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.html b/src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.html index 74203964b..146de4862 100644 --- a/src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.html +++ b/src/app/savings/savings-account-stepper/savings-account-details-step/savings-account-details-step.component.html @@ -3,30 +3,30 @@
- Product Name + {{'labels.inputs.Product Name' | translate}} {{ product.name }} - Product Name is required + {{'labels.inputs.Product Name' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Submitted On + {{'labels.inputs.Submitted On' | translate}} - Submission Date is required + {{'labels.inputs.Submitted On' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Field Officer + {{'labels.inputs.Field Officer' | translate}} {{ officer.displayName }} @@ -35,7 +35,7 @@ - External ID + {{'labels.inputs.External ID' | translate}} @@ -44,12 +44,12 @@
- + \ No newline at end of file diff --git a/src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html b/src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html index 8b1964af0..ca9b06b08 100644 --- a/src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html +++ b/src/app/savings/savings-account-stepper/savings-account-preview-step/savings-account-preview-step.component.html @@ -1,151 +1,158 @@
-

Details

+

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

- Product + {{'labels.inputs.Product' | translate}} {{ savingsAccount.productId | find:savingsAccountTemplate.productOptions:'id':'name' }}
- Submitted On + {{'labels.inputs.Submitted On' | translate}} {{ savingsAccount.submittedOnDate | dateFormat }}
- External Id + {{'labels.inputs.External Id' | translate}} - Unassigned + {{'labels.inputs.Unassigned' | translate}}
- Field Officer - {{ savingsAccount.fieldOfficerId | find:savingsAccountProductTemplate.fieldOfficerOptions:'id':'displayName' }} + {{'labels.inputs.Field Officer' | translate}} + {{ savingsAccount.fieldOfficerId | + find:savingsAccountProductTemplate.fieldOfficerOptions:'id':'displayName' }}
-

Terms

+

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

- Currency - {{ savingsAccountTermsForm.get('currencyCode').value }} + {{'labels.inputs.Currency' | translate}} + {{ savingsAccountTermsForm.get('currencyCode').value }}
- Decimal Places + {{'labels.inputs.Decimal Places' | translate}} {{ savingsAccountTermsForm.get('decimal').value }}
- Nominal Annual Interest Rate: - {{ savingsAccount.nominalAnnualInterestRate }} + {{'labels.inputs.Nominal Annual Interest' | translate}}: + {{ savingsAccount.nominalAnnualInterestRate | formatNumber }} %
- Interest Compounding Period: - {{ savingsAccount.interestCompoundingPeriodType | find:savingsAccountProductTemplate.interestCompoundingPeriodTypeOptions:'id':'value' }} + {{'labels.inputs.Interest Compounding Period' | translate}}: + {{ savingsAccount.interestCompoundingPeriodType | + find:savingsAccountProductTemplate.interestCompoundingPeriodTypeOptions:'id':'value' }}
- Interest Posting Period: - {{ savingsAccount.interestPostingPeriodType | find:savingsAccountProductTemplate.interestPostingPeriodTypeOptions:'id':'value' }} + {{'labels.inputs.Interest Posting Period' | translate}}: + {{ savingsAccount.interestPostingPeriodType | + find:savingsAccountProductTemplate.interestPostingPeriodTypeOptions:'id':'value' }}
- Interest Calculated using: - {{ savingsAccount.interestCalculationType | find:savingsAccountProductTemplate.interestCalculationTypeOptions:'id':'value' }} + {{'labels.inputs.Interest Calculated using' | translate}}: + {{ savingsAccount.interestCalculationType | + find:savingsAccountProductTemplate.interestCalculationTypeOptions:'id':'value' }}
- Days in Year: - {{ savingsAccount.interestCalculationDaysInYearType | find:savingsAccountProductTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' }} + {{'labels.inputs.Days in Year' | translate}}: + {{ savingsAccount.interestCalculationDaysInYearType | + find:savingsAccountProductTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' }}
- Minimum Opening Balance: - {{ savingsAccount.minRequiredOpeningBalance }} + {{'labels.inputs.Minimum Opening Balance' | translate}}: + {{ savingsAccount.minRequiredOpeningBalance | formatNumber }}
- Apply Withdrawal Fee for Transfers: + {{'labels.inputs.Apply Withdrawal Fee for Transfers' | translate}}: {{ savingsAccount.withdrawalFeeForTransfers | yesNo }}
- Lock-in Period: - {{ savingsAccount.lockinPeriodFrequency + ' ' + (savingsAccount.lockinPeriodFrequencyType | find:savingsAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') }} + {{'labels.inputs.Lock-in Period' | translate}}: + {{ savingsAccount.lockinPeriodFrequency + ' ' + (savingsAccount.lockinPeriodFrequencyType | + find:savingsAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') }}
- Is Overdraft Allowed: + {{'labels.inputs.Is Overdraft Allowed' | translate}}: {{ savingsAccount.allowOverdraft | yesNo }}
- Minimum Overdraft Required for Interest Calculation: - {{ savingsAccount.minOverdraftForInterestCalculation }} + {{'labels.inputs.Minimum Overdraft Required for Interest Calculation' | translate}}: + {{ savingsAccount.minOverdraftForInterestCalculation | formatNumber }}
- Nominal Annual Interest for Overdraft: - {{ savingsAccount.nominalAnnualInterestRateOverdraft }} + {{'labels.inputs.Nominal Annual Interest for Overdraft' | translate}}: + {{ savingsAccount.nominalAnnualInterestRateOverdraft | formatNumber }} %
- Maximum Overdraft Amount Limit: - {{ savingsAccount.overdraftLimit }} + {{'labels.inputs.Maximum Overdraft Amount Limit' | translate}}: + {{ savingsAccount.overdraftLimit | formatNumber }}
- Enforce Minimum Balance: + {{'labels.inputs.Enforce Minimum Balance' | translate}}: {{ savingsAccount.enforceMinRequiredBalance | yesNo }}
- Minimum Balance: + {{'labels.inputs.Minimum Balance' | translate}}: {{ savingsAccount.minRequiredBalance }}
-

Charges

+

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

Penalty {{'labels.inputs.Penalty' | translate}} {{ penaltyIncome.charge.name }} Income Account {{'labels.inputs.Income Account' | translate}} {{ penaltyIncome.incomeAccount.name }} Name {{'labels.inputs.Name' | translate }} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate }} {{ charge.chargeCalculationType.value }} Amount {{'labels.inputs.Amount' | translate }} - {{ charge.amount }} + {{ charge.amount | formatNumber }} @@ -45,14 +45,14 @@ - Collected On {{'labels.inputs.Collected On' | translate }} {{ charge.chargeTimeType.value }} Date {{'labels.inputs.Date' | translate }} @@ -73,9 +73,10 @@ - Repayments Every {{'labels.inputs.Repayments Every' | translate }} - {{ charge.feeInterval || 'Not Provided' }} + {{ charge.feeInterval}} + {{'labels.inputs.Not Provided' | translate }} Actions {{'labels.inputs.Actions' | translate }} - - - - + + + + Client ID {{'labels.inputs.Client ID' | translate }} {{element.id}} Client Name {{'labels.inputs.Client Name' | translate }} {{element.displayName}}
- + - + - + - + + - + @@ -185,12 +192,12 @@
- -
+ \ No newline at end of file diff --git a/src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html b/src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html index 216f148e5..a4a799c23 100644 --- a/src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html +++ b/src/app/savings/savings-account-stepper/savings-account-terms-step/savings-account-terms-step.component.html @@ -3,89 +3,89 @@
- Currency + {{'labels.inputs.Currency' | translate}} - Decimal Places + {{'labels.inputs.Decimal Places' | translate}} - Nominal Annual Interest Rate + {{'labels.inputs.Nominal Annual Interest' | translate}} - Nominal Annual Interest is required + {{'labels.inputs.Nominal Annual Interest' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Interest Compounding Period + {{'labels.inputs.Interest Compounding Period' | translate}} {{ interestCompoundingPeriodType.value }} - Interest Compounding Period is required + {{'labels.inputs.Interest Compounding Period' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Interest Posting Period + {{'labels.inputs.Interest Posting Period' | translate}} {{ interestPostingPeriodType.value }} - Interest Posting Period is required + {{'labels.inputs.Interest Posting Period' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Interest Calculated using + {{'labels.inputs.Interest Calculated using' | translate}} {{ interestCalculationType.value }} - Interest Calculated using is required + {{'labels.inputs.Interest Calculated using' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Days in Year + {{'labels.inputs.Days in Year' | translate}} {{ interestCalculationDaysInYearType.value }} - Days in Year is required + {{'labels.inputs.Days in Year' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Minimum Opening Balance + {{'labels.inputs.Minimum Opening Balance' | translate}} - Apply Withdrawal Fee for Transfers + {{'labels.inputs.Apply Withdrawal Fee for Transfers' | translate}} -

Lock-in Period

+

{{'labels.inputs.Lock-in Period' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} {{ lockinPeriodFrequencyType.value }} @@ -95,26 +95,26 @@ -

Overdraft

+

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

- Is Overdraft Allowed? + {{'labels.inputs.Is Overdraft Allowed' | translate}}
- Minimum Overdraft Required for Interest Calculation + {{'labels.inputs.Minimum Overdraft Required for Interest Calculation' | translate}} - Nominal Annual Interest for Overdraft + {{'labels.inputs.Nominal Annual Interest for Overdraft' | translate}} - Maximum Overdraft Amount Limit + {{'labels.inputs.Maximum Overdraft Amount Limit' | translate}} @@ -123,16 +123,16 @@ - Enforce Minimum Balance + {{'labels.inputs.Enforce Minimum Balance' | translate}} - Minimum Balance + {{'labels.inputs.Minimum Balance' | translate}} - Balance Required for Interest Calculation + {{'labels.inputs.Balance Required for Interest Calculation' | translate}} @@ -141,10 +141,10 @@
diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index 134706d7c..95b671c99 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -1358,11 +1358,11 @@ "Follow": "Seguir", "Frequency": "Frecuencia", "Frequency Interval": "Intervalo de frecuencia", - "Frequency Interval for compounding": "Intervalo de frecuencia para la capitalización", + "Frequency Interval for compounding": "Intervalo de frecuencia para la contabilización", "Frequency Interval for recalculation": "Intervalo de frecuencia para recálculo", "Frequency Number": "Número de frecuencia", "Frequency Type": "Tipo de frecuencia", - "Frequency for compounding": "Frecuencia de capitalización", + "Frequency for compounding": "Frecuencia de contabilización", "Frequency for recalculate Outstanding Principal": "Frecuencia para recalcular el capital pendiente", "Friday": "Viernes", "From": "De", @@ -1451,7 +1451,7 @@ "Interest Calculated Using": "Interés calculado usando", "Interest Calculated using": "Interés calculado usando", "Interest Calculation Period": "Período de cálculo de intereses", - "Interest Compounding Period": "Período de capitalización de intereses", + "Interest Compounding Period": "Período de contabilización de intereses", "Interest Date": "Fecha de interés", "Interest Earned": "Interés obtenido", "Interest Earned Not Posted": "Intereses ganados no contabilizados", @@ -1461,8 +1461,8 @@ "Interest Outstanding": "Interés pendiente", "Interest Payable": "Intereses a pagar", "Interest Posted": "Interés publicado", - "Interest Posting Period": "Período de contabilización de intereses", - "Interest Posting period": "Periodo de contabilización de intereses", + "Interest Posting Period": "Período de capitalización de intereses", + "Interest Posting period": "Periodo de capitalización de intereses", "Interest Rate": "Tasa de interés", "Interest Rates": "Tasas de interés", "Interest Rate Chart": "Gráfico de tasas de interés", @@ -1658,8 +1658,8 @@ "No. of Active Loans": "No. de Créditos Activos", "No. of Active Savings": "No. de Ahorros Activos", "No. of Days in Year": "No. de días en el año", - "Nominal Annual Interest": "Interés nominal anual", - "Nominal Annual Interest for Overdraft": "Interés Nominal Anual por Sobregiro", + "Nominal Annual Interest": "Tasa de Interés Nominal Anual", + "Nominal Annual Interest for Overdraft": "Tasa de Interés Nominal Anual por Sobregiro", "Nominal Interest Rate": "Tasa de interés nominal", "Nominal interest rate by loan cycle": "Tasa de interés nominal por ciclo de préstamo", "Nominal Price": "Precio nominal", @@ -1982,7 +1982,7 @@ "String Value": "Valor de cadena", "Sub Type": "Subtipo", "Submission Date": "Día de entrega", - "Submitted On": "Enviado el", + "Submitted On": "Registrado el día", "Submitted On Date": "Registrado el día", "Submitted on": "Registrado el", "Submitted on Date From": "Registrado en fecha de",
Name {{'labels.inputs.Name' | translate}} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate}} {{ charge.chargeCalculationType.value }} Amount {{'labels.inputs.Amount' | translate}} - {{ charge.amount }} + {{ charge.amount | formatNumber }} Date {{'labels.inputs.Date' | translate}} - + {{(charge.dueDate | dateFormat) || 'Unassigned'}} @@ -160,14 +167,14 @@ - Repayments Every {{'labels.inputs.Repayments Every' | translate}} {{ charge.feeInterval || 'Not Provided' }} Collected On {{'labels.inputs.Collected On' | translate}} {{ charge.chargeTimeType.value }}