#
# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
=head1 NAME
use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Auth;
-use C4::Branch;
use C4::Context;
+use C4::Koha qw( GetAuthorisedValues );
use C4::Output;
use C4::Serials;
+use Koha::AdditionalField;
use Koha::DateUtils;
my $expiration_date = $query->param('expiration_date_filter') || '';
my $routing = $query->param('routing') || C4::Context->preference("RoutingSerials");
my $searched = $query->param('searched') || 0;
-my @subscriptionids = $query ->param('subscriptionid');
+my @subscriptionids = $query->multi_param('subscriptionid');
my $op = $query->param('op');
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
}
}
+
+my $additional_fields = Koha::AdditionalField->all( { tablename => 'subscription', searchable => 1 } );
+my $additional_field_filters;
+for my $field ( @$additional_fields ) {
+ my $filter_value = $query->param('additional_field_' . $field->{id} . '_filter');
+ if ( defined $filter_value and $filter_value ne q|| ) {
+ $additional_field_filters->{ $field->{name} } = {
+ value => $filter_value,
+ authorised_value_category => $field->{authorised_value_category},
+ };
+ }
+ if ( $field->{authorised_value_category} ) {
+ $field->{authorised_value_choices} = GetAuthorisedValues( $field->{authorised_value_category} );
+ }
+}
+
my $expiration_date_dt = $expiration_date ? dt_from_string( $expiration_date ) : undef;
my @subscriptions;
if ($searched){
publisher => $publisher,
bookseller => $bookseller,
branch => $branch,
+ additional_fields => [ map{ { name => $_, value => $additional_field_filters->{$_}{value}, authorised_value_category => $additional_field_filters->{$_}{authorised_value_category} } } keys %$additional_field_filters ],
location => $location,
expiration_date => $expiration_date_dt,
}
}
}
-my $branches = GetBranches();
-my @branches_loop;
-foreach (sort keys %$branches){
- my $selected = 0;
- $selected = 1 if( defined $branch and $branch eq $_ );
- push @branches_loop, {
- branchcode => $_,
- branchname => $branches->{$_}->{'branchname'},
- selected => $selected,
- };
-}
-
-
$template->param(
openedsubscriptions => \@openedsubscriptions,
closedsubscriptions => \@closedsubscriptions,
publisher_filter => $publisher,
bookseller_filter => $bookseller,
branch_filter => $branch,
- locations => C4::Koha::GetAuthorisedValues('LOC', $location),
+ location_filter => $location,
expiration_date_filter => $expiration_date_dt,
- branches_loop => \@branches_loop,
done_searched => $searched,
routing => $routing,
+ additional_field_filters => $additional_field_filters,
+ additional_fields_for_subscription => $additional_fields,
marcflavour => (uc(C4::Context->preference("marcflavour")))
);