diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.html b/src/app/loans/loans-view/general-tab/general-tab.component.html
index 873f0450c..88bdef17f 100644
--- a/src/app/loans/loans-view/general-tab/general-tab.component.html
+++ b/src/app/loans/loans-view/general-tab/general-tab.component.html
@@ -23,33 +23,38 @@
- | Original |
- {{ ele.original | number }} |
+ Original |
+ {{ ele.original | currency }} |
- Paid |
- {{ ele.paid | number }} |
+ Paid |
+ {{ ele.paid | currency }} |
+
+
+
+ Credit Adjustments |
+ {{ ele.adjustment | currency }} |
- Waived |
- {{ ele.waived | number }} |
+ Waived |
+ {{ ele.waived | currency }} |
- Written Off |
- {{ ele.writtenOff | number }} |
+ Written Off |
+ {{ ele.writtenOff | currency }} |
- Outstanding |
- {{ ele.outstanding | number }} |
+ Outstanding |
+ {{ ele.outstanding | currency }} |
- Over Due |
- {{ ele.overdue | number }} |
+ Over Due |
+ {{ ele.overdue | currency }} |
@@ -176,17 +181,17 @@
Proposed Amount:
- {{ loanDetails.proposedPrincipal | number}}
+ {{ loanDetails.proposedPrincipal | currency}}
Approved Amount:
- {{ loanDetails.approvedPrincipal | number }}
+ {{ loanDetails.approvedPrincipal | currency }}
Disburse Amount:
- {{ loanDetails.principal | number }}
+ {{ loanDetails.principal | currency }}
diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.scss b/src/app/loans/loans-view/general-tab/general-tab.component.scss
index 6d8f631f5..b0aff4877 100644
--- a/src/app/loans/loans-view/general-tab/general-tab.component.scss
+++ b/src/app/loans/loans-view/general-tab/general-tab.component.scss
@@ -2,18 +2,18 @@
padding: 1%;
margin: 1%;
- h3{
- margin:1% auto;
+ h3 {
+ margin: 1% auto;
}
.performance-history-container {
- border: 1px solid;
- padding: 1%;
- margin-bottom: 20px ;
+ border: 1px solid;
+ padding: 1%;
+ margin-bottom: 20px;
}
table {
- width: 100%;
- margin-bottom: 20px;
+ width: 100%;
+ margin-bottom: 20px;
}
}
diff --git a/src/app/loans/loans-view/general-tab/general-tab.component.ts b/src/app/loans/loans-view/general-tab/general-tab.component.ts
index f961dd412..9c7a48d3f 100644
--- a/src/app/loans/loans-view/general-tab/general-tab.component.ts
+++ b/src/app/loans/loans-view/general-tab/general-tab.component.ts
@@ -16,6 +16,7 @@ export class GeneralTabComponent implements OnInit {
loanSummaryTableData: {
'property': string,
'original': string,
+ 'adjustment': string,
'paid': string,
'waived': string,
'writtenOff': string,
@@ -34,6 +35,14 @@ export class GeneralTabComponent implements OnInit {
constructor(private route: ActivatedRoute) {
this.route.parent.data.subscribe((data: { loanDetailsData: any, }) => {
this.loanDetails = data.loanDetailsData;
+ if (this.loanDetails.transactions) {
+ this.loanDetails.transactions.some((transaction: any) => {
+ if (transaction.type.code === 'loanTransactionType.chargeback') {
+ this.loanSummaryColumns = ['Empty', 'Original', 'Adjustments', 'Paid', 'Waived', 'Written Off', 'Outstanding', 'Over Due'];
+ return;
+ }
+ });
+ }
});
}
@@ -52,6 +61,7 @@ export class GeneralTabComponent implements OnInit {
{
'property': 'Principal',
'original': this.loanDetails.summary.principalDisbursed,
+ 'adjustment': this.loanDetails.summary.principalAdjustments || 0,
'paid': this.loanDetails.summary.principalPaid,
'waived': this.loanDetails.summary.principalWaived || 0,
'writtenOff': this.loanDetails.summary.principalWrittenOff,
@@ -62,6 +72,7 @@ export class GeneralTabComponent implements OnInit {
{
'property': 'Interest',
'original': this.loanDetails.summary.interestCharged,
+ 'adjustment': '0',
'paid': this.loanDetails.summary.interestPaid,
'waived': this.loanDetails.summary.interestWaived,
'writtenOff': this.loanDetails.summary.interestWrittenOff,
@@ -71,6 +82,7 @@ export class GeneralTabComponent implements OnInit {
{
'property': 'Fees',
'original': this.loanDetails.summary.feeChargesCharged,
+ 'adjustment': '0',
'paid': this.loanDetails.summary.feeChargesPaid,
'waived': this.loanDetails.summary.feeChargesWaived,
'writtenOff': this.loanDetails.summary.feeChargesWrittenOff,
@@ -80,6 +92,7 @@ export class GeneralTabComponent implements OnInit {
{
'property': 'Penalties',
'original': this.loanDetails.summary.penaltyChargesCharged,
+ 'adjustment': '0',
'paid': this.loanDetails.summary.penaltyChargesPaid,
'waived': this.loanDetails.summary.penaltyChargesWaived,
'writtenOff': this.loanDetails.summary.penaltyChargesWrittenOff,
@@ -89,6 +102,7 @@ export class GeneralTabComponent implements OnInit {
{
'property': 'Total',
'original': this.loanDetails.summary.totalExpectedRepayment,
+ 'adjustment': this.loanDetails.summary.principalAdjustments || 0,
'paid': this.loanDetails.summary.totalRepayment,
'waived': this.loanDetails.summary.totalWaived,
'writtenOff': this.loanDetails.summary.totalWrittenOff,
diff --git a/src/assets/styles/_align.scss b/src/assets/styles/_align.scss
index 3ad825aa0..2d1b30b8c 100644
--- a/src/assets/styles/_align.scss
+++ b/src/assets/styles/_align.scss
@@ -29,3 +29,11 @@
.center {
text-align: center !important;
}
+
+.amount-plus {
+ color: #000000;
+}
+
+.amount-minus {
+ color: #0f36e4;
+}