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 $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves");
+my $maxreserves = C4::Context->preference("maxreserves");
my $query = new CGI;
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "opac-reserve.tmpl",
+ template_name => "opac-reserve.tt",
query => $query,
type => "opac",
authnotrequired => 0,
# get borrower information ....
my ( $borr ) = GetMemberDetails( $borrowernumber );
+# check if this user can place a reserve, -1 means use sys pref, 0 means dont block, 1 means block
+if ( $borr->{'BlockExpiredPatronOpacActions'} ) {
+
+ if ( $borr->{'is_expired'} ) {
+
+ # cannot reserve, their card has expired and the rules set mean this is not allowed
+ $template->param( message => 1, expired_patron => 1 );
+ get_out( $query, $cookie, $template->output );
+ }
+}
+
# Pass through any reserve charge
if ($borr->{reservefee} > 0){
$template->param( RESERVE_CHARGE => sprintf("%.2f",$borr->{reservefee}));
&get_out($query, $cookie, $template->output);
}
+
# pass the pickup branch along....
my $branch = $query->param('branch') || $borr->{'branchcode'} || C4::Context->userenv->{branch} || '' ;
($branches->{$branch}) or $branch = ""; # Confirm branch is real
$template->param( branch => $branch );
# make branch selection options...
-my $CGIbranchloop = GetBranchesLoop($branch);
-$template->param( CGIbranch => $CGIbranchloop );
+my $branchloop = GetBranchesLoop($branch);
# Is the person allowed to choose their branch
my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0;
}
# Compute the priority rank.
- my ( $rank, $reserves ) =
- GetReservesFromBiblionumber( $biblioNumber, 1 );
+ my $reserves = GetReservesFromBiblionumber({ biblionumber => $biblioNumber, all_dates => 1 });
+ my $rank = scalar( @$reserves );
$biblioData->{reservecount} = 1; # new reserve
foreach my $res (@{$reserves}) {
my $found = $res->{found};
#
#
if ( $query->param('place_reserve') ) {
- my $notes = $query->param('notes');
my $reserve_cnt = 0;
- if ($MAXIMUM_NUMBER_OF_RESERVES) {
+ if ($maxreserves) {
$reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber );
}
# holdingbranch, force the value $rank and $found.
my $rank = $biblioData->{rank};
if ( $itemNum ne '' ) {
- $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum );
+ $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum ) eq 'OK';
$rank = '0' unless C4::Context->preference('ReservesNeedReturns');
my $item = GetItem($itemNum);
if ( $item->{'holdingbranch'} eq $branch ) {
}
}
else {
- $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum );
+ $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum ) eq 'OK';
# Inserts a null into the 'itemnumber' field of 'reserves' table.
$itemNum = undef;
}
+ my $notes = $query->param('notes_'.$biblioNum)||'';
- if ( $MAXIMUM_NUMBER_OF_RESERVES
- && $reserve_cnt >= $MAXIMUM_NUMBER_OF_RESERVES )
+ if ( $maxreserves
+ && $reserve_cnt >= $maxreserves )
{
$canreserve = 0;
}
my $maxoutstanding = C4::Context->preference("maxoutstanding");
$template->param( noreserve => 1 ) unless $maxoutstanding;
if ( $borr->{'amountoutstanding'} && ($borr->{'amountoutstanding'} > $maxoutstanding) ) {
- my $amount = sprintf "\$%.02f", $borr->{'amountoutstanding'};
+ my $amount = sprintf "%.02f", $borr->{'amountoutstanding'};
$template->param( message => 1 );
$noreserves = 1;
$template->param( too_much_oweing => $amount );
if ( $borr->{gonenoaddress} && ($borr->{gonenoaddress} == 1) ) {
$noreserves = 1;
$template->param(
- message => 1,
- GNA => 1
- );
+ message => 1,
+ GNA => 1
+ );
}
if ( $borr->{lost} && ($borr->{lost} == 1) ) {
$noreserves = 1;
$template->param(
- message => 1,
- lost => 1
- );
+ message => 1,
+ lost => 1
+ );
}
-if ( CheckBorrowerDebarred($borrowernumber) ) {
+if ( IsDebarred($borrowernumber) ) {
$noreserves = 1;
$template->param(
- message => 1,
- debarred => 1
- );
+ message => 1,
+ debarred => 1
+ );
}
my @reserves = GetReservesFromBorrowernumber( $borrowernumber );
+my $reserves_count = scalar(@reserves);
$template->param( RESERVES => \@reserves );
-if ( $MAXIMUM_NUMBER_OF_RESERVES && (scalar(@reserves) >= $MAXIMUM_NUMBER_OF_RESERVES) ) {
+if ( $maxreserves && ( $reserves_count >= $maxreserves ) ) {
$template->param( message => 1 );
$noreserves = 1;
$template->param( too_many_reserves => scalar(@reserves));
}
+
+unless ( $noreserves ) {
+ my $requested_reserves_count = scalar( @biblionumbers );
+ if ( $maxreserves && ( $reserves_count + $requested_reserves_count > $maxreserves ) ) {
+ $template->param( new_reserves_allowed => $maxreserves - $reserves_count );
+ }
+}
+
foreach my $res (@reserves) {
foreach my $biblionumber (@biblionumbers) {
if ( $res->{'biblionumber'} == $biblionumber && $res->{'borrowernumber'} == $borrowernumber) {
my $biblioLoop = [];
my $numBibsAvailable = 0;
my $itemdata_enumchron = 0;
-my $anyholdable;
+my $anyholdable = 0;
my $itemLevelTypes = C4::Context->preference('item-level_itypes');
$template->param('item_level_itypes' => $itemLevelTypes);
my $record = GetMarcBiblio($biblioNum);
# Init the bib item with the choices for branch pickup
- my %biblioLoopIter = ( branchChoicesLoop => $CGIbranchloop );
+ my %biblioLoopIter = ( branchloop => $branchloop );
# Get relevant biblio data.
my $biblioData = $biblioDataHash{$biblioNum};
$biblioLoopIter{rank} = $biblioData->{rank};
$biblioLoopIter{reservecount} = $biblioData->{reservecount};
$biblioLoopIter{already_reserved} = $biblioData->{already_reserved};
+ $biblioLoopIter{mandatorynotes}=0; #FIXME: For future use
if (!$itemLevelTypes && $biblioData->{itemtype}) {
$biblioLoopIter{description} = $itemTypes->{$biblioData->{itemtype}}{description};
$biblioLoopIter{itemLoop} = [];
my $numCopiesAvailable = 0;
+ my $numCopiesOPACAvailable = 0;
foreach my $itemInfo (@{$biblioData->{itemInfos}}) {
my $itemNum = $itemInfo->{itemnumber};
my $itemLoopIter = {};
# change the background color.
my $issues= GetItemIssue($itemNum);
if ( $issues->{'date_due'} ) {
- $itemLoopIter->{dateDue} = format_sqlduedatetime($issues->{date_due});
+ $itemLoopIter->{dateDue} = output_pref({ dt => dt_from_string($issues->{date_due}, 'sql'), as_due_date => 1 });
$itemLoopIter->{backgroundcolor} = 'onloan';
}
# checking reserve
- my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemNum);
+ my ($reservedate,$reservedfor,$expectedAt,undef,$wait) = GetReservesFromItemnumber($itemNum);
my $ItemBorrowerReserveInfo = GetMemberDetails( $reservedfor, 0);
- # the item could be reserved for this borrower vi a host record, flag this
- if ($reservedfor eq $borrowernumber){
- $itemLoopIter->{already_reserved} = 1;
- }
+ # the item could be reserved for this borrower vi a host record, flag this
+ if ($reservedfor eq $borrowernumber){
+ $itemLoopIter->{already_reserved} = 1;
+ }
if ( defined $reservedate ) {
$itemLoopIter->{backgroundcolor} = 'reserved';
$itemLoopIter->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'};
$itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'};
$itemLoopIter->{ExpectedAtLibrary} = $expectedAt;
+ #waiting status
+ $itemLoopIter->{waitingdate} = $wait;
}
$itemLoopIter->{notforloan} = $itemInfo->{notforloan};
# If there is no loan, return and transfer, we show a checkbox.
$itemLoopIter->{notforloan} = $itemLoopIter->{notforloan} || 0;
- my $branch = C4::Circulation::_GetCircControlBranch($itemLoopIter, $borr);
-
- my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} );
- my $policy_holdallowed = 1;
-
- if ( $branchitemrule->{'holdallowed'} == 0 ||
- ( $branchitemrule->{'holdallowed'} == 1 && $borr->{'branchcode'} ne $itemInfo->{'homebranch'} ) ) {
- $policy_holdallowed = 0;
+ my $branch = GetReservesControlBranch( $itemInfo, $borr );
+
+ my $policy_holdallowed = !$itemLoopIter->{already_reserved};
+ if ($policy_holdallowed) {
+ if (my $branchitemrule = GetBranchItemRule( $branch, $itemInfo->{'itype'} )) {
+ $policy_holdallowed =
+ ($branchitemrule->{'holdallowed'} == 2) ||
+ ($branchitemrule->{'holdallowed'} == 1
+ && $borr->{'branchcode'} eq $itemInfo->{'homebranch'});
+ } else {
+ $policy_holdallowed = 0; # No rule - not allowed
+ }
}
-
- if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) and ($itemLoopIter->{already_reserved} ne 1)) {
- $itemLoopIter->{available} = 1;
+ $policy_holdallowed &&=
+ IsAvailableForItemLevelRequest($itemInfo,$borr) &&
+ CanItemBeReserved($borrowernumber,$itemNum) eq 'OK';
+
+ if ($policy_holdallowed) {
+ if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $borr ) ) {
+ $itemLoopIter->{available} = 1;
+ $numCopiesOPACAvailable++;
+ $biblioLoopIter{force_hold} = 1 if $hold_allowed eq 'F';
+ }
$numCopiesAvailable++;
}
- # 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($itemLoopIter->{ReservedForBorrowernumber}, $itemNum);
- while (my $wait_hashref = $sth2->fetchrow_hashref) {
- $itemLoopIter->{waitingdate} = format_date($wait_hashref->{waitingdate});
- }
- $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} );
+ $itemLoopIter->{imageurl} = getitemtypeimagelocation( 'opac', $itemTypes->{ $itemInfo->{itype} }{imageurl} );
# Show serial enumeration when needed
if ($itemLoopIter->{enumchron}) {
$numBibsAvailable++;
$biblioLoopIter{bib_available} = 1;
$biblioLoopIter{holdable} = 1;
- $anyholdable = 1;
+ $biblioLoopIter{itemholdable} = 1 if $numCopiesOPACAvailable;
}
if ($biblioLoopIter{already_reserved}) {
$biblioLoopIter{holdable} = undef;
- $anyholdable = undef;
+ $biblioLoopIter{itemholdable} = undef;
}
- if(not CanBookBeReserved($borrowernumber,$biblioNum)){
+ if(not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowernumber,$biblioNum)) {
$biblioLoopIter{holdable} = undef;
- $anyholdable = undef;
+ $biblioLoopIter{already_patron_possession} = 1;
}
+ $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum) eq 'OK';
+
push @$biblioLoop, \%biblioLoopIter;
+
+ $anyholdable = 1 if $biblioLoopIter{holdable};
}
-if ( $numBibsAvailable == 0 || !$anyholdable) {
+if ( $numBibsAvailable == 0 || $anyholdable == 0) {
$template->param( none_available => 1 );
}
-my $itemTableColspan = 7;
-if (! $template->{VARS}->{'OPACItemHolds'}) {
- $itemTableColspan--;
-}
-if (! $template->{VARS}->{'singleBranchMode'}) {
- $itemTableColspan--;
-}
-$template->param(itemtable_colspan => $itemTableColspan);
+my $show_notes=C4::Context->preference('OpacHoldNotes');
+$template->param(OpacHoldNotes=>$show_notes);
# 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' ) &&
);
}
-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
-
output_html_with_http_headers $query, $cookie, $template->output;
projects / koha.git / blobdiff