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

[koha-equinox.git] / reserve / modrequest.pl

diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl
index ff810f8..6c134ef 100755 (executable)
--- a/reserve/modrequest.pl
+++ b/reserve/modrequest.pl
@@ -22,12 +22,13 @@
 # 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 Modern::Perl;
 use CGI qw ( -utf8 );
+use List::MoreUtils qw( uniq );
 use C4::Output;
 use C4::Reserves;
 use C4::Auth;
+use Koha::DateUtils qw( dt_from_string );
 
 my $query = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -41,17 +42,18 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my @reserve_id = $query->param('reserve_id');
-my @rank = $query->param('rank-request');
-my @biblionumber = $query->param('biblionumber');
-my @borrower = $query->param('borrowernumber');
-my @branch = $query->param('pickup');
-my @itemnumber = $query->param('itemnumber');
-my @suspend_until=$query->param('suspend_until');
-my $multi_hold = $query->param('multi_hold');
-my $biblionumbers = $query->param('biblionumbers');
+my @reserve_id = $query->multi_param('reserve_id');
+my @rank = $query->multi_param('rank-request');
+my @borrower = $query->multi_param('borrowernumber');
+my @reservedates = $query->multi_param('reservedate');
+my @expirationdates = $query->multi_param('expirationdate');
+my @branch = $query->multi_param('pickup');
+my @itemnumber = $query->multi_param('itemnumber');
+my @biblionumber = $query->multi_param('biblionumber');
 my $count=@rank;
 
+@biblionumber = uniq @biblionumber;
+
 my $CancelBiblioNumber = $query->param('CancelBiblioNumber');
 my $CancelBorrowerNumber = $query->param('CancelBorrowerNumber');
 my $CancelItemnumber = $query->param('CancelItemnumber');
@@ -67,14 +69,21 @@ if ($CancelBorrowerNumber) {
 # 2) Cancel or modify the queue list of reserves (without item linked)
 else {
     for (my $i=0;$i<$count;$i++){
-        undef $itemnumber[$i] unless $itemnumber[$i] ne '';
-        ModReserve({
+        undef $itemnumber[$i] if !$itemnumber[$i];
+        my $suspend_until = $query->param( "suspend_until_" . $reserve_id[$i] );
+        my $params = {
             rank => $rank[$i],
             reserve_id => $reserve_id[$i],
+            expirationdate => $expirationdates[$i] ? dt_from_string($expirationdates[$i]) : undef,
             branchcode => $branch[$i],
             itemnumber => $itemnumber[$i],
-            suspend_until => $suspend_until[$i]
-        });
+            defined $suspend_until ? ( suspend_until => $suspend_until ) : (),
+        };
+        if (C4::Context->preference('AllowHoldDateInFuture')) {
+            $params->{reservedate} = $reservedates[$i] ? dt_from_string($reservedates[$i]) : undef;
+        }
+
+        ModReserve($params);
     }
 }
 
@@ -86,10 +95,6 @@ if ( $from eq 'borrower'){
     print $query->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrower[0]");
 } else {
      my $url = "/cgi-bin/koha/reserve/request.pl?";
-     if ($multi_hold) {
-         $url .= "multi_hold=1&biblionumbers=$biblionumbers";
-     } else {
-         $url .= "biblionumber=$biblionumber[0]";
-     }
+     $url .= "biblionumbers=" . join('/', @biblionumber);
      print $query->redirect($url);
 }