#
# 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 3 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>.
use Modern::Perl;
use Carp;
use Koha::Database;
+use Koha::DateUtils qw( dt_from_string );
use Koha::Club;
}
}
+ my $dtf = Koha::Database->new->schema->storage->datetime_parser;
+
+ # Only clubs with no end date or an end date in the future can be enrolled in
+ $params->{'-and'} = [
+ -or => [
+ date_end => { '>=' => $dtf->format_datetime( dt_from_string() ) },
+ date_end => undef,
+ ],
+ -or => [
+ 'me.branchcode' => $borrower->branchcode,
+ 'me.branchcode' => undef,
+ ]
+ ];
+
my $rs = $self->_resultset()->search( $params, { prefetch => 'club_template' } );
if (wantarray) {