support patron alias in hold/transit slip, and fix a bug where patron name was not...

git-svn-id: svn://svn.open-ils.org/ILS/trunk@11802 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index cffda55..3f23317 100644 (file)
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -2047,7 +2047,11 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                                msg += '\n';
                                                var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
                                                msg += '\n';
-                                               msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                        if (au_obj.alias()) {
+                                               msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
+                        } else {
+                                               msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron',  [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                        }
                                                msg += '\n';
                                                msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
                                                msg += '\n';
@@ -2177,7 +2181,11 @@ circ.util.checkin_via_barcode2 = function(session,params,backdate,auto_print,che
                                JSAN.use('patron.util');
                                var au_obj = patron.util.retrieve_fleshed_au_via_id( session, check.payload.hold.usr() );
                                msg += '\n';
-                               document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                if (au_obj.alias()) {
+                    msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron_alias',  [au_obj.alias()]);
+                } else {
+                               msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.patron', [au_obj.family_name(), au_obj.first_given_name(), au_obj.second_given_name()]);
+                }
                                msg += '\n';
                                msg += document.getElementById('circStrings').getFormattedString('staff.circ.utils.payload.hold.barcode', [au_obj.card().barcode()]);
                                msg += '\n';

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 b9c5caa..f9103b1 100644 (file)
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -290,6 +290,7 @@ staff.circ.utils.payload.hold.barcode=Barcode: %1$s
 staff.circ.utils.payload.hold.title=Title: %1$s
 # Hold for patron familyName, firstName secondName
 staff.circ.utils.payload.hold.patron=Hold for patron %1$s, %2$s %3$s
+staff.circ.utils.payload.hold.patron_alias=Hold for patron %1$s
 staff.circ.utils.payload.hold.phone_notify=Notify by phone: %1$s
 staff.circ.utils.payload.hold.email_notify=Notify by email: %1$s
 staff.circ.utils.payload.hold.request_date=Request Date: %1$s