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

(-)a/C4/Auth.pm (-2 / +3 lines)
Lines 260-266 sub get_template_and_user { Link Here
260
        my $all_perms = get_all_subpermissions();
260
        my $all_perms = get_all_subpermissions();
261
261
262
        my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
262
        my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
263
          editcatalogue updatecharges management tools editauthorities serials reports acquisition);
263
          editcatalogue updatecharges management tools editauthorities serials reports acquisition clubs);
264
264
265
        # We are going to use the $flags returned by checkauth
265
        # We are going to use the $flags returned by checkauth
266
        # to create the template's parameters that will indicate
266
        # to create the template's parameters that will indicate
Lines 283-290 sub get_template_and_user { Link Here
283
            $template->param( CAN_user_staffaccess      => 1 );
283
            $template->param( CAN_user_staffaccess      => 1 );
284
            $template->param( CAN_user_plugins          => 1 );
284
            $template->param( CAN_user_plugins          => 1 );
285
            $template->param( CAN_user_coursereserves   => 1 );
285
            $template->param( CAN_user_coursereserves   => 1 );
286
            foreach my $module ( keys %$all_perms ) {
286
            $template->param( CAN_user_clubs            => 1 );
287
287
288
            foreach my $module ( keys %$all_perms ) {
288
                foreach my $subperm ( keys %{ $all_perms->{$module} } ) {
289
                foreach my $subperm ( keys %{ $all_perms->{$module} } ) {
289
                    $template->param( "CAN_user_${module}_${subperm}" => 1 );
290
                    $template->param( "CAN_user_${module}_${subperm}" => 1 );
290
                }
291
                }
(-)a/C4/Members.pm (-13 / +3 lines)
Lines 974-993 addresses. Link Here
974
974
975
sub GetFirstValidEmailAddress {
975
sub GetFirstValidEmailAddress {
976
    my $borrowernumber = shift;
976
    my $borrowernumber = shift;
977
    my $dbh = C4::Context->dbh;
978
    my $sth = $dbh->prepare( "SELECT email, emailpro, B_email FROM borrowers where borrowernumber = ? ");
979
    $sth->execute( $borrowernumber );
980
    my $data = $sth->fetchrow_hashref;
981
977
982
    if ($data->{'email'}) {
978
    my $borrower = Koha::Patrons->find( $borrowernumber );
983
       return $data->{'email'};
979
984
    } elsif ($data->{'emailpro'}) {
980
    return $borrower->FirstValidEmailAddress();
985
       return $data->{'emailpro'};
986
    } elsif ($data->{'B_email'}) {
987
       return $data->{'B_email'};
988
    } else {
989
       return '';
990
    }
991
}
981
}
992
982
993
=head2 GetNoticeEmailAddress
983
=head2 GetNoticeEmailAddress
(-)a/Koha/Club.pm (+92 lines)
Line 0 Link Here
1
package Koha::Club;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Templates;
27
use Koha::Club::Fields;
28
use Koha::Libraries;
29
30
use base qw(Koha::Object);
31
32
=head1 NAME
33
34
Koha::Club - Koha Club Object class
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 club_template
43
44
=cut
45
46
sub club_template {
47
    my ($self) = @_;
48
49
    return unless $self->club_template_id();
50
51
    return Koha::Club::Templates->find( $self->club_template_id() );
52
}
53
54
=head3 club_fields
55
56
=cut
57
58
sub club_fields {
59
    my ($self) = @_;
60
61
    return unless $self->id();
62
63
    return Koha::Club::Fields->search( { club_id => $self->id() } );
64
}
65
66
=head3 club_fields
67
68
=cut
69
70
sub branch {
71
    my ($self) = @_;
72
73
    return unless $self->branchcode();
74
75
    return Koha::Libraries->find( $self->branchcode() );
76
}
77
78
=head3 type
79
80
=cut
81
82
sub _type {
83
    return 'Club';
84
}
85
86
=head1 AUTHOR
87
88
Kyle M Hall <kyle@bywatersolutions.com>
89
90
=cut
91
92
1;
(-)a/Koha/Club/Enrollment.pm (+78 lines)
Line 0 Link Here
1
package Koha::Club::Enrollment;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
use Koha::Clubs;
26
27
use base qw(Koha::Object);
28
29
=head1 NAME
30
31
Koha::Club::Enrollment
32
33
Represents a "pattern" on which many clubs can be created.
34
In this way we can directly compare different clubs of the same 'template'
35
for statistical purposes.
36
37
=head1 API
38
39
=head2 Class Methods
40
41
=cut
42
43
=head3 cancel
44
45
=cut
46
47
sub cancel {
48
    my ( $self ) = @_;
49
50
    $self->_result()->update( { date_canceled => \'NOW()' } );
51
52
    return $self;
53
}
54
55
=head3 club
56
57
=cut
58
59
sub club {
60
    my ( $self ) = @_;
61
    return Koha::Clubs->find( $self->club_id() );
62
}
63
64
=head3 type
65
66
=cut
67
68
sub _type {
69
    return 'ClubEnrollment';
70
}
71
72
=head1 AUTHOR
73
74
Kyle M Hall <kyle@bywatersolutions.com>
75
76
=cut
77
78
1;
(-)a/Koha/Club/Enrollment/Field.pm (+56 lines)
Line 0 Link Here
1
package Koha::Club::Enrollment::Field;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Club::Enrollment::Field
31
32
Represents a "pattern" on which many clubs can be created.
33
In this way we can directly compare different clubs of the same 'template'
34
for statistical purposes.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubEnrollmentField';
48
}
49
50
=head1 AUTHOR
51
52
Kyle M Hall <kyle@bywatersolutions.com>
53
54
=cut
55
56
1;
(-)a/Koha/Club/Enrollment/Fields.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Enrollment::Fields;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Enrollment::Field;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Enrollment::Fields
33
34
This object represents a collection of club enrollemnt fields.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubEnrollmentField';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Enrollment::Field';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Club/Enrollments.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Enrollments;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Enrollment;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Enrollments
33
34
This object represents a collection of club templates.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubEnrollment';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Enrollment';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Club/Field.pm (+66 lines)
Line 0 Link Here
1
package Koha::Club::Field;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Template::Fields;
27
28
use base qw(Koha::Object);
29
30
=head1 NAME
31
32
Koha::Club::Field
33
34
Represents the value set at creation time for a Koha::Club::Template::Field
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 club_template_field
43
44
=cut
45
46
sub club_template_field {
47
    my ( $self ) = @_;
48
49
    return Koha::Club::Template::Fields->find( $self->club_template_field_id );
50
}
51
52
=head3 type
53
54
=cut
55
56
sub _type {
57
    return 'ClubField';
58
}
59
60
=head1 AUTHOR
61
62
Kyle M Hall <kyle@bywatersolutions.com>
63
64
=cut
65
66
1;
(-)a/Koha/Club/Fields.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Fields;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Field;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Fields
33
34
Represents a collection of club fields.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubField';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Field';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Club/Template.pm (+75 lines)
Line 0 Link Here
1
package Koha::Club::Template;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Template::Fields;
27
use Koha::Club::Template::EnrollmentFields;
28
29
use base qw(Koha::Object);
30
31
=head1 NAME
32
33
Koha::Club::Template
34
35
Represents a "pattern" on which many clubs can be created.
36
In this way we can directly compare different clubs of the same 'template'
37
for statistical purposes.
38
39
=head1 API
40
41
=head2 Class Methods
42
43
=cut
44
45
=head3 club_template_fields
46
47
=cut
48
49
sub club_template_fields {
50
    my ($self) = @_;
51
52
    return Koha::Club::Template::Fields->search( { club_template_id => $self->id() } );
53
}
54
55
sub club_template_enrollment_fields {
56
    my ($self) = @_;
57
58
    return Koha::Club::Template::EnrollmentFields->search( { club_template_id => $self->id() } );
59
}
60
61
=head3 type
62
63
=cut
64
65
sub _type {
66
    return 'ClubTemplate';
67
}
68
69
=head1 AUTHOR
70
71
Kyle M Hall <kyle@bywatersolutions.com>
72
73
=cut
74
75
1;
(-)a/Koha/Club/Template/EnrollmentField.pm (+54 lines)
Line 0 Link Here
1
package Koha::Club::Template::EnrollmentField;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Club::Template::EnrollemntField
31
32
Represents a club field that is only set at the time a patron is enrolled
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub _type {
45
    return 'ClubTemplateEnrollmentField';
46
}
47
48
=head1 AUTHOR
49
50
Kyle M Hall <kyle@bywatersolutions.com>
51
52
=cut
53
54
1;
(-)a/Koha/Club/Template/EnrollmentFields.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Template::EnrollmentFields;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Template::EnrollmentField;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Template::EnrollemntFields
33
34
Represents a colleciton of club fields that are only set at the time a patron is enrolled
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubTemplateEnrollmentField';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Template::EnrollmentField';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Club/Template/Field.pm (+54 lines)
Line 0 Link Here
1
package Koha::Club::Template::Field;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use base qw(Koha::Object);
27
28
=head1 NAME
29
30
Koha::Club::Template::Field
31
32
Represents a club field that is set when the club is created
33
34
=head1 API
35
36
=head2 Class Methods
37
38
=cut
39
40
=head3 type
41
42
=cut
43
44
sub _type {
45
    return 'ClubTemplateField';
46
}
47
48
=head1 AUTHOR
49
50
Kyle M Hall <kyle@bywatersolutions.com>
51
52
=cut
53
54
1;
(-)a/Koha/Club/Template/Fields.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Template::Fields;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Template::Field;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Template::Fields
33
34
Represents a collection of club fields that are set when the club is created
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubTemplateField';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Template::Field';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Club/Templates.pm (+60 lines)
Line 0 Link Here
1
package Koha::Club::Templates;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club::Template;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Club::Templates
33
34
This object represents a collection of club templates.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 type
43
44
=cut
45
46
sub _type {
47
    return 'ClubTemplate';
48
}
49
50
sub object_class {
51
    return 'Koha::Club::Template';
52
}
53
54
=head1 AUTHOR
55
56
Kyle M Hall <kyle@bywatersolutions.com>
57
58
=cut
59
60
1;
(-)a/Koha/Clubs.pm (+92 lines)
Line 0 Link Here
1
package Koha::Clubs;
2
3
# Copyright ByWater Solutions 2014
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 3 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
20
use Modern::Perl;
21
22
use Carp;
23
24
use Koha::Database;
25
26
use Koha::Club;
27
28
use base qw(Koha::Objects);
29
30
=head1 NAME
31
32
Koha::Clubs - Koha Clubs Object class
33
34
This object represents a collection of clubs a patron may enroll in.
35
36
=head1 API
37
38
=head2 Class Methods
39
40
=cut
41
42
=head3 GetEnrollable
43
44
=cut
45
46
sub GetEnrollable {
47
    my ( $self, $params ) = @_;
48
49
    # We need to filter out all the already enrolled in clubs
50
    my $borrower = $params->{borrower};
51
    if ($borrower) {
52
        delete( $params->{borrower} );
53
        my @enrollments = $borrower->GetClubEnrollments();
54
        if (@enrollments) {
55
            $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] };
56
        }
57
    }
58
59
    my $rs = $self->_resultset()->search( $params, { prefetch => 'club_template' } );
60
61
    if (wantarray) {
62
        my $class = ref($self) ? ref($self) : $self;
63
64
        return $class->_wrap( $rs->all() );
65
66
    }
67
    else {
68
        my $class = ref($self) ? ref($self) : $self;
69
70
        return $class->_new_from_dbic($rs);
71
    }
72
}
73
74
=head3 type
75
76
=cut
77
78
sub _type {
79
    return 'Club';
80
}
81
82
sub object_class {
83
    return 'Koha::Club';
84
}
85
86
=head1 AUTHOR
87
88
Kyle M Hall <kyle@bywatersolutions.com>
89
90
=cut
91
92
1;
(-)a/Koha/Patron.pm (+62 lines)
Lines 35-40 use Koha::Patron::HouseboundRole; Link Here
35
use Koha::Patron::Images;
35
use Koha::Patron::Images;
36
use Koha::Patrons;
36
use Koha::Patrons;
37
use Koha::Virtualshelves;
37
use Koha::Virtualshelves;
38
use Koha::Club::Enrollments;
38
39
39
use base qw(Koha::Object);
40
use base qw(Koha::Object);
40
41
Lines 584-589 sub holds { Link Here
584
    return Koha::Holds->_new_from_dbic($holds_rs);
585
    return Koha::Holds->_new_from_dbic($holds_rs);
585
}
586
}
586
587
588
=head3 FirstValidEmailAddress
589
590
=cut
591
592
sub FirstValidEmailAddress {
593
    my ($self) = @_;
594
595
    return $self->email() || $self->emailpro() || $self->b_email() || q{};
596
}
597
598
=head3 GetClubEnrollments
599
600
=cut
601
602
sub GetClubEnrollments {
603
    my ($self) = @_;
604
605
    return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } );
