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');
}
);
-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, amountoutstanding => { '!=' => 0 } },
+ { 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 $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};
+ $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 );
+ $checkout->{itemtype_description} = $itemtype->description; #FIXME Should not it be translated_description
- my $itemtypeinfo = getitemtypeinfo($itemtype);
- $row{'itemtype_description'} = $itemtypeinfo->{description};
+ $checkout->{charge} = $charge;
+
+ $checkout->{overdue} = $c->is_overdue;
+
+ push @checkouts, $checkout;
+ }
+
+ return \@checkouts;
+
+}
+
+sub build_reserve_data {
+ my $reserves = shift;
+
+ my $return = [];
+
+ my $today = DateTime->now( time_zone => C4::Context->tz );
+ $today->truncate( to => 'day' );
- $row{'charge'} = sprintf( "%.2f", $charge );
+ while ( my $reserve = $reserves->next() ) {
- $row{date_due} = $row{date_due_sql};
+ my $row = {
+ title => $reserve->biblio()->title(),
+ author => $reserve->biblio()->author(),
+ reservedate => $reserve->reservedate(),
+ expirationdate => $reserve->expirationdate(),
+ waiting_at => $reserve->branch()->branchname(),
+ };
- push( @{$return}, \%row );
+ push( @{$return}, $row );
}
- @{$return} = sort { $a->{date_due} <=> $b->{date_due} } @{$return};
+ @{$return} = sort { $a->{reservedate} <=> $b->{reservedate} } @{$return};
return $return;
}