Kyle M Hall
c2f1106f2e
On request.pl, the table of holds shows a suspend_until date picker for each hold, *unless* that hold is waiting or in transit. The script reserve/modrequest.pl assumes that there will be a suspend_until input for each hold, but that is incorrect. Assume there are 20 holds on a record, and 10 of them are waiting or in transit. If you were to then set the suspend until date on the 10 open holds, and use the "Update hold(s)" button, those 10 suspensions would apply to the 10 found holds and not the holds they should apply to! Test Plan: 1) Place two holds on a record 2) Check in an item and trap it for the first hold 3) Now that one hold is waiting and the other is not, attempt to set a suspension date using the "Update hold(s)" button 4) Note your hold does not get suspended! 5) Apply this patch 6) Restart all the things! 7) Repeat steps 1-3 8) Your hold should now be suspended! Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
103 lines
3.6 KiB
Perl
Executable file
103 lines
3.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to modify reserves/requests
|
|
#written 2/1/00 by chris@katipo.oc.nz
|
|
#last update 27/1/2000 by chris@katipo.co.nz
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
#
|
|
# 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 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.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
use CGI qw ( -utf8 );
|
|
use C4::Output;
|
|
use C4::Reserves;
|
|
use C4::Auth;
|
|
use Koha::DateUtils qw( dt_from_string );
|
|
|
|
my $query = new CGI;
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "about.tt",
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { catalogue => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my @reserve_id = $query->multi_param('reserve_id');
|
|
my @rank = $query->multi_param('rank-request');
|
|
my @biblionumber = $query->multi_param('biblionumber');
|
|
my @borrower = $query->multi_param('borrowernumber');
|
|
my @reservedates = $query->multi_param('reservedate');
|
|
my @expirationdates = $query->multi_param('expirationdate');
|
|
my @branch = $query->multi_param('pickup');
|
|
my @itemnumber = $query->multi_param('itemnumber');
|
|
my $multi_hold = $query->param('multi_hold');
|
|
my $biblionumbers = $query->param('biblionumbers');
|
|
my $count=@rank;
|
|
|
|
my $CancelBiblioNumber = $query->param('CancelBiblioNumber');
|
|
my $CancelBorrowerNumber = $query->param('CancelBorrowerNumber');
|
|
my $CancelItemnumber = $query->param('CancelItemnumber');
|
|
|
|
# 2 possibilitys : cancel an item reservation, or modify or cancel the queded list
|
|
|
|
# 1) cancel an item reservation by function ModReserveCancelAll (in reserves.pm)
|
|
if ($CancelBorrowerNumber) {
|
|
ModReserveCancelAll($CancelItemnumber, $CancelBorrowerNumber);
|
|
$biblionumber[0] = $CancelBiblioNumber,
|
|
}
|
|
|
|
# 2) Cancel or modify the queue list of reserves (without item linked)
|
|
else {
|
|
for (my $i=0;$i<$count;$i++){
|
|
undef $itemnumber[$i] if !$itemnumber[$i];
|
|
my $suspend_until = $query->param( "suspend_until_" . $reserve_id[$i] );
|
|
my $params = {
|
|
rank => $rank[$i],
|
|
reserve_id => $reserve_id[$i],
|
|
expirationdate => $expirationdates[$i] ? dt_from_string($expirationdates[$i]) : undef,
|
|
branchcode => $branch[$i],
|
|
itemnumber => $itemnumber[$i],
|
|
defined $suspend_until ? ( suspend_until => $suspend_until ) : (),
|
|
};
|
|
if (C4::Context->preference('AllowHoldDateInFuture')) {
|
|
$params->{reservedate} = $reservedates[$i] ? dt_from_string($reservedates[$i]) : undef;
|
|
}
|
|
|
|
ModReserve($params);
|
|
}
|
|
}
|
|
|
|
my $from=$query->param('from');
|
|
$from ||= q{};
|
|
if ( $from eq 'borrower'){
|
|
print $query->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrower[0]");
|
|
} elsif ( $from eq 'circ'){
|
|
print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
|
|
} else {
|
|
my $url = "/cgi-bin/koha/reserve/request.pl?";
|
|
if ($multi_hold) {
|
|
$url .= "multi_hold=1&biblionumbers=$biblionumbers";
|
|
} else {
|
|
$url .= "biblionumber=$biblionumber[0]";
|
|
}
|
|
print $query->redirect($url);
|
|
}
|