X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fprintfeercpt.pl;h=c73f8f5bf46b1d870536e8442a2e013f23fb8a6c;hb=db75d5bf035efa92ea0a70956a3abb258283b49c;hp=da02121567516b2455d00b24a95339e84cdddf92;hpb=d8b8799355596a960d3c2cabf6bf4e7a04cef00c;p=koha.git

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index da02121567..c73f8f5bf4 100755
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -29,6 +29,7 @@ use C4::Output;
 use CGI qw ( -utf8 );
 use C4::Members;
 use C4::Accounts;
+use Koha::Account::Lines;
 use Koha::DateUtils;
 use Koha::Patrons;
 use Koha::Patron::Categories;
@@ -53,74 +54,57 @@ 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;
-
 if ( $action eq 'print' ) {
 #  ReversePayment( $borrowernumber, $input->param('accountno') );
 }
 
-if ( $category->category_type eq 'C') {
+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->categorycde )  if $patron_categories->count == 1;
 }
 
 #get account details
-my ($total,$accts,$numaccts)=GetMemberAccountRecords($borrowernumber);
+my $total = $patron->account->balance;
+
+# FIXME This whole stuff is ugly and should be rewritten
+# FIXME We should pass the $accts iterator to the template and do this formatting part there
+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]{'amount'}*=-1.00;
-    }
-    $accts->[$i]{'amountoutstanding'}+=0.00;
-    if($accts->[$i]{'amountoutstanding'} <= 0){
-        $accts->[$i]{'amountoutstandingcredit'} = 1;
-    }
-
-    my %row = ( 'date'         => dt_from_string( $accts->[$i]{'date'} ),
-                '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;
+}
+
+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( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
 
 $template->param(
     patron               => $patron,
     finesview           => 1,
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-    accounts            => \@accountrows );
+    accounts            => [$accountline], # FIXME There is always only 1 row!
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;