Bug 7684: QA Followup and bugfixes

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index fb8e91b..aca4514 100755 (executable)
--- 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;
@@ -46,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 => $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;
 
-
-