X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-user.pl;h=7fc1f91ef1e90f808362cbfb8c55412fe5ff39c8;hb=c5999dbbbd1bcfb45f258140c9b1f0041bb848f6;hp=274ca0bfa661047459930e44d461ae199f2c2857;hpb=100e6a9808ead4ee8d951da59ead1550e75bb4c3;p=koha-ffzg.git diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 274ca0bfa6..7fc1f91ef1 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -76,7 +76,7 @@ $template->param( BORROWER_INFO => \@bordat ); $template->param( borrowernumber => $borrowernumber ); #get issued items .... -my $issues = GetBorrowerIssues($borr); +my ($countissues,$issues) = GetPendingIssues($borrowernumber); my $count = 0; my $overdues_count = 0; @@ -92,7 +92,7 @@ foreach my $issue ( @$issues ) { $issue->{'reserved'} = 1; } - my ( $total , $accts, $numaccts) = GetBorrowerAcctRecord( $borrowernumber ); + my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); my $charges = 0; foreach my $ac (@$accts) { if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) { @@ -141,8 +141,8 @@ $template->param( overdues_count => $overdues_count ); my $branches = GetBranches(); # now the reserved items.... -my ( $rcount, $reserves ) = FindReserves( undef, $borrowernumber ); -foreach my $res (@$reserves) { +my @reserves = GetReservesFromBorrowernumber( $borrowernumber ); +foreach my $res (@reserves) { $res->{'reservedate'} = format_date( $res->{'reservedate'} ); my $publictype = $res->{'publictype'}; $res->{$publictype} = 1; @@ -152,12 +152,15 @@ foreach my $res (@$reserves) { $res->{'reserves_title'} = $biblioData->{'title'}; } -$template->param( RESERVES => $reserves ); -$template->param( reserves_count => $rcount ); +use Data::Dumper; +warn Dumper(@reserves); + +$template->param( RESERVES => \@reserves ); +$template->param( reserves_count => $#reserves+1 ); my @waiting; my $wcount = 0; -foreach my $res (@$reserves) { +foreach my $res (@reserves) { if ( $res->{'itemnumber'} ) { my $item = GetItem( $res->{'itemnumber'}); $res->{'holdingbranch'} =