+
+
+ {{"labels.inputs.Reason" | translate}}
+
+
+
+
{{"labels.inputs.External Id" | translate}}
diff --git a/src/app/loans/loans-view/loan-account-actions/loan-reamortize/loan-reamortize.component.ts b/src/app/loans/loans-view/loan-account-actions/loan-reamortize/loan-reamortize.component.ts
index 58d3453ae..54de24bc2 100644
--- a/src/app/loans/loans-view/loan-account-actions/loan-reamortize/loan-reamortize.component.ts
+++ b/src/app/loans/loans-view/loan-account-actions/loan-reamortize/loan-reamortize.component.ts
@@ -28,6 +28,7 @@ export class LoanReamortizeComponent implements OnInit {
createReAmortizeLoanForm() {
this.reamortizeLoanForm = this.formBuilder.group({
+ 'note': '',
'externalId': ''
});
}
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 1d5e89d9d..4af57be3b 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
@@ -112,9 +112,11 @@ export class TransactionsTabComponent implements OnInit {
* GOODWILL_CREDIT:23
* CHARGE_ADJUSTMENT:26
* DOWN_PAYMENT:28
+ * REAGE:29
+ * REAMORTIZE:30
*/
showTransactions(transactionsData: any) {
- if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28].includes(transactionsData.type.id)) {
+ if ([1, 2, 4, 9, 20, 21, 22, 23, 26, 28, 29, 30].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.ts b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
index 12a782aec..d9900bc1c 100644
--- a/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
+++ b/src/app/loans/loans-view/transactions/view-transaction/view-transaction.component.ts
@@ -33,6 +33,7 @@ export class ViewTransactionComponent implements OnInit {
/** Transaction data. */
transactionData: any;
+ transactionType: LoanTransactionType;
/** Is Editable */
allowEdition = true;
/** Is Undoable */
@@ -72,9 +73,10 @@ export class ViewTransactionComponent implements OnInit {
private alertService: AlertService) {
this.route.data.subscribe((data: { loansAccountTransaction: any }) => {
this.transactionData = data.loansAccountTransaction;
+ this.transactionType = this.transactionData.type;
this.allowEdition = !this.transactionData.manuallyReversed && !this.allowTransactionEdition(this.transactionData.type.id);
this.allowUndo = !this.transactionData.manuallyReversed;
- this.allowChargeback = this.allowChargebackTransaction(this.transactionData.type) && !this.transactionData.manuallyReversed;
+ this.allowChargeback = this.allowChargebackTransaction(this.transactionType) && !this.transactionData.manuallyReversed;
let transactionsChargebackRelated = false;
if (this.allowChargeback) {
if (this.transactionData.transactionRelations) {
@@ -89,13 +91,13 @@ export class ViewTransactionComponent implements OnInit {
});
this.amountRelationsAllowed = this.transactionData.amount - amountRelations;
this.isFullRelated = (this.amountRelationsAllowed === 0);
- this.allowChargeback = this.allowChargebackTransaction(this.transactionData.type) && !this.isFullRelated;
+ this.allowChargeback = this.allowChargebackTransaction(this.transactionType) && !this.isFullRelated;
}
}
if (!this.allowChargeback) {
this.allowEdition = false;
}
- if (this.existTransactionRelations && transactionsChargebackRelated) {
+ if ((this.existTransactionRelations && transactionsChargebackRelated) || this.transactionType.reAge || this.transactionType.reAmortize) {
this.allowUndo = false;
}
});