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;
-}
-
-my @types_old = values %types_old;
+# 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 ;
-# end old version
-################################
+$template->param( itemcount => scalar(@items) );
-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;
$debug and warn $itm->{'notforloan'};
- 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;
- }
- }
+ 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'}){
- $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];
+ if (!$itm->{'notforloan'} && !($itm->{'itemnotforloan'} > 0)){
+ $forloan=1;
}
- 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');
my $checkitem=$query->param('checkitem');
my $found;
+ my $canreserve=0;
#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 ''){
$i2++;
}
}
- # here we actually do the reserveration. Stage 3.
- if ($query->param('request') eq 'any'){
- # place a request on 1st available
- AddReserve($branch,$borrowernumber,$biblionumber,'a',\@realbi,$rank,$notes,$bibdata->{'title'},$checkitem,$found);
- } else {
- AddReserve($branch,$borrowernumber,$biblionumber,'a',\@realbi,$rank,$notes,$bibdata->{'title'},$checkitem, $found);
+
+ if ($checkitem ne ''){
+ $canreserve = 1 if CanItemBeReserved($borrowernumber,$checkitem);
+ $rank = '0' unless C4::Context->preference('ReservesNeedReturns');
+ my $item = GetItem($checkitem);
+ if ( $item->{'holdingbranch'} eq $branch ){
+ $found = 'W' unless C4::Context->preference('ReservesNeedReturns');
+ }
+ }
+ else {
+ $canreserve = 1 if CanBookBeReserved($borrowernumber,$biblionumber);
+ # Inserts a null into the 'itemnumber' field of 'reserves' table.
+ $checkitem = undef;
}
+
+ # here we actually do the reserveration. Stage 3.
+ AddReserve($branch,$borrowernumber,$biblionumber,'a',\@realbi,$rank,$notes,
+ $bibdata->{'title'},$checkitem, $found) if ($canreserve);
print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");
}
else {
}
}
unless ($noreserves) {
- $template->param( TYPES => \@types_old );
$template->param( select_item_types => 1 );
}
}
}
my @bibitemloop;
+my $num_available = 0;
foreach my $biblioitemnumber (@biblioitemnumbers) {
my $biblioitem = $biblioiteminfos_of->{$biblioitemnumber};
# If there is no loan, return and transfer, we show a checkbox.
$item->{notforloan} = $item->{notforloan} || 0;
- if (IsAvailableForItemLevelRequest($itemnumber)) {
+ my $branch = C4::Circulation::_GetCircControlBranch($item, $borr);
+
+ my $branchitemrule = GetBranchItemRule( $branch, $item->{'itemtype'} );
+
+ my $policy_holdallowed = 1;
+
+ if ( $branchitemrule->{'holdallowed'} == 0 ||
+ ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $item->{'homebranch'} ) ) {
+ $policy_holdallowed = 0;
+ }
+
+ if (IsAvailableForItemLevelRequest($itemnumber) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemnumber)) {
$item->{available} = 1;
+ $num_available++;
}
# FIXME: move this to a pm
while (my $wait_hashref = $sth2->fetchrow_hashref) {
$item->{waitingdate} = format_date($wait_hashref->{waitingdate});
}
- $item->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $item->{itype} }{imageurl} );
+
+ $item->{imageurl} = getitemtypeimagelocation( 'opac', $itemtypes->{ $item->{itype} }{imageurl} );
+
push @{ $biblioitem->{itemloop} }, $item;
}
-
+
+ if(not CanBookBeReserved($borrowernumber,$biblionumber)){
+ $biblioitem->{available} = undef;
+ $biblioitem->{notholdable} = 1;
+ }
+
push @bibitemloop, $biblioitem;
}
+if ( $num_available == 0 ) {
+ $template->param( none_available => 1, message => 1 );
+}
+
# display infos
$template->param(
forloan => $forloan,
projects / koha.git / blobdiff