Merge branch 'bug_9052' into 3.12-master

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index 7955581..51a843c 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;
@@ -53,12 +54,21 @@ $template->param( picture => 1 ) if $picture;
 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
+    );
+}
+
 $template->param(
                        QUEUED_MESSAGES         => $queued_messages,
                        borrowernumber          => $borrowernumber,
                        sentnotices             => 1,
-            branchname          => GetBranchName($borrower->{'branchcode'}),
-            categoryname        => $borrower->{'description'},
-               );
+                        branchname              => GetBranchName($borrower->{'branchcode'}),
+                        categoryname            => $borrower->{'description'},
+                       activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
+);
 output_html_with_http_headers $input, $cookie, $template->output;