Bug 24545: Fix license statements

[srvgit] / circ / renew.pl

diff --git a/circ/renew.pl b/circ/renew.pl
index 6634c0c..c3f1d2a 100755 (executable)
--- a/circ/renew.pl
+++ b/circ/renew.pl
@@ -4,34 +4,36 @@
 #
 # 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 Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Auth qw/:DEFAULT get_session/;
 use C4::Output;
 use C4::Circulation;
+use C4::Koha;
 use Koha::DateUtils;
 use Koha::Database;
+use Koha::BiblioFrameworks;
 
 my $cgi = new CGI;
 
-my ( $template, $librarian, $cookie ) = get_template_and_user(
+my ( $template, $librarian, $cookie, $flags ) = get_template_and_user(
     {
-        template_name   => "circ/renew.tmpl",
+        template_name   => "circ/renew.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -42,29 +44,34 @@ my ( $template, $librarian, $cookie ) = get_template_and_user(
 my $schema = Koha::Database->new()->schema();
 
 my $barcode        = $cgi->param('barcode');
+$barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespae
+$barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter'));
 my $override_limit = $cgi->param('override_limit');
 my $override_holds = $cgi->param('override_holds');
 
-my ( $item, $issue, $borrower, $error );
+my ( $item, $issue, $borrower );
+my $error = q{};
+my ( $soonest_renew_date, $latest_auto_renew_date );
 
 if ($barcode) {
+    $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespace
     $item = $schema->resultset("Item")->single( { barcode => $barcode } );
 
     if ($item) {
 
-        $issue = $item->issues()->single();
+        $issue = $item->issue();
 
         if ($issue) {
 
             $borrower = $issue->borrower();
-
-            if ( $borrower->debarred() lt dt_from_string()->ymd() ) {
+            
+            if ( ( $borrower->debarred() || q{} ) lt dt_from_string()->ymd() ) {
                 my $can_renew;
                 ( $can_renew, $error ) =
                   CanBookBeRenewed( $borrower->borrowernumber(),
                     $item->itemnumber(), $override_limit );
 
-                if ( $error eq 'on_reserve' ) {
+                if ( $error && ($error eq 'on_reserve') ) {
                     if ($override_holds) {
                         $can_renew = 1;
                         $error     = undef;
@@ -74,8 +81,25 @@ if ($barcode) {
                     }
                 }
 
+                if ( $error && ($error eq 'too_soon' or $error eq 'auto_too_soon') ) {
+                    $soonest_renew_date = C4::Circulation::GetSoonestRenewDate(
+                        $borrower->borrowernumber(),
+                        $item->itemnumber(),
+                    );
+                }
+                if ( $error && ( $error eq 'auto_too_late' ) ) {
+                    $latest_auto_renew_date = C4::Circulation::GetLatestAutoRenewDate(
+                        $borrower->borrowernumber(),
+                        $item->itemnumber(),
+                    );
+                }
                 if ($can_renew) {
-                    my $date_due = AddRenewal( undef, $item->itemnumber() );
+                    my $branchcode = C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef;
+                    my $date_due;
+                    if ( $cgi->param('renewonholdduedate') ) {
+                        $date_due = dt_from_string( scalar $cgi->param('renewonholdduedate'));
+                    }
+                    $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, $date_due );
                     $template->param( date_due => $date_due );
                 }
             }
@@ -95,8 +119,13 @@ if ($barcode) {
         item     => $item,
         issue    => $issue,
         borrower => $borrower,
-        error    => $error
+        error    => $error,
+        soonestrenewdate => $soonest_renew_date,
+        latestautorenewdate => $latest_auto_renew_date,
     );
 }
 
+# Checking if there is a Fast Cataloging Framework
+$template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' );
+
 output_html_with_http_headers( $cgi, $cookie, $template->output );