X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fsummary-print.pl;h=76bb1d421333f89efa0e21b508d2e1d4a8f0ea67;hb=refs%2Fheads%2Fkoha_ffzg;hp=f1933f5961ce129dde3880cc8c85ebd2321b63d5;hpb=bde685fa9208aef6c7a7f14034e55c9dcd6e88a0;p=koha.git

diff --git a/members/summary-print.pl b/members/summary-print.pl
index f1933f5961..76bb1d4213 100755
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -22,11 +22,12 @@ use CGI;
 use C4::Auth;
 use C4::Output;
 use C4::Members;
-use C4::Koha qw( getitemtypeinfo );
 use C4::Circulation qw( GetIssuingCharges );
 use C4::Reserves;
 use C4::Items;
 use Koha::Holds;
+use Koha::ItemTypes;
+use Koha::Patrons;
 
 my $input          = CGI->new;
 my $borrowernumber = $input->param('borrowernumber');
@@ -42,39 +43,29 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-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 } );
 
-my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
-foreach my $accountline (@$accts) {
-    $accountline->{amount} = sprintf( '%.2f', $accountline->{amount} )
-        if ( $accountline->{amount} ) ;
-    $accountline->{amountoutstanding} = sprintf( '%.2f', $accountline->{amountoutstanding} )
-        if ( $accountline->{amountoutstanding} );
-
-    if (   $accountline->{accounttype} ne 'F'
-        && $accountline->{accounttype} ne 'FU' )
-    {
-        $accountline->{printtitle} = 1;
-    }
-}
+my $total = $patron->account->balance;
+my $accts = Koha::Account::Lines->search(
+    { borrowernumber => $patron->borrowernumber, amountoutstanding => { '!=' => 0 } },
+    { order_by       => { -desc => 'accountlines_id' } }
+);
 
 our $totalprice = 0;
-my $total_format = '';
-$total_format = sprintf( "%.2f", $total ) if ($total);
 
 my $holds_rs = Koha::Holds->search(
     { borrowernumber => $borrowernumber },
 );
 
 $template->param(
-    %$data,
-
-    borrowernumber => $borrowernumber,
+    patron => $patron,
 
     accounts => $accts,
-    totaldue => $total_format,
+    totaldue => $total,
 
-    issues     => build_issue_data( GetPendingIssues($borrowernumber) ),
+    issues     => build_issue_data( $borrowernumber ),
     totalprice => $totalprice,
 
     reserves => build_reserve_data( $holds_rs ),
@@ -83,36 +74,36 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub build_issue_data {
-    my $issues = shift;
+    my ( $borrowernumber ) = @_;
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    return unless $patron;
 
-    my $return = [];
+    my $pending_checkouts = $patron->pending_checkouts->search( {},
+        { order_by => [ { -desc => 'date_due' }, { -asc => 'issue_id' } ] } );
 
-    my $today = DateTime->now( time_zone => C4::Context->tz );
-    $today->truncate( to => 'day' );
+    my @checkouts;
 
-    foreach my $issue ( @{$issues} ) {
+    while ( my $c = $pending_checkouts->next ) {
+        my $checkout = $c->unblessed_all_relateds;
 
-        my %row = %{$issue};
-        $totalprice += $issue->{replacementprice}
-            if ( $issue->{replacementprice} );
+        $totalprice += $checkout->{replacementprice}
+            if $checkout->{replacementprice};
 
         #find the charge for an item
         my ( $charge, $itemtype ) =
-          GetIssuingCharges( $issue->{itemnumber}, $borrowernumber );
+          GetIssuingCharges( $checkout->{itemnumber}, $borrowernumber );
 
-        my $itemtypeinfo = getitemtypeinfo($itemtype);
-        $row{'itemtype_description'} = $itemtypeinfo->{description};
+        $itemtype = Koha::ItemTypes->find( $itemtype );
+        $checkout->{itemtype_description} = $itemtype->description; #FIXME Should not it be translated_description
 
-        $row{'charge'} = sprintf( "%.2f", $charge );
+        $checkout->{charge} = $charge;
 
-        $row{date_due} = $row{date_due_sql};
+        $checkout->{overdue} = $c->is_overdue;
 
-        push( @{$return}, \%row );
+        push @checkouts, $checkout;
     }
 
-    @{$return} = sort { $a->{date_due} eq $b->{date_due} } @{$return};
-
-    return $return;
+    return \@checkouts;
 
 }