[open-ils-commits] r14083 - in trunk/Open-ILS/xul/staff_client: chrome/content/OpenILS server/circ server/locale/en-US (phasefx)

[svn at svn.open-ils.org]

Author: phasefx
Date: 2009-09-22 12:11:51 -0400 (Tue, 22 Sep 2009)
New Revision: 14083

Modified:
   trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
   trunk/Open-ILS/xul/staff_client/server/circ/util.js
   trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
Log:
This I18N'izes the string "HOLDS SHELF", and adds "PUBLIC HOLDS SHELF" and "PRIVATE HOLDS SHELF".

The latter two get used if the org unit setting circ.holds.behind_desk_pickup_supported is set to true, and more specifically, PRIVATE HOLDS SHELF gets used if the hold user has a user setting of circ.holds_behind_desk



Modified: trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2009-09-22 05:21:59 UTC (rev 14082)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2009-09-22 16:11:51 UTC (rev 14083)
@@ -349,7 +349,7 @@
 				},
                 'hold_slip' : {
 					'type' : 'holds',
-					'header' : 'This item needs to be routed to <b>HOLDS SHELF</b>:<br/>\r\n',
+					'header' : 'This item needs to be routed to <b>%route_to%</b>:<br/>\r\n',
                     'line_item' : 'Barcode: %item_barcode%<br/>\r\nTitle: %item_title%<br/>\r\n<br/>\r\n%hold_for_msg%<br/>\r\nBarcode: %PATRON_BARCODE%<br/>\r\nNotify by phone: %notify_by_phone%<br/>\r\nNotify by email: %notify_by_email%<br/>\r\n<br/>\r\nRequest date: <br/>\r\n',
                     'footer' : 'Slip Date: %TODAY_TRIM%<br/>\r\nPrinted by %STAFF_FIRSTNAME% at %SHORTNAME%<br/>\r\n<br/>\r\n'
                 },

Modified: trunk/Open-ILS/xul/staff_client/server/circ/util.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-09-22 05:21:59 UTC (rev 14082)
+++ trunk/Open-ILS/xul/staff_client/server/circ/util.js	2009-09-22 16:11:51 UTC (rev 14083)
@@ -2237,7 +2237,7 @@
 					}
 				break;
 				case 8: /* ON HOLDS SHELF */
-					check.route_to = 'HOLDS SHELF';
+                    check.route_to = document.getElementById('circStrings').getString('staff.circ.route_to.hold_shelf');
 					if (check.payload.hold) {
 						if (check.payload.hold.pickup_lib() != data.list.au[0].ws_ou()) {
 							var err_msg = document.getElementById('commonStrings').getString('common.error');
@@ -2249,6 +2249,20 @@
 						} else {
 							print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
                             print_data.route_to = check.route_to;
+                            var behind_the_desk_support = String( data.hash.aous['circ.holds.behind_desk_pickup_supported'] ) == 'true';
+                            if (behind_the_desk_support) {
+                               var usr_settings = network.simple_request('FM_AUS_RETRIEVE',[ses(),check.payload.hold.usr()]); 
+                                if (typeof usr_settings['circ.holds_behind_desk'] != 'undefined') {
+                                    print_data.prefer_behind_holds_desk = true;
+                                    check.route_to = document.getElementById('circStrings').getString('staff.circ.route_to.private_hold_shelf');
+                                    print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+                                    print_data.route_to = check.route_to;
+                                } else {
+                                    check.route_to = document.getElementById('circStrings').getString('staff.circ.route_to.public_hold_shelf');
+                                    print_data.route_to_msg = document.getElementById('circStrings').getFormattedString('staff.circ.utils.route_to.msg', [check.route_to]);
+                                    print_data.route_to = check.route_to;
+                                }
+                            }
                             msg += print_data.route_to_msg;
 							msg += '\n';
 						}

Modified: trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-09-22 05:21:59 UTC (rev 14082)
+++ trunk/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties	2009-09-22 16:11:51 UTC (rev 14083)
@@ -156,6 +156,9 @@
 staff.circ.hold_capture.no_external=circ.hold_capture: No external .on_hold_capture()
 staff.circ.hold_capture.capture_failed=Could not capture hold.
 staff.circ.hold_capture.error=FIXME: need special alert and error handling
+staff.circ.route_to.hold_shelf=HOLD SHELF
+staff.circ.route_to.public_hold_shelf=PUBLIC HOLD SHELF
+staff.circ.route_to.private_hold_shelf=PRIVATE HOLD SHELF
 staff.circ.in_house_use.tab_name=In-House Use
 staff.circ.in_house_use.barcode=Barcode:
 staff.circ.in_house_use.noncat_sort_error=error in noncat sorting: