X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;ds=sidebyside;f=labels%2Flabel-edit-batch.pl;h=5252213a5fc8616283020ceb8dec42e0b38771a0;hb=8d5b4306e07a594cd102fcce85f912ab3a5661e9;hp=35c38fb210cf54180e4a5f7ccb322202fbbae9b2;hpb=3b0c92c442a160cbf218b9b4bbfbce288ad66536;p=koha-ffzg.git

diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 35c38fb210..5252213a5f 100755
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -4,36 +4,36 @@
 # Parts Copyright 2009 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 2 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.
+# 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.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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 strict;
 use warnings;
 use vars qw($debug);
 
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Branch qw(get_branch_code_from_name);
-use C4::Labels::Lib 1.000000 qw(get_label_summary html_table);
-use C4::Labels::Batch 1.000000;
+use C4::Items qw(GetItem GetItemnumberFromBarcode);
+use C4::Creators;
+use C4::Labels;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "labels/label-edit-batch.tmpl",
+        template_name   => "labels/label-edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -48,18 +48,25 @@ my $duplicate_count = undef;
 my $duplicate_message = undef;
 my $db_rows = {};
 my $batch = undef;
-my $display_columns = [ {_label_number  => {label => 'Label Number', link_field => 0}},
+my $display_columns = [ {_label_number  => {label => 'Label number', link_field => 0}},
                         {_summary       => {label => 'Summary', link_field => 0}},
-                        {_item_type     => {label => 'Item Type', link_field => 0}},
+                        {_item_type     => {label => 'Item type', link_field => 0}},
+                        {_item_cn       => {label => 'Call number', link_field => 0}},
                         {_barcode       => {label => 'Barcode', link_field => 0}},
+                        {_delete        => {label => 'Actions', link_field => 0}},
                         {select         => {label => 'Select', value => '_label_id'}},
                       ];
 my $op = $cgi->param('op') || 'edit';
-my $batch_id = $cgi->param('element_id') || $cgi->param('batch_id') || undef;
-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 @label_ids;
+my @item_numbers;
+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->multi_param('label_id') if $cgi->param('label_id');
+@item_numbers = $cgi->multi_param('item_number') if $cgi->param('item_number');
+$number_list = $cgi->param('number_list') if $cgi->param('number_list');
 
-my $branch_code = get_branch_code_from_name($template->param('LoginBranchname'));
+my $branch_code = C4::Context->userenv->{'branch'};
 
 if ($op eq 'remove') {
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
@@ -76,12 +83,27 @@ elsif ($op eq 'delete') {
     $errstr = "batch $batch_id was not deleted." if $err;
 }
 elsif ($op eq 'add') {
-    $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
-    $batch = C4::Labels::Batch->new(branch_code => $branch_code) if $batch == -2;
+    if ($number_list) {
+        my @numbers_list = split /\n/, $number_list; # Entries are effectively passed in as a <cr> separated list
+        foreach my $number (@numbers_list) {
+            $number =~ s/\r$//; # strip any naughty return chars
+            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;
+                }
+            }
+        }
+    }
+    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);
         }
+        $batch_id = $batch->get_attr('batch_id') if $batch_id == 0; #update batch_id if we added to a new batch
         $errstr = "item(s) not added to batch $batch_id." if $err;
     }
     else {
@@ -108,7 +130,7 @@ $db_rows = get_label_summary(items => $items, batch_id => $batch_id);
 
 my $table = html_table($display_columns, $db_rows);
 
-$template->param(   
+$template->param(
                 err         => $err,
                 errstr      => $errstr,
                 ) if ($err ne 0);