Bug 31775: Show single library

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

diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl
index 16b9f6d..46a2050 100755 (executable)
--- a/opac/opac-renew.pl
+++ b/opac/opac-renew.pl
@@ -21,39 +21,35 @@
 # 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;
-use C4::Auth;
+use C4::Circulation qw( CanBookBeRenewed AddRenewal );
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Items;
 use C4::Members;
-use Date::Calc qw( Today Date_to_Days );
-my $query = new CGI;
+use Koha::Items;
+use Koha::Patrons;
+my $query = CGI->new;
 
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
        {
         template_name   => "opac-user.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        flagsrequired   => { borrow => 1 },
-        debug           => 1,
        }
 ); 
-my @items = $query->param('item');
+my @items = $query->multi_param('item');
 
 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';
 }
@@ -63,27 +59,7 @@ else {
         my ( $status, $error ) =
           CanBookBeRenewed( $borrowernumber, $itemnumber );
         if ( $status == 1 && $opacrenew == 1 ) {
-            my $renewalbranch = C4::Context->preference('OpacRenewalBranch');
-            my $branchcode;
-            if ( $renewalbranch eq 'itemhomebranch' ) {
-                my $item = GetItem($itemnumber);
-                $branchcode = $item->{'homebranch'};
-            }
-            elsif ( $renewalbranch eq 'patronhomebranch' ) {
-                my $borrower = GetMemberDetails($borrowernumber);
-                $branchcode = $borrower->{'branchcode'};
-            }
-            elsif ( $renewalbranch eq 'checkoutbranch' ) {
-                my $issue = GetOpenIssue($itemnumber);
-                $branchcode = $issue->{'branchcode'};
-            }
-            elsif ( $renewalbranch eq 'NULL' ) {
-                $branchcode = '';
-            }
-            else {
-                $branchcode = 'OPACRenew';
-            }
-            AddRenewal( $borrowernumber, $itemnumber, $branchcode );
+            AddRenewal( $borrowernumber, $itemnumber, undef, undef, undef, undef, 0 );
             push( @renewed, $itemnumber );
         }
         else {