X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=reserve%2Frequest.pl;h=9b37f4844b71b7db241ee83f652ab50db46076ec;hb=6bb0b6b2d90402bf1c618f32ddfde83529e63ba8;hp=0839f458bf28e78c6d02c7a5c88a0067ac0f4fd2;hpb=11bacd8f653fa935f9809fd46499f62b15ef06e1;p=koha.git diff --git a/reserve/request.pl b/reserve/request.pl index 0839f458bf..9b37f4844b 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -7,18 +7,18 @@ # # 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 . =head1 request.pl @@ -29,7 +29,7 @@ script to place reserves/requests use strict; use warnings; use C4::Branch; -use CGI; +use CGI qw ( -utf8 ); use List::MoreUtils qw/uniq/; use Date::Calc qw/Date_to_Days/; use C4::Output; @@ -39,13 +39,15 @@ use C4::Biblio; use C4::Items; use C4::Koha; use C4::Circulation; -use C4::Dates qw/format_date/; +use Koha::DateUtils; +use C4::Utils::DataTables::Members; use C4::Members; use C4::Search; # enabled_staff_search_views use Koha::DateUtils; +use Koha::Borrower::Debarments qw(IsDebarred); +use Koha::Holds; my $dbh = C4::Context->dbh; -my $sth; my $input = new CGI; my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user( { @@ -77,11 +79,11 @@ $findborrower = '' unless defined $findborrower; $findborrower =~ s|,| |g; my $borrowernumber_hold = $input->param('borrowernumber') || ''; my $messageborrower; -my $maxreserves; my $warnings; my $messages; +my $exceeded_maxreserves; -my $date = C4::Dates->today('iso'); +my $date = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }); my $action = $input->param('action'); $action ||= q{}; @@ -102,37 +104,67 @@ if ( $action eq 'move' ) { } if ($findborrower) { - my $borrowers = Search($findborrower, 'cardnumber'); - - if ($borrowers && @$borrowers) { - if ( @$borrowers == 1 ) { - $borrowernumber_hold = $borrowers->[0]->{'borrowernumber'}; - } - else { - $template->param( borrower_list => sort_borrowerlist($borrowers)); - } + my $borrower = C4::Members::GetMember( cardnumber => $findborrower ); + if ( $borrower ) { + $borrowernumber_hold = $borrower->{borrowernumber}; } else { - $messageborrower = "'$findborrower'"; + my $dt_params = { iDisplayLength => -1 }; + my $results = C4::Utils::DataTables::Members::search( + { + searchmember => $findborrower, + dt_params => $dt_params, + } + ); + my $borrowers = $results->{patrons}; + if ( scalar @$borrowers == 1 ) { + $borrowernumber_hold = $borrowers->[0]->{borrowernumber}; + } elsif ( @$borrowers ) { + $template->param( borrowers => $borrowers ); + } else { + $messageborrower = "'$findborrower'"; + } } } +my @biblionumbers = (); +my $biblionumbers = $input->param('biblionumbers'); +if ($multihold) { + @biblionumbers = split '/', $biblionumbers; +} else { + push @biblionumbers, $input->param('biblionumber'); +} + + # If we have the borrowernumber because we've performed an action, then we # don't want to try to place another reserve. if ($borrowernumber_hold && !$action) { my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold ); my $diffbranch; - my @getreservloop; - my $count_reserv = 0; # we check the reserves of the borrower, and if he can reserv a document # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ... - my $number_reserves = + my $reserves_count = GetReserveCount( $borrowerinfo->{'borrowernumber'} ); - if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) { - $warnings = 1; - $maxreserves = 1; + my $new_reserves_count = scalar( @biblionumbers ); + + my $maxreserves = C4::Context->preference('maxreserves'); + if ( $maxreserves + && ( $reserves_count + $new_reserves_count > $maxreserves ) ) + { + my $new_reserves_allowed = + $maxreserves - $reserves_count > 0 + ? $maxreserves - $reserves_count + : 0; + $warnings = 1; + $exceeded_maxreserves = 1; + $template->param( + new_reserves_allowed => $new_reserves_allowed, + new_reserves_count => $new_reserves_count, + reserves_count => $reserves_count, + maxreserves => $maxreserves, + ); } # we check the date expiry of the borrower (only if there is an expiry date, otherwise, set to 1 (warn) @@ -161,12 +193,13 @@ if ($borrowernumber_hold && !$action) { borroweremail => $borrowerinfo->{'email'}, borroweremailpro => $borrowerinfo->{'emailpro'}, borrowercategory => $borrowerinfo->{'category'}, - borrowerreservs => $count_reserv, cardnumber => $borrowerinfo->{'cardnumber'}, expiry => $expiry, diffbranch => $diffbranch, messages => $messages, - warnings => $warnings + warnings => $warnings, + restricted => IsDebarred($borrowerinfo->{'borrowernumber'}), + amount_outstanding => GetMemberAccountRecords($borrowerinfo->{borrowernumber}), ); } @@ -175,14 +208,6 @@ $template->param( messageborrower => $messageborrower ); # FIXME launch another time GetMember perhaps until my $borrowerinfo = GetMember( borrowernumber => $borrowernumber_hold ); -my @biblionumbers = (); -my $biblionumbers = $input->param('biblionumbers'); -if ($multihold) { - @biblionumbers = split '/', $biblionumbers; -} else { - push @biblionumbers, $input->param('biblionumber'); -} - my $itemdata_enumchron = 0; my @biblioloop = (); foreach my $biblionumber (@biblionumbers) { @@ -191,8 +216,21 @@ foreach my $biblionumber (@biblionumbers) { my $dat = GetBiblioData($biblionumber); - unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) { - $maxreserves = 1; + my $canReserve = CanBookBeReserved( $borrowerinfo->{borrowernumber}, $biblionumber ); + $canReserve //= ''; + if ( $canReserve eq 'OK' ) { + + #All is OK and we can continue + } + elsif ( $canReserve eq 'tooManyReserves' ) { + $exceeded_maxreserves = 1; + } + elsif ( $canReserve eq 'ageRestricted' ) { + $template->param( $canReserve => 1 ); + $biblioloopiter{$canReserve} = 1; + } + else { + $biblioloopiter{$canReserve} = 1; } my $alreadypossession; @@ -208,7 +246,7 @@ foreach my $biblionumber (@biblionumbers) { my $alreadyreserved = 0; foreach my $res (@$reserves) { - if ( defined $res->{found} ) { + if ( defined $res->{found} ) { # found can be 'W' or 'T' $count--; } @@ -244,7 +282,6 @@ foreach my $biblionumber (@biblionumbers) { # adding a fixed value for priority options my $fixedRank = $count+1; - my @branchcodes; my %itemnumbers_of_biblioitem; my @itemnumbers; @@ -289,15 +326,21 @@ foreach my $biblionumber (@biblionumbers) { my $num_override = 0; my $hiddencount = 0; - $biblioitem->{description} = - $itemtypes->{ $biblioitem->{itemtype} }{description}; - if($biblioitem->{biblioitemnumber} ne $biblionumber){ - $biblioitem->{hostitemsflag}=1; - } + if ( $biblioitem->{biblioitemnumber} ne $biblionumber ) { + $biblioitem->{hostitemsflag} = 1; + } + $biblioloopiter{description} = $biblioitem->{description}; - $biblioloopiter{itypename} = $biblioitem->{description}; - $biblioloopiter{imageurl} = - getitemtypeimagelocation('intranet', $itemtypes->{$biblioitem->{itemtype}}{imageurl}); + $biblioloopiter{itypename} = $biblioitem->{description}; + if ( $biblioitem->{itemtype} ) { + + $biblioitem->{description} = + $itemtypes->{ $biblioitem->{itemtype} }{description}; + + $biblioloopiter{imageurl} = + getitemtypeimagelocation( 'intranet', + $itemtypes->{ $biblioitem->{itemtype} }{imageurl} ); + } foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } ) { my $item = $iteminfos_of->{$itemnumber}; @@ -322,24 +365,21 @@ foreach my $biblionumber (@biblionumbers) { $item->{hosttitle} = GetBiblioData($item->{biblionumber})->{title}; } - # add information - $item->{itemcallnumber} = $item->{itemcallnumber}; - # if the item is currently on loan, we display its return date and # change the background color my $issues= GetItemIssue($itemnumber); if ( $issues->{'date_due'} ) { - $item->{date_due} = format_sqldatetime($issues->{date_due}); + $item->{date_due} = $issues->{date_due_sql}; $item->{backgroundcolor} = 'onloan'; } # checking reserve my ($reservedate,$reservedfor,$expectedAt,$reserve_id,$wait) = GetReservesFromItemnumber($itemnumber); - my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor ); - if ( defined $reservedate ) { + my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor ); + $item->{backgroundcolor} = 'reserved'; - $item->{reservedate} = format_date($reservedate); + $item->{reservedate} = output_pref({ dt => dt_from_string( $reservedate ), dateonly => 1 }); $item->{ReservedForBorrowernumber} = $reservedfor; $item->{ReservedForSurname} = $ItemBorrowerReserveInfo->{'surname'}; $item->{ReservedForFirstname} = $ItemBorrowerReserveInfo->{'firstname'}; @@ -374,7 +414,7 @@ foreach my $biblionumber (@biblionumbers) { GetTransfers($itemnumber); if ( defined $transfertwhen && $transfertwhen ne '' ) { - $item->{transfertwhen} = format_date($transfertwhen); + $item->{transfertwhen} = output_pref({ dt => dt_from_string( $transfertwhen ), dateonly => 1 }); $item->{transfertfrom} = $branches->{$transfertfrom}{branchname}; $item->{transfertto} = $branches->{$transfertto}{branchname}; @@ -382,7 +422,7 @@ foreach my $biblionumber (@biblionumbers) { } # If there is no loan, return and transfer, we show a checkbox. - $item->{notforloan} = $item->{notforloan} || 0; + $item->{notforloan} ||= 0; # if independent branches is on we need to check if the person can reserve # for branches they arent logged in to @@ -399,23 +439,16 @@ foreach my $biblionumber (@biblionumbers) { my $branch = C4::Circulation::_GetCircControlBranch($item, $borrowerinfo); my $branchitemrule = GetBranchItemRule( $branch, $item->{'itype'} ); - my $policy_holdallowed = 1; $item->{'holdallowed'} = $branchitemrule->{'holdallowed'}; - if ( $branchitemrule->{'holdallowed'} == 0 || - ( $branchitemrule->{'holdallowed'} == 1 && - $borrowerinfo->{'branchcode'} ne $item->{'homebranch'} ) ) { - $policy_holdallowed = 0; - } - if ( - $policy_holdallowed - && !$item->{cantreserve} - && IsAvailableForItemLevelRequest($itemnumber) + !$item->{cantreserve} + && !$exceeded_maxreserves + && IsAvailableForItemLevelRequest($item, $borrowerinfo) && CanItemBeReserved( $borrowerinfo->{borrowernumber}, $itemnumber - ) + ) eq 'OK' ) { $item->{available} = 1; @@ -451,87 +484,90 @@ foreach my $biblionumber (@biblionumbers) { # existingreserves building my @reserveloop; - $reserves = GetReservesFromBiblionumber({ biblionumber => $biblionumber, all_dates => 1 }); - foreach my $res ( sort { - my $a_found = $a->{found} || ''; - my $b_found = $a->{found} || ''; + my @reserves = Koha::Holds->search( { biblionumber => $biblionumber }, { order_by => 'priority' } ); + foreach my $res ( + sort { + my $a_found = $a->found() || ''; + my $b_found = $a->found() || ''; $a_found cmp $b_found; - } @$reserves ) { + } @reserves + ) + { my %reserve; my @optionloop; for ( my $i = 1 ; $i <= $totalcount ; $i++ ) { push( - @optionloop, - { - num => $i, - selected => ( $i == $res->{priority} ), - } - ); + @optionloop, + { + num => $i, + selected => ( $i == $res->priority() ), + } + ); } - if ( defined $res->{'found'} && ($res->{'found'} eq 'W' || $res->{'found'} eq 'T' )) { - my $item = $res->{'itemnumber'}; - $item = GetBiblioFromItemNumber($item,undef); - $reserve{'wait'}= 1; - $reserve{'holdingbranch'}=$item->{'holdingbranch'}; - $reserve{'biblionumber'}=$item->{'biblionumber'}; - $reserve{'barcodenumber'} = $item->{'barcode'}; - $reserve{'wbrcode'} = $res->{'branchcode'}; - $reserve{'itemnumber'} = $res->{'itemnumber'}; - $reserve{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'}; - if($reserve{'holdingbranch'} eq $reserve{'wbrcode'}){ + if ( $res->is_found() ) { + $reserve{'wait'} = 1; + $reserve{'holdingbranch'} = $res->item()->holdingbranch(); + $reserve{'biblionumber'} = $res->item()->biblionumber(); + $reserve{'barcodenumber'} = $res->item()->barcode(); + $reserve{'wbrcode'} = $res->branchcode(); + $reserve{'itemnumber'} = $res->itemnumber(); + $reserve{'wbrname'} = $res->branch()->branchname(); + + if ( $reserve{'holdingbranch'} eq $reserve{'wbrcode'} ) { + # Just because the holdingbranch matches the reserve branch doesn't mean the item # has arrived at the destination, check for an open transfer for the item as well - my ( $transfertwhen, $transfertfrom, $transferto ) = C4::Circulation::GetTransfers( $res->{itemnumber} ); - if ( not $transferto or $transferto ne $res->{branchcode} ) { + my ( $transfertwhen, $transfertfrom, $transferto ) = + C4::Circulation::GetTransfers( $res->itemnumber() ); + if ( not $transferto or $transferto ne $res->branchcode() ) { $reserve{'atdestination'} = 1; } } + # set found to 1 if reserve is waiting for patron pickup - $reserve{'found'} = 1 if $res->{'found'} eq 'W'; - $reserve{'intransit'} = 1 if $res->{'found'} eq 'T'; - } elsif ($res->{priority} > 0) { - if (defined($res->{itemnumber})) { - my $item = GetItem($res->{itemnumber}); - $reserve{'itemnumber'} = $res->{'itemnumber'}; - $reserve{'barcodenumber'} = $item->{'barcode'}; + $reserve{'found'} = $res->is_found(); + $reserve{'intransit'} = $res->is_in_transit(); + } + elsif ( $res->priority() > 0 ) { + if ( my $item = $res->item() ) { + $reserve{'itemnumber'} = $item->id(); + $reserve{'barcodenumber'} = $item->barcode(); $reserve{'item_level_hold'} = 1; } } # get borrowers reserve info - my $reserveborrowerinfo = GetMember( borrowernumber => $res->{'borrowernumber'} ); - if (C4::Context->preference('HidePatronName')){ - $reserve{'hidename'} = 1; - $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'}; - } - $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} ) - unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' ); - $reserve{'date'} = format_date( $res->{'reservedate'} ); - $reserve{'borrowernumber'} = $res->{'borrowernumber'}; - $reserve{'biblionumber'} = $res->{'biblionumber'}; - $reserve{'borrowernumber'} = $res->{'borrowernumber'}; - $reserve{'firstname'} = $reserveborrowerinfo->{'firstname'}; - $reserve{'surname'} = $reserveborrowerinfo->{'surname'}; - $reserve{'notes'} = $res->{'reservenotes'}; - $reserve{'wait'} = - ( ( defined $res->{'found'} and $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) ); - $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' ); - $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' ); - $reserve{'voldesc'} = $res->{'volumeddesc'}; - $reserve{'ccode'} = $res->{'ccode'}; - $reserve{'barcode'} = $res->{'barcode'}; - $reserve{'priority'} = $res->{'priority'}; - $reserve{'lowestPriority'} = $res->{'lowestPriority'}; - $reserve{'optionloop'} = \@optionloop; - $reserve{'suspend'} = $res->{'suspend'}; - $reserve{'suspend_until'} = $res->{'suspend_until'}; - $reserve{'reserve_id'} = $res->{'reserve_id'}; + if ( C4::Context->preference('HidePatronName') ) { + $reserve{'hidename'} = 1; + $reserve{'cardnumber'} = $res->borrower()->cardnumber(); + } + $reserve{'expirationdate'} = output_pref( { dt => dt_from_string( $res->expirationdate ), dateonly => 1 } ) + unless ( !defined( $res->expirationdate ) || $res->expirationdate eq '0000-00-00' ); + $reserve{'date'} = output_pref( { dt => dt_from_string( $res->reservedate ), dateonly => 1 } ); + $reserve{'borrowernumber'} = $res->borrowernumber(); + $reserve{'biblionumber'} = $res->biblionumber(); + $reserve{'borrowernumber'} = $res->borrowernumber(); + $reserve{'firstname'} = $res->borrower()->firstname(); + $reserve{'surname'} = $res->borrower()->surname(); + $reserve{'notes'} = $res->reservenotes(); + $reserve{'wait'} = $res->is_waiting(); + $reserve{'waiting_date'} = $res->waitingdate(); + $reserve{'waiting_until'} = $res->is_waiting() ? $res->waiting_expires_on() : undef; + $reserve{'ccode'} = $res->item() ? $res->item()->ccode() : undef; + $reserve{'barcode'} = $res->item() ? $res->item()->barcode() : undef; + $reserve{'priority'} = $res->priority(); + $reserve{'lowestPriority'} = $res->lowestPriority(); + $reserve{'optionloop'} = \@optionloop; + $reserve{'suspend'} = $res->suspend(); + $reserve{'suspend_until'} = $res->suspend_until(); + $reserve{'reserve_id'} = $res->reserve_id(); if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) { - $reserve{'branchloop'} = [ GetBranchDetail($res->{'branchcode'}) ]; - } else { - $reserve{'branchloop'} = GetBranchesLoop($res->{'branchcode'}); + $reserve{'branchloop'} = [ GetBranchDetail( $res->branchcode() ) ]; + } + else { + $reserve{'branchloop'} = GetBranchesLoop( $res->branchcode() ); } push( @reserveloop, \%reserve ); @@ -580,7 +616,7 @@ foreach my $biblionumber (@biblionumbers) { $template->param( biblioloop => \@biblioloop ); $template->param( biblionumbers => $biblionumbers ); -$template->param( maxreserves => $maxreserves ); +$template->param( exceeded_maxreserves => $exceeded_maxreserves ); if ($multihold) { $template->param( multi_hold => 1 );