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

(-)a/Koha/Clubs.pm (-3 / +3 lines)
Lines 39-56 This object represents a collection of clubs a patron may enroll in. Link Here
39
39
40
=cut
40
=cut
41
41
42
=head3 GetEnrollable
42
=head3 get_enrollable
43
43
44
=cut
44
=cut
45
45
46
sub GetEnrollable {
46
sub get_enrollable {
47
    my ( $self, $params ) = @_;
47
    my ( $self, $params ) = @_;
48
48
49
    # We need to filter out all the already enrolled in clubs
49
    # We need to filter out all the already enrolled in clubs
50
    my $borrower = $params->{borrower};
50
    my $borrower = $params->{borrower};
51
    if ($borrower) {
51
    if ($borrower) {
52
        delete( $params->{borrower} );
52
        delete( $params->{borrower} );
53
        my @enrollments = $borrower->GetClubEnrollments();
53
        my @enrollments = $borrower->get_club_enrollments();
54
        if (@enrollments) {
54
        if (@enrollments) {
55
            $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] };
55
            $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] };
56
        }
56
        }
(-)a/Koha/Patron.pm (-11 / +11 lines)
Lines 595-627 sub FirstValidEmailAddress { Link Here
595
    return $self->email() || $self->emailpro() || $self->b_email() || q{};
595
    return $self->email() || $self->emailpro() || $self->b_email() || q{};
596
}
596
}
597
597
598
=head3 GetClubEnrollments
598
=head3 get_club_enrollments
599
599
600
=cut
600
=cut
601
601
602
sub GetClubEnrollments {
602
sub get_club_enrollments {
603
    my ($self) = @_;
603
    my ($self) = @_;
604
604
605
    return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } );
605
    return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } );
606
}
606
}
607
607
608
=head3 GetClubEnrollmentsCount
608
=head3 get_club_enrollments_count
609
609
610
=cut
610
=cut
611
611
612
sub GetClubEnrollmentsCount {
612
sub get_club_enrollments_count {
613
    my ($self) = @_;
613
    my ($self) = @_;
614
614
615
    my $e = $self->GetClubEnrollments();
615
    my $e = $self->get_club_enrollments();
616
616
617
    return $e->count();
617
    return $e->count();
618
}
618
}
619
619
620
=head3 GetEnrollableClubs
620
=head3 get_enrollable_clubs
621
621
622
=cut
622
=cut
623
623
624
sub GetEnrollableClubs {
624
sub get_enrollable_clubs {
625
    my ( $self, $is_enrollable_from_opac ) = @_;
625
    my ( $self, $is_enrollable_from_opac ) = @_;
626
626
627
    my $params;
627
    my $params;
Lines 631-647 sub GetEnrollableClubs { Link Here
631
631
632
    $params->{borrower} = $self;
632
    $params->{borrower} = $self;
633
633
634
    return Koha::Clubs->GetEnrollable($params);
634
    return Koha::Clubs->get_enrollable($params);
635
}
635
}
636
636
637
=head3 GetEnrollableClubsCount
637
=head3 get_enrollable_clubs_count
638
638
639
=cut
639
=cut
640
640
641
sub GetEnrollableClubsCount {
641
sub get_enrollable_clubs_count {
642
    my ( $self, $is_enrollable_from_opac ) = @_;
642
    my ( $self, $is_enrollable_from_opac ) = @_;
643
643
644
    my $e = $self->GetEnrollableClubs($is_enrollable_from_opac);
644
    my $e = $self->get_enrollable_clubs($is_enrollable_from_opac);
645
645
646
    return $e->count();
646
    return $e->count();
647
}
647
}
(-)a/clubs/patron-clubs-tab.pl (-2 / +2 lines)
Lines 43-50 my $borrowernumber = $cgi->param('borrowernumber'); Link Here
43
43
44
my $borrower = Koha::Patrons->find($borrowernumber);
44
my $borrower = Koha::Patrons->find($borrowernumber);
45
45
46
my @enrollments = $borrower->GetClubEnrollments();
46
my @enrollments = $borrower->get_club_enrollments();
47
my @clubs       = $borrower->GetEnrollableClubs();
47
my @clubs       = $borrower->get_enrollable_clubs();
48
48
49
$template->param(
49
$template->param(
50
    enrollments    => \@enrollments,
50
    enrollments    => \@enrollments,
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-2 / +2 lines)
Lines 898-905 No patron matched <span class="ex">[% message | html %]</span> Link Here
898
        [% END %]
898
        [% END %]
899
    </li>
899
    </li>
900
900
901
    [% SET enrollments = borrower.GetClubEnrollmentsCount %]
901
    [% SET enrollments = borrower.get_club_enrollments_count %]
902
    [% SET enrollable  = borrower.GetEnrollableClubsCount %]
902
    [% SET enrollable  = borrower.get_enrollable_clubs_count %]
903
    [% IF CAN_user_clubs && ( enrollable || enrollments ) %]
903
    [% IF CAN_user_clubs && ( enrollable || enrollments ) %]
904
        <li>
904
        <li>
905
            <a id="clubs-tab-link" href="#clubs-tab">
905
            <a id="clubs-tab-link" href="#clubs-tab">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-2 / +2 lines)
Lines 526-533 function validate1(date) { Link Here
526
            </li>
526
            </li>
527
        [% END %]
527
        [% END %]
528
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
528
        <li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
529
        [% SET enrollments = borrower.GetClubEnrollmentsCount %]
529
        [% SET enrollments = borrower.get_club_enrollments_count %]
530
        [% SET enrollable  = borrower.GetEnrollableClubsCount %]
530
        [% SET enrollable  = borrower.get_enrollable_clubs_count %]
531
        [% IF CAN_user_clubs && ( enrollments || enrollable ) %]
531
        [% IF CAN_user_clubs && ( enrollments || enrollable ) %]
532
            <li>
532
            <li>
533
                <a id="clubs-tab-link" href="#clubs-tab">
533
                <a id="clubs-tab-link" href="#clubs-tab">
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-3 / +3 lines)
Lines 134-143 Using this account is not recommended because some parts of Koha will not functi Link Here
134
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %]
134
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %]
135
                            [% END %]
