From c95e4d3165c79ab5bfbc6171752904b2cf2195be Mon Sep 17 00:00:00 2001
From: Terran McCanna <tmccanna@georgialibraries.org>
Date: Wed, 12 Dec 2018 15:12:56 -0500
Subject: [PATCH] LP 1743783 Billing Location

Fix for missing billing location on full bill details page.
Will also be submitting to Evergreen community as bug fix.

Signed-off-by: Terran McCanna <tmccanna@georgialibraries.org>
---
 Open-ILS/src/templates/staff/circ/patron/t_xact_details.tt2 | 2 +-
 Open-ILS/web/js/ui/default/staff/circ/services/billing.js   | 7 ++++---
 2 files changed, 5 insertions(+), 4 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..fec94e5cdc 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>
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..214fc571ac 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']
+                bre : ['simple_record'],
+                mg : ['billing_location']
             },
             select : {bre : ['id']}}, // avoid MARC
             {authoritative : true}
-- 
2.11.0