Bug 15774: Add additional fields to order baskets

[srvgit] / acqui / histsearch.pl

diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl
index 663ab60..a1c7fe6 100755 (executable)
--- a/acqui/histsearch.pl
+++ b/acqui/histsearch.pl
@@ -56,6 +56,7 @@ use C4::Output;
 use C4::Acquisition;
 use C4::Debug;
 use C4::Koha;
+use Koha::AdditionalField;
 use Koha::DateUtils;
 
 my $input = new CGI;
@@ -87,7 +88,7 @@ my $filters = {
     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'),
+    created_by              => [ $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;
@@ -97,6 +98,12 @@ unless ( $input->param('from') ) {
 }
 $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 } ),
+$filters->{additional_fields} = Koha::AdditionalField->get_filters_from_query({
+    tablename => 'aqbasket',
+    query => $input,
+} );
+
+$template->param( available_additional_fields => scalar Koha::AdditionalField->all( { tablename => 'aqbasket', searchable => 1 } ) );
 
 my $order_loop;
 # If we're supplied any value then we do a search. Otherwise we don't.