diff --git a/src/app/clients/clients-view/general-tab/general-tab.component.html b/src/app/clients/clients-view/general-tab/general-tab.component.html index 407d9407f..a645c47c1 100644 --- a/src/app/clients/clients-view/general-tab/general-tab.component.html +++ b/src/app/clients/clients-view/general-tab/general-tab.component.html @@ -605,7 +605,7 @@ + [routerLink]="['../', 'shares-accounts', row.id, 'general']"> @@ -640,7 +640,7 @@ - + diff --git a/src/app/core/utils/accounting.ts b/src/app/core/utils/accounting.ts index cae90c465..65f923fac 100644 --- a/src/app/core/utils/accounting.ts +++ b/src/app/core/utils/accounting.ts @@ -5,8 +5,12 @@ import { OptionData } from 'app/shared/models/option-data.model'; @Injectable({ providedIn: 'root' - }) - export class Accounting { +}) +export class Accounting { + + public getAccountingRulesForShares(): string[] { + return ['NONE', 'Cash']; + } public getAccountingRulesForSavings(): string[] { return ['NONE', 'Cash', 'Accrual (periodic)']; diff --git a/src/app/core/utils/charges.ts b/src/app/core/utils/charges.ts new file mode 100644 index 000000000..d61b76e26 --- /dev/null +++ b/src/app/core/utils/charges.ts @@ -0,0 +1,19 @@ +import { Injectable } from '@angular/core'; +import { OptionData } from 'app/shared/models/option-data.model'; + + +@Injectable({ + providedIn: 'root' +}) +export class Charges { + + public getChargeAppliesToOptions(): OptionData[] { + return [ + { 'id': 1, 'code': 'chargeAppliesTo.loan', 'value': 'Loan' }, + { 'id': 2, 'code': 'chargeAppliesTo.savings', 'value': 'Savings' }, + { 'id': 3, 'code': 'chargeAppliesTo.client', 'value': 'Client' }, + { 'id': 4, 'code': 'chargeAppliesTo.shares', 'value': 'Shares' } + ]; + } + +} diff --git a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html index f68517235..242a9dcd5 100644 --- a/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html +++ b/src/app/deposits/recurring-deposits/recurring-deposits-account-view/general-tab/general-tab.component.html @@ -43,7 +43,7 @@ - {{"labels.inputs.Balance Required For Interest Calculation" | translate }} + {{"labels.inputs.Balance Required for Interest Calculation" | translate }} {{recurringDepositsAccountData.minBalanceForInterestCalculation}} @@ -166,7 +166,7 @@ - {{"labels.inputs.Balance Required For Interest Calculation" | translate }} + {{"labels.inputs.Balance Required for Interest Calculation" | translate }} {{ recurringDepositsAccountData.minBalanceForInterestCalculation | number }} diff --git a/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html b/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html index 0450c706c..b2cd5e5c2 100644 --- a/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-preview-step/loans-account-preview-step.component.html @@ -132,6 +132,16 @@ fxFlex="60%">{{ loansAccount.transactionProcessingStrategyCode | find:loansAccountProductTemplate.transactionProcessingStrategyOptions:'code':'name' }} +
+ {{"labels.inputs.Installment Amount" | translate}} + {{ loansAccount.fixedEmiAmount | formatNumber }} +
+ +
+ {{"labels.inputs.Balloon Repayment Amount" | translate}} + {{ loansAccount.balloonRepaymentAmount | formatNumber }} +
+

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

diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html index df3c03f1f..7f04bb729 100644 --- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html +++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.html @@ -209,6 +209,16 @@ + + {{"labels.inputs.Installment Amount" | translate}} + + + + + {{"labels.inputs.Balloon Repayment Amount" | translate}} + + +

{{"labels.heading.Interest Calculations" | translate}}

@@ -280,11 +290,6 @@ - - {{"labels.inputs.Installment Amount" | translate}} - - -
diff --git a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts index 1fa27b1e2..f7ce4594b 100644 --- a/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts +++ b/src/app/loans/loans-account-stepper/loans-account-terms-step/loans-account-terms-step.component.ts @@ -145,7 +145,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges { 'transactionProcessingStrategyCode': this.loansAccountTermsData.transactionProcessingStrategyCode, 'interestRateDifferential': this.loansAccountTermsData.interestRateDifferential, 'multiDisburseLoan': this.loansAccountTermsData.multiDisburseLoan, - 'interestRateFrequencyType': this.loansAccountTermsData.interestRateFrequencyType.id + 'interestRateFrequencyType': this.loansAccountTermsData.interestRateFrequencyType.id, + 'balloonRepaymentAmount': this.loansAccountTermsData.balloonRepaymentAmount, }); this.setAdvancedPaymentStrategyControls(); @@ -237,7 +238,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges { 'transactionProcessingStrategyCode': this.loansAccountTermsData.transactionProcessingStrategyCode, 'interestRateDifferential': this.loansAccountTermsData.interestRateDifferential, 'multiDisburseLoan': this.loansAccountTermsData.multiDisburseLoan, - 'interestRateFrequencyType': this.loansAccountTermsData.interestRateFrequencyType.id + 'interestRateFrequencyType': this.loansAccountTermsData.interestRateFrequencyType.id, + 'balloonRepaymentAmount': this.loansAccountTermsData.balloonRepaymentAmount }); } this.createloansAccountTermsForm(); @@ -357,7 +359,8 @@ export class LoansAccountTermsStepComponent implements OnInit, OnChanges { 'interestRateDifferential': [''], 'transactionProcessingStrategyCode': ['', Validators.required], 'multiDisburseLoan': [false], - 'interestRateFrequencyType': [''] + 'interestRateFrequencyType': [''], + 'balloonRepaymentAmount': [''] }); } diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.html b/src/app/loans/loans-view/general-tab/general-tab.component.html index 83d0d620b..3b208abfd 100644 --- a/src/app/loans/loans-view/general-tab/general-tab.component.html +++ b/src/app/loans/loans-view/general-tab/general-tab.component.html @@ -200,6 +200,11 @@ {{ loanDetails.principal | currency:currencyCode:'symbol-narrow':'1.2-2' }}
+
+ {{"labels.inputs.Balloon Repayment Amount" | translate}}: + {{ loanDetails.balloonRepaymentAmount | currency:currencyCode:'symbol-narrow':'1.2-2' }} +
+
{{"labels.inputs.Arrears By" | translate}}: {{"labels.inputs.Not Provided" | translate}} diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.scss b/src/app/loans/loans-view/general-tab/general-tab.component.scss index b0aff4877..6cd571619 100644 --- a/src/app/loans/loans-view/general-tab/general-tab.component.scss +++ b/src/app/loans/loans-view/general-tab/general-tab.component.scss @@ -5,6 +5,7 @@ h3 { margin: 1% auto; } + .performance-history-container { border: 1px solid; padding: 1%; @@ -19,4 +20,4 @@ span { margin: 0.5em 0; -} +} \ No newline at end of file diff --git a/src/app/products/charges/charges.component.html b/src/app/products/charges/charges.component.html index 4586bb2ad..215183903 100644 --- a/src/app/products/charges/charges.component.html +++ b/src/app/products/charges/charges.component.html @@ -10,10 +10,17 @@
- + {{'labels.inputs.Filter' | translate}} + + + + {{ chargeAppliesTo.value | translateCatalog }} + + +
@@ -46,18 +53,23 @@ - {{"labels.commons.Is" | translate}} {{"labels.inputs.Penalty" | translate}}? + {{"labels.commons.Is" | translate}} + {{"labels.inputs.Penalty" | translate}}? - - + + - {{"labels.commons.Is" | translate}} {{"labels.status.Active" | translate}}? + {{"labels.commons.Is" | translate}} + {{"labels.status.Active" | translate}}?
- +
@@ -77,26 +89,34 @@

{{"labels.text.Create Charge" | translate}}

{{"labels.text.Supports Loan charges, Savings & deposits" | translate}}

- + - +

{{"labels.heading.Search bar to filter charges." | translate}}

- - - + + +
-

{{"labels.heading.List of charges in the organization. For more details click" | translate}}: Charges

+

{{"labels.heading.List of charges in the organization. For more details click" | translate}}: Charges

