Bug 11944: use CGI( -utf8 ) everywhere

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index 088d5a8..113e20c 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -23,10 +23,11 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use C4::Auth;
 use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
 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;
@@ -37,7 +38,7 @@ my $borrowernumber = $input->param('borrowernumber');
 my $borrower = GetMember(borrowernumber => $borrowernumber);
 
 my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/notices.tmpl",
+= get_template_and_user({template_name => "members/notices.tt",
                                query => $input,
                                type => "intranet",
                                authnotrequired => 0,
@@ -46,17 +47,34 @@ 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 => $borrowernumber});
 $template->param( %{$borrower} );
 
+if (C4::Context->preference('ExtendedPatronAttributes')) {
+    my $attributes = GetBorrowerAttributes($borrowernumber);
+    $template->param(
+        ExtendedPatronAttributes => 1,
+        extendedattributes => $attributes
+    );
+}
+
+# Computes full borrower address
+my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{'streettype'} );
+my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
+
 $template->param(
                        QUEUED_MESSAGES         => $queued_messages,
                        borrowernumber          => $borrowernumber,
-                       sentnotices             => 1
-               );
+                       sentnotices             => 1,
+                        branchname              => GetBranchName($borrower->{'branchcode'}),
+                        categoryname            => $borrower->{'description'},
+                        address                 => $address,
+                       activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+            RoutingSerials => C4::Context->preference('RoutingSerials'),
+);
 output_html_with_http_headers $input, $cookie, $template->output;