diff --git a/src/app/collaterals/view-collateral/view-collateral.component.html b/src/app/collaterals/view-collateral/view-collateral.component.html index 6f82b8318..9eaa727a3 100644 --- a/src/app/collaterals/view-collateral/view-collateral.component.html +++ b/src/app/collaterals/view-collateral/view-collateral.component.html @@ -1,9 +1,9 @@
- - @@ -47,7 +47,7 @@ {{"labels.inputs.Remaining Amount" |translate}} - {{element.remainingAmount}} + {{element.remainingAmount | formatNumber}} 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 7079c6ea3..7c3fff05e 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 @@ -11,7 +11,7 @@
{{"labels.inputs.Submitted On" | translate }} - {{ fixedDepositAccountData.submittedOnDate | dateFormat }} + {{ fixedDepositAccountData.submittedOnDate | dateFormat }}
@@ -21,7 +21,7 @@
{{"labels.inputs.Field Officer" | translate }} - {{ (fixedDepositAccountData.fieldOfficerId | find:fixedDepositsAccountProductTemplate.fieldOfficerOptions:'id':'displayName') || 'Unassigned' }} + {{ (fixedDepositAccountData.fieldOfficerId | find:fixedDepositsAccountProductTemplate.fieldOfficerOptions:'id':'displayName') || 'Unassigned' | translateKey:'inputs' }}

{{"labels.heading.Currency" | translate }}

