From f207960e70e76b0ac2b71dee772d9cf946cc01eb Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 12 Dec 2018 17:57:19 -0500
Subject: [PATCH] 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>
Signed-off-by: John Amundson <jamundson@cwmars.org>
Signed-off-by: Jason Stephenson <jason@sigio.com>
---
 .../src/templates/staff/circ/patron/t_xact_details.tt2   | 8 +++++++-
 .../web/js/ui/default/staff/circ/services/billing.js     | 9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

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 0be1f7d90b..1ea6fd176d 100644
--- 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>
 
 <hr/>
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 8c1c406f31..048e9d78a6 100644
--- 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($uibModal , $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}
-- 
2.43.2