LP#1743783 Web Client Bill Full Detail Display Issues

Fleshes out retrieved data to be able to display the billing
location for both circulation and grocery bills on the full
details page as well as the owning library for circulation bills.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
index 9e83fe3..38ca7a9 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2
@@ -2,7 +2,7 @@
 
 <div class="row">
   <div class="col-md-2 strong-text">[% l('Billing Location') %]</div>
-  <div class="col-md-2">{{xact.billing_location().shortname()}}</div>
+  <div class="col-md-2">{{xact.grocery().billing_location().shortname()||xact.circulation().circ_lib().shortname()}}</div>
   <div class="col-md-2 strong-text">[% l('Total Billed') %]</div>
   <div class="col-md-2">{{xact.summary().total_owed() | currency}}</div>
   <div class="col-md-2 strong-text">[% l('Title') %]</div>
@@ -103,6 +103,12 @@
       {{total_circs}}
     </div>
   </div>
+  <div class="row">
+    <div class="col-md-2 strong-text">[% l('Owning Library') %]</div>
+    <div class="col-md-2">
+      {{xact.circulation().target_copy().call_number().owning_lib().shortname()}}
+    </div>
+  </div>
 </div>
 
 

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
index 9a2efb6..50e4a05 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/billing.js
@@ -14,13 +14,14 @@ function($modal , $q , egCore) {
     // fetch a fleshed money.billable_xact
     service.fetchXact = function(xact_id) {
         return egCore.pcrud.retrieve('mbt', xact_id, {
-            flesh : 5,
+            flesh : 6,
             flesh_fields : {
                 mbt : ['summary','circulation','grocery','reservation'],
-                circ: ['target_copy'],
+                circ: ['target_copy', 'circ_lib'],
                 acp : ['call_number','location','status','age_protect'],
-                acn : ['record'],
-                bre : ['simple_record']
+                acn : ['record','owning_lib'],
+                bre : ['simple_record'],
+                mg : ['billing_location']
             },
             select : {bre : ['id']}}, // avoid MARC
             {authoritative : true}