135
                            [% END %]
136
136
137
                            [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %]
137
                            [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %]
138
                                <li>
138
                                <li>
139
                                    <a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
139
                                    <a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
140
                                        Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %])
140
                                        Clubs ([% borrower.get_club_enrollments_count %]/[% borrower.get_enrollable_clubs_count(1) %])
141
                                    </a>
141
                                    </a>
142
                                </li>
142
                                </li>
143
                            [% END %]
143
                            [% END %]
Lines 324-330 Using this account is not recommended because some parts of Koha will not functi Link Here
324
                            [% END # IF issues_count %]
324
                            [% END # IF issues_count %]
325
                        </div> <!-- / .opac-user-checkouts -->
325
                        </div> <!-- / .opac-user-checkouts -->
326
326
327
                        [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %]
327
                        [% IF borrower.get_club_enrollments_count || borrower.get_enrollable_clubs_count(1) %]
328
                            <div id="opac-user-clubs">
328
                            <div id="opac-user-clubs">
329
                                Loading...
329
                                Loading...
330
                            </div>
330
                            </div>
(-)a/opac/clubs/clubs-tab.pl (-3 / +2 lines)
Lines 40-47 my $borrowernumber = $cgi->param('borrowernumber'); Link Here
40
40
41
my $borrower = Koha::Patrons->find($borrowernumber);
41
my $borrower = Koha::Patrons->find($borrowernumber);
42
42
43
my @enrollments = $borrower->GetClubEnrollments();
43
my @enrollments = $borrower->get_club_enrollments();
44
my @clubs = $borrower->GetEnrollableClubs( my $opac = 1 );
44
my @clubs = $borrower->get_enrollable_clubs( my $opac = 1 );
45
45
46
$template->param(
46
$template->param(
47
    enrollments => \@enrollments,
47
    enrollments => \@enrollments,
48
- 

Return to bug 12461