[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. 77f4c0ce8361989a8b38c660a966f7250dcab1ab

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  77f4c0ce8361989a8b38c660a966f7250dcab1ab (commit)
       via  72797023ee7bebbf1252a9c8eff1724386a4d163 (commit)
      from  f3064bcee06c2ae30291293ab9dae8f84edcb625 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 77f4c0ce8361989a8b38c660a966f7250dcab1ab
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Aug 23 15:22:28 2017 -0400

    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 at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 2562e6a..d2f4c99 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 a0aa6ef..ad6688c 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 ccf9e8c..8ddae19 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 c878e8f..8ed2a35 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);
                 }

commit 72797023ee7bebbf1252a9c8eff1724386a4d163
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Wed Aug 9 14:30:43 2017 -0400

    LP#1708485 - Add courier code variable to transit slips.
    
    This code, developed by Bill Erickson, creates a variable/macro
    for {{dest_courier_code}} for receipt templates in the web client.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

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 9e0ed5e..c878e8f 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
@@ -1397,10 +1397,20 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
             );
         }
 
+
         if (!tmpl.match(/hold_shelf/)) {
+            var courier_deferred = $q.defer();
+            promises.push(courier_deferred.promise);
             promises.push(
                 service.find_copy_transit(evt, params, options)
-                .then(function(trans) {data.transit = trans})
+                .then(function(trans) {
+                    data.transit = trans;
+                    egCore.org.settings('lib.courier_code', trans.dest().id())
+                    .then(function(s) {
+                        data.dest_courier_code = s['lib.courier_code'];
+                        courier_deferred.resolve();
+                    });
+                })
             );
         }
 

-----------------------------------------------------------------------

Summary of changes:
 .../staff/circ/share/t_transit_dialog.tt2          |    3 +++
 .../share/print_templates/t_hold_transit_slip.tt2  |    1 +
 .../staff/share/print_templates/t_transit_slip.tt2 |    1 +
 .../web/js/ui/default/staff/circ/services/circ.js  |   13 ++++++++++++-
 4 files changed, 17 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS