Bug 15869: Change framework on overlay

[koha-ffzg.git] / labels / label-edit-batch.pl

diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl
index 0026ebe..230291e 100755 (executable)
--- a/labels/label-edit-batch.pl
+++ b/labels/label-edit-batch.pl
@@ -19,27 +19,24 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use vars qw($debug);
 
 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(GetItem);
-use C4::Creators;
+use C4::Auth qw( get_template_and_user );
+use C4::Circulation qw( barcodedecode );
+use C4::Creators qw( get_label_summary html_table );
 use C4::Labels;
+use C4::Output qw( output_html_with_http_headers );
 
 use Koha::Items;
 
-my $cgi = new CGI;
+my $cgi = CGI->new;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "labels/label-edit-batch.tt",
         query           => $cgi,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { catalogue => 1 },
-        debug           => 1,
     }
 );
 
@@ -63,6 +60,7 @@ 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;
+my $description = $cgi->param('description') || '';
 @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');
@@ -88,10 +86,11 @@ elsif ($op eq 'add') {
         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) ) {
+            if( $number_type eq "itemnumber" && Koha::Items->find($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
+                $number = barcodedecode($number);
                 my $item = Koha::Items->find({barcode => $number});
                 push @item_numbers, $item->itemnumber if $item;
             }
@@ -99,6 +98,7 @@ elsif ($op eq 'add') {
     }
     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);}
+    $template->param( description => $batch->{description} );
     if ($branch_code){
         foreach my $item_number (@item_numbers) {
             $err = $batch->add_item($item_number);
@@ -123,6 +123,7 @@ elsif ($op eq 'de_duplicate') {
 }
 else { # edit
     $batch = C4::Labels::Batch->retrieve(batch_id => $batch_id);
+    $template->param( description => $batch->{description} );
 }
 
 my $items = $batch->get_attr('items');