Bug 15635: Koha::Patron::Images - Remove GetPatronImage

[koha.git] / members / printfeercpt.pl

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 59d5cb3..0808bba 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 
-#writen 3rd May 2010 by kmkale@anantcorp.com adapted from boraccount.pl by chris@katipo.oc.nz
+#written 3rd May 2010 by kmkale@anantcorp.com adapted from boraccount.pl by chris@katipo.oc.nz
 #script to print fee receipts
 
 
@@ -9,45 +9,46 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# 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 C4::Auth;
 use C4::Output;
-use C4::Dates qw/format_date/;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Branch;
 use C4::Accounts;
+use Koha::DateUtils;
+use Koha::Patron::Images;
 
 my $input=new CGI;
 
 
 my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/printfeercpt.tmpl",
+    = get_template_and_user({template_name => "members/printfeercpt.tt",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {borrowers => 1, updatecharges => 1},
+                            flagsrequired => {borrowers => 1, updatecharges => 'remaining_permissions'},
                             debug => 1,
                             });
 
 my $borrowernumber=$input->param('borrowernumber');
 my $action = $input->param('action') || '';
-my $accountno = $input->param('accountno');
+my $accountlines_id = $input->param('accountlines_id');
 
 #get borrower details
 my $data=GetMember('borrowernumber' => $borrowernumber);
@@ -73,7 +74,7 @@ my @accountrows; # this is for the tmpl-loop
 
 my $toggle;
 for (my $i=0;$i<$numaccts;$i++){
-   next if ($accts->[$i]{'accountno'} ne $accountno);
+    next if ( $accts->[$i]{'accountlines_id'} ne $accountlines_id );
     if($i%2){
             $toggle = 0;
     } else {
@@ -89,7 +90,8 @@ for (my $i=0;$i<$numaccts;$i++){
     if($accts->[$i]{'amountoutstanding'} <= 0){
         $accts->[$i]{'amountoutstandingcredit'} = 1;
     }
-    my %row = ( 'date'              => format_date($accts->[$i]{'date'}),
+
+    my %row = ( 'date'         => dt_from_string( $accts->[$i]{'date'} ),
                 'amountcredit' => $accts->[$i]{'amountcredit'},
                 'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
                 'toggle' => $accts->[$i]{'toggle'},
@@ -99,8 +101,7 @@ for (my $i=0;$i<$numaccts;$i++){
                 'amount'            => sprintf("%.2f",$accts->[$i]{'amount'}),
                 'amountoutstanding' => sprintf("%.2f",$accts->[$i]{'amountoutstanding'}),
                 'accountno' => $accts->[$i]{'accountno'},
-                'payment' => ( $accts->[$i]{'accounttype'} eq 'Pay' ),
-
+                accounttype => $accts->[$i]{accounttype},
                 );
 
     if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
@@ -113,8 +114,8 @@ for (my $i=0;$i<$numaccts;$i++){
 
 $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' );
 
-my ($picture, $dberror) = GetPatronImage($data->{'cardnumber'});
-$template->param( picture => 1 ) if $picture;
+my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
+$template->param( picture => 1 ) if $patron_image;
 
 $template->param(
     finesview           => 1,