#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth; # checkauth, getborrowernumber.
use C4::Koha;
use C4::Circulation;
use C4::Overdues;
use C4::Debug;
use Koha::DateUtils;
+use Koha::Borrower::Debarments qw(IsDebarred);
use Date::Calc qw/Today Date_to_Days/;
# use Data::Dumper;
my $maxreserves = C4::Context->preference("maxreserves");
my $query = new CGI;
+
+# if RequestOnOpac (for placing holds) is disabled, leave immediately
+if ( ! C4::Context->preference('RequestOnOpac') ) {
+ print $query->redirect("/cgi-bin/koha/errors/404.pl");
+ exit;
+}
+
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "opac-reserve.tt",
query => $query,
type => "opac",
authnotrequired => 0,
- flagsrequired => { borrow => 1 },
debug => 1,
}
);
&get_out($query, $cookie, $template->output);
}
+ my $failed_holds = 0;
while (@selectedItems) {
my $biblioNum = shift(@selectedItems);
my $itemNum = shift(@selectedItems);
# Here we actually do the reserveration. Stage 3.
if ($canreserve) {
- AddReserve(
+ my $reserve_id = AddReserve(
$branch, $borrowernumber,
- $biblioNum, 'a',
+ $biblioNum,
[$biblioNum], $rank,
$startdate, $expiration_date,
$notes, $biblioData->{title},
$itemNum, $found
);
+ $failed_holds++ unless $reserve_id;
++$reserve_cnt;
}
}
- print $query->redirect("/cgi-bin/koha/opac-user.pl#opac-user-holds");
+ print $query->redirect("/cgi-bin/koha/opac-user.pl?" . ( $failed_holds ? "failed_holds=$failed_holds" : q|| ) . "#opac-user-holds");
exit;
}
lost => 1
);
}
-if ( $borr->{'debarred'} ) {
+if ( IsDebarred($borrowernumber) ) {
$noreserves = 1;
$template->param(
message => 1,
$biblioLoopIter{mandatorynotes}=0; #FIXME: For future use
if (!$itemLevelTypes && $biblioData->{itemtype}) {
- $biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description};
+ $biblioLoopIter{translated_description} = $itemTypes->{$biblioData->{itemtype}}{translated_description};
$biblioLoopIter{imageurl} = getitemtypeimagesrc() . "/". $itemTypes->{$biblioData->{itemtype}}{imageurl};
}
foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
- $debug and warn $itemInfo->{'notforloan'};
-
- # Get reserve fee.
- my $fee = GetReserveFee(undef, $borrowernumber, $itemInfo->{'biblionumber'}, 'a',
- ( $itemInfo->{'biblioitemnumber'} ) );
- $itemInfo->{'reservefee'} = sprintf "%.02f", ($fee ? $fee : 0.0);
-
if ($itemLevelTypes && $itemInfo->{itype}) {
- $itemInfo->{description} = $itemTypes->{$itemInfo->{itype}}{description};
+ $itemInfo->{translated_description} = $itemTypes->{$itemInfo->{itype}}{translated_description};
$itemInfo->{imageurl} = getitemtypeimagesrc() . "/". $itemTypes->{$itemInfo->{itype}}{imageurl};
}
$biblioLoopIter{itemLoop} = [];
my $numCopiesAvailable = 0;
+ my $numCopiesOPACAvailable = 0;
foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
my $itemNum = $itemInfo->{itemnumber};
my $itemLoopIter = {};
$itemLoopIter->{enumchron} = $itemInfo->{enumchron};
$itemLoopIter->{copynumber} = $itemInfo->{copynumber};
if ($itemLevelTypes) {
- $itemLoopIter->{description} = $itemInfo->{description};
+ $itemLoopIter->{translated_description} = $itemInfo->{translated_description};
$itemLoopIter->{imageurl} = $itemInfo->{imageurl};
}
my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
# the item could be reserved for this borrower vi a host record, flag this
+ $reservedfor //= '';
if ($reservedfor eq $borrowernumber){
$itemLoopIter->{already_reserved} = 1;
}
my $branch = GetReservesControlBranch( $itemInfo, $borr );
- my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
- my $policy_holdallowed = 1;
+ my $policy_holdallowed = !$itemLoopIter->{already_reserved};
+ $policy_holdallowed &&=
+ IsAvailableForItemLevelRequest($itemInfo,$borr) &&
+ CanItemBeReserved($borrowernumber,$itemNum) eq 'OK';
- if ( $branchitemrule->{'holdallowed'} == 0 ||
- ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
- $policy_holdallowed = 0;
- }
-
- if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) eq 'OK' and ($itemLoopIter->{already_reserved} ne 1)) {
- $itemLoopIter->{available} = 1;
+ if ($policy_holdallowed) {
+ if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $borr ) ) {
+ $itemLoopIter->{available} = 1;
+ $numCopiesOPACAvailable++;
+ $biblioLoopIter{force_hold} = 1 if $hold_allowed eq 'F';
+ }
$numCopiesAvailable++;
}
$numBibsAvailable++;
$biblioLoopIter{bib_available} = 1;
$biblioLoopIter{holdable} = 1;
+ $biblioLoopIter{itemholdable} = 1 if $numCopiesOPACAvailable;
}
if ($biblioLoopIter{already_reserved}) {
$biblioLoopIter{holdable} = undef;
+ $biblioLoopIter{itemholdable} = undef;
}
- my $canReserve = CanBookBeReserved($borrowernumber,$biblioNum);
- if ($canReserve eq 'OK') {
- #All is OK!
- }
- else {
- $biblioLoopIter{holdable} = undef;
- $biblioLoopIter{ $canReserve } = 1;
- }
if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) {
$biblioLoopIter{holdable} = undef;
$biblioLoopIter{already_patron_possession} = 1;
}
- if( $biblioLoopIter{holdable} ){ $anyholdable++; }
+ $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum) eq 'OK';
push @$biblioLoop, \%biblioLoopIter;
+
+ $anyholdable = 1 if $biblioLoopIter{holdable};
}
if ( $numBibsAvailable == 0 || $anyholdable == 0) {
# display infos
$template->param(bibitemloop => $biblioLoop);
-$template->param( showholds=>$show_holds_count);
-$template->param( showpriority=>$show_priority);
# can set reserve date in future
if (
C4::Context->preference( 'AllowHoldDateInFuture' ) &&
);
}
-output_html_with_http_headers $query, $cookie, $template->output;
-
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
projects / koha.git / blobdiff