Jonathan Druart
0c8496a85a
The selector is not correct, we must to not rely on the number.
This patch fixes a regression caused by bug 28445, but also a
long-standing bug.
* Regression:
The barcode plugin is broken is autoBarcode=<branchcode>yymm0001
There is a JS error in the console:
Uncaught TypeError: form.field_value is undefined
Focustag_952_subfield_p_878344
Focustag_952_subfield_p_878344_handler
jQuery 11
BindEventstag_952_subfield_p_878344
* Long standing bug:
If there are several item forms on the same page, the branchcode is not
correctly retrieved. For instance on the "Serial edition" page there are
2 item forms, the homebranch that is used by the barcode plugin will be
the one from the last form.
Test plan:
* regression
Set autoBarcode=<branchcode>yymm0001
Catalogue a new item, click into the barcode input
Notice that without this patch you get a JS error in the console
* long standing bug
Create a new subscription, select "Create an item record when receiving this serial".
Receive a serial
Open the 2 item forms ("Click to add item")
Select 2 different home library and click the barcode inputs.
The prefix (branchcode) should be correct with this patch applied.
QA Note: it would be way easier if all add item forms were using the new
methods, it could be:
let loc = document.getElementsByName('items.homebranch')[0].value;
Yes, that's all!
Signed-off-by: Hayley Pelham <hayleypelham@catalyst.net.nz>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
103 lines
3.3 KiB
Perl
Executable file
103 lines
3.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Converted to new plugin style (Bug 13437)
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Parts copyright 2008-2010 Foundations Bible College
|
|
#
|
|
# 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 C4::Context;
|
|
use C4::Barcodes::ValueBuilder;
|
|
use C4::Biblio qw( GetMarcFromKohaField );
|
|
use Koha::DateUtils qw( dt_from_string output_pref );
|
|
|
|
use Algorithm::CheckDigits qw( CheckDigits );
|
|
|
|
my $builder = sub {
|
|
my ( $params ) = @_;
|
|
my $function_name = $params->{id};
|
|
my %args;
|
|
|
|
# find today's date
|
|
($args{year}, $args{mon}, $args{day}) = split('-', output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }));
|
|
($args{tag},$args{subfield}) = GetMarcFromKohaField( "items.barcode" );
|
|
|
|
my $nextnum;
|
|
my $scr;
|
|
my $autoBarcodeType = C4::Context->preference("autoBarcode");
|
|
if ((not $autoBarcodeType) or $autoBarcodeType eq 'OFF') {
|
|
# don't return a value unless we have the appropriate syspref set
|
|
return q|<script></script>|;
|
|
}
|
|
if ($autoBarcodeType eq 'annual') {
|
|
($nextnum, $scr) = C4::Barcodes::ValueBuilder::annual::get_barcode(\%args);
|
|
}
|
|
elsif ($autoBarcodeType eq 'incremental') {
|
|
($nextnum, $scr) = C4::Barcodes::ValueBuilder::incremental::get_barcode(\%args);
|
|
}
|
|
elsif ($autoBarcodeType eq 'hbyymmincr') { # Generates a barcode where hb = home branch Code, yymm = year/month catalogued, incr = incremental number, reset yearly -fbcit
|
|
($nextnum, $scr) = C4::Barcodes::ValueBuilder::hbyymmincr::get_barcode(\%args);
|
|
}
|
|
elsif ($autoBarcodeType eq 'EAN13') {
|
|
# not the best, two catalogers could add the same barcode easily this way :/
|
|
my $query = "select max(abs(barcode)) from items";
|
|
my $dbh = $params->{dbh};
|
|
my $sth = $dbh->prepare($query);
|
|
$sth->execute();
|
|
while (my ($last)= $sth->fetchrow_array) {
|
|
$nextnum = $last;
|
|
}
|
|
my $ean = CheckDigits('ean');
|
|
if ( $ean->is_valid($nextnum) ) {
|
|
my $next = $ean->basenumber( $nextnum ) + 1;
|
|
$nextnum = $ean->complete( $next );
|
|
$nextnum = '0' x ( 13 - length($nextnum) ) . $nextnum; # pad zeros
|
|
} else {
|
|
warn "ERROR: invalid EAN-13 $nextnum, using increment";
|
|
$nextnum++;
|
|
}
|
|
}
|
|
else {
|
|
warn "ERROR: unknown autoBarcode: $autoBarcodeType";
|
|
}
|
|
|
|
# default js body (if not filled by hbyymmincr)
|
|
$scr or $scr = <<END_OF_JS;
|
|
if (\$('#' + id).val() == '' || force) {
|
|
\$('#' + id).val('$nextnum');
|
|
};
|
|
END_OF_JS
|
|
|
|
my $js = <<END_OF_JS;
|
|
<script>
|
|
|
|
function Focus$function_name(id, force) {
|
|
$scr
|
|
}
|
|
|
|
function Click$function_name(id) {
|
|
Focus$function_name(id, 1);
|
|
return false;
|
|
}
|
|
</script>
|
|
END_OF_JS
|
|
return $js;
|
|
};
|
|
|
|
return { builder => $builder };
|