FIx: missed labels to Advanced Payment Allocation

alberto-art3ch · May 23, 2024 · e20a672 · e20a672
1 parent 3b714fe
commit e20a672
Show file tree

Hide file tree

Showing 16 changed files with 164 additions and 6 deletions.
diff --git a/src/app/login/login.component.html b/src/app/login/login.component.html
@@ -37,7 +37,7 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate}}</h1>
       <mifosx-language-selector class="p-r-10 p-t-10"></mifosx-language-selector>
       <mifosx-theme-toggle class="p-r-10 p-t-10"></mifosx-theme-toggle>
       <div fxFlex></div>
-      <mifosx-server-selector class="p-l-10 p-t-10" *ngIf="environment.allowServerSwitch"></mifosx-server-selector>
+      <mifosx-server-selector class="p-l-10 p-t-10" *ngIf="!environment.production && environment.allowServerSwitch"></mifosx-server-selector>
     </div>
 
     <!-- Logo with Organization Name -->
@@ -46,7 +46,7 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate}}</h1>
     </div>
 
     <!-- Tenant Identifier Name -->
-    <div fxLayout="row" fxLayoutAlign="center center" fxFlex="1 0 auto">
+    <div fxLayout="row" fxLayoutAlign="center center" fxFlex="1 0 auto" *ngIf="!environment.production">
       <mifosx-tenant-selector></mifosx-tenant-selector>
     </div>
 

diff --git a/...pper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html b/...pper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.html
@@ -3,7 +3,7 @@
 
     <mat-tab *ngFor="let advancedPaymentAllocation of advancedPaymentAllocations">
         <ng-template mat-tab-label>
-            {{advancedPaymentAllocation.transaction.code}}
+            {{advancedPaymentAllocation.transaction.value | translateCatalog}}
         </ng-template>
         <mifosx-advance-payment-allocation-tab [advancedPaymentAllocation]="advancedPaymentAllocation"
             (allocationChanged)="allocationChanged($event)"
@@ -13,7 +13,7 @@
 
     <mat-tab *ngFor="let advancedCreditAllocation of advancedCreditAllocations">
         <ng-template mat-tab-label>
-            {{advancedCreditAllocation.transaction.code}}
+            {{advancedCreditAllocation.transaction.value | translateCatalog}}
         </ng-template>
         <mifosx-advance-payment-allocation-tab [advancedCreditAllocation]="advancedCreditAllocation"
             (allocationChanged)="allocationChanged($event)"