606
}
607
608
=head3 GetClubEnrollmentsCount
609
610
=cut
611
612
sub GetClubEnrollmentsCount {
613
    my ($self) = @_;
614
615
    my $e = $self->GetClubEnrollments();
616
617
    return $e->count();
618
}
619
620
=head3 GetEnrollableClubs
621
622
=cut
623
624
sub GetEnrollableClubs {
625
    my ( $self, $is_enrollable_from_opac ) = @_;
626
627
    my $params;
628
    $params->{is_enrollable_from_opac} = $is_enrollable_from_opac
629
      if $is_enrollable_from_opac;
630
    $params->{is_email_required} = 0 unless $self->FirstValidEmailAddress();
631
632
    $params->{borrower} = $self;
633
634
    return Koha::Clubs->GetEnrollable($params);
635
}
636
637
=head3 GetEnrollableClubsCount
638
639
=cut
640
641
sub GetEnrollableClubsCount {
642
    my ( $self, $is_enrollable_from_opac ) = @_;
643
644
    my $e = $self->GetEnrollableClubs($is_enrollable_from_opac);
645
646
    return $e->count();
647
}
648
587
=head3 type
649
=head3 type
588
650
589
=cut
651
=cut
(-)a/Koha/Schema/Result/AuthorisedValue.pm (-2 / +2 lines)
Lines 130-137 __PACKAGE__->belongs_to( Link Here
130
);
130
);
131
131
132
132
133
# Created by DBIx::Class::Schema::Loader v0.07045 @ 2016-08-30 11:52:45
133
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
134
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LOArv8JQ0aiTZgcy+jb7pA
134
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IzI/WpMbwvfZ8BpHtRCsiQ
135
135
136
136
137
# You can replace this text with custom content, and it will be preserved on regeneration
137
# You can replace this text with custom content, and it will be preserved on regeneration
(-)a/Koha/Schema/Result/Borrower.pm (+15 lines)
Lines 855-860 __PACKAGE__->belongs_to( Link Here
855
  { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
855
  { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
856
);
856
);
857
857
858
=head2 club_enrollments
859
860
Type: has_many
861
862
Related object: L<Koha::Schema::Result::ClubEnrollment>
863
864
=cut
865
866
__PACKAGE__->has_many(
867
  "club_enrollments",
868
  "Koha::Schema::Result::ClubEnrollment",
869
  { "foreign.borrowernumber" => "self.borrowernumber" },
870
  { cascade_copy => 0, cascade_delete => 0 },
871
);
872
858
=head2 course_instructors
873
=head2 course_instructors
859
874
860
Type: has_many
875
Type: has_many
(-)a/Koha/Schema/Result/Branch.pm (-2 / +47 lines)
Lines 352-357 __PACKAGE__->has_many( Link Here
352
  { cascade_copy => 0, cascade_delete => 0 },
352
  { cascade_copy => 0, cascade_delete => 0 },
353
);
353
);
354
354
355
=head2 club_enrollments
356
357
Type: has_many
358
359
Related object: L<Koha::Schema::Result::ClubEnrollment>
360
361
=cut
362
363
__PACKAGE__->has_many(
364
  "club_enrollments",
365
  "Koha::Schema::Result::ClubEnrollment",
366
  { "foreign.branchcode" => "self.branchcode" },
367
  { cascade_copy => 0, cascade_delete => 0 },
368
);
369
370
=head2 club_templates
371
372
Type: has_many
373
374
Related object: L<Koha::Schema::Result::ClubTemplate>
375
376
=cut
377
378
__PACKAGE__->has_many(
379
  "club_templates",
380
  "Koha::Schema::Result::ClubTemplate",
381
  { "foreign.branchcode" => "self.branchcode" },
382
  { cascade_copy => 0, cascade_delete => 0 },
383
);
384
385
=head2 clubs
386
387
Type: has_many
388
389
Related object: L<Koha::Schema::Result::Club>
390
391
=cut
392
393
__PACKAGE__->has_many(
394
  "clubs",
395
  "Koha::Schema::Result::Club",
396
  { "foreign.branchcode" => "self.branchcode" },
397
  { cascade_copy => 0, cascade_delete => 0 },
398
);
399
355
=head2 collections
400
=head2 collections
356
401
357
Type: has_many
402
Type: has_many
Lines 543-550 Composing rels: L</branchrelations> -> categorycode Link Here
543
__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");
588
__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");
544
589
545
590
546
# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-10-24 13:56:21
591
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
547
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:/9YwsU+GXK+fzc6IX2Tj5g
592
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lvjA8x8u5RKeZQ0+uiLm7A
548
593
549
594
550
# You can replace this text with custom code or comments, and it will be preserved on regeneration
595
# You can replace this text with custom code or comments, and it will be preserved on regeneration
(-)a/Koha/Schema/Result/Club.pm (+197 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::Club;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::Club
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<clubs>
19
20
=cut
21
22
__PACKAGE__->table("clubs");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_template_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 name
39
40
  data_type: 'tinytext'
41
  is_nullable: 0
42
43
=head2 description
44
45
  data_type: 'text'
46
  is_nullable: 1
47
48
=head2 date_start
49
50
  data_type: 'date'
51
  datetime_undef_if_invalid: 1
52
  is_nullable: 1
53
54
=head2 date_end
55
56
  data_type: 'date'
57
  datetime_undef_if_invalid: 1
58
  is_nullable: 1
59
60
=head2 branchcode
61
62
  data_type: 'varchar'
63
  is_foreign_key: 1
64
  is_nullable: 1
65
  size: 11
66
67
=head2 date_created
68
69
  data_type: 'timestamp'
70
  datetime_undef_if_invalid: 1
71
  default_value: current_timestamp
72
  is_nullable: 0
73
74
=head2 date_updated
75
76
  data_type: 'timestamp'
77
  datetime_undef_if_invalid: 1
78
  is_nullable: 1
79
80
=cut
81
82
__PACKAGE__->add_columns(
83
  "id",
84
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
85
  "club_template_id",
86
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
87
  "name",
88
  { data_type => "tinytext", is_nullable => 0 },
89
  "description",
90
  { data_type => "text", is_nullable => 1 },
91
  "date_start",
92
  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
93
  "date_end",
94
  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
95
  "branchcode",
96
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 11 },
97
  "date_created",
98
  {
99
    data_type => "timestamp",
100
    datetime_undef_if_invalid => 1,
101
    default_value => \"current_timestamp",
102
    is_nullable => 0,
103
  },
104
  "date_updated",
105
  {
106
    data_type => "timestamp",
107
    datetime_undef_if_invalid => 1,
108
    is_nullable => 1,
109
  },
110
);
111
112
=head1 PRIMARY KEY
113
114
=over 4
115
116
=item * L</id>
117
118
=back
119
120
=cut
121
122
__PACKAGE__->set_primary_key("id");
123
124
=head1 RELATIONS
125
126
=head2 branchcode
127
128
Type: belongs_to
129
130
Related object: L<Koha::Schema::Result::Branch>
131
132
=cut
133
134
__PACKAGE__->belongs_to(
135
  "branchcode",
136
  "Koha::Schema::Result::Branch",
137
  { branchcode => "branchcode" },
138
  {
139
    is_deferrable => 1,
140
    join_type     => "LEFT",
141
    on_delete     => "RESTRICT",
142
    on_update     => "RESTRICT",
143
  },
144
);
145
146
=head2 club_enrollments
147
148
Type: has_many
149
150
Related object: L<Koha::Schema::Result::ClubEnrollment>
151
152
=cut
153
154
__PACKAGE__->has_many(
155
  "club_enrollments",
156
  "Koha::Schema::Result::ClubEnrollment",
157
  { "foreign.club_id" => "self.id" },
158
  { cascade_copy => 0, cascade_delete => 0 },
159
);
160
161
=head2 club_fields
162
163
Type: has_many
164
165
Related object: L<Koha::Schema::Result::ClubField>
166
167
=cut
168
169
__PACKAGE__->has_many(
170
  "club_fields",
171
  "Koha::Schema::Result::ClubField",
172
  { "foreign.club_id" => "self.id" },
173
  { cascade_copy => 0, cascade_delete => 0 },
174
);
175
176
=head2 club_template
177
178
Type: belongs_to
179
180
Related object: L<Koha::Schema::Result::ClubTemplate>
181
182
=cut
183
184
__PACKAGE__->belongs_to(
185
  "club_template",
186
  "Koha::Schema::Result::ClubTemplate",
187
  { id => "club_template_id" },
188
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
189
);
190
191
192
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
193
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nMwJy/qR8aWu12hQq4rORQ
194
195
196
# You can replace this text with custom content, and it will be preserved on regeneration
197
1;
(-)a/Koha/Schema/Result/ClubEnrollment.pm (+201 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubEnrollment;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubEnrollment
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_enrollments>
19
20
=cut
21
22
__PACKAGE__->table("club_enrollments");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 borrowernumber
39
40
  data_type: 'integer'
41
  is_foreign_key: 1
42
  is_nullable: 0
43
44
=head2 date_enrolled
45
46
  data_type: 'timestamp'
47
  datetime_undef_if_invalid: 1
48
  default_value: current_timestamp
49
  is_nullable: 0
50
51
=head2 date_canceled
52
53
  data_type: 'timestamp'
54
  datetime_undef_if_invalid: 1
55
  is_nullable: 1
56
57
=head2 date_created
58
59
  data_type: 'timestamp'
60
  datetime_undef_if_invalid: 1
61
  default_value: '0000-00-00 00:00:00'
62
  is_nullable: 0
63
64
=head2 date_updated
65
66
  data_type: 'timestamp'
67
  datetime_undef_if_invalid: 1
68
  is_nullable: 1
69
70
=head2 branchcode
71
72
  data_type: 'varchar'
73
  is_foreign_key: 1
74
  is_nullable: 1
75
  size: 11
76
77
=cut
78
79
__PACKAGE__->add_columns(
80
  "id",
81
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
82
  "club_id",
83
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
84
  "borrowernumber",
85
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
86
  "date_enrolled",
87
  {
88
    data_type => "timestamp",
89
    datetime_undef_if_invalid => 1,
90
    default_value => \"current_timestamp",
91
    is_nullable => 0,
92
  },
93
  "date_canceled",
94
  {
95
    data_type => "timestamp",
96
    datetime_undef_if_invalid => 1,
97
    is_nullable => 1,
98
  },
99
  "date_created",
100
  {
101
    data_type => "timestamp",
102
    datetime_undef_if_invalid => 1,
103
    default_value => "0000-00-00 00:00:00",
104
    is_nullable => 0,
105
  },
106
  "date_updated",
107
  {
108
    data_type => "timestamp",
109
    datetime_undef_if_invalid => 1,
110
    is_nullable => 1,
111
  },
112
  "branchcode",
113
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 11 },
114
);
115
116
=head1 PRIMARY KEY
117
118
=over 4
119
120
=item * L</id>
121
122
=back
123
124
=cut
125
126
__PACKAGE__->set_primary_key("id");
127
128
=head1 RELATIONS
129
130
=head2 borrowernumber
131
132
Type: belongs_to
133
134
Related object: L<Koha::Schema::Result::Borrower>
135
136
=cut
137
138
__PACKAGE__->belongs_to(
139
  "borrowernumber",
140
  "Koha::Schema::Result::Borrower",
141
  { borrowernumber => "borrowernumber" },
142
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
143
);
144
145
=head2 branchcode
146
147
Type: belongs_to
148
149
Related object: L<Koha::Schema::Result::Branch>
150
151
=cut
152
153
__PACKAGE__->belongs_to(
154
  "branchcode",
155
  "Koha::Schema::Result::Branch",
156
  { branchcode => "branchcode" },
157
  {
158
    is_deferrable => 1,
159
    join_type     => "LEFT",
160
    on_delete     => "SET NULL",
161
    on_update     => "CASCADE",
162
  },
163
);
164
165
=head2 club
166
167
Type: belongs_to
168
169
Related object: L<Koha::Schema::Result::Club>
170
171
=cut
172
173
__PACKAGE__->belongs_to(
174
  "club",
175
  "Koha::Schema::Result::Club",
176
  { id => "club_id" },
177
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
178
);
179
180
=head2 club_enrollment_fields
181
182
Type: has_many
183
184
Related object: L<Koha::Schema::Result::ClubEnrollmentField>
185
186
=cut
187
188
__PACKAGE__->has_many(
189
  "club_enrollment_fields",
190
  "Koha::Schema::Result::ClubEnrollmentField",
191
  { "foreign.club_enrollment_id" => "self.id" },
192
  { cascade_copy => 0, cascade_delete => 0 },
193
);
194
195
196
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
197
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9ypc+smG/VlgtWW66PhvHQ
198
199
200
# You can replace this text with custom content, and it will be preserved on regeneration
201
1;
(-)a/Koha/Schema/Result/ClubEnrollmentField.pm (+112 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubEnrollmentField;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubEnrollmentField
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_enrollment_fields>
19
20
=cut
21
22
__PACKAGE__->table("club_enrollment_fields");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_enrollment_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 club_template_enrollment_field_id
39
40
  data_type: 'integer'
41
  is_foreign_key: 1
42
  is_nullable: 0
43
44
=head2 value
45
46
  data_type: 'text'
47
  is_nullable: 0
48
49
=cut
50
51
__PACKAGE__->add_columns(
52
  "id",
53
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
54
  "club_enrollment_id",
55
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
56
  "club_template_enrollment_field_id",
57
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
58
  "value",
59
  { data_type => "text", is_nullable => 0 },
60
);
61
62
=head1 PRIMARY KEY
63
64
=over 4
65
66
=item * L</id>
67
68
=back
69
70
=cut
71
72
__PACKAGE__->set_primary_key("id");
73
74
=head1 RELATIONS
75
76
=head2 club_enrollment
77
78
Type: belongs_to
79
80
Related object: L<Koha::Schema::Result::ClubEnrollment>
81
82
=cut
83
84
__PACKAGE__->belongs_to(
85
  "club_enrollment",
86
  "Koha::Schema::Result::ClubEnrollment",
87
  { id => "club_enrollment_id" },
88
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
89
);
90
91
=head2 club_template_enrollment_field
92
93
Type: belongs_to
94
95
Related object: L<Koha::Schema::Result::ClubTemplateEnrollmentField>
96
97
=cut
98
99
__PACKAGE__->belongs_to(
100
  "club_template_enrollment_field",
101
  "Koha::Schema::Result::ClubTemplateEnrollmentField",
102
  { id => "club_template_enrollment_field_id" },
103
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
104
);
105
106
107
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
108
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2ANAs3mh3i/kd3Qxrcd5IA
109
110
111
# You can replace this text with custom content, and it will be preserved on regeneration
112
1;
(-)a/Koha/Schema/Result/ClubField.pm (+112 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubField;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubField
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_fields>
19
20
=cut
21
22
__PACKAGE__->table("club_fields");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_template_field_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 club_id
39
40
  data_type: 'integer'
41
  is_foreign_key: 1
42
  is_nullable: 0
43
44
=head2 value
45
46
  data_type: 'text'
47
  is_nullable: 1
48
49
=cut
50
51
__PACKAGE__->add_columns(
52
  "id",
53
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
54
  "club_template_field_id",
55
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
56
  "club_id",
57
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
58
  "value",
59
  { data_type => "text", is_nullable => 1 },
60
);
61
62
=head1 PRIMARY KEY
63
64
=over 4
65
66
=item * L</id>
67
68
=back
69
70
=cut
71
72
__PACKAGE__->set_primary_key("id");
73
74
=head1 RELATIONS
75
76
=head2 club
77
78
Type: belongs_to
79
80
Related object: L<Koha::Schema::Result::Club>
81
82
=cut
83
84
__PACKAGE__->belongs_to(
85
  "club",
86
  "Koha::Schema::Result::Club",
87
  { id => "club_id" },
88
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
89
);
90
91
=head2 club_template_field
92
93
Type: belongs_to
94
95
Related object: L<Koha::Schema::Result::ClubTemplateField>
96
97
=cut
98
99
__PACKAGE__->belongs_to(
100
  "club_template_field",
101
  "Koha::Schema::Result::ClubTemplateField",
102
  { id => "club_template_field_id" },
103
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
104
);
105
106
107
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
108
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:m4GLLIVIHgRpRhCGLh12DQ
109
110
111
# You can replace this text with custom content, and it will be preserved on regeneration
112
1;
(-)a/Koha/Schema/Result/ClubTemplate.pm (+195 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubTemplate;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubTemplate
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_templates>
19
20
=cut
21
22
__PACKAGE__->table("club_templates");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 name
33
34
  data_type: 'tinytext'
35
  is_nullable: 0
36
37
=head2 description
38
39
  data_type: 'text'
40
  is_nullable: 1
41
42
=head2 is_enrollable_from_opac
43
44
  data_type: 'tinyint'
45
  default_value: 0
46
  is_nullable: 0
47
48
=head2 is_email_required
49
50
  data_type: 'tinyint'
51
  default_value: 0
52
  is_nullable: 0
53
54
=head2 branchcode
55
56
  data_type: 'varchar'
57
  is_foreign_key: 1
58
  is_nullable: 1
59
  size: 10
60
61
=head2 date_created
62
63
  data_type: 'timestamp'
64
  datetime_undef_if_invalid: 1
65
  default_value: current_timestamp
66
  is_nullable: 0
67
68
=head2 date_updated
69
70
  data_type: 'timestamp'
71
  datetime_undef_if_invalid: 1
72
  is_nullable: 1
73
74
=head2 is_deletable
75
76
  data_type: 'tinyint'
77
  default_value: 1
78
  is_nullable: 0
79
80
=cut
81
82
__PACKAGE__->add_columns(
83
  "id",
84
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
85
  "name",
86
  { data_type => "tinytext", is_nullable => 0 },
87
  "description",
88
  { data_type => "text", is_nullable => 1 },
89
  "is_enrollable_from_opac",
90
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
91
  "is_email_required",
92
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
93
  "branchcode",
94
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 },
95
  "date_created",
96
  {
97
    data_type => "timestamp",
98
    datetime_undef_if_invalid => 1,
99
    default_value => \"current_timestamp",
100
    is_nullable => 0,
101
  },
102
  "date_updated",
103
  {
104
    data_type => "timestamp",
105
    datetime_undef_if_invalid => 1,
106
    is_nullable => 1,
107
  },
108
  "is_deletable",
109
  { data_type => "tinyint", default_value => 1, is_nullable => 0 },
110
);
111
112
=head1 PRIMARY KEY
113
114
=over 4
115
116
=item * L</id>
117
118
=back
119
120
=cut
121
122
__PACKAGE__->set_primary_key("id");
123
124
=head1 RELATIONS
125
126
=head2 branchcode
127
128
Type: belongs_to
129
130
Related object: L<Koha::Schema::Result::Branch>
131
132
=cut
133
134
__PACKAGE__->belongs_to(
135
  "branchcode",
136
  "Koha::Schema::Result::Branch",
137
  { branchcode => "branchcode" },
138
  {
139
    is_deferrable => 1,
140
    join_type     => "LEFT",
141
    on_delete     => "SET NULL",
142
    on_update     => "CASCADE",
143
  },
144
);
145
146
=head2 club_template_enrollment_fields
147
148
Type: has_many
149
150
Related object: L<Koha::Schema::Result::ClubTemplateEnrollmentField>
151
152
=cut
153
154
__PACKAGE__->has_many(
155
  "club_template_enrollment_fields",
156
  "Koha::Schema::Result::ClubTemplateEnrollmentField",
157
  { "foreign.club_template_id" => "self.id" },
158
  { cascade_copy => 0, cascade_delete => 0 },
159
);
160
161
=head2 club_template_fields
162
163
Type: has_many
164
165
Related object: L<Koha::Schema::Result::ClubTemplateField>
166
167
=cut
168
169
__PACKAGE__->has_many(
170
  "club_template_fields",
171
  "Koha::Schema::Result::ClubTemplateField",
172
  { "foreign.club_template_id" => "self.id" },
173
  { cascade_copy => 0, cascade_delete => 0 },
174
);
175
176
=head2 clubs
177
178
Type: has_many
179
180
Related object: L<Koha::Schema::Result::Club>
181
182
=cut
183
184
__PACKAGE__->has_many(
185
  "clubs",
186
  "Koha::Schema::Result::Club",
187
  { "foreign.club_template_id" => "self.id" },
188
  { cascade_copy => 0, cascade_delete => 0 },
189
);
190
191
192
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
193
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j5aiACVUGzrdng4+jt6mfg
194
195
1;
(-)a/Koha/Schema/Result/ClubTemplateEnrollmentField.pm (+119 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubTemplateEnrollmentField;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubTemplateEnrollmentField
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_template_enrollment_fields>
19
20
=cut
21
22
__PACKAGE__->table("club_template_enrollment_fields");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_template_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 name
39
40
  data_type: 'tinytext'
41
  is_nullable: 0
42
43
=head2 description
44
45
  data_type: 'text'
46
  is_nullable: 1
47
48
=head2 authorised_value_category
49
50
  data_type: 'varchar'
51
  is_nullable: 1
52
  size: 16
53
54
=cut
55
56
__PACKAGE__->add_columns(
57
  "id",
58
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
59
  "club_template_id",
60
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
61
  "name",
62
  { data_type => "tinytext", is_nullable => 0 },
63
  "description",
64
  { data_type => "text", is_nullable => 1 },
65
  "authorised_value_category",
66
  { data_type => "varchar", is_nullable => 1, size => 16 },
67
);
68
69
=head1 PRIMARY KEY
70
71
=over 4
72
73
=item * L</id>
74
75
=back
76
77
=cut
78
79
__PACKAGE__->set_primary_key("id");
80
81
=head1 RELATIONS
82
83
=head2 club_enrollment_fields
84
85
Type: has_many
86
87
Related object: L<Koha::Schema::Result::ClubEnrollmentField>
88
89
=cut
90
91
__PACKAGE__->has_many(
92
  "club_enrollment_fields",
93
  "Koha::Schema::Result::ClubEnrollmentField",
94
  { "foreign.club_template_enrollment_field_id" => "self.id" },
95
  { cascade_copy => 0, cascade_delete => 0 },
96
);
97
98
=head2 club_template
99
100
Type: belongs_to
101
102
Related object: L<Koha::Schema::Result::ClubTemplate>
103
104
=cut
105
106
__PACKAGE__->belongs_to(
107
  "club_template",
108
  "Koha::Schema::Result::ClubTemplate",
109
  { id => "club_template_id" },
110
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
111
);
112
113
114
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
115
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KGo2mEIAkTVYSPsOLoaBCg
116
117
118
# You can replace this text with custom content, and it will be preserved on regeneration
119
1;
(-)a/Koha/Schema/Result/ClubTemplateField.pm (+119 lines)
Line 0 Link Here
1
use utf8;
2
package Koha::Schema::Result::ClubTemplateField;
3
4
# Created by DBIx::Class::Schema::Loader
5
# DO NOT MODIFY THE FIRST PART OF THIS FILE
6
7
=head1 NAME
8
9
Koha::Schema::Result::ClubTemplateField
10
11
=cut
12
13
use strict;
14
use warnings;
15
16
use base 'DBIx::Class::Core';
17
18
=head1 TABLE: C<club_template_fields>
19
20
=cut
21
22
__PACKAGE__->table("club_template_fields");
23
24
=head1 ACCESSORS
25
26
=head2 id
27
28
  data_type: 'integer'
29
  is_auto_increment: 1
30
  is_nullable: 0
31
32
=head2 club_template_id
33
34
  data_type: 'integer'
35
  is_foreign_key: 1
36
  is_nullable: 0
37
38
=head2 name
39
40
  data_type: 'tinytext'
41
  is_nullable: 0
42
43
=head2 description
44
45
  data_type: 'text'
46
  is_nullable: 1
47
48
=head2 authorised_value_category
49
50
  data_type: 'varchar'
51
  is_nullable: 1
52
  size: 16
53
54
=cut
55
56
__PACKAGE__->add_columns(
57
  "id",
58
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
59
  "club_template_id",
60
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
61
  "name",
62
  { data_type => "tinytext", is_nullable => 0 },
63
  "description",
64
  { data_type => "text", is_nullable => 1 },
65
  "authorised_value_category",
66
  { data_type => "varchar", is_nullable => 1, size => 16 },
67
);
68
69
=head1 PRIMARY KEY
70
71
=over 4
72
73
=item * L</id>
74
75
=back
76
77
=cut
78
79
__PACKAGE__->set_primary_key("id");
80
81
=head1 RELATIONS
82
83
=head2 club_fields
84
85
Type: has_many
86
87
Related object: L<Koha::Schema::Result::ClubField>
88
89
=cut
90
91
__PACKAGE__->has_many(
92
  "club_fields",
93
  "Koha::Schema::Result::ClubField",
94
  { "foreign.club_template_field_id" => "self.id" },
95
  { cascade_copy => 0, cascade_delete => 0 },
96
);
97
98
=head2 club_template
99
100
Type: belongs_to
101
102
Related object: L<Koha::Schema::Result::ClubTemplate>
103
104
=cut
105
106
__PACKAGE__->belongs_to(
107
  "club_template",
108
  "Koha::Schema::Result::ClubTemplate",
109
  { id => "club_template_id" },
110
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
111
);
112
113
114
# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
115
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:P73ABSn2tzlTYbD3nov21g
116
117
118
# You can replace this text with custom content, and it will be preserved on regeneration
119
1;
(-)a/Koha/Template/Plugin/AuthorisedValues.pm (-2 / +2 lines)
Lines 35-42 sub GetByCode { Link Here
35
}
35
}
36
36
37
sub Get {
37
sub Get {
38
    my ( $self, $category, $opac ) = @_;
38
    my ( $self, $category, $selected, $opac ) = @_;
39
    return GetAuthorisedValues( $category, $opac );
39
    return GetAuthorisedValues( $category, $selected, $opac );
40
}
40
}
41
41
42
sub GetAuthValueDropbox {
42
sub GetAuthValueDropbox {
(-)a/Koha/Template/Plugin/Borrowers.pm (-1 lines)
Lines 57-61 sub HasOverdues { Link Here
57
    return Koha::Patrons->find( $borrowernumber )->has_overdues;
57
    return Koha::Patrons->find( $borrowernumber )->has_overdues;
58
}
58
}
59
59
60
61
1;
60
1;
(-)a/Koha/Template/Plugin/Branches.pm (+7 lines)
Lines 27-32 use C4::Koha; Link Here
27
use C4::Context;
27
use C4::Context;
28
use Koha::Libraries;
28
use Koha::Libraries;
29
29
30
sub GetBranches {
31
    my ($self) = @_;
32
33
    my $dbh = C4::Context->dbh;
34
    return $dbh->selectall_arrayref( "SELECT * FROM branches", { Slice => {} } );
35
}
36
30
sub GetName {
37
sub GetName {
31
    my ( $self, $branchcode ) = @_;
38
    my ( $self, $branchcode ) = @_;
32
39
(-)a/Koha/Template/Plugin/Koha.pm (+5 lines)
Lines 58-61 sub Version { Link Here
58
    };
58
    };
59
}
59
}
60
60
61
sub UserEnv {
62
    my ( $self, $key ) = @_;
63
    my $userenv = C4::Context->userenv;
64
    return $userenv ? $userenv->{$key} : undef;
65
}
61
1;
66
1;
(-)a/circ/circulation.pl (-4 / +8 lines)
Lines 24-32 Link Here
24
24
25
use strict;
25
use strict;
26
use warnings;
26
use warnings;
27
27
use CGI qw ( -utf8 );
28
use CGI qw ( -utf8 );
28
use DateTime;
29
use DateTime;
29
use DateTime::Duration;
30
use DateTime::Duration;
31
use MARC::Record;
32
use CGI::Session;
33
30
use C4::Output;
34
use C4::Output;
31
use C4::Print;
35
use C4::Print;
32
use C4::Auth qw/:DEFAULT get_session haspermission/;
36
use C4::Auth qw/:DEFAULT get_session haspermission/;
Lines 36-58 use C4::Utils::DataTables::Members; Link Here
36
use C4::Members;
40
use C4::Members;
37
use C4::Biblio;
41
use C4::Biblio;
38
use C4::Search;
42
use C4::Search;
39
use MARC::Record;
40
use C4::Reserves;
43
use C4::Reserves;
41
use Koha::Holds;
42
use C4::Context;
44
use C4::Context;
43
use CGI::Session;
44
use C4::Members::Attributes qw(GetBorrowerAttributes);
45
use C4::Members::Attributes qw(GetBorrowerAttributes);
45
use Koha::AuthorisedValues;
46
use Koha::AuthorisedValues;
46
use Koha::Patron;
47
use Koha::Patron::Debarments qw(GetDebarments);
47
use Koha::Patron::Debarments qw(GetDebarments);
48
use Koha::DateUtils;
48
use Koha::DateUtils;
49
use Koha::Database;
49
use Koha::Database;
50
use Koha::BiblioFrameworks;
50
use Koha::BiblioFrameworks;
51
use Koha::Patrons;
51
use Koha::Patron::Messages;
52
use Koha::Patron::Messages;
52
use Koha::Patron::Images;
53
use Koha::Patron::Images;
53
use Koha::SearchEngine;
54
use Koha::SearchEngine;
54
use Koha::SearchEngine::Search;
55
use Koha::SearchEngine::Search;
55
use Koha::Patron::Modifications;
56
use Koha::Patron::Modifications;
57
use Koha::Holds;
56
58
57
use Date::Calc qw(
59
use Date::Calc qw(
58
  Today
60
  Today
Lines 647-652 my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); Link Here
647
$template->param( picture => 1 ) if $patron_image;
649
$template->param( picture => 1 ) if $patron_image;
648
650
649
my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
651
my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count;
652
650
$template->param(
653
$template->param(
651
    debt_confirmed            => $debt_confirmed,
654
    debt_confirmed            => $debt_confirmed,
652
    SpecifyDueDate            => $duedatespec_allow,
655
    SpecifyDueDate            => $duedatespec_allow,
Lines 656-661 $template->param( Link Here
656
    has_modifications         => $has_modifications,
659
    has_modifications         => $has_modifications,
657
    override_high_holds       => $override_high_holds,
660
    override_high_holds       => $override_high_holds,
658
    nopermission              => scalar $query->param('nopermission'),
661
    nopermission              => scalar $query->param('nopermission'),
662
    borrower                  => Koha::Patrons->find( $borrowernumber ),
659
);
663
);
660
664
661
output_html_with_http_headers $query, $cookie, $template->output;
665
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/clubs/clubs-add-modify.pl (+104 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
use Koha::Database;
27
use Koha::DateUtils qw(dt_from_string);
28
use Koha::Clubs;
29
use Koha::Club::Fields;
30
31
my $cgi = new CGI;
32
33
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
34
    {
35
        template_name   => 'clubs/clubs-add-modify.tt',
36
        query           => $cgi,
37
        type            => 'intranet',
38
        authnotrequired => 0,
39
        flagsrequired   => { clubs => 'edit_clubs' },
40
    }
41
);
42
43
my $schema = Koha::Database->new()->schema();
44
45
my $id = $cgi->param('id');
46
my $club = $id ? Koha::Clubs->find($id) : Koha::Club->new();
47
$template->param( stored => $id ? 'updated' : 'stored' ) if $cgi->param('name');
48
49
my $club_template_id = $cgi->param('club_template_id');
50
my $club_template = $club->club_template() || Koha::Club::Templates->find($club_template_id);
51
$club_template_id ||= $club_template->id();
52
53
my $date_start = $cgi->param('date_start');
54
$date_start = $date_start ? dt_from_string($date_start) : undef;
55
my $date_end = $cgi->param('date_end');
56
$date_end = $date_end ? dt_from_string($date_end) : undef;
57
58
if ( $cgi->param('name') ) {    # Update or create club
59
    $club->set(
60
        {
61
            club_template_id => $cgi->param('club_template_id') || undef,
62
            name             => $cgi->param('name')             || undef,
63
            description      => $cgi->param('description')      || undef,
64
            branchcode       => $cgi->param('branchcode')       || undef,
65
            date_start       => $date_start,
66
            date_end         => $date_end,
67
            date_updated     => dt_from_string(),
68
        }
69
    )->store();
70
71
    my @club_template_field_id = $cgi->param('club_template_field_id');
72
    my @club_field_id          = $cgi->param('club_field_id');
73
    my @club_field             = $cgi->param('club_field');
74
75
    for ( my $i = 0 ; $i < @club_template_field_id ; $i++ ) {
76
        my $club_template_field_id = $club_template_field_id[$i] || undef;
77
        my $club_field_id          = $club_field_id[$i]          || undef;
78
        my $club_field             = $club_field[$i]             || undef;
79
80
        my $field =
81
          $club_field_id
82
          ? Koha::Club::Fields->find($club_field_id)
83
          : Koha::Club::Field->new();
84
85
        $field->set(
86
            {
87
                club_id                => $club->id(),
88
                club_template_field_id => $club_template_field_id,
89
                value                  => $club_field,
90
            }
91
        )->store();
92
    }
93
94
    $id ||= $club->id();
95
}
96
97
$club = Koha::Clubs->find($id);
98
99
$template->param(
100
    club_template => $club_template,
101
    club          => $club,
102
);
103
104
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/clubs/clubs.pl (+50 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
27
use Koha::Clubs;
28
use Koha::Club::Templates;
29
30
my $cgi = new CGI;
31
32
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
33
    {
34
        template_name   => "clubs/clubs.tt",
35
        query           => $cgi,
36
        type            => "intranet",
37
        authnotrequired => 0,
38
        flagsrequired   => { clubs => '*' },
39
    }
40
);
41
42
my @club_templates = Koha::Club::Templates->search();
43
my @clubs          = Koha::Clubs->search();
44
45
$template->param(
46
    club_templates => \@club_templates,
47
    clubs          => \@clubs,
48
);
49
50
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/clubs/patron-clubs-tab.pl (+55 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
27
use Koha::Patrons;
28
use Koha::Club::Enrollments;
29
30
my $cgi = new CGI;
31
32
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
33
    {
34
        template_name   => "clubs/patron-clubs-tab.tt",
35
        query           => $cgi,
36
        type            => "intranet",
37
        authnotrequired => 0,
38
        flagsrequired   => { clubs => '*' },
39
    }
40
);
41
42
my $borrowernumber = $cgi->param('borrowernumber');
43
44
my $borrower = Koha::Patrons->find($borrowernumber);
45
46
my @enrollments = $borrower->GetClubEnrollments();
47
my @clubs       = $borrower->GetEnrollableClubs();
48
49
$template->param(
50
    enrollments    => \@enrollments,
51
    clubs          => \@clubs,
52
    borrowernumber => $borrowernumber
53
);
54
55
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/clubs/patron-enroll.pl (+50 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
use Koha::Clubs;
27
28
my $cgi = new CGI;
29
30
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
    {
32
        template_name   => "clubs/patron-enroll.tt",
33
        query           => $cgi,
34
        type            => "intranet",
35
        authnotrequired => 0,
36
        flagsrequired   => { clubs => '*' },
37
    }
38
);
39
40
my $id             = $cgi->param('id');
41
my $borrowernumber = $cgi->param('borrowernumber');
42
43
my $club = Koha::Clubs->find($id);
44
45
$template->param(
46
    club           => $club,
47
    borrowernumber => $borrowernumber,
48
);
49
50
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/clubs/templates-add-modify.pl (+150 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
27
use Koha::DateUtils qw(dt_from_string);
28
use Koha::Club::Templates;
29
use Koha::Club::Template::Fields;
30
use Koha::Club::Template::EnrollmentFields;
31
32
use Koha::Database;
33
my $schema = Koha::Database->new()->schema();
34
35
my $cgi = new CGI;
36
37
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
38
    {
39
        template_name   => 'clubs/templates-add-modify.tt',
40
        query           => $cgi,
41
        type            => 'intranet',
42
        authnotrequired => 0,
43
        flagsrequired   => { clubs => 'edit_templates' },
44
    }
45
);
46
47
my $id = $cgi->param('id');
48
49
my $club_template;
50
51
if ( $cgi->param('name') ) {    # Update or create club
52
    if ($id) {
53
        $club_template = Koha::Club::Templates->find($id);
54
        $template->param( stored => 'updated' );
55
    }
56
    else {
57
        $club_template = Koha::Club::Template->new();
58
        $template->param( stored => 'created' );
59
    }
60
61
    $club_template->set(
62
        {
63
            id          => $id                        || undef,
64
            name        => $cgi->param('name')        || undef,
65
            description => $cgi->param('description') || undef,
66
            branchcode  => $cgi->param('branchcode')  || undef,
67
            date_updated            => dt_from_string(),
68
            is_email_required       => $cgi->param('is_email_required') ? 1 : 0,
69
            is_enrollable_from_opac => $cgi->param('is_enrollable_from_opac')
70
            ? 1
71
            : 0,
72
        }
73
    )->store();
74
75
    $id ||= $club_template->id();
76
77
    # Update club creation fields
78
    my @field_id                        = $cgi->param('club_template_field_id');
79
    my @field_name                      = $cgi->param('club_template_field_name');
80
    my @field_description               = $cgi->param('club_template_field_description');
81
    my @field_authorised_value_category = $cgi->param('club_template_field_authorised_value_category');
82
83
    my @field_delete = $cgi->param('club_template_field_delete');
84
85
    for ( my $i = 0 ; $i < @field_id ; $i++ ) {
86
        my $field_id                        = $field_id[$i];
87
        my $field_name                      = $field_name[$i];
88
        my $field_description               = $field_description[$i];
89
        my $field_authorised_value_category = $field_authorised_value_category[$i];
90
91
        my $field =
92
          $field_id
93
          ? Koha::Club::Template::Fields->find($field_id)
94
          : Koha::Club::Template::Field->new();
95
96
        if ( grep( /^$field_id$/, @field_delete ) ) {
97
            $field->delete();
98
        }
99
        else {
100
            $field->set(
101
                {
102
                    club_template_id          => $id,
103
                    name                      => $field_name,
104
                    description               => $field_description,
105
                    authorised_value_category => $field_authorised_value_category,
106
                }
107
            )->store();
108
        }
109
    }
110
111
    # Update club enrollment fields
112
    @field_id                        = $cgi->param('club_template_enrollment_field_id');
113
    @field_name                      = $cgi->param('club_template_enrollment_field_name');
114
    @field_description               = $cgi->param('club_template_enrollment_field_description');
115
    @field_authorised_value_category = $cgi->param('club_template_enrollment_field_authorised_value_category');
116
117
    @field_delete = $cgi->param('club_template_enrollment_field_delete');
118
119
    for ( my $i = 0 ; $i < @field_id ; $i++ ) {
120
        my $field_id                        = $field_id[$i];
121
        my $field_name                      = $field_name[$i];
122
        my $field_description               = $field_description[$i];
123
        my $field_authorised_value_category = $field_authorised_value_category[$i];
124
125
        my $field =
126
          $field_id
127
          ? Koha::Club::Template::EnrollmentFields->find($field_id)
128
          : Koha::Club::Template::EnrollmentField->new();
129
130
        if ( grep( /^$field_id$/, @field_delete ) ) {
131
            $field->delete();
132
        }
133
        else {
134
            $field->set(
135
                {
136
                    id                        => $field_id,
137
                    club_template_id          => $id,
138
                    name                      => $field_name,
139
                    description               => $field_description,
140
                    authorised_value_category => $field_authorised_value_category,
141
                }
142
            )->store();
143
        }
144
    }
145
}
146
147
$club_template ||= Koha::Club::Templates->find($id);
148
$template->param( club_template => $club_template );
149
150
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/installer/data/mysql/atomicupdate/bug_12461.sql (+131 lines)
Line 0 Link Here
1
--
2
-- Table structure for table 'club_templates'
3
--
4
5
CREATE TABLE IF NOT EXISTS club_templates (
6
  id int(11) NOT NULL AUTO_INCREMENT,
7
  `name` tinytext NOT NULL,
8
  description text,
9
  is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
10
  is_email_required tinyint(1) NOT NULL DEFAULT '0',
11
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
12
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
13
  date_updated timestamp NULL DEFAULT NULL,
14
  is_deletable tinyint(1) NOT NULL DEFAULT '1',
15
  PRIMARY KEY (id),
16
  KEY ct_branchcode (branchcode),
17
  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
18
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
19
20
--
21
-- Table structure for table 'clubs'
22
--
23
24
CREATE TABLE IF NOT EXISTS clubs (
25
  id int(11) NOT NULL AUTO_INCREMENT,
26
  club_template_id int(11) NOT NULL,
27
  `name` tinytext NOT NULL,
28
  description text,
29
  date_start date DEFAULT NULL,
30
  date_end date DEFAULT NULL,
31
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
32
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
33
  date_updated timestamp NULL DEFAULT NULL,
34
  PRIMARY KEY (id),
35
  KEY club_template_id (club_template_id),
36
  KEY branchcode (branchcode),
37
  CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
38
  CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode)
39
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
40
41
--
42
-- Table structure for table 'club_enrollments'
43
--
44
45
CREATE TABLE IF NOT EXISTS club_enrollments (
46
  id int(11) NOT NULL AUTO_INCREMENT,
47
  club_id int(11) NOT NULL,
48
  borrowernumber int(11) NOT NULL,
49
  date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
50
  date_canceled timestamp NULL DEFAULT NULL,
51
  date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
52
  date_updated timestamp NULL DEFAULT NULL,
53
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
54
  PRIMARY KEY (id),
55
  KEY club_id (club_id),
56
  KEY borrowernumber (borrowernumber),
57
  KEY branchcode (branchcode),
58
  CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
59
  CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
60
  CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE
61
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
62
63
--
64
-- Table structure for table 'club_template_enrollment_fields'
65
--
66
67
CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
68
  id int(11) NOT NULL AUTO_INCREMENT,
69
  club_template_id int(11) NOT NULL,
70
  `name` tinytext NOT NULL,
71
  description text,
72
  authorised_value_category varchar(16) DEFAULT NULL,
73
  PRIMARY KEY (id),
74
  KEY club_template_id (club_template_id),
75
  CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
76
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
77
78
--
79
-- Table structure for table 'club_enrollment_fields'
80
--
81
82
CREATE TABLE IF NOT EXISTS club_enrollment_fields (
83
  id int(11) NOT NULL AUTO_INCREMENT,
84
  club_enrollment_id int(11) NOT NULL,
85
  club_template_enrollment_field_id int(11) NOT NULL,
86
  `value` text NOT NULL,
87
  PRIMARY KEY (id),
88
  KEY club_enrollment_id (club_enrollment_id),
89
  KEY club_template_enrollment_field_id (club_template_enrollment_field_id),
90
  CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
91
  CONSTRAINT club_enrollment_fields_ibfk_2 FOREIGN KEY (club_template_enrollment_field_id) REFERENCES club_template_enrollment_fields (id) ON DELETE CASCADE ON UPDATE CASCADE
92
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
93
94
--
95
-- Table structure for table 'club_template_fields'
96
--
97
98
CREATE TABLE IF NOT EXISTS club_template_fields (
99
  id int(11) NOT NULL AUTO_INCREMENT,
100
  club_template_id int(11) NOT NULL,
101
  `name` tinytext NOT NULL,
102
  description text,
103
  authorised_value_category varchar(16) DEFAULT NULL,
104
  PRIMARY KEY (id),
105
  KEY club_template_id (club_template_id),
106
  CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
107
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
108
109
--
110
-- Table structure for table 'club_fields'
111
--
112
113
CREATE TABLE IF NOT EXISTS club_fields (
114
  id int(11) NOT NULL AUTO_INCREMENT,
115
  club_template_field_id int(11) NOT NULL,
116
  club_id int(11) NOT NULL,
117
  `value` text,
118
  PRIMARY KEY (id),
119
  KEY club_template_field_id (club_template_field_id),
120
  KEY club_id (club_id),
121
  CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
122
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
123
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
124
125
INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES (21, 'clubs', 'Patron clubs', '0');
126
127
INSERT INTO permissions (module_bit, code, description) VALUES
128
   (21, 'edit_templates', 'Create and update club templates'),
129
   (21, 'edit_clubs', 'Create and update clubs'),
130
   (21, 'enroll', 'Enroll patrons in clubs')
131
;
(-)a/installer/data/mysql/kohastructure.sql (+126 lines)
Lines 3954-3959 CREATE TABLE deletedbiblio_metadata ( Link Here
3954
    CONSTRAINT `deletedrecord_metadata_fk_1` FOREIGN KEY (biblionumber) REFERENCES deletedbiblio (biblionumber) ON DELETE CASCADE ON UPDATE CASCADE
3954
    CONSTRAINT `deletedrecord_metadata_fk_1` FOREIGN KEY (biblionumber) REFERENCES deletedbiblio (biblionumber) ON DELETE CASCADE ON UPDATE CASCADE
3955
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3955
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3956
3956
3957
--
3958
-- Table structure for table 'club_templates'
3959
--
3960
3961
CREATE TABLE IF NOT EXISTS club_templates (
3962
  id int(11) NOT NULL AUTO_INCREMENT,
3963
  `name` tinytext NOT NULL,
3964
  description text,
3965
  is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
3966
  is_email_required tinyint(1) NOT NULL DEFAULT '0',
3967
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
3968
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
3969
  date_updated timestamp NULL DEFAULT NULL,
3970
  is_deletable tinyint(1) NOT NULL DEFAULT '1',
3971
  PRIMARY KEY (id),
3972
  KEY ct_branchcode (branchcode),
3973
  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
3974
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3975
3976
--
3977
-- Table structure for table 'clubs'
3978
--
3979
3980
CREATE TABLE IF NOT EXISTS clubs (
3981
  id int(11) NOT NULL AUTO_INCREMENT,
3982
  club_template_id int(11) NOT NULL,
3983
  `name` tinytext NOT NULL,
3984
  description text,
3985
  date_start date DEFAULT NULL,
3986
  date_end date DEFAULT NULL,
3987
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
3988
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
3989
  date_updated timestamp NULL DEFAULT NULL,
3990
  PRIMARY KEY (id),
3991
  KEY club_template_id (club_template_id),
3992
  KEY branchcode (branchcode),
3993
  CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
3994
  CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode)
3995
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3996
3997
--
3998
-- Table structure for table 'club_enrollments'
3999
--
4000
4001
CREATE TABLE IF NOT EXISTS club_enrollments (
4002
  id int(11) NOT NULL AUTO_INCREMENT,
4003
  club_id int(11) NOT NULL,
4004
  borrowernumber int(11) NOT NULL,
4005
  date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
4006
  date_canceled timestamp NULL DEFAULT NULL,
4007
  date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
4008
  date_updated timestamp NULL DEFAULT NULL,
4009
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
4010
  PRIMARY KEY (id),
4011
  KEY club_id (club_id),
4012
  KEY borrowernumber (borrowernumber),
4013
  KEY branchcode (branchcode),
4014
  CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
4015
  CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
4016
  CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE
4017
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4018
4019
--
4020
-- Table structure for table 'club_template_enrollment_fields'
4021
--
4022
4023
CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
4024
  id int(11) NOT NULL AUTO_INCREMENT,
4025
  club_template_id int(11) NOT NULL,
4026
  `name` tinytext NOT NULL,
4027
  description text,
4028
  authorised_value_category varchar(16) DEFAULT NULL,
4029
  PRIMARY KEY (id),
4030
  KEY club_template_id (club_template_id),
4031
  CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
4032
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4033
4034
--
4035
-- Table structure for table 'club_enrollment_fields'
4036
--
4037
4038
CREATE TABLE IF NOT EXISTS club_enrollment_fields (
4039
  id int(11) NOT NULL AUTO_INCREMENT,
4040
  club_enrollment_id int(11) NOT NULL,
4041
  club_template_enrollment_field_id int(11) NOT NULL,
4042
  `value` text NOT NULL,
4043
  PRIMARY KEY (id),
4044
  KEY club_enrollment_id (club_enrollment_id),
4045
  KEY club_template_enrollment_field_id (club_template_enrollment_field_id),
4046
  CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
4047
  CONSTRAINT club_enrollment_fields_ibfk_2 FOREIGN KEY (club_template_enrollment_field_id) REFERENCES club_template_enrollment_fields (id) ON DELETE CASCADE ON UPDATE CASCADE
4048
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4049
4050
--
4051
-- Table structure for table 'club_template_fields'
4052
--
4053
4054
CREATE TABLE IF NOT EXISTS club_template_fields (
4055
  id int(11) NOT NULL AUTO_INCREMENT,
4056
  club_template_id int(11) NOT NULL,
4057
  `name` tinytext NOT NULL,
4058
  description text,
4059
  authorised_value_category varchar(16) DEFAULT NULL,
4060
  PRIMARY KEY (id),
4061
  KEY club_template_id (club_template_id),
4062
  CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
4063
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4064
4065
--
4066
-- Table structure for table 'club_fields'
4067
--
4068
4069
CREATE TABLE IF NOT EXISTS club_fields (
4070
  id int(11) NOT NULL AUTO_INCREMENT,
4071
  club_template_field_id int(11) NOT NULL,
4072
  club_id int(11) NOT NULL,
4073
  `value` text,
4074
  PRIMARY KEY (id),
4075
  KEY club_template_field_id (club_template_field_id),
4076
  KEY club_id (club_id),
4077
  CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
4078
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
4079
>>>>>>> Bug 12461 - Add patron clubs feature
4080
>>>>>>> Bug 12461 - Add patron clubs feature
4081
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
4082
3957
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
4083
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
3958
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
4084
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
3959
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
4085
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
(-)a/installer/data/mysql/userflags.sql (-1 / +2 lines)
Lines 17-21 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here
17
(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
17
(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
18
(18,'coursereserves','Course reserves',0),
18
(18,'coursereserves','Course reserves',0),
19
(19, 'plugins', 'Koha plugins', '0'),
19
(19, 'plugins', 'Koha plugins', '0'),
20
(20, 'lists', 'Lists', 0)
20
(20, 'lists', 'Lists', 0),
21
(21, 'clubs', 'Patron clubs', '0')
21
;
22
;
(-)a/installer/data/mysql/userpermissions.sql (-1 / +4 lines)
Lines 78-82 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
78
   (19, 'tool', 'Use tool plugins'),
78
   (19, 'tool', 'Use tool plugins'),
79
   (19, 'report', 'Use report plugins'),
79
   (19, 'report', 'Use report plugins'),
80
   (19, 'configure', 'Configure plugins'),
80
   (19, 'configure', 'Configure plugins'),
81
   (20, 'delete_public_lists', 'Delete public lists')
81
   (20, 'delete_public_lists', 'Delete public lists'),
82
   (21, 'edit_templates', 'Create and update club templates'),
83
   (21, 'edit_clubs', 'Create and update clubs'),
84
   (21, 'enroll', 'Enroll patrons in clubs')
82
;
85
;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+4 lines)
Lines 19-24 Link Here
19
    [%- CASE 'coursereserves' -%]<span>Course reserves</span>
19
    [%- CASE 'coursereserves' -%]<span>Course reserves</span>
20
    [%- CASE 'plugins' -%]<span>Koha plugins</span>
20
    [%- CASE 'plugins' -%]<span>Koha plugins</span>
21
    [%- CASE 'lists' -%]<span>Lists</span>
21
    [%- CASE 'lists' -%]<span>Lists</span>
22
    [%- CASE 'clubs' -%]<span>Patron clubs</span>
22
    [%- END -%]
23
    [%- END -%]
23
[%- END -%]
24
[%- END -%]
24
25
Lines 103-107 Link Here
103
    [%- CASE 'delete_public_lists' -%]<span>Delete public lists</span>
104
    [%- CASE 'delete_public_lists' -%]<span>Delete public lists</span>
104
    [%- CASE 'upload_general_files' -%]<span>Upload any file</span>
105
    [%- CASE 'upload_general_files' -%]<span>Upload any file</span>
105
    [%- CASE 'upload_manage' -%]<span>Manage uploaded files (<i>Useless without upload_general_files</i>)</span>
106
    [%- CASE 'upload_manage' -%]<span>Manage uploaded files (<i>Useless without upload_general_files</i>)</span>
107
    [%- CASE 'edit_clubs' -%]<span>Create and edit clubs</span>
108
    [%- CASE 'edit_templates' -%]<span>Create and edit club templates</span>
109
    [%- CASE 'enroll' -%]<span>Enroll patrons in clubs</span>
106
    [%- END -%]
110
    [%- END -%]
107
[%- END -%]
111
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc (+3 lines)
Lines 25-30 Link Here
25
    [% IF ( CAN_user_tools_manage_patron_lists ) %]
25
    [% IF ( CAN_user_tools_manage_patron_lists ) %]
26
	<li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
26
	<li><a href="/cgi-bin/koha/patron_lists/lists.pl">Patron lists</a></li>
27
    [% END %]
27
    [% END %]
28
    [% IF (CAN_user_clubs) %]
29
        <li><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a></li>
30
    [% END %]
28
    [% IF ( CAN_user_tools_moderate_comments ) %]
31
    [% IF ( CAN_user_tools_moderate_comments ) %]
29
	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
32
	<li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></li>
30
    [% END %]
33
    [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+23 lines)
Lines 97-102 $(document).ready(function() { Link Here
97
        }
97
        }
98
    });
98
    });
99
99
100
    if ( $('#clubs-tab').length ) {
101
        $('#clubs-tab-link').on('click', function() {
102
            $('#clubs-tab').text(_("Loading..."));
103
            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
104
        });
105
    }
106
100
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
107
    [% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
101
        // listen submit to trigger qslip on empty checkout
108
        // listen submit to trigger qslip on empty checkout
102
        $('#mainform').bind('submit',function() {
109
        $('#mainform').bind('submit',function() {
Lines 891-896 No patron matched <span class="ex">[% message | html %]</span> Link Here
891
        [% END %]
898
        [% END %]
892
    </li>
899
    </li>
893
900
901
    [% SET enrollments = borrower.GetClubEnrollmentsCount %]
902
    [% SET enrollable  = borrower.GetEnrollableClubsCount %]
903
    [% IF CAN_user_clubs && ( enrollable || enrollments ) %]
904
        <li>
905
            <a id="clubs-tab-link" href="#clubs-tab">
906
                Clubs ([% enrollments %]/[% enrollable %])
907
            </a>
908
        </li>
909
    [% END %]
910
894
    [% IF relatives_issues_count %]
911
    [% IF relatives_issues_count %]
895
        <li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
912
        <li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
896
    [% END %]
913
    [% END %]
Lines 939-944 No patron matched <span class="ex">[% message | html %]</span> Link Here
939
    </div>
956
    </div>
940
[% END %]
957
[% END %]
941
958
959
[% IF CAN_user_clubs %]
960
    <div id="clubs-tab">
961
        Loading...
962
    </div>
963
[% END %]
964
942
[% INCLUDE borrower_debarments.inc %]
965
[% INCLUDE borrower_debarments.inc %]
943
966
944
<div id="reserves">
967
<div id="reserves">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt (+132 lines)
Line 0 Link Here
1
[% USE KohaDates %]
2
[% USE Branches %]
3
[% USE AuthorisedValues %]
4
[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
5
[% INCLUDE 'doc-head-open.inc' %]
6
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo; Club</title>
7
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'calendar.inc' %]
9
</head>
10
11
<body id="clubs_add_modify" class="clubs">
12
[% INCLUDE 'header.inc' %]
13
[% INCLUDE 'cat-search.inc' %]
14
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="clubs.pl">Patron clubs</a> &rsaquo; Add / modify club</div>
15
16
<div class="yui-t7">
17
    <div class="yui-main">
18
        [% IF stored %]
19
            <div class="alert">
20
                [% IF stored == 'updated' %]
21
                    <p>Your club was updated</p>
22
                [% ELSE %]
23
                    <p>Your club was created</p>
24
                [% END %]
25
                <a href="clubs.pl">Return to patron clubs</a>
26
            </div>
27
        [% END %]
28
29
        <form method="post" class="validated">
30
            <input type="hidden" name="id" value="[% club.id %]" />
31
            <input type="hidden" name="club_template_id" value="[% club_template.id %]" />
32
33
            <fieldset class="rows">
34
35
                <legend>
36
                    [% IF club %]
37
                        Modify club <i>[% club.name %]</i>
38
                    [% ELSE %]
39
                        Create a new <i>[% club_template.name %]</i> club
40
                    [% END %]
41
                </legend>
42
43
                <ol>
44
                    <li>
45
                        <label class="required" for="name">Name:</label>
46
                        <input id="club-name" name="name" type="text" value="[% club.name %]" required="required"/>
47
                        <span class="required">Required</span>
48
                    </li>
49
50
                    <li>
51
                        <label for="description">Description:</label>
52
                        <input id="club-template-name" name="description" type="text" value="[% club.description %]" />
53
                    </li>
54
55
                    <li>
56
                        <label for="date_start">Start date:</label>
57
                        <input name="date_start" id="from" size="10" readonly="readonly" class="datepickerfrom" value="[% club.date_start | $KohaDates %]">
58
                    </li>
59
60
                    <li>
61
                        <label for="date_end">End date:</label>
62
                        <input name="date_end" id="to" size="10" readonly="readonly" class="datepickerto" value="[% club.date_end | $KohaDates %]" >
63
                    </li>
64
65
                    <li>
66
                        <label for="name">Library:</label>
67
                        <select name="branchcode" id="club-template-branchcode">
68
                            <option value="">&nbsp</option>
69
                            [% FOREACH b IN Branches.GetBranches() %]
70
                                [% IF b.branchcode == club.branch.branchcode %]
71
                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
72
                                [% ELSE %]
73
                                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
74
                                [% END %]
75
                            [% END %]
76
                        </select>
77
                    </li>
78
79
                    [% IF club %]
80
                        [% FOREACH f IN club.club_fields %]
81
                            <li>
82
                                <input type="hidden" name="club_template_field_id" value="[% f.club_template_field.id %]" />
83
                                <input type="hidden" name="club_field_id" value="[% f.id %]" />
84
85
                                <label for="club_field">[% f.club_template_field.name %]</label>
86
                                [% IF f.club_template_field.authorised_value_category %]
87
                                    <select name="club_field">
88
                                        [% FOREACH a IN AuthorisedValues.Get( f.club_template_field.authorised_value_category ) %]
89
                                            [% IF a.authorised_value == f.value %]
90
                                                <option value="[% a.authorised_value %]" selected="selected">[% a.lib %]</option>
91
                                            [% ELSE %]
92
                                                <option value="[% a.authorised_value %]">[% a.lib %]</option>
93
                                            [% END %]
94
                                        [% END %]
95
                                    </select>
96
                                [% ELSE %]
97
                                    <input type="text" name="club_field" value="[% f.value %]" />
98
                                [% END %]
99
                            </li>
100
                        [% END %]
101
                    [% ELSE %]
102
                        [% FOREACH f IN club_template.club_template_fields %]
103
                            <li>
104
                                <input type="hidden" name="club_template_field_id" value="[% f.id %]" />
105
106
                                <label for="club_field">[% f.name %]</label>
107
                                [% IF f.authorised_value_category %]
108
                                    <select name="club_field">
109
                                        [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
110
                                            <option value="[% a.authorised_value %]">[% a.lib %]</option>
111
                                        [% END %]
112
                                    </select>
113
                                [% ELSE %]
114
                                    <input type="text" name="club_field" />
115
                                [% END %]
116
                            </li>
117
                        [% END %]
118
                    [% END %]
119
120
                </ol>
121
122
            </fieldset>
123
124
            <fieldset class="action">
125
                <input type="submit" class="btn btn-default" value="Save" />
126
                <a href="clubs.pl" class="cancel">Cancel</a>
127
            </fieldset>
128
        </form>
129
    </div>
130
</div>
131
132
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt (+234 lines)
Line 0 Link Here
1
[% USE Branches %]
2
[% USE Koha %]
3
[% INCLUDE 'doc-head-open.inc' %]
4
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs</title>
5
[% INCLUDE 'doc-head-close.inc' %]
6
7
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
8
[% INCLUDE 'datatables.inc' %]
9
10
<script type="text/javascript">
11
//<![CDATA[
12
    $(document).ready(function() {
13
        tTable = $('#club-templates-table').dataTable($.extend(true, {}, dataTablesDefaults, {
14
            "sPaginationType": "four_button",
15
            "sDom": 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>',
16
            "aoColumnDefs": [
17
                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
18
            ]
19
        } ));
20
21
        cTable = $('#clubs-table').dataTable($.extend(true, {}, dataTablesDefaults, {
22
            "sPaginationType": "four_button",
23
            "sDom": 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>',
24
            "aoColumnDefs": [
25
                    { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
26
            ]
27
        } ));
28
    });
29
30
    function ConfirmDeleteTemplate( id, name, a ) {
31
        if ( confirm( _("Are you sure you want to delete the club template %s?" ).format(name) ) ) {
32
            $.ajax({
33
                type: "POST",
34
                url: '/cgi-bin/koha/svc/club/template/delete',
35
                data: { id: id },
36
                success: function( data ) {
37
                    if ( data.success ) {
38
                        tTable.fnDeleteRow(a.closest("tr")[0]);
39
                    } else {
40
                        alert(_("Unable to delete template!"));
41
                    }
42
                },
43
                dataType: 'json'
44
            });
45
        }
46
    }
47
48
    function ConfirmDeleteClub( id, name, a ) {
49
        if ( confirm( _("Are you sure you want to delete the club %s?" ).format(name) ) ) {
50
            $.ajax({
51
                type: "POST",
52
                url: '/cgi-bin/koha/svc/club/delete',
53
                data: { id: id },
54
                success: function( data ) {
55
                    if ( data.success ) {
56
                        cTable.fnDeleteRow(a.closest("tr")[0]);
57
                    } else {
58
                        alert(_("Unable to delete club!"));
59
                    }
60
                },
61
                dataType: 'json'
62
            });
63
        }
64
    }
65
//]]>
66
</script>
67
68
</head>
69
70
<body id="clubs_clubs" class="clubs">
71
[% INCLUDE 'header.inc' %]
72
[% INCLUDE 'cat-search.inc' %]
73
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; Patron clubs</div>
74
75
<div id="doc3" class="yui-t2">
76
   <div id="bd">
77
        <div id="yui-main">
78
            <div class="yui-b">
79
                <h1>Patron clubs</h1>
80
81
                <h3>Club templates</h3>
82
83
                [% IF CAN_user_clubs_edit_templates %]
84
                    <div class="btn-toolbar">
85
                        <div class="btn-group">
86
                            <a class="btn btn-default" href="templates-add-modify.pl"><i class="fa fa-plus"></i> New club template</a>
87
                        </div>
88
                    </div>
89
                [% END %]
90
91
                <table id="club-templates-table">
92
                    <thead>
93
                        <tr>
94
                            <th>Name</th>
95
                            <th>Description</th>
96
                            <th>Public enrollment</th>
97
                            <th>Email required</th>
98
                            <th>Library</th>
99
                            <th>&nbsp;</th>
100
                            <th>&nbsp;</th>
101
                        </tr>
102
                    </thead>
103
104
                    <tbody>
105
                        [% IF club_templates %]
106
                            [% FOREACH t IN club_templates %]
107
                                <tr>
108
                                    <td>[% t.name %]</td>
109
                                    <td>[% t.description %]</td>
110
                                    <td>
111
                                        [% IF t.is_enrollable_from_opac %]
112
                                            Yes
113
                                        [% ELSE %]
114
                                            No
115
                                        [% END %]
116
                                    </td>
117
                                    <td>
118
                                        [% IF t.is_email_required %]
119
                                            Yes
120
                                        [% ELSE %]
121
                                            No
122
                                        [% END %]
123
                                    </td>
124
                                    <td>[% Branches.GetName( t.branchcode ) %]</td>
125
                                    <td>
126
                                        [% IF CAN_user_clubs_edit_templates %]
127
                                            <a class="btn btn-default" style="white-space:nowrap"  href="templates-add-modify.pl?id=[% t.id %]">
128
                                                <i class="fa fa-edit"></i> Edit
129
                                            </a>
130
                                        [% END %]
131
                                    </td>
132
                                    <td>
133
                                        [% IF CAN_user_clubs_edit_templates %]
134
                                            <a class="btn btn-default" href="#" onclick='ConfirmDeleteTemplate([% t.id %], "[% t.name | html %]", $(this) ); return false;'>
135
                                                <i class="fa fa-trash"></i> Delete
136
                                            </a>
137
                                        [% END %]
138
                                    </td>
139
                                </tr>
140
                            [% END %]
141
                        [% ELSE %]
142
                            <tr>
143
                                <td colspan="7">
144
                                    No club templates defined.
145
                                </td>
146
                            </td>
147
                        [% END %]
148
                    </tbody>
149
                </table>
150
151
                <h3>Clubs</h3>
152
153
                [% IF CAN_user_clubs_edit_clubs %]
154
                    <div class="btn-toolbar">
155
                        <div class="btn-group">
156
                            <button class="btn dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus"></i> New club <span class="caret"></span></button>
157
                            <ul class="dropdown-menu">
158
                                [% FOREACH t IN club_templates %]
159
                                    <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id %]">[% t.name %]</a></li>
160
                                [% END %]
161
                            </ul>
162
                        </div>
163
                    </div>
164
                [% END %]
165
166
                <table id="clubs-table">
167
                    <thead>
168
                        <tr>
169
                            <th>Name</th>
170
                            <th>Template</th>
171
                            <th>Description</th>
172
                            <th>Public enrollment</th>
173
                            <th>Email required</th>
174
                            <th>Library</th>
175
                            <th>&nbsp;</th>
176
                            <th>&nbsp;</th>
177
                        </tr>
178
                    </thead>
179
180
                    <tbody>
181
                        [% IF clubs %]
182
                            [% FOREACH c IN clubs %]
183
                                <tr>
184
                                    <td>[% c.name %]</td>
185
                                    <td>[% c.club_template.name %]</td>
186
                                    <td>[% c.description %]</td>
187
                                    <td>
188
                                        [% IF c.club_template.is_enrollable_from_opac %]
189
                                            Yes
190
                                        [% ELSE %]
191
                                            No
192
                                        [% END %]
193
                                    </td>
194
                                    <td>
195
                                        [% IF c.club_template.is_email_required %]
196
                                            Yes
197
                                        [% ELSE %]
198
                                            No
199
                                        [% END %]
200
                                    </td>
201
                                    <td>[% Branches.GetName( c.branchcode ) %]</td>
202
                                    <td>
203
                                        [% IF CAN_user_clubs_edit_clubs %]
204
                                            <a class="btn btn-default" style="white-space:nowrap" href="clubs-add-modify.pl?id=[% c.id %]">
205
                                                <i class="fa fa-edit"></i> Edit
206
                                            </a>
207
                                        [% END %]
208
                                    </td>
209
                                    <td>
210
                                        [% IF CAN_user_clubs_edit_clubs %]
211
                                            <a class="btn btn-default" href="#" onclick='ConfirmDeleteClub([% c.id %], "[% c.name | html %]", $(this) ); return false;'>
212
                                                <i class="fa fa-trash"></i> Delete
213
                                            </a>
214
                                        [% END %]
215
                                    </td>
216
                                </tr>
217
                            [% END %]
218
                        [% ELSE %]
219
                            <tr>
220
                                <td colspan="8">
221
                                    No club templates defined.
222
                                </td>
223
                            </td>
224
                        [% END %]
225
                    </tbody>
226
                </table>
227
            </div>
228
        </div>
229
        <div class="yui-b noprint">
230
            [% INCLUDE 'tools-menu.inc' %]
231
        </div>
232
    </div>
233
</div>
234
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-clubs-tab.tt (+102 lines)
Line 0 Link Here
1
[% USE KohaDates %]
2
3
[% IF enrollments %]
4
    <table>
5
        <thead>
6
            <tr>
7
                <th colspan="4">
8
                    Clubs currently enrolled in
9
                </th>
10
            </tr>
11
            <tr>
12
                <th>Name</th>
13
                <th>Description</th>
14
                <th>Date enrolled</th>
15
                [% IF CAN_user_clubs_enroll %]<th>&nbsp;</th>[% END %]
16
            </tr>
17
        </thead>
18
19
        <tbody>
20
            [% FOREACH e IN enrollments %]
21
                <tr>
22
                    <td>[% e.club.name %]</td>
23
                    <td>[% e.club.description %]</td>
24
                    <td>[% e.date_enrolled | $KohaDates %]</td>
25
                    [% IF CAN_user_clubs_enroll %]
26
                        <td>
27
                            <a class="btn btn-xs" onclick="cancelEnrollment( [% e.id %] )">
28
                                <i class="fa fa-remove"></i> Cancel
29
                            </a>
30
                        </td>
31
                    [% END %]
32
                </tr>
33
            [% END %]
34
        </tbody>
35
    </table>
36
[% END %]
37
38
[% IF clubs %]
39
    <table>
40
        <thead>
41
            <tr>
42
                <th colspan="3">
43
                    Clubs not enrolled in
44
                </th>
45
            </tr>
46
            <tr>
47
                <th>Name</th>
48
                <th>Description</th>
49
                [% IF CAN_user_clubs_enroll %]<th>&nbsp;</th>[% END %]
50
            </tr>
51
        </thead>
52
53
        <tbody>
54
            [% FOREACH c IN clubs %]
55
                <tr>
56
                    <td>[% c.name %]</td>
57
                    <td>[% c.description %]</td>
58
                    [% IF CAN_user_clubs_enroll %]
59
                        <td>
60
                            <a class="btn btn-xs" onclick="loadEnrollmentForm([% c.id %])">
61
                                <i class="fa fa-plus"></i> Enroll
62
                            </a>
63
                        </td>
64
                    [% END %]
65
                </tr>
66
            [% END %]
67
        </tbody>
68
    </table>
69
[% END %]
70
71
[% IF CAN_user_clubs_enroll %]
72
<script type="text/javascript">
73
function loadEnrollmentForm( id ) {
74
    $("body").css("cursor", "progress");
75
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=[% borrowernumber %]&id=' + id, function() {
76
        $("body").css("cursor", "default");
77
    });
78
79
    return false;
80
}
81
82
function cancelEnrollment( id ) {
83
    $("body").css("cursor", "progress");
84
    $.ajax({
85
        type: "POST",
86
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
87
        data: { id: id },
88
        success: function( data ) {
89
            if ( data.success ) {
90
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]', function() {
91
                    $("body").css("cursor", "default");
92
                });
93
            } else {
94
                alert(_("Unable to cancel enrollment!"));
95
            }
96
        },
97
        dataType: 'json'
98
    });
99
    return false;
100
}
101
</script>
102
[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/patron-enroll.tt (+66 lines)
Line 0 Link Here
1
[% USE AuthorisedValues %]
2
[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
3
4
<h3>
5
    Enroll in <i>[% club.name %]</i>
6
</h3>
7
8
<div class="container">
9
    <form id="patron-enrollment-form">
10
        <input type="hidden" name="id" value="[% club.id %]" />
11
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
12
        <fieldset class="rows">
13
            <ol>
14
                [% FOREACH f IN club.club_template.club_template_enrollment_fields %]
15
                    <li>
16
                        <label>[% f.name %]</label>
17
                        [% IF f.authorised_value_category %]
18
                            <select name="[% f.id %]">
19
                                [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
20
                                    <option value="[% a.authorised_value %]">[% a.lib %]</option>
21
                                [% END %]
22
                            </select>
23
                        [% ELSE %]
24
                            <input type="text" name="[% f.id %]" />
25
                        [% END %]
26
                        <span class="hint">[% f.description %]</span>
27
                    </li>
28
                [% END %]
29
30
                <li>
31
                    <a href="#" class="btn btn-default" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a>
32
                    <a href="#" onclick="showClubs(); return false;">Cancel</a>
33
                </li>
34
            </ol>
35
        </fieldset>
36
    </form>
37
</div>
38
39
<script type="text/javascript">
40
function addEnrollment() {
41
    $("body").css("cursor", "progress");
42
    $.ajax({
43
        type: "POST",
44
        url: '/cgi-bin/koha/svc/club/enroll',
45
        data: $( "#patron-enrollment-form" ).serialize(),
46
        success: function( data ) {
47
            if ( data.success ) {
48
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
49
                    $("body").css("cursor", "default");
50
                });
51
            } else {
52
                alert(_("Unable to create enrollment!"));
53
            }
54
        },
55
        dataType: 'json'
56
    });
57
    return false;
58
}
59
60
function showClubs() {
61
    $("body").css("cursor", "progress");
62
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
63
        $("body").css("cursor", "default");
64
    });
65
}
66
</script>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/templates-add-modify.tt (+246 lines)
Line 0 Link Here
1
[% USE Branches %]
2
[% USE AuthorisedValues %]
3
[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
4
[% INCLUDE 'doc-head-open.inc' %]
5
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo; Club template</title>
6
[% INCLUDE 'doc-head-close.inc' %]
7
</head>
8
9
<body id="clubs_templates_add_modify" class="clubs">
10
[% INCLUDE 'header.inc' %]
11
[% INCLUDE 'cat-search.inc' %]
12
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <a href="clubs.pl">Patron clubs</a> &rsaquo; Add / modify club template</div>
13
14
<div class="yui-t7">
15
    <div class="yui-main">
16
        [% IF stored %]
17
            <div class="alert">
18
                <p>Your club template was [% IF stored == 'updated' %] updated [% ELSE %] saved [% END %]</p>
19
                <a href="clubs.pl">Return to patron clubs</a>
20
            </div>
21
        [% END %]
22
23
        <form method="post" class="validated">
24
            <input type="hidden" name="id" value="[% club_template.id %]" />
25
26
            <fieldset class="rows">
27
28
                <legend>
29
                    [% IF club_template %]
30
                        Modify club template <i>[% club_template.name %]</i>
31
                    [% ELSE %]
32
                        Create a new club template
33
                    [% END %]
34
                </legend>
35
36
                <ol>
37
                    <li>
38
                        <label class="required" for="name">Name:</label>
39
                        <input id="club-template-name" name="name" type="text" value="[% club_template.name %]" required="required"/>
40
                        <span class="required">Required</span>
41
                    </li>
42
43
                    <li>
44
                        <label for="description">Description:</label>
45
                        <input id="club-template-description" name="description" type="text" value="[% club_template.description %]" />
46
                    </li>
47
48
                    <li>
49
                        <label for="name">Allow public enrollment:</label>
50
                        [% IF club_template.is_enrollable_from_opac %]
51
                            <input type="checkbox" id="club-template-is-enrollable-from-opac" name="is_enrollable_from_opac" checked="checked" />
52
                        [% ELSE %]
53
                            <input type="checkbox" id="club-template-is-enrollable-from-opac" name="is_enrollable_from_opac" />
54
                        [% END %]
55
                        <span class="hint">If a template allows public enrollment, patrons can enroll in a club based on this template from the public catalog.</span>
56
                    </li>
57
58
                    <li>
59
                        <label for="name">Require valid email address:</label>
60
                        [% IF club_template.is_email_required %]
61
                            <input type="checkbox" id="club-template-is-email-required" name="is_email_required" checked="checked" />
62
                        [% ELSE %]
63
                            <input type="checkbox" id="club-template-is-email-required" name="is_email_required" />
64
                        [% END %]
65
                        <span class="hint">If set, a club based on this template can only be enrolled in by patrons with a valid email address.</span>
66
                    </li>
67
68
                    <li>
69
                        <label for="name">Library:</label>
70
                        <select name="branchcode" id="club-template-branchcode">
71
                            <option value="">&nbsp</option>
72
                            [% FOREACH b IN Branches.GetBranches() %]
73
                                [% IF b.branchcode == club_template.branchcode %]
74
                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
75
                                [% ELSE %]
76
                                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
77
                                [% END %]
78
                            [% END %]
79
                        </select>
80
                        <span class="hint">If set, only librarians logged in with this branch will be able to modify this club template.</span>
81
                    </li>
82
83
                </ol>
84
85
                <h2>Club fields:</h2>
86
                <p><span class="hint">These fields will be used in the creation of clubs based on this template</span></p>
87
                <span id="club-template-fields">
88
                    [% FOREACH f IN club_template.club_template_fields %]
89
                        <ul>
90
                            <input type="hidden" name="club_template_field_id" value="[% f.id %]" />
91
                            <li>
92
                                <label for="field-name-[% f.id %]">Name:</label>
93
                                <input name="club_template_field_name" id="field-name-[% f.id %]" value="[% f.name %]" />
94
                            </li>
95
96
                            <li>
97
                                <label for="field-description-[% f.id %]">Description:</label>
98
                                <input name="club_template_field_description" id="field-description-[% f.id %]" value="[% f.description %]" />
99
                            </li>
100
101
                            <li>
102
                                <label for="field-description-[% f.id %]">Authorised value category:</label>
103
                                <select name="club_template_field_authorised_value_category" id="field-authorised-value-category-[% f.id %]">
104
                                    <option value="">&nbsp;</option>
105
                                    [% FOREACH c IN AuthorisedValuesCategories %]
106
                                        [% IF f.authorised_value_category == c %]
107
                                            <option selected="selected" value="[% c %]">[% c %]</option>
108
                                        [% ELSE %]
109
                                            <option value="[% c %]">[% c %]</option>
110
                                        [% END %]
111
                                    [% END %]
112
                                </select>
113
                            </li>
114
115
                            <li>
116
                                <label for="field-delete-[% f.id %]">Delete field:</label>
117
                                <input type="checkbox" name="club_template_field_delete" id="field-delete-[% f.id %]" value="[% f.id %]" />
118
                            </li>
119
120
                            <hr/>
121
                        </ul>
122
                    [% END %]
123
                </span>
124
                <div class="btn-toolbar">
125
                    <a href="#" class="btn btn-default" onclick="$('#new-field-template').clone().attr('id','').show().appendTo('#club-template-fields'); return false;">
126
                        <i class="fa fa-plus"></i> Add new field
127
                    </a>
128
                </div>
129
130
                <h2>Enrollment fields:</h2>
131
                <p><span class="hint">These fields will be used when enrolling a patron in a club based on this template</span></p>
132
                <span id="club-template-enrollment-fields">
133
                    [% FOREACH f IN club_template.club_template_enrollment_fields %]
134
                        <ul>
135
                            <input type="hidden" name="club_template_enrollment_field_id" value="[% f.id %]" />
136
                            <li>
137
                                <label for="enrollment-field-name-[% f.id %]">Name:</label>
138
                                <input name="club_template_enrollment_field_name" id="enrollment-field-name-[% f.id %]" value="[% f.name %]" />
139
                            </li>
140
141
                            <li>
142
                                <label for="enrollment-field-description-[% f.id %]">Description:</label>
143
                                <input name="club_template_enrollment_field_description" id="enrollment-field-description-[% f.id %]" value="[% f.description %]" />
144
                            </li>
145
146
                            <li>
147
                                <label for="enrollment-field-description-[% f.id %]">Authorised value category:</label>
148
                                <select name="club_template_enrollment_field_authorised_value_category" id="enrollment-field-authorised-value-category-[% f.id %]">
149
                                    <option value="">&nbsp;</option>
150
                                    [% FOREACH c IN AuthorisedValuesCategories %]
151
                                        [% IF f.authorised_value_category == c %]
152
                                            <option selected="selected" value="[% c %]">[% c %]</option>
153
                                        [% ELSE %]
154
                                            <option value="[% c %]">[% c %]</option>
155
                                        [% END %]
156
                                    [% END %]
157
                                </select>
158
                            </li>
159
160
                            <li>
161
                                <label for="enrollment-field-delete-[% f.id %]">Delete field:</label>
162
                                <input type="checkbox" name="club_template_enrollment_field_delete" id="enrollment-field-delete-[% f.id %]" value="[% f.id %]" />
163
                            </li>
164
165
                            <hr/>
166
                        </ul>
167
                    [% END %]
168
                </span>
169
                <div class="btn-toolbar">
170
                    <a href="#" class="btn btn-default" onclick="$('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields'); return false;">
171
                        <i class="fa fa-plus"></i> Add new field
172
                    </a>
173
                </div>
174
175
            </fieldset>
176
177
            <fieldset class="action">
178
                <input type="hidden" name="id" value="[% club_template.id %]" />
179
                <input type="submit" class="btn btn-default" value="Save" />
180
                <a href="clubs.pl" class="cancel">Cancel</a>
181
            </fieldset>
182
        </form>
183
    </div>
184
</div>
185
186
<span id="new-field-template" style="display:none">
187
    <ul>
188
        <input type="hidden" name="club_template_field_id" value="" />
189
190
        <li>
191
            <label for="club_template_field_name">Name:</label>
192
            <input name="club_template_field_name" />
193
        </li>
194
195
        <li>
196
            <label for="club_template_field_description">Description:</label>
197
            <input name="club_template_field_description" />
198
        </li>
199
200
        <li>
201
            <label for="club_template_field_authorised_value_category">Authorised value category:</label>
202
            <select name="club_template_field_authorised_value_category">
203
                <option value="">&nbsp;</option>
204
                [% FOREACH c IN AuthorisedValuesCategories %]
205
                    <option value="[% c %]">[% c %]</option>
206
                [% END %]
207
            </select>
208
        </li>
209
210
        <a href="#" onclick="$(this).parent().remove(); return false;">Cancel</a>
211
212
        <hr/>
213
    </ul>
214
</span>
215
216
<span id="new-enrollment-field-template" style="display:none">
217
    <ul>
218
        <input type="hidden" name="club_template_enrollment_field_id" value="" />
219
220
        <li>
221
            <label for="club_template_enrollment_field_name">Name:</label>
222
            <input name="club_template_enrollment_field_name" />
223
        </li>
224
225
        <li>
226
            <label for="club_template_enrollment_field_description">Description:</label>
227
            <input name="club_template_enrollment_field_description" />
228
        </li>
229
230
        <li>
231
            <label for="club_template_enrollment_field_authorised_value_category">Authorised value category:</label>
232
            <select name="club_template_enrollment_field_authorised_value_category">
233
                <option value="">&nbsp;</option>
234
                [% FOREACH c IN AuthorisedValuesCategories %]
235
                    <option value="[% c %]">[% c %]</option>
236
                [% END %]
237
            </select>
238
        </li>
239
240
        <a href="#" onclick="$(this).parent().remove(); return false;">Cancel</a>
241
242
        <hr/>
243
    </ul>
244
</span>
245
246
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+22 lines)
Lines 48-53 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here
48
columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
48
columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
49
49
50
$(document).ready(function() {
50
$(document).ready(function() {
51
    if ( $('#clubs-tab').length ) {
52
        $('#clubs-tab-link').on('click', function() {
53
            $('#clubs-tab').text(_("Loading..."));
54
            $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
55
        });
56
    }
57
51
    $('#finesholdsissues').tabs({
58
    $('#finesholdsissues').tabs({
52
        // Correct table sizing for tables hidden in tabs
59
        // Correct table sizing for tables hidden in tabs
53
        // http://www.datatables.net/examples/api/tabs_and_scrolling.html
60
        // http://www.datatables.net/examples/api/tabs_and_scrolling.html
Lines 519-524 function validate1(date) { Link Here
519
            </li>
526
            </li>
520
        [% END %]
527
        [% END %]
521
        <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 %]
530
        [% SET enrollable  = borrower.GetEnrollableClubsCount %]
531
        [% IF CAN_user_clubs && ( enrollments || enrollable ) %]
532
            <li>
533
                <a id="clubs-tab-link" href="#clubs-tab">
534
                    Clubs ([% enrollments %]/[% enrollable %])
535
                </a>
536
            </li>
537
        [% END %]
522
    </ul>
538
    </ul>
523
539
524
[% INCLUDE "checkouts-table.inc" %]
540
[% INCLUDE "checkouts-table.inc" %]
Lines 554-559 function validate1(date) { Link Here
554
    [% END %]
570
    [% END %]
555
</div>
571
</div>
556
572
573
[% IF CAN_user_clubs && ( enrollments || enrollable ) %]
574
    <div id="clubs-tab">
575
        Loading...
576
    </div>
577
[% END %]
578
557
[% INCLUDE borrower_debarments.inc %]
579
[% INCLUDE borrower_debarments.inc %]
558
580
559
<div id="reserves">
581
<div id="reserves">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (+5 lines)
Lines 20-25 Link Here
20
    <dd>Manage lists of patrons.</dd>
20
    <dd>Manage lists of patrons.</dd>
21
    [% END %]
21
    [% END %]
22
22
23
    [% IF (CAN_user_clubs) %]
24
    <dt><a href="/cgi-bin/koha/clubs/clubs.pl">Patron clubs</a>
25
    <dd>Manage patron clubs..</dd>
26
    [% END %]
27
23
[% IF ( CAN_user_tools_moderate_comments ) %]
28
[% IF ( CAN_user_tools_moderate_comments ) %]
24
    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a> [% IF ( pendingcomments ) %]<span class="number_box"><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">[% pendingcomments %]</a></span>[% END %]</dt>
29
    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a> [% IF ( pendingcomments ) %]<span class="number_box"><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">[% pendingcomments %]</a></span>[% END %]</dt>
25
	<dd>Moderate patron comments. </dd>
30
	<dd>Moderate patron comments. </dd>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (+102 lines)
Line 0 Link Here
1
[% USE KohaDates %]
2
3
[% IF enrollments %]
4
    <table id="clubs-table-enrolled" class="table table-bordered table-striped">
5
        <thead>
6
            <tr>
7
                <th colspan="4">
8
                    Clubs you are currently enrolled in
9
                </th>
10
            </tr>
11
            <tr>
12
                <th>Name</th>
13
                <th>Description</th>
14
                <th>Date enrolled</th>
15
                <th>&nbsp;</th>
16
            </tr>
17
        </thead>
18
19
        <tbody>
20
            [% FOREACH e IN enrollments %]
21
                <tr>
22
                    <td>[% e.club.name %]</td>
23
                    <td>[% e.club.description %]</td>
24
                    <td>[% e.date_enrolled | $KohaDates %]</td>
25
                    [% IF e.club.club_template.is_enrollable_from_opac %]
26
                        <td>
27
                            <a class="btn btn-xs" onclick="cancelEnrollment( [% e.id %] )">
28
                                <i class="icon-remove"></i> Cancel
29
                            </a>
30
                        </td>
31
                    [% END %]
32
                </tr>
33
            [% END %]
34
        </tbody>
35
    </table>
36
[% END %]
37
38
[% IF clubs %]
39
    <table id="clubs-table-unenrolled" class="table table-bordered table-striped">
40
        <thead>
41
            <tr>
42
                <th colspan="3">
43
                    Clubs you can enroll in
44
                </th>
45
            </tr>
46
            <tr>
47
                <th>Name</th>
48
                <th>Description</th>
49
                <th>&nbsp;</th>
50
            </tr>
51
        </thead>
52
53
        <tbody>
54
            [% FOREACH c IN clubs %]
55
                <tr>
56
                    <td>[% c.name %]</td>
57
                    <td>[% c.description %]</td>
58
                    <td>
59
                        [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.FirstValidEmailAddress ) %]
60
                            <a class="btn btn-xs" onclick="loadEnrollmentForm([% c.id %])">
61
                                <i class="icon-plus"></i> Enroll
62
                            </a>
63
                        [% ELSE %]
64
                            <span class="hint">You must have an email address to enroll</span>
65
                        [% END %]
66
                    </td>
67
                </tr>
68
            [% END %]
69
        </tbody>
70
    </table>
71
[% END %]
72
73
<script type="text/javascript">
74
function loadEnrollmentForm( id ) {
75
    $("body").css("cursor", "progress");
76
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber %]&id=' + id, function() {
77
        $("body").css("cursor", "default");
78
    });
79
80
    return false;
81
}
82
83
function cancelEnrollment( id ) {
84
    $("body").css("cursor", "progress");
85
    $.ajax({
86
        type: "POST",
87
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
88
        data: { id: id },
89
        success: function( data ) {
90
            if ( data.success ) {
91
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber %]', function() {
92
                    $("body").css("cursor", "default");
93
                });
94
            } else {
95
                alert(_("Unable to cancel enrollment!"));
96
            }
97
        },
98
        dataType: 'json'
99
    });
100
    return false;
101
}
102
</script>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/enroll.tt (+66 lines)
Line 0 Link Here
1
[% USE AuthorisedValues %]
2
[% SET AuthorisedValuesCategories = AuthorisedValues.GetCategories %]
3
4
<h3>
5
    Enroll in <i>[% club.name %]</i>
6
</h3>
7
8
<div class="container">
9
    <form id="patron-enrollment-form">
10
        <input type="hidden" name="id" value="[% club.id %]" />
11
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
12
        <fieldset class="rows">
13
            <ol>
14
                [% FOREACH f IN club.club_template.club_template_enrollment_fields %]
15
                    <li>
16
                        <label>[% f.name %]</label>
17
                        [% IF f.authorised_value_category %]
18
                            <select name="[% f.id %]">
19
                                [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
20
                                    <option value="[% a.authorised_value %]">[% a.lib %]</option>
21
                                [% END %]
22
                            </select>
23
                        [% ELSE %]
24
                            <input type="text" name="[% f.id %]" />
25
                        [% END %]
26
                        <span class="hint">[% f.description %]</span>
27
                    </li>
28
                [% END %]
29
30
                <li>
31
                    <a href="#" class="btn btn-default" onclick="addEnrollment(); return false;"><i class="fa fa-plus"></i> Enroll</a>
32
                    <a href="#" onclick="showClubs(); return false;">Cancel</a>
33
                </li>
34
            </ol>
35
        </fieldset>
36
    </form>
37
</div>
38
39
<script type="text/javascript">
40
function addEnrollment() {
41
    $("body").css("cursor", "progress");
42
    $.ajax({
43
        type: "POST",
44
        url: '/cgi-bin/koha/svc/club/enroll',
45
        data: $( "#patron-enrollment-form" ).serialize(),
46
        success: function( data ) {
47
            if ( data.success ) {
48
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
49
                    $("body").css("cursor", "default");
50
                });
51
            } else {
52
                alert(_("Unable to create enrollment!"));
53
            }
54
        },
55
        dataType: 'json'
56
    });
57
    return false;
58
}
59
60
function showClubs() {
61
    $("body").css("cursor", "progress");
62
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
63
        $("body").css("cursor", "default");
64
    });
65
}
66
</script>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +23 lines)
Lines 82-88 Using this account is not recommended because some parts of Koha will not functi Link Here
82
                                    [% ELSIF error == 'too_soon' %]
82
                                    [% ELSIF error == 'too_soon' %]
83
                                        It is too soon after the checkout date for this item to be renewed.
83
                                        It is too soon after the checkout date for this item to be renewed.
84
                                    [% ELSIF error == 'on_reserve' %]
84
                                    [% ELSIF error == 'on_reserve' %]
85
                                        This item is on hold for another patron.
85
                                        This item is on hold for another borrower.
86
                                    [% END %]
86
                                    [% END %]
87
                                [% END %]
87
                                [% END %]
88
                            </span>
88
                            </span>
Lines 133-138 Using this account is not recommended because some parts of Koha will not functi Link Here
133
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
133
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %]
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
137
                            [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %]
138
                                <li>
139
                                    <a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
140
                                        Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %])
141
                                    </a>
142
                                </li>
143
                            [% END %]
144
136
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
145
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
137
                            [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]
146
                            [% IF Koha.Preference('ArticleRequests') && borrower.article_requests_current %]<li><a href="#opac-user-article-requests">Article requests ([% borrower.article_requests_current.count %])</a></li>[% END %]
138
                            [% IF ( OverDriveCirculation ) %]
147
                            [% IF ( OverDriveCirculation ) %]
Lines 315-320 Using this account is not recommended because some parts of Koha will not functi Link Here
315
                            [% END # IF issues_count %]
324
                            [% END # IF issues_count %]
316
                        </div> <!-- / .opac-user-checkouts -->
325
                        </div> <!-- / .opac-user-checkouts -->
317
326
327
                        [% IF borrower.GetClubEnrollmentsCount || borrower.GetEnrollableClubsCount(1) %]
328
                            <div id="opac-user-clubs">
329
                                Loading...
330
                            </div>
331
                        [% END %]
332
318
                        [% IF ( OPACFinesTab ) %]
333
                        [% IF ( OPACFinesTab ) %]
319
                            <!-- FINES BOX -->
334
                            <!-- FINES BOX -->
320
                            [% IF BORROWER_INFO.amountoverfive %]
335
                            [% IF BORROWER_INFO.amountoverfive %]
Lines 893-898 Using this account is not recommended because some parts of Koha will not functi Link Here
893
            [% END %]
908
            [% END %]
894
909
895
            $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
910
            $( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
911
912
            if ( $('#opac-user-clubs').length ) {
913
                $('#opac-user-clubs-tab-link').on('click', function() {
914
                    $('#opac-user-clubs').text(_("Loading..."));
915
                    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]');
916
                });
917
            }
896
        });
918
        });
897
        //]]>
919
        //]]>
898
    </script>
920
    </script>
(-)a/members/moremember.pl (+2 lines)
Lines 64-69 if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preferen Link Here
64
use DateTime;
64
use DateTime;
65
use Koha::DateUtils;
65
use Koha::DateUtils;
66
use Koha::Database;
66
use Koha::Database;
67
use Koha::Patrons;
67
use Koha::Patron::Categories;
68
use Koha::Patron::Categories;
68
use Koha::Token;
69
use Koha::Token;
69
70
Lines 356-361 $template->param( Link Here
356
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
357
    PatronsPerPage => C4::Context->preference("PatronsPerPage") || 20,
357
    relatives_issues_count => $relatives_issues_count,
358
    relatives_issues_count => $relatives_issues_count,
358
    relatives_borrowernumbers => \@relatives,
359
    relatives_borrowernumbers => \@relatives,
360
    borrower => Koha::Patrons->find( $borrowernumber ),
359
);
361
);
360
362
361
output_html_with_http_headers $input, $cookie, $template->output;
363
output_html_with_http_headers $input, $cookie, $template->output;
(-)a/opac/clubs/clubs-tab.pl (+52 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
use Koha::Patrons;
27
28
my $cgi = new CGI;
29
30
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
    {
32
        template_name   => "clubs/clubs-tab.tt",
33
        query           => $cgi,
34
        type            => "opac",
35
        authnotrequired => 0,
36
    }
37
);
38
39
my $borrowernumber = $cgi->param('borrowernumber');
40
41
my $borrower = Koha::Patrons->find($borrowernumber);
42
43
my @enrollments = $borrower->GetClubEnrollments();
44
my @clubs = $borrower->GetEnrollableClubs( my $opac = 1 );
45
46
$template->param(
47
    enrollments => \@enrollments,
48
    clubs       => \@clubs,
49
    borrower    => $borrower,
50
);
51
52
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/opac/clubs/enroll.pl (+49 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2013 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it
8
# under the terms of the GNU General Public License as published by
9
# the Free Software Foundation; either version 3 of the License, or
10
# (at your option) any later version.
11
#
12
# Koha is distributed in the hope that it will be useful, but
13
# WITHOUT ANY WARRANTY; without even the implied warranty of
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
# GNU General Public License for more details.
16
#
17
# You should have received a copy of the GNU General Public License
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
20
use Modern::Perl;
21
22
use CGI;
23
24
use C4::Auth;
25
use C4::Output;
26
use Koha::Clubs;
27
28
my $cgi = new CGI;
29
30
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
31
    {
32
        template_name   => "clubs/enroll.tt",
33
        query           => $cgi,
34
        type            => "opac",
35
        authnotrequired => 0,
36
    }
37
);
38
39
my $id             = $cgi->param('id');
40
my $borrowernumber = $cgi->param('borrowernumber');
41
42
my $club = Koha::Clubs->find($id);
43
44
$template->param(
45
    club           => $club,
46
    borrowernumber => $borrowernumber,
47
);
48
49
output_html_with_http_headers( $cgi, $cookie, $template->output );
(-)a/opac/svc/club/cancel_enrollment (+47 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
use Koha::Club::Enrollments;
28
29
my $cgi = new CGI;
30
31
my ( $auth_status, $sessionID ) =
32
  check_cookie_auth( $cgi->cookie('CGISESSID') );
33
if ( $auth_status ne "ok" ) {
34
    exit 0;
35
}
36
37
my $borrowernumber = C4::Context->userenv->{'number'};
38
39
my $id = $cgi->param('id');
40
41
my $enrollment = Koha::Club::Enrollments->find($id);
42
$enrollment->cancel();
43
44
binmode STDOUT, ':encoding(UTF-8)';
45
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
46
47
print to_json( { success => $enrollment ? 1 : 0 } );
(-)a/opac/svc/club/enroll (+77 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
use Koha::Club::Enrollment::Field;
28
use Koha::Club::Enrollment;
29
use Koha::Clubs;
30
31
my $cgi = new CGI;
32
33
my ( $auth_status, $sessionID ) =
34
  check_cookie_auth( $cgi->cookie('CGISESSID') );
35
if ( $auth_status ne "ok" ) {
36
    exit 0;
37
}
38
39
my $borrowernumber = C4::Context->userenv->{'number'};
40
41
my $id = $cgi->param('id');
42
43
my $enrollment;
44
if ( $borrowernumber && $id ) {
45
    my $club = Koha::Clubs->find($id);
46
47
    if ( $club->club_template()->is_enrollable_from_opac() ) {
48
        $enrollment = Koha::Club::Enrollment->new()->set(
49
            {
50
                club_id        => $club->id(),
51
                borrowernumber => $borrowernumber,
52
                date_enrolled  => \'NOW()',
53
                date_created   => \'NOW()',
54
                branchcode     => C4::Context->userenv
55
                ? C4::Context->userenv->{'branch'}
56
                : undef,
57
            }
58
        )->store();
59
60
        my @enrollment_fields = $club->club_template()->club_template_enrollment_fields();
61
62
        foreach my $e (@enrollment_fields) {
63
            Koha::Club::Enrollment::Field->new()->set(
64
                {
65
                    club_enrollment_id                => $enrollment->id(),
66
                    club_template_enrollment_field_id => $e->id(),
67
                    value                             => $cgi->param( $e->id() ),
68
                }
69
            )->store();
70
        }
71
    }
72
}
73
74
binmode STDOUT, ':encoding(UTF-8)';
75
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
76
77
print to_json( { success => $enrollment ? 1 : 0 } );
(-)a/svc/club/cancel_enrollment (+46 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
28
use Koha::Club::Enrollments;
29
30
my $cgi = new CGI;
31
32
my ( $auth_status, $sessionID ) =
33
  check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'enroll' } );
34
if ( $auth_status ne "ok" ) {
35
    exit 0;
36
}
37
38
my $id = $cgi->param('id');
39
40
my $enrollment = Koha::Club::Enrollments->find($id);
41
$enrollment->cancel() if $enrollment;
42
43
binmode STDOUT, ':encoding(UTF-8)';
44
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
45
46
print to_json( { success => $enrollment ? 1 : 0 } );
(-)a/svc/club/delete (+48 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
use Koha::Clubs;
28
29
my $cgi = new CGI;
30
31
my ( $auth_status, $sessionID ) = check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'edit_clubs' } );
32
if ( $auth_status ne "ok" ) {
33
    exit 0;
34
}
35
36
my $success = 0;
37
38
my $id = $cgi->param('id');
39
40
my $club = Koha::Clubs->find($id);
41
if ($club) {
42
    $success = $club->delete();
43
}
44
45
binmode STDOUT, ':encoding(UTF-8)';
46
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
47
48
print to_json( { success => $success ? 1 : 0 } );
(-)a/svc/club/enroll (+74 lines)
Line 0 Link Here
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
use Koha::Club::Enrollment::Fields;
28
use Koha::Club::Enrollments;
29
use Koha::Clubs;
30
31
my $cgi = new CGI;
32
33
my ( $auth_status, $sessionID ) =
34
  check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'enroll' } );
35
if ( $auth_status ne "ok" ) {
36
    exit 0;
37
}
38
39
my $id             = $cgi->param('id');
40
my $borrowernumber = $cgi->param('borrowernumber');
41
42
my $club = Koha::Clubs->find($id);
43
44
my $enrollment;
45
if ($club) {
46
    $enrollment = Koha::Club::Enrollment->new(
47
        {
48
            club_id        => $club->id(),
49
            borrowernumber => $borrowernumber,
50
            date_enrolled  => \'NOW()',
51
            date_created   => \'NOW()',
52
            branchcode     => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
53
        }
54
    )->store();
55
56
    if ($enrollment) {
57
        my @enrollment_fields = $club->club_template()->club_template_enrollment_fields();
58
59
        foreach my $e (@enrollment_fields) {
60
            my $club_enrollment_field = Koha::Club::Enrollment::Field->new(
61
                {
62
                    club_enrollment_id                => $enrollment->id(),
63
                    club_template_enrollment_field_id => $e->id(),
64
                    value                             => $cgi->param( $e->id() ),
65
                }
66
            )->store();
67
        }
68
    }
69
}
70
71
binmode STDOUT, ':encoding(UTF-8)';
72
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
73
74
print to_json( { success => $enrollment ? 1 : 0 } );
(-)a/svc/club/template/delete (-1 / +49 lines)
Line 0 Link Here
0
- 
1
#!/usr/bin/perl
2
3
# Copyright 2014 ByWater Solutions
4
#
5
# This file is part of Koha.
6
#
7
# Koha is free software; you can redistribute it and/or modify it under the
8
# terms of the GNU General Public License as published by the Free Software
9
# Foundation; either version 2 of the License, or (at your option) any later
10
# version.
11
#
12
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
13
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
14
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License along
17
# with Koha; if not, write to the Free Software Foundation, Inc.,
18
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
#
20
21
use Modern::Perl;
22
23
use CGI;
24
use JSON qw(to_json);
25
26
use C4::Auth qw(check_cookie_auth);
27
28
use Koha::Club::Templates;
29
30
my $cgi = new CGI;
31
32
my ( $auth_status, $sessionID ) = check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'edit_templates' } );
33
if ( $auth_status ne "ok" ) {
34
    exit 0;
35
}
36
37
my $success = 0;
38
39
my $id = $cgi->param('id');
40
41
my $club_template = Koha::Club::Templates->find($id);
42
if ($club_template) {
43
    $success = $club_template->delete();
44
}
45
46
binmode STDOUT, ':encoding(UTF-8)';
47
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );
48
49
print to_json( { success => $success ? 1 : 0 } );

Return to bug 12461