From e614720c66908cf3be3c17e676ce698df7166a03 Mon Sep 17 00:00:00 2001
From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 25 Aug 2008 16:44:37 +0000
Subject: [PATCH] extra patron macro for all receipts fed a patron object, and
 Current Copy Location for hold lists

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2_3@10439 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/xul/staff_client/chrome/content/util/print.js | 2 ++
 Open-ILS/xul/staff_client/server/circ/util.js          | 5 +++++
 2 files changed, 7 insertions(+)

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 b53c61964b..4c81e6a0d3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/print.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/print.js
@@ -166,6 +166,8 @@ util.print.prototype = {
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_FIRSTNAME%/,params.patron.first_given_name());}
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
+		try{b = s; s = s.replace(/%PATRON_MIDDLENAME%/,params.patron.second_given_name());}
+			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_LASTNAME%/,params.patron.family_name());}
 			catch(E){s = b; this.error.sdump('D_WARN','string = <' + s + '> error = ' + js2JSON(E)+'\n');}
 		try{b = s; s = s.replace(/%PATRON_BARCODE%/,typeof params.patron.card() == 'object' ? params.patron.card().barcode() : util.functional.find_id_object_in_list( params.patron.cards(), params.patron.card() ).barcode() ) ;}
diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 41fa873af6..2ceb9f7635 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -782,6 +782,11 @@ circ.util.hold_columns = function(modify,params) {
 			'primary' : false, 'hidden' : true,  'render' : function(my) { return my.acp ? my.acp.barcode() : "No Copy"; },
 		},
 		{
+			'id' : 'current_copy_location', 'label' : 'Current Copy Location', 'flex' : 1,
+			'primary' : false, 'hidden' : true, 'render' : function(my) { if (!my.acp) { return ""; } else { if (Number(my.acp.location())>=0) return data.lookup("acpl", my.acp.location() ).name(); else return my.acp.location().name(); } },
+			'persist' : 'hidden width ordinal',
+		},
+		{
 			'persist' : 'hidden width ordinal', 'id' : 'email_notify', 'label' : getString('staff.ahr_email_notify_label'), 'flex' : 1,
 			'primary' : false, 'hidden' : true,  'render' : function(my) { return get_bool(my.ahr.email_notify()) ? "Yes" : "No"; },
 		},
-- 
2.11.0