From b0bdb166c987a31e04e08bacdc1ea73c04d95c9f Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Tue, 24 Jun 2025 16:01:22 -0500 Subject: [PATCH 001/707] Disbursement option hasn't appeared in menu after MIR and CRB with Loan multidisbursement --- src/app/loans/loans-view/loans-view.component.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/loans/loans-view/loans-view.component.ts b/src/app/loans/loans-view/loans-view.component.ts index ee25195d52..8e65bdbc76 100644 --- a/src/app/loans/loans-view/loans-view.component.ts +++ b/src/app/loans/loans-view/loans-view.component.ts @@ -285,6 +285,14 @@ export class LoansViewComponent implements OnInit { taskPermissionName: 'UNDO_REAMORTIZE_LOAN' }); } + } else if (this.status === 'Closed (obligations met)' || this.status === 'Overpaid') { + if (this.loanDetailsData.multiDisburseLoan) { + this.buttonConfig.addButton({ + name: 'Disburse', + icon: 'hand-holding-usd', + taskPermissionName: 'DISBURSE_LOAN' + }); + } } } From 97186569d3ffcb651b77817b405e43679d33aa89 Mon Sep 17 00:00:00 2001 From: mariiaKraievska Date: Wed, 25 Jun 2025 15:19:53 +0300 Subject: [PATCH 002/707] WEB-232: Reset overAppliedCalculationType and overAppliedNumber fields when 'Allow approval / disbursal above loan applied amount' is unchecked --- .../loan-product-terms-step.component.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts index 5e2461a415..e9192df72f 100644 --- a/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts +++ b/src/app/products/loan-products/loan-product-stepper/loan-product-terms-step/loan-product-terms-step.component.ts @@ -202,6 +202,8 @@ export class LoanProductTermsStepComponent implements OnInit, OnChanges { maxNumberOfRepayments: [''], isLinkedToFloatingInterestRates: [false], allowApprovedDisbursedAmountsOverApplied: [false], + overAppliedCalculationType: [{ value: null, disabled: true }], + overAppliedNumber: [{ value: null, disabled: true }], minInterestRatePerPeriod: [''], interestRatePerPeriod: [ '', @@ -236,12 +238,14 @@ export class LoanProductTermsStepComponent implements OnInit, OnChanges { .get('allowApprovedDisbursedAmountsOverApplied') .valueChanges.subscribe((allowApprovedDisbursedAmountsOverApplied) => { if (allowApprovedDisbursedAmountsOverApplied) { - this.loanProductTermsForm.addControl('overAppliedCalculationType', new UntypedFormControl('')); - this.loanProductTermsForm.addControl('overAppliedNumber', new UntypedFormControl('')); + this.loanProductTermsForm.get('overAppliedCalculationType').enable(); + this.loanProductTermsForm.get('overAppliedNumber').enable(); this.loanProductTermsForm.addControl('disallowExpectedDisbursements', new UntypedFormControl('true')); } else { - this.loanProductTermsForm.removeControl('overAppliedCalculationType'); - this.loanProductTermsForm.removeControl('overAppliedNumber'); + this.loanProductTermsForm.get('overAppliedCalculationType').disable(); + this.loanProductTermsForm.get('overAppliedCalculationType').patchValue(null); + this.loanProductTermsForm.get('overAppliedNumber').disable(); + this.loanProductTermsForm.get('overAppliedNumber').patchValue(null); this.loanProductTermsForm.removeControl('disallowExpectedDisbursements'); } }); From 2f575aa7ebd3987fffdf7137f3b25b9e534d9845 Mon Sep 17 00:00:00 2001 From: Jose Alberto Hernandez Date: Thu, 19 Jun 2025 17:30:51 -0500 Subject: [PATCH 003/707] Extend Manual Journal entry to support Asset Externalization --- .../accounting/accounting-routing.module.ts | 7 ++-- .../external-asset-configuration.resolver.ts | 27 ++++++++++++++ .../create-journal-entry.component.html | 7 +++- .../create-journal-entry.component.ts | 36 +++++++++++-------- ...w-journal-entry-transaction.component.html | 18 +++++++++- ...w-journal-entry-transaction.component.scss | 7 ++++ ...iew-journal-entry-transaction.component.ts | 14 +++++++- src/app/system/system.service.ts | 2 ++ src/assets/styles/_colours.scss | 2 ++ src/assets/translations/cs-CS.json | 1 + src/assets/translations/de-DE.json | 1 + src/assets/translations/en-US.json | 1 + src/assets/translations/es-CL.json | 1 + src/assets/translations/es-MX.json | 1 + src/assets/translations/fr-FR.json | 1 + src/assets/translations/it-IT.json | 1 + src/assets/translations/ko-KO.json | 1 + src/assets/translations/lt-LT.json | 1 + src/assets/translations/lv-LV.json | 1 + src/assets/translations/ne-NE.json | 1 + src/assets/translations/pt-PT.json | 1 + src/assets/translations/sw-SW.json | 1 + 22 files changed, 114 insertions(+), 19 deletions(-) create mode 100644 src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts diff --git a/src/app/accounting/accounting-routing.module.ts b/src/app/accounting/accounting-routing.module.ts index cc2b004ddb..1717969468 100644 --- a/src/app/accounting/accounting-routing.module.ts +++ b/src/app/accounting/accounting-routing.module.ts @@ -62,6 +62,7 @@ import { ProvisioningJournalEntriesResolver } from './provisioning-entries/view- import { ViewJournalEntryTransactionComponent } from 'app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component'; import { JournalEntryTransactionResolver } from './common-resolvers/journal-entry-transaction.resolver'; import { ExternalAssetOwnerJournalEntryResolver } from 'app/loans/common-resolvers/external-asset-owner-journal-entry.resolver'; +import { ExternalAssetConfigurationResolver } from './common-resolvers/external-asset-configuration.resolver'; /** Accounting Routes */ const routes: Routes = [ @@ -105,7 +106,8 @@ const routes: Routes = [ offices: OfficesResolver, currencies: CurrenciesResolver, paymentTypes: PaymentTypesResolver, - glAccounts: GlAccountsResolver + glAccounts: GlAccountsResolver, + globalConfig: ExternalAssetConfigurationResolver } }, { @@ -419,7 +421,8 @@ const routes: Routes = [ ProvisioningEntryEntriesResolver, LoanProductsResolver, ProvisioningCategoriesResolver, - ProvisioningJournalEntriesResolver + ProvisioningJournalEntriesResolver, + ExternalAssetConfigurationResolver ] }) export class AccountingRoutingModule {} diff --git a/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts b/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts new file mode 100644 index 0000000000..8d395e137d --- /dev/null +++ b/src/app/accounting/common-resolvers/external-asset-configuration.resolver.ts @@ -0,0 +1,27 @@ +/** Angular Imports */ +import { Injectable } from '@angular/core'; + +/** rxjs Imports */ +import { Observable } from 'rxjs'; + +/** Custom Services */ +import { SystemService } from 'app/system/system.service'; + +/** + * Offices data resolver. + */ +@Injectable() +export class ExternalAssetConfigurationResolver { + /** + * @param {AccountingService} accountingService Accounting service. + */ + constructor(private systemService: SystemService) {} + + /** + * Returns the offices data. + * @returns {Observable} + */ + resolve(): Observable { + return this.systemService.getConfigurationByName(SystemService.CONFIG_ASSET_EXTERNALIZATION); + } +} diff --git a/src/app/accounting/create-journal-entry/create-journal-entry.component.html b/src/app/accounting/create-journal-entry/create-journal-entry.component.html index 789cb35ba0..5fcc8121ca 100644 --- a/src/app/accounting/create-journal-entry/create-journal-entry.component.html +++ b/src/app/accounting/create-journal-entry/create-journal-entry.component.html @@ -16,7 +16,7 @@ - + {{ 'labels.inputs.Currency' | translate }} @@ -29,6 +29,11 @@ + + {{ 'labels.inputs.External Asset Owner' | translate }} + + +
; @@ -81,12 +78,16 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit { private configurationWizardService: ConfigurationWizardService, private popoverService: PopoverService ) { - this.route.data.subscribe((data: { offices: any; currencies: any; paymentTypes: any; glAccounts: any }) => { - this.officeData = data.offices; - this.currencyData = data.currencies.selectedCurrencyOptions; - this.paymentTypeData = data.paymentTypes; - this.glAccountData = data.glAccounts; - }); + this.assetExternalizationEnabled = false; + this.route.data.subscribe( + (data: { offices: any; currencies: any; paymentTypes: any; glAccounts: any; globalConfig: any }) => { + this.officeData = data.offices; + this.currencyData = data.currencies.selectedCurrencyOptions; + this.paymentTypeData = data.paymentTypes; + this.glAccountData = data.glAccounts; + this.assetExternalizationConfig = data.globalConfig; + } + ); } /** @@ -192,6 +193,9 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit { this.settingsService.dateFormat ); } + if (!journalEntry['externalAssetOwner']) { + delete journalEntry['externalAssetOwner']; + } this.accountingService.createJournalEntry(journalEntry).subscribe((response) => { this.router.navigate( [ @@ -228,6 +232,10 @@ export class CreateJournalEntryComponent implements OnInit, AfterViewInit { this.showPopover(this.templateCreateJournalFormRef, this.createJournalFormRef.nativeElement, 'top', true); }); } + this.assetExternalizationEnabled = this.assetExternalizationConfig.enabled; + if (this.assetExternalizationEnabled) { + this.journalEntryForm.addControl('externalAssetOwner', new UntypedFormControl()); + } } /** diff --git a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.html b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.html index bcec18189d..29a2051fe9 100644 --- a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.html +++ b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.html @@ -15,7 +15,7 @@
- +
@@ -49,6 +49,22 @@
{{ dataSource.data[0].submittedOnDate | datetimeFormat }}
+ +
+ {{ 'labels.inputs.Manual Journal Entry' | translate }} +
+ +
+ {{ dataSource.data[0].manualEntry | yesNo }} +
+ +
+ {{ 'labels.inputs.External Asset Owner' | translate }} +
+ +
+ {{ dataSource.data[0].externalAssetOwner }} +
diff --git a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.scss b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.scss index 24edb63bbb..613e12eee1 100644 --- a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.scss +++ b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.scss @@ -1,3 +1,6 @@ +@use 'assets/styles/helper'; +@use 'assets/styles/colours' as *; + table { width: 100%; @@ -5,3 +8,7 @@ table { cursor: pointer; } } + +.manual-entry { + background-color: $manual-entry; +} diff --git a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.ts b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.ts index 57f838dce4..57436d9cfd 100644 --- a/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.ts +++ b/src/app/shared/accounting/view-journal-entry-transaction/view-journal-entry-transaction.component.ts @@ -25,6 +25,7 @@ import { DateFormatPipe } from '../../../pipes/date-format.pipe'; import { DatetimeFormatPipe } from '../../../pipes/datetime-format.pipe'; import { FormatNumberPipe } from '../../../pipes/format-number.pipe'; import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; +import { YesnoPipe } from '@pipes/yesno.pipe'; @Component({ selector: 'mifosx-view-journal-entry-transaction', @@ -47,7 +48,8 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module'; MatRow, DateFormatPipe, DatetimeFormatPipe, - FormatNumberPipe + FormatNumberPipe, + YesnoPipe ] }) export class ViewJournalEntryTransactionComponent implements OnInit { @@ -76,6 +78,8 @@ export class ViewJournalEntryTransactionComponent implements OnInit { isJournalEntryLoaded = false; + isManualJournalEntry = false; + /** * @param {AccountingService} accountingService Accounting Service. * @param {ActivatedRoute} route Activated Route. @@ -102,6 +106,7 @@ export class ViewJournalEntryTransactionComponent implements OnInit { if (data.transaction.pageItems.length > 0) { this.isJournalEntryLoaded = true; this.transactionId = data.transaction.pageItems[0].transactionId; + this.isManualJournalEntry = data.transaction.pageItems[0].manualEntry; } } else if (this.isViewTransfer()) { this.journalEntriesData = data.transferJournalEntryData.journalEntryData.content; @@ -185,4 +190,11 @@ export class ViewJournalEntryTransactionComponent implements OnInit { goBack(): void { this.location.back(); } + + journalEntryColor(): string { + if (this.isManualJournalEntry) { + return 'manual-entry'; + } + return ''; + } } diff --git a/src/app/system/system.service.ts b/src/app/system/system.service.ts index 48e01bda06..2e62da2727 100644 --- a/src/app/system/system.service.ts +++ b/src/app/system/system.service.ts @@ -13,6 +13,8 @@ import { RunJobWithParamPayloadType } from './manage-jobs/scheduler-jobs/custom- providedIn: 'root' }) export class SystemService { + public static CONFIG_ASSET_EXTERNALIZATION = 'asset-externalization-of-non-active-loans'; + emptyPayload: any = {}; /** diff --git a/src/assets/styles/_colours.scss b/src/assets/styles/_colours.scss index 7906ebd23a..1fb3a94232 100644 --- a/src/assets/styles/_colours.scss +++ b/src/assets/styles/_colours.scss @@ -84,6 +84,8 @@ $subStatus-contract-termination: #b3b3b3; $error-log: #ffa726; +$manual-entry: #d7e3ff; + .column-mandatory { color: $status-active; text-align: center; diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index ae194fd8b2..6a940970c3 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -1877,6 +1877,7 @@ "Mandatory": "Povinné", "Mandatory Guarantee(%)": "Povinná záruka (%)", "Manual Entries Allowed": "Ruční vkládání povoleno", + "Manual Journal Entry": "Ruční zápis do deníku", "Mapper Key": "Mapper Key", "Mapper Value": "Hodnota mapovače", "Mapping id": "ID mapování", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 8c78abdced..888819366c 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -1877,6 +1877,7 @@ "Mandatory": "Obligatorisch", "Mandatory Guarantee(%)": "Obligatorische Garantie (%)", "Manual Entries Allowed": "Manuelle Eingaben erlaubt", + "Manual Journal Entry": "Manuelle Journalbuchung", "Mapper Key": "Mapper-Schlüssel", "Mapper Value": "Mapper-Wert", "Mapping id": "Zuordnungs-ID", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index 4e0f62d824..d82f412a7d 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -1882,6 +1882,7 @@ "Mandatory": "Mandatory", "Mandatory Guarantee(%)": "Mandatory Guarantee(%)", "Manual Entries Allowed": "Manual Entries Allowed", + "Manual Journal Entry": "Manual Journal Entry", "Mapper Key": "Mapper Key", "Mapper Value": "Mapper Value", "Mapping id": "Mapping id", diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json index e18c308e38..98dbd0875e 100644 --- a/src/assets/translations/es-CL.json +++ b/src/assets/translations/es-CL.json @@ -1876,6 +1876,7 @@ "Mandatory": "Obligatorio", "Mandatory Guarantee(%)": "Garantía obligatoria(%)", "Manual Entries Allowed": "Permitir Entradas manuales", + "Manual Journal Entry": "Entrada de diario manual", "Mapper Key": "Clave del asignador", "Mapper Value": "Valor del asignador", "Mapping id": "Identificación de mapeo", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index 7e91321430..5b624f67f0 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -1876,6 +1876,7 @@ "Mandatory": "Obligatorio", "Mandatory Guarantee(%)": "Garantía obligatoria(%)", "Manual Entries Allowed": "Permitir Entradas manuales", + "Manual Journal Entry": "Entrada de diario manual", "Mapper Key": "Clave del asignador", "Mapper Value": "Valor del asignador", "Mapping id": "Identificación de mapeo", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index 896ca0bf4e..1d3b1c92ac 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -1877,6 +1877,7 @@ "Mandatory": "Obligatoire", "Mandatory Guarantee(%)": "Garantie obligatoire (%)", "Manual Entries Allowed": "Entrées manuelles autorisées", + "Manual Journal Entry": "Écriture de journal manuelle", "Mapper Key": "Clé du mappeur", "Mapper Value": "Valeur du mappeur", "Mapping id": "Identifiant de mappage", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index d034232c61..ef9379fdba 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -1877,6 +1877,7 @@ "Mandatory": "Obbligatorio", "Mandatory Guarantee(%)": "Garanzia Obbligatoria(%)", "Manual Entries Allowed": "Inserimenti manuali consentiti", + "Manual Journal Entry": "Registrazione manuale del giornale", "Mapper Key": "Chiave del mappatore", "Mapper Value": "Valore del mappatore", "Mapping id": "ID mappatura", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index 71f02a4c85..5675821ff4 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -1878,6 +1878,7 @@ "Mandatory": "필수적인", "Mandatory Guarantee(%)": "의무보증(%)", "Manual Entries Allowed": "수동 입력이 허용됨", + "Manual Journal Entry": "수동 저널 입력", "Mapper Key": "매퍼 키", "Mapper Value": "매퍼 값", "Mapping id": "매핑 ID", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 1f7abe192b..0076aa65ea 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -1877,6 +1877,7 @@ "Mandatory": "Privaloma", "Mandatory Guarantee(%)": "Privaloma garantija (%)", "Manual Entries Allowed": "Leidžiami rankiniai įvedimai", + "Manual Journal Entry": "Rankinis žurnalo įrašas", "Mapper Key": "Žemėlapio kūrėjo raktas", "Mapper Value": "Žemėlapio vertė", "Mapping id": "Atvaizdavimo ID", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index e6257b2d5f..41109f1fa0 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -1877,6 +1877,7 @@ "Mandatory": "Obligāts", "Mandatory Guarantee(%)": "Obligātā garantija (%)", "Manual Entries Allowed": "Manuālas ievades ir atļautas", + "Manual Journal Entry": "Manuālais žurnāla ieraksts", "Mapper Key": "Mapper Key", "Mapper Value": "Kartētāja vērtība", "Mapping id": "Kartēšanas ID", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index 383bde32bd..a19547ae7c 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -1877,6 +1877,7 @@ "Mandatory": "अनिवार्य", "Mandatory Guarantee(%)": "अनिवार्य ग्यारेन्टी (%)", "Manual Entries Allowed": "म्यानुअल प्रविष्टिहरूलाई अनुमति दिइएको छ", + "Manual Journal Entry": "म्यानुअल जर्नल प्रविष्टि", "Mapper Key": "म्यापर कुञ्जी", "Mapper Value": "म्यापर मान", "Mapping id": "म्यापिङ आईडी", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 857f7618bb..c907f3f338 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -1877,6 +1877,7 @@ "Mandatory": "Obrigatório", "Mandatory Guarantee(%)": "Garantia Obrigatória(%)", "Manual Entries Allowed": "Entradas manuais permitidas", + "Manual Journal Entry": "Lançamento Manual de Diário", "Mapper Key": "Chave do mapeador", "Mapper Value": "Valor do mapeador", "Mapping id": "ID de mapeamento", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index a4ccaca679..eb82db30ee 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -1877,6 +1877,7 @@ "Mandatory": "Lazima", "Mandatory Guarantee(%)": "Dhamana ya Lazima(%)", "Manual Entries Allowed": "Maingizo Mwongozo Yanaruhusiwa", + "Manual Journal Entry": "Kuingia kwa Jarida kwa Mwongozo", "Mapper Key": "Ufunguo wa ramani", "Mapper Value": "Thamani ya ramani", "Mapping id": "Kitambulisho cha ramani", From 3713df02350c79988bca1ac677386beac7041e8b Mon Sep 17 00:00:00 2001 From: Felix van Hove Date: Sun, 29 Jun 2025 16:36:48 +0200 Subject: [PATCH 004/707] fix: Diverse problems in the Organization section This fixes a number of layout issues in the Organization section, replaces "Advanced Search" in the path by "Fund Mapping", adds a missing translation and fixes a broken link on the Organization page itself. FIXES: WEB-227, WEB-226, WEB-225, WEB-224 --- .../fund-mapping/fund-mapping.component.html | 332 +++++++------- .../investors/investors.component.html | 422 +++++++++--------- .../organization-routing.module.ts | 2 +- .../organization/organization.component.html | 2 +- src/assets/translations/cs-CS.json | 1 + src/assets/translations/de-DE.json | 1 + src/assets/translations/en-US.json | 1 + src/assets/translations/es-CL.json | 1 + src/assets/translations/es-MX.json | 1 + src/assets/translations/fr-FR.json | 1 + src/assets/translations/it-IT.json | 1 + src/assets/translations/ko-KO.json | 1 + src/assets/translations/lt-LT.json | 1 + src/assets/translations/lv-LV.json | 1 + src/assets/translations/ne-NE.json | 1 + src/assets/translations/pt-PT.json | 1 + src/assets/translations/sw-SW.json | 1 + 17 files changed, 395 insertions(+), 376 deletions(-) diff --git a/src/app/organization/fund-mapping/fund-mapping.component.html b/src/app/organization/fund-mapping/fund-mapping.component.html index a0ab91d87a..5a0fb0214b 100644 --- a/src/app/organization/fund-mapping/fund-mapping.component.html +++ b/src/app/organization/fund-mapping/fund-mapping.component.html @@ -1,190 +1,192 @@
-
- - {{ 'labels.inputs.Loan Status' | translate }} - - {{ 'labels.inputs.All' | translate }} - {{ 'labels.inputs.Active' | translate }} - {{ 'labels.inputs.Overpaid' | translate }} - {{ 'labels.inputs.Closed (obligations met)' | translate }} - {{ 'labels.inputs.Closed (written-off)' | translate }} - - - - - - - {{ 'labels.inputs.Product' | translate }} - - - {{ product.name }} - - - - - - {{ 'labels.inputs.Office' | translate }} - - - {{ office.name }} - - - - - - {{ 'labels.inputs.Date Type' | translate }} - - {{ 'labels.inputs.Approval Date' | translate }} - {{ 'labels.inputs.Creation Date' | translate }} - {{ 'labels.inputs.Disbursement Date' | translate }} - - - - - {{ 'labels.inputs.From Date' | translate }} - - - - - {{ 'labels.inputs.From Date' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - - - - {{ 'labels.inputs.To Date' | translate }} - - - - - {{ 'labels.inputs.To Date' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - - - - {{ 'labels.inputs.Loan Outstanding Percentage' | translate }} - - -
- - {{ 'labels.inputs.Comparison Condition' | translate }} - - {{ 'labels.inputs.between' | translate }} - <= - >= - < - > - = + +
+ + {{ 'labels.inputs.Loan Status' | translate }} + + {{ 'labels.inputs.All' | translate }} + {{ 'labels.inputs.Active' | translate }} + {{ 'labels.inputs.Overpaid' | translate }} + {{ 'labels.inputs.Closed (obligations met)' | translate }} + {{ 'labels.inputs.Closed (written-off)' | translate }} - - {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - - {{ 'labels.inputs.Minimum Value' | translate }} - - - {{ 'labels.inputs.Minimum Value' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - + - - {{ 'labels.inputs.Comparison Value' | translate }} - - - {{ 'labels.inputs.Comparison Value' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - + + {{ 'labels.inputs.Product' | translate }} + + + {{ product.name }} + + - - {{ 'labels.inputs.Maximum Value' | translate }} - - - {{ 'labels.inputs.Maximum Value' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - + + {{ 'labels.inputs.Office' | translate }} + + + {{ office.name }} + + -
- - {{ 'labels.inputs.Loan Outstanding Amount' | translate }} - - -
- - {{ 'labels.inputs.Comparison Condition' | translate }} - - {{ 'labels.inputs.between' | translate }} - <= - >= - < - > - = + + {{ 'labels.inputs.Date Type' | translate }} + + {{ 'labels.inputs.Approval Date' | translate }} + {{ 'labels.inputs.Creation Date' | translate }} + {{ 'labels.inputs.Disbursement Date' | translate }} - - {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - - {{ 'labels.inputs.Minimum Value' | translate }} - - - {{ 'labels.inputs.Minimum Value' | translate }} {{ 'labels.commons.is' | translate }} + + {{ 'labels.inputs.From Date' | translate }} + + + + + {{ 'labels.inputs.From Date' | translate }} {{ 'labels.commons.is' | translate }} {{ 'labels.commons.required' | translate }} - - {{ 'labels.inputs.Comparison Value' | translate }} - - - {{ 'labels.inputs.Comparison Value' | translate }} {{ 'labels.commons.is' | translate }} + + {{ 'labels.inputs.To Date' | translate }} + + + + + {{ 'labels.inputs.To Date' | translate }} {{ 'labels.commons.is' | translate }} {{ 'labels.commons.required' | translate }} - - {{ 'labels.inputs.Maximum Value' | translate }} - - - {{ 'labels.inputs.Maximum Value' | translate }} {{ 'labels.commons.is' | translate }} - {{ 'labels.commons.required' | translate }} - - + + {{ 'labels.inputs.Loan Outstanding Percentage' | translate }} + + +
+ + {{ 'labels.inputs.Comparison Condition' | translate }} + + {{ 'labels.inputs.between' | translate }} + <= + >= + < + > + = + + + {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Minimum Value' | translate }} + + + {{ 'labels.inputs.Minimum Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Comparison Value' | translate }} + + + {{ 'labels.inputs.Comparison Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Maximum Value' | translate }} + + + {{ 'labels.inputs.Maximum Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + +
+ + + {{ 'labels.inputs.Loan Outstanding Amount' | translate }} + + +
+ + {{ 'labels.inputs.Comparison Condition' | translate }} + + {{ 'labels.inputs.between' | translate }} + <= + >= + < + > + = + + + {{ 'labels.inputs.Comparison Condition' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Minimum Value' | translate }} + + + {{ 'labels.inputs.Minimum Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Comparison Value' | translate }} + + + {{ 'labels.inputs.Comparison Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + + + + {{ 'labels.inputs.Maximum Value' | translate }} + + + {{ 'labels.inputs.Maximum Value' | translate }} {{ 'labels.commons.is' | translate }} + {{ 'labels.commons.required' | translate }} + + +
-
+ diff --git a/src/app/organization/investors/investors.component.html b/src/app/organization/investors/investors.component.html index cea3de7c7f..91165da6ff 100644 --- a/src/app/organization/investors/investors.component.html +++ b/src/app/organization/investors/investors.component.html @@ -1,225 +1,229 @@ -
- - {{ 'labels.text.Search by Text' | translate }} - - + +
+ + {{ 'labels.text.Search by Text' | translate }} + + - - {{ 'labels.text.Effective Date From' | translate }} - - - - + + {{ 'labels.text.Effective Date From' | translate }} + + + + - - {{ 'labels.text.Effective Date To' | translate }} - - - - + + {{ 'labels.text.Effective Date To' | translate }} + + + + - - {{ 'labels.text.Settlement Date From' | translate }} - - - - + + {{ 'labels.text.Settlement Date From' | translate }} + + + + - - {{ 'labels.text.Settlement Date To' | translate }} - - - - + + {{ 'labels.text.Settlement Date To' | translate }} + + + + -
- +
+ +
-
-
-
-
-
- - - - +
+
+
+
+ + + + + + + + + + + + + + +
+
+ + {{ record.status }} +
+
{{ 'labels.inputs.Owner External Id' | translate }} + + {{ 'labels.inputs.Transfer External Id' | translate }} + + {{ 'labels.inputs.Effective From' | translate }}{{ record.effectiveFrom | dateFormat }}
+
+
+ +
- - - - - - - - - + + + + + + + + + + + + + + + + + +
-
- - {{ record.status }} -
-
{{ 'labels.inputs.Owner External Id' | translate }} - - {{ 'labels.inputs.Transfer External Id' | translate }} - - {{ 'labels.inputs.Effective From' | translate }}{{ record.effectiveFrom | dateFormat }}
+ {{ 'labels.inputs.Status' | translate }} : + +
+ + {{ record.status }} +
+
+ {{ 'labels.inputs.Owner External Id' | translate }} : + + +
+ {{ 'labels.inputs.Settlement Date' | translate }} : + + {{ record.settlementDate | dateFormat }} + + {{ 'labels.inputs.Effective Date' | translate }} : + + {{ record.effectiveFrom | dateFormat }} +
+ {{ 'labels.inputs.Details' | translate }} : + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ 'labels.inputs.Principal Outstanding' | translate }} : + + {{ record.details.totalPrincipalOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Interest Outstanding' | translate }} : + + {{ record.details.totalInterestOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Fees Outstanding' | translate }} : + + {{ record.details.totalFeeChargesOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Penalties Outstanding' | translate }} : + + {{ record.details.totalPenaltyChargesOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Outstanding' | translate }} : + {{ record.details.totalOutstanding | formatNumber }}
+ {{ 'labels.inputs.Overpaid' | translate }} : + {{ record.details.totalOverpaid | formatNumber }}
+
- - +
-
- - - - - - - - - - - - - - - - - - - -
- {{ 'labels.inputs.Status' | translate }} : - -
- - {{ record.status }} -
-
- {{ 'labels.inputs.Owner External Id' | translate }} : - - -
- {{ 'labels.inputs.Settlement Date' | translate }} : - - {{ record.settlementDate | dateFormat }} - - {{ 'labels.inputs.Effective Date' | translate }} : - - {{ record.effectiveFrom | dateFormat }} -
- {{ 'labels.inputs.Details' | translate }} : - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ 'labels.inputs.Principal Outstanding' | translate }} : - - {{ record.details.totalPrincipalOutstanding | formatNumber }} -
- {{ 'labels.inputs.Interest Outstanding' | translate }} : - - {{ record.details.totalInterestOutstanding | formatNumber }} -
- {{ 'labels.inputs.Fees Outstanding' | translate }} : - - {{ record.details.totalFeeChargesOutstanding | formatNumber }} -
- {{ 'labels.inputs.Penalties Outstanding' | translate }} : - - {{ record.details.totalPenaltyChargesOutstanding | formatNumber }} -
- {{ 'labels.inputs.Outstanding' | translate }} : - {{ record.details.totalOutstanding | formatNumber }}
- {{ 'labels.inputs.Overpaid' | translate }} : - {{ record.details.totalOverpaid | formatNumber }}
-
-
+ - +
+ +
+
+
-
- -
- - - - -
+ +
-
-
- - {{ 'labels.text.No data found' | translate }} +
+
+ + {{ 'labels.text.No data found' | translate }} +
-
+ diff --git a/src/app/organization/organization-routing.module.ts b/src/app/organization/organization-routing.module.ts index bc7b3bb273..ffe64ba1ba 100644 --- a/src/app/organization/organization-routing.module.ts +++ b/src/app/organization/organization-routing.module.ts @@ -339,7 +339,7 @@ const routes: Routes = [ { path: 'fund-mapping', component: FundMappingComponent, - data: { title: 'Advance Search', breadcrumb: 'Advance Search' }, + data: { title: 'Fund Mapping', breadcrumb: 'Fund Mapping' }, resolve: { advanceSearchTemplate: AdvanceSearchTemplateResolver } diff --git a/src/app/organization/organization.component.html b/src/app/organization/organization.component.html index 83b64a1dc8..cc3889f517 100644 --- a/src/app/organization/organization.component.html +++ b/src/app/organization/organization.component.html @@ -102,7 +102,7 @@
diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json index 36f233fc0b..460df16158 100644 --- a/src/assets/translations/cs-CS.json +++ b/src/assets/translations/cs-CS.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Poplatek za podvody", "Charges": "Poplatky", "Checked Date": "Datum kontroly", + "Client Ip": "IP klienta", "Checked To Date": "Zkontrolováno k dnešnímu dni", "Checker": "Dáma", "Checker From Date": "Kontrola od data", diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json index 61b47b1d7c..365734bb65 100644 --- a/src/assets/translations/de-DE.json +++ b/src/assets/translations/de-DE.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Betrugskosten abrechnen", "Charges": "Gebühren", "Checked Date": "Geprüftes Datum", + "Client Ip": "Kunden-IP", "Checked To Date": "Bisher überprüft", "Checker": "Checker", "Checker From Date": "Checker-Von-Datum", diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json index c9c45092d3..0921f6dbe3 100644 --- a/src/assets/translations/en-US.json +++ b/src/assets/translations/en-US.json @@ -1346,6 +1346,7 @@ "ChargeOff Fraud Expense": "Charge Off Fraud Expense", "Charges": "Charges", "Checked Date": "Checked Date", + "Client Ip": "Client Ip", "Checked To Date": "Checked To Date", "Checker": "Checker", "Checker From Date": "Checker From Date", diff --git a/src/assets/translations/es-CL.json b/src/assets/translations/es-CL.json index a59bd17ce0..aeea3de207 100644 --- a/src/assets/translations/es-CL.json +++ b/src/assets/translations/es-CL.json @@ -1341,6 +1341,7 @@ "ChargeOff Fraud Expense": "Cargo por fraude de cancelación", "Charges": "Comisiones", "Checked Date": "Fecha comprobada", + "Client Ip": "IP del cliente", "Checked To Date": "Comprobado hasta la fecha", "Checker": "Inspector", "Checker From Date": "Comprobador desde la fecha", diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json index 1bd1949328..a74958f9e6 100644 --- a/src/assets/translations/es-MX.json +++ b/src/assets/translations/es-MX.json @@ -1341,6 +1341,7 @@ "ChargeOff Fraud Expense": "Cargo por fraude de cancelación", "Charges": "Comisiones", "Checked Date": "Fecha comprobada", + "Client Ip": "IP del cliente", "Checked To Date": "Comprobado hasta la fecha", "Checker": "Inspector", "Checker From Date": "Comprobador desde la fecha", diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json index 5898bac7f9..b081df251c 100644 --- a/src/assets/translations/fr-FR.json +++ b/src/assets/translations/fr-FR.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Facturer les dépenses de fraude", "Charges": "Des charges", "Checked Date": "Date de vérification", + "Client Ip": "IP du client", "Checked To Date": "Vérifié à ce jour", "Checker": "Vérificateur", "Checker From Date": "Date de début du vérificateur", diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json index 188f5c0c19..5cd46fac18 100644 --- a/src/assets/translations/it-IT.json +++ b/src/assets/translations/it-IT.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Addebito delle spese relative alle frodi", "Charges": "Spese", "Checked Date": "Data controllata", + "Client Ip": "IP del cliente", "Checked To Date": "Controllato fino ad oggi", "Checker": "Controllore", "Checker From Date": "Controllo dalla data", diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json index 3c47f80bb6..a7e59bda8d 100644 --- a/src/assets/translations/ko-KO.json +++ b/src/assets/translations/ko-KO.json @@ -1343,6 +1343,7 @@ "ChargeOff Fraud Expense": "사기 비용 상각", "Charges": "요금", "Checked Date": "확인 날짜", + "Client Ip": "고객 IP", "Checked To Date": "확인된 날짜", "Checker": "체커", "Checker From Date": "검사기 시작 날짜", diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json index 5a676fa166..acca8115e5 100644 --- a/src/assets/translations/lt-LT.json +++ b/src/assets/translations/lt-LT.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Apmokestinkite sukčiavimo išlaidas", "Charges": "Mokesčiai", "Checked Date": "Patikrinimo data", + "Client Ip": "Kliento IP", "Checked To Date": "Patikrinta iki datos", "Checker": "Šaškė", "Checker From Date": "Tikrinimas nuo datos", diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json index 39904e58f1..f0cda17a5d 100644 --- a/src/assets/translations/lv-LV.json +++ b/src/assets/translations/lv-LV.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Atstāj krāpšanas izdevumus", "Charges": "Maksas", "Checked Date": "Pārbaudes datums", + "Client Ip": "Klienta IP", "Checked To Date": "Pārbaudīts līdz datumam", "Checker": "Pārbaudītājs", "Checker From Date": "Pārbaudītājs no datuma", diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json index 58debae852..c42244f446 100644 --- a/src/assets/translations/ne-NE.json +++ b/src/assets/translations/ne-NE.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "धोखाधडी खर्च चार्ज गर्नुहोस्", "Charges": "शुल्कहरू", "Checked Date": "जाँच गरिएको मिति", + "Client Ip": "क्लाइन्ट आईपी", "Checked To Date": "मिति सम्म जाँच गरियो", "Checker": "परीक्षक", "Checker From Date": "मिति देखि परीक्षक", diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json index 13044f5c01..6ecb1e7620 100644 --- a/src/assets/translations/pt-PT.json +++ b/src/assets/translations/pt-PT.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Cobrar despesas de fraude", "Charges": "Cobranças", "Checked Date": "Data verificada", + "Client Ip": "IP do cliente", "Checked To Date": "Verificado até o momento", "Checker": "Verificador", "Checker From Date": "Verificador de data", diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json index a401934b11..df2eb0ba2b 100644 --- a/src/assets/translations/sw-SW.json +++ b/src/assets/translations/sw-SW.json @@ -1342,6 +1342,7 @@ "ChargeOff Fraud Expense": "Lipiza Gharama za Ulaghai", "Charges": "Malipo", "Checked Date": "Tarehe ya Kukaguliwa", + "Client Ip": "IP ya mteja", "Checked To Date": "Imeangaliwa Hadi Sasa", "Checker": "Kikagua", "Checker From Date": "Checker Kutoka Tarehe", From 85c4b3115bbc9803958392aa0f782de21274865f Mon Sep 17 00:00:00 2001 From: Yessica Viridiana Leon Mendiola Date: Wed, 2 Jul 2025 16:19:28 -0600 Subject: [PATCH 006/707] WEB-241: Front End fix on Savings Accounts --- ...ing-product-accounting-step.component.html | 16 +- ...aving-product-accounting-step.component.ts | 9 + ...-savings-accounting-details.component.html | 174 +++++++++--------- 3 files changed, 113 insertions(+), 86 deletions(-) diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html index 97fab4701a..691e0f0b6d 100644 --- a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html +++ b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.html @@ -52,6 +52,16 @@

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

> + + +

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

@@ -153,7 +163,7 @@

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

@@ -215,7 +225,7 @@

-
+

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

@@ -267,7 +277,7 @@

{{ 'labels.heading.Map Fees to Specific Income Accoun

-
+

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

diff --git a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts index 400b8ce2b9..2fb2b268a4 100644 --- a/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts +++ b/src/app/products/saving-products/saving-product-stepper/saving-product-accounting-step/saving-product-accounting-step.component.ts @@ -157,6 +157,10 @@ export class SavingProductAccountingStepComponent implements OnInit { this.savingProductAccountingForm.patchValue({ feesReceivableAccountId: this.savingProductsTemplate.accountingMappings.feeReceivableAccount.id, penaltiesReceivableAccountId: this.savingProductsTemplate.accountingMappings.penaltyReceivableAccount.id, + interestReceivableAccountId: + this.savingProductsTemplate.accountingMappings.interestReceivableAccount == null || undefined + ? '' + : this.savingProductsTemplate.accountingMappings.interestReceivableAccount.id, interestPayableAccountId: this.savingProductsTemplate.accountingMappings.interestPayableAccount.id }); } @@ -252,6 +256,10 @@ export class SavingProductAccountingStepComponent implements OnInit { 'penaltiesReceivableAccountId', new UntypedFormControl('', Validators.required) ); + this.savingProductAccountingForm.addControl( + 'interestReceivableAccountId', + new UntypedFormControl('', Validators.required) + ); this.savingProductAccountingForm.addControl( 'interestPayableAccountId', new UntypedFormControl('', Validators.required) @@ -311,6 +319,7 @@ export class SavingProductAccountingStepComponent implements OnInit { this.savingProductAccountingForm.removeControl('escheatLiabilityId'); this.savingProductAccountingForm.removeControl('feesReceivableAccountId'); this.savingProductAccountingForm.removeControl('penaltiesReceivableAccountId'); + this.savingProductAccountingForm.removeControl('interestReceivableAccountId'); this.savingProductAccountingForm.removeControl('interestPayableAccountId'); } }); diff --git a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html index 2ff910bf4d..7756a9a622 100644 --- a/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html +++ b/src/app/shared/accounting/view-savings-accounting-details/view-savings-accounting-details.component.html @@ -45,97 +45,105 @@

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

[withTitle]="'40%'" > -
- -

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

-
- - -
-
- - -
-
-
-
- - -
-

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

-
- - -
-
- - -
-
- - -
+

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

+
+ + +
+
+ + +
+
+ + +
+
+ + +
-

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

-
- - -
-
- - +

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

+
+ + +
+
+ + +
+
+ + +
+ +

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

+
+ + +
+
+ + +
From e4cf07729770415af6164c27fe43a2f5fadca4c4 Mon Sep 17 00:00:00 2001 From: "mark.vituska" Date: Thu, 3 Jul 2025 12:13:38 +0200 Subject: [PATCH 007/707] WEB-242: add buy down fee adjustment transaction to existing non reversed buy down fee transactions --- .../transactions-tab.component.html | 10 +++ .../transactions-tab.component.ts | 74 ++++++++++++++++++- .../models/loan-transaction-type.model.ts | 2 + src/assets/translations/cs-CS.json | 6 ++ src/assets/translations/de-DE.json | 8 +- src/assets/translations/en-US.json | 8 +- src/assets/translations/es-CL.json | 6 ++ src/assets/translations/es-MX.json | 6 ++ src/assets/translations/fr-FR.json | 6 ++ src/assets/translations/it-IT.json | 6 ++ src/assets/translations/ko-KO.json | 6 ++ src/assets/translations/lt-LT.json | 6 ++ src/assets/translations/lv-LV.json | 6 ++ src/assets/translations/ne-NE.json | 6 ++ src/assets/translations/pt-PT.json | 6 ++ src/assets/translations/sw-SW.json | 6 ++ src/environments/.env.ts | 4 +- 17 files changed, 167 insertions(+), 5 deletions(-) diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html index 144fcbd109..5839990dcf 100644 --- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html +++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.html @@ -204,6 +204,16 @@ {{ 'labels.menus.Capitalized Income Adjustment' | translate }} + + + diff --git a/src/app/organization/investors/investors.component.html b/src/app/organization/investors/investors.component.html index cea3de7c7f..91165da6ff 100644 --- a/src/app/organization/investors/investors.component.html +++ b/src/app/organization/investors/investors.component.html @@ -1,225 +1,229 @@ -
- - {{ 'labels.text.Search by Text' | translate }} - - + +
+ + {{ 'labels.text.Search by Text' | translate }} + + - - {{ 'labels.text.Effective Date From' | translate }} - - - - + + {{ 'labels.text.Effective Date From' | translate }} + + + + - - {{ 'labels.text.Effective Date To' | translate }} - - - - + + {{ 'labels.text.Effective Date To' | translate }} + + + + - - {{ 'labels.text.Settlement Date From' | translate }} - - - - + + {{ 'labels.text.Settlement Date From' | translate }} + + + + - - {{ 'labels.text.Settlement Date To' | translate }} - - - - + + {{ 'labels.text.Settlement Date To' | translate }} + + + + -
- +
+ +
-
-
-
-
-
- - - - +
+
+
+
+ + + + + + + + + + + + + + +
+
+ + {{ record.status }} +
+
{{ 'labels.inputs.Owner External Id' | translate }} + + {{ 'labels.inputs.Transfer External Id' | translate }} + + {{ 'labels.inputs.Effective From' | translate }}{{ record.effectiveFrom | dateFormat }}
+
+
+ +
- - - - - - - - - + + + + + + + + + + + + + + + + + +
-
- - {{ record.status }} -
-
{{ 'labels.inputs.Owner External Id' | translate }} - - {{ 'labels.inputs.Transfer External Id' | translate }} - - {{ 'labels.inputs.Effective From' | translate }}{{ record.effectiveFrom | dateFormat }}
+ {{ 'labels.inputs.Status' | translate }} : + +
+ + {{ record.status }} +
+
+ {{ 'labels.inputs.Owner External Id' | translate }} : + + +
+ {{ 'labels.inputs.Settlement Date' | translate }} : + + {{ record.settlementDate | dateFormat }} + + {{ 'labels.inputs.Effective Date' | translate }} : + + {{ record.effectiveFrom | dateFormat }} +
+ {{ 'labels.inputs.Details' | translate }} : + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ 'labels.inputs.Principal Outstanding' | translate }} : + + {{ record.details.totalPrincipalOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Interest Outstanding' | translate }} : + + {{ record.details.totalInterestOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Fees Outstanding' | translate }} : + + {{ record.details.totalFeeChargesOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Penalties Outstanding' | translate }} : + + {{ record.details.totalPenaltyChargesOutstanding | formatNumber }} +
+ {{ 'labels.inputs.Outstanding' | translate }} : + {{ record.details.totalOutstanding | formatNumber }}
+ {{ 'labels.inputs.Overpaid' | translate }} : + {{ record.details.totalOverpaid | formatNumber }}
+
- - +
-
- - - - - - - - - - - - - - - - - - - -
- {{ 'labels.inputs.Status' | translate }} : - -
- - {{ record.status }} -
-
- {{ 'labels.inputs.Owner External Id' | translate }} : - - -
- {{ 'labels.inputs.Settlement Date' | translate }} : - - {{ record.settlementDate | dateFormat }} - - {{ 'labels.inputs.Effective Date' | translate }} : - - {{ record.effectiveFrom | dateFormat }} -
- {{ 'labels.inputs.Details' | translate }} : - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- {{ 'labels.inputs.Principal Outstanding' | translate }} : - - {{ record.details.totalPrincipalOutstanding | formatNumber }} -
- {{ 'labels.inputs.Interest Outstanding' | translate }} : - - {{ record.details.totalInterestOutstanding | formatNumber }} -
- {{ 'labels.inputs.Fees Outstanding' | translate }} : - - {{ record.details.totalFeeChargesOutstanding | formatNumber }} -
- {{ 'labels.inputs.Penalties Outstanding' | translate }} : - - {{ record.details.totalPenaltyChargesOutstanding | formatNumber }} -
- {{ 'labels.inputs.Outstanding' | translate }} : - {{ record.details.totalOutstanding | formatNumber }}
- {{ 'labels.inputs.Overpaid' | translate }} : - {{ record.details.totalOverpaid | formatNumber }}
-
-
+ - +
+ +
+
+
-
- -
- - - - -
+ +
-
-
- - {{ 'labels.text.No data found' | translate }} +
+
+ + {{ 'labels.text.No data found' | translate }} +
-
+ diff --git a/src/app/organization/organization-routing.module.ts b/src/app/organization/organization-routing.module.ts index bc7b3bb273..ffe64ba1ba 100644 --- a/src/app/organization/organization-routing.module.ts +++ b/src/app/organization/organization-routing.module.ts @@ -339,7 +339,7 @@ const routes: Routes = [ { path: 'fund-mapping', component: FundMappingComponent, - data: { title: 'Advance Search', breadcrumb: 'Advance Search' }, + data: { title: 'Fund Mapping', breadcrumb: 'Fund Mapping' }, resolve: { advanceSearchTemplate: AdvanceSearchTemplateResolver } diff --git a/src/app/organization/organization.component.html b/src/app/organization/organization.component.html index 83b64a1dc8..cc3889f517 100644 --- a/src/app/organization/organization.component.html +++ b/src/app/organization/organization.component.html @@ -102,7 +102,7 @@