From 51ca2cc1212cfae38712523d090df118b873e589 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 28 May 2014 16:46:09 -0400
Subject: [PATCH] bill page; use mbt not mobts

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 .../templates/staff/circ/patron/t_bills_list.tt2   |  8 +++---
 .../web/js/ui/default/staff/circ/patron/bills.js   | 31 +++++++++++++---------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
index 241869eae2..d090ae3e51 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_bills_list.tt2
@@ -1,6 +1,6 @@
 
 <eg-grid
-  idl-class="mobts"
+  idl-class="mbt"
   query="gridQuery"
   sort="gridSort"
   activate-item="activateBill"
@@ -47,11 +47,11 @@
   <eg-grid-action label="[% l('Full Details') %]" 
     handler="showFullDetails"></eg-grid-action>
 
-  <eg-grid-field label="[% ('Balance Owed') %]" path='balance_owed'></eg-grid-field>
+  <eg-grid-field label="[% ('Balance Owed') %]" path='summary.balance_owed'></eg-grid-field>
   <eg-grid-field label="[% ('Bill #') %]" path='id'></eg-grid-field>
   <eg-grid-field label="[% ('Start') %]" path='xact_start'></eg-grid-field>
-  <eg-grid-field label="[% ('Total Billed') %]" path='total_owed'></eg-grid-field>
-  <eg-grid-field label="[% ('Total Paid') %]" path='total_paid'></eg-grid-field>
+  <eg-grid-field label="[% ('Total Billed') %]" path='summary.total_owed'></eg-grid-field>
+  <eg-grid-field label="[% ('Total Paid') %]" path='summary.total_paid'></eg-grid-field>
   <eg-grid-field label="[% ('Type') %]" path='xact_type'></eg-grid-field>
 
   <eg-grid-field label="[% l('Title') %]" name="title"
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index b7a4fce19c..b0bf85a5a3 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -128,7 +128,7 @@ function($q , egCore , patronSvc) {
             'mbt', id, service.xactFlesh, {authoritative : true}
         ).then(function(xact) {
 
-            /* mobts has location, but mbts does not
+            /* mobts has billing_location, but mbts does not
              * only the xact detail page shows it now, so maybe move
              * this into the template...
              *
@@ -204,9 +204,6 @@ function($q , egCore , patronSvc) {
 function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
          egGridDataProvider , billSvc , patronSvc , egPromptDialog , $modal) {
 
-    // TODO: move to fetching "mbt"+summary instead of "mobts" for
-    // consistency
-
     $scope.initTab('bills', $routeParams.id);
     billSvc.userId = $routeParams.id;
 
@@ -217,7 +214,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     $scope.focus_payment = true;
     $scope.annotate_payment = false;
     $scope.gridRevision = 0;
-    var allItems = []; // all grid items (flattened mobts)
+    var allItems = []; // all grid items (flattened mbt's)
     var selectedItems = []; // selected grid items
 
     billSvc.fetchSummary().then(function(s) {$scope.summary = s});
@@ -240,9 +237,9 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     function selected_payment_info() {
         var info = {owed : 0, billed : 0, paid : 0};
         angular.forEach(selectedItems, function(item) {
-            info.owed   += Number(item.balance_owed) * 100;
-            info.billed += Number(item.total_owed) * 100;
-            info.paid   += Number(item.total_paid) * 100;
+            info.owed   += Number(item['summary.balance_owed']) * 100;
+            info.billed += Number(item['summary.total_owed']) * 100;
+            info.paid   += Number(item['summary.total_paid']) * 100;
         });
         info.owed /= 100;
         info.billed /= 100;
@@ -268,13 +265,18 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     $scope.refunds_available = function() {
         var amount = 0;
         angular.forEach(allItems, function(item) {
-            if (item.balance_owed < 0) 
-                amount += item.balance_owed * 100;
+            if (item['summary.balance_owed'] < 0) 
+                amount += item['summary.balance_owed'] * 100;
         });
         return -(amount / 100);
     }
 
-    var query = {usr : billSvc.userId, balance_owed : {'<>' : 0}};
+    var query = {
+        usr : billSvc.userId, 
+        xact_finish : null,
+        'summary.balance_owed' : {'<>' : 0}
+    };
+
     $scope.gridQuery = function() {return query};
     $scope.gridSort = ['xact_start']; // default sort
 
@@ -306,7 +308,7 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
 
         for (var i = 0; i < selectedItems.length; i++) { // for/break
             var item = selectedItems[i];
-            var owed = Number(item.balance_owed);
+            var owed = Number(item['summary.balance_owed']);
 
             if (payment_amount > owed) {
                 // pending payment exceeds balance of current item.
@@ -450,7 +452,10 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
     // then clicking Apply Payment -- this just adds a speed bump (ditto
     // the XUL client).
     $scope.refundXact = function(all) {
-        var items = all.filter(function(item) {return item.balance_owed < 0});
+        var items = all.filter(function(item) {
+            return item['summary.balance_owed'] < 0
+        });
+
         if (items.length == 0) return;
 
         var ids = items.map(function(item) {return item.id});
-- 
2.11.0