X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=acqui%2Fhistsearch.pl;h=44921be7a29dd35a373fd95bdcba4ada59058cb5;hb=d09e428a7dc9854c6f4e45f3caade3c8e141b79d;hp=5bdc8a61d819d1b974bbf8b866bf108e995bd692;hpb=b4ce3dbfb7ead3bcf06d9286bb83fcd7a6e35624;p=koha_gimpoz

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 5bdc8a61d8..44921be7a2 100755
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -1,42 +1,134 @@
 #!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Parts copyright 2011 Catalyst IT Ltd.
+#
+# 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 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
+
+
+=head1 NAME
+
+histsearch.pl
+
+=head1 DESCRIPTION
+
+this script offer a interface to search among order.
+
+=head1 CGI PARAMETERS
+
+=over 4
+
+=item title
+if the script has to filter the results on title.
+
+=item author
+if the script has to filter the results on author.
+
+=item name
+if the script has to filter the results on supplier.
+
+=item fromplacedon
+to filter on started date.
+
+=item toplacedon
+to filter on ended date.
+
+=back
+
+=cut
+
 use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
 use CGI;
-use HTML::Template;
-
-use C4::Auth;       # get_template_and_user
-use C4::Interface::CGI::Output;
+use C4::Auth;    # get_template_and_user
+use C4::Output;
 use C4::Acquisition;
+use C4::Dates;
+use C4::Debug;
 
 my $input = new CGI;
-my $title = $input->param('title');
-my $author = $input->param('author');
-my $name = $input->param('name');
-my $from_placed_on = $input->param('fromplacedon');
-my $to_placed_on = $input->param('toplacedon');
+my $title                   = $input->param( 'title');
+my $author                  = $input->param('author');
+my $isbn                    = $input->param('isbn');
+my $name                    = $input->param( 'name' );
+my $basket                  = $input->param( 'basket' );
+my $booksellerinvoicenumber = $input->param( 'booksellerinvoicenumber' );
+my $do_search               = $input->param('do_search') || 0;
+my $from_placed_on          = C4::Dates->new($input->param('from'));
+my $to_placed_on            = C4::Dates->new($input->param('to'));
+if ( not $input->param('from') ) {
+    # FIXME Dirty but we can't sent a Date::Calc to C4::Dates ?
+    # We would use a function like Add_Delta_YM(-1, 0, 0);
+    $$from_placed_on{dmy_arrayref}[5] -= 1;
+}
 
 my $dbh = C4::Context->dbh;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/histsearch.tmpl",
-			     query => $input,
-			     type => "intranet",
-			     authnotrequired => 0,
-			     flagsrequired => {acquisition => 1},
-			     debug => 1,
-			     });
-my ($order_loop,$total_qty,$total_price,$total_qtyreceived)= &histsearch($title,$author,$name,$from_placed_on,$to_placed_on);
-$template->param(suggestions_loop => $order_loop,
-				total_qty => $total_qty,
-				total_qtyreceived => $total_qtyreceived,
-				total_price => sprintf  ("%.2f",$total_price),
-				numresults => scalar(@$order_loop),
-				title => $title,
-				author => $author,
-				name => $name,
-				from_placed_on =>$from_placed_on,
-				to_placed_on =>$to_placed_on,
-				intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
-		intranetstylesheet => C4::Context->preference("intranetstylesheet"),
-		IntranetNav => C4::Context->preference("IntranetNav"),
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "acqui/histsearch.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 'group_manage', acquisition => 'order_manage', acquisition => 'order_receive' },
+        debug           => 1,
+    }
 );
+
+my ( $from_iso, $to_iso, $d );
+if ( $d = $input->param('from') ) {
+    $from_iso = C4::Dates->new($d)->output('iso');
+}
+if ( $d = $input->param('iso') ) {
+    $to_iso = C4::Dates->new($d)->output('iso');
+}
+
+my ( $order_loop, $total_qty, $total_price, $total_qtyreceived );
+# If we're supplied any value then we do a search. Otherwise we don't.
+if ($do_search) {
+    ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) = GetHistory(
+        title => $title,
+        author => $author,
+        isbn   => $isbn,
+        name => $name,
+        from_placed_on => $from_iso,
+        to_placed_on => $to_iso,
+        basket => $basket,
+        booksellerinvoicenumber => $booksellerinvoicenumber,
+    );
+}
+
+my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
+my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
+
+$template->param(
+    suggestions_loop        => $order_loop,
+    total_qty               => $total_qty,
+    total_qtyreceived       => $total_qtyreceived,
+    total_price             => sprintf( "%.2f", $total_price ),
+    numresults              => $order_loop ? scalar(@$order_loop) : undef,
+    title                   => $title,
+    author                  => $author,
+    isbn                    => $isbn,
+    name                    => $name,
+    basket                  => $basket,
+    booksellerinvoicenumber => $booksellerinvoicenumber,
+    from_placed_on          => $from_date,
+    to_placed_on            => $to_date,
+    DHTMLcalendar_dateformat=> C4::Dates->DHTMLcalendar(),
+    dateformat              => C4::Dates->new()->format(),
+    debug                   => $debug || $input->param('debug') || 0,
+);
+
 output_html_with_http_headers $input, $cookie, $template->output;