Bug 21085: Fix add/edit of patrons when HouseboundModule is set

[koha.git] / members / notices.pl

diff --git a/members/notices.pl b/members/notices.pl
index 4b1abb7..765b402 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -27,6 +27,7 @@ use C4::Members;
 use C4::Letters;
 use C4::Members::Attributes qw(GetBorrowerAttributes);
 use Koha::Patrons;
+use Koha::Patron::Categories;
 
 my $input=new CGI;
 
@@ -39,8 +40,7 @@ unless ( $patron ) {
 }
 my $borrower = $patron->unblessed;
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/notices.tt",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/notices.tt",
                                query => $input,
                                type => "intranet",
                                authnotrequired => 0,
@@ -51,8 +51,11 @@ my ($template, $loggedinuser, $cookie)
 my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
-$template->param( $borrower );
-$template->param( picture => 1 ) if $patron->image;
+if ( $patron->is_child ) {
+    my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
+    $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
+    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
+}
 
 # Allow resending of messages in Notices tab
 my $op = $input->param('op') || q{};
@@ -77,13 +80,11 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-$template->param(%$borrower);
-$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
 $template->param(
+    patron             => $patron,
     QUEUED_MESSAGES    => $queued_messages,
     borrowernumber     => $borrowernumber,
     sentnotices        => 1,
-    categoryname       => $patron->category->description,
 );
 output_html_with_http_headers $input, $cookie, $template->output;