From 77f4c0ce8361989a8b38c660a966f7250dcab1ab Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Wed, 23 Aug 2017 15:22:28 -0400
Subject: [PATCH] LP#1708485: (follow-up) improve dest_courier_code support

This patch ensures that dest_courier_code is added to
the printer context; it also displays the courier code (if set)
on the transit modal and mentions dest_courier_code in the
inline documentation for transit and hold slips.

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2           | 3 +++
 .../src/templates/staff/share/print_templates/t_hold_transit_slip.tt2  | 1 +
 Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2  | 1 +
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js                 | 1 +
 4 files changed, 6 insertions(+)

diff --git a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
index 2562e6afc8..d2f4c99e0e 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
@@ -10,6 +10,9 @@
         <span>[% l('Destination') %]</span>
         <strong>{{dest_location.shortname}}</strong>
       </div>
+      <div ng-if="dest_courier_code">
+        <span>{{dest_courier_code}}</span>
+      </div>
       <br/>
       <div>
         <address>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
index a0aa6ef501..ad6688c268 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
@@ -8,6 +8,7 @@ Template for printing hold transit slips. Fields include:
 * dest_address.city
 * dest_address.state
 * dest_address.post_code
+* dest_courier_code - from lib.courier_code library setting
 * hold.behind_desk
 * copy.barcode
 * title
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
index ccf9e8c05d..8ddae19a38 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
@@ -8,6 +8,7 @@ Template for printing a transit slip. Fields include:
 * dest_address.city
 * dest_address.state
 * dest_address.post_code
+* dest_courier_code - from lib.courier_code library setting
 * copy.barcode
 * title
 * author
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 c878e8f8a6..8ed2a355e7 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
@@ -1445,6 +1445,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
                 // route_dialog includes the "route to holds shelf" 
                 // dialog, which has no transit
                 print_context.transit = egCore.idl.toHash(data.transit);
+                print_context.dest_courier_code = data.dest_courier_code;
                 if (data.address) {
                     print_context.dest_address = egCore.idl.toHash(data.address);
                 }
-- 
2.11.0