ffzg/recall_notices.pl: added --interval and --dedup

[koha.git] / opac / opac-renew.pl

diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index ca58f3d..85570d5 100755 (executable)
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -7,55 +7,58 @@
 
 # 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>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Circulation;
 use C4::Auth;
 use C4::Context;
 use C4::Items;
 use C4::Members;
+use Koha::Items;
+use Koha::Patrons;
 use Date::Calc qw( Today Date_to_Days );
 my $query = new CGI;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
        {
-                 template_name   => "opac-user.tmpl",
-                 query           => $query,
-                 type            => "opac",
-                 authnotrequired => 0,
-                 flagsrequired   => { borrow => 1 },
-                 debug           => 1,
+        template_name   => "opac-user.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        debug           => 1,
        }
 ); 
-my @items          = $query->param('item');
+my @items = $query->multi_param('item');
 
 my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
 
-my $errorstring='';
-my $member_details = GetMemberDetails($borrowernumber);
+my $errorstring = q{};
+my $renewed     = q{};
 
-if (   $member_details->{'BlockExpiredPatronOpacActions'}
-    && $member_details->{'is_expired'} )
+my $patron = Koha::Patrons->find( $borrowernumber );
+
+if (   $patron->category->effective_BlockExpiredPatronOpacActions
+    && $patron->is_expired )
 {
     $errorstring = 'card_expired';
 }
 else {
+    my @renewed;
     for my $itemnumber (@items) {
         my ( $status, $error ) =
           CanBookBeRenewed( $borrowernumber, $itemnumber );
@@ -63,15 +66,14 @@ else {
             my $renewalbranch = C4::Context->preference('OpacRenewalBranch');
             my $branchcode;
             if ( $renewalbranch eq 'itemhomebranch' ) {
-                my $item = GetItem($itemnumber);
-                $branchcode = $item->{'homebranch'};
+                my $item = Koha::Items->find($itemnumber);
+                $branchcode = $item->homebranch;
             }
             elsif ( $renewalbranch eq 'patronhomebranch' ) {
-                my $borrower = GetMemberDetails($borrowernumber);
-                $branchcode = $borrower->{'branchcode'};
+                $branchcode = Koha::Patrons->find( $borrowernumber )->branchcode;
             }
             elsif ( $renewalbranch eq 'checkoutbranch' ) {
-                my $issue = GetOpenIssue($itemnumber);
+                my $issue = GetOpenIssue($itemnumber); # FIXME Should not be $item->checkout?
                 $branchcode = $issue->{'branchcode'};
             }
             elsif ( $renewalbranch eq 'NULL' ) {
@@ -80,13 +82,15 @@ else {
             else {
                 $branchcode = 'OPACRenew';
             }
-            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
+            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef );
+            push( @renewed, $itemnumber );
         }
         else {
             $errorstring .= $error . "|";
         }
     }
+    $renewed = join( ':', @renewed );
 }
 
-print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring");
+print $query->redirect("/cgi-bin/koha/opac-user.pl?renew_error=$errorstring&renewed=$renewed");