# 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
=cut
use strict;
-require Exporter;
+#use warnings; FIXME - Bug 2505
use CGI;
use C4::Auth; # get_template_and_user
use C4::Output;
use C4::Acquisition;
use C4::Dates;
-
-use vars qw($debug);
-
-BEGIN {
- $debug = $ENV{DEBUG} || 0;
-}
-
-my $input = new CGI;
-$debug or $debug = $input->param('debug') || 0;
-my $title = $input->param( 'title');
-my $author = $input->param('author');
-my $name = $input->param( 'name' );
-my $from_placed_on = C4::Dates->new($input->param('from'));
-my $to_placed_on = C4::Dates->new($input->param( 'to'));
+use C4::Debug;
+
+my $input = new CGI;
+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 $from_placed_on = $input->param('from');
+$from_placed_on = C4::Dates->new($from_placed_on) if $from_placed_on;
+my $to_placed_on = $input->param('to');
+$to_placed_on = C4::Dates->new($to_placed_on) if $to_placed_on;
my $dbh = C4::Context->dbh;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
);
-my $from_iso = C4::Dates->new($input->param('from'))->output('iso') if $input->param('from');
-my $to_iso = C4::Dates->new($input->param('to'))->output('iso') if $input->param('iso');
-my ( $order_loop, $total_qty, $total_price, $total_qtyreceived ) =
- &GetHistory( $title, $author, $name, $from_iso, $to_iso );
-
+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.
+my $do_search = $title || $author || $isbn || $name || $basket || $booksellerinvoicenumber ||
+ $from_placed_on || $to_placed_on;
+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 => scalar(@$order_loop),
+ numresults => $order_loop ? scalar(@$order_loop) : undef,
title => $title,
author => $author,
+ isbn => $isbn,
name => $name,
- from_placed_on => $from_placed_on->output('syspref'),
- to_placed_on => $to_placed_on->output('syspref'),
+ 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,
+ debug => $debug || $input->param('debug') || 0,
);
output_html_with_http_headers $input, $cookie, $template->output;