From cbeaec4b531f92a7a8daac082a02cc71e27e27c4 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>
---
 .../staff/circ/share/t_transit_dialog.tt2          |  3 +++
 .../share/print_templates/t_hold_transit_slip.tt2  | 24 ++++++++++++++++++++++
 .../staff/share/print_templates/t_transit_slip.tt2 | 15 ++++++++++++++
 .../web/js/ui/default/staff/circ/services/circ.js  |  1 +
 4 files changed, 43 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 e8370bc8c5..98af0417d6 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
@@ -1,3 +1,27 @@
+<!--
+Template for printing hold transit slips. Fields include:
+
+* dest_location.name - name of destination library
+* dest_location.shortname
+* dest_address.street1
+* dest_address.street2
+* 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
+* patron.family_name
+* patron.first_given_name
+* patron.second_given_name
+* patron.card.barcode
+* hold.request_time
+* hold.phone_notify
+* hold.sms_notify
+* hold.email_notify
+
+-->
 <div style="text-align:center;font-weight:bold;font-size:4em;">{{dest_courier_code}}</div>
 <div style="text-align:center;font-weight:bold;font-size:2.5em;">{{dest_location.shortname}}</div>
 <br/>
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 a16662a1e4..e29f8148d7 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
@@ -1,3 +1,18 @@
+<!--
+Template for printing a transit slip. Fields include:
+
+* dest_location.name - name of destination library
+* dest_location.shortname
+* dest_address.street1
+* dest_address.street2
+* dest_address.city
+* dest_address.state
+* dest_address.post_code
+* dest_courier_code - from lib.courier_code library setting
+* copy.barcode
+* title
+* author
+-->
 <div style="text-align:center;font-weight:bold;font-size:4em;">{{dest_courier_code}}</div>
 <div style="text-align:center;font-weight:bold;font-size:2.5em;">{{dest_location.shortname}}</div>
 <br/>
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 e28007cef8..c0b0f4811f 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
@@ -1423,6 +1423,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