X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-reserve.pl;h=58dac17b48787ace63cfca60d9cd4efd372df911;hb=59ac9be07e70b23c2dfcd009f6d5f689d1065c9b;hp=1fb4df08de3b8df37692fb58d8e6cb7eb79a4da8;hpb=068e5be6395088793aeab66d67c36c2b9da2c5d9;p=koha.git diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index 1fb4df08de..58dac17b48 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -5,22 +5,22 @@ # # 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 . -use strict; -use warnings; -use CGI; +use Modern::Perl; + +use CGI qw ( -utf8 ); use C4::Auth; # checkauth, getborrowernumber. use C4::Koha; use C4::Circulation; @@ -28,25 +28,33 @@ use C4::Reserves; use C4::Biblio; use C4::Items; use C4::Output; -use C4::Dates qw/format_date/; use C4::Context; use C4::Members; use C4::Branch; # GetBranches use C4::Overdues; use C4::Debug; use Koha::DateUtils; -# use Data::Dumper; +use Koha::Libraries; +use Koha::Patrons; +use Date::Calc qw/Today Date_to_Days/; +use List::MoreUtils qw/uniq/; -my $MAXIMUM_NUMBER_OF_RESERVES = C4::Context->preference("maxreserves"); +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.tmpl", + template_name => "opac-reserve.tt", query => $query, type => "opac", authnotrequired => 0, - flagsrequired => { borrow => 1 }, debug => 1, } ); @@ -65,6 +73,17 @@ sub get_out { # 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})); @@ -102,14 +121,14 @@ if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) { &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; @@ -147,22 +166,20 @@ foreach my $biblioNumber (@biblionumbers) { $itemInfoHash{$itemInfo->{itemnumber}} = $itemInfo; } - if ($show_holds_count) { - # Compute the priority rank. - my ( $rank, $reserves ) = GetReservesFromBiblionumber($biblioNumber,1); - $biblioData->{reservecount} = 1; # new reserve - foreach my $res (@$reserves) { - my $found = $res->{'found'}; - if ( $found && ($found eq 'W') ) { - $rank--; - } - else { - $biblioData->{reservecount}++; - } + # Compute the priority rank. + 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 ( $found && $found eq 'W' ) { + $rank--; + } + else { + $biblioData->{reservecount}++; } - $rank++; - $biblioData->{rank} = $rank; } + $biblioData->{rank} = $rank + 1; } # @@ -173,8 +190,10 @@ foreach my $biblioNumber (@biblionumbers) { # # if ( $query->param('place_reserve') ) { - my $notes = $query->param('notes'); - my $canreserve=0; + my $reserve_cnt = 0; + if ($maxreserves) { + $reserve_cnt = GetReservesFromBorrowernumber( $borrowernumber ); + } # List is composed of alternating biblio/item/branch my $selectedItems = $query->param('selecteditems'); @@ -202,61 +221,84 @@ if ( $query->param('place_reserve') ) { &get_out($query, $cookie, $template->output); } + my $failed_holds = 0; while (@selectedItems) { my $biblioNum = shift(@selectedItems); my $itemNum = shift(@selectedItems); - my $branch = shift(@selectedItems); # i.e., branch code, not name + my $branch = shift(@selectedItems); # i.e., branch code, not name - my $singleBranchMode = C4::Context->preference("singleBranchMode"); - if ($singleBranchMode || ! $OPACChooseBranch) { # single branch mode or disabled user choosing + my $canreserve = 0; + + my $singleBranchMode = Koha::Libraries->search->count == 1; + if ( $singleBranchMode || !$OPACChooseBranch ) + { # single branch mode or disabled user choosing $branch = $borr->{'branchcode'}; } - #item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber - if ($itemNum ne '') { - my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum); - if ($hostbiblioNum ne $biblioNum) { - $biblioNum = $hostbiblioNum; - } - } +#item may belong to a host biblio, if yes change biblioNum to hosts bilbionumber + if ( $itemNum ne '' ) { + my $hostbiblioNum = GetBiblionumberFromItemnumber($itemNum); + if ( $hostbiblioNum ne $biblioNum ) { + $biblioNum = $hostbiblioNum; + } + } my $biblioData = $biblioDataHash{$biblioNum}; my $found; - # Check for user supplied reserve date - my $startdate; - if ( - C4::Context->preference( 'AllowHoldDateInFuture' ) && - C4::Context->preference( 'OPACAllowHoldDateInFuture' ) - ) { - $startdate = $query->param("reserve_date_$biblioNum"); - } - - my $expiration_date = $query->param("expiration_date_$biblioNum"); + # Check for user supplied reserve date + my $startdate; + if ( C4::Context->preference('AllowHoldDateInFuture') + && C4::Context->preference('OPACAllowHoldDateInFuture') ) + { + $startdate = $query->param("reserve_date_$biblioNum"); + } + + my $expiration_date = $query->param("expiration_date_$biblioNum"); - # If a specific item was selected and the pickup branch is the same as the - # holdingbranch, force the value $rank and $found. + # If a specific item was selected and the pickup branch is the same as the + # holdingbranch, force the value $rank and $found. my $rank = $biblioData->{rank}; - if ($itemNum ne ''){ - $canreserve = 1 if CanItemBeReserved($borrowernumber,$itemNum); + if ( $itemNum ne '' ) { + $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum ) eq 'OK'; $rank = '0' unless C4::Context->preference('ReservesNeedReturns'); my $item = GetItem($itemNum); - if ( $item->{'holdingbranch'} eq $branch ){ - $found = 'W' unless C4::Context->preference('ReservesNeedReturns'); + if ( $item->{'holdingbranch'} eq $branch ) { + $found = 'W' + unless C4::Context->preference('ReservesNeedReturns'); } } 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 ( $maxreserves + && $reserve_cnt >= $maxreserves ) + { + $canreserve = 0; + } + + my $itemtype = $query->param('itemtype') || undef; + $itemtype = undef if $itemNum; # Here we actually do the reserveration. Stage 3. - AddReserve($branch, $borrowernumber, $biblioNum, 'a', [$biblioNum], $rank, $startdate, $expiration_date, $notes, - $biblioData->{'title'}, $itemNum, $found) if ($canreserve); + if ($canreserve) { + my $reserve_id = AddReserve( + $branch, $borrowernumber, $biblioNum, + [$biblioNum], $rank, $startdate, + $expiration_date, $notes, $biblioData->{title}, + $itemNum, $found, $itemtype, + ); + $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; } @@ -269,40 +311,54 @@ my $noreserves = 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} eq 1) ) { + +if ( $borr->{gonenoaddress} && ($borr->{gonenoaddress} == 1) ) { $noreserves = 1; $template->param( - message => 1, - GNA => 1 - ); + message => 1, + GNA => 1 + ); } -if ( $borr->{lost} && ($borr->{lost} eq 1) ) { + +if ( $borr->{lost} && ($borr->{lost} == 1) ) { $noreserves = 1; $template->param( - message => 1, - lost => 1 - ); + message => 1, + lost => 1 + ); } -if ( CheckBorrowerDebarred($borrowernumber) ) { + +if ( Koha::Patrons->find( $borrowernumber )->is_debarred ) { $noreserves = 1; $template->param( - message => 1, - debarred => 1 - ); + message => 1, + debarred => 1, + debarred_comment => $borr->{debarredcomment}, + debarred_date => $borr->{debarred}, + ); } 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) { @@ -330,7 +386,7 @@ my $notforloan_label_of = get_notforloan_label_of(); 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); @@ -338,7 +394,7 @@ foreach my $biblioNum (@biblionumbers) { 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}; @@ -354,22 +410,16 @@ foreach my $biblioNum (@biblionumbers) { $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{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}; } @@ -380,6 +430,7 @@ foreach my $biblioNum (@biblionumbers) { $biblioLoopIter{itemLoop} = []; my $numCopiesAvailable = 0; + my $numCopiesOPACAvailable = 0; foreach my $itemInfo (@{$biblioData->{itemInfos}}) { my $itemNum = $itemInfo->{itemnumber}; my $itemLoopIter = {}; @@ -391,7 +442,8 @@ foreach my $biblioNum (@biblionumbers) { $itemLoopIter->{enumchron} = $itemInfo->{enumchron}; $itemLoopIter->{copynumber} = $itemInfo->{copynumber}; if ($itemLevelTypes) { - $itemLoopIter->{description} = $itemInfo->{description}; + $itemLoopIter->{translated_description} = $itemInfo->{translated_description}; + $itemLoopIter->{itype} = $itemInfo->{itype}; $itemLoopIter->{imageurl} = $itemInfo->{imageurl}; } @@ -406,26 +458,29 @@ foreach my $biblioNum (@biblionumbers) { # 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 + $reservedfor //= ''; + if ($reservedfor eq $borrowernumber){ + $itemLoopIter->{already_reserved} = 1; + } if ( defined $reservedate ) { $itemLoopIter->{backgroundcolor} = 'reserved'; - $itemLoopIter->{reservedate} = format_date($reservedate); + $itemLoopIter->{reservedate} = output_pref({ dt => dt_from_string($reservedate), dateonly => 1 }); $itemLoopIter->{ReservedForBorrowernumber} = $reservedfor; $itemLoopIter->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; $itemLoopIter->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; $itemLoopIter->{ExpectedAtLibrary} = $expectedAt; + #waiting status + $itemLoopIter->{waitingdate} = $wait; } $itemLoopIter->{notforloan} = $itemInfo->{notforloan}; @@ -453,7 +508,7 @@ foreach my $biblioNum (@biblionumbers) { my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itemNum); if ( $transfertwhen && ($transfertwhen ne '') ) { - $itemLoopIter->{transfertwhen} = format_date($transfertwhen); + $itemLoopIter->{transfertwhen} = output_pref({ dt => dt_from_string($transfertwhen), dateonly => 1 }); $itemLoopIter->{transfertfrom} = $branches->{$transfertfrom}{branchname}; $itemLoopIter->{transfertto} = $branches->{$transfertto}{branchname}; @@ -470,29 +525,23 @@ foreach my $biblioNum (@biblionumbers) { # 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 $branch = GetReservesControlBranch( $itemInfo, $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 $policy_holdallowed = !$itemLoopIter->{already_reserved}; + $policy_holdallowed &&= + IsAvailableForItemLevelRequest($itemInfo,$borr) && + CanItemBeReserved($borrowernumber,$itemNum) eq 'OK'; - if (IsAvailableForItemLevelRequest($itemNum) and $policy_holdallowed and CanItemBeReserved($borrowernumber,$itemNum) 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++; } - # 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}) { @@ -507,37 +556,34 @@ foreach my $biblioNum (@biblionumbers) { $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' ) && @@ -548,7 +594,4 @@ if ( ); } -$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() ); - -output_html_with_http_headers $query, $cookie, $template->output; - +output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };