X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fsummary-print.pl;h=03e9d89f9fc73240205749881aea86a566881a36;hb=8b61e7145e7046ea042cfb2e7a4c81c89a924001;hp=ea227dd6f029ad3ca203acfd512d161dc82acd9d;hpb=255f02cad1822965685adac729a19b17769652ea;p=koha.git

diff --git a/members/summary-print.pl b/members/summary-print.pl
index ea227dd6f0..03e9d89f9f 100755
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -22,8 +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');
@@ -39,44 +43,41 @@ 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};
-    $accountline->{amountoutstanding} = sprintf '%.2f',
-      $accountline->{amountoutstanding};
+my $total = $patron->account->balance;
+my $accts = Koha::Account::Lines->search(
+    { borrowernumber => $patron->borrowernumber },
+    { order_by       => { -desc => 'accountlines_id' } }
+);
 
-    if (   $accountline->{accounttype} ne 'F'
-        && $accountline->{accounttype} ne 'FU' )
-    {
-        $accountline->{printtitle} = 1;
-    }
-}
+our $totalprice = 0;
 
-my $roadtype =
-  C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
+my $holds_rs = Koha::Holds->search(
+    { borrowernumber => $borrowernumber },
+);
 
-our $totalprice = 0;
 $template->param(
-    %$data,
-
-    borrowernumber => $borrowernumber,
-    address => $data->{'streetnumber'} . " $roadtype " . $data->{'address'},
+    patron => $patron,
 
     accounts => $accts,
-    totaldue => sprintf( "%.2f", $total ),
+    totaldue => $total,
 
-    issues     => build_issue_data( GetPendingIssues($borrowernumber) ),
+    issues     => build_issue_data( $borrowernumber ),
     totalprice => $totalprice,
+
+    reserves => build_reserve_data( $holds_rs ),
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub build_issue_data {
-    my $issues = shift;
+    my ( $borrowernumber ) = @_;
+    my $issues = GetPendingIssues( $borrowernumber );
 
-    my $return;
+    my $return = [];
 
     my $today = DateTime->now( time_zone => C4::Context->tz );
     $today->truncate( to => 'day' );
@@ -84,18 +85,51 @@ sub build_issue_data {
     foreach my $issue ( @{$issues} ) {
 
         my %row = %{$issue};
-        $totalprice += $issue->{replacementprice};
+        $totalprice += $issue->{replacementprice}
+            if ( $issue->{replacementprice} );
 
         #find the charge for an item
         my ( $charge, $itemtype ) =
           GetIssuingCharges( $issue->{itemnumber}, $borrowernumber );
 
-        my $itemtypeinfo = getitemtypeinfo($itemtype);
-        $row{'itemtype_description'} = $itemtypeinfo->{description};
+        $itemtype = Koha::ItemTypes->find( $itemtype );
+        $row{'itemtype_description'} = $itemtype->description; #FIXME Should not it be translated_description
 
         $row{'charge'} = sprintf( "%.2f", $charge );
 
+        $row{date_due} = $row{date_due_sql};
+
         push( @{$return}, \%row );
     }
+
+    @{$return} = sort { $a->{date_due} eq $b->{date_due} } @{$return};
+
+    return $return;
+
+}
+
+sub build_reserve_data {
+    my $reserves = shift;
+
+    my $return = [];
+
+    my $today = DateTime->now( time_zone => C4::Context->tz );
+    $today->truncate( to => 'day' );
+
+    while ( my $reserve = $reserves->next() ) {
+
+        my $row = {
+            title          => $reserve->biblio()->title(),
+            author         => $reserve->biblio()->author(),
+            reservedate    => $reserve->reservedate(),
+            expirationdate => $reserve->expirationdate(),
+            waiting_at     => $reserve->branch()->branchname(),
+        };
+
+        push( @{$return}, $row );
+    }
+
+    @{$return} = sort { $a->{reservedate} <=> $b->{reservedate} } @{$return};
+
     return $return;
 }