Martin Renvoize
a24c17a2aa
Without the patch, renewing from the renewal tab/page led to wrong renewal/due dates. To test: - Check an item out to your patron account - Renew it from the patron account - Note the due date - Return the item - Check the item out again - Renew it using the renewal tab - Verify a different due date was calculated - Apply patch - Repeat test - due dates now should be the same Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
131 lines
4.4 KiB
Perl
Executable file
131 lines
4.4 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2013 ByWater Solutions
|
|
#
|
|
# 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, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Context;
|
|
use C4::Auth qw/:DEFAULT get_session/;
|
|
use C4::Output;
|
|
use C4::Circulation;
|
|
use C4::Koha;
|
|
use Koha::DateUtils;
|
|
use Koha::Database;
|
|
use Koha::BiblioFrameworks;
|
|
|
|
my $cgi = new CGI;
|
|
|
|
my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
|
|
{
|
|
template_name => "circ/renew.tt",
|
|
query => $cgi,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { circulate => "circulate_remaining_permissions" },
|
|
}
|
|
);
|
|
|
|
my $schema = Koha::Database->new()->schema();
|
|
|
|
my $barcode = $cgi->param('barcode');
|
|
$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespae
|
|
$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
|
|
my $override_limit = $cgi->param('override_limit');
|
|
my $override_holds = $cgi->param('override_holds');
|
|
|
|
my ( $item, $issue, $borrower );
|
|
my $error = q{};
|
|
my ( $soonest_renew_date, $latest_auto_renew_date );
|
|
|
|
if ($barcode) {
|
|
$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
|
|
$item = $schema->resultset("Item")->single( { barcode => $barcode } );
|
|
|
|
if ($item) {
|
|
|
|
$issue = $item->issue();
|
|
|
|
if ($issue) {
|
|
|
|
$borrower = $issue->borrower();
|
|
|
|
if ( ( $borrower->debarred() || q{} ) lt dt_from_string()->ymd() ) {
|
|
my $can_renew;
|
|
( $can_renew, $error ) =
|
|
CanBookBeRenewed( $borrower->borrowernumber(),
|
|
$item->itemnumber(), $override_limit );
|
|
|
|
if ( $error && ($error eq 'on_reserve') ) {
|
|
if ($override_holds) {
|
|
$can_renew = 1;
|
|
$error = undef;
|
|
}
|
|
else {
|
|
$can_renew = 0;
|
|
}
|
|
}
|
|
|
|
if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {
|
|
$soonest_renew_date = C4::Circulation::GetSoonestRenewDate(
|
|
$borrower->borrowernumber(),
|
|
$item->itemnumber(),
|
|
);
|
|
}
|
|
if ( $error && ( $error eq 'auto_too_late' ) ) {
|
|
$latest_auto_renew_date = C4::Circulation::GetLatestAutoRenewDate(
|
|
$borrower->borrowernumber(),
|
|
$item->itemnumber(),
|
|
);
|
|
}
|
|
if ($can_renew) {
|
|
my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
|
|
my $date_due;
|
|
if ( $cgi->param('renewonholdduedate') ) {
|
|
$date_due = dt_from_string( scalar $cgi->param('renewonholdduedate'));
|
|
}
|
|
$date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, $date_due );
|
|
$template->param( date_due => $date_due );
|
|
}
|
|
}
|
|
else {
|
|
$error = "patron_restricted";
|
|
}
|
|
}
|
|
else {
|
|
$error = "no_checkout";
|
|
}
|
|
}
|
|
else {
|
|
$error = "no_item";
|
|
}
|
|
|
|
$template->param(
|
|
item => $item,
|
|
issue => $issue,
|
|
borrower => $borrower,
|
|
error => $error,
|
|
soonestrenewdate => $soonest_renew_date,
|
|
latestautorenewdate => $latest_auto_renew_date,
|
|
);
|
|
}
|
|
|
|
# Checking if there is a Fast Cataloging Framework
|
|
$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
|
|
|
|
output_html_with_http_headers( $cgi, $cookie, $template->output );
|