X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fissuehistory.pl;h=0c50dcbb88f8108c0198009f47a0ed71f29c41a5;hb=refs%2Fheads%2Fkoha_ffzg;hp=a5c4d0dc2f5b70855d465aba0edb67133db10081;hpb=65be03846d064dd6d9e7159550a269a352054b65;p=koha.git

diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl
index a5c4d0dc2f..0c50dcbb88 100755
--- a/catalogue/issuehistory.pl
+++ b/catalogue/issuehistory.pl
@@ -2,82 +2,70 @@
 
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 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; FIXME - Bug 2505
+use Modern::Perl;
 
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 
-use C4::Circulation;    # GetBiblioIssues
-use C4::Biblio;    # GetBiblio GetBiblioFromItemNumber
+use C4::Biblio;    # GetBiblio
 use C4::Search;		# enabled_staff_search_views
-use Koha::DateUtils;
+use C4::Serials;
+use Koha::Checkouts;
+use Koha::Old::Checkouts;
+
+use Koha::Biblios;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
-        template_name   => "catalogue/issuehistory.tmpl",
+        template_name   => "catalogue/issuehistory.tt",
         query           => $query,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { circulate => "circulate_remaining_permissions" },
+        flagsrequired   => { catalogue => 1 },
     }
 );
 
-# getting cgi params.
-my $params = $query->Vars;
+my $biblionumber = $query->param('biblionumber');
 
-my $biblionumber = $params->{'biblionumber'};
-my $itemnumber   = $params->{'itemnumber'};
+my @checkouts = Koha::Checkouts->search(
+    { biblionumber => $biblionumber },
+    {
+        join       => 'item',
+        order_by   => 'timestamp',
+    }
+);
+my @old_checkouts = Koha::Old::Checkouts->search(
+    { biblionumber => $biblionumber },
+    {
+        join       => 'item',
+        order_by   => 'timestamp',
+    }
+);
 
-if (C4::Context->preference("HidePatronName")) {
-   $template->param(HidePatronName => 1);
-}
+my $biblio = Koha::Biblios->find( $biblionumber );
 
-my ($issues,$biblio,$barcode);
-if ($itemnumber){
-	$issues=GetItemIssues($itemnumber);
-	$biblio=GetBiblioFromItemNumber($itemnumber);
-	$biblionumber=$biblio->{biblionumber};
-	$barcode=$issues->[0]->{barcode};
-	$template->param(
-		%$biblio,
-		barcode=> $barcode,
-	);
-} else {
-	$issues = GetBiblioIssues($biblionumber);
-        my $biblio = GetBiblio($biblionumber);
-	my $total  = scalar @$issues;
-	$template->param(
-               %{$biblio},
-	);
-} 
-foreach (@{$issues}){
-	$_->{date_due}   = format_sqldatetime($_->{date_due});
-	$_->{issuedate}  = format_sqldatetime($_->{issuedate});
-	$_->{returndate} = format_sqldatetime($_->{returndate});
-	$_->{lastreneweddate} = format_sqldatetime($_->{lastreneweddate});
-}
 $template->param(
-    total        => scalar @$issues,
-    issues       => $issues,
+    checkouts => [ @checkouts, @old_checkouts ],
+    biblio    => $biblio,
 	issuehistoryview => 1,
 	C4::Search::enabled_staff_search_views,
+    subscriptionsnumber => CountSubscriptionFromBiblionumber($biblionumber),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;