LP1904036 Transaction details total billed/paid fixes

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
index 7324746..227f603 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.html
@@ -19,7 +19,7 @@
       </a>
     </div>
     <div class="col-lg-2" i18n>Total Billed</div>
-    <div class="col-lg-1">{{statement.summary.billing_total | currency}}</div>
+    <div class="col-lg-1">{{totalBilled() | currency}}</div>
     <div class="col-lg-2" i18n>Title</div>
     <div class="col-lg-3">
       <ng-container *ngIf="statement.title_id">
@@ -37,7 +37,7 @@
       <span *ngIf="!statement.xact.circulation()" i18n>Grocery</span>
     </div>
     <div class="col-lg-2" i18n>Total Paid / Credited</div>
-    <div class="col-lg-1">{{statement.payment_total | currency}}</div>
+    <div class="col-lg-1">{{statement.summary.payment_total | currency}}</div>
     <div class="col-lg-2" i18n>Checked Out</div>
     <div class="col-lg-3">
       <ng-container *ngIf="statement.xact.circulation()">
@@ -49,7 +49,7 @@
     <div class="col-lg-2" i18n>Started</div>
     <div class="col-lg-2">{{statement.xact.xact_start() | date:'short'}}</div>
     <div class="col-lg-2" i18n>Balance Due</div>
-    <div class="col-lg-1">{{statement.balance_due | currency}}</div>
+    <div class="col-lg-1">{{statement.summary.balance_due | currency}}</div>
     <div class="col-lg-2" i18n>Due Date</div>
     <div class="col-lg-3">
       <ng-container *ngIf="statement.xact.circulation()">

diff --git a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
index a9c2762..2dcbfbe 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/circ/patron/bill-statement.component.ts
@@ -165,5 +165,14 @@ export class BillStatementComponent implements OnInit {
             return this.statement.xact.circulation().target_copy();
         }
     }
+
+    totalBilled(): number {
+        if (!this.statement) { return 0; }
+
+        const billed = (this.statement.summary.billing_total || 0) * 100;
+        const voided = (this.statement.summary.void_total || 0) * 100;
+
+        return (billed - voided) / 100;
+    }
 }