X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fnotices.pl;h=aca4514319ea47fe475b9e0e47669556c6b07191;hb=5d6c092921919526ade501facb1220f8a108a08f;hp=3ce4ee3958370c1a36161ce2deb8b7a0eaaa53de;hpb=8ad2c7d7acc3cb0033426bd78928214a22ad9dd1;p=koha_fer

diff --git a/members/notices.pl b/members/notices.pl
index 3ce4ee3958..aca4514319 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -15,17 +15,19 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use C4::Output;
 use CGI;
 use C4::Members;
 use C4::Branch;
 use C4::Letters;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 
 use C4::Dates qw/format_date/;
 my $input=new CGI;
@@ -45,22 +47,29 @@ my ($template, $loggedinuser, $cookie)
 				});
 
 $template->param( $borrower );
-my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
+my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
 $template->param( picture => 1 ) if $picture;
 
 # Getting the messages
-my $queued_messages = C4::Letters::GetQueuedMessages({$borrowernumber});
+my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
+$template->param( %{$borrower} );
+
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
 
-warn Data::Dumper::Dumper( $queued_messages );
 $template->param(
 			QUEUED_MESSAGES 	=> $queued_messages,
- 			BORROWER_INFO         	=> [ $borrower ],
-                        firstname 		=> $borrower->{'firstname'},
-			surname 		=> $borrower->{'surname'},
 			borrowernumber 		=> $borrowernumber,
-			sentnotices 		=> 1
-		);
+			sentnotices 		=> 1,
+                        branchname              => GetBranchName($borrower->{'branchcode'}),
+                        categoryname            => $borrower->{'description'},
+			activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+            RoutingSerials => C4::Context->preference('RoutingSerials'),
+);
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
-