# Suite 330, Boston, MA 02111-1307 USA
use strict;
-require Exporter;
use CGI;
use C4::Biblio;
+use C4::Items;
use C4::Auth; # checkauth, getborrowernumber.
use C4::Koha;
use C4::Circulation;
use C4::Context;
use C4::Members;
use C4::Branch; # GetBranches
-use Data::Dumper;
+use C4::Debug;
+# use Data::Dumper;
my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
}
);
+sub get_out ($$$) {
+ output_html_with_http_headers(shift,shift,shift); # $query, $cookie, $template->output;
+ exit;
+}
+
# get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+my ( $borr ) = GetMemberDetails( $borrowernumber );
+
+# get branches and itemtypes
+my $branches = GetBranches();
+my $itemtypes = GetItemTypes();
# get biblionumber.....
my $biblionumber = $query->param('biblionumber');
+if (! $biblionumber) {
+ $template->param(message=>1,no_biblionumber=>1);
+ &get_out($query, $cookie, $template->output);
+}
+$template->param( biblionumber => $biblionumber );
my $bibdata = GetBiblioData($biblionumber);
-$template->param($bibdata);
-$template->param( biblionumber => $biblionumber );
+if (! $bibdata) {
+ $template->param(message=>1,bad_biblionumber=>$biblionumber);
+ &get_out($query, $cookie, $template->output);
+}
+$template->param($bibdata); # FIXME: bad form.
# get the rank number....
my ( $rank, $reserves ) = GetReservesFromBiblionumber( $biblionumber);
my $branch = $query->param('branch');
$template->param( branch => $branch );
-my $branches = GetBranches();
-
# make sure it's a real branch
if ( !$branches->{$branch} ) {
$branch = '';
my $CGIbranchloop = \@CGIbranchlooparray;
$template->param( CGIbranch => $CGIbranchloop );
-#### THIS IS A BIT OF A HACK BECAUSE THE BIBLIOITEMS DATA IS A LITTLE MESSED UP!
-# get the itemtype data....
my @items = GetItemsInfo($biblionumber);
-#######################################################
-# old version, add so that old templates still work
-my %types_old;
-foreach my $itm (@items) {
- my $ity = $itm->{'itemtype'};
- unless ( $types_old{$ity} ) {
- $types_old{$ity}->{'itemtype'} = $ity;
- $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} } = 1;
- $types_old{$ity}->{'description'} = $itm->{'description'};
- }
- else {
- $types_old{$ity}->{'branchinfo'}->{ $itm->{'branchcode'} }++;
- }
-}
-foreach my $type ( values %types_old ) {
- my $copies = "";
- foreach my $bc ( keys %{ $type->{'branchinfo'} } ) {
- $copies .=
- $branches->{$bc}->{'branchname'} . "("
- . $type->{'branchinfo'}->{$bc} . ")";
- }
- $type->{'copies'} = $copies;
-}
+# an item was previously required to have an itemtype in order to be reserved.
+# this behavior removed to fix bug 1891 .
+# my @items = grep { (C4::Context->preference('item-level_itypes') ? $_->{'itype'} : $_->{'itemtype'} ) } @all_items ;
-my @types_old = values %types_old;
+$template->param( itemcount => scalar(@items) );
-# end old version
-################################
-
-my @temp;
-foreach my $itm (@items) {
- push @temp, $itm if $itm->{'itemtype'};
-}
-@items = @temp;
-my $itemcount = @items;
-$template->param( itemcount => $itemcount );
-
-my %types;
-my %itemtypes;
-my @duedates;
-#die @items;
+my %itemhash;
+my $forloan;
foreach my $itm (@items) {
- push @duedates, { date_due => format_date( $itm->{'date_due'} ) }
- if defined $itm->{'date_due'};
- $itm->{ $itm->{'publictype'} } = 1;
- my $fee = GetReserveFee( undef, $borrowernumber, $itm->{'biblionumber'},
- 'a', ( $itm->{'biblioitemnumber'} ) );
- $fee = sprintf "%.02f", $fee;
- $itm->{'reservefee'} = $fee;
- my $pty = $itm->{'publictype'};
- $itemtypes{ $itm->{'itemtype'} } = $itm;
- unless ( $types{$pty} ) {
- $types{$pty}->{'count'} = 1;
- $types{$pty}->{ $itm->{'itemtype'} } = 1;
- push @{ $types{$pty}->{'items'} }, $itm;
- }
- else {
- unless ( $types{$pty}->{ $itm->{'itemtype'} } ) {
- $types{$pty}->{'count'}++;
- $types{$pty}->{ $itm->{'itemtype'} } = 1;
- push @{ $types{$pty}->{'items'} }, $itm;
- }
- }
+ $debug and warn $itm->{'notforloan'};
+ my $fee = GetReserveFee( undef, $borrowernumber, $itm->{'biblionumber'}, 'a', ( $itm->{'biblioitemnumber'} ) );
+ $itm->{'reservefee'} = sprintf "%.02f", $fee;
+ # pass itype to itemtype for display purposes.
+ $itm->{'itemtype'} = $itm->{'itype'} if(C4::Context->preference('item-level_itypes'));
+ $itemhash{$itm->{'itemnumber'}}=$itm;
+ if (!$itm->{'notforloan'} && !($itm->{'itemnotforloan'} > 0)){
+ $forloan=1;
+ }
}
-$template->param( ITEMS => \@duedates );
-
-my $width = keys %types;
-my @publictypes = sort { $b->{'count'} <=> $a->{'count'} } values %types;
-my $typecount;
-foreach my $pt (@publictypes) {
- $typecount += $pt->{'count'};
-}
-$template->param( onlyone => 1 ) if $typecount == 1;
-
-my @typerows;
-for ( my $rownum = 0 ; $rownum < $publictypes[0]->{'count'} ; $rownum++ ) {
- my @row;
- foreach my $pty (@publictypes) {
- my @items = @{ $pty->{'items'} };
- push @row, $items[$rownum] if defined $items[$rownum];
- }
- my $last = @row;
- $row[ $last - 1 ]->{'last'} = 1 if $last == $width;
- my $fill = ( $width - $last ) * 2;
- $fill-- if $fill;
- push @typerows, { ROW => \@row, fill => $fill };
-}
-$template->param( TYPE_ROWS => \@typerows );
-$width = 2 * $width - 1;
-$template->param( totalwidth => 2 * $width - 1, );
-
if ( $query->param('place_reserve') ) {
my @bibitems=$query->param('biblioitem');
my $notes=$query->param('notes');
#if we have an item selectionned, and the pickup branch is the same as the holdingbranch of the document, we force the value $rank and $found.
if ($checkitem ne ''){
- $rank = '0';
+ $rank = '0' unless C4::Context->preference('ReservesNeedReturns');
my $item = $checkitem;
$item = GetItem($item);
if ( $item->{'holdingbranch'} eq $branch ){
} else {
AddReserve($branch,$borrowernumber,$biblionumber,'a',\@realbi,$rank,$notes,$bibdata->{'title'},$checkitem, $found);
}
- print $query->redirect("/cgi-bin/koha/opac-user.pl");
+ print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");
}
else {
}
my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
$template->param( RESERVES => \@reserves );
- if ( scalar(@$reserves) >= $MAXIMUM_NUMBER_OF_RESERVES ) {
+ if ( scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES ) {
$template->param( message => 1 );
$noreserves = 1;
- $template->param( too_many_reserves => scalar($reserves));
+ $template->param( too_many_reserves => scalar(@reserves));
}
- foreach my $res (@$reserves) {
- if ( $res->{'biblionumber'} == $biblionumber ) {
+ foreach my $res (@reserves) {
+ if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) {
$template->param( message => 1 );
$noreserves = 1;
$template->param( already_reserved => 1 );
}
}
unless ($noreserves) {
- $template->param( TYPES => \@types_old );
$template->param( select_item_types => 1 );
}
}
-my @branchcodes;
my %itemnumbers_of_biblioitem;
my @itemnumbers = @{ get_itemnumbers_of($biblionumber)->{$biblionumber} };
my $iteminfos_of = GetItemInfosOf(@itemnumbers);
foreach my $itemnumber (@itemnumbers) {
- push( @branchcodes,
- $iteminfos_of->{$itemnumber}->{homebranch},
- $iteminfos_of->{$itemnumber}->{holdingbranch} );
-
my $biblioitemnumber = $iteminfos_of->{$itemnumber}->{biblioitemnumber};
push( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} }, $itemnumber );
}
-# @branchcodes = uniq @branchcodes;
-
my @biblioitemnumbers = keys %itemnumbers_of_biblioitem;
-my $branchinfos_of = get_branchinfos_of(@branchcodes);
my $notforloan_label_of = get_notforloan_label_of();
my $biblioiteminfos_of = GetBiblioItemInfosOf(@biblioitemnumbers);
push @itemtypes, $biblioiteminfos_of->{$biblioitemnumber}{itemtype};
}
-my $itemtypeinfos_of = get_itemtypeinfos_of(@itemtypes);
-
my @bibitemloop;
foreach my $biblioitemnumber (@biblioitemnumbers) {
my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
$biblioitem->{description} =
- $itemtypeinfos_of->{ $biblioitem->{itemtype} }{description};
+ $itemtypes->{ $biblioitem->{itemtype} }{description};
foreach
my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )
{
- my $item = $iteminfos_of->{$itemnumber};
+ my $item = $itemhash{$itemnumber};
$item->{homebranchname} =
- $branchinfos_of->{ $item->{homebranch} }{branchname};
+ $branches->{ $item->{homebranch} }{branchname};
# if the holdingbranch is different than the homebranch, we show the
# holdingbranch of the document too
if ( $item->{homebranch} ne $item->{holdingbranch} ) {
$item->{holdingbranchname} =
- $branchinfos_of->{ $item->{holdingbranch} }{branchname};
+ $branches->{ $item->{holdingbranch} }{branchname};
}
# add information
}
# Management of the notforloan document
- if ( $item->{notforloan} ) {
+ if ( $item->{notforloan} || $item->{itemnotforloan}) {
$item->{backgroundcolor} = 'other';
$item->{notforloanvalue} =
$notforloan_label_of->{ $item->{notforloan} };
if ( $transfertwhen ne '' ) {
$item->{transfertwhen} = format_date($transfertwhen);
$item->{transfertfrom} =
- $branchinfos_of->{$transfertfrom}{branchname};
- $item->{transfertto} = $branchinfos_of->{$transfertto}{branchname};
+ $branches->{$transfertfrom}{branchname};
+ $item->{transfertto} = $branches->{$transfertto}{branchname};
$item->{nocancel} = 1;
}
# If there is no loan, return and transfer, we show a checkbox.
$item->{notforloan} = $item->{notforloan} || 0;
- # An item is available only if:
- if (
- not defined $reservedate # not reserved yet
- and $issues->{'date_due'} eq '' # not currently on loan
- and not $item->{itemlost} # not lost
- and not $item->{notforloan} # not forbidden to loan
- and $transfertwhen eq '' # not currently on transfert
- )
- {
+ if (IsAvailableForItemLevelRequest($itemnumber)) {
$item->{available} = 1;
}
+ # FIXME: move this to a pm
+ my $dbh = C4::Context->dbh;
+ my $sth2 = $dbh->prepare("SELECT * FROM reserves WHERE borrowernumber=? AND itemnumber=? AND found='W'");
+ $sth2->execute($item->{ReservedForBorrowernumber},$item->{itemnumber});
+ while (my $wait_hashref = $sth2->fetchrow_hashref) {
+ $item->{waitingdate} = format_date($wait_hashref->{waitingdate});
+ }
+ $item->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $item->{itype} }{imageurl} );
push @{ $biblioitem->{itemloop} }, $item;
}
# display infos
$template->param(
+ forloan => $forloan,
bibitemloop => \@bibitemloop,
);
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff