Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FINERACT-2092: Payment Waiver - UI changes #2123

Merged
merged 1 commit into from
Jun 19, 2024
Merged

FINERACT-2092: Payment Waiver - UI changes #2123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/loans/common-resolvers/loan-action-button.resolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ export class LoanActionButtonResolver implements Resolve<Object> {
return this.loansService.getLoanActionTemplate(loanId, 'repayment');
} else if (loanActionButton === 'Goodwill Credit') {
return this.loansService.getLoanActionTemplate(loanId, 'goodwillCredit');
} if (loanActionButton === 'Interest Payment Waiver') {
return this.loansService.getLoanActionTemplate(loanId, 'interestPaymentWaiver');
} else if (loanActionButton === 'Payout Refund') {
return this.loansService.getLoanActionTemplate(loanId, 'payoutRefund');
} else if (loanActionButton === 'Merchant Issued Refund') {
Expand Down
3 changes: 2 additions & 1 deletion src/app/loans/loans-view/loan-account-actions/loan-account-actions.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<mifosx-prepay-loan [dataObject]="actionButtonData" *ngIf="actions['Prepay Loan']"></mifosx-prepay-loan>
<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Make Repayment']"></mifosx-make-repayment>
<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Goodwill Credit']"></mifosx-make-repayment>
<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Interest Payment Waiver']"></mifosx-make-repayment>
<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Payout Refund']"></mifosx-make-repayment>
<mifosx-make-repayment [dataObject]="actionButtonData" *ngIf="actions['Merchant Issued Refund']"></mifosx-make-repayment>
<mifosx-loan-credit-balance-refund [dataObject]="actionButtonData" *ngIf="actions['Credit Balance Refund']"></mifosx-loan-credit-balance-refund>
Expand All @@ -29,4 +30,4 @@
<mifosx-undo-command [actionName]="actionName" *ngIf="actions['Undo Charge-Off']"></mifosx-undo-command>
<mifosx-asset-transfer-loan *ngIf="actions['Sell Loan'] || actions['Buy Back Loan']"></mifosx-asset-transfer-loan>
<mifosx-loan-reaging [dataObject]="actionButtonData" *ngIf="actions['Re-Age']"></mifosx-loan-reaging>
<mifosx-loan-reamortize [dataObject]="actionButtonData" *ngIf="actions['Re-Amortize']"></mifosx-loan-reamortize>
<mifosx-loan-reamortize [dataObject]="actionButtonData" *ngIf="actions['Re-Amortize']"></mifosx-loan-reamortize>
9 changes: 9 additions & 0 deletions src/app/loans/loans-view/loan-accounts-button-config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,11 @@ export class LoansAccountButtonConfiguration {
icon: 'coins',
taskPermissionName: 'CREATE_GOODWILL_TRANSACTION',
},
{
name: 'Interest Payment Waiver',
icon: 'coins',
taskPermissionName: 'CREATE_INTERESTPAYMENTWAIVER_TRANSACTION',
},
{
name: 'Payout Refund',
icon: 'coins',
Expand Down Expand Up @@ -200,6 +205,10 @@ export class LoansAccountButtonConfiguration {
name: 'Goodwill Credit',
taskPermissionName: 'CREATE_GOODWILL_TRANSACTION',
},
{
name: 'Interest Payment Waiver',
taskPermissionName: 'CREATE_INTERESTPAYMENTWAIVER_TRANSACTION',
},
{
name: 'Payout Refund',
taskPermissionName: 'CREATE_PAYOUT_REFUND',
Expand Down
2 changes: 1 addition & 1 deletion src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ export class TransactionsTabComponent implements OnInit {
* REAMORTIZE:30
*/
showTransactions(transactionsData: LoanTransaction) {
if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28, 29, 30].includes(transactionsData.type.id)) {
if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28, 29, 30, 31].includes(transactionsData.type.id)) {
this.router.navigate([transactionsData.id], { relativeTo: this.route });
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export class ViewTransactionComponent implements OnInit {
}

allowChargebackTransaction(transactionType: LoanTransactionType): boolean {
return (transactionType.repayment
return (transactionType.repayment || transactionType.interestPaymentWaiver
|| transactionType.goodwillCredit || transactionType.payoutRefund
|| transactionType.merchantIssuedRefund || transactionType.downPayment);
}
Expand Down
1 change: 1 addition & 0 deletions src/app/loans/models/loan-transaction-type.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface LoanTransactionType {
merchantIssuedRefund: boolean;
payoutRefund: boolean;
goodwillCredit: boolean;
interestPaymentWaiver: boolean;
chargeRefund: boolean;
contra: boolean;
waiveInterest: boolean;
Expand Down
1 change: 1 addition & 0 deletions src/app/products/loan-products/models/loan-account.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export interface LoanTransactionType {
merchantIssuedRefund: boolean;
payoutRefund: boolean;
goodwillCredit: boolean;
interestPaymentWaiver: boolean;
chargeRefund: boolean;
contra: boolean;
waiveInterest: boolean;
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/cs-CS.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Ano"
},
"catalogs": {
"Interest payment waiver": "Prominutí platby úroků",
"Active": "Aktivní",
"account_transfer": "převod_účtu",
"accounting": "účetnictví",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navigace",
"Notifications": "Oznámení",
"Organization": "Organizace",
"Interest Payment Waiver": "Prominutí platby úroků",
"Payments": "Platby",
"Payout Refund": "Vrácení platby",
"Post Interest": "Post Interest",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/de-DE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Ja"
},
"catalogs": {
"Interest payment waiver": "Zinszahlungsverzicht",
"Active": "Aktiv",
"account_transfer": "account_transfer",
"accounting": "Buchhaltung",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navigation",
"Notifications": "Benachrichtigungen",
"Organization": "Organisation",
"Interest Payment Waiver": "Zinszahlungsverzicht",
"Payments": "Zahlungen",
"Payout Refund": "Auszahlungsrückerstattung",
"Post Interest": "Interesse posten",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Yes"
},
"catalogs": {
"Interest payment waiver": "Interest Payment Waiver",
"Active": "Active",
"account_transfer": "account_transfer",
"accounting": "accounting",
Expand Down Expand Up @@ -2445,6 +2446,7 @@
"Navigation": "Navigation",
"Notifications": "Notifications",
"Organization": "Organization",
"Interest Payment Waiver": "Interest Payment Waiver",
"Payments": "Payments",
"Payout Refund": "Payout Refund",
"Post Interest": "Post Interest",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/es-MX.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Sí"
},
"catalogs": {
"Interest payment waiver": "Exención de pago de intereses",
"Active": "Activo",
"account_transfer": "transferencia de cuenta",
"accounting": "contabilidad",
Expand Down Expand Up @@ -2443,6 +2444,7 @@
"Navigation": "Navegación",
"Notifications": "Notificaciones",
"Organization": "Organización",
"Interest Payment Waiver": "Exención de pago de intereses",
"Payments": "Pagos",
"Payout Refund": "Reembolso de pago",
"Post Interest": "Publicar interés",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/fr-FR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Oui"
},
"catalogs": {
"Interest payment waiver": "Renonciation au paiement des intérêts",
"Active": "Actif",
"account_transfer": "transfert_de compte",
"accounting": "comptabilité",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "La navigation",
"Notifications": "Notifications",
"Organization": "Organisation",
"Interest Payment Waiver": "Renonciation au paiement des intérêts",
"Payments": "Paiements",
"Payout Refund": "Remboursement des paiements",
"Post Interest": "Intérêt pour les publications",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/it-IT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "SÌ"
},
"catalogs": {
"Interest payment waiver": "Rinuncia al pagamento degli interessi",
"Active": "Attivo",
"account_transfer": "trasferimento_account",
"accounting": "contabilità",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navigazione",
"Notifications": "Notifiche",
"Organization": "Organizzazione",
"Interest Payment Waiver": "Rinuncia al pagamento degli interessi",
"Payments": "Pagamenti",
"Payout Refund": "Rimborso del pagamento",
"Post Interest": "Pubblica interesse",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/ko-KO.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "예"
},
"catalogs": {
"Interest payment waiver": "이자 지급 면제",
"Active": "활동적인",
"account_transfer": "계좌_이체",
"accounting": "회계",
Expand Down Expand Up @@ -2445,6 +2446,7 @@
"Navigation": "항해",
"Notifications": "알림",
"Organization": "조직",
"Interest Payment Waiver": "이자 지급 면제",
"Payments": "결제",
"Payout Refund": "지불금 환불",
"Post Interest": "관심 게시",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/lt-LT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Taip"
},
"catalogs": {
"Interest payment waiver": "Palūkanų mokėjimo atsisakymas",
"Active": "Aktyvus",
"account_transfer": "account_transfer",
"accounting": "buhalterinė apskaita",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navigacija",
"Notifications": "Pranešimai",
"Organization": "Organizacija",
"Interest Payment Waiver": "Palūkanų mokėjimo atsisakymas",
"Payments": "Mokėjimai",
"Payout Refund": "Išmokų grąžinimas",
"Post Interest": "Paskelbti susidomėjimą",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/lv-LV.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Jā"
},
"catalogs": {
"Interest payment waiver": "Atteikšanās no procentu maksājumiem",
"Active": "Aktīvs",
"account_transfer": "account_transfer",
"accounting": "grāmatvedība",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navigācija",
"Notifications": "Paziņojumi",
"Organization": "Organizācija",
"Interest Payment Waiver": "Atteikšanās no procentu maksājumiem",
"Payments": "Maksājumi",
"Payout Refund": "Izmaksas atmaksa",
"Post Interest": "Post Interese",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/ne-NE.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "हो"
},
"catalogs": {
"Interest payment waiver": "ब्याज भुक्तानी माफी",
"Active": "सक्रिय",
"account_transfer": "account_transfer",
"accounting": "लेखा",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "नेभिगेसन",
"Notifications": "सूचनाहरू",
"Organization": "संगठन",
"Interest Payment Waiver": "ब्याज भुक्तानी माफी",
"Payments": "भुक्तानीहरू",
"Payout Refund": "भुक्तानी फिर्ता",
"Post Interest": "पोस्ट ब्याज",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/pt-PT.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Sim"
},
"catalogs": {
"Interest payment waiver": "Isenção de pagamento de juros",
"Active": "Ativo",
"account_transfer": "transferência de conta",
"accounting": "contabilidade",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Navegação",
"Notifications": "Notificações",
"Organization": "Organização",
"Interest Payment Waiver": "Isenção de pagamento de juros",
"Payments": "Pagamentos",
"Payout Refund": "Reembolso de pagamento",
"Post Interest": "Publicar interesse",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/translations/sw-SW.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
"Yes": "Ndiyo"
},
"catalogs": {
"Interest payment waiver": "Msamaha wa Malipo ya Riba",
"Active": "Inayotumika",
"account_transfer": "akaunti_uhamisho",
"accounting": "uhasibu",
Expand Down Expand Up @@ -2444,6 +2445,7 @@
"Navigation": "Urambazaji",
"Notifications": "Arifa",
"Organization": "Shirika",
"Interest Payment Waiver": "Msamaha wa Malipo ya Riba",
"Payments": "Malipo",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reckon here you have modified the wrong translation key!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

"Payout Refund": "Marejesho ya Malipo",
"Post Interest": "Chapisha Maslahi",
Expand Down
Loading