From: Jeff Godin <jgodin@tadl.org>
Date: Mon, 10 Oct 2011 20:30:38 +0000 (-0400)
Subject: Add LIBRARY_PHONE, LIBRARY_EMAIL receipt macros
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=8934953a3976afc3043a7c4f004847c675095873;p=working%2FEvergreen.git

Add LIBRARY_PHONE, LIBRARY_EMAIL receipt macros

Add two new receipt template macros:
%LIBRARY_PHONE%
%LIBRARY_EMAIL%

These correspond with the phone and email attributes for the
workstation's OU -- the same OU used by the existing %LIBRARY%
and %SHORTNAME% macros.
---

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/print.js b/Open-ILS/xul/staff_client/chrome/content/util/print.js
index bb3b6116eb..4df451d00d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -329,6 +329,10 @@ util.print.prototype = {
 
             try{b = s; s = s.replace(/%LIBRARY%/g,this.escape_html(params.lib.name()));}
                 catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+            try{b = s; s = s.replace(/%LIBRARY_PHONE%/g,this.escape_html(params.lib.phone()));}
+                catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+            try{b = s; s = s.replace(/%LIBRARY_EMAIL%/g,this.escape_html(params.lib.email()));}
+                catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
             try{b = s; s = s.replace(/%PINES_CODE%/g,this.escape_html(params.lib.shortname()));}
                 catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
             try{b = s; s = s.replace(/%SHORTNAME%/g,this.escape_html(params.lib.shortname()));}
diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
index 352d0c650f..b7e3123823 100644
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.js
@@ -262,7 +262,7 @@ circ.print_list_template_editor.prototype = {
                                             + '<h1>' 
                                             + document.getElementById('circStrings').getString('staff.circ.print_list_template.window.heading')
                                             + '</h1>'
-                                            + '<p>%LIBRARY%, %SHORTNAME%, %LINE_NO%, '
+                                            + '<p>%LIBRARY%, %LIBRARY_PHONE%, %LIBRARY_EMAIL%, %SHORTNAME%, %LINE_NO%, '
                                             + '%STAFF_FIRSTNAME%, %STAFF_LASTNAME%, %STAFF_BARCODE%, %STAFF_PROFILE%, '
                                             + '%PATRON_FIRSTNAME%, %PATRON_ALIAS%, %PATRON_ALIAS_OR_FIRSTNAME%, %PATRON_LASTNAME%, '
                                             + '%PATRON_BARCODE%, %patron_barcode%, '