Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / serials / serials-collection.pl

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index d4b2665..2179b83 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -21,20 +21,18 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use C4::Auth;
-use C4::Koha;
-use C4::Serials;
-use C4::Letters;
-use C4::Output;
+use C4::Auth qw( get_template_and_user );
+use C4::Serials qw( ModSerialStatus GetSubscription GetNextExpected GetNextSeq GetNextDate NewIssue HasSubscriptionExpired abouttoexpire check_routing GetFullSubscription PrepareSerialsData CountSubscriptionFromBiblionumber GetSubscriptionsFromBiblionumber GetFullSubscriptionsFromBiblionumber );
+use C4::Output qw( output_and_exit output_html_with_http_headers );
 use C4::Context;
 use Koha::Serial::Items;
 
 use Koha::DateUtils qw( dt_from_string );
 
-use List::MoreUtils qw/uniq/;
+use List::MoreUtils qw( uniq );
 
 
-my $query = new CGI;
+my $query = CGI->new;
 my $op = $query->param('op') || q{};
 my $nbissues=$query->param('nbissues');
 my $date_received_today = $query->param('date_received_today') || 0;
@@ -44,9 +42,7 @@ my ($template, $loggedinuser, $cookie)
   = get_template_and_user({template_name => "serials/serials-collection.tt",
                             query => $query,
                             type => "intranet",
-                            authnotrequired => 0,
                             flagsrequired => {serials => '*'},
-                            debug => 1,
                             });
 my $biblionumber = $query->param('biblionumber');
 my @subscriptionid = $query->multi_param('subscriptionid');
@@ -78,7 +74,7 @@ if($op eq 'gennext' && @subscriptionid){
             require C4::Serials::Numberpattern;
             my $subscription = GetSubscription($subscriptionid);
             my $pattern = C4::Serials::Numberpattern::GetSubscriptionNumberpattern($subscription->{numberpattern});
-            my $frequency = C4::Serials::Frequency::GetSubscriptionFrequencies($subscription->{periodicity});
+            my $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
             my $expected = GetNextExpected($subscriptionid);
             my (
                  $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
@@ -86,7 +82,6 @@ if($op eq 'gennext' && @subscriptionid){
             ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
 
              ## We generate the next publication date
-             $frequency = C4::Serials::Frequency::GetSubscriptionFrequency($subscription->{periodicity});
              my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, $frequency, 1);
              my $planneddate = $date_received_today ? dt_from_string : $nextpublisheddate;
              ## Creating the new issue
@@ -121,12 +116,16 @@ if($op eq 'delete_confirm'){
     }
 }elsif($op eq 'delete_confirmed'){
     if($query->param('delitems') eq "Yes"){
+        my @itemnumbers;
         foreach my $serialid (@serialsid){
-            my @itemnumbers = Koha::Serial::Items->search({serialid => $serialid})->get_column('itemnumber');
-            foreach my $itemnumber (@itemnumbers){
-                my $delcheck = C4::Items::DelItemCheck($biblionumber, $itemnumber);
-                $template->param(error_delitem => 1) if $delcheck != 1;
-            }
+            my @ids = Koha::Serial::Items->search({serialid => $serialid})->get_column('itemnumber');
+            push(@itemnumbers, @ids);
+        }
+        my $items = Koha::Items->search({ itemnumber => \@itemnumbers });
+        while ( my $item = $items->next ) {
+            my $deleted = $item->safe_delete;
+            $template->param(error_delitem => 1)
+                unless $deleted;
         }
     }
     for my $serialid (@serialsid){