From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 30 Jun 2014 15:08:09 +0000 (-0400)
Subject: renew item
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=14f754ada3bdbb741f5edf71235a0b1327b9080e;p=working%2FEvergreen.git

renew item

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
index 6559ce7438..41401f1eea 100644
--- a/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_checkin_table.tt2
@@ -30,7 +30,7 @@
     path="acp.alert_message"></eg-grid-field>
 
   <eg-grid-field label="[% l('Balance Owed') %]"     
-    path='circ.billable_transaction.summary.balance_owed'></eg-grid-field>
+    path='mbts.balance_owed'></eg-grid-field>
 
   <eg-grid-field label="[% l('Barcode') %]" path="acp_barcode">
     <!-- FIXME: ng-if / ng-disabled not working since the contents 
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
index ea8efe5d01..2d0dbe21d0 100644
--- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2
@@ -46,7 +46,7 @@
   main-label="[% l('Items Checked In') %]"
   items-provider="gridDataProvider"
   grid-controls="gridControls"
-  persist-key="circ.checkin">
+  persist-key="circ.renew">
 
   <eg-grid-action 
     handler="fetchLastCircPatron"
@@ -69,7 +69,7 @@
     path="acp.alert_message"></eg-grid-field>
 
   <eg-grid-field label="[% l('Balance Owed') %]"     
-    path='circ.billable_transaction.summary.balance_owed'></eg-grid-field>
+    path='mbts.balance_owed'></eg-grid-field>
 
   <eg-grid-field label="[% l('Barcode') %]" path="acp_barcode">
     <!-- FIXME: ng-if / ng-disabled not working since the contents 
@@ -85,29 +85,20 @@
     path='circ.id'></eg-grid-field>
 
   <eg-grid-field label="[% l('Call Number') %]" 
-    path="acn.label" hidden></eg-grid-field>
+    path="acn.label"></eg-grid-field>
 
   <eg-grid-field label="[% l('Due Date') %]"    
-    path='circ.due_date' dateformat='short' hidden></eg-grid-field>
-
-  <eg-grid-field label="[% l('Checkin Date') %]"    
-    path='circ.checkin_time' dateformat='short'></eg-grid-field>
+    path='circ.due_date' dateformat='short'></eg-grid-field>
 
   <eg-grid-field label="[% l('Family Name') %]"    
     path='au.family_name'></eg-grid-field>
 
-  <eg-grid-field label="[% l('Finish') %]"    
-    path='circ.stop_fines_time'></eg-grid-field>
-
   <eg-grid-field label="[% l('Location') %]" 
     path='acp.location.name'> </eg-grid-field>
 
   <eg-grid-field label="[% l('Remaining Renewals') %]" 
     path='circ.renewal_remaining'></eg-grid-field>
 
-  <eg-grid-field label="[% l('Start') %]" 
-    path='circ.xact_start'></eg-grid-field>
-
   <eg-grid-field label="[% l('Title') %]" path="title">
     <a target="_self" href="[% ctx.base_path %]/opac/record/{{record.doc_id()}}">
       {{item.title}}
diff --git a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js
index 5a960bd097..54d7a6372e 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js
@@ -38,7 +38,7 @@ function($scope , egCore , egGridDataProvider , egCirc) {
     $scope.renewals = [];
 
     var today = new Date();
-    $scope.renewalsArgs = {due_date : today};
+    $scope.renewalArgs = {due_date : today};
 
     $scope.gridDataProvider = egGridDataProvider.instance({
         get : function(offset, count) {
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index e3f1be3328..ca5b31165b 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -217,6 +217,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
         if (!payload) return;
 
         data.circ = payload.circ;
+        data.parent_circ = payload.parent_circ;
         data.hold = payload.hold;
         data.record = payload.record;
         data.acp = payload.copy;
@@ -230,9 +231,14 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
         data.isbn = final_resp.evt.isbn;
         data.route_to = final_resp.evt.route_to;
 
+        // for checkin, the mbts lives on the main circ
         if (payload.circ && payload.circ.billable_transaction())
             data.mbts = payload.circ.billable_transaction().summary();
 
+        // on renewals, the mbts lives on the parent circ
+        if (payload.parent_circ && payload.parent_circ.billable_transaction())
+            data.mbts = payload.parent_circ.billable_transaction().summary();
+
         if (!data.route_to) {
             if (data.transit) {
                 data.route_to = data.transit.dest().shortname();
@@ -477,6 +483,14 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) {
             transit.dest(egCore.org.get(transit.dest()));
         }
 
+        // TODO: renewal responses should include the patron
+        if (!payload.patron && payload.circ) {
+            promises.push(
+                egCore.pcrud.retrieve('au', payload.circ.usr())
+                .then(function(user) {payload.patron = user})
+            );
+        }
+
         // extract precat values
         evt.title = payload.record ? payload.record.title() : 
             (payload.copy ? payload.copy.dummy_title() : null);