@@ -49,32 +49,32 @@
{{"labels.inputs.Fixed Deposit Amount" | translate }}: - {{ fixedDepositAccountData.depositAmount }} + {{ fixedDepositAccountData.depositAmount | currency:fixedDepositsAccountProductTemplate.currency.code:'symbol-narrow':'1.2-2' }}
{{"labels.inputs.Deposit Period" | translate }}: - {{ fixedDepositAccountData.depositPeriod + ' ' + (fixedDepositAccountData.depositPeriodFrequencyId | find:fixedDepositsAccountProductTemplate.periodFrequencyTypeOptions:'id':'value') }} + {{ fixedDepositAccountData.depositPeriod }} {{(fixedDepositAccountData.depositPeriodFrequencyId | find:fixedDepositsAccountProductTemplate.periodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }}
{{"labels.inputs.Interest Compounding Period" | translate }}: - {{ fixedDepositAccountData.interestCompoundingPeriodType | find:fixedDepositsAccountProductTemplate.interestCompoundingPeriodTypeOptions:'id':'value' }} + {{ (fixedDepositAccountData.interestCompoundingPeriodType | find:fixedDepositsAccountProductTemplate.interestCompoundingPeriodTypeOptions:'id':'value') | translateKey:'catalogs' }}
{{"labels.inputs.Interest Posting Period" | translate }}: - {{ fixedDepositAccountData.interestPostingPeriodType | find:fixedDepositsAccountProductTemplate.interestPostingPeriodTypeOptions:'id':'value' }} + {{ (fixedDepositAccountData.interestPostingPeriodType | find:fixedDepositsAccountProductTemplate.interestPostingPeriodTypeOptions:'id':'value') | translateKey:'catalogs' }}
{{"labels.inputs.Interest Calculated using" | translate }}: - {{ fixedDepositAccountData.interestCalculationType | find:fixedDepositsAccountProductTemplate.interestCalculationTypeOptions:'id':'value' }} + {{ (fixedDepositAccountData.interestCalculationType | find:fixedDepositsAccountProductTemplate.interestCalculationTypeOptions:'id':'value') | translateKey:'catalogs' }}
{{"labels.inputs.Days in Year" | translate }}: - {{ fixedDepositAccountData.interestCalculationDaysInYearType | find:fixedDepositsAccountProductTemplate.interestCalculationDaysInYearTypeOptions:'id':'value' }} + {{ (fixedDepositAccountData.interestCalculationDaysInYearType | find:fixedDepositsAccountProductTemplate.interestCalculationDaysInYearTypeOptions:'id':'value') | translateKey:'catalogs' }}

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

@@ -83,27 +83,27 @@
{{"labels.inputs.Lock-in Period" | translate }}: - {{ fixedDepositAccountData.lockinPeriodFrequency + ' ' + (fixedDepositAccountData.lockinPeriodFrequencyType | find:fixedDepositsAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') }} + {{ fixedDepositAccountData.lockinPeriodFrequency }} {{(fixedDepositAccountData.lockinPeriodFrequencyType | find:fixedDepositsAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') | translateKey:'catalogs' }}
{{"labels.inputs.Minimum Deposit Term" | translate }}: - {{ fixedDepositsAccountProductTemplate.minDepositTerm + ' ' + (fixedDepositsAccountProductTemplate.minDepositTermType?.value || '') }} + {{ fixedDepositsAccountProductTemplate.minDepositTerm }} {{fixedDepositsAccountProductTemplate.minDepositTermType?.value | translateKey:'catalogs' }}
{{"labels.inputs.In Multiples Of" | translate }}: - {{ fixedDepositsAccountProductTemplate.inMultiplesOfDepositTerm + ' ' + (fixedDepositsAccountProductTemplate.inMultiplesOfDepositTermType?.value || '') }} + {{ fixedDepositsAccountProductTemplate.inMultiplesOfDepositTerm }} {{fixedDepositsAccountProductTemplate.inMultiplesOfDepositTermType?.value | translateKey:'catalogs' }}
{{"labels.inputs.Maximum Deposit Term" | translate }} - {{ fixedDepositsAccountProductTemplate.maxDepositTerm + ' ' + (fixedDepositsAccountProductTemplate.maxDepositTermType?.value || '') }} + {{ fixedDepositsAccountProductTemplate.maxDepositTerm }} {{fixedDepositsAccountProductTemplate.maxDepositTermType?.value | translateKey:'catalogs' }}
{{"labels.inputs.Transfer Interest to Savings Account" | translate }}? - {{ fixedDepositAccountData.transferInterestToSavings ? 'Yes' : 'No' }} + {{ fixedDepositAccountData.transferInterestToSavings | yesNo }}
@@ -113,12 +113,12 @@
{{"labels.inputs.Maturity Instructions" | translate }} - {{ fixedDepositAccountData.maturityInstructionId | find:fixedDepositsAccountProductTemplate.maturityInstructionOptions:'id':'value' }} + {{ fixedDepositAccountData.maturityInstructionId | find:fixedDepositsAccountProductTemplate.maturityInstructionOptions:'id':'value' | translateKey:'catalogs' }}
{{"labels.inputs.Apply Penal Interest (less)" | translate }}: - {{ fixedDepositsAccountProductTemplate.preClosurePenalApplicable ? 'Yes' : 'No' }} + {{ fixedDepositsAccountProductTemplate.preClosurePenalApplicable | yesNo }}
@@ -128,7 +128,7 @@
{{"labels.inputs.Withhold Tax is Applicable" | translate }}: - {{ fixedDepositAccountData.withHoldTax ? 'Yes' : 'No' }} + {{ fixedDepositAccountData.withHoldTax | yesNo }}

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

@@ -144,12 +144,12 @@
{{"labels.inputs.Valid from Date" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }} + {{ fixedDepositsAccountProductTemplate?.accountChart.fromDate | dateFormat }}
{{"labels.inputs.End Date" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }} + {{ fixedDepositsAccountProductTemplate?.accountChart.endDate | dateFormat }}
@@ -159,7 +159,7 @@
{{"labels.inputs.Primary Grouping by Amount" | translate }}: - {{ fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount ? 'Yes' : 'No' }} + {{ fixedDepositsAccountProductTemplate?.accountChart.isPrimaryGroupingByAmount | yesNo }}
@@ -167,17 +167,17 @@ + {{chartSlab.fromPeriod}} - {{chartSlab.toPeriod}} {{chartSlab.periodType.value | translateKey:'catalogs' }} - + - + @@ -252,7 +252,7 @@ diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html index 834783817..affe7791c 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-settings-step/fixed-deposit-account-settings-step.component.html @@ -14,7 +14,7 @@ - {{ lockinPeriodFrequencyType.value }} + {{ lockinPeriodFrequencyType.value | translateKey:'catalogs' }} @@ -25,7 +25,7 @@ {{"labels.inputs.Frequency" | translate }} - {{"labels.inputs.Minimum Deposit Term Frequency" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Minimum Deposit Term Frequency" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -33,11 +33,11 @@ {{"labels.inputs.Frequency Type" | translate }} - {{ periodFrequencyType.value }} + {{ periodFrequencyType.value | translateKey:'catalogs' }} - {{"labels.inputs.Minimum Deposit Term Frequency Type" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Minimum Deposit Term Frequency Type" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -52,7 +52,7 @@ {{"labels.inputs.Type" | translate }} - {{ periodFrequencyType.value }} + {{ periodFrequencyType.value | translateKey:'catalogs' }} @@ -68,7 +68,7 @@ {{"labels.inputs.Type" | translate }} - {{ periodFrequencyType.value }} + {{ periodFrequencyType.value | translateKey:'catalogs' }} @@ -85,11 +85,11 @@ {{"labels.inputs.Linked Savings Account" | translate }} - {{ account.accountNo }} + ({{ account.accountNo }}) {{ account.savingsProductName }} - {{"labels.inputs.Linked Savings Account" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Linked Savings Account" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -99,7 +99,7 @@ {{"labels.inputs.Maturity Instructions" | translate }} - {{ maturityInstruction.value }} + {{ maturityInstruction.value | translateKey:'catalogs' }} @@ -108,11 +108,11 @@ {{"labels.inputs.Transfer to savings account" | translate }} - {{ account.accountNo }} + ({{ account.accountNo }}) {{ account.savingsProductName }} - {{"labels.inputs.Transfer to savings account" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Transfer to savings account" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -134,7 +134,7 @@ - {{ preClosurePenalInterestOnType.value }} + {{ preClosurePenalInterestOnType.value | translateKey:'catalogs' }} diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html index 5cca7ce79..831f16ac7 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.html @@ -2,13 +2,10 @@
- - {{"labels.inputs.Deposit Amount" | translate }} - - - {{"labels.inputs.Fixed Deposit Amount" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} - - + + @@ -16,7 +13,7 @@ {{"labels.inputs.Deposit Period" | translate }} - {{"labels.inputs.Deposit Period" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Deposit Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -24,11 +21,11 @@ {{"labels.inputs.Deposit Period Type" | translate }} - {{ periodFrequencyType.value }} + {{ periodFrequencyType.value | translateKey:'catalogs' }} - {{"labels.inputs.Deposit Period Type" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Deposit Period Type" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -39,11 +36,11 @@ - {{ interestCompoundingPeriodType.value }} + {{ interestCompoundingPeriodType.value | translateKey:'catalogs' }} - {{"labels.inputs.Interest Compounding Period" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Interest Compounding Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -52,11 +49,11 @@ - {{ interestPostingPeriodType.value }} + {{ interestPostingPeriodType.value | translateKey:'catalogs' }} - {{"labels.inputs.Interest Posting Period" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Interest Posting Period" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -65,11 +62,11 @@ - {{ interestCalculationType.value }} + {{ interestCalculationType.value | translateKey:'catalogs' }} - {{"labels.inputs.Interest Calculated using" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Interest Calculated using" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} @@ -78,11 +75,11 @@ - {{ interestCalculationDaysInYearType.value }} + {{ interestCalculationDaysInYearType.value | translateKey:'catalogs' }} - {{"labels.inputs.Days in Year" | translate }} {{ "labels.commons.is" |translate}} {{ "labels.commons.required" | translate}} + {{"labels.inputs.Days in Year" | translate }} {{ "labels.commons.is" | translate}} {{ "labels.commons.required" | translate}} diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts index 932aefdc3..0bbb2e2b7 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-terms-step/fixed-deposit-account-terms-step.component.ts @@ -2,6 +2,7 @@ import { Component, OnInit, Input, OnChanges } from '@angular/core'; import { UntypedFormGroup, UntypedFormBuilder, Validators} from '@angular/forms'; import { SettingsService } from 'app/settings/settings.service'; +import { Currency } from 'app/shared/models/general.model'; /** * Fixed Deposits Terms Step @@ -34,6 +35,7 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges interestCalculationDaysInYearTypeData: any; /** Period Frequency Type Data */ periodFrequencyTypeData: any; + currency: Currency | null = null; /** * @param {FormBuilder} formBuilder Form Builder @@ -46,6 +48,7 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges ngOnChanges() { if (this.fixedDepositsAccountProductTemplate) { + this.currency = this.fixedDepositsAccountProductTemplate.currency; this.setOptions(); } } @@ -58,10 +61,11 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges 'interestPostingPeriodType': this.fixedDepositsAccountTemplate.interestPostingPeriodType.id, 'interestCalculationType': this.fixedDepositsAccountTemplate.interestCalculationType.id, 'interestCalculationDaysInYearType': this.fixedDepositsAccountTemplate.interestCalculationDaysInYearType.id, - 'depositAmount': this.fixedDepositsAccountTemplate.depositAmount, + 'depositAmount': this.fixedDepositsAccountTemplate.depositAmount ? this.fixedDepositsAccountTemplate.depositAmount : 0, 'depositPeriod': this.fixedDepositsAccountTemplate.depositPeriod, 'depositPeriodFrequencyId': this.fixedDepositsAccountTemplate.depositPeriodFrequency.id, }); + console.log(this.fixedDepositAccountTermsForm.value); } } @@ -74,7 +78,7 @@ export class FixedDepositAccountTermsStepComponent implements OnInit, OnChanges 'interestPostingPeriodType': ['', Validators.required], 'interestCalculationType': ['', Validators.required], 'interestCalculationDaysInYearType': ['', Validators.required], - 'depositAmount': ['', Validators.required], + 'depositAmount': [0, Validators.required], 'depositPeriod': ['', Validators.required], 'depositPeriodFrequencyId': ['', Validators.required] }); diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html index bb2cad3df..5e3097e72 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/charges-tab/charges-tab.component.html @@ -21,12 +21,12 @@
- + - + @@ -36,32 +36,32 @@ - + - + - + - + - + - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html index 36aa37c27..98f15869e 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.html @@ -22,25 +22,24 @@ -
-

{{"labels.heading.Account Overview" | translate}}

-
{{"labels.inputs.Period" | translate }} - {{chartSlab.fromPeriod}}-{{chartSlab.toPeriod}} {{chartSlab.periodType.value}} {{"labels.inputs.Amount Range" | translate }} {{chartSlab.amountRangeFrom}}-{{chartSlab.amountRangeTo}}{{chartSlab.amountRangeFrom | formatNumber}} - {{chartSlab.amountRangeTo | formatNumber}} {{"labels.inputs.Interest" | translate }} {{ chartSlab.annualInterestRate }} {{ chartSlab.annualInterestRate | formatNumber }} % {{"labels.inputs.Interest" | translate }} - {{ incentive.amount }} + {{ incentive.amount | formatNumber }} {{"labels.inputs.Fee/Penalty" | translate }} {{ charge.penalty === true ? 'Penalty' : 'Fee' }} {{ charge.penalty === true ? ('Penalty'| translateKey:'catalogs') : ('Fee'| translateKey:'catalogs') }} {{"labels.inputs.Payment Due At" | translate }} {{ charge.chargeTimeType.value }} {{ charge.chargeTimeType.value | translateKey:'catalogs' }} {{"labels.inputs.Repeats On" | translate }} {{charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : 'Unassigned'}} {{charge.feeOnMonthDay ? ([2000].concat(charge.feeOnMonthDay) | dateFormat: 'dd MMMM') : ('Unassigned' | translateKey:'inputs')}} {{"labels.inputs.Calculation Type" | translate }} {{charge.chargeCalculationType.value}} {{charge.chargeCalculationType.value | translateKey:'catalogs'}} {{"labels.inputs.Due" | translate }} {{charge.currency.displaySymbol}} {{charge.amount}} {{charge.currency.displaySymbol}} {{charge.amount | formatNumber }} {{"labels.inputs.Paid" | translate }} {{charge.currency.displaySymbol}} {{charge.amountPaid}} {{charge.currency.displaySymbol}} {{charge.amountPaid | formatNumber }} {{"labels.inputs.Waived" | translate }} {{charge.currency.displaySymbol}} {{charge.amountWaived}} {{charge.currency.displaySymbol}} {{charge.amountWaived | formatNumber }} {{"labels.inputs.Outstanding" | translate }} {{charge.currency.displaySymbol}} {{charge.amountOutstanding}} {{charge.currency.displaySymbol}} {{charge.amountOutstanding | formatNumber }}
+
+

{{"labels.heading.Account Overview" | translate}}

+
- - + + - - + + @@ -62,14 +61,14 @@ + {{button.name | translateKey:'menus'}} - + - + diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.html index 490af9973..83e63a4c4 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/general-tab/general-tab.component.html @@ -18,23 +18,23 @@ {{"labels.inputs.Activated On" | translate }} - {{fixedDepositsAccountData.timeline.activatedOnDate ? (fixedDepositsAccountData.timeline.activatedOnDate | dateFormat) : 'Not Activated'}} + {{fixedDepositsAccountData.timeline.activatedOnDate ? (fixedDepositsAccountData.timeline.activatedOnDate | dateFormat) : ('labels.text.Not Activated' | translate)}} {{"labels.inputs.Closed On" | translate }} - {{fixedDepositsAccountData.timeline.closedOnDate | dateFormat}} + {{fixedDepositsAccountData.timeline.closedOnDate | dateFormat}} {{"labels.inputs.Field Officer" | translate }} - {{fixedDepositsAccountData.fieldOfficerName ? fixedDepositsAccountData.fieldOfficerName : 'Unassigned'}} + {{fixedDepositsAccountData.fieldOfficerName ? fixedDepositsAccountData.fieldOfficerName : ('Unassigned' | translateKey:'inputs')}} {{"labels.inputs.Maturity Date" | translate }} - {{fixedDepositsAccountData.maturityDate ? (fixedDepositsAccountData.maturityDate | dateFormat) : 'N/A'}} + {{fixedDepositsAccountData.maturityDate ? (fixedDepositsAccountData.maturityDate | dateFormat) : 'N/A'}} {{"labels.inputs.Deposit Period" | translate }} - {{fixedDepositsAccountData.depositPeriod}} {{fixedDepositsAccountData.depositPeriodFrequency.value}} + {{fixedDepositsAccountData.depositPeriod}} {{fixedDepositsAccountData.depositPeriodFrequency.value | translateKey:'catalogs'}} {{"labels.inputs.Tax Group" | translate }} @@ -42,7 +42,7 @@ {{"labels.inputs.Maturity Instructions" | translate }} - {{fixedDepositsAccountData.onAccountClosure.value}} + {{fixedDepositsAccountData.onAccountClosure.value | translateKey:'catalogs'}} @@ -54,27 +54,27 @@ {{"labels.inputs.Interest Rate" | translate }} - {{fixedDepositsAccountData.nominalAnnualInterestRate}}% + {{fixedDepositsAccountData.nominalAnnualInterestRate}} % {{"labels.inputs.Interest Compounding Period" | translate }} - {{fixedDepositsAccountData.interestCompoundingPeriodType.value}} + {{fixedDepositsAccountData.interestCompoundingPeriodType.value | translateKey:'catalogs'}} {{"labels.inputs.Interest Posting Period" | translate }} - {{fixedDepositsAccountData.interestPostingPeriodType.value}} + {{fixedDepositsAccountData.interestPostingPeriodType.value | translateKey:'catalogs'}} {{"labels.inputs.Interest Calculated Using" | translate }} - {{fixedDepositsAccountData.interestCalculationType.value}} + {{fixedDepositsAccountData.interestCalculationType.value | translateKey:'catalogs'}} {{"labels.inputs.No. of Days in Year" | translate }} - {{fixedDepositsAccountData.interestCalculationDaysInYearType.value}} + {{fixedDepositsAccountData.interestCalculationDaysInYearType.value | translateKey:'catalogs'}} {{"labels.inputs.Pre-cloure Penal" | translate }} - {{fixedDepositsAccountData.preClosurePenalInterest}} % on {{fixedDepositsAccountData.preClosurePenalInterestOnType.value}} + {{fixedDepositsAccountData.preClosurePenalInterest}} % on {{fixedDepositsAccountData.preClosurePenalInterestOnType.value | translateKey:'catalogs'}} diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.html index a345d1cf7..64f45fea8 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/interest-rate-chart-tab/interest-rate-chart-tab.component.html @@ -13,17 +13,17 @@ {{"labels.inputs.Period" | translate }} - {{chartSlab.fromPeriod}}-{{chartSlab.toPeriod}} {{chartSlab.periodType.value}} + {{chartSlab.fromPeriod}} - {{chartSlab.toPeriod}} {{chartSlab.periodType.value | translateKey:'catalogs'}} {{"labels.inputs.Amount Range" | translate }} - {{chartSlab.amountRangeFrom}}-{{chartSlab.amountRangeTo}} + {{chartSlab.amountRangeFrom | formatNumber}} - {{chartSlab.amountRangeTo | formatNumber}} {{"labels.inputs.Interest" | translate }} - {{ chartSlab.annualInterestRate }} + {{ chartSlab.annualInterestRate | formatNumber }} % @@ -98,7 +98,7 @@ {{"labels.inputs.Interest" | translate }} - {{ incentive.amount }} + {{ incentive.amount | formatNumber }} diff --git a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html index 1a16c6afb..b92e2ae11 100644 --- a/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html +++ b/src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html @@ -37,28 +37,28 @@ {{"labels.inputs.Transaction Type" | translate }} - {{ transaction.transactionType.value }} + {{ transaction.transactionType.value | translateKey:'catalogs' }} {{"labels.inputs.Debit" | translate }} - {{ isDebit(transaction.transactionType) ? transaction.amount : 'N/A'}} + {{ isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A'}} {{"labels.inputs.Credit" | translate }} - {{ !isDebit(transaction.transactionType) ? transaction.amount : 'N/A' }} + {{ !isDebit(transaction.transactionType) ? (transaction.amount | formatNumber) : 'N/A' }} {{"labels.inputs.Balance" | translate }} - {{ transaction.runningBalance }} + {{ transaction.runningBalance | formatNumber }} diff --git a/src/app/directives/format-amount.directive.ts b/src/app/directives/format-amount.directive.ts index 98d94ad5a..3378bc643 100644 --- a/src/app/directives/format-amount.directive.ts +++ b/src/app/directives/format-amount.directive.ts @@ -24,7 +24,11 @@ export class FormatAmountDirective implements OnInit { target.value = this.parse(target.value); } @HostListener('focus', ['$event.target']) focus(target: any) { - target.value = this.control.value; + if (typeof this.control.value == 'undefined') { + target.value = ''; + } else { + target.value = this.control.value; + } } ngOnInit() { diff --git a/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts b/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts index 97c2e30eb..8df41e9e7 100644 --- a/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts +++ b/src/app/system/entity-to-entity-mapping/entity-to-entity-mapping.component.ts @@ -242,7 +242,7 @@ export class EntityToEntityMappingComponent implements OnInit { }) ]; const data = { - title: this.translateService.instant('labels.buttons.Add') +' '+this.translateService.instant('labels.heading.Entity to Entity Mapping'), + title: this.translateService.instant('labels.buttons.Add') + ' ' + this.translateService.instant('labels.heading.Entity to Entity Mapping'), layout: { addButtonText: 'Confirm' }, formfields: formfields }; @@ -293,7 +293,7 @@ export class EntityToEntityMappingComponent implements OnInit { }) ]; const data = { - title: this.translateService.instant('labels.buttons.Edit') +' '+this.translateService.instant('labels.heading.Entity to Entity Mapping'), + title: this.translateService.instant('labels.buttons.Edit') + ' ' + this.translateService.instant('labels.heading.Entity to Entity Mapping'), layout: { addButtonText: 'Confirm' }, formfields: formfields }; diff --git a/src/app/system/manage-hooks/create-hook/create-hook.component.ts b/src/app/system/manage-hooks/create-hook/create-hook.component.ts index ea96a1b92..8624cdeb9 100644 --- a/src/app/system/manage-hooks/create-hook/create-hook.component.ts +++ b/src/app/system/manage-hooks/create-hook/create-hook.component.ts @@ -47,11 +47,11 @@ export class CreateHookComponent implements OnInit { * @param {TranslateService} translateService Translate Service. */ constructor(private route: ActivatedRoute, - private systemService: SystemService, - private router: Router, - private formBuilder: UntypedFormBuilder, - private dialog: MatDialog, - private translateService:TranslateService) { + private systemService: SystemService, + private router: Router, + private formBuilder: UntypedFormBuilder, + private dialog: MatDialog, + private translateService: TranslateService) { this.route.data.subscribe((data: { hooksTemplate: any }) => { this.hooksTemplateData = data.hooksTemplate; }); @@ -115,11 +115,13 @@ export class CreateHookComponent implements OnInit { console.log(this.hooksTemplateData); addEventDialogRef.afterClosed().subscribe((response: any) => { - if (response) { - this.eventsData.push({ entityName: response.entity, - actionName: response.action }); - this.dataSource.connect().next(this.eventsData); - } + if (response) { + this.eventsData.push({ + entityName: response.entity, + actionName: response.action + }); + this.dataSource.connect().next(this.eventsData); + } }); } @@ -129,7 +131,7 @@ export class CreateHookComponent implements OnInit { */ deleteEvent(index: number) { const deleteEventDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: this.translateService.instant('labels.inputs.event with entity name of') +' '+this.eventsData[index].entityName } + data: { deleteContext: this.translateService.instant('labels.inputs.event with entity name of') + ' ' + this.eventsData[index].entityName } }); deleteEventDialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { @@ -165,7 +167,7 @@ export class CreateHookComponent implements OnInit { }; this.systemService.createHook(hook) .subscribe((response: any) => { - this.router.navigate(['../', response.resourceId], {relativeTo: this.route}); + this.router.navigate(['../', response.resourceId], { relativeTo: this.route }); }); } } diff --git a/src/app/system/manage-hooks/edit-hook/edit-hook.component.ts b/src/app/system/manage-hooks/edit-hook/edit-hook.component.ts index 07d7b405b..9b1497fe9 100644 --- a/src/app/system/manage-hooks/edit-hook/edit-hook.component.ts +++ b/src/app/system/manage-hooks/edit-hook/edit-hook.component.ts @@ -51,12 +51,12 @@ export class EditHookComponent implements OnInit { * @param {TranslateService} translateService Translate Service. */ constructor(private route: ActivatedRoute, - private systemService: SystemService, - private router: Router, - private formBuilder: UntypedFormBuilder, - private dialog: MatDialog, - private translateService:TranslateService) { - this.route.data.subscribe(( data: { hooksTemplate: any, hook: any }) => { + private systemService: SystemService, + private router: Router, + private formBuilder: UntypedFormBuilder, + private dialog: MatDialog, + private translateService: TranslateService) { + this.route.data.subscribe((data: { hooksTemplate: any, hook: any }) => { this.hooksTemplateData = data.hooksTemplate; this.hookData = data.hook; this.eventsData = data.hook.events ? data.hook.events : []; @@ -104,11 +104,13 @@ export class EditHookComponent implements OnInit { data: this.hooksTemplateData }); addEventDialogRef.afterClosed().subscribe((response: any) => { - if (response) { - this.eventsData.push({ entityName: response.entity, - actionName: response.action }); - this.dataSource.connect().next(this.eventsData); - this.eventsDataChanged = true; + if (response) { + this.eventsData.push({ + entityName: response.entity, + actionName: response.action + }); + this.dataSource.connect().next(this.eventsData); + this.eventsDataChanged = true; } }); } @@ -119,7 +121,7 @@ export class EditHookComponent implements OnInit { */ deleteEvent(index: number) { const deleteEventDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: this.translateService.instant('labels.inputs.event with entity name of') +' '+this.eventsData[index].entityName } + data: { deleteContext: this.translateService.instant('labels.inputs.event with entity name of') + ' ' + this.eventsData[index].entityName } }); deleteEventDialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { @@ -156,7 +158,7 @@ export class EditHookComponent implements OnInit { }; this.systemService.updateHook(this.hookData.id, hook) .subscribe((response: any) => { - this.router.navigate(['../'], {relativeTo: this.route}); + this.router.navigate(['../'], { relativeTo: this.route }); }); } diff --git a/src/app/system/manage-hooks/view-hook/view-hook.component.ts b/src/app/system/manage-hooks/view-hook/view-hook.component.ts index 0ae668f09..7f148615f 100644 --- a/src/app/system/manage-hooks/view-hook/view-hook.component.ts +++ b/src/app/system/manage-hooks/view-hook/view-hook.component.ts @@ -32,10 +32,10 @@ export class ViewHookComponent implements OnInit { * @param {TranslateService} translateService Translate Service. */ constructor(private route: ActivatedRoute, - private dialog: MatDialog, - private systemService: SystemService, - private router: Router, - private translateService:TranslateService) { + private dialog: MatDialog, + private systemService: SystemService, + private router: Router, + private translateService: TranslateService) { this.route.data.subscribe((data: { hook: any }) => { this.hookData = data.hook; }); @@ -49,7 +49,7 @@ export class ViewHookComponent implements OnInit { */ delete() { const deleteHookDialogRef = this.dialog.open(DeleteDialogComponent, { - data: { deleteContext: this.translateService.instant('labels.inputs.hook') +' ' + this.hookData.id } + data: { deleteContext: this.translateService.instant('labels.inputs.hook') + ' ' + this.hookData.id } }); deleteHookDialogRef.afterClosed().subscribe((response: any) => { if (response.delete) { diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index 07bf2e3b9..c1fd41051 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -701,7 +701,11 @@ "Amount on hold": "Částka na počkání", "Percentage": "Procento", "Fixed Amount": "Pevná částka", - "Invalid": "Neplatný" + "Invalid": "Neplatný", + "Withdraw Deposit": "Vybrat vklad", + "Re-Invest Maturity Amount": "Částka splatnosti znovu investovat", + "Re-Invest Principal Only": "Pouze reinvestice jistiny", + "Transfer to Savings": "Převod do Úspory" }, "commons": { "50 characters long": "50 znaků dlouhé", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 894f89bdd..d7a18270c 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -701,7 +701,11 @@ "Amount on hold": "Zurückgestellter Betrag", "Percentage": "Prozentsatz", "Fixed Amount": "Fester Betrag", - "Invalid": "Ungültig" + "Invalid": "Ungültig", + "Withdraw Deposit": "Einzahlung abheben", + "Re-Invest Maturity Amount": "Fälligkeitsbetrag reinvestieren", + "Re-Invest Principal Only": "Nur Kapital reinvestieren", + "Transfer to Savings": "Übertragen auf Ersparnisse" }, "commons": { "50 characters long": "50 Zeichen lang", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index e8692c00a..f7c799db9 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -703,7 +703,11 @@ "Goodwill credit": "Goodwill credit", "Payout refund": "Payout refund", "Merchant issued refund": "Merchant issued refund", - "Invalid": "Invalid" + "Invalid": "Invalid", + "Withdraw Deposit": "Withdraw Deposit", + "Re-Invest Maturity Amount": "Re-Invest Maturity Amount", + "Re-Invest Principal Only": "Re-Invest Principal Only", + "Transfer to Savings": "Transfer to Savings" }, "commons": { "50 characters long": "50 characters long", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index 61c6cf0db..83c708c4b 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -700,7 +700,11 @@ "Amount on hold": "Retención", "Percentage": "Porcentaje", "Fixed Amount": "Cantidad fija", - "Invalid": "Inválido" + "Invalid": "Inválido", + "Withdraw Deposit": "Retirar depósito", + "Re-Invest Maturity Amount": "Reinvertir el monto al vencimiento", + "Re-Invest Principal Only": "Reinvertir solo el capital", + "Transfer to Savings": "Transferir a Ahorros" }, "commons": { "50 characters long": "50 caracteres de largo", @@ -874,7 +878,7 @@ "Fixed Deposit Products": "Productos de Depósito Fijo", "Fixed Deposit Transactions": "Transacciones de Depósito Fijo", "Floating Rates": "Tasas variables", - "For Pre-mature closure": "Para cierre prematuro", + "For Pre-mature closure": "Cierre prematuro", "Frequent Activities": "Actividades frecuentes", "Frequent Postings": "Publicaciones frecuentes", "Fund Mapping": "Mapeo de fondos", @@ -1184,7 +1188,7 @@ "Applicant": "Solicitante", "Application Date": "Fecha de solicitud", "Application Table Name": "Nombre de la tabla de aplicación", - "Apply Penal Interest (less)": "Aplicar Interés Penal (menos)", + "Apply Penal Interest (less)": "Aplicar Penalización en Interés (menos)", "Apply Withdrawal Fee for Transfers": "Aplicar comisión de retiro para transferencias", "Approval Date": "Fecha de aprobación", "Approve Share": "Aprobar Acciones", @@ -1530,7 +1534,7 @@ "Fee": "Tarifa", "Fee Amount": "Importe de la cuota", "Fee Frequency": "Frecuencia de comisiones", - "Fee/Penalty": "Tarifa/Sanción", + "Fee/Penalty": "Comisión/Penalización", "Fees": "Comisiones", "Fees Outstanding": "Tarifas pendientes", "Fees Receivable": "Comisiones por cobrar", @@ -1971,7 +1975,7 @@ "Payment due as of": "Pago vencido en", "Payment due at": "Pago vencido en", "Payments due on non working days": "Pagos vencidos en días no laborables", - "Penal Interest": "Interés Penal", + "Penal Interest": "Interés Penalización", "Penalties": "Penalizaciones", "Penalties Outstanding": "Penalizaciones pendientes", "Penalties Receivable": "Penalizaciones por Cobrar", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index c3a1fd061..4ab0a9693 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -701,7 +701,11 @@ "Amount on hold": "Montant retenu", "Percentage": "Pourcentage", "Fixed Amount": "Montant fixé", - "Invalid": "Invalide" + "Invalid": "Invalide", + "Withdraw Deposit": "Retirer un dépôt", + "Re-Invest Maturity Amount": "Réinvestir le montant à l’échéance", + "Re-Invest Principal Only": "Réinvestir le capital uniquement", + "Transfer to Savings": "Transfert vers l'épargne" }, "commons": { "50 characters long": "50 caractères", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 48ffcb8fd..abc0d62e4 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -701,7 +701,11 @@ "Amount on hold": "Importo sospeso", "Percentage": "Percentuale", "Fixed Amount": "Importo fisso", - "Invalid": "Non valido" + "Invalid": "Non valido", + "Withdraw Deposit": "Prelevare il deposito", + "Re-Invest Maturity Amount": "Reinvestimento dell'importo a scadenza", + "Re-Invest Principal Only": "Reinvestire solo il capitale", + "Transfer to Savings": "Trasferimento al risparmio" }, "commons": { "50 characters long": "50 caratteri di lunghezza", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index 1da5be25b..74f738f9d 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -701,7 +701,11 @@ "Amount on hold": "보류 금액", "Percentage": "백분율", "Fixed Amount": "정액", - "Invalid": "유효하지 않은" + "Invalid": "유효하지 않은", + "Withdraw Deposit": "예치금 인출", + "Re-Invest Maturity Amount": "만기금액 재투자", + "Re-Invest Principal Only": "본인만 재투자", + "Transfer to Savings": "저축으로 이체" }, "commons": { "50 characters long": "50자(영문 기준)", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 0b670eb6a..2fe622804 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -701,7 +701,11 @@ "Amount on hold": "Sulaikyta suma", "Percentage": "Procentas", "Fixed Amount": "Nustatyta suma", - "Invalid": "Neteisinga" + "Invalid": "Neteisinga", + "Withdraw Deposit": "Išsiimti indėlį", + "Re-Invest Maturity Amount": "Iš naujo investuokite termino sumą", + "Re-Invest Principal Only": "Iš naujo investuokite tik pagrindinę sumą", + "Transfer to Savings": "Perkėlimas į santaupas" }, "commons": { "50 characters long": "50 simbolių ilgio", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index 86b7c8a43..1ec4c27a0 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -701,7 +701,11 @@ "Amount on hold": "Aizturētā summa", "Percentage": "Procenti", "Fixed Amount": "Fiksēta summa", - "Invalid": "Nederīgs" + "Invalid": "Nederīgs", + "Withdraw Deposit": "Izņemt depozītu", + "Re-Invest Maturity Amount": "Atkārtoti ieguldīt termiņa summu", + "Re-Invest Principal Only": "Reinvestēt tikai pamatsummu", + "Transfer to Savings": "Pārskaitījums uz uzkrājumiem" }, "commons": { "50 characters long": "50 rakstzīmes garš", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index b53cd12a2..d68462d5e 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -701,7 +701,11 @@ "Amount on hold": "होल्डमा रहेको रकम", "Percentage": "प्रतिशत", "Fixed Amount": "निश्चित रकम", - "Invalid": "अवैध" + "Invalid": "अवैध", + "Withdraw Deposit": "निक्षेप फिर्ता लिनुहोस्", + "Re-Invest Maturity Amount": "परिपक्वता रकम पुन: लगानी गर्नुहोस्", + "Re-Invest Principal Only": "पुन: लगानी प्रिन्सिपल मात्र", + "Transfer to Savings": "बचतमा स्थानान्तरण गर्नुहोस्" }, "commons": { "50 characters long": "५० वर्ण लामो", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 99ccab8d5..123b2cb28 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -701,7 +701,11 @@ "Amount on hold": "Valor retido", "Percentage": "Percentagem", "Fixed Amount": "Quantia fixa", - "Invalid": "Inválido" + "Invalid": "Inválido", + "Withdraw Deposit": "Retirar Depósito", + "Re-Invest Maturity Amount": "Reinvestir o valor do vencimento", + "Re-Invest Principal Only": "Reinvestir apenas o principal", + "Transfer to Savings": "Transferência para Poupança" }, "commons": { "50 characters long": "50 caracteres", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index da8cbb4c9..83ced9017 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -701,7 +701,11 @@ "Amount on hold": "Kiasi kilichohifadhiwa", "Percentage": "Asilimia", "Fixed Amount": "Kiasi kisichobadilika", - "Invalid": "Batili" + "Invalid": "Batili", + "Withdraw Deposit": "Toa Amana", + "Re-Invest Maturity Amount": "Wekeza Tena Kiasi cha Ukomavu", + "Re-Invest Principal Only": "Wekeza tena Mkuu Pekee", + "Transfer to Savings": "Hamisha kwa Akiba" }, "commons": { "50 characters long": "Urefu wa herufi 50",