Bug 18789: Remove useless IS_ADULT variable

[srvgit] / members / printinvoice.pl

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 252c241..552e0cd 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -20,8 +20,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use C4::Auth;
 use C4::Output;
@@ -29,8 +28,8 @@ use Koha::DateUtils;
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
-use Koha::Patron::Images;
 
+use Koha::Patrons;
 use Koha::Patron::Categories;
 
 my $input = new CGI;
@@ -40,7 +39,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired => { borrowers => 1, updatecharges => 'remaining_permissions' },
+        flagsrequired => { borrowers => 'edit_borrowers', updatecharges => 'remaining_permissions' },
         debug           => 1,
     }
 );
@@ -49,13 +48,16 @@ my $borrowernumber  = $input->param('borrowernumber');
 my $action          = $input->param('action') || '';
 my $accountlines_id = $input->param('accountlines_id');
 
-#get borrower details
-my $data = GetMember( 'borrowernumber' => $borrowernumber );
+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 } );
 
-if ( $data->{'category_type'} eq 'C' ) {
+my $category = $patron->category;
+
+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 )  if $patron_categories->count == 1;
+    $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
 }
 
 #get account details
@@ -112,31 +114,11 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
     push( @accountrows, \%row );
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
-
-my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
-$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
 );