Bug 24545: Fix license statements

[srvgit] / members / summary-print.pl

diff --git a/members/summary-print.pl b/members/summary-print.pl
index 03e9d89..50cf0a6 100755 (executable)
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -2,18 +2,18 @@
 
 # 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 3 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 Modern::Perl;
 
@@ -43,13 +43,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $logged_in_user = Koha::Patrons->find( $loggedinuser );
 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 = $patron->account->balance;
 my $accts = Koha::Account::Lines->search(
-    { borrowernumber => $patron->borrowernumber },
+    { borrowernumber => $patron->borrowernumber, amountoutstanding => { '!=' => 0 } },
     { order_by       => { -desc => 'accountlines_id' } }
 );
 
@@ -75,36 +75,32 @@ output_html_with_http_headers $input, $cookie, $template->output;
 
 sub build_issue_data {
     my ( $borrowernumber ) = @_;
-    my $issues = GetPendingIssues( $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 );
 
-        $itemtype = Koha::ItemTypes->find( $itemtype );
-        $row{'itemtype_description'} = $itemtype->description; #FIXME Should not it be translated_description
+        $checkout->{charge} = $charge;
 
-        $row{'charge'} = sprintf( "%.2f", $charge );
+        $checkout->{overdue} = $c->is_overdue;
 
-        $row{date_due} = $row{date_due_sql};
-
-        push( @{$return}, \%row );
+        push @checkouts, $checkout;
     }
 
-    @{$return} = sort { $a->{date_due} eq $b->{date_due} } @{$return};
-
-    return $return;
+    return \@checkouts;
 
 }