Bug 18789: Remove useless IS_ADULT variable

[srvgit] / members / printinvoice.pl

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index a8ea225..552e0cd 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -48,17 +48,13 @@ my $borrowernumber  = $input->param('borrowernumber');
 my $action          = $input->param('action') || '';
 my $accountlines_id = $input->param('accountlines_id');
 
-my $patron = Koha::Patrons->find( $borrowernumber );
-unless ( $patron ) {
-    print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
-    exit;
-}
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $patron         = Koha::Patrons->find( $borrowernumber );
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
+
 my $category = $patron->category;
-my $data = $patron->unblessed;
-$data->{description} = $category->description;
-$data->{category_type} = $category->category_type;
 
-if ( $data->{'category_type'} eq 'C' ) {
+if ( $category->category_type eq 'C' ) {
     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;
@@ -118,30 +114,11 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
     push( @accountrows, \%row );
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
-
-$template->param( picture => 1 ) if $patron->image;
-
 $template->param(
+    patron         => $patron,
     finesview      => 1,
-    firstname      => $data->{'firstname'},
-    surname        => $data->{'surname'},
-    borrowernumber => $borrowernumber,
-    cardnumber     => $data->{'cardnumber'},
-    categorycode   => $data->{'categorycode'},
-    category_type  => $data->{'category_type'},
-    categoryname   => $data->{'description'},
-    address        => $data->{'address'},
-    address2       => $data->{'address2'},
-    city           => $data->{'city'},
-    zipcode        => $data->{'zipcode'},
-    country        => $data->{'country'},
-    phone          => $data->{'phone'},
-    email          => $data->{'email'},
-    branchcode     => $data->{'branchcode'},
     total          => sprintf( "%.2f", $total ),
     totalcredit    => $totalcredit,
-    is_child       => ( $data->{'category_type'} eq 'C' ),
     accounts       => \@accountrows
 );