diff --git a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.ts b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.ts
index db3b5278f..0eb958705 100644
--- a/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/prepay-loan/prepay-loan.component.ts
@@ -38,6 +38,7 @@ export class PrepayLoanComponent implements OnInit {
prepayData: any;
currency: Currency | null = null;
+ contractTermination: boolean;
/**
* @param {FormBuilder} formBuilder Form Builder.
@@ -62,10 +63,13 @@ export class PrepayLoanComponent implements OnInit {
* and initialize with the required values
*/
ngOnInit() {
+ this.prepayData = this.dataObject;
+ this.contractTermination = this.dataObject['actionName'] == 'Contract Termination';
this.maxDate = this.settingsService.businessDate;
this.createprepayLoanForm();
- this.setPrepayLoanDetails();
- this.prepayData = this.dataObject;
+ if (!this.contractTermination) {
+ this.setPrepayLoanDetails();
+ }
if (this.dataObject.currency) {
this.currency = this.dataObject.currency;
}
@@ -75,19 +79,26 @@ export class PrepayLoanComponent implements OnInit {
* Creates the prepay loan form.
*/
createprepayLoanForm() {
- this.prepayLoanForm = this.formBuilder.group({
- transactionDate: [
- new Date(),
- Validators.required
- ],
- transactionAmount: [
- '',
- Validators.required
- ],
- externalId: [''],
- paymentTypeId: [''],
- note: ['']
- });
+ if (this.contractTermination) {
+ this.prepayLoanForm = this.formBuilder.group({
+ externalId: [''],
+ note: ['']
+ });
+ } else {
+ this.prepayLoanForm = this.formBuilder.group({
+ transactionDate: [
+ new Date(),
+ Validators.required
+ ],
+ transactionAmount: [
+ '',
+ Validators.required
+ ],
+ externalId: [''],
+ paymentTypeId: [''],
+ note: ['']
+ });
+ }
}
/**
@@ -133,7 +144,7 @@ export class PrepayLoanComponent implements OnInit {
/**
* Submits the prepay loan form
*/
- submit() {
+ submitRepayment() {
const prepayLoanFormData = this.prepayLoanForm.value;
const locale = this.settingsService.language.code;
const dateFormat = this.settingsService.dateFormat;
@@ -151,4 +162,21 @@ export class PrepayLoanComponent implements OnInit {
this.router.navigate(['../../general'], { relativeTo: this.route });
});
}
+
+ submitContractTermination() {
+ const data = {
+ ...this.prepayLoanForm.value
+ };
+ this.loanService.loanActionButtons(this.loanId, 'contractTermination', data).subscribe((response: any) => {
+ this.router.navigate(['../../general'], { relativeTo: this.route });
+ });
+ }
+
+ submit() {
+ if (this.contractTermination) {
+ this.submitContractTermination();
+ } else {
+ this.submitRepayment();
+ }
+ }
}
diff --git a/src/app/loans/loans-view/loan-accounts-button-config.ts b/src/app/loans/loans-view/loan-accounts-button-config.ts
index 2ba6c2b5e..728388465 100644
--- a/src/app/loans/loans-view/loan-accounts-button-config.ts
+++ b/src/app/loans/loans-view/loan-accounts-button-config.ts
@@ -1,3 +1,5 @@
+import { OptionData } from 'app/shared/models/option-data.model';
+
/** Recurring Deposits Account Buttons Configuration */
export class LoansAccountButtonConfiguration {
optionArray: {
@@ -16,8 +18,8 @@ export class LoansAccountButtonConfiguration {
taskPermissionName?: string;
}[];
- constructor(status: string) {
- this.setOptions(status);
+ constructor(status: string, substatus: OptionData) {
+ this.setOptions(status, substatus);
this.setButtons(status);
}
@@ -154,7 +156,7 @@ export class LoansAccountButtonConfiguration {
}
}
- setOptions(status: string) {
+ setOptions(status: string, substatus: OptionData) {
switch (status) {
case 'Active':
this.optionArray = [
@@ -199,6 +201,12 @@ export class LoansAccountButtonConfiguration {
taskPermissionName: 'SALE_LOAN'
}
];
+ if (!this.isContractTermination(substatus)) {
+ this.optionArray.push({
+ name: 'Contract Termination',
+ taskPermissionName: 'CONTRACT_TERMINATION_LOAN'
+ });
+ }
this.optionPaymentArray = [
{
name: 'Goodwill Credit',
@@ -281,4 +289,11 @@ export class LoansAccountButtonConfiguration {
addButton(option: { name: string; icon: string; taskPermissionName?: string }) {
this.buttonsArray.push(option);
}
+
+ private isContractTermination(substatus: OptionData): boolean {
+ if (substatus == null) {
+ return false;
+ }
+ return substatus.code === 'loanSubStatus.loanSubStatusType.contractTermination';
+ }
}
diff --git a/src/app/loans/loans-view/loans-view.component.html b/src/app/loans/loans-view/loans-view.component.html
index 4d9c4690b..40c25a895 100644
--- a/src/app/loans/loans-view/loans-view.component.html
+++ b/src/app/loans/loans-view/loans-view.component.html
@@ -22,9 +22,7 @@
{{ 'labels.heading.Loan Product' | translate }} :
{
@@ -75,6 +78,7 @@ export class LoansViewComponent implements OnInit {
}
});
}
+ this.setConditionalButtons();
}
);
this.loanId = this.route.snapshot.params['loanId'];
@@ -90,6 +94,8 @@ export class LoansViewComponent implements OnInit {
});
this.recalculateInterest = this.loanDetailsData.recalculateInterest || true;
this.status = this.loanDetailsData.status.value;
+ this.loanStatus = this.loanDetailsData.status;
+ this.loanSubStatus = this.loanDetailsData.subStatus === undefined ? null : this.loanDetailsData.subStatus;
if (this.loanStatus.active && this.loanDetailsData.multiDisburseLoan) {
if (this.loanDetailsData && this.loanDetailsData.transactions) {
this.loanDetailsData.transactions.forEach((transaction: any) => {
@@ -112,7 +118,7 @@ export class LoansViewComponent implements OnInit {
// Defines the buttons based on the status of the loan account
setConditionalButtons() {
- this.buttonConfig = new LoansAccountButtonConfiguration(this.status);
+ this.buttonConfig = new LoansAccountButtonConfiguration(this.status, this.loanSubStatus);
if (this.status === 'Submitted and pending approval') {
this.buttonConfig.addOption({
@@ -345,9 +351,32 @@ export class LoansViewComponent implements OnInit {
if (this.loanDetailsData.chargedOff) {
return 'loanStatusType.chargeoff';
}
+ if (this.isContractTermination(this.loanSubStatus)) {
+ return 'loanSubStatusType.contractTermination';
+ }
+ if (this.loanDetailsData.inArrears) {
+ return 'loanStatusType.activeOverdue';
+ }
return this.loanDetailsData.status.code;
}
+ loanStatusTooltip() {
+ if (this.loanDetailsData.chargedOff) {
+ return 'Chargeoff';
+ }
+ if (this.loanDetailsData.inArrears) {
+ return 'activeOverdue';
+ }
+ return this.loanDetailsData.status.code;
+ }
+
+ loanSubStatusTooltip() {
+ if (this.isContractTermination(this.loanSubStatus)) {
+ return 'contractTermination';
+ }
+ return '';
+ }
+
/**
* Delete loan Account
*/
@@ -375,4 +404,11 @@ export class LoansViewComponent implements OnInit {
.navigateByUrl(`/clients/${clientId}/loans-accounts`, { skipLocationChange: true })
.then(() => this.router.navigate([url]));
}
+
+ private isContractTermination(substatus: OptionData): boolean {
+ if (substatus == null) {
+ return false;
+ }
+ return substatus.code === 'loanSubStatus.loanSubStatusType.contractTermination';
+ }
}
diff --git a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
index 2b56f9885..5d1692ae4 100644
--- a/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
+++ b/src/app/loans/loans-view/transactions-tab/transactions-tab.component.ts
@@ -179,6 +179,7 @@ export class TransactionsTabComponent implements OnInit {
* REAGE:29
* REAMORTIZE:30
* INTEREST REFUND:33
+ * CONTRACT_TERMINATION:90
*/
showTransactions(transactionsData: LoanTransaction) {
if ([
@@ -195,7 +196,8 @@ export class TransactionsTabComponent implements OnInit {
29,
30,
31,
- 33
+ 33,
+ 90
].includes(transactionsData.type.id)) {
this.router.navigate([transactionsData.id], { relativeTo: this.route });
}
diff --git a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
index 339e12129..b050cd74d 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.html
@@ -22,7 +22,7 @@
- {{ 'Transaction Id' | translate }}
+ {{ 'Transaction Id' | translateKey: 'catalogs' }}
@@ -30,7 +30,7 @@
- {{ 'Repayment Transaction' | translate }}
+ {{ 'Repayment Transaction' | translateKey: 'catalogs' }}
@@ -40,15 +40,15 @@
- {{ 'Type' | translate }}
+ {{ 'Type' | translateKey: 'catalogs' }}
- {{ transactionData.type.value }}
+ {{ transactionData.type.value | translateKey: 'catalogs' }}
- {{ 'Transaction Date' | translate }}
+ {{ 'Transaction Date' | translateKey: 'catalogs' }}
@@ -56,7 +56,7 @@
- {{ 'Currency' | translate }}
+ {{ 'Currency' | translateKey: 'catalogs' }}
@@ -64,7 +64,7 @@
- {{ 'Amount' | translate }}
+ {{ 'Amount' | translateKey: 'catalogs' }}
@@ -108,7 +108,7 @@
| {{ 'labels.inputs.Amount' | translate }} |
- {{ transactionRel.amount | currency }} {{ transactionData.currency.code }}
+ {{ transactionRel.amount | currency: transactionData.currency.code : 'symbol-narrow' : '1.2-2' }}
|
|
diff --git a/src/app/pipes/status-lookup.pipe.ts b/src/app/pipes/status-lookup.pipe.ts
index 13cc8dcad..11e200d02 100644
--- a/src/app/pipes/status-lookup.pipe.ts
+++ b/src/app/pipes/status-lookup.pipe.ts
@@ -16,6 +16,8 @@ export class StatusLookupPipe implements PipeTransform {
'loanStatusType.active': 'status-active',
'loanStatusType.overpaid': 'status-overpaid',
'loanStatusType.chargeoff': 'status-chargeoff',
+ 'loanStatusType.activeOverdue': 'status-active-overdue',
+ 'loanSubStatusType.contractTermination': 'subStatus-contract-termination',
'savingsAccountStatusType.submitted.and.pending.approval': 'status-pending',
'savingsAccountStatusType.approved': 'status-approved',
'savingsAccountStatusType.active': 'status-active',
diff --git a/src/app/products/charges/create-charge/create-charge.component.html b/src/app/products/charges/create-charge/create-charge.component.html
index 12b7401c7..e68bf8104 100644
--- a/src/app/products/charges/create-charge/create-charge.component.html
+++ b/src/app/products/charges/create-charge/create-charge.component.html
@@ -199,8 +199,8 @@
{{ 'labels.inputs.Minimum Charge Cap' | translate }}
- {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
- chargeForm.controls.minCap.value
+ {{ 'errors.validation.msg.loanproduct.minimumGap.not.greater.than.specified.number' | translate }} ({{
+ chargeForm.controls.maxCap.value
}})
diff --git a/src/app/products/charges/edit-charge/edit-charge.component.html b/src/app/products/charges/edit-charge/edit-charge.component.html
index a7455d383..540997a01 100644
--- a/src/app/products/charges/edit-charge/edit-charge.component.html
+++ b/src/app/products/charges/edit-charge/edit-charge.component.html
@@ -114,8 +114,8 @@
{{ 'labels.inputs.Minimum Charge Cap' | translate }}
- {{ 'errors.validation.msg.loanproduct.maximumGap.not.greater.than.specified.number' | translate }} ({{
- chargeForm.controls.minCap.value
+ {{ 'errors.validation.msg.loanproduct.minimumGap.not.greater.than.specified.number' | translate }} ({{
+ chargeForm.controls.maxCap.value
}})
diff --git a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
index 2d173a839..e2608f4f9 100644
--- a/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
+++ b/src/app/products/loan-products/common/loan-product-summary/loan-product-summary.component.html
@@ -879,6 +879,11 @@
{{ 'labels.inputs.Income type' | translate }}:
{{ loanProduct.capitalizedIncomeType?.value | translateKey: 'catalogs' }}
+
+
+ {{ 'labels.inputs.Income type' | translate }}:
+ {{ loanProduct.capitalizedIncomeType?.value | translateKey: 'catalogs' }}
+