- - + +
- + \ No newline at end of file diff --git a/src/app/products/charges/charges.component.ts b/src/app/products/charges/charges.component.ts index d08ef2214..34d890430 100644 --- a/src/app/products/charges/charges.component.ts +++ b/src/app/products/charges/charges.component.ts @@ -11,6 +11,9 @@ import { of } from 'rxjs'; /** Custom Services */ import { PopoverService } from '../../configuration-wizard/popover/popover.service'; import { ConfigurationWizardService } from '../../configuration-wizard/configuration-wizard.service'; +import { Charges } from 'app/core/utils/charges'; +import { OptionData } from 'app/shared/models/option-data.model'; +import { Charge } from './models/charge.model'; /** * Charges component. @@ -23,7 +26,7 @@ import { ConfigurationWizardService } from '../../configuration-wizard/configura export class ChargesComponent implements OnInit, AfterViewInit { /** Charge data. */ - chargeData: any; + chargeData: Charge[] = []; /** Columns to be displayed in charges table. */ displayedColumns: string[] = ['name', 'chargeAppliesTo', 'chargeTimeType', 'chargeCalculationType', 'amount', 'penalty', 'active']; /** Data source for charges table. */ @@ -43,6 +46,8 @@ export class ChargesComponent implements OnInit, AfterViewInit { /* Template for popover on charges table */ @ViewChild('templateChargesTable') templateChargesTable: TemplateRef; + chargeAppliesToOptions: OptionData[] = []; + /** * Retrieves the charges data from `resolve`. * @param {ActivatedRoute} route Activated Route. @@ -53,10 +58,12 @@ export class ChargesComponent implements OnInit, AfterViewInit { constructor(private route: ActivatedRoute, private router: Router, private configurationWizardService: ConfigurationWizardService, - private popoverService: PopoverService) { + private popoverService: PopoverService, + private charges: Charges) { this.route.data.subscribe(( data: { charges: any }) => { this.chargeData = data.charges; }); + this.chargeAppliesToOptions = this.charges.getChargeAppliesToOptions(); } /** @@ -136,4 +143,13 @@ export class ChargesComponent implements OnInit, AfterViewInit { this.configurationWizardService.showCharges = true; this.router.navigate(['/products']); } + + filterByAppliesTo(chargeAppliesTo: number) { + console.log(chargeAppliesTo); + const filteredCharges: Charge[] = this.chargeData.filter((charge: Charge) => { + return (charge.chargeAppliesTo.id === chargeAppliesTo); + }); + this.dataSource = new MatTableDataSource(filteredCharges); + } + } diff --git a/src/app/products/charges/models/charge.model.ts b/src/app/products/charges/models/charge.model.ts new file mode 100644 index 000000000..c0a062f99 --- /dev/null +++ b/src/app/products/charges/models/charge.model.ts @@ -0,0 +1,52 @@ +import { Currency, PaymentTypeOption } from 'app/shared/models/general.model'; +import { OptionData } from 'app/shared/models/option-data.model'; + +export interface Charge { + id: number; + name: string; + active: boolean; + penalty: boolean; + freeWithdrawal: boolean; + freeWithdrawalChargeFrequency: number; + restartFrequency: number; + restartFrequencyEnum: number; + isPaymentType: boolean; + currency: Currency; + amount: number; + chargeTimeType: OptionData; + chargeAppliesTo: OptionData; + chargeCalculationType: OptionData; + chargePaymentMode: OptionData; + feeInterval?: number; + feeFrequency?: OptionData; + feeOnMonthDay?: number[]; + paymentTypeOptions?: PaymentTypeOption; +} + +export enum ChargeAppliesToCode { + ChargeAppliesToClient = 'chargeAppliesTo.client', + ChargeAppliesToLoan = 'chargeAppliesTo.loan', + ChargeAppliesToSavings = 'chargeAppliesTo.savings', + ChargeAppliesToShares = 'chargeAppliesTo.shares', + ChargeCalculationTypeFlat = 'chargeCalculationType.flat', + ChargeCalculationTypePercentOfAmount = 'chargeCalculationType.percent.of.amount', + ChargeCalculationTypePercentOfAmountAndInterest = 'chargeCalculationType.percent.of.amount.and.interest', + ChargeCalculationTypePercentOfInterest = 'chargeCalculationType.percent.of.interest', + ChargeTimeTypeActivation = 'chargeTimeType.activation', + ChargeTimeTypeAnnualFee = 'chargeTimeType.annualFee', + ChargeTimeTypeDisbursement = 'chargeTimeType.disbursement', + ChargeTimeTypeInstalmentFee = 'chargeTimeType.instalmentFee', + ChargeTimeTypeMonthlyFee = 'chargeTimeType.monthlyFee', + ChargeTimeTypeOverdueInstallment = 'chargeTimeType.overdueInstallment', + ChargeTimeTypeSavingsActivation = 'chargeTimeType.savingsActivation', + ChargeTimeTypeSavingsNoActivityFee = 'chargeTimeType.savingsNoActivityFee', + ChargeTimeTypeSharespurchase = 'chargeTimeType.sharespurchase', + ChargeTimeTypeSharesredeem = 'chargeTimeType.sharesredeem', + ChargeTimeTypeSolidarityFund = 'chargeTimeType.solidarityFund', + ChargeTimeTypeSpecifiedDueDate = 'chargeTimeType.specifiedDueDate', + ChargeTimeTypeWeeklyFee = 'chargeTimeType.weeklyFee', + ChargeTimeTypeWithdrawalFee = 'chargeTimeType.withdrawalFee', + ChargepaymentmodeAccounttransfer = 'chargepaymentmode.accounttransfer', + ChargepaymentmodeRegular = 'chargepaymentmode.regular', + FeeFrequencyperiodFrequencyTypeMonths = 'feeFrequencyperiodFrequencyType.months', +} 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 b492d7e9c..cc4766de2 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 @@ -128,7 +128,7 @@
- {{'labels.inputs.Balance Required For Interest Calculation' | translate}}: + {{'labels.inputs.Balance Required for Interest Calculation' | translate}}: {{ fixedDepositProductData.minBalanceForInterestCalculation | formatNumber }}
diff --git a/src/app/products/share-products/create-share-product/create-share-product.component.html b/src/app/products/share-products/create-share-product/create-share-product.component.html index 71d818a96..b043fd323 100644 --- a/src/app/products/share-products/create-share-product/create-share-product.component.html +++ b/src/app/products/share-products/create-share-product/create-share-product.component.html @@ -24,7 +24,7 @@ - DETAILS + {{'labels.inputs.DETAILS' | translate}} @@ -32,7 +32,7 @@ - CURRENCY + {{'labels.inputs.CURRENCY' | translate}} @@ -40,7 +40,7 @@ - TERMS + {{'labels.inputs.TERMS' | translate}} @@ -48,7 +48,7 @@ - SETTINGS + {{'labels.inputs.SETTINGS' | translate}} @@ -56,7 +56,7 @@ - MARKET PRICE + {{'labels.inputs.MARKET PRICE' | translate}} @@ -64,7 +64,7 @@ - CHARGES + {{'labels.inputs.CHARGES' | translate}} - ACCOUNTING + {{'labels.inputs.ACCOUNTING' | translate}} - PREVIEW + {{'labels.inputs.PREVIEW' | translate}} { this.shareProductsTemplate = data.shareProductsTemplate; }); + this.accountingRuleData = this.accounting.getAccountingRulesForShares(); } ngOnInit() { diff --git a/src/app/products/share-products/edit-share-product/edit-share-product.component.html b/src/app/products/share-products/edit-share-product/edit-share-product.component.html index 77ac1554c..b53a525f4 100644 --- a/src/app/products/share-products/edit-share-product/edit-share-product.component.html +++ b/src/app/products/share-products/edit-share-product/edit-share-product.component.html @@ -24,7 +24,7 @@ - DETAILS + {{'labels.inputs.DETAILS' | translate}} @@ -32,7 +32,7 @@ - CURRENCY + {{'labels.inputs.CURRENCY' | translate}} @@ -40,7 +40,7 @@ - TERMS + {{'labels.inputs.TERMS' | translate}} @@ -48,7 +48,7 @@ - SETTINGS + {{'labels.inputs.SETTINGS' | translate}} @@ -56,7 +56,7 @@ - MARKET PRICE + {{'labels.inputs.MARKET PRICE' | translate}} @@ -64,7 +64,7 @@ - CHARGES + {{'labels.inputs.CHARGES' | translate}} - ACCOUNTING + {{'labels.inputs.ACCOUNTING' | translate}} - PREVIEW + {{'labels.inputs.PREVIEW' | translate}} { this.shareProductAndTemplate = data.shareProductAndTemplate; }); + this.accountingRuleData = this.accounting.getAccountingRulesForShares(); } ngOnInit() { diff --git a/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html index 43a30855a..e9c462268 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-accounting-step/share-product-accounting-step.component.html @@ -4,7 +4,7 @@ - {{ accountingRule }} + {{ 'labels.accounting.' + accountingRule | translate }} @@ -12,67 +12,39 @@
-

Assets

+

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

- - Share reference - - - ({{ assetAccount.glCode }}) {{ assetAccount.name }} - - - - Share reference is required - - + + -

Liabilities

+

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

- - Share suspense control - - - ({{ liabilityAccount.glCode }}) {{ liabilityAccount.name }} - - - - Share suspense control is required - - + + -

Share Equity

+

{{'labels.heading.Share Equity' | translate}}

- - Equity - - - ({{ equityAccount.glCode }}) {{ equityAccount.name }} - - - - Equity is required - - + + -

Income

+

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

- - Income from fees - - - ({{ incomeAccount.glCode }}) {{ incomeAccount.name }} - - - - Income from fees is required - - + +
@@ -81,10 +53,10 @@
diff --git a/src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.html index 55c491681..9ee12b210 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-charges-step/share-product-charges-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-charges-step/share-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 }} + {{ charge.chargeCalculationType.value | translateCatalog }} Amount {{'labels.inputs.Amount' | translate}} - {{ charge.amount }} + {{ charge.amount | formatNumber }} Collected On {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }} Actions {{'labels.inputs.Actions' | translate}} diff --git a/src/app/products/share-products/share-product-stepper/share-product-currency-step/share-product-currency-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-currency-step/share-product-currency-step.component.html index 995a1f6f6..1459623cf 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-currency-step/share-product-currency-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-currency-step/share-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/share-products/share-product-stepper/share-product-details-step/share-product-details-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-details-step/share-product-details-step.component.html index 5e9fe0b4e..890ffafa3 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-details-step/share-product-details-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-details-step/share-product-details-step.component.html @@ -3,23 +3,23 @@
- 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}} @@ -28,10 +28,10 @@
diff --git a/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.html index 7571bce58..648a5b506 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.html @@ -1,32 +1,32 @@
-

Market Price Periods

+

{{'labels.inputs.Market Price Period' | translate}}

- + - + - +
From Date {{'labels.inputs.From Date' | translate}} {{ marketPricePeriod.fromDate | dateFormat }} Nominal/Unit Price {{'labels.inputs.Nominal/Unit Price' | translate}} {{ marketPricePeriod.shareValue }} Actions {{'labels.inputs.Actions' | translate}} diff --git a/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.ts b/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.ts index a1909fae6..00c04cf14 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.ts +++ b/src/app/products/share-products/share-product-stepper/share-product-market-price-step/share-product-market-price-step.component.ts @@ -14,6 +14,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-share-product-market-price-step', @@ -38,7 +39,8 @@ export class ShareProductMarketPriceStepComponent implements OnInit { constructor(private formBuilder: UntypedFormBuilder, public dialog: MatDialog, private dateUtils: Dates, - private settingsService: SettingsService) { + private settingsService: SettingsService, + private translateService: TranslateService) { this.createShareProductMarketPriceForm(); } @@ -99,14 +101,14 @@ export class ShareProductMarketPriceStepComponent implements OnInit { } getData(values?: any) { - return { title: 'Market Price Period', formfields: this.getFormfields(values) }; + return { title: this.translateService.instant('labels.inputs.Market Price Period'), formfields: this.getFormfields(values) }; } getFormfields(values?: any) { const formfields: FormfieldBase[] = [ new DatepickerBase({ controlName: 'fromDate', - label: 'From Date', + label: this.translateService.instant('labels.inputs.From Date'), value: values ? values.fromDate : undefined, maxDate: new Date(new Date().setFullYear(new Date().getFullYear() + 10)), required: true, @@ -114,7 +116,7 @@ export class ShareProductMarketPriceStepComponent implements OnInit { }), new InputBase({ controlName: 'shareValue', - label: 'Nominal/Unit Price', + label: this.translateService.instant('labels.inputs.Nominal/Unit Price'), value: values ? values.shareValue : undefined, type: 'number', required: true, diff --git a/src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html index 1a7e09f4c..563e270c6 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-preview-step/share-product-preview-step.component.html @@ -4,106 +4,106 @@ -

Details

+

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

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

Currency

+

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

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

Terms

+

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

- Total Number of Shares: - {{ shareProduct.totalShares }} + {{'labels.inputs.Total Number of Shares' | translate}}: + {{ shareProduct.totalShares | formatNumber }}
- Shares to be Issued: - {{ shareProduct.sharesIssued }} + {{'labels.inputs.Shares to be Issued' | translate}}: + {{ shareProduct.sharesIssued | formatNumber }}
- Nominal/Unit Price: - {{ shareProduct.unitPrice }} + {{'labels.inputs.Nominal/Unit Price' | translate}}: + {{ shareProduct.unitPrice | formatNumber }}
- Capital Value: - {{ shareProduct.shareCapital }} + {{'labels.inputs.Capital Value' | translate}}: + {{ shareProduct.shareCapital | formatNumber }}
-

Settings

+

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

- Shares per Client: + {{'labels.inputs.Shares per Client' | translate}}: {{ shareProduct.nominalShares + ' (Min: ' + (shareProduct.minimumShares ? shareProduct.minimumShares : shareProduct.nominalShares) + ', Max: ' + (shareProduct.maximumShares ? shareProduct.maximumShares : shareProduct.nominalShares) + ')' }}
- Minimum Active Period: + {{'labels.inputs.Minimum Active Period' | translate}}: {{ shareProduct.minimumActivePeriodForDividends + ' ' + (shareProduct.minimumactiveperiodFrequencyType | find:shareProductsTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value') }}
- Lock-in Period: + {{'labels.inputs.Lock-in Period' | translate}}: {{ shareProduct.lockinPeriodFrequency + ' ' + (shareProduct.lockinPeriodFrequencyType | find:shareProductsTemplate.lockinPeriodFrequencyTypeOptions:'id':'value') }}
- Allow dividends for inactive clients: + {{'labels.inputs.Allow dividends for inactive clients' | translate}}: {{ shareProduct.allowDividendCalculationForInactiveClients | yesNo }}
-

Market Price Periods

+

{{'labels.inputs.Market Price Period' | translate}}

- + - + @@ -116,37 +116,37 @@
-

Charges

+

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

From Date {{'labels.inputs.From Date' | translate}} {{ marketPricePeriod.fromDate | dateFormat }} Nominal/Unit Price {{'labels.inputs.Nominal/Unit Price' | translate}} - {{ marketPricePeriod.shareValue }} + {{ marketPricePeriod.shareValue | formatNumber }}
- + - + - + - + @@ -157,42 +157,42 @@ -

Accounting

+

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

- Type: + {{'labels.inputs.Type' | translate}}: {{ accountingRuleData[shareProduct.accountingRule-1] }}
-

Assets

+

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

- Share reference: + {{'labels.inputs.Share reference' | translate}}: {{ shareProduct.shareReferenceId | find:shareProductsTemplate.accountingMappingOptions.assetAccountOptions:'id':'name' }}
-

Liabilities

+

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

- Share suspense control: + {{'labels.inputs.Share suspense control' | translate}}: {{ shareProduct.shareSuspenseId | find:shareProductsTemplate.accountingMappingOptions.liabilityAccountOptions:'id':'name' }}
-

Share Equity

+

{{'labels.heading.Share Equity' | translate}}

- Equity: + {{'labels.inputs.Equity' | translate}}: {{ shareProduct.shareEquityId | find:shareProductsTemplate.accountingMappingOptions.equityAccountOptions:'id':'name' }}
-

Income

+

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

- Income from fees: + {{'labels.inputs.Income from fees' | translate}}: {{ shareProduct.incomeFromFeeAccountId | find:shareProductsTemplate.accountingMappingOptions.incomeAccountOptions:'id':'name' }}
@@ -203,12 +203,12 @@
diff --git a/src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html index 849f6b75d..5202e769c 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-settings-step/share-product-settings-step.component.html @@ -2,60 +2,60 @@
-

Shares per Client

+

{{'labels.inputs.Shares per Client' | translate}}

- Minimum + {{'labels.inputs.Minimum' | translate}} - Default + {{'labels.inputs.Default' | translate}} - Default Shares per Client is required + {{'labels.inputs.Default Shares per Client' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Maximum + {{'labels.inputs.Maximum' | translate}} -

Minimum Active Period

+

{{'labels.inputs.Minimum Active Period' | translate}}

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} - {{ minimumActivePeriodFrequencyType.value }} + {{ minimumActivePeriodFrequencyType.value | translateCatalog }} -

Lock-in Period

+

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

- Frequency + {{'labels.inputs.Frequency' | translate}} - Type + {{'labels.inputs.Type' | translate}} - {{ lockinPeriodFrequencyType.value }} + {{ lockinPeriodFrequencyType.value | translateCatalog }} - Allow dividends for inactive clients + {{'labels.inputs.Allow dividends for inactive clients' | translate}}
@@ -63,10 +63,10 @@
diff --git a/src/app/products/share-products/share-product-stepper/share-product-terms-step/share-product-terms-step.component.html b/src/app/products/share-products/share-product-stepper/share-product-terms-step/share-product-terms-step.component.html index 831985d75..0990b52b9 100644 --- a/src/app/products/share-products/share-product-stepper/share-product-terms-step/share-product-terms-step.component.html +++ b/src/app/products/share-products/share-product-stepper/share-product-terms-step/share-product-terms-step.component.html @@ -3,34 +3,34 @@
- Total Number of Shares + {{'labels.inputs.Total Number of Shares' | translate}} - Total Number of Shares is required + {{'labels.inputs.Total Number of Shares' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Shares to be Issued + {{'labels.inputs.Shares to be Issued' | translate}} - Shares to be Issued is required + {{'labels.inputs.Shares to be Issued' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Nominal/Unit Price + {{'labels.inputs.Nominal/Unit Price' | translate}} - Nominal Price is required + {{'labels.inputs.Nominal Price' | translate}} {{'labels.commons.is' | translate}} {{'labels.commons.required' | translate}} - Capital Value + {{'labels.inputs.Capital Value' | translate}} - Shares to be Issued * Nominal Price (Auto calculated) + {{'labels.inputs.Shares to be Issued * Nominal Price (Auto calculated)' | translate}} @@ -39,10 +39,10 @@
diff --git a/src/app/products/share-products/share-products.component.html b/src/app/products/share-products/share-products.component.html index 5c67ebb8a..aa9384dc0 100644 --- a/src/app/products/share-products/share-products.component.html +++ b/src/app/products/share-products/share-products.component.html @@ -2,7 +2,7 @@
@@ -21,17 +21,17 @@
Name {{'labels.inputs.Name' | translate}} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} Amount {{'labels.inputs.Amount' | translate}} - {{ charge.amount }} + {{ charge.amount | formatNumber }} Collected On {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }}
- + - + - + @@ -47,29 +47,29 @@ -

Create share product

+

{{ 'labels.buttons.Create Share Product' | translate }}

This option allows you to create new share product.

- - - + + +

Search bar to filter share products.

- - - + + +
-

List of share products in the organization. For more details click: Share Products

+

List of share products in the organization. For more details click: {{ 'labels.buttons.Share Products' | translate }}

- - - + + +
diff --git a/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html b/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html index 447147afc..b0bbba535 100644 --- a/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html +++ b/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.html @@ -1,11 +1,11 @@
@@ -21,106 +21,106 @@ -

Details

+

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

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

Currency

+

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

- Currency: + {{'labels.inputs.Currency' | translate}}: {{ shareProduct.currency.name }}
- Decimal Places: + {{'labels.inputs.Decimal Places' | translate}}: {{ shareProduct.currency.decimalPlaces }}
- Currency in multiples of: + {{'labels.inputs.Currency in multiples of' | translate}}: {{ shareProduct.currency.inMultiplesOf }}
-

Terms

+

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

- Total Number of Shares: - {{ shareProduct.totalShares }} + {{'labels.inputs.Total Number of Shares' | translate}}: + {{ shareProduct.totalShares | formatNumber }}
- Shares to be Issued: - {{ shareProduct.totalSharesIssued }} + {{'labels.inputs.Shares to be Issued' | translate}}: + {{ shareProduct.totalSharesIssued | formatNumber }}
- Nominal/Unit Price: - {{ shareProduct.unitPrice }} + {{'labels.inputs.Nominal/Unit Price' | translate}}: + {{ shareProduct.unitPrice | formatNumber }}
- Capital Value: - {{ shareProduct.shareCapital }} + {{'labels.inputs.Capital Value' | translate}}: + {{ shareProduct.shareCapital | formatNumber }}
-

Settings

+

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

- Shares per Client: + {{'labels.inputs.Shares per Client' | translate}}: {{ shareProduct.nominalShares + ' (Min: ' + (shareProduct.minimumShares ? shareProduct.minimumShares : shareProduct.nominalShares) + ', Max: ' + (shareProduct.maximumShares ? shareProduct.maximumShares : shareProduct.nominalShares) + ')' }}
- Minimum Active Period: - {{ shareProduct.minimumActivePeriod + ' ' + shareProduct.minimumActivePeriodForDividendsTypeEnum.value }} + {{'labels.inputs.Minimum Active Period' | translate}}: + {{ shareProduct.minimumActivePeriod }} {{ shareProduct.minimumActivePeriodForDividendsTypeEnum.value | translateCatalog }}
- Lock-in Period: - {{ shareProduct.lockinPeriod + ' ' + shareProduct.lockPeriodTypeEnum.value }} + {{'labels.inputs.Lock-in Period' | translate}}: + {{ shareProduct.lockinPeriod }} {{ shareProduct.lockPeriodTypeEnum.value | translateCatalog}}
- Allow dividends for inactive clients: + {{'labels.inputs.Allow dividends for inactive clients' | translate}}: {{ shareProduct.allowDividendCalculationForInactiveClients | yesNo }}
-

Market Price Periods

+

{{'labels.inputs.Market Price Period' | translate}}

Name {{ 'labels.inputs.Name' | translate }} {{ shareProduct.name }} Short Name {{ 'labels.inputs.Short Name' | translate }} {{ shareProduct.shortName }} Total Shares {{ 'labels.inputs.Total Shares' | translate }} {{ shareProduct.totalShares }}
- + - + @@ -133,37 +133,37 @@
-

Charges

+

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

From Date {{'labels.inputs.From Date' | translate}} {{ marketPrice.fromDate | dateFormat }} Nominal/Unit Price {{'labels.inputs.Nominal/Unit Price' | translate}} - {{ marketPrice.shareValue }} + {{ marketPrice.shareValue | formatNumber }}
- + - + - + - + @@ -174,43 +174,47 @@ -

Accounting

+

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

- Type: - {{ shareProduct.accountingRule.value }} + {{'labels.inputs.Type' | translate}}: + {{ 'labels.accounting.' + getAccountingRuleName(shareProduct.accountingRule.value) | translate }}
-

Assets

+

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

- Share reference: - ({{ shareProduct.accountingMappings.shareReferenceId.glCode }}) {{ shareProduct.accountingMappings.shareReferenceId.name }} + +
-

Liabilities

+

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

- Share suspense control: - ({{ shareProduct.accountingMappings.shareSuspenseId.glCode }}) {{ shareProduct.accountingMappings.shareSuspenseId.name }} + +
-

Share Equity

+

{{'labels.heading.Share Equity' | translate}}

- Equity: - ({{ shareProduct.accountingMappings.shareEquityId.glCode }}) {{ shareProduct.accountingMappings.shareEquityId.name }} + +
-

Income

+

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

- Income from fees: - ({{ shareProduct.accountingMappings.incomeFromFeeAccountId.glCode }}) {{ shareProduct.accountingMappings.incomeFromFeeAccountId.name }} + +
diff --git a/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.ts b/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.ts index c767bf840..4bd59bb91 100644 --- a/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.ts +++ b/src/app/products/share-products/view-share-product/share-product-general-tab/share-product-general-tab.component.ts @@ -1,5 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { Accounting } from 'app/core/utils/accounting'; @Component({ selector: 'mifosx-share-product-general-tab', @@ -13,7 +14,8 @@ export class ShareProductGeneralTabComponent implements OnInit { marketPriceDisplayedColumns: string[] = ['fromDate', 'shareValue']; chargesDisplayedColumns: string[] = ['name', 'chargeCalculationType', 'amount', 'chargeTimeType']; - constructor(private route: ActivatedRoute) { + constructor(private route: ActivatedRoute, + private accounting: Accounting) { this.route.data.subscribe((data: { shareProduct: any }) => { this.shareProduct = data.shareProduct; }); @@ -22,4 +24,8 @@ export class ShareProductGeneralTabComponent implements OnInit { ngOnInit(): void { } + getAccountingRuleName(value: string): string { + return this.accounting.getAccountRuleName(value.toUpperCase()); + } + } diff --git a/src/app/products/share-products/view-share-product/view-share-product.component.html b/src/app/products/share-products/view-share-product/view-share-product.component.html index 8e3712966..c21025a4a 100644 --- a/src/app/products/share-products/view-share-product/view-share-product.component.html +++ b/src/app/products/share-products/view-share-product/view-share-product.component.html @@ -5,7 +5,7 @@
Name {{'labels.inputs.Name' | translate}} {{ charge.name + ', ' + charge.currency.displaySymbol }} Type {{'labels.inputs.Type' | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} Amount {{'labels.inputs.Amount' | translate}} {{ charge.amount | numberFormat }} Collected On {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }}
+
@@ -46,22 +47,26 @@ - + - + - + - + @@ -88,7 +93,8 @@ @@ -103,4 +109,4 @@ - + \ No newline at end of file diff --git a/src/app/shared/account-number/account-number.component.html b/src/app/shared/account-number/account-number.component.html index 7338e2fc4..f7217487e 100644 --- a/src/app/shared/account-number/account-number.component.html +++ b/src/app/shared/account-number/account-number.component.html @@ -1,5 +1,8 @@ - {{ accountNo }} + + {{ accountNo }} + + {{ accountNo }} diff --git a/src/app/shared/account-number/account-number.component.ts b/src/app/shared/account-number/account-number.component.ts index a1b7e47df..aa597f324 100644 --- a/src/app/shared/account-number/account-number.component.ts +++ b/src/app/shared/account-number/account-number.component.ts @@ -9,6 +9,9 @@ import { Clipboard } from '@angular/cdk/clipboard'; export class AccountNumberComponent implements OnInit { @Input() accountNo: string; @Input() display = 'right'; + @Input() clientId: number | null = null; + @Input() accountId: number | null = null; + @Input() accountType: string | null = null; iconVisible = false; displayL = false; @@ -32,4 +35,19 @@ export class AccountNumberComponent implements OnInit { mouseLeave() { this.iconVisible = false; } + + getAccountLink(): string { + if (this.accountType) { + return `/#/clients/${this.clientId}/${this.getAccountType()}/${this.accountId}`; + } + return ''; + } + + private getAccountType(): string { + if (this.accountType === '1') { + return 'loan-accounts'; + } else if (this.accountType === '2') { + return 'savings-accounts'; + } + } } diff --git a/src/app/shared/dropdown/dropdown.component.html b/src/app/shared/dropdown/dropdown.component.html new file mode 100644 index 000000000..e16bbf847 --- /dev/null +++ b/src/app/shared/dropdown/dropdown.component.html @@ -0,0 +1,12 @@ + + {{getLabelText()}} + + + {{ option.value | translateCatalog }} + + + + \ No newline at end of file diff --git a/src/app/shared/dropdown/dropdown.component.scss b/src/app/shared/dropdown/dropdown.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/shared/dropdown/dropdown.component.spec.ts b/src/app/shared/dropdown/dropdown.component.spec.ts new file mode 100644 index 000000000..4918a4792 --- /dev/null +++ b/src/app/shared/dropdown/dropdown.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DropdownComponent } from './dropdown.component'; + +describe('DropdownComponent', () => { + let component: DropdownComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ DropdownComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(DropdownComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/dropdown/dropdown.component.ts b/src/app/shared/dropdown/dropdown.component.ts new file mode 100644 index 000000000..c7a7d6ba3 --- /dev/null +++ b/src/app/shared/dropdown/dropdown.component.ts @@ -0,0 +1,35 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { UntypedFormControl } from '@angular/forms'; +import { TranslateService } from '@ngx-translate/core'; + +@Component({ + selector: 'mifosx-dropdown', + templateUrl: './dropdown.component.html', + styleUrls: ['./dropdown.component.scss'] +}) +export class DropdownComponent implements OnInit { + + @Input() placeHolderText: string; + @Input() labelText: string; + @Input() selectOptions: any[] = []; + @Input() controlSelect: UntypedFormControl; + @Input() required: boolean; + + constructor(private translateService: TranslateService) { } + + ngOnInit(): void { + } + + getPlaceHolderText(): string { + return this.placeHolderText ? this.translateService.instant('labels.inputs.' + this.placeHolderText) : ''; + } + + getLabelText(): string { + return this.labelText ? this.translateService.instant('labels.inputs.' + this.labelText) : ''; + } + + clearProperty() { + this.controlSelect.patchValue(''); + } + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index de960d999..9f9f59b76 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -48,6 +48,7 @@ import { GlAccountDisplayComponent } from './accounting/gl-account-display/gl-ac import { ViewSavingsAccountingDetailsComponent } from './accounting/view-savings-accounting-details/view-savings-accounting-details.component'; import { ThemeToggleComponent } from './theme-toggle/theme-toggle.component'; import { LongTextComponent } from './long-text/long-text.component'; +import { DropdownComponent } from './dropdown/dropdown.component'; /** * Shared Module @@ -102,7 +103,8 @@ import { LongTextComponent } from './long-text/long-text.component'; GlAccountDisplayComponent, ViewSavingsAccountingDetailsComponent, ThemeToggleComponent, - LongTextComponent + LongTextComponent, + DropdownComponent ], exports: [ FileUploadComponent, diff --git a/src/app/shares/common-resolvers/share-account-view.resolver.ts b/src/app/shares/common-resolvers/share-account-view.resolver.ts index 802fd39b6..84eb0323e 100644 --- a/src/app/shares/common-resolvers/share-account-view.resolver.ts +++ b/src/app/shares/common-resolvers/share-account-view.resolver.ts @@ -25,7 +25,7 @@ export class SharesAccountViewResolver implements Resolve { * @returns {Observable} */ resolve(route: ActivatedRouteSnapshot): Observable { - const shareAccountId = route.paramMap.get('shareAccountId'); + const shareAccountId = route.paramMap.get('shareAccountId') || route.parent.paramMap.get('shareAccountId'); return this.sharesService.getSharesAccountData(shareAccountId, false); } diff --git a/src/app/shares/create-shares-account/create-shares-account.component.ts b/src/app/shares/create-shares-account/create-shares-account.component.ts index ad8dd5d65..a3fa247df 100644 --- a/src/app/shares/create-shares-account/create-shares-account.component.ts +++ b/src/app/shares/create-shares-account/create-shares-account.component.ts @@ -105,7 +105,7 @@ export class CreateSharesAccountComponent { const sharesAccount = { ...this.sharesAccount, clientId: this.sharesAccountTemplate.clientId, - charges: this.sharesAccount.charges.map((charge: any) => ({ chargeId: charge.chargeId, amount: charge.amount })), + charges: this.sharesAccount.charges.map((charge: any) => ({ chargeId: charge.id, amount: charge.amount })), applicationDate: this.dateUtils.formatDate(this.sharesAccount.applicationDate, dateFormat), submittedDate: this.dateUtils.formatDate(this.sharesAccount.submittedDate, dateFormat), unitPrice: this.sharesAccountTermsForm.get('unitPrice').value, diff --git a/src/app/shares/edit-shares-account/edit-shares-account.component.ts b/src/app/shares/edit-shares-account/edit-shares-account.component.ts index 1f3dd4d79..3b29d5c0b 100644 --- a/src/app/shares/edit-shares-account/edit-shares-account.component.ts +++ b/src/app/shares/edit-shares-account/edit-shares-account.component.ts @@ -110,7 +110,7 @@ export class EditSharesAccountComponent { const sharesAccount = { ...this.sharesAccount, clientId: this.sharesAccountAndTemplate.clientId, - charges: this.sharesAccount.charges.map((charge: any) => ({ chargeId: charge.chargeId, amount: charge.amount })), + charges: this.sharesAccount.charges.map((charge: any) => ({ chargeId: charge.id, amount: charge.amount })), applicationDate: this.dateUtils.formatDate(this.sharesAccount.applicationDate, dateFormat), submittedDate: this.dateUtils.formatDate(this.sharesAccount.submittedDate, dateFormat), unitPrice: this.sharesAccountTermsForm.get('unitPrice').value, diff --git a/src/app/shares/shares-account-actions/activate-shares-account/activate-shares-account.component.html b/src/app/shares/shares-account-actions/activate-shares-account/activate-shares-account.component.html index a0482da44..3dc3b0f7d 100644 --- a/src/app/shares/shares-account-actions/activate-shares-account/activate-shares-account.component.html +++ b/src/app/shares/shares-account-actions/activate-shares-account/activate-shares-account.component.html @@ -20,7 +20,7 @@ - + diff --git a/src/app/shares/shares-account-actions/apply-shares/apply-shares.component.html b/src/app/shares/shares-account-actions/apply-shares/apply-shares.component.html index 83cb27d85..4e5f9d04a 100644 --- a/src/app/shares/shares-account-actions/apply-shares/apply-shares.component.html +++ b/src/app/shares/shares-account-actions/apply-shares/apply-shares.component.html @@ -27,7 +27,7 @@ - {{'labels.inputs.Today's Price' | translate}} + {{'labels.inputs.Current Price' | translate}} @@ -37,7 +37,7 @@ - + diff --git a/src/app/shares/shares-account-actions/approve-shares-account/approve-shares-account.component.html b/src/app/shares/shares-account-actions/approve-shares-account/approve-shares-account.component.html index 026593b10..bd573ff20 100644 --- a/src/app/shares/shares-account-actions/approve-shares-account/approve-shares-account.component.html +++ b/src/app/shares/shares-account-actions/approve-shares-account/approve-shares-account.component.html @@ -29,7 +29,7 @@ - + diff --git a/src/app/shares/shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component.html b/src/app/shares/shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component.html index 69c1436a0..87918a0bf 100644 --- a/src/app/shares/shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component.html +++ b/src/app/shares/shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component.html @@ -4,5 +4,5 @@ - + diff --git a/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html b/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html index 189a4000a..02d7a19c1 100644 --- a/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html +++ b/src/app/shares/shares-account-actions/close-shares-account/close-shares-account.component.html @@ -29,7 +29,7 @@ - + diff --git a/src/app/shares/shares-account-actions/redeem-shares/redeem-shares.component.html b/src/app/shares/shares-account-actions/redeem-shares/redeem-shares.component.html index c6c76fae9..68a3c4bc9 100644 --- a/src/app/shares/shares-account-actions/redeem-shares/redeem-shares.component.html +++ b/src/app/shares/shares-account-actions/redeem-shares/redeem-shares.component.html @@ -27,7 +27,7 @@ - {{"labels.inputs.Today's Price" | translate}} + {{"labels.inputs.Current Price" | translate}} @@ -35,7 +35,7 @@ - + diff --git a/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html b/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html index 9924e84aa..2692a41ad 100644 --- a/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html +++ b/src/app/shares/shares-account-actions/reject-shares-account/reject-shares-account.component.html @@ -29,7 +29,7 @@ - + diff --git a/src/app/shares/shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component.html b/src/app/shares/shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component.html index 91138702d..8fcf3eb19 100644 --- a/src/app/shares/shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component.html +++ b/src/app/shares/shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component.html @@ -4,5 +4,5 @@ - + diff --git a/src/app/shares/shares-account-actions/undo-approval-shares-account/undo-approval-shares-account.component.html b/src/app/shares/shares-account-actions/undo-approval-shares-account/undo-approval-shares-account.component.html index 069123b3f..66cb21523 100644 --- a/src/app/shares/shares-account-actions/undo-approval-shares-account/undo-approval-shares-account.component.html +++ b/src/app/shares/shares-account-actions/undo-approval-shares-account/undo-approval-shares-account.component.html @@ -18,7 +18,7 @@ - + diff --git a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html index dfbd81c44..29d3ce141 100644 --- a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html +++ b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.html @@ -28,7 +28,7 @@ @@ -45,7 +45,7 @@ diff --git a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts index 3e246b168..d0f74a4cc 100644 --- a/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts +++ b/src/app/shares/shares-account-stepper/shares-account-charges-step/shares-account-charges-step.component.ts @@ -10,6 +10,7 @@ import { FormDialogComponent } from 'app/shared/form-dialog/form-dialog.componen /** Custom Models */ import { FormfieldBase } from 'app/shared/form-dialog/formfield/model/formfield-base'; import { InputBase } from 'app/shared/form-dialog/formfield/model/input-base'; +import { TranslateService } from '@ngx-translate/core'; /** * Shares Account Charges Step @@ -42,7 +43,8 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges { /** * @param {MatDialog} dialog Mat Dialog */ - constructor(public dialog: MatDialog) { } + constructor(private dialog: MatDialog, + private translateService: TranslateService) { } ngOnInit() { this.currencyCode.valueChanges.subscribe(() => { @@ -80,15 +82,15 @@ export class SharesAccountChargesStepComponent implements OnInit, OnChanges { const formfields: FormfieldBase[] = [ new InputBase({ controlName: 'amount', - label: 'Amount', + label: this.translateService.instant('labels.inputs.Amount'), value: charge.amount || charge.amountOrPercentage, type: 'number', required: false, }), ]; const data = { - title: 'Edit Charge', - layout: { addButtonText: 'Confirm' }, + title: this.translateService.instant('labels.heading.Edit Charge'), + layout: { addButtonText: 'Submit' }, formfields: formfields }; const editNoteDialogRef = this.dialog.open(FormDialogComponent, { data }); diff --git a/src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html b/src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html index 863e07c4e..c18df8995 100644 --- a/src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html +++ b/src/app/shares/shares-account-stepper/shares-account-preview-step/shares-account-preview-step.component.html @@ -33,24 +33,19 @@ {{ sharesAccountTermsForm.get('currencyCode').value | find:[sharesAccountProductTemplate.currency]:'code':'displayLabel' }} -
- {{'labels.inputs.Decimal Places' | translate}} - {{ sharesAccountTermsForm.get('decimal').value }} -
-
{{'labels.inputs.Total Number of Shares' | translate}} - {{ sharesAccount.requestedShares }} + {{ sharesAccount.requestedShares | formatNumber }}
- {{'labels.inputs.Today's Price' | translate}} - {{ sharesAccountTermsForm.get('unitPrice').value }} + {{'labels.inputs.Current Price' | translate}} + {{ sharesAccountTermsForm.get('unitPrice').value | formatNumber }}
- {{'labels.inputs.Currency in multiples of' | translate}} - {{ sharesAccountTermsForm.get('currencyMultiple').value }} + {{'labels.inputs.Amount' | translate}} + {{ (sharesAccount.requestedShares * sharesAccountTermsForm.get('unitPrice').value) | formatNumber }}
@@ -60,12 +55,12 @@
{{'labels.inputs.Minimum Active Period' | translate}} - {{sharesAccount.minimumActivePeriod}} {{sharesAccount.minimumActivePeriodFrequencyType | find:sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value'}} + {{sharesAccount.minimumActivePeriod}} {{sharesAccount.minimumActivePeriodFrequencyType | find:sharesAccountProductTemplate.minimumActivePeriodFrequencyTypeOptions:'id':'value' | translateCatalog}}
{{'labels.inputs.Lock-in Period' | translate}} - {{sharesAccount.lockinPeriodFrequency}} {{sharesAccount.lockinPeriodFrequencyType | find:sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value'}} + {{sharesAccount.lockinPeriodFrequency}} {{sharesAccount.lockinPeriodFrequencyType | find:sharesAccountProductTemplate.lockinPeriodFrequencyTypeOptions:'id':'value' | translateCatalog}}
@@ -75,7 +70,7 @@
{{'labels.inputs.Allow dividends for inactive clients' | translate}} - {{ sharesAccount.allowDividendCalculationForInactiveClients }} + {{ sharesAccount.allowDividendCalculationForInactiveClients | yesNo }}
@@ -96,7 +91,7 @@
@@ -110,7 +105,7 @@ diff --git a/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html b/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html index b3297b4d1..d5f823e92 100644 --- a/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html +++ b/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.html @@ -8,8 +8,8 @@ - {{'labels.inputs.Decimal Places' | translate}} - + {{"labels.inputs.Current Price" | translate}} + @@ -19,22 +19,13 @@ {{'labels.inputs.Total Number of Shares' | translate}} {{"labels.commons.is" | translate}} {{"labels.commons.required" | translate}} - - - {{"labels.inputs.Today's Price" | translate}} - - - - - {{'labels.inputs.Currency in multiples of' | translate}} - - + {{ calculateCurrenValue() | currency:currency.code:'symbol-narrow':'1.2-2' }} {{'labels.inputs.Default Savings Account' | translate}} - {{ account.accountNo }} + {{ account.accountNo }} - {{ account.savingsProductName }} @@ -68,7 +59,7 @@ {{'labels.inputs.Type' | translate}} - {{ minimumActivePeriodFrequencyType.value }} + {{ minimumActivePeriodFrequencyType.value | translateCatalog }} @@ -84,7 +75,7 @@ {{'labels.inputs.Type' | translate}} - {{ lockinPeriodFrequencyType.value }} + {{ lockinPeriodFrequencyType.value | translateCatalog }} diff --git a/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.ts b/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.ts index d9137971a..2f1239e94 100644 --- a/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.ts +++ b/src/app/shares/shares-account-stepper/shares-account-terms-step/shares-account-terms-step.component.ts @@ -2,6 +2,7 @@ import { Component, OnChanges, OnInit, Input } 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'; /** * Shares Account Terms Step @@ -33,6 +34,8 @@ export class SharesAccountTermsStepComponent implements OnChanges, OnInit { /** For Edit Shares Account Form */ isSavingsPatched = false; + currency: Currency | null = null; + /** * @param {FormBuilder} formBuilder Form Builder * @param {SettingsService} settingsService Settings Service @@ -44,6 +47,7 @@ export class SharesAccountTermsStepComponent implements OnChanges, OnInit { ngOnChanges() { if (this.sharesAccountProductTemplate) { + this.currency = this.sharesAccountProductTemplate.currency; this.sharesAccountTermsForm.patchValue({ 'currencyCode': this.sharesAccountProductTemplate.currency.code, 'decimal': this.sharesAccountProductTemplate.currency.decimalPlaces, @@ -112,4 +116,11 @@ export class SharesAccountTermsStepComponent implements OnChanges, OnInit { return this.sharesAccountTermsForm.value; } + calculateCurrenValue(): number { + if (this.sharesAccountTermsForm.value.requestedShares && this.sharesAccountProductTemplate.currentMarketPrice) { + return this.sharesAccountProductTemplate.currentMarketPrice * this.sharesAccountTermsForm.value.requestedShares; + } + return 0; + } + } diff --git a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.html b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.html index c71ae4306..ad7136602 100644 --- a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.html +++ b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.html @@ -20,32 +20,58 @@ - + - + - + - + - + - + + + + + + diff --git a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.scss b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.scss index be9328c80..527e017a6 100644 --- a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.scss +++ b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.scss @@ -4,7 +4,19 @@ h3 { margin:1% auto; } + .action-button { + margin-left: auto; + } table { width: 100%; + .account-action-button{ + min-width: 26px; + padding: 0 6px; + margin: 4px; + line-height: 25px; + } + .select-row:hover { + cursor: pointer; + } } -} +} \ No newline at end of file diff --git a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.ts b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.ts index 6546c3681..9b1dafed1 100644 --- a/src/app/shares/shares-account-view/charges-tab/charges-tab.component.ts +++ b/src/app/shares/shares-account-view/charges-tab/charges-tab.component.ts @@ -20,16 +20,7 @@ export class ChargesTabComponent implements OnInit { /** Data source for charges table. */ dataSource: MatTableDataSource; /** Columns to be displayed in charges table. */ - displayedColumns: string[] = [ - 'name', - 'feeOrPenalty', - 'paymentDueAt', - 'calculationType', - 'due', - 'paid', - 'waived', - 'outstanding', - ]; + displayedColumns: string[] = ['name', 'feeOrPenalty', 'paymentDueAt', 'calculationType', 'due', 'paid', 'waived', 'outstanding', 'actions' ]; /** * Retrieves shares account aata from `resolve`. @@ -40,6 +31,7 @@ export class ChargesTabComponent implements OnInit { this.sharesAccountData = data.sharesAccountData; this.chargesData = this.sharesAccountData.charges; }); + console.log(this.sharesAccountData); } ngOnInit() { diff --git a/src/app/shares/shares-account-view/dividends-tab/dividends-tab.component.html b/src/app/shares/shares-account-view/dividends-tab/dividends-tab.component.html index 2bbec306e..630b9ab5e 100644 --- a/src/app/shares/shares-account-view/dividends-tab/dividends-tab.component.html +++ b/src/app/shares/shares-account-view/dividends-tab/dividends-tab.component.html @@ -1,7 +1,7 @@
-

{{'labels.inputs.All Dividends' | translate}}

+

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

@@ -15,7 +15,7 @@
- + @@ -25,7 +25,7 @@ - + diff --git a/src/app/shares/shares-account-view/general-tab/general-tab.component.html b/src/app/shares/shares-account-view/general-tab/general-tab.component.html new file mode 100644 index 000000000..744d3cb1f --- /dev/null +++ b/src/app/shares/shares-account-view/general-tab/general-tab.component.html @@ -0,0 +1,65 @@ +
+ +
{{'labels.inputs.Name' | translate}} {{'labels.inputs.Due' | translate}} {{charge.amount | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{charge.amount | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} + {{'labels.inputs.Paid' | translate}} {{charge.amountPaid | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{charge.amountPaid | + currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Waived' | translate}} {{charge.amountWaived | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{charge.amountWaived | + currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Outstanding' | translate}} {{charge.amountOutstanding | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{charge.amountOutstanding | + currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Type' | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }} {{'labels.inputs.Type' | translate}} - {{ charge.chargeCalculationType.value }} + {{ charge.chargeCalculationType.value | translateCatalog }} {{'labels.inputs.Collected On' | translate}} - {{ charge.chargeTimeType.value }} + {{ charge.chargeTimeType.value | translateCatalog }} {{'labels.inputs.Payment Due At' | translate}} {{ charge.chargeTimeType.value }} {{ charge.chargeTimeType.value | translateCatalog }} {{'labels.inputs.Calculation Type' | translate}} {{charge.chargeCalculationType.value}} {{charge.chargeCalculationType.value | translateCatalog}} {{'labels.inputs.Due' | translate}} {{charge.currency.displaySymbol}} {{charge.amount}} {{charge.amount | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Paid' | translate}} {{charge.currency.displaySymbol}} {{charge.amountPaid}} {{charge.amountPaid | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Waived' | translate}} {{charge.currency.displaySymbol}} {{charge.amountWaived}} {{charge.amountWaived | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Outstanding' | translate}} {{charge.currency.displaySymbol}} {{charge.amountOutstanding}} {{charge.amountOutstanding | currency:charge.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Actions' | translate}} + + + + + + + + +
{{'labels.inputs.Amount' | translate}} {{shareAccountData.currency.displaySymbol}} {{dividend.amount}} {{dividend.amount | currency:shareAccountData.currency.code:'symbol-narrow':'1.2-2'}} {{'labels.inputs.Status' | translate}} {{dividend.status.value}} {{ 'labels.status.' + dividend.status.value | translate}}
+ + + + + + + + + + + + + + + + + + + + + +
{{'labels.inputs.Activated On' | translate}} + {{sharesAccountData.timeline.activatedDate | dateFormat}} + + {{ 'labels.text.Not Activated' | translate}} +
{{'labels.inputs.Currency' | translate}}{{sharesAccountData.currency.name}} [{{sharesAccountData.currency.code}}]
{{'labels.inputs.External Id' | translate}} + + + {{'labels.inputs.Unassigned' | translate}} +
{{'labels.inputs.Linked Savings Account(Dividend Posting)' | translate}} + + + {{'labels.inputs.Unassigned' | translate}} +
+
+ +
+

{{'labels.heading.Account Summary' | translate}}

+ + + + + + + + + + + +
{{'labels.inputs.Pending for Approval Shares' | translate}}{{sharesAccountData.summary.totalPendingForApprovalShares | formatNumber}}
{{'labels.inputs.Approved Shares' | translate}}{{sharesAccountData.summary.totalApprovedShares | formatNumber}}
+
+ + + + \ No newline at end of file diff --git a/src/app/shares/shares-account-view/general-tab/general-tab.component.scss b/src/app/shares/shares-account-view/general-tab/general-tab.component.scss new file mode 100644 index 000000000..630a36bed --- /dev/null +++ b/src/app/shares/shares-account-view/general-tab/general-tab.component.scss @@ -0,0 +1,23 @@ +.tab-container { + padding: 1%; + margin: 1%; + + h3 { + margin: 1% auto; + } + + .performance-history-container { + border: 1px solid; + padding: 1%; + margin-bottom: 20px; + } + + table { + width: 100%; + margin-bottom: 20px; + } +} + +span { + margin: 0.5em 0; +} \ No newline at end of file diff --git a/src/app/shares/shares-account-view/general-tab/general-tab.component.spec.ts b/src/app/shares/shares-account-view/general-tab/general-tab.component.spec.ts new file mode 100644 index 000000000..23d4dfb2b --- /dev/null +++ b/src/app/shares/shares-account-view/general-tab/general-tab.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { GeneralTabComponent } from './general-tab.component'; + +describe('GeneralTabComponent', () => { + let component: GeneralTabComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ GeneralTabComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(GeneralTabComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shares/shares-account-view/general-tab/general-tab.component.ts b/src/app/shares/shares-account-view/general-tab/general-tab.component.ts new file mode 100644 index 000000000..ff0af952a --- /dev/null +++ b/src/app/shares/shares-account-view/general-tab/general-tab.component.ts @@ -0,0 +1,26 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +@Component({ + selector: 'mifosx-general-tab', + templateUrl: './general-tab.component.html', + styleUrls: ['./general-tab.component.scss'] +}) +export class GeneralTabComponent implements OnInit { + /** Shares Account Data */ + sharesAccountData: any; + + /** + * Fetches shares account data from `resolve` + * @param {ActivatedRoute} route Activated Route + */ + constructor(private route: ActivatedRoute) { + this.route.data.subscribe((data: { sharesAccountData: any }) => { + this.sharesAccountData = data.sharesAccountData; + }); + } + + ngOnInit(): void { + } + +} diff --git a/src/app/shares/shares-account-view/shares-account-view.component.html b/src/app/shares/shares-account-view/shares-account-view.component.html index 8d36de195..7fdb8c329 100644 --- a/src/app/shares/shares-account-view/shares-account-view.component.html +++ b/src/app/shares/shares-account-view/shares-account-view.component.html @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/src/app/shares/shares-account-view/shares-account-view.component.scss b/src/app/shares/shares-account-view/shares-account-view.component.scss index 6f6c669de..30e67dda9 100644 --- a/src/app/shares/shares-account-view/shares-account-view.component.scss +++ b/src/app/shares/shares-account-view/shares-account-view.component.scss @@ -1,53 +1,8 @@ -.shares-account-card { - margin: 0 auto; - max-width: 80rem; - width: 90%; - padding: 0; - .header { - padding: 1%; - .header-title-group { - .account-card-title { - color: white; - width: 90%; - p { - color: white; - } - } - } - .profile-image-container { - margin: 1%; - .profile-image { - object-fit: cover; - border-radius: 20px; - } - } - .account-actions { - align-self: flex-end; - margin: 0 1%; - i { - margin-bottom: 2px; - margin-right: 4px; - } - } - } - .navigation-tabs { - background-color: #f2f2f2; - overflow: auto; - } - .content { - .shares-account-tables { - padding: 1%; - margin: 1%; - .table-headers { - margin: 0; - padding: 6px; - } - td { - padding: 3px; - } - } - } - i, img:hover { - cursor: pointer; - } +.shares-overview { + font-size: 14px; } + +.account-overview { + min-width: 60%; + font-weight: 400; +} \ No newline at end of file diff --git a/src/app/shares/shares-account-view/shares-account-view.component.ts b/src/app/shares/shares-account-view/shares-account-view.component.ts index bcfa584a0..f91344c40 100644 --- a/src/app/shares/shares-account-view/shares-account-view.component.ts +++ b/src/app/shares/shares-account-view/shares-account-view.component.ts @@ -27,6 +27,8 @@ export class SharesAccountViewComponent implements OnInit { /** Button Configurations */ buttonConfig: SharesButtonsConfiguration; + entityType: string; + /** * Fetches shares account data from `resolve` * @param {ActivatedRoute} route Activated Route @@ -45,6 +47,13 @@ export class SharesAccountViewComponent implements OnInit { ngOnInit() { this.setConditionalButtons(); + if (this.router.url.includes('clients')) { + this.entityType = 'Client'; + } else if (this.router.url.includes('groups')) { + this.entityType = 'Group'; + } else if (this.router.url.includes('centers')) { + this.entityType = 'Center'; + } } /** diff --git a/src/app/shares/shares-account-view/shares-buttons.config.ts b/src/app/shares/shares-account-view/shares-buttons.config.ts index 5fee5def0..5406b3e13 100644 --- a/src/app/shares/shares-account-view/shares-buttons.config.ts +++ b/src/app/shares/shares-account-view/shares-buttons.config.ts @@ -31,22 +31,22 @@ export class SharesButtonsConfiguration { this.buttonsArray = [ { name: 'Apply Additional Shares', - icon: 'fa fa-arrow-right', + icon: 'arrow-right', taskPermissionName: 'APPLYADDITIONAL_SHAREACCOUNT' }, { name: 'Approve Additional Shares', - icon: 'fa fa-arrow-right', + icon: 'arrow-right', taskPermissionName: 'APPROVEADDITIONAL_SHAREACCOUNT' }, { name: 'Reject Additional Shares', - icon: 'fa fa-arrow-left', + icon: 'arrow-left', taskPermissionName: 'REJECTADDITIONAL_SHAREACCOUNT' }, { name: 'Redeem Shares', - icon: 'fa fa-arrow-left', + icon: 'arrow-left', taskPermissionName: 'WITHDRAW_SAVINGSACCOUNT' } ]; @@ -55,12 +55,12 @@ export class SharesButtonsConfiguration { this.buttonsArray = [ { name: 'Modify Application', - icon: 'fa fa-pencil ', + icon: 'pencil', taskPermissionName: 'UPDATE_SHAREACCOUNT' }, { name: 'Approve', - icon: 'fa fa-check', + icon: 'check', taskPermissionName: 'APPROVE_SHAREACCOUNT' } ]; @@ -69,12 +69,12 @@ export class SharesButtonsConfiguration { this.buttonsArray = [ { name: 'Undo Approval', - icon: 'fa fa-undo', + icon: 'undo', taskPermissionName: 'APPROVALUNDO_SHAREACCOUNT' }, { name: 'Activate', - icon: 'fa fa-check', + icon: 'check', taskPermissionName: 'ACTIVATE_SHAREACCOUNT' } ]; diff --git a/src/app/shares/shares-routing.module.ts b/src/app/shares/shares-routing.module.ts index 05ec8ccaf..4be5242f7 100644 --- a/src/app/shares/shares-routing.module.ts +++ b/src/app/shares/shares-routing.module.ts @@ -16,6 +16,7 @@ import { SharesAccountViewResolver } from './common-resolvers/share-account-view import { ShareAccountActionsResolver } from './common-resolvers/share-account-actions.resolver'; import { SharesAccountTemplateResolver } from './common-resolvers/shares-account-template.resolver'; import { SharesAccountAndTemplateResolver } from './common-resolvers/share-account-and-template.resolver'; +import { GeneralTabComponent } from './shares-account-view/general-tab/general-tab.component'; /** Shares Routes */ const routes: Routes = [ @@ -42,6 +43,19 @@ const routes: Routes = [ sharesAccountData: SharesAccountViewResolver }, children: [ + { + path: '', + redirectTo: 'general', + pathMatch: 'full' + }, + { + path: 'general', + component: GeneralTabComponent, + data: { title: 'Shares Account General', breadcrumb: 'General', routeParamBreadcrumb: false }, + resolve: { + sharesAccountData: SharesAccountViewResolver + }, + }, { path: 'transactions', component: TransactionsTabComponent, diff --git a/src/app/shares/shares.module.ts b/src/app/shares/shares.module.ts index 1c73ee788..dc672874e 100644 --- a/src/app/shares/shares.module.ts +++ b/src/app/shares/shares.module.ts @@ -28,6 +28,7 @@ import { ApproveSharesComponent } from './shares-account-actions/approve-shares/ import { ApproveShareDialogComponent } from './shares-account-actions/approve-shares/approve-share-dialog/approve-share-dialog.component'; import { RejectSharesComponent } from './shares-account-actions/reject-shares/reject-shares.component'; import { RejectShareDialogComponent } from './shares-account-actions/reject-shares/reject-share-dialog/reject-share-dialog.component'; +import { GeneralTabComponent } from './shares-account-view/general-tab/general-tab.component'; /** * Shares Module @@ -63,7 +64,8 @@ import { RejectShareDialogComponent } from './shares-account-actions/reject-shar ApproveSharesComponent, ApproveShareDialogComponent, RejectSharesComponent, - RejectShareDialogComponent + RejectShareDialogComponent, + GeneralTabComponent ], providers: [ ] }) diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index fce479cd8..0f2a88874 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -994,6 +994,7 @@ "Share Products": "Sdílejte produkty", "Shares Accounts": "Účty akcií", "Shares Details": "Podrobnosti o podílech", + "Share Equity": "Podíl vlastního kapitálu", "Shares per Client": "Akcie na klienta", "Standing Instructions History": "Historie stálých instrukcí", "Submitted On Date": "Odesláno dne", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Zůstatek úvěru", "Balance Required For Interest Calculation": "Zůstatek požadovaný pro výpočet úroku", "Balance Required for Interest Calculation": "Zůstatek požadovaný pro výpočet úroku", + "Balloon Repayment Amount": "Částka splátek balónu", "Bank": "banka", "Bank No": "č. banky", "Bank Number": "Číslo banky", @@ -1437,6 +1439,7 @@ "Entity Type": "Typ entity", "Entry ID": "ID vstupu", "Equal Amortization": "Rovné odpisování", + "Equity": "Spravedlnost", "Error": "Chyba", "Error Log": "Protokol chyb", "Escheat liability": "Escheat odpovědnost", @@ -1733,6 +1736,7 @@ "Mapper Key": "Mapper Key", "Mapper Value": "Hodnota mapovače", "Mapping Between Entities": "Mapování mezi entitami", + "Market Price Period": "Období tržní ceny", "Marital Status": "Stav", "Matures on": "Zraje na", "Maturity Amount": "Částka splatnosti", @@ -2163,7 +2167,7 @@ "To Office": "Do Office", "To Savings Officer": "Na spořitelního úředníka", "To loan officer": "Úvěrovému úředníkovi", - "Today's Price": "Dnešní cena", + "Current Price": "Dnešní cena", "Topup closure amount": "Částka pro uzavření doplnění", "Total": "Celkový", "Total Amount": "Celková částka", @@ -2413,6 +2417,10 @@ "Withdrawal": "Vybrání", "Withdrawn by Client": "Staženo klientem", "Write Off": "Odepsat", + "Apply Additional Shares": "Použít další", + "Redeem Shares": "Uplatnit akcie", + "Approve Additional Shares": "Schválit další akcie", + "Reject Additional Shares": "Odmítnout další akcie", "XBRL": "XBRL" }, "placeholders": { @@ -2793,6 +2801,7 @@ "N/A": "N/A", "Navigate system selecting entity": "To uživateli umožní rychle procházet entitou pro výběr systému, zatímco vyhledávání činí navigaci robustnější.", "Navigation": "Navigace", + "Not Activated": "Neaktivováno", "No Data": "Žádná data", "No Description": "Bez popisu", "No checker inbox data available for this account": "Pro tento účet nejsou k dispozici žádná data doručené pošty Checker.", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 4d1104176..c32af410f 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -995,6 +995,7 @@ "Share Products": "Produkte teilen", "Shares Accounts": "Aktienkonten", "Shares Details": "Gibt Details weiter", + "Share Equity": "Aktienkapital", "Shares per Client": "Anteile pro Kunde", "Standing Instructions History": "Ständige Anweisungen Geschichte", "Submitted On Date": "Eingereicht am Datum", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Darlehenssaldo", "Balance Required For Interest Calculation": "Für die Zinsberechnung erforderlicher Saldo", "Balance Required for Interest Calculation": "Für die Zinsberechnung erforderlicher Saldo", + "Balloon Repayment Amount": "Ballon-Rückzahlungsbetrag", "Bank": "Bank", "Bank No": "Bank-Nr", "Bank Number": "Bank Nummer", @@ -1437,6 +1439,7 @@ "Entity Type": "Entitätstyp", "Entry ID": "Eintrags-ID", "Equal Amortization": "Gleiche Amortisation", + "Equity": "Eigenkapital", "Error": "Fehler", "Error Log": "Fehlerprotokoll", "Escheat liability": "Treuhandhaftung", @@ -1733,6 +1736,7 @@ "Mapper Key": "Mapper-Schlüssel", "Mapper Value": "Mapper-Wert", "Mapping Between Entities": "Zuordnung zwischen Entitäten", + "Market Price Period": "Marktpreiszeitraum", "Marital Status": "Familienstand", "Matures on": "Reift weiter", "Maturity Amount": "Fälligkeitsbetrag", @@ -2163,7 +2167,7 @@ "To Office": "Zum Büro", "To Savings Officer": "An den Sparbeauftragten", "To loan officer": "An den Kreditsachbearbeiter", - "Today's Price": "Heutiger Preis", + "Current Price": "Heutiger Preis", "Topup closure amount": "Aufladeabschlussbetrag", "Total": "Gesamt", "Total Amount": "Gesamtmenge", @@ -2413,6 +2417,10 @@ "Withdrawal": "Rückzug", "Withdrawn by Client": "Vom Kunden zurückgezogen", "Write Off": "Abschreiben", + "Apply Additional Shares": "Zusätzlich anwenden", + "Redeem Shares": "Anteile zurückgeben", + "Approve Additional Shares": "Genehmigen Sie zusätzliche Freigaben", + "Reject Additional Shares": "Zusätzliche Freigaben ablehnen", "XBRL": "XBRL" }, "placeholders": { @@ -2792,6 +2800,7 @@ "N/A": "N / A", "Navigate system selecting entity": "Dadurch kann der Benutzer schnell durch das System navigieren und eine Entität auswählen, während die Suche die Navigation robuster macht.", "Navigation": "Navigation", + "Not Activated": "Nicht aktiviert", "No Data": "Keine Daten", "No Description": "Keine Beschreibung", "No checker inbox data available for this account": "Für dieses Konto sind keine Checker-Posteingangsdaten verfügbar.", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index 9cbca8b09..57b4719c8 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -648,6 +648,8 @@ "Amount on hold": "Amount on hold", "Percentage": "Percentage", "Fixed Amount": "Fixed Amount", + "Share Solidarity Fund": "Share Solidarity Fund", + "Share Building Contribution": "Share Building Contribution", "Invalid": "Invalid" }, "commons": { @@ -994,6 +996,7 @@ "Share Products": "Share Products", "Shares Accounts": "Shares Accounts", "Shares Details": "Shares Details", + "Share Equity": "Share Equity", "Shares per Client": "Shares per Client", "Standing Instructions History": "Standing Instructions History", "Submitted On Date": "Submitted On Date", @@ -1164,6 +1167,7 @@ "Balance Of Loan": "Balance Of Loan", "Balance Required For Interest Calculation": "Balance Required For Interest Calculation", "Balance Required for Interest Calculation": "Balance Required for Interest Calculation", + "Balloon Repayment Amount": "Balloon Repayment Amount", "Bank": "Bank", "Bank No": "Bank No", "Bank Number": "Bank Number", @@ -1436,6 +1440,7 @@ "Entity Type": "Entity Type", "Entry ID": "Entry ID", "Equal Amortization": "Equal Amortization", + "Equity": "Equity", "Error": "Error", "Error Log": "Error Log", "Escheat liability": "Escheat liability", @@ -1732,6 +1737,7 @@ "Mapper Key": "Mapper Key", "Mapper Value": "Mapper Value", "Mapping Between Entities": "Mapping Between Entities", + "Market Price Period": "Market Price Period", "Marital Status": "Marital Status", "Matures on": "Matures on", "Maturity Amount": "Maturity Amount", @@ -2162,7 +2168,7 @@ "To Office": "To Office", "To Savings Officer": "To Savings Officer", "To loan officer": "To loan officer", - "Today's Price": "Today's Price", + "Current Price": "Current Price", "Topup closure amount": "Topup closure amount", "Total": "Total", "Total Amount": "Total Amount", @@ -2412,6 +2418,10 @@ "Withdrawal": "Withdrawal", "Withdrawn by Client": "Withdrawn by Client", "Write Off": "Write Off", + "Apply Additional Shares": "Apply Additional Shares", + "Redeem Shares": "Redeem Shares", + "Approve Additional Shares": "Approve Additional Shares", + "Reject Additional Shares": "Reject Additional Shares", "XBRL": "XBRL" }, "placeholders": { @@ -2792,6 +2802,7 @@ "N/A": "N/A", "Navigate system selecting entity": "This will allow the user to quickly navigate the system selecting entity while searching makes the navigation more robust.", "Navigation": "Navigation", + "Not Activated": "Not Activated", "No Data": "No Data", "No Description": "No Description", "No checker inbox data available for this account": "No checker inbox data available for this account.", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index 1f0f595db..96c376a51 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -372,7 +372,7 @@ "Create Report": "Crear Reporte", "Create SMS Campaign": "Crear campaña de SMS", "Create Self Service User": "Crear usuario de autoservicio", - "Create Share Product": "Crear producto compartido", + "Create Share Product": "Crear producto Acciones", "Create Standing Instructions": "Crear instrucciones permanentes", "Create Surveys": "Crear encuestas", "Create Tax Component": "Crear componente de impuestos", @@ -721,7 +721,7 @@ "All Standing Instructions": "Todas las instrucciones permanentes", "All Transactions": "Todas las transacciones", "And thereafter, in Multiples of": "Y posteriormente, en Múltiplos de", - "Approve Share": "Aprobar Compartir", + "Approve Share": "Aprobar Acción", "Approve Checker": "Aprobar el verificador", "Approve Loan": "Aprobar Crédito", "Assets": "Activos", @@ -777,7 +777,7 @@ "Create loan product": "Crear producto de Crédito", "Create recurring deposit product": "Crear producto de Depósito Recurrente", "Create Savings Product": "Crear producto de ahorro", - "Create share product": "Crear producto compartido", + "Create share product": "Crear producto de Acciones", "Currency": "Moneda", "Currency Configuration": "Configuración de moneda", "Dashboard": "Tableros", @@ -875,7 +875,7 @@ "List of recurring deposit products in the organization": "Listado de productos de depósito recurrentes en la organización. Para más detalles haga clic", "List of roles defined within the organization": "Listado de roles definidos dentro de la organización. o más detalles haga clic", "List of saving products in the organization": "Listado de productos de ahorro en la organización. Para más detalles haga clic", - "List of share products in the organization": "Listado de productos compartidos en la organización. Para más detalles haga clic", + "List of share products in the organization": "Listado de productos de acciones en la organización. Para más detalles haga clic", "Loan Account OverView": "Resumen cuenta de Crédito", "Loan Accounts": "Cuentas de Crédito", "Loan Delinquency Actions": "Acciones de Delincuencia de Crédito", @@ -947,7 +947,7 @@ "Recurring Deposit Details": "Detalles del Depósito Recurrente", "Recurring Deposit Products": "Productos de depósito recurrentes", "Recurring Deposit Transactions": "Transacciones de depósito recurrentes", - "Reject Share": "Rechazar compartir", + "Reject Share": "Rechazar Acción", "Reject Checker": "Rechazador", "Release Amount": "Cantidad de liberación", "Repaid Every": "Frecuencia de Pago", @@ -985,16 +985,17 @@ "Search bar to filter recurring deposit products.": "Barra de búsqueda para filtrar productos de depósito recurrentes.", "Search bar to filter roles": "Barra de búsqueda para filtrar roles.", "Search bar to filter saving products.": "Barra de búsqueda para filtrar productos de ahorro.", - "Search bar to filter share products.": "Barra de búsqueda para filtrar productos compartidos.", + "Search bar to filter share products.": "Barra de búsqueda para filtrar productos de acciones.", "Select Excel File": "Seleccionar archivo de Excel", "Selected Clients": "Clientes seleccionados", "Selected Groups": "Grupos seleccionados", "Session Timeout": "Término de la Sesión", "Settings": "Ajustes", - "Share Accounts": "Compartir cuentas", - "Share Products": "Compartir productos", + "Share Accounts": "Cuentas de Acciones", + "Share Products": "Productos de Acciones", "Shares Accounts": "Cuentas de acciones", "Shares Details": "Detalles de acciones", + "Share Equity": "Capital accionario", "Shares per Client": "Acciones por Cliente", "Standing Instructions History": "Historial de instrucciones permanentes", "Submitted On Date": "Registrado el día", @@ -1133,7 +1134,7 @@ "Apply Penal Interest (less)": "Aplicar Interés Penal (menos)", "Apply Withdrawal Fee for Transfers": "Aplicar comisión de retiro para transferencias", "Approval Date": "Fecha de aprobación", - "Approve Share": "Aprobar Compartir", + "Approve Share": "Aprobar Acciones", "Approved": "Aprobado", "Approved Amount": "Monto aprobado", "Approved By": "Aprobado por", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Saldo del Crédito", "Balance Required For Interest Calculation": "Saldo requerido para el cálculo de intereses", "Balance Required for Interest Calculation": "Saldo requerido para el cálculo de intereses", + "Balloon Repayment Amount": "Monto de Pago Final", "Bank": "Banco", "Bank No": "Número de banco", "Bank Number": "Número de banco", @@ -1437,6 +1439,7 @@ "Entity Type": "Tipo de entidad", "Entry ID": "Id de entrada", "Equal Amortization": "Amortización igual", + "Equity": "Acción", "Error": "Error", "Error Log": "Registro de errores", "Escheat liability": "Renunciar a la propiedad", @@ -1508,7 +1511,7 @@ "From Account ID": "Desde la cuenta", "From Account Type": "Tipo de cuenta origen", "From Client": "Del cliente", - "From Date": "Partir de la fecha", + "From Date": "Desde la fecha", "From Email": "Desde el correo", "From Name": "Del nombre", "From loan officer": "Del oficial de Créditos", @@ -1733,6 +1736,7 @@ "Mapper Key": "Clave del asignador", "Mapper Value": "Valor del asignador", "Mapping Between Entities": "Mapeo entre entidades", + "Market Price Period": "Periodo de precio de mercado", "Marital Status": "Estado civil", "Matures on": "Madura en", "Maturity Amount": "Monto de vencimiento", @@ -2091,10 +2095,10 @@ "Server Key": "Clave del servidor", "Settlement": "Liquidación", "Settlement Date": "Fecha de liquidación", - "Share Account": "Compartir cuenta", - "Share Product": "Compartir producto", - "Share reference": "Compartir referencia", - "Share suspense control": "Compartir control de suspenso", + "Share Account": "Cuenta de Acciones", + "Share Product": "Producto de Acciones", + "Share reference": "Referencia de Acciones", + "Share suspense control": "Control de suspenso de Acciones", "Shares Accounts": "Cuentas de acciones", "Shares per Client": "Acciones por cliente", "Shares to be Issued": "Acciones a emitir", @@ -2163,7 +2167,7 @@ "To Office": "A la oficina", "To Savings Officer": "Al oficial de ahorros", "To loan officer": "Al oficial de créditos", - "Today's Price": "Precio de hoy", + "Current Price": "Precio Actual", "Topup closure amount": "Importe de cierre de recarga", "Total": "Total", "Total Amount": "Cantidad total", @@ -2336,7 +2340,7 @@ "Chart of Accounts": "Catálogo de cuentas", "Checker Inbox and Tasks": "Bandeja de entrada y tareas de Checker", "Clients": "Clientes", - "Close": "Cerca", + "Close": "Cerrar", "Close (as Rescheduled)": "Cerrar (según reprogramado)", "Configuration Wizard": "Asistente de configuración", "Create Guarantor": "Crear garante", @@ -2413,6 +2417,10 @@ "Withdrawal": "Retiro", "Withdrawn by Client": "Retirado por el cliente", "Write Off": "Cancelar crédito", + "Apply Additional Shares": "Adicionar Acciones", + "Redeem Shares": "Canjear acciones", + "Approve Additional Shares": "Aprobar acciones adicionales", + "Reject Additional Shares": "Rechazar acciones adicionales", "XBRL": "XBRL" }, "placeholders": { @@ -2481,7 +2489,7 @@ "Add new office or modify or deactivate office": "Agregar nueva oficina o modificar o desactivar oficina o modificar jerarquía", "Add new report and classify reports": "Agregar nuevo reporte y clasificar reportes", "Add new savings product or modify or inactivate savings product": "Agregar nuevo producto de ahorro o modificar o desactivar producto de ahorro", - "Add new share product or modify or inactivate share product": "Agregar nuevo producto compartido o modificar o desactivar el producto compartido", + "Add new share product or modify or inactivate share product": "Agregar nuevo producto de acciones o modificar o desactivar el producto de acciones", "Add, modify or inactivate a Fixed deposit product": "Agregar, modificar o desactivar un producto de Depósito Fijo", "Add, modify or inactivate a Recurring Deposit product": "Agregar, modificar o desactivar un producto de Depósito Recurrente", "Address": "Domicilio", @@ -2496,7 +2504,7 @@ "Allows you to create new fixed deposit product": "Esta opción le permite crear un nuevo producto de Depósito Fijo.", "Alternative way-Tree view": "Existe una forma alternativa de ver sus cuentas: utilizando la Vista de árbol.", "Are you sure you want to": "Estás seguro que quieres", - "Are you sure you want to approve share with id": "¿Estás seguro de que deseas aprobar compartir con id?", + "Are you sure you want to approve share with id": "¿Estás seguro de que deseas aprobar acciones con id?", "Are you sure you want to calculate interest": "¿Estás seguro de que quieres calcular el interés?", "Are you sure you want to cancel": "Estas seguro que quieres cancelar", "Are you sure you want to disable": "¿Estás seguro de que deseas desactivar?", @@ -2505,7 +2513,7 @@ "Are you sure you want to inactivate charge with id": "¿Estás seguro de que deseas desactivar el cargo con identificación?", "Are you sure you want to leave this page and lose all inputted data": "¿Está seguro de que desea abandonar esta página y perder todos los datos ingresados?", "Are you sure you want to post interest": "¿Estás seguro de que quieres publicar interés?", - "Are you sure you want to reject share with id": "¿Estás seguro de que quieres rechazar compartir con id?", + "Are you sure you want to reject share with id": "¿Estás seguro de que quieres rechazar acciones con id?", "Are you sure you want to release this amount": "¿Estás seguro de que quieres liberar esta cantidad?", "Are you sure you want to undo this transaction": "¿Estás seguro de que deseas deshacer esta transacción?", "Are you sure you want to waive charge with id": "¿Estás seguro de que quieres renunciar al cargo con identificación?", @@ -2589,7 +2597,7 @@ "Create Savings Product": "Crear producto de ahorro", "Create Savings Account": "Crear Cuenta de Ahorros", "Create Self Service User": "Crear usuario de autoservicio", - "Create Share Product": "Crear producto compartido", + "Create Share Product": "Crear producto de Acciones", "Create Shares Account": "Crear cuenta de acciones", "Create Standing Instructions": "Crear instrucciones permanentes", "Create Survey": "Crear encuesta", @@ -2678,7 +2686,7 @@ "Edit Savings Account": "Editar Cuenta de Ahorros", "Edit Scheduler Job": "Editar proceso calendarizado", "Edit Self Service User": "Editar usuario de autoservicio", - "Edit Share Product": "Editar Compartir Producto", + "Edit Share Product": "Editar Producto de Acciones", "Edit Shares Account": "Editar cuenta de acciones", "Edit Standing Instructions": "Editar instrucciones permanentes", "Edit Survey": "Editar encuesta", @@ -2793,6 +2801,7 @@ "N/A": "N/A", "Navigate system selecting entity": "Esto permitirá al usuario navegar rápidamente por el sistema seleccionando la entidad mientras la búsqueda hace que la navegación sea más sólida.", "Navigation": "Navegación", + "Not Activated": "No Activado", "No Data": "Sin datos", "No Description": "Sin descripción", "No checker inbox data available for this account": "No hay datos de la bandeja de entrada del inspector disponibles para esta cuenta.", @@ -2915,7 +2924,7 @@ "This option allows you to create new loan product.": "Esta opción le permite crear un nuevo producto de Crédito.", "This option allows you to create new recurring product.": "Esta opción le permite crear un nuevo producto recurrente.", "This option allows you to create new savings product.": "Esta opción le permite crear un nuevo producto de ahorro.", - "This option allows you to create new share product.": "Esta opción le permite crear un nuevo producto compartido.", + "This option allows you to create new share product.": "Esta opción le permite crear un nuevo producto de acciones.", "This shows all the notifications.": "Esto muestra todas las notificaciones.", "This will navigate the user to the dashboard component.": "Esto llevará al usuario al componente del tablero.", "This will navigate the user to the searched activity.": "Esto llevará al usuario a la actividad buscada.", @@ -2985,7 +2994,7 @@ "View Saving Product": "Ver Cuenta de Ahorros", "View Scheduler Job": "Ver proceso calendarizado", "View Self Service User": "Ver usuario de autoservicio", - "View Share Product": "Ver Compartir Producto", + "View Share Product": "Ver Producto de Acciones", "View Standing Instructions": "Ver instrucciones permanentes", "View Survey": "Ver encuesta", "View Tax Component": "Ver componente de impuestos", @@ -3062,7 +3071,7 @@ "Annualised Interest rate": "Tasa de interés anualizada", "Approve": "Aprobar", "Approve Reschedule": "Aprobar reprogramar", - "Approve Share": "Aprobar Compartir", + "Approve Share": "Aprobar Acciones", "Base lending rate for the organisation": "Compruebe si este esquema de tasa variable debe considerarse tasa de Crédito base para la organización.", "Capture Image": "Capturar imagen", "Chart Of Accounts": "Catálogo de cuentas", @@ -3148,7 +3157,7 @@ "Provides an external id": "Proporciona una Id externo para la cuenta del Crédito.", "Provides an indication": "Proporciona una indicación de cómo se dirigirán los fondos proporcionados a través del Crédito y cómo se pueden utilizar para agrupar Créditos con el mismo propósito de informar.", "Reject Reschedule": "Rechazar reprogramar", - "Reject Share": "Rechazar compartir", + "Reject Share": "Rechazar Acciones", "Remove Client from Group": "Eliminar cliente del grupo", "Remove Period": "Eliminar período", "Resume Delinquency Classification": "Reanudar la clasificación de la delincuencia", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index 2fd606be4..98f3f5bcd 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -995,6 +995,7 @@ "Share Products": "Partager des produits", "Shares Accounts": "Comptes d'actions", "Shares Details": "Détails des actions", + "Share Equity": "Actions", "Shares per Client": "Actions par client", "Standing Instructions History": "Historique des instructions permanentes", "Submitted On Date": "Soumis le jour", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Solde du prêt", "Balance Required For Interest Calculation": "Solde requis pour le calcul des intérêts", "Balance Required for Interest Calculation": "Solde requis pour le calcul des intérêts", + "Balloon Repayment Amount": "Montant du remboursement du ballon", "Bank": "Banque", "Bank No": "Numéro de banque", "Bank Number": "Numéro de banque", @@ -1437,6 +1439,7 @@ "Entity Type": "Type d'entité", "Entry ID": "ID d'entrée", "Equal Amortization": "Amortissement égal", + "Equity": "Équité", "Error": "Erreur", "Error Log": "Journal des erreurs", "Escheat liability": "Responsabilité en cas de déshérence", @@ -1733,6 +1736,7 @@ "Mapper Key": "Clé du mappeur", "Mapper Value": "Valeur du mappeur", "Mapping Between Entities": "Mappage entre entités", + "Market Price Period": "Période de prix du marché", "Marital Status": "État civil", "Matures on": "Mûrit le", "Maturity Amount": "Montant à l'échéance", @@ -2163,7 +2167,7 @@ "To Office": "Au bureau", "To Savings Officer": "Au responsable de l'épargne", "To loan officer": "À l'agent de crédit", - "Today's Price": "Prix ​​du jour", + "Current Price": "Prix ​​du jour", "Topup closure amount": "Montant de clôture du rechargement", "Total": "Total", "Total Amount": "Montant total", @@ -2413,6 +2417,10 @@ "Withdrawal": "Retrait", "Withdrawn by Client": "Retiré par le client", "Write Off": "Radier", + "Apply Additional Shares": "Appliquer supplémentaire", + "Redeem Shares": "Racheter des actions", + "Approve Additional Shares": "Approuver des partages supplémentaires", + "Reject Additional Shares": "Rejeter les partages supplémentaires", "XBRL": "XBRL" }, "placeholders": { @@ -2793,6 +2801,7 @@ "N/A": "N / A", "Navigate system selecting entity": "Cela permettra à l'utilisateur de naviguer rapidement dans l'entité de sélection du système tandis que la recherche rendra la navigation plus robuste.", "Navigation": "La navigation", + "Not Activated": "Non activé", "No Data": "Pas de données", "No Description": "Pas de description", "No checker inbox data available for this account": "Aucune donnée de boîte de réception du vérificateur disponible pour ce compte.", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 405f71d09..86f37189b 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -995,6 +995,7 @@ "Share Products": "Condividi prodotti", "Shares Accounts": "Conti di condivisione", "Shares Details": "Condivide i dettagli", + "Share Equity": "Condividi capitale", "Shares per Client": "Azioni per cliente", "Standing Instructions History": "Storia delle istruzioni permanenti", "Submitted On Date": "Inserito in data", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Saldo del prestito", "Balance Required For Interest Calculation": "Saldo richiesto per il calcolo degli interessi", "Balance Required for Interest Calculation": "Saldo richiesto per il calcolo degli interessi", + "Balloon Repayment Amount": "Importo Rimborso Pallone", "Bank": "Banca", "Bank No": "Banca n", "Bank Number": "Numero di banca", @@ -1437,6 +1439,7 @@ "Entity Type": "Tipo di entità", "Entry ID": "ID della voce", "Equal Amortization": "Ammortamento uguale", + "Equity": "Equità", "Error": "Errore", "Error Log": "Registro degli errori", "Escheat liability": "Responsabilità di evasione", @@ -1733,6 +1736,7 @@ "Mapper Key": "Chiave del mappatore", "Mapper Value": "Valore del mappatore", "Mapping Between Entities": "Mappatura tra entità", + "Market Price Period": "Periodo del prezzo di mercato", "Marital Status": "Stato civile", "Matures on": "Matura", "Maturity Amount": "Importo di scadenza", @@ -2163,7 +2167,7 @@ "To Office": "All'ufficio", "To Savings Officer": "All'ufficiale del risparmio", "To loan officer": "All'ufficiale di prestito", - "Today's Price": "Il prezzo di oggi", + "Current Price": "Il prezzo di oggi", "Topup closure amount": "Importo di chiusura della ricarica", "Total": "Totale", "Total Amount": "Importo totale", @@ -2413,6 +2417,10 @@ "Withdrawal": "Ritiro", "Withdrawn by Client": "Ritirato dal cliente", "Write Off": "Cancellare", + "Apply Additional Shares": "Applicare aggiuntivo", + "Redeem Shares": "Riscattare azioni", + "Approve Additional Shares": "Approvare azioni aggiuntive", + "Reject Additional Shares": "Rifiutare condivisioni aggiuntive", "XBRL": "XBRL" }, "placeholders": { @@ -2793,6 +2801,7 @@ "N/A": "N / A", "Navigate system selecting entity": "Ciò consentirà all'utente di navigare rapidamente nel sistema selezionando l'entità mentre la ricerca rende la navigazione più affidabile.", "Navigation": "Navigazione", + "Not Activated": "Non attivato", "No Data": "Nessun dato", "No Description": "Nessuna descrizione", "No checker inbox data available for this account": "Nessun dato della casella di posta disponibile per questo account.", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index 1df2c5ec4..1ecab3061 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -996,6 +996,7 @@ "Share Products": "제품 공유", "Shares Accounts": "주식 계좌", "Shares Details": "주식 세부정보", + "Share Equity": "지분 공유", "Shares per Client": "클라이언트당 공유수", "Standing Instructions History": "기립 지시 내역", "Submitted On Date": "제출 날짜", @@ -1166,6 +1167,7 @@ "Balance Of Loan": "대출 잔액", "Balance Required For Interest Calculation": "이자 계산에 필요한 잔액", "Balance Required for Interest Calculation": "이자 계산에 필요한 잔액", + "Balloon Repayment Amount": "Ballon 상환 금액", "Bank": "은행", "Bank No": "은행번호", "Bank Number": "은행번호", @@ -1438,6 +1440,7 @@ "Entity Type": "엔터티 유형", "Entry ID": "항목 ID", "Equal Amortization": "균등 상환", + "Equity": "형평성", "Error": "오류", "Error Log": "오류 기록", "Escheat liability": "몰락 책임", @@ -1734,6 +1737,7 @@ "Mapper Key": "매퍼 키", "Mapper Value": "매퍼 값", "Mapping Between Entities": "엔터티 간 매핑", + "Market Price Period": "시장 가격 기간", "Marital Status": "결혼 여부", "Matures on": "성숙일", "Maturity Amount": "만기금액", @@ -2164,7 +2168,7 @@ "To Office": "사무실로", "To Savings Officer": "저축 담당자에게", "To loan officer": "대출담당자에게", - "Today's Price": "오늘의 가격", + "Current Price": "오늘의 가격", "Topup closure amount": "충전 마감 금액", "Total": "총", "Total Amount": "총액", @@ -2413,6 +2417,10 @@ "Withdrawal": "철수", "Withdrawn by Client": "고객이 철회함", "Write Off": "상각", + "Apply Additional Shares": "추가 신청", + "Redeem Shares": "주식 상환", + "Approve Additional Shares": "추가 공유 승인", + "Reject Additional Shares": "추가 공유 거부", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "이를 통해 사용자는 시스템 선택 엔터티를 빠르게 탐색할 수 있으며 검색은 탐색을 더욱 강력하게 만듭니다.", "Navigation": "항해", "No Data": "데이터 없음", + "Not Activated": "활성화되지 않음", "No Description": "설명이 없습니다", "No checker inbox data available for this account": "이 계정에 사용할 수 있는 체커 받은 편지함 데이터가 없습니다.", "No checker inbox data available for this search": "이 검색에 사용할 수 있는 검사기 받은 편지함 데이터가 없습니다.", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index b7b58e671..7fb96e5ad 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -995,6 +995,7 @@ "Share Products": "Dalintis produktais", "Shares Accounts": "Bendrina sąskaitas", "Shares Details": "Dalinasi informacija", + "Share Equity": "Akcinis kapitalas", "Shares per Client": "Akcijos vienam klientui", "Standing Instructions History": "Nuolatinių instrukcijų istorija", "Submitted On Date": "Pateikta datą", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Paskolos likutis", "Balance Required For Interest Calculation": "Palūkanoms apskaičiuoti reikalingas likutis", "Balance Required for Interest Calculation": "Palūkanoms apskaičiuoti reikalingas likutis", + "Balloon Repayment Amount": "Ballono grąžinimo suma", "Bank": "bankas", "Bank No": "Bankas Nr", "Bank Number": "Banko numeris", @@ -1437,6 +1439,7 @@ "Entity Type": "Esybės tipas", "Entry ID": "Įėjimo ID", "Equal Amortization": "Vienoda amortizacija", + "Equity": "Nuosavas kapitalas", "Error": "Klaida", "Error Log": "Klaidų žurnalas", "Escheat liability": "Atsisakyti atsakomybės", @@ -1733,6 +1736,7 @@ "Mapper Key": "Žemėlapio kūrėjo raktas", "Mapper Value": "Žemėlapio vertė", "Mapping Between Entities": "Žemėlapių sudarymas tarp objektų", + "Market Price Period": "Rinkos kainos laikotarpis", "Marital Status": "Šeiminė padėtis", "Matures on": "Subręsta toliau", "Maturity Amount": "Termino suma", @@ -2163,7 +2167,7 @@ "To Office": "Į biurą", "To Savings Officer": "Taupymo pareigūnui", "To loan officer": "Paskolos pareigūnui", - "Today's Price": "Šios dienos kaina", + "Current Price": "Šios dienos kaina", "Topup closure amount": "Papildymo uždarymo suma", "Total": "Iš viso", "Total Amount": "Visas kiekis", @@ -2413,6 +2417,10 @@ "Withdrawal": "Pasitraukimas", "Withdrawn by Client": "Atsiėmė klientas", "Write Off": "Nusirašinėti", + "Apply Additional Shares": "Taikyti Papildomą", + "Redeem Shares": "Išpirkti akcijas", + "Approve Additional Shares": "Patvirtinti papildomas akcijas", + "Reject Additional Shares": "Atmesti papildomas akcijas", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "Tai leis vartotojui greitai naršyti sistemos pasirinkimo objektą, o ieškant naršymas tampa patikimesnis.", "Navigation": "Navigacija", "No Data": "Nėra duomenų", + "Not Activated": "Neaktyvinta", "No Description": "Nėra aprašymo", "No checker inbox data available for this account": "Nėra šios paskyros tikrinimo gautųjų duomenų.", "No checker inbox data available for this search": "Nėra šios paieškos tikrinimo gautųjų duomenų.", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index 7e20c073a..547f376cc 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -995,6 +995,7 @@ "Share Products": "Kopīgojiet produktus", "Shares Accounts": "Akciju konti", "Shares Details": "Kopīgošanas informācija", + "Share Equity": "Akciju kapitāls", "Shares per Client": "Akcijas katram klientam", "Standing Instructions History": "Pastāvīgo instrukciju vēsture", "Submitted On Date": "Iesniegts datumā", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Aizdevuma atlikums", "Balance Required For Interest Calculation": "Nepieciešamais atlikums procentu aprēķināšanai", "Balance Required for Interest Calculation": "Nepieciešamais atlikums procentu aprēķināšanai", + "Balloon Repayment Amount": "Balona atmaksas summa", "Bank": "Banka", "Bank No": "Bankas Nr", "Bank Number": "Bankas numurs", @@ -1437,6 +1439,7 @@ "Entity Type": "Entītijas veids", "Entry ID": "Ieejas ID", "Equal Amortization": "Vienāda amortizācija", + "Equity": "Pašu kapitāls", "Error": "Kļūda", "Error Log": "Kļūdu žurnāls", "Escheat liability": "Atteikties no atbildības", @@ -1733,6 +1736,7 @@ "Mapper Key": "Mapper Key", "Mapper Value": "Kartētāja vērtība", "Mapping Between Entities": "Kartēšana starp entītijām", + "Market Price Period": "Tirgus cenu periods", "Marital Status": "Ģimenes stāvoklis", "Matures on": "Nobriest tālāk", "Maturity Amount": "Termiņa summa", @@ -2163,7 +2167,7 @@ "To Office": "Uz biroju", "To Savings Officer": "Uzkrājumu darbiniekam", "To loan officer": "Aizdevuma darbiniekam", - "Today's Price": "Šodienas cena", + "Current Price": "Šodienas cena", "Topup closure amount": "Papildinājuma slēgšanas summa", "Total": "Kopā", "Total Amount": "Kopējā summa", @@ -2413,6 +2417,10 @@ "Withdrawal": "Izņemšana", "Withdrawn by Client": "Izņēmis klients", "Write Off": "Norakstīt", + "Apply Additional Shares": "Lietot papildu", + "Redeem Shares": "Izpirkt Akcijas", + "Approve Additional Shares": "Apstipriniet papildu akcijas", + "Reject Additional Shares": "Noraidīt papildu akcijas", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "Tas ļaus lietotājam ātri pārvietoties pa sistēmas atlases entītiju, kamēr meklēšana padara navigāciju noturīgāku.", "Navigation": "Navigācija", "No Data": "Nav datu", + "Not Activated": "Nav aktivizēts", "No Description": "Nav apraksta", "No checker inbox data available for this account": "Šim kontam nav pieejami pārbaudītāja iesūtnes dati.", "No checker inbox data available for this search": "Šai meklēšanai nav pieejami pārbaudītāja iesūtnes dati.", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index b120ac13c..06e65b357 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -995,6 +995,7 @@ "Share Products": "उत्पादनहरू साझेदारी गर्नुहोस्", "Shares Accounts": "सेयर खाताहरू", "Shares Details": "साझा विवरणहरू", + "Share Equity": "शेयर इक्विटी", "Shares per Client": "शेयर प्रति ग्राहक", "Standing Instructions History": "स्थायी निर्देशन इतिहास", "Submitted On Date": "मितिमा पेश गरियो", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "ऋणको ब्यालेन्स", "Balance Required For Interest Calculation": "ब्याज गणनाको लागि आवश्यक ब्यालेन्स", "Balance Required for Interest Calculation": "ब्याज गणनाको लागि आवश्यक ब्यालेन्स", + "Balloon Repayment Amount": "Ballon चुक्ता रकम", "Bank": "बैंक", "Bank No": "बैंक नं", "Bank Number": "बैंक नम्बर", @@ -1437,6 +1439,7 @@ "Entity Type": "संस्थाको प्रकार", "Entry ID": "प्रविष्टि आईडी", "Equal Amortization": "समान परिशोधन", + "Equity": "इक्विटी", "Error": "त्रुटि", "Error Log": "त्रुटि लग", "Escheat liability": "एस्केट दायित्व", @@ -1733,6 +1736,7 @@ "Mapper Key": "म्यापर कुञ्जी", "Mapper Value": "म्यापर मान", "Mapping Between Entities": "संस्थाहरू बीच म्यापिङ", + "Market Price Period": "बजार मूल्य अवधि", "Marital Status": "वैवाहिक स्थिति", "Matures on": "मा परिपक्व हुन्छ", "Maturity Amount": "परिपक्वता रकम", @@ -2163,7 +2167,7 @@ "To Office": "कार्यालयमा", "To Savings Officer": "बचत अधिकारीलाई", "To loan officer": "ऋण अधिकारीलाई", - "Today's Price": "आजको मूल्य", + "Current Price": "आजको मूल्य", "Topup closure amount": "टपअप बन्द रकम", "Total": "कुल", "Total Amount": "कुल रकम", @@ -2413,6 +2417,10 @@ "Withdrawal": "फिर्ता", "Withdrawn by Client": "ग्राहक द्वारा फिर्ता", "Write Off": "लेख्नुहोस्", + "Apply Additional Shares": "अतिरिक्त लागू गर्नुहोस्", + "Redeem Shares": "शेयरहरू रिडिम गर्नुहोस्", + "Approve Additional Shares": "अतिरिक्त शेयरहरू स्वीकृत गर्नुहोस्", + "Reject Additional Shares": "अतिरिक्त शेयरहरू अस्वीकार गर्नुहोस्", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "यसले प्रयोगकर्तालाई प्रणाली चयन गर्ने निकायलाई द्रुत रूपमा नेभिगेट गर्न अनुमति दिनेछ जब खोजी गर्दा नेभिगेसनलाई अझ बलियो बनाउँछ।", "Navigation": "नेभिगेसन", "No Data": "डाटा छैन", + "Not Activated": "सक्रिय छैन", "No Description": "विवरण छैन", "No checker inbox data available for this account": "यस खाताको लागि कुनै जाँचकर्ता इनबक्स डाटा उपलब्ध छैन।", "No checker inbox data available for this search": "यस खोजको लागि कुनै परीक्षक इनबक्स डाटा उपलब्ध छैन।", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 1299deb70..3e0dab43c 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -995,6 +995,7 @@ "Share Products": "Compartilhe produtos", "Shares Accounts": "Contas de ações", "Shares Details": "Detalhes de ações", + "Share Equity": "Compartilhar patrimônio", "Shares per Client": "Ações por Cliente", "Standing Instructions History": "Histórico de instruções permanentes", "Submitted On Date": "Enviado na data", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Saldo do empréstimo", "Balance Required For Interest Calculation": "Saldo necessário para cálculo de juros", "Balance Required for Interest Calculation": "Saldo necessário para cálculo de juros", + "Balloon Repayment Amount": "Valor de reembolso do balão", "Bank": "Banco", "Bank No": "Banco Não", "Bank Number": "Número do banco", @@ -1437,6 +1439,7 @@ "Entity Type": "Tipo de entidade", "Entry ID": "ID de entrada", "Equal Amortization": "Amortização igual", + "Equity": "Equidade", "Error": "Erro", "Error Log": "Registro de erros", "Escheat liability": "Fugir de responsabilidade", @@ -1733,6 +1736,7 @@ "Mapper Key": "Chave do mapeador", "Mapper Value": "Valor do mapeador", "Mapping Between Entities": "Mapeamento entre entidades", + "Market Price Period": "Período de preço de mercado", "Marital Status": "Estado civil", "Matures on": "Amadurece em", "Maturity Amount": "Valor de vencimento", @@ -2163,7 +2167,7 @@ "To Office": "Para o escritório", "To Savings Officer": "Para o Diretor de Poupança", "To loan officer": "Para oficial de empréstimo", - "Today's Price": "Preço de hoje", + "Current Price": "Preço de hoje", "Topup closure amount": "Valor de fechamento de recarga", "Total": "Total", "Total Amount": "Montante total", @@ -2413,6 +2417,10 @@ "Withdrawal": "Cancelamento", "Withdrawn by Client": "Retirado pelo cliente", "Write Off": "Eliminar", + "Apply Additional Shares": "Aplicar Adicional", + "Redeem Shares": "Resgatar Ações", + "Approve Additional Shares": "Aprovar ações adicionais", + "Reject Additional Shares": "Rejeitar compartilhamentos adicionais", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "Isso permitirá que o usuário navegue rapidamente no sistema selecionando a entidade enquanto a pesquisa torna a navegação mais robusta.", "Navigation": "Navegação", "No Data": "Sem dados", + "Not Activated": "Não ativado", "No Description": "Sem descrição", "No checker inbox data available for this account": "Não há dados da caixa de entrada do verificador disponíveis para esta conta.", "No checker inbox data available for this search": "Não há dados da caixa de entrada do verificador disponíveis para esta pesquisa.", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index 6a0837d9a..5fcf032e8 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -995,6 +995,7 @@ "Share Products": "Shiriki Bidhaa", "Shares Accounts": "Hesabu za Hisa", "Shares Details": "Maelezo ya Hisa", + "Share Equity": "Shiriki Usawa", "Shares per Client": "Hisa kwa kila Mteja", "Standing Instructions History": "Historia ya Maagizo ya Kudumu", "Submitted On Date": "Imewasilishwa Tarehe", @@ -1165,6 +1166,7 @@ "Balance Of Loan": "Salio la Mkopo", "Balance Required For Interest Calculation": "Salio Inahitajika kwa Kukokotoa Riba", "Balance Required for Interest Calculation": "Salio Inahitajika kwa Kukokotoa Riba", + "Balloon Repayment Amount": "Kiasi cha Marejesho ya Ballon", "Bank": "Benki", "Bank No": "Nambari ya Benki", "Bank Number": "Nambari ya Benki", @@ -1437,6 +1439,7 @@ "Entity Type": "Aina ya Huluki", "Entry ID": "Kitambulisho cha kuingia", "Equal Amortization": "Usawa wa Mapato", + "Equity": "Usawa", "Error": "Hitilafu", "Error Log": "Kumbukumbu ya Hitilafu", "Escheat liability": "Escheat dhima", @@ -1733,6 +1736,7 @@ "Mapper Key": "Ufunguo wa ramani", "Mapper Value": "Thamani ya ramani", "Mapping Between Entities": "Kuchora ramani kati ya Mashirika", + "Market Price Period": "Kipindi cha Bei ya Soko", "Marital Status": "Hali ya ndoa", "Matures on": "Inakomaa", "Maturity Amount": "Kiasi cha Ukomavu", @@ -2163,7 +2167,7 @@ "To Office": "Kwa Ofisi", "To Savings Officer": "Kwa Afisa Akiba", "To loan officer": "Kwa afisa wa mkopo", - "Today's Price": "Bei ya Leo", + "Current Price": "Bei ya Leo", "Topup closure amount": "Kiasi cha ziada cha kufungwa", "Total": "Jumla", "Total Amount": "Jumla", @@ -2413,6 +2417,10 @@ "Withdrawal": "Uondoaji", "Withdrawn by Client": "Imetolewa na mteja", "Write Off": "Andika", + "Apply Additional Shares": "Omba Ziada", + "Redeem Shares": "Komboa Hisa", + "Approve Additional Shares": "Idhinisha Hisa za Ziada", + "Reject Additional Shares": "Kataa Hisa za Ziada", "XBRL": "XBRL" }, "placeholders": { @@ -2794,6 +2802,7 @@ "Navigate system selecting entity": "Hii itamruhusu mtumiaji kuabiri kwa haraka huluki ya kuchagua mfumo huku akitafuta hufanya urambazaji kuwa thabiti zaidi.", "Navigation": "Urambazaji", "No Data": "Hakuna Data", + "Not Activated": "Haijawezeshwa", "No Description": "Hakuna maelezo", "No checker inbox data available for this account": "Hakuna data ya kikasha kikagua inayopatikana kwa akaunti hii.", "No checker inbox data available for this search": "Hakuna data ya kikasha kikagua inayopatikana kwa utafutaji huu.", diff --git a/src/theme/_content.scss b/src/theme/_content.scss index 97c741018..36d51b7b4 100644 --- a/src/theme/_content.scss +++ b/src/theme/_content.scss @@ -19,6 +19,7 @@ mifosx-clients-view, mifosx-fixed-deposit-account-view, mifosx-loans-view, + mifosx-shares-account-view, mifosx-recurring-deposits-account-view, mifosx-savings-account-view { .account-card { diff --git a/src/theme/_dark_content.scss b/src/theme/_dark_content.scss index da397beac..73e333779 100644 --- a/src/theme/_dark_content.scss +++ b/src/theme/_dark_content.scss @@ -47,6 +47,7 @@ mifosx-clients-view, mifosx-fixed-deposit-account-view, mifosx-loans-view, + mifosx-shares-account-view, mifosx-recurring-deposits-account-view, mifosx-savings-account-view { .account-card {