@@ -, +, @@
new batch per patron added
---
.../prog/en/modules/labels/label-edit-batch.tt | 38 +++++++++++++-------
.../intranet-tmpl/prog/en/modules/labels/result.tt | 13 +++----
.../prog/en/modules/patroncards/edit-batch.tt | 42 ++++++++++++++++------
labels/label-edit-batch.pl | 28 +++++++++------
patroncards/edit-batch.pl | 21 ++++++++---
5 files changed, 95 insertions(+), 47 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-batch.tt
@@ -64,14 +64,20 @@
}
};
function Add() {
- var barcodes = document.getElementById("barcode");
- if (barcodes.value == '') {
+ var number_list = document.getElementById("number_list");
+ if (number_list.value == '') {
window.open("/cgi-bin/koha/labels/label-item-search.pl?batch_id=[% batch_id %]&type=labels",'FindABibIndex','width=875,height=400,toolbar=no,scrollbars=yes');
}
else {
- document.forms["add_by_barcode"].submit();
+ document.forms["add_by_number"].submit();
}
};
+
+ function add_item(item_number) {
+ $("#itemnum_enter").prop("checked",true);
+ $("#number_list").val($("#number_list").val()+item_number+"\r\n");
+ };
+
function DeDuplicate() {
window.location = "/cgi-bin/koha/labels/label-edit-batch.pl?op=de_duplicate&batch_id=[% batch_id %]";
};
@@ -195,17 +201,25 @@
Current library: [% LoginBranchname %]
-
--- a/labels/label-edit-batch.pl
+++ a/labels/label-edit-batch.pl
@@ -26,7 +26,7 @@ use CGI qw ( -utf8 );
use C4::Auth qw(get_template_and_user);
use C4::Output qw(output_html_with_http_headers);
-use C4::Items qw(GetItemnumberFromBarcode);
+use C4::Items qw(GetItem GetItemnumberFromBarcode);
use C4::Creators;
use C4::Labels;
@@ -57,11 +57,12 @@ my $display_columns = [ {_label_number => {label => 'Label Number', link_field
my $op = $cgi->param('op') || 'edit';
my @label_ids;
my @item_numbers;
-my $barcode;
-my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
+my $number_list;
+my $number_type = $cgi->param('number_type') || "barcode";
+my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || 0;
@label_ids = $cgi->param('label_id') if $cgi->param('label_id');
@item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
-$barcode = $cgi->param('barcode') if $cgi->param('barcode');
+$number_list = $cgi->param('number_list') if $cgi->param('number_list');
my $branch_code = C4::Context->userenv->{'branch'};
@@ -80,17 +81,22 @@ elsif ($op eq 'delete') {
$errstr = "batch $batch_id was not deleted." if $err;
}
elsif ($op eq 'add') {
- if ($barcode) {
- my @barcodes = split /\n/, $barcode; # $barcode is effectively passed in as a separated list
- foreach my $number (@barcodes) {
+ if ($number_list) {
+ my @numbers_list = split /\n/, $number_list; # Entries are effectively passed in as a separated list
+ foreach my $number (@numbers_list) {
$number =~ s/\r$//; # strip any naughty return chars
- if (my $item_number = GetItemnumberFromBarcode($number)) { # we must test in case an invalid barcode is passed in; we effectively disgard them atm
- push @item_numbers, $item_number;
+ if( $number_type eq "itemnumber" && GetItem($number) ) {
+ push @item_numbers, $number;
+ }
+ elsif ($number_type eq "barcode" ) { # we must test in case an invalid barcode is passed in; we effectively disgard them atm
+ if( my $item_number = GetItemnumberFromBarcode($number) ){
+ push @item_numbers, $item_number;
+ }
}
}
}
- $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
- $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2;
+ if ($batch_id != 0) {$batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);}
+ if ($batch_id == 0 || $batch == -2) {$batch = C4::Labels::Batch->new(branch_code => $branch_code);}
if ($branch_code){
foreach my $item_number (@item_numbers) {
$err = $batch->add_item($item_number);
--- a/patroncards/edit-batch.pl
+++ a/patroncards/edit-batch.pl
@@ -29,7 +29,7 @@ use C4::Auth qw(get_template_and_user);
use C4::Output qw(output_html_with_http_headers);
use C4::Creators;
use C4::Patroncards;
-
+use C4::Members qw(GetMember);
my $cgi = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
@@ -53,12 +53,12 @@ my $display_columns = [ {_card_number => {label => 'Card Number', link_field =
{select => {label => 'Select', value => '_label_id'}},
];
my $op = $cgi->param('op') || 'new';
-my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
+my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || 0;
my @label_ids = $cgi->param('label_id') if $cgi->param('label_id');
my @item_numbers = $cgi->param('item_number') if $cgi->param('item_number');
my @borrower_numbers = $cgi->param('borrower_number') if $cgi->param('borrower_number');
my $errstr = $cgi->param('error') || '';
-
+my $bor_num_list = $cgi->param('bor_num_list') || undef;
my $branch_code = C4::Context->userenv->{'branch'};
if ($op eq 'remove') {
@@ -79,12 +79,23 @@ elsif ($op eq 'delete') {
}
}
elsif ($op eq 'add') {
- $batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);
- $batch = C4::Patroncards::Batch->new(branch_code => $branch_code) if $batch == -2;
+if ($bor_num_list) {
+ my @bor_nums_unchecked = split /\n/, $bor_num_list; # $bor_num_list is effectively passed in as a separated list
+ foreach my $number (@bor_nums_unchecked) {
+ $number =~ s/\r$//; # strip any naughty return chars
+ if ( GetMember(borrowernumber => $number)) { # we must test in case an invalid borrowernumber is passed in; we effectively disgard them atm
+ my $borrower_number = $number;
+ push @borrower_numbers, $borrower_number;
+ }
+ }
+ }
+ if ($batch_id != 0) {$batch = C4::Patroncards::Batch->retrieve(batch_id => $batch_id);}
+ if ($batch_id == 0 || $batch == -2) {$batch = C4::Patroncards::Batch->new(branch_code => $branch_code);}
if ($branch_code){
foreach my $borrower_number (@borrower_numbers) {
$err = $batch->add_item($borrower_number);
}
+ $batch_id = $batch->get_attr('batch_id') if $batch_id == 0; #update batch_id if we added to a new batch
if ($err) {
print $cgi->redirect("edit-batch.pl?op=edit&batch_id=$batch_id&error=401");
exit;
--