From: Dan Pearl <dpearl@cwmars.org>
Date: Wed, 19 Jun 2013 14:34:46 +0000 (-0400)
Subject: LP#1192267 Add support for %pickup_lib_shortname% in hold receipts.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fdpearl%2Fmacros;p=working%2FEvergreen.git

LP#1192267 Add support for %pickup_lib_shortname% in hold receipts.

This change will allow use of the above-named macro to allow librarians
to correctly route items to the appropriate location when receiving a
delivery.  Some examples: Bookmobile, children's room, etc.

Signed-off-by: Dan Pearl <dpearl@cwmars.org>
---

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 9c41675b60..d66e8c21f7 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2970,6 +2970,8 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
             'notify_by_email_msg' : '',
             'notify_by_text' : '',
             'notify_by_text_msg' : '',
+            'pickup_lib_shortname' : '',
+            'pickup_lib_shortname_msg' : '',
             'request_date' : '',
             'request_date_msg' : '',
             'shelf_expire_time' : '',
@@ -3098,6 +3100,12 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                         print_data.item_barcode = check.payload.copy.barcode();
                         msg += print_data.item_barcode_msg;
                         msg += '\n';
+                        var pu_lib = data.hash.aou[ check.payload.hold.pickup_lib() ]; 
+                        var pu_lib_shortname = pu_lib.shortname(); 
+                        print_data.pickup_lib_shortname_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.pickup_lib_shortname', pu_lib_shortname);
+                        print_data.pickup_lib_shortname = pu_lib_shortname;
+                        msg += print_data.pickup_lib_shortname_msg;
+                        msg += '\n';
                         var payload_title  = (check.payload.record ? check.payload.record.title() : check.payload.copy.dummy_title() );
                         print_data.item_title_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.title', [payload_title]);
                         print_data.item_title = payload_title;
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index cf4ae70781..15cdb80b1f 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -360,6 +360,7 @@ staff.circ.utils.route_item_status_error=status of Holds Shelf, but no actual ho
 staff.circ.utils.reservation_status_error=status of Reservation Shelf, but no actual hold found.
 staff.circ.utils.payload.hold.barcode=Barcode: %1$s
 staff.circ.utils.payload.hold.title=Title: %1$s
+staff.circ.utils.payload.hold.pickup_lib_shortname=Pickup Lib: %1$s
 staff.circ.utils.ahr_mint_condition=Copy Quality
 staff.circ.utils.ahr_mint_condition.true=Good
 staff.circ.utils.ahr_mint_condition.false=Any