diff --git a/...tepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.ts b/...tepper/loan-product-payment-strategy-step/loan-product-payment-strategy-step.component.ts
@@ -58,12 +58,14 @@ export class LoanProductPaymentStrategyStepComponent implements OnInit {
     this.advancedPaymentAllocationTransactionTypes.forEach((option: PaymentAllocationTransactionType) => {
       if (!this.advancedPaymentStrategy.isDefault(option) && transactionTypesCurrent.indexOf(option.code) < 0) {
         option.credit = false;
+        option.value = this.translateService.instant('labels.catalogs.' + option.value);
         transactionTypesOptions.push(option);
       }
     });
     this.advancedCreditAllocationTransactionTypes.forEach((option: PaymentAllocationTransactionType) => {
       if (transactionTypesCurrent.indexOf(option.code) < 0) {
         option.credit = true;
+        option.value = this.translateService.instant('labels.catalogs.' + option.value);
         transactionTypesOptions.push(option);
       }
     });
@@ -72,7 +74,7 @@ export class LoanProductPaymentStrategyStepComponent implements OnInit {
       new SelectBase({
         controlName: 'code',
         label: this.translateService.instant('labels.inputs.Transaction Type'),
-        options: { label: 'code', value: 'code', data: transactionTypesOptions },
+        options: { label: 'value', value: 'code', data: transactionTypesOptions },
         order: 1
       })
     ];

diff --git a/src/assets/translations/cs-CS.json b/src/assets/translations/cs-CS.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Po splatnosti/Poplatek po splatnosti/Int, jistina",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Splatná pokuta, poplatek, úrok, jistina, Předem jistina, penále, poplatek, úrok",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Splatná pokuta, úrok, jistina, poplatek, Pokuta předem, úrok, jistina, poplatek",
+      "Principal": "Ředitel školy",
+      "Repayment": "Splácení",
+      "Down payment": "Záloha",
+      "Charge refund": "Vrácení poplatku",
+      "Charge adjustment": "Úprava náboje",
+      "Waive interest": "Vzdát se úroků",
+      "Charge payment": "Úhrada poplatku",
+      "Refund for active loan": "Vrácení peněz za aktivní půjčku",
+      "Chargeback": "Zpětné zúčtování",
+      "Default": "Výchozí",
+      "Goodwill credit": "Úvěr dobré vůle",
+      "Payout refund": "Vrácení výplaty",
+      "Merchant issued refund": "Obchodník vrátil peníze",
 	    "first": "První",
 	    "second": "druhý",
 	    "third": "Třetí",

diff --git a/src/assets/translations/de-DE.json b/src/assets/translations/de-DE.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Überfällige/fällige Gebühr/Int, Kapital",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Fällige Vertragsstrafe, Gebühr, Zinsen, Kapital, Im Voraus fällige Vertragsstrafe, Vertragsstrafe, Gebühr, Zinsen",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Fällige Strafe, Zinsen, Kapital, Gebühr, Vorabstrafe, Zinsen, Kapital, Gebühr",
+      "Principal": "Rektor",
+      "Repayment": "Rückzahlung",
+      "Down payment": "Anzahlung",
+      "Charge refund": "Rückerstattung der Gebühr",
+      "Charge adjustment": "Gebührenanpassung",
+      "Waive interest": "Verzichten Sie auf Zinsen",
+      "Charge payment": "Gebührenzahlung",
+      "Refund for active loan": "Rückerstattung für aktives Darlehen",
+      "Chargeback": "Rückbuchung",
+      "Default": "Standard",
+      "Goodwill credit": "Kulanzgutschrift",
+      "Payout refund": "Auszahlungsrückerstattung",
+      "Merchant issued refund": "Vom Händler ausgestellte Rückerstattung",
 	    "first": "Erste",
 	    "second": "zweite",
 	    "third": "dritte",

diff --git a/src/assets/translations/en-US.json b/src/assets/translations/en-US.json
@@ -650,6 +650,19 @@
             "Fixed Amount": "Fixed Amount",
             "Share Solidarity Fund": "Share Solidarity Fund",
             "Share Building Contribution": "Share Building Contribution",
+            "Principal": "Principal",
+            "Repayment": "Repayment",
+            "Down payment": "Down payment",
+            "Charge refund": "Charge refund",
+            "Charge adjustment": "Charge adjustment",
+            "Waive interest": "Waive interest",
+            "Charge payment": "Charge payment",
+            "Refund for active loan": "Refund for active loan",
+            "Chargeback": "Chargeback",
+            "Default": "Default",
+            "Goodwill credit": "Goodwill credit",
+            "Payout refund": "Payout refund",
+            "Merchant issued refund": "Merchant issued refund",
             "Invalid": "Invalid"
         },
         "commons": {

diff --git a/src/assets/translations/es-MX.json b/src/assets/translations/es-MX.json
@@ -631,6 +631,18 @@
             "Overdue/Due Fee/Int,Principal": "Vencido/Comisiones vencida/int, Capital",
             "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Penalización vencida, Comisiones, Intereses, Capital, Capital adelantado, Penalizaciones, Comisiones, Intereses",
             "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Penalización vencida, Intereses, Capital, Comisiones, Penalización por adelantado, Intereses, Capital, Comisiones",
+            "Principal": "Capital",	"Repayment": "Reembolso",
+            "Down payment": "Auto Pago",
+            "Charge refund": "Reembolso de cargo",
+            "Charge adjustment": "Ajuste de cargo",
+            "Waive interest": "Renunciar a intereses",
+            "Charge payment": "Pago de cargo",
+            "Refund for active loan": "Reembolso por préstamo activo",
+            "Chargeback": "Contracargo",
+            "Default": "Por defecto",
+            "Goodwill credit": "crédito de buena voluntad",
+            "Payout refund": "Reembolso de pago",
+            "Merchant issued refund": "Reembolso emitido por el comerciante",
             "first": "Primer",
             "second": "Segundo",
             "third": "Tercer",

diff --git a/src/assets/translations/fr-FR.json b/src/assets/translations/fr-FR.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Frais de retard/dû/Int, principal",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Pénalité due, frais, intérêts, principal, Principal à l'avance, pénalité, frais, intérêts",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Pénalité due, intérêts, principal, frais, Pénalité d'avance, intérêts, principal, frais",
+      "Principal": "Principal",
+      "Repayment": "Remboursement",
+      "Down payment": "Acompte",
+      "Charge refund": "Remboursement des frais",
+      "Charge adjustment": "Ajustement des frais",
+      "Waive interest": "Renoncer aux intérêts",
+      "Charge payment": "Paiement des frais",
+      "Refund for active loan": "Remboursement d'un prêt actif",
+      "Chargeback": "Rétrofacturation",
+      "Default": "Défaut",
+      "Goodwill credit": "Crédit de bonne volonté",
+      "Payout refund": "Remboursement du paiement",
+      "Merchant issued refund": "Remboursement émis par le commerçant",
 	    "first": "d'abord",
 	    "second": "deuxième",
 	    "third": "troisième",

diff --git a/src/assets/translations/it-IT.json b/src/assets/translations/it-IT.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Commissione scaduta/scaduta/Int",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Pena, commissione, interesse, capitale dovuta, Capitale anticipato, penale, commissione, interesse",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Penale dovuta, interessi, capitale, commissione, Penale anticipata, interessi, capitale, commissione",
+      "Principal": "Principale",
+      "Repayment": "Rimborso",
+      "Down payment": "Acconto",
+      "Charge refund": "Rimborso addebito",
+      "Charge adjustment": "Adeguamento della tariffa",
+      "Waive interest": "Rinuncia agli interessi",
+      "Charge payment": "Pagamento addebito",
+      "Refund for active loan": "Rimborso prestito attivo",
+      "Chargeback": "Riaddebito",
+      "Default": "Predefinito",
+      "Goodwill credit": "Credito di buona volontà",
+      "Payout refund": "Rimborso del pagamento",
+      "Merchant issued refund": "Il commerciante ha emesso il rimborso",
 	    "first": "Primo",
 	    "second": "secondo",
 	    "third": "terzo",

diff --git a/src/assets/translations/ko-KO.json b/src/assets/translations/ko-KO.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "연체/연체 수수료/내부, 원금",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "위약금, 수수료, 이자, 원금, 선불원금, 위약금, 수수료, 이자",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "위약금, 이자, 원금, 수수료, 선납 위약금, 이자, 원금, 수수료",
+      "Principal": "주요한",
+      "Repayment": "반환",
+      "Down payment": "계약금",
+      "Charge refund": "청구금액 환불",
+      "Charge adjustment": "요금 조정",
+      "Waive interest": "이자 면제",
+      "Charge payment": "청구지불",
+      "Refund for active loan": "활성 대출에 대한 환불",
+      "Chargeback": "지불 거절",
+      "Default": "기본",
+      "Goodwill credit": "영업권 신용",
+      "Payout refund": "지불금 환불",
+      "Merchant issued refund": "판매자가 환불 처리함",
 	    "first": "첫 번째",
 	    "second": "두번째",
 	    "third": "제삼",

diff --git a/src/assets/translations/lt-LT.json b/src/assets/translations/lt-LT.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Uždelstas/mokestis/Tarptautinis, pagrindinis",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Delspinigiai, mokestis, palūkanos, pagrindinė suma, Avansinė pagrindinė suma, netesybos, mokestis, palūkanos",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Delspinigiai, delspinigiai, pagrindinė suma, mokestis, Avansinė bauda, palūkanos, pagrindinė suma, mokestis",
+      "Principal": "direktorius",
+      "Repayment": "Grąžinimas",
+      "Down payment": "Pradinis įnašas",
+      "Charge refund": "Mokesčio grąžinimas",
+      "Charge adjustment": "Krovinio reguliavimas",
+      "Waive interest": "Atsisakyti palūkanų",
+      "Charge payment": "Mokesčio mokėjimas",
+      "Refund for active loan": "Aktyvios paskolos grąžinimas",
+      "Chargeback": "Mokėjimo grąžinimas",
+      "Default": "Numatytas",
+      "Goodwill credit": "Geros valios kreditas",
+      "Payout refund": "Išmokų grąžinimas",
+      "Merchant issued refund": "Prekybininkas grąžino pinigus",
 	    "first": "Pirmas",
 	    "second": "antra",
 	    "third": "trečias",

diff --git a/src/assets/translations/lv-LV.json b/src/assets/translations/lv-LV.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Nokavējums/Maksa/Int, Principal",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Maksājamais līgumsods, nodeva, procenti, pamatsumma, Avansa pamatsumma, līgumsods, maksa, procenti",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Maksājamais līgumsods, procenti, pamatsumma, maksa, avansa līgumsods, procenti, pamatsumma, maksa",
+      "Principal": "Direktors",
+      "Repayment": "Atmaksa",
+      "Down payment": "Pirmā iemaksa",
+      "Charge refund": "Maksas atmaksa",
+      "Charge adjustment": "Uzlādes regulēšana",
+      "Waive interest": "Atteikties no procentiem",
+      "Charge payment": "Maksas maksājums",
+      "Refund for active loan": "Aktīva kredīta atmaksa",
+      "Chargeback": "Atmaksa",
+      "Default": "Noklusējums",
+      "Goodwill credit": "Labas gribas kredīts",
+      "Payout refund": "Izmaksas atmaksa",
+      "Merchant issued refund": "Tirgotājs izsniedza atmaksu",
 	    "first": "vispirms",
 	    "second": "otrais",
 	    "third": "trešais",

diff --git a/src/assets/translations/ne-NE.json b/src/assets/translations/ne-NE.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "ओभरड्यू/देय शुल्क/Int, प्रिन्सिपल",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "देय जरिवाना, दस्तुर, ब्याज, मुद्दल, अग्रिम मुद्दल, जरिवाना, शुल्क, ब्याज",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "बक्यौता जरिवाना, व्याज, मुद्दल, शुल्क, अग्रिम जरिवाना, व्याज, मूल, शुल्क",
+      "Principal": "प्रिन्सिपल",
+      "Repayment": "भुक्तानी",
+      "Down payment": "डाउन पेमेन्ट",
+      "Charge refund": "शुल्क फिर्ता",
+      "Charge adjustment": "चार्ज समायोजन",
+      "Waive interest": "ब्याज माफ गर्नुहोस्",
+      "Charge payment": "शुल्क भुक्तानी",
+      "Refund for active loan": "सक्रिय ऋणको लागि फिर्ता",
+      "Chargeback": "चार्जब्याक",
+      "Default": "पूर्वनिर्धारित",
+      "Goodwill credit": "सद्भावना क्रेडिट",
+      "Payout refund": "भुक्तानी फिर्ता",
+      "Merchant issued refund": "व्यापारीले फिर्ता जारी गर्यो",
 	    "first": "पहिलो",
 	    "second": "दोस्रो",
 	    "third": "तेस्रो",

diff --git a/src/assets/translations/pt-PT.json b/src/assets/translations/pt-PT.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Taxa vencida/devida/int,principal",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Multa devida, taxa, juros, principal, Adiantamento de principal, multa, taxa, juros",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Pena devida, juros, principal, taxa, multa antecipada, juros, principal, taxa",
+      "Principal": "Diretor",
+      "Repayment": "Reembolso",
+      "Down payment": "Pagamento inicial",
+      "Charge refund": "Reembolso de cobrança",
+      "Charge adjustment": "Ajuste de cobrança",
+      "Waive interest": "Renunciar a juros",
+      "Charge payment": "Cobrar pagamento",
+      "Refund for active loan": "Reembolso para empréstimo ativo",
+      "Chargeback": "Estorno",
+      "Default": "Padrão",
+      "Goodwill credit": "Crédito de boa vontade",
+      "Payout refund": "Reembolso de pagamento",
+      "Merchant issued refund": "Reembolso emitido pelo comerciante",
 	    "first": "primeiro",
 	    "second": "segundo",
 	    "third": "terceiro",

diff --git a/src/assets/translations/sw-SW.json b/src/assets/translations/sw-SW.json
@@ -631,6 +631,19 @@
 	    "Overdue/Due Fee/Int,Principal": "Ada Imechelewa/Inayodaiwa/Int,Mkuu",
 	    "Due penalty, fee, interest, principal, In advance principal, penalty, fee, interest": "Adhabu inayodaiwa, ada, riba, mkuu, Mapema mkuu, adhabu, ada, riba",
 	    "Due penalty, interest, principal, fee, In advance penalty, interest, principal, fee": "Adhabu inayostahili, riba, mkuu, ada, Adhabu ya mapema, riba, mkuu, ada",
+      "Principal": "Mkuu wa shule",
+      "Repayment": "Ulipaji",
+      "Down payment": "Malipo ya chini",
+      "Charge refund": "Maliza marejesho",
+      "Charge adjustment": "Marekebisho ya malipo",
+      "Waive interest": "Ondoa riba",
+      "Charge payment":"Malipo ya malipo",
+      "Refund for active loan": "Rejesha pesa kwa mkopo unaotumika",
+      "Chargeback": "Urejeshaji malipo",
+      "Default": "Chaguomsingi",
+      "Goodwill credit": "Mikopo ya nia njema",
+      "Payout refund": "Marejesho ya malipo",
+      "Merchant issued refund": "Mfanyabiashara alirejesha pesa",
 	    "first": "kwanza",
 	    "second": "pili",
 	    "third": "cha tatu",

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -15,7 +15,8 @@ export const environment = {
   fineractPlatformTenantIds: window['env']['fineractPlatformTenantIds'] || 'default',
   // For connecting to others servers running elsewhere update the base API URL
   baseApiUrls: window['env']['fineractApiUrls'] ||
-    'https://dev.mifos.io,https://demo.mifos.io,https://qa.mifos.io,https://staging.mifos.io,https://mobile.mifos.io,https://demo.fineract.dev,https://localhost:8443,' + window.location.protocol + '://' + window.location.hostname + ':' + window.location.port,
+    'https://dev.mifos.io,https://demo.mifos.io,https://qa.mifos.io,https://staging.mifos.io,https://mobile.mifos.io,https://demo.fineract.dev,https://localhost:8443,'
+    + window.location.protocol + '://' + window.location.hostname + ':' + window.location.port,
   // For connecting to server running elsewhere set the base API URL
   baseApiUrl: window['env']['baseApiUrl'] || window.location.protocol + '://' + window.location.hostname + ':' + window.location.port,
   allowServerSwitch: env.allow_switching_backend_instance,