X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fprintinvoice.pl;h=a6d92f7e3a5809c7992b9ce88c8c6c0ba4a9171b;hb=9f112ff75c2049cb3e5a259e38ad27a7282f53d2;hp=77f315630d7aab99dedc0d9db111c1556f3c4588;hpb=185dc7f45af17bf70ec36125be736286a1f8b86e;p=koha.git

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 77f315630d..a6d92f7e3a 100755
--- 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,9 @@ use Koha::DateUtils;
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
-use Koha::Patron::Images;
 
+use Koha::Account::Lines;
+use Koha::Patrons;
 use Koha::Patron::Categories;
 
 my $input = new CGI;
@@ -40,7 +40,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,95 +49,49 @@ 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 );
-
-if ( $data->{'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;
-}
+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 } );
 
 #get account details
-my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
+my $total = $patron->account->balance;
+my $accountline = Koha::Account::Lines->find($accountlines_id)->unblessed;
+
 my $totalcredit;
 if ( $total <= 0 ) {
     $totalcredit = 1;
 }
 
-my @accountrows;    # this is for the tmpl-loop
-
-my $toggle;
-for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
-    next if ( $accts->[$i]{'accountlines_id'} ne $accountlines_id );
-
-    if ( $i % 2 ) {
-        $toggle = 0;
-    } else {
-        $toggle = 1;
-    }
-
-    $accts->[$i]{'toggle'} = $toggle;
-    $accts->[$i]{'amount'} += 0.00;
-
-    if ( $accts->[$i]{'amount'} <= 0 ) {
-        $accts->[$i]{'amountcredit'} = 1;
-    }
-
-    $accts->[$i]{'amountoutstanding'} += 0.00;
-    if ( $accts->[$i]{'amountoutstanding'} <= 0 ) {
-        $accts->[$i]{'amountoutstandingcredit'} = 1;
-    }
-
-    my %row = (
-        'date'                    => output_pref({ dt => dt_from_string( $accts->[$i]{'date'} ), dateonly => 1 }),
-        'amountcredit'            => $accts->[$i]{'amountcredit'},
-        'amountoutstandingcredit' => $accts->[$i]{'amountoutstandingcredit'},
-        'toggle'                  => $accts->[$i]{'toggle'},
-        'description'             => $accts->[$i]{'description'},
-        'itemnumber'              => $accts->[$i]{'itemnumber'},
-        'biblionumber'            => $accts->[$i]{'biblionumber'},
-        'amount'                  => sprintf( "%.2f", $accts->[$i]{'amount'} ),
-        'amountoutstanding'       => sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} ),
-        'accountno'               => $accts->[$i]{'accountno'},
-        accounttype               => $accts->[$i]{accounttype},
-        'note'                    => $accts->[$i]{'note'},
-    );
-
-    if ( $accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU' ) {
-        $row{'printtitle'} = 1;
-        $row{'title'}      = $accts->[$i]{'title'};
-    }
 
-    push( @accountrows, \%row );
+$accountline->{'amount'} += 0.00;
+if ( $accountline->{'amount'} <= 0 ) {
+    $accountline->{'amountcredit'} = 1;
+    $accountline->{'amount'} *= -1.00;
+}
+$accountline->{'amountoutstanding'} += 0.00;
+if ( $accountline->{'amountoutstanding'} <= 0 ) {
+    $accountline->{'amountoutstandingcredit'} = 1;
 }
 
-$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' );
-
-my $patron_image = Koha::Patron::Images->find($data->{borrowernumber});
-$template->param( picture => 1 ) if $patron_image;
+my %row = (
+    'date'                    => dt_from_string( $accountline->{'date'} ),
+    'amountcredit'            => $accountline->{'amountcredit'},
+    'amountoutstandingcredit' => $accountline->{'amountoutstandingcredit'},
+    'description'             => $accountline->{'description'},
+    'amount'                  => sprintf( "%.2f", $accountline->{'amount'} ),
+    'amountoutstanding' =>
+      sprintf( "%.2f", $accountline->{'amountoutstanding'} ),
+    'accountno' => $accountline->{'accountno'},
+    accounttype => $accountline->{accounttype},
+    'note'      => $accountline->{'note'},
+);
 
 $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
+    accounts       => [$accountline], # FIXME There is always only 1 row!
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;