View | Details | Raw Unified | Return to bug 18557
Collapse All | Expand All

(-)a/Koha/Clubs.pm (-1 / +1 lines)
Lines 58-64 sub get_enrollable { Link Here
58
58
59
    # Only clubs with no end date or an end date in the future can be enrolled in
59
    # Only clubs with no end date or an end date in the future can be enrolled in
60
    $params->{'-and'} = [
60
    $params->{'-and'} = [
61
        -or => [ date_end => { '>=' => \'CURRENT_DATE()' }, date_end => undef],
61
        -or => [ date_end => { '>=' => \'CAST(now() AS date)' }, date_end => undef],
62
        -or => [ 'me.branchcode' => $borrower->branchcode, 'me.branchcode' => undef ]
62
        -or => [ 'me.branchcode' => $borrower->branchcode, 'me.branchcode' => undef ]
63
    ];
63
    ];
64
64
(-)a/t/db_dependent/Clubs.t (-1 / +10 lines)
Lines 124-129 is( $club_template->club_template_enrollment_fields->count, Link Here
124
    2, 'Club template has two enrollment fields' );
124
    2, 'Club template has two enrollment fields' );
125
125
126
## Create a club based on this template
126
## Create a club based on this template
127
Koha::Club->new(
128
    {
129
        club_template_id => $club_template->id,
130
        name             => "Test Expired Club",
131
        branchcode       => $branchcode,
132
        date_start       => '1900-01-01',
133
        date_end         => '1900-01-02',
134
    }
135
)->store();
136
127
my $club = Koha::Club->new(
137
my $club = Koha::Club->new(
128
    {
138
    {
129
        club_template_id => $club_template->id,
139
        club_template_id => $club_template->id,
130
- 

Return to bug 18557