Bug 15774: Show additional field values in edit form

[koha.git] / serials / subscription-renew.pl

diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl
index 92f7766..ccfbad2 100755 (executable)
--- a/serials/subscription-renew.pl
+++ b/serials/subscription-renew.pl
@@ -4,18 +4,18 @@
 #
 # 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 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.
 #
-# 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 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
 =head1 NAME
@@ -43,25 +43,24 @@ Id of the subscription this script has to renew
 
 =cut
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use Carp;
 use C4::Koha;
 use C4::Auth;
-use C4::Dates qw/format_date/;
 use C4::Context;
 use C4::Auth;
 use C4::Output;
 use C4::Serials;
+use Koha::DateUtils;
 
 my $query = new CGI;
 my $dbh   = C4::Context->dbh;
 
 my $mode           = $query->param('mode') || q{};
 my $op             = $query->param('op') || 'display';
-my $subscriptionid = $query->param('subscriptionid');
+my @subscriptionids = $query->multi_param('subscriptionid');
 my $done = 0;    # for after form has been submitted
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
@@ -74,33 +73,48 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 if ( $op eq "renew" ) {
+    # Do not use this script with op=renew and @subscriptionids > 1!
+    my $subscriptionid = $subscriptionids[0];
+    # Make sure the subscription exists
+    my $subscription = GetSubscription( $subscriptionid );
+    output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless $subscription;
+    my $startdate = output_pref( { str => scalar $query->param('startdate'), dateonly => 1, dateformat => 'iso' } );
     ReNewSubscription(
-        $subscriptionid,             $loggedinuser,
-        C4::Dates->new($query->param('startdate'))->output('iso'),  $query->param('numberlength'),
-        $query->param('weeklength'), $query->param('monthlength'),
-        $query->param('note')
+        $subscriptionid, $loggedinuser,
+        $startdate, scalar $query->param('numberlength'),
+        scalar $query->param('weeklength'), scalar $query->param('monthlength'),
+        scalar $query->param('note')
     );
-}
+} elsif ( $op eq 'multi_renew' ) {
+    for my $subscriptionid ( @subscriptionids ) {
+        my $subscription = GetSubscription( $subscriptionid );
+        next unless $subscription;
+        ReNewSubscription(
+            $subscriptionid, $loggedinuser,
+            $subscription->{enddate}, $subscription->{numberlength},
+            $subscription->{weeklength}, $subscription->{monthlength},
+        );
+    }
+} else {
+    my $subscriptionid = $subscriptionids[0];
+    my $subscription = GetSubscription($subscriptionid);
+    output_and_exit( $query, $cookie, $template, 'unknown_subscription') unless $subscription;
+    if ($subscription->{'cannotedit'}){
+      carp "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
+      print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    }
 
-my $subscription = GetSubscription($subscriptionid);
-if ($subscription->{'cannotedit'}){
-  carp "Attempt to renew subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
-  print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
+    my $newstartdate = output_pref( { str => $subscription->{enddate}, dateonly => 1 } )
+        or output_pref( { dt => dt_from_string, dateonly => 1 } );
+
+    $template->param(
+        startdate      => $newstartdate,
+        subscription   => $subscription,
+    );
 }
 
 $template->param(
-    startdate => format_date(
-             $subscription->{enddate}
-          || POSIX::strftime( "%Y-%m-%d", localtime )
-    ),
-    numberlength   => $subscription->{numberlength},
-    weeklength     => $subscription->{weeklength},
-    monthlength    => $subscription->{monthlength},
-    subscriptionid => $subscriptionid,
-    bibliotitle    => $subscription->{bibliotitle},
-    $op            => 1,
-    popup          => ($mode eq 'popup'),
+    op => $op,
 );
 
-# Print the page
 output_html_with_http_headers $query, $cookie, $template->output;