Bug 15184: Change permission (+x) on .pl

[koha.git] / acqui / histsearch.pl

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 5add9e1..663ab60 100755 (executable)
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -49,40 +49,17 @@ to filter on ended date.
 
 =cut
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Auth;    # get_template_and_user
 use C4::Output;
 use C4::Acquisition;
-use C4::Dates;
 use C4::Debug;
-use C4::Branch;
 use C4::Koha;
+use Koha::DateUtils;
 
 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 $ean                     = $input->param('ean');
-my $basket                  = $input->param( 'basket' );
-my $basketgroupname             = $input->param('basketgroupname');
-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'));
-my $budget                  = $input->param( 'budget' );
-my $orderstatus             = $input->param( 'orderstatus' );
-my $ordernumber             = $input->param( 'ordernumber' );
-my $search_children_too     = $input->param( 'search_children_too' );
-my @created_by              = $input->param('created_by');
-
-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(
@@ -96,39 +73,37 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-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 $filters = {
+    basket                  => scalar $input->param('basket'),
+    title                   => scalar $input->param('title'),
+    author                  => scalar $input->param('author'),
+    isbn                    => scalar $input->param('isbn'),
+    name                    => scalar $input->param('name'),
+    ean                     => scalar $input->param('ean'),
+    basketgroupname         => scalar $input->param('basketgroupname'),
+    budget                  => scalar $input->param('budget'),
+    booksellerinvoicenumber => scalar $input->param('booksellerinvoicenumber'),
+    budget                  => scalar $input->param('budget'),
+    orderstatus             => scalar $input->param('orderstatus'),
+    ordernumber             => scalar $input->param('ordernumber'),
+    search_children_too     => scalar $input->param('search_children_too'),
+    created_by              => scalar $input->multi_param('created_by'),
+};
+my $from_placed_on = eval { dt_from_string( scalar $input->param('from') ) } || dt_from_string;
+my $to_placed_on   = eval { dt_from_string( scalar $input->param('to')   ) } || dt_from_string;
+unless ( $input->param('from') ) {
+    # Fill the form with year-1
+    $from_placed_on->subtract( years => 1 );
 }
+$filters->{from_placed_on} = output_pref( { dt => $from_placed_on, dateformat => 'iso', dateonly => 1 } ),
+$filters->{to_placed_on} = output_pref( { dt => $to_placed_on, dateformat => 'iso', dateonly => 1 } ),
 
 my $order_loop;
 # If we're supplied any value then we do a search. Otherwise we don't.
 if ($do_search) {
-    $order_loop = GetHistory(
-        title => $title,
-        author => $author,
-        isbn   => $isbn,
-        ean   => $ean,
-        name => $name,
-        from_placed_on => $from_iso,
-        to_placed_on => $to_iso,
-        basket => $basket,
-        booksellerinvoicenumber => $booksellerinvoicenumber,
-        basketgroupname => $basketgroupname,
-        budget => $budget,
-        orderstatus => $orderstatus,
-        ordernumber => $ordernumber,
-        search_children_too => $search_children_too,
-        created_by => \@created_by,
-    );
+    $order_loop = GetHistory(%$filters);
 }
 
-my $from_date = $from_placed_on ? $from_placed_on->output('syspref') : undef;
-my $to_date = $to_placed_on ? $to_placed_on->output('syspref') : undef;
-
 my $budgetperiods = C4::Budgets::GetBudgetPeriods;
 my $bp_loop = $budgetperiods;
 for my $bp ( @{$budgetperiods} ) {
@@ -140,26 +115,10 @@ for my $bp ( @{$budgetperiods} ) {
 }
 
 $template->param(
-    order_loop              => $order_loop,
-    numresults              => $order_loop ? scalar(@$order_loop) : undef,
-    title                   => $title,
-    author                  => $author,
-    isbn                    => $isbn,
-    ean                     => $ean,
-    name                    => $name,
-    basket                  => $basket,
-    booksellerinvoicenumber => $booksellerinvoicenumber,
-    basketgroupname         => $basketgroupname,
-    ordernumber             => $ordernumber,
-    search_children_too     => $search_children_too,
-    from_placed_on          => $from_date,
-    to_placed_on            => $to_date,
-    orderstatus             => $orderstatus,
-    budget_id               => $budget,
-    bp_loop                 => $bp_loop,
-    search_done             => $do_search,
-    debug                   => $debug || $input->param('debug') || 0,
-    uc(C4::Context->preference("marcflavour")) => 1
+    order_loop  => $order_loop,
+    filters     => $filters,
+    bp_loop     => $bp_loop,
+    search_done => $do_search,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;