X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=serials%2Fcheckexpiration.pl;h=aeebd2f5bc64de3cbc77b28554f969143b96302a;hb=d7363cd52335153b80f4092fa929c16d4cdc5101;hp=bf4b6e933b5ae505c538adb038c001b0f1eb7cf8;hpb=9b8b74fd8f2b8b3af102cfb60437e3b8b4040110;p=srvgit

diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl
index bf4b6e933b..aeebd2f5bc 100755
--- a/serials/checkexpiration.pl
+++ b/serials/checkexpiration.pl
@@ -3,18 +3,18 @@
 #
 # 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>.
 
 
 =head1 NAME
@@ -42,24 +42,23 @@ The date to filter on.
 
 =cut
 
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Serials; # GetExpirationDate
 use C4::Output;
 use C4::Context;
-use C4::Dates qw/format_date format_date_in_iso/;
-use Date::Calc qw/Today Date_to_Days/;
+use Koha::DateUtils;
 
-my $query = new CGI;
+use DateTime;
 
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
+my $query = CGI->new;
+
+my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user (
     {
-        template_name   => "serials/checkexpiration.tmpl",
+        template_name   => "serials/checkexpiration.tt",
         query           => $query,
         type            => "intranet",
-        authnotrequired => 0,
         flagsrequired   => { serials => 'check_expiration' },
         debug           => 1,
     }
@@ -67,10 +66,13 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
 
 my $title = $query->param('title');
 my $issn  = $query->param('issn');
-my $date  = format_date_in_iso($query->param('date'));
+my $branch = $query->param('branch');
+my $date = $query->param('date');
+$date = eval { dt_from_string( scalar $query->param('date') ) } if $date;
+my $showhistoricexpired = $query->param('showhistoricexpired');
 
 if ($date) {
-    my @subscriptions = GetSubscriptions( $title, $issn );
+    my @subscriptions = SearchSubscriptions({ title => $title, issn => $issn, orderby => 'title' });
     my @subscriptions_loop;
 
     foreach my $subscription ( @subscriptions ) {
@@ -78,25 +80,53 @@ if ($date) {
         my $expirationdate = GetExpirationDate($subscriptionid);
 
         $subscription->{expirationdate} = $expirationdate;
+
         next if $expirationdate !~ /\d{4}-\d{2}-\d{2}/; # next if not in ISO format.
-        if ( Date_to_Days(split "-",$expirationdate) < Date_to_Days(split "-",$date) &&
-			 Date_to_Days(split "-",$expirationdate) > Date_to_Days(&Today) ) {
-            $subscription->{expirationdate}=format_date($subscription->{expirationdate});
-            push @subscriptions_loop,$subscription;
+
+        next if $subscription->{closed};
+        if (   !C4::Context->preference("IndependentBranches")
+            or C4::Context->IsSuperLibrarian()
+            or ( ref $flags->{serials} and $flags->{serials}->{superserials} )
+            or ( !ref $flags->{serials} and $flags->{serials} == 1 ) )
+        {
+            $subscription->{cannotedit} = 0;
+        }
+        next if $subscription->{cannotedit};
+
+        my $expirationdate_dt = dt_from_string( $expirationdate, 'iso' );
+        my $today_dt = dt_from_string();
+        if (   DateTime->compare( $date, $expirationdate_dt ) == 1
+            && ( $showhistoricexpired || DateTime->compare( $expirationdate_dt, $today_dt ) == 1 )
+            && ( !$branch || ( $subscription->{'branchcode'} eq $branch ) ) ) {
+            push @subscriptions_loop, $subscription;
         }
     }
 
-    $template->param (
-        title           => $title,
-        issn            => $issn,
-        numsubscription => scalar @subscriptions_loop,
-        date => format_date($date),
-        subscriptions_loop => \@subscriptions_loop,
-        "BiblioDefaultView".C4::Context->preference("BiblioDefaultView") => 1,
+    $template->param(
+        title               => $title,
+        issn                => $issn,
+        showhistoricexpired => $showhistoricexpired,
+        numsubscription     => scalar @subscriptions_loop,
+        date                => $date,
+        subscriptions_loop  => \@subscriptions_loop,
+        "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1,
+        searched                                                           => 1,
     );
 }
+
+my $can_change_library;;
+if (  !C4::Context->preference("IndependentBranches")
+    or C4::Context->IsSuperLibrarian()
+    or ( ref $flags->{serials}  and $flags->{serials}->{superserials} )
+    or ( !ref $flags->{serials} and $flags->{serials} == 1 ) )
+{
+    $can_change_library = 1;
+}
+
 $template->param (
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
-    (uc(C4::Context->preference("marcflavour"))) => 1
+    (uc(C4::Context->preference("marcflavour"))) => 1,
+    can_change_library => $can_change_library,
+    branch => $branch,
 );
+
 output_html_with_http_headers $query, $cookie, $template->output;