Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / serials / serials-collection.pl

diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl
index a4fd91d..d4b2665 100755 (executable)
--- a/serials/serials-collection.pl
+++ b/serials/serials-collection.pl
@@ -27,6 +27,7 @@ use C4::Serials;
 use C4::Letters;
 use C4::Output;
 use C4::Context;
+use Koha::Serial::Items;
 
 use Koha::DateUtils qw( dt_from_string );
 
@@ -59,7 +60,7 @@ if($op eq 'gennext' && @subscriptionid){
     my $subscriptionid = $subscriptionid[0];
     my $sth = $dbh->prepare("
         SELECT publisheddate, publisheddatetext, serialid, serialseq,
-            planneddate
+            planneddate, notes, routingnotes
         FROM serial
         WHERE status = 1 AND subscriptionid = ?
     ");
@@ -77,18 +78,21 @@ 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 $expected = GetNextExpected($subscriptionid);
             my (
                  $newserialseq,  $newlastvalue1, $newlastvalue2, $newlastvalue3,
                  $newinnerloop1, $newinnerloop2, $newinnerloop3
-            ) = GetNextSeq($subscription, $pattern, $expected->{publisheddate});
+            ) = GetNextSeq($subscription, $pattern, $frequency, $expected->{publisheddate});
 
              ## We generate the next publication date
-             my $nextpublisheddate = GetNextDate($subscription, $expected->{publisheddate}, 1);
+             $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
              NewIssue( $newserialseq, $subscriptionid, $subscription->{'biblionumber'},
-                     1, $planneddate, $nextpublisheddate );
+                     1, $planneddate, $nextpublisheddate, undef,
+                     $issue->{notes}, $issue->{routingnotes} );
 
              ## Updating the subscription seq status
              my $squery = "UPDATE subscription SET lastvalue1=?, lastvalue2=?, lastvalue3=?, innerloop1=?, innerloop2=?, innerloop3=?
@@ -104,6 +108,31 @@ if($op eq 'gennext' && @subscriptionid){
         last if HasSubscriptionExpired($subscriptionid) > 0;
     }
     print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid);
+    exit;
+}
+
+my $countitems = 0;
+my @serialsid = $query->multi_param('serialid');
+my $subscriptionid = $subscriptionid[0];
+
+if($op eq 'delete_confirm'){
+    foreach my $serialid (@serialsid){
+        $countitems += Koha::Serial::Items->search({serialid => $serialid})->count();
+    }
+}elsif($op eq 'delete_confirmed'){
+    if($query->param('delitems') eq "Yes"){
+        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;
+            }
+        }
+    }
+    for my $serialid (@serialsid){
+        my $serial = Koha::Serials->find($serialid);
+        ModSerialStatus($serialid, $serial->serialseq, $serial->planneddate, $serial->publisheddate, $serial->publisheddatetext, 6, "");
+    }
 }
 
 my $subscriptioncount;
@@ -113,12 +142,9 @@ if (@subscriptionid){
    my $closed = 0;
    foreach my $subscriptionid (@subscriptionid){
     my $subs= GetSubscription($subscriptionid);
+    next unless $subs;
     $closed = 1 if $subs->{closed};
 
-    $subs->{opacnote}     =~ s/\n/\<br\/\>/g;
-    $subs->{missinglist}  =~ s/\n/\<br\/\>/g;
-    $subs->{recievedlist} =~ s/\n/\<br\/\>/g;
-
     ##these are display information
     $subs->{'abouttoexpire'}=abouttoexpire($subs->{'subscriptionid'});
     $subs->{'subscriptionexpired'}=HasSubscriptionExpired($subs->{'subscriptionid'});
@@ -134,6 +160,9 @@ if (@subscriptionid){
     my $tmpsubscription= GetFullSubscription($subscriptionid);
     @subscriptioninformation=(@$tmpsubscription,@subscriptioninformation);
   }
+
+  output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless @subscriptioninformation;
+
   $template->param(closed => $closed);
   $subscriptions=PrepareSerialsData(\@subscriptioninformation);
   $subscriptioncount = CountSubscriptionFromBiblionumber($subscriptiondescs->[0]{'biblionumber'});
@@ -177,6 +206,11 @@ $template->param(
           callnumber          => $callnumber,
           uc(C4::Context->preference("marcflavour")) => 1,
           serialsadditems   => $subscriptiondescs->[0]{'serialsadditems'},
+          delete => ($op eq 'delete_confirm'),
+          subscriptionid => $subscriptionid,
+          countitems => $countitems,
+          serialnumber => scalar @serialsid,
+          serialsid => \@serialsid,
           );
 
 output_html_with_http_headers $query, $cookie, $template->output;