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 9da82e5..85570d5 100755 (executable)
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -21,8 +21,7 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
-use warnings;
+use Modern::Perl;
 
 use CGI qw ( -utf8 );
 use C4::Circulation;
@@ -30,6 +29,8 @@ 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;
 
@@ -49,10 +50,10 @@ my $opacrenew = C4::Context->preference("OpacRenewalAllowed");
 my $errorstring = q{};
 my $renewed     = q{};
 
-my $member_details = GetMemberDetails($borrowernumber);
+my $patron = Koha::Patrons->find( $borrowernumber );
 
-if (   $member_details->{'BlockExpiredPatronOpacActions'}
-    && $member_details->{'is_expired'} )
+if (   $patron->category->effective_BlockExpiredPatronOpacActions
+    && $patron->is_expired )
 {
     $errorstring = 'card_expired';
 }
@@ -65,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' ) {
@@ -82,7 +82,7 @@ else {
             else {
                 $branchcode = 'OPACRenew';
             }
-            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
+            AddRenewal( $borrowernumber, $itemnumber, $branchcode, undef, undef );
             push( @renewed, $itemnumber );
         }
         else {