X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fnotices.pl;h=51a843c2f6df285ca0dfa782174e27576aca4ed1;hb=0486d0c6b781fbda73df19eb825ef330bdc4544a;hp=dea577e470c0e5e7aef5946f262f394bb214ae1c;hpb=0718cc8b6daf15f36d0aedb562a3e555a2ff9cf1;p=koha_fer

diff --git a/members/notices.pl b/members/notices.pl
index dea577e470..51a843c2f6 100755
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -27,6 +27,7 @@ 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;
@@ -50,18 +51,24 @@ my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'});
 $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 ''),
+);
 output_html_with_http_headers $input, $cookie, $template->output;
 
-
-