48e9082043
In Circulation->Renew, the renew feature does not check the system preference itemBarcodeFilter to see whether the barcode needs to be converted. This patch fixes this, adding a check for the system pref and applying it accordingly to convert the barcode if it is needed. Test plan: 1) In Circulation->Renew, enter a barcode that you know exists in the catalogue but add extra spaces, breaking up the barcode. Note that this fails with a warning that says 'No item matches this barcode' 2) In system Preferences, set the itemBarcodeInputFilter pref to Remove spaces and repeat step1. Note that the result is the same as in step 1 3) Apply the patch 4) Repeat step 1, and note that the filter removes the spaces and the item is renewed (or gives an error that indicates it recognises the barcode) Sponsored-by: Catalyst IT Signed-off-by: Bin Wen <bin.wen@inlibro.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
126 lines
4.1 KiB
Perl
Executable file
126 lines
4.1 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 = 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 = AddRenewal( undef, $item->itemnumber(), $branchcode );
|
|
$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 );
|