X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=circ%2Fwaitingreserves.pl;h=67afdccdd821950dcb95feb40dfb96ba6b509c3c;hb=010a32d95f871853f5c597b2670f3de4c62cfa51;hp=128d1eb2a4ea9cc0dc79b0ae1db7f82084711eaf;hpb=c8df6bdcc9fe2523a77c839270b31304d8e13ee5;p=koha.git diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl index 128d1eb2a4..67afdccdd8 100755 --- a/circ/waitingreserves.pl +++ b/circ/waitingreserves.pl @@ -5,32 +5,31 @@ # # 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 CGI qw ( -utf8 ); use C4::Context; use C4::Output; use C4::Branch; # GetBranchName use C4::Auth; -use C4::Dates qw/format_date/; use C4::Circulation; use C4::Members; use C4::Biblio; use C4::Items; - +use Koha::DateUtils; use Date::Calc qw( Today Add_Delta_Days @@ -46,12 +45,14 @@ my $borrowernumber = $input->param('borrowernumber'); my $fbr = $input->param('fbr') || ''; my $tbr = $input->param('tbr') || ''; my $all_branches = $input->param('allbranches') || ''; +my $cancelall = $input->param('cancelall'); +my $tab = $input->param('tab'); my $cancel; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { - template_name => "circ/waitingreserves.tmpl", + template_name => "circ/waitingreserves.tt", query => $input, type => "intranet", authnotrequired => 0, @@ -62,42 +63,23 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( my $default = C4::Context->userenv->{'branch'}; +my $transfer_when_cancel_all = C4::Context->preference('TransferWhenCancelAllWaitingHolds'); +$template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_cancel_all; + +my @cancel_result; # if we have a return from the form we launch the subroutine CancelReserve if ($item) { - my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber ); - # if we have a result - if ($nextreservinfo) { - my $borrowerinfo = GetMemberDetails( $nextreservinfo ); - my $iteminfo = GetBiblioFromItemNumber($item); - if ( $messages->{'transfert'} ) { - $template->param( - messagetransfert => $messages->{'transfert'}, - branchname => GetBranchName($messages->{'transfert'}), - ); - } - - $template->param( - message => 1, - nextreservnumber => $nextreservinfo, - nextreservsurname => $borrowerinfo->{'surname'}, - nextreservfirstname => $borrowerinfo->{'firstname'}, - nextreservitem => $item, - nextreservtitle => $iteminfo->{'title'}, - waiting => ($messages->{'waiting'}) ? 1 : 0, - ); - } - -# if the document is not in his homebranch location and there is not reservation after, we transfer it - if ($fbr ne $tbr and not $nextreservinfo) { - ModItemTransfer( $item, $fbr, $tbr ); - } + my $res = cancel( $item, $borrowernumber, $fbr, $tbr ); + push @cancel_result, $res if $res; } -if ( C4::Context->preference('IndependantBranches') ) { + +if ( C4::Context->preference('IndependentBranches') ) { undef $all_branches; } else { - $template->param( all_branches_link => $input->url . '?allbranches=1&' . $input->query_string ) + $template->param( all_branches_link => '/cgi-bin/koha/circ/waitingreserves.pl' . '?allbranches=1' ) unless $all_branches; } +$template->param( all_branches => 1 ) if $all_branches; my (@reservloop, @overloop); my ($reservcount, $overcount); @@ -107,13 +89,23 @@ my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch( my $today = Date_to_Days(&Today); foreach my $num (@getreserves) { next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00'); - my %getreserv; - my $gettitle = GetBiblioFromItemNumber( $num->{'itemnumber'} ); + + my $itemnumber = $num->{'itemnumber'}; + my $gettitle = GetBiblioFromItemNumber( $itemnumber ); + my $borrowernum = $num->{'borrowernumber'}; + my $holdingbranch = $gettitle->{'holdingbranch'}; + my $homebranch = $gettitle->{'homebranch'}; + + my %getreserv = ( + itemnumber => $itemnumber, + borrowernum => $borrowernum, + ); + # fix up item type for display $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'}; my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'}); my $itemtypeinfo = getitemtypeinfo( $gettitle->{'itemtype'} ); # using the fixed up itype/itemtype - $getreserv{'waitingdate'} = format_date( $num->{'waitingdate'} ); + $getreserv{'waitingdate'} = $num->{'waitingdate'}; my ( $waiting_year, $waiting_month, $waiting_day ) = split (/-/, $num->{'waitingdate'}); ( $waiting_year, $waiting_month, $waiting_day ) = Add_Delta_Days( $waiting_year, $waiting_month, $waiting_day, @@ -122,27 +114,37 @@ foreach my $num (@getreserves) { $getreserv{'itemtype'} = $itemtypeinfo->{'description'}; $getreserv{'title'} = $gettitle->{'title'}; - $getreserv{'itemnumber'} = $gettitle->{'itemnumber'}; + $getreserv{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($gettitle->{'biblionumber'}), GetFrameworkCode($gettitle->{'biblionumber'})); $getreserv{'biblionumber'} = $gettitle->{'biblionumber'}; $getreserv{'barcode'} = $gettitle->{'barcode'}; $getreserv{'branchname'} = GetBranchName($gettitle->{'homebranch'}); $getreserv{'homebranch'} = $gettitle->{'homebranch'}; $getreserv{'holdingbranch'} = $gettitle->{'holdingbranch'}; $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'}; - if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) { + $getreserv{'enumchron'} = $gettitle->{'enumchron'}; + $getreserv{'copynumber'} = $gettitle->{'copynumber'}; + if ( $homebranch ne $holdingbranch ) { $getreserv{'dotransfer'} = 1; } - $getreserv{'borrowernum'} = $getborrower->{'borrowernumber'}; $getreserv{'borrowername'} = $getborrower->{'surname'}; $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'}; $getreserv{'borrowerphone'} = $getborrower->{'phone'}; - if ( $getborrower->{'emailaddress'} ) { - $getreserv{'borrowermail'} = $getborrower->{'emailaddress'}; + + my $borEmail = GetFirstValidEmailAddress( $borrowernum ); + + if ( $borEmail ) { + $getreserv{'borrowermail'} = $borEmail; } - + if ($today > $calcDate) { - push @overloop, \%getreserv; - $overcount++; + if ($cancelall) { + my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all ); + push @cancel_result, $res if $res; + next; + } else { + push @overloop, \%getreserv; + $overcount++; + } }else{ push @reservloop, \%getreserv; $reservcount++; @@ -150,14 +152,59 @@ foreach my $num (@getreserves) { } +$template->param(cancel_result => \@cancel_result) if @cancel_result; $template->param( reserveloop => \@reservloop, reservecount => $reservcount, overloop => \@overloop, overcount => $overcount, - show_date => format_date(C4::Dates->today('iso')), - dateformat => C4::Context->preference("dateformat"), + show_date => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay') ); -output_html_with_http_headers $input, $cookie, $template->output; +if ($item && $tab eq 'holdsover') { + print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl#holdsover"); +} elsif ($cancelall) { + print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl"); +} else { + output_html_with_http_headers $input, $cookie, $template->output; +} + +exit; + +sub cancel { + my ($item, $borrowernumber, $fbr, $tbr, $skip_transfers ) = @_; + + my $transfer = $fbr ne $tbr; # XXX && !$nextreservinfo; + + return if $transfer && $skip_transfers; + + my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber ); + +# if the document is not in his homebranch location and there is not reservation after, we transfer it + if ($transfer && !$nextreservinfo) { + ModItemTransfer( $item, $fbr, $tbr ); + } + # if we have a result + if ($nextreservinfo) { + my %res; + my $borrowerinfo = C4::Members::GetMember( borrowernumber => $nextreservinfo ); + my $iteminfo = GetBiblioFromItemNumber($item); + if ( $messages->{'transfert'} ) { + $res{messagetransfert} = $messages->{'transfert'}; + $res{branchname} = GetBranchName($messages->{'transfert'}); + } + + $res{message} = 1; + $res{nextreservnumber} = $nextreservinfo; + $res{nextreservsurname} = $borrowerinfo->{'surname'}; + $res{nextreservfirstname} = $borrowerinfo->{'firstname'}; + $res{nextreservitem} = $item; + $res{nextreservtitle} = $iteminfo->{'title'}; + $res{waiting} = $messages->{'waiting'} ? 1 : 0; + + return \%res; + } + + return; +}