Attachment #43428 for bug #12461

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




        my $all_perms = get_all_subpermissions();

        my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
          editcatalogue updatecharges management tools editauthorities serials reports acquisition clubs);

        # We are going to use the $flags returned by checkauth
        # to create the template's parameters that will indicate

            $template->param( CAN_user_staffaccess      => 1 );
            $template->param( CAN_user_plugins          => 1 );
            $template->param( CAN_user_coursereserves   => 1 );
            $template->param( CAN_user_clubs            => 1 );

            foreach my $module ( keys %$all_perms ) {
                foreach my $subperm ( keys %{ $all_perms->{$module} } ) {
                    $template->param( "CAN_user_${module}_${subperm}" => 1 );
                }




use Text::Unaccent qw( unac_string );
use Koha::AuthUtils qw(hash_password);
use Koha::Database;
use Koha::Borrowers;
use Module::Load;
if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
    load Koha::NorwegianPatronDB, qw( NLUpdateHashedPIN NLEncryptPIN NLSync );


sub GetFirstValidEmailAddress {
    my $borrowernumber = shift;
    my $dbh = C4::Context->dbh;
    my $sth = $dbh->prepare( "SELECT email, emailpro, B_email FROM borrowers where borrowernumber = ? ");
    $sth->execute( $borrowernumber );
    my $data = $sth->fetchrow_hashref;

    my $borrower = Koha::Borrowers->find( $borrowernumber );

    return $borrower->FirstValidEmailAddress();
       return $data->{'emailpro'};
    } elsif ($data->{'B_email'}) {
       return $data->{'B_email'};
    } else {
       return '';
    }
}

=head2 GetNoticeEmailAddress

Lines 23-28 use Carp; Link Here

(-)a/Koha/Borrower.pm (+64 lines)
23		23
24	use Koha::Database;	24	use Koha::Database;
25		25
		26	use Koha::Clubs;
		27	use Koha::Club::Enrollments;
		28
26	use base qw(Koha::Object);	29	use base qw(Koha::Object);
27		30
28	=head1 NAME	31	=head1 NAME
Lines 35-40 Koha::Borrower - Koha Borrower Object class Link Here
35		38
36	=cut	39	=cut
37		40
		41	=head3 FirstValidEmailAddress
		42
		43	=cut
		44
		45	sub FirstValidEmailAddress {
		46	my ($self) = @_;
		47
		48	return $self->email() \|\| $self->emailpro() \|\| $self->b_email() \|\| q{};
		49	}
		50
		51	=head3 GetClubEnrollments
		52
		53	=cut
		54
		55	sub GetClubEnrollments {
		56	my ($self) = @_;
		57
		58	return Koha::Club::Enrollments->search( { borrowernumber => $self->borrowernumber(), date_canceled => undef } );
		59	}
		60
		61	=head3 GetClubEnrollmentsCount
		62
		63	=cut
		64
		65	sub GetClubEnrollmentsCount {
		66	my ($self) = @_;
		67
		68	my $e = $self->GetClubEnrollments();
		69
		70	return $e->count();
		71	}
		72
		73	=head3 GetEnrollableClubs
		74
		75	=cut
		76
		77	sub GetEnrollableClubs {
		78	my ( $self, $is_enrollable_from_opac ) = @_;
		79
		80	my $params;
		81	$params->{is_enrollable_from_opac} = $is_enrollable_from_opac
		82	if $is_enrollable_from_opac;
		83	$params->{is_email_required} = 0 unless $self->FirstValidEmailAddress();
		84
		85	$params->{borrower} = $self;
		86
		87	return Koha::Clubs->GetEnrollable($params);
		88	}
		89
		90	=head3 GetEnrollableClubsCount
		91
		92	=cut
		93
		94	sub GetEnrollableClubsCount {
		95	my ( $self, $is_enrollable_from_opac ) = @_;
		96
		97	my $e = $self->GetEnrollableClubs($is_enrollable_from_opac);
		98
		99	return $e->count();
		100	}
		101
38	=head3 type	102	=head3 type
39		103
40	=cut	104	=cut




package Koha::Club;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Templates;
use Koha::Club::Fields;
use Koha::Branches;

use base qw(Koha::Object);

=head1 NAME

Koha::Club - Koha Club Object class

=head1 API

=head2 Class Methods

=cut

=head3 club_template

=cut

sub club_template {
    my ($self) = @_;

    return unless $self->club_template_id();

    return Koha::Club::Templates->find( $self->club_template_id() );
}

=head3 club_fields

=cut

sub club_fields {
    my ($self) = @_;

    return unless $self->id();

    return Koha::Club::Fields->search( { club_id => $self->id() } );
}

=head3 club_fields

=cut

sub branch {
    my ($self) = @_;

    return unless $self->branchcode();

    return Koha::Branches->find( $self->branchcode() );
}

=head3 type

=cut

sub type {
    return 'Club';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Enrollment;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;
use Koha::Clubs;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Enrollment

Represents a "pattern" on which many clubs can be created.
In this way we can directly compare different clubs of the same 'template'
for statistical purposes.

=head1 API

=head2 Class Methods

=cut

=head3 cancel

=cut

sub cancel {
    my ( $self ) = @_;

    $self->_result()->update( { date_canceled => \'NOW()' } );

    return $self;
}

=cut

=head3 club

=cut

sub club {
    my ( $self ) = @_;
    return Koha::Clubs->find( $self->club_id() );
}

=head3 type

=cut

sub type {
    return 'ClubEnrollment';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Enrollment::Field;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Enrollment::Field

Represents a "pattern" on which many clubs can be created.
In this way we can directly compare different clubs of the same 'template'
for statistical purposes.

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubEnrollmentField';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Enrollment::Fields;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Enrollment::Field;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Enrollment::Fields

This object represents a collection of club enrollemnt fields.

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubEnrollmentField';
}

sub object_class {
    return 'Koha::Club::Enrollment::Field';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Enrollments;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Enrollment;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Enrollments

This object represents a collection of club templates.

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubEnrollment';
}

sub object_class {
    return 'Koha::Club::Enrollment';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Field;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Template::Fields;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Field

Represents the value set at creation time for a Koha::Club::Template::Field

=head1 API

=head2 Class Methods

=cut

=head3 club_template_field

=cut

sub club_template_field {
    my ( $self ) = @_;

    return Koha::Club::Template::Fields->find( $self->club_template_field_id );
}

=head3 type

=cut

sub type {
    return 'ClubField';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Fields;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Field;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Fields

Represents a collection of club fields.

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubField';
}

sub object_class {
    return 'Koha::Club::Field';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Template;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Template::Fields;
use Koha::Club::Template::EnrollmentFields;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Template

Represents a "pattern" on which many clubs can be created.
In this way we can directly compare different clubs of the same 'template'
for statistical purposes.

=head1 API

=head2 Class Methods

=cut

=head3 club_template_fields

=cut

sub club_template_fields {
    my ($self) = @_;

    return Koha::Club::Template::Fields->search( { club_template_id => $self->id() } );
}

sub club_template_enrollment_fields {
    my ($self) = @_;

    return Koha::Club::Template::EnrollmentFields->search( { club_template_id => $self->id() } );
}

=head3 type

=cut

sub type {
    return 'ClubTemplate';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Template::EnrollmentField;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Template::EnrollemntField

Represents a club field that is only set at the time a patron is enrolled

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubTemplateEnrollmentField';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Template::EnrollmentFields;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Template::EnrollmentField;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Template::EnrollemntFields

Represents a colleciton of club fields that are only set at the time a patron is enrolled

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubTemplateEnrollmentField';
}

sub object_class {
    return 'Koha::Club::Template::EnrollmentField';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Template::Field;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use base qw(Koha::Object);

=head1 NAME

Koha::Club::Template::Field

Represents a club field that is set when the club is created

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubTemplateField';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Template::Fields;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Template::Field;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Template::Fields

Represents a collection of club fields that are set when the club is created

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubTemplateField';
}

sub object_class {
    return 'Koha::Club::Template::Field';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Club::Templates;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club::Template;

use base qw(Koha::Objects);

=head1 NAME

Koha::Club::Templates

This object represents a collection of club templates.

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'ClubTemplate';
}

sub object_class {
    return 'Koha::Club::Template';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Clubs;

# Copyright ByWater Solutions 2014
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 3 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

use Modern::Perl;

use Carp;

use Koha::Database;

use Koha::Club;

use base qw(Koha::Objects);

=head1 NAME

Koha::Clubs - Koha Clubs Object class

This object represents a collection of clubs a patron may enroll in.

=head1 API

=head2 Class Methods

=cut

=head3 GetEnrollable

=cut

sub GetEnrollable {
    my ( $self, $params ) = @_;

    # We need to filter out all the already enrolled in clubs
    my $borrower = $params->{borrower};
    if ($borrower) {
        delete( $params->{borrower} );
        my @enrollments = $borrower->GetClubEnrollments();
        if (@enrollments) {
            $params->{'me.id'} = { -not_in => [ map { $_->club()->id() } @enrollments ] };
        }
    }

    my $rs = $self->_resultset()->search( $params, { prefetch => 'club_template' } );

    if (wantarray) {
        my $class = ref($self) ? ref($self) : $self;

        return $class->_wrap( $rs->all() );

    }
    else {
        my $class = ref($self) ? ref($self) : $self;

        return $class->_new_from_dbic($rs);
    }
}

=cut

=head3 type

=cut

sub type {
    return 'Club';
}

sub object_class {
    return 'Koha::Club';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;

Lines 123-130 __PACKAGE__->has_many( Link Here

(-)a/Koha/Schema/Result/AuthorisedValue.pm (-2 / +2 lines)
123	);	123	);
124		124
125		125
126	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-02-05 15:20:11	126	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
127	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:GS7UBpk66HAhBptwrpKR7Q	127	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IzI/WpMbwvfZ8BpHtRCsiQ
128		128
129		129
130	# You can replace this text with custom content, and it will be preserved on regeneration	130	# You can replace this text with custom content, and it will be preserved on regeneration




  { is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
);

=head2 club_enrollments

Type: has_many

Related object: L<Koha::Schema::Result::ClubEnrollment>

=cut

__PACKAGE__->has_many(
  "club_enrollments",
  "Koha::Schema::Result::ClubEnrollment",
  { "foreign.borrowernumber" => "self.borrowernumber" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 course_instructors

Type: has_many

__PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber");


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wy9KSEiYp/SxYsw+xW0x1g


# You can replace this text with custom code or comments, and it will be preserved on regeneration
1;




  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_enrollments

Type: has_many

Related object: L<Koha::Schema::Result::ClubEnrollment>

=cut

__PACKAGE__->has_many(
  "club_enrollments",
  "Koha::Schema::Result::ClubEnrollment",
  { "foreign.branchcode" => "self.branchcode" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_templates

Type: has_many

Related object: L<Koha::Schema::Result::ClubTemplate>

=cut

__PACKAGE__->has_many(
  "club_templates",
  "Koha::Schema::Result::ClubTemplate",
  { "foreign.branchcode" => "self.branchcode" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 clubs

Type: has_many

Related object: L<Koha::Schema::Result::Club>

=cut

__PACKAGE__->has_many(
  "clubs",
  "Koha::Schema::Result::Club",
  { "foreign.branchcode" => "self.branchcode" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 collections

Type: has_many

__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lvjA8x8u5RKeZQ0+uiLm7A


# You can replace this text with custom content, and it will be preserved on regeneration




use utf8;
package Koha::Schema::Result::Club;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::Club

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<clubs>

=cut

__PACKAGE__->table("clubs");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_template_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 name

  data_type: 'tinytext'
  is_nullable: 0

=head2 description

  data_type: 'text'
  is_nullable: 1

=head2 date_start

  data_type: 'date'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=head2 date_end

  data_type: 'date'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=head2 branchcode

  data_type: 'varchar'
  is_foreign_key: 1
  is_nullable: 1
  size: 11

=head2 date_created

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  default_value: current_timestamp
  is_nullable: 0

=head2 date_updated

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_template_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "name",
  { data_type => "tinytext", is_nullable => 0 },
  "description",
  { data_type => "text", is_nullable => 1 },
  "date_start",
  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
  "date_end",
  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
  "branchcode",
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 11 },
  "date_created",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    default_value => \"current_timestamp",
    is_nullable => 0,
  },
  "date_updated",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    is_nullable => 1,
  },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 branchcode

Type: belongs_to

Related object: L<Koha::Schema::Result::Branch>

=cut

__PACKAGE__->belongs_to(
  "branchcode",
  "Koha::Schema::Result::Branch",
  { branchcode => "branchcode" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "RESTRICT",
    on_update     => "RESTRICT",
  },
);

=head2 club_enrollments

Type: has_many

Related object: L<Koha::Schema::Result::ClubEnrollment>

=cut

__PACKAGE__->has_many(
  "club_enrollments",
  "Koha::Schema::Result::ClubEnrollment",
  { "foreign.club_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubField>

=cut

__PACKAGE__->has_many(
  "club_fields",
  "Koha::Schema::Result::ClubField",
  { "foreign.club_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_template

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubTemplate>

=cut

__PACKAGE__->belongs_to(
  "club_template",
  "Koha::Schema::Result::ClubTemplate",
  { id => "club_template_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:nMwJy/qR8aWu12hQq4rORQ


# You can replace this text with custom content, and it will be preserved on regeneration
1;




use utf8;
package Koha::Schema::Result::ClubEnrollment;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubEnrollment

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_enrollments>

=cut

__PACKAGE__->table("club_enrollments");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 borrowernumber

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 date_enrolled

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  default_value: current_timestamp
  is_nullable: 0

=head2 date_canceled

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=head2 date_created

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  default_value: '0000-00-00 00:00:00'
  is_nullable: 0

=head2 date_updated

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=head2 branchcode

  data_type: 'varchar'
  is_foreign_key: 1
  is_nullable: 1
  size: 11

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "borrowernumber",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "date_enrolled",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    default_value => \"current_timestamp",
    is_nullable => 0,
  },
  "date_canceled",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    is_nullable => 1,
  },
  "date_created",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    default_value => "0000-00-00 00:00:00",
    is_nullable => 0,
  },
  "date_updated",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    is_nullable => 1,
  },
  "branchcode",
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 11 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 borrowernumber

Type: belongs_to

Related object: L<Koha::Schema::Result::Borrower>

=cut

__PACKAGE__->belongs_to(
  "borrowernumber",
  "Koha::Schema::Result::Borrower",
  { borrowernumber => "borrowernumber" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);

=head2 branchcode

Type: belongs_to

Related object: L<Koha::Schema::Result::Branch>

=cut

__PACKAGE__->belongs_to(
  "branchcode",
  "Koha::Schema::Result::Branch",
  { branchcode => "branchcode" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "SET NULL",
    on_update     => "CASCADE",
  },
);

=head2 club

Type: belongs_to

Related object: L<Koha::Schema::Result::Club>

=cut

__PACKAGE__->belongs_to(
  "club",
  "Koha::Schema::Result::Club",
  { id => "club_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);

=head2 club_enrollment_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubEnrollmentField>

=cut

__PACKAGE__->has_many(
  "club_enrollment_fields",
  "Koha::Schema::Result::ClubEnrollmentField",
  { "foreign.club_enrollment_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9ypc+smG/VlgtWW66PhvHQ


# You can replace this text with custom content, and it will be preserved on regeneration
1;




use utf8;
package Koha::Schema::Result::ClubEnrollmentField;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubEnrollmentField

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_enrollment_fields>

=cut

__PACKAGE__->table("club_enrollment_fields");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_enrollment_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 club_template_enrollment_field_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 value

  data_type: 'text'
  is_nullable: 0

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_enrollment_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "club_template_enrollment_field_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "value",
  { data_type => "text", is_nullable => 0 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 club_enrollment

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubEnrollment>

=cut

__PACKAGE__->belongs_to(
  "club_enrollment",
  "Koha::Schema::Result::ClubEnrollment",
  { id => "club_enrollment_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);

=head2 club_template_enrollment_field

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubTemplateEnrollmentField>

=cut

__PACKAGE__->belongs_to(
  "club_template_enrollment_field",
  "Koha::Schema::Result::ClubTemplateEnrollmentField",
  { id => "club_template_enrollment_field_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2ANAs3mh3i/kd3Qxrcd5IA


# You can replace this text with custom content, and it will be preserved on regeneration
1;




use utf8;
package Koha::Schema::Result::ClubField;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubField

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_fields>

=cut

__PACKAGE__->table("club_fields");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_template_field_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 club_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 value

  data_type: 'text'
  is_nullable: 1

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_template_field_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "club_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "value",
  { data_type => "text", is_nullable => 1 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 club

Type: belongs_to

Related object: L<Koha::Schema::Result::Club>

=cut

__PACKAGE__->belongs_to(
  "club",
  "Koha::Schema::Result::Club",
  { id => "club_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);

=head2 club_template_field

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubTemplateField>

=cut

__PACKAGE__->belongs_to(
  "club_template_field",
  "Koha::Schema::Result::ClubTemplateField",
  { id => "club_template_field_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:m4GLLIVIHgRpRhCGLh12DQ


# You can replace this text with custom content, and it will be preserved on regeneration
1;




use utf8;
package Koha::Schema::Result::ClubTemplate;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubTemplate

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_templates>

=cut

__PACKAGE__->table("club_templates");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 name

  data_type: 'tinytext'
  is_nullable: 0

=head2 description

  data_type: 'text'
  is_nullable: 1

=head2 is_enrollable_from_opac

  data_type: 'tinyint'
  default_value: 0
  is_nullable: 0

=head2 is_email_required

  data_type: 'tinyint'
  default_value: 0
  is_nullable: 0

=head2 branchcode

  data_type: 'varchar'
  is_foreign_key: 1
  is_nullable: 1
  size: 10

=head2 date_created

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  default_value: current_timestamp
  is_nullable: 0

=head2 date_updated

  data_type: 'timestamp'
  datetime_undef_if_invalid: 1
  is_nullable: 1

=head2 is_deletable

  data_type: 'tinyint'
  default_value: 1
  is_nullable: 0

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "name",
  { data_type => "tinytext", is_nullable => 0 },
  "description",
  { data_type => "text", is_nullable => 1 },
  "is_enrollable_from_opac",
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
  "is_email_required",
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
  "branchcode",
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 10 },
  "date_created",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    default_value => \"current_timestamp",
    is_nullable => 0,
  },
  "date_updated",
  {
    data_type => "timestamp",
    datetime_undef_if_invalid => 1,
    is_nullable => 1,
  },
  "is_deletable",
  { data_type => "tinyint", default_value => 1, is_nullable => 0 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 branchcode

Type: belongs_to

Related object: L<Koha::Schema::Result::Branch>

=cut

__PACKAGE__->belongs_to(
  "branchcode",
  "Koha::Schema::Result::Branch",
  { branchcode => "branchcode" },
  {
    is_deferrable => 1,
    join_type     => "LEFT",
    on_delete     => "SET NULL",
    on_update     => "CASCADE",
  },
);

=head2 club_template_enrollment_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubTemplateEnrollmentField>

=cut

__PACKAGE__->has_many(
  "club_template_enrollment_fields",
  "Koha::Schema::Result::ClubTemplateEnrollmentField",
  { "foreign.club_template_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_template_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubTemplateField>

=cut

__PACKAGE__->has_many(
  "club_template_fields",
  "Koha::Schema::Result::ClubTemplateField",
  { "foreign.club_template_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 clubs

Type: has_many

Related object: L<Koha::Schema::Result::Club>

=cut

__PACKAGE__->has_many(
  "clubs",
  "Koha::Schema::Result::Club",
  { "foreign.club_template_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:j5aiACVUGzrdng4+jt6mfg

1;




use utf8;
package Koha::Schema::Result::ClubTemplateEnrollmentField;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubTemplateEnrollmentField

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_template_enrollment_fields>

=cut

__PACKAGE__->table("club_template_enrollment_fields");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_template_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 name

  data_type: 'tinytext'
  is_nullable: 0

=head2 description

  data_type: 'text'
  is_nullable: 1

=head2 authorised_value_category

  data_type: 'varchar'
  is_nullable: 1
  size: 16

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_template_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "name",
  { data_type => "tinytext", is_nullable => 0 },
  "description",
  { data_type => "text", is_nullable => 1 },
  "authorised_value_category",
  { data_type => "varchar", is_nullable => 1, size => 16 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 club_enrollment_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubEnrollmentField>

=cut

__PACKAGE__->has_many(
  "club_enrollment_fields",
  "Koha::Schema::Result::ClubEnrollmentField",
  { "foreign.club_template_enrollment_field_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_template

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubTemplate>

=cut

__PACKAGE__->belongs_to(
  "club_template",
  "Koha::Schema::Result::ClubTemplate",
  { id => "club_template_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:KGo2mEIAkTVYSPsOLoaBCg


# You can replace this text with custom content, and it will be preserved on regeneration
1;




use utf8;
package Koha::Schema::Result::ClubTemplateField;

# Created by DBIx::Class::Schema::Loader
# DO NOT MODIFY THE FIRST PART OF THIS FILE

=head1 NAME

Koha::Schema::Result::ClubTemplateField

=cut

use strict;
use warnings;

use base 'DBIx::Class::Core';

=head1 TABLE: C<club_template_fields>

=cut

__PACKAGE__->table("club_template_fields");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 club_template_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 name

  data_type: 'tinytext'
  is_nullable: 0

=head2 description

  data_type: 'text'
  is_nullable: 1

=head2 authorised_value_category

  data_type: 'varchar'
  is_nullable: 1
  size: 16

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "club_template_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "name",
  { data_type => "tinytext", is_nullable => 0 },
  "description",
  { data_type => "text", is_nullable => 1 },
  "authorised_value_category",
  { data_type => "varchar", is_nullable => 1, size => 16 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 club_fields

Type: has_many

Related object: L<Koha::Schema::Result::ClubField>

=cut

__PACKAGE__->has_many(
  "club_fields",
  "Koha::Schema::Result::ClubField",
  { "foreign.club_template_field_id" => "self.id" },
  { cascade_copy => 0, cascade_delete => 0 },
);

=head2 club_template

Type: belongs_to

Related object: L<Koha::Schema::Result::ClubTemplate>

=cut

__PACKAGE__->belongs_to(
  "club_template",
  "Koha::Schema::Result::ClubTemplate",
  { id => "club_template_id" },
  { is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:P73ABSn2tzlTYbD3nov21g


# You can replace this text with custom content, and it will be preserved on regeneration
1;

Lines 38-43 sub GetAuthValueDropbox { Link Here

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (+6 lines)
38	return C4::Koha::GetAuthvalueDropbox($category, $default);	38	return C4::Koha::GetAuthvalueDropbox($category, $default);
39	}	39	}
40		40
		41	sub Categories {
		42	my ( $self ) = @_;
		43
		44	return GetAuthorisedValueCategories();
		45	}
		46
41	1;	47	1;
42		48
43	=head1 NAME	49	=head1 NAME

Lines 48-51 sub IsDebarred { Link Here

(-)a/Koha/Template/Plugin/Borrowers.pm (+4 lines)
48	return Koha::Borrower::Debarments::IsDebarred($borrower->{borrowernumber});	48	return Koha::Borrower::Debarments::IsDebarred($borrower->{borrowernumber});
49	}	49	}
50		50
		51	sub HasValidEmailAddress {
		52
		53	}
		54
51	1;	55	1;

Lines 26-31 use base qw( Template::Plugin ); Link Here

(-)a/Koha/Template/Plugin/Branches.pm (+7 lines)
26	use C4::Koha;	26	use C4::Koha;
27	use C4::Context;	27	use C4::Context;
28		28
		29	sub GetBranches {
		30	my ($self) = @_;
		31
		32	my $dbh = C4::Context->dbh;
		33	return $dbh->selectall_arrayref( "SELECT * FROM branches", { Slice => {} } );
		34	}
		35
29	sub GetName {	36	sub GetName {
30	my ( $self, $branchcode ) = @_;	37	my ( $self, $branchcode ) = @_;
31		38

Lines 59-62 sub Version { Link Here

(-)a/Koha/Template/Plugin/Koha.pm (+5 lines)
59	};	59	};
60	}	60	}
61		61
		62	sub UserEnv {
		63	my ( $self, $key ) = @_;
		64	my $userenv = C4::Context->userenv;
		65	return $userenv ? $userenv->{$key} : undef;
		66	}
62	1;	67	1;

Lines 47-52 use C4::Members::Attributes qw(GetBorrowerAttributes); Link Here

(-)a/circ/circulation.pl (+4 lines)
47	use Koha::Borrower::Debarments qw(GetDebarments IsDebarred);	47	use Koha::Borrower::Debarments qw(GetDebarments IsDebarred);
48	use Koha::DateUtils;	48	use Koha::DateUtils;
49	use Koha::Database;	49	use Koha::Database;
		50	use Koha::Borrowers;
50		51
51	use Date::Calc qw(	52	use Date::Calc qw(
52	Today	53	Today
Lines 565-570 $template->param( picture => 1 ) if $picture; Link Here
565		566
566	my $canned_notes = GetAuthorisedValues("BOR_NOTES");	567	my $canned_notes = GetAuthorisedValues("BOR_NOTES");
567		568
		569	my $schema = Koha::Database->new()->schema();
		570
568	$template->param(	571	$template->param(
569	debt_confirmed => $debt_confirmed,	572	debt_confirmed => $debt_confirmed,
570	SpecifyDueDate => $duedatespec_allow,	573	SpecifyDueDate => $duedatespec_allow,
Lines 573-578 $template->param( Link Here
573	canned_bor_notes_loop => $canned_notes,	576	canned_bor_notes_loop => $canned_notes,
574	debarments => GetDebarments({ borrowernumber => $borrowernumber }),	577	debarments => GetDebarments({ borrowernumber => $borrowernumber }),
575	todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),	578	todaysdate => output_pref( { dt => dt_from_string()->set(hour => 23)->set(minute => 59), dateformat => 'sql' } ),
		579	borrower => Koha::Borrowers->find( $borrowernumber ),
576	);	580	);
577		581
578	output_html_with_http_headers $query, $cookie, $template->output;	582	output_html_with_http_headers $query, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use Koha::Database;
use Koha::DateUtils qw(dt_from_string);
use Koha::Clubs;
use Koha::Club::Fields;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => 'clubs/clubs-add-modify.tt',
        query           => $cgi,
        type            => 'intranet',
        authnotrequired => 0,
        flagsrequired   => { clubs => 'edit_clubs' },
    }
);

my $schema = Koha::Database->new()->schema();

my $id = $cgi->param('id');
my $club = $id ? Koha::Clubs->find($id) : Koha::Club->new();
$template->param( stored => $id ? 'updated' : 'stored' ) if $cgi->param('name');

my $club_template_id = $cgi->param('club_template_id');
my $club_template = $club->club_template() || Koha::Club::Templates->find($club_template_id);
$club_template_id ||= $club_template->id();

my $date_start = $cgi->param('date_start');
$date_start = $date_start ? dt_from_string($date_start) : undef;
my $date_end = $cgi->param('date_end');
$date_end = $date_end ? dt_from_string($date_end) : undef;

if ( $cgi->param('name') ) {    # Update or create club
    $club->set(
        {
            club_template_id => $cgi->param('club_template_id') || undef,
            name             => $cgi->param('name')             || undef,
            description      => $cgi->param('description')      || undef,
            branchcode       => $cgi->param('branchcode')       || undef,
            date_start       => $date_start,
            date_end         => $date_end,
            date_updated     => dt_from_string(),
        }
    )->store();

    my @club_template_field_id = $cgi->param('club_template_field_id');
    my @club_field_id          = $cgi->param('club_field_id');
    my @club_field             = $cgi->param('club_field');

    for ( my $i = 0 ; $i < @club_template_field_id ; $i++ ) {
        my $club_template_field_id = $club_template_field_id[$i] || undef;
        my $club_field_id          = $club_field_id[$i]          || undef;
        my $club_field             = $club_field[$i]             || undef;

        my $field =
          $club_field_id
          ? Koha::Club::Fields->find($club_field_id)
          : Koha::Club::Field->new();

        $field->set(
            {
                club_id                => $club->id(),
                club_template_field_id => $club_template_field_id,
                value                  => $club_field,
            }
        )->store();
    }

    $id ||= $club->id();
}

$club = Koha::Clubs->find($id);

$template->param(
    club_template => $club_template,
    club          => $club,
);

output_html_with_http_headers( $cgi, $cookie, $template->output );




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;

use Koha::Clubs;
use Koha::Club::Templates;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "clubs/clubs.tt",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { clubs => '*' },
    }
);

my @club_templates = Koha::Club::Templates->search();
my @clubs          = Koha::Clubs->search();

$template->param(
    club_templates => \@club_templates,
    clubs          => \@clubs,
);

output_html_with_http_headers( $cgi, $cookie, $template->output );




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;

use Koha::Borrowers;
use Koha::Club::Enrollments;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "clubs/patron-clubs-tab.tt",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { clubs => '*' },
    }
);

my $borrowernumber = $cgi->param('borrowernumber');

my $borrower = Koha::Borrowers->find($borrowernumber);

my @enrollments = $borrower->GetClubEnrollments();
my @clubs       = $borrower->GetEnrollableClubs();

$template->param(
    enrollments    => \@enrollments,
    clubs          => \@clubs,
    borrowernumber => $borrowernumber
);

output_html_with_http_headers( $cgi, $cookie, $template->output );




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use Koha::Clubs;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "clubs/patron-enroll.tt",
        query           => $cgi,
        type            => "intranet",
        authnotrequired => 0,
        flagsrequired   => { clubs => '*' },
    }
);

my $id             = $cgi->param('id');
my $borrowernumber = $cgi->param('borrowernumber');

my $club = Koha::Clubs->find($id);

$template->param(
    club           => $club,
    borrowernumber => $borrowernumber,
);

output_html_with_http_headers( $cgi, $cookie, $template->output );




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;

use Koha::DateUtils qw(dt_from_string);
use Koha::Club::Templates;
use Koha::Club::Template::Fields;
use Koha::Club::Template::EnrollmentFields;

use Koha::Database;
my $schema = Koha::Database->new()->schema();

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => 'clubs/templates-add-modify.tt',
        query           => $cgi,
        type            => 'intranet',
        authnotrequired => 0,
        flagsrequired   => { clubs => 'edit_templates' },
    }
);

my $id = $cgi->param('id');

my $club_template;

if ( $cgi->param('name') ) {    # Update or create club
    if ($id) {
        $club_template = Koha::Club::Templates->find($id);
        $template->param( stored => 'updated' );
    }
    else {
        $club_template = Koha::Club::Template->new();
        $template->param( stored => 'created' );
    }

    $club_template->set(
        {
            id          => $id                        || undef,
            name        => $cgi->param('name')        || undef,
            description => $cgi->param('description') || undef,
            branchcode  => $cgi->param('branchcode')  || undef,
            date_updated            => dt_from_string(),
            is_email_required       => $cgi->param('is_email_required') ? 1 : 0,
            is_enrollable_from_opac => $cgi->param('is_enrollable_from_opac')
            ? 1
            : 0,
        }
    )->store();

    $id ||= $club_template->id();

    # Update club creation fields
    my @field_id                        = $cgi->param('club_template_field_id');
    my @field_name                      = $cgi->param('club_template_field_name');
    my @field_description               = $cgi->param('club_template_field_description');
    my @field_authorised_value_category = $cgi->param('club_template_field_authorised_value_category');

    my @field_delete = $cgi->param('club_template_field_delete');

    for ( my $i = 0 ; $i < @field_id ; $i++ ) {
        my $field_id                        = $field_id[$i];
        my $field_name                      = $field_name[$i];
        my $field_description               = $field_description[$i];
        my $field_authorised_value_category = $field_authorised_value_category[$i];

        my $field =
          $field_id
          ? Koha::Club::Template::Fields->find($field_id)
          : Koha::Club::Template::Field->new();

        if ( grep( /^$field_id$/, @field_delete ) ) {
            $field->delete();
        }
        else {
            $field->set(
                {
                    club_template_id          => $id,
                    name                      => $field_name,
                    description               => $field_description,
                    authorised_value_category => $field_authorised_value_category,
                }
            )->store();
        }
    }

    # Update club enrollment fields
    @field_id                        = $cgi->param('club_template_enrollment_field_id');
    @field_name                      = $cgi->param('club_template_enrollment_field_name');
    @field_description               = $cgi->param('club_template_enrollment_field_description');
    @field_authorised_value_category = $cgi->param('club_template_enrollment_field_authorised_value_category');

    @field_delete = $cgi->param('club_template_enrollment_field_delete');

    for ( my $i = 0 ; $i < @field_id ; $i++ ) {
        my $field_id                        = $field_id[$i];
        my $field_name                      = $field_name[$i];
        my $field_description               = $field_description[$i];
        my $field_authorised_value_category = $field_authorised_value_category[$i];

        my $field =
          $field_id
          ? Koha::Club::Template::EnrollmentFields->find($field_id)
          : Koha::Club::Template::EnrollmentField->new();

        if ( grep( /^$field_id$/, @field_delete ) ) {
            $field->delete();
        }
        else {
            $field->set(
                {
                    id                        => $field_id,
                    club_template_id          => $id,
                    name                      => $field_name,
                    description               => $field_description,
                    authorised_value_category => $field_authorised_value_category,
                }
            )->store();
        }
    }
}

$club_template ||= Koha::Club::Templates->find($id);
$template->param( club_template => $club_template );

output_html_with_http_headers( $cgi, $cookie, $template->output );




--
-- Table structure for table 'club_templates'
--

CREATE TABLE IF NOT EXISTS club_templates (
  id int(11) NOT NULL AUTO_INCREMENT,
  `name` tinytext NOT NULL,
  description text,
  is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
  is_email_required tinyint(1) NOT NULL DEFAULT '0',
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_updated timestamp NULL DEFAULT NULL,
  is_deletable tinyint(1) NOT NULL DEFAULT '1',
  PRIMARY KEY (id),
  KEY ct_branchcode (branchcode),
  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'clubs'
--

CREATE TABLE IF NOT EXISTS clubs (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  date_start date DEFAULT NULL,
  date_end date DEFAULT NULL,
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_updated timestamp NULL DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  KEY branchcode (branchcode),
  CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_enrollments'
--

CREATE TABLE IF NOT EXISTS club_enrollments (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_id int(11) NOT NULL,
  borrowernumber int(11) NOT NULL,
  date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_canceled timestamp NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
  date_updated timestamp NULL DEFAULT NULL,
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_id (club_id),
  KEY borrowernumber (borrowernumber),
  KEY branchcode (branchcode),
  CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_template_enrollment_fields'
--

CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  authorised_value_category varchar(16) DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_enrollment_fields'
--

CREATE TABLE IF NOT EXISTS club_enrollment_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_enrollment_id int(11) NOT NULL,
  club_template_enrollment_field_id int(11) NOT NULL,
  `value` text NOT NULL,
  PRIMARY KEY (id),
  KEY club_enrollment_id (club_enrollment_id),
  KEY club_template_enrollment_field_id (club_template_enrollment_field_id),
  CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
  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
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_template_fields'
--

CREATE TABLE IF NOT EXISTS club_template_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  authorised_value_category varchar(16) DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_fields'
--

CREATE TABLE IF NOT EXISTS club_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_field_id int(11) NOT NULL,
  club_id int(11) NOT NULL,
  `value` text,
  PRIMARY KEY (id),
  KEY club_template_field_id (club_template_field_id),
  KEY club_id (club_id),
  CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;


Lines 17-21 INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userflags.sql (-1 / +2 lines)
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	;

Lines 74-78 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (-1 / +4 lines)
74	(19, 'tool', 'Use tool plugins'),	74	(19, 'tool', 'Use tool plugins'),
75	(19, 'report', 'Use report plugins'),	75	(19, 'report', 'Use report plugins'),
76	(19, 'configure', 'Configure plugins'),	76	(19, 'configure', 'Configure plugins'),
77	(20, 'delete_public_lists', 'Delete public lists')	77	(20, 'delete_public_lists', 'Delete public lists'),
		78	(21, 'edit_templates', 'Create and update club templates'),
		79	(21, 'edit_clubs', 'Create and update clubs'),
		80	(21, 'enroll', 'Enroll patrons in clubs')
78	;	81	;




  CONSTRAINT `afv_fk` FOREIGN KEY (`field_id`) REFERENCES `additional_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

--
-- Table structure for table 'club_templates'
--

CREATE TABLE IF NOT EXISTS club_templates (
  id int(11) NOT NULL AUTO_INCREMENT,
  `name` tinytext NOT NULL,
  description text,
  is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
  is_email_required tinyint(1) NOT NULL DEFAULT '0',
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_updated timestamp NULL DEFAULT NULL,
  is_deletable tinyint(1) NOT NULL DEFAULT '1',
  PRIMARY KEY (id),
  KEY ct_branchcode (branchcode),
  CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'clubs'
--

CREATE TABLE IF NOT EXISTS clubs (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  date_start date DEFAULT NULL,
  date_end date DEFAULT NULL,
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_updated timestamp NULL DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  KEY branchcode (branchcode),
  CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_enrollments'
--

CREATE TABLE IF NOT EXISTS club_enrollments (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_id int(11) NOT NULL,
  borrowernumber int(11) NOT NULL,
  date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
  date_canceled timestamp NULL DEFAULT NULL,
  date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
  date_updated timestamp NULL DEFAULT NULL,
  `branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_id (club_id),
  KEY borrowernumber (borrowernumber),
  KEY branchcode (branchcode),
  CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_template_enrollment_fields'
--

CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  authorised_value_category varchar(16) DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_enrollment_fields'
--

CREATE TABLE IF NOT EXISTS club_enrollment_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_enrollment_id int(11) NOT NULL,
  club_template_enrollment_field_id int(11) NOT NULL,
  `value` text NOT NULL,
  PRIMARY KEY (id),
  KEY club_enrollment_id (club_enrollment_id),
  KEY club_template_enrollment_field_id (club_template_enrollment_field_id),
  CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
  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
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_template_fields'
--

CREATE TABLE IF NOT EXISTS club_template_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_id int(11) NOT NULL,
  `name` tinytext NOT NULL,
  description text,
  authorised_value_category varchar(16) DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_template_id (club_template_id),
  CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Table structure for table 'club_fields'
--

CREATE TABLE IF NOT EXISTS club_fields (
  id int(11) NOT NULL AUTO_INCREMENT,
  club_template_field_id int(11) NOT NULL,
  club_id int(11) NOT NULL,
  `value` text,
  PRIMARY KEY (id),
  KEY club_template_field_id (club_template_field_id),
  KEY club_id (club_id),
  CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;

Lines 88-93 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+23 lines)
88	}	88	}
89	});	89	});
90		90
		91	if ( $('#clubs-tab').length ) {
		92	$('#clubs-tab-link').on('click', function() {
		93	$('#clubs-tab').text(_("Loading..."));
		94	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		95	});
		96	}
		97
91	[% IF !( CircAutoPrintQuickSlip == 'clear' ) %]	98	[% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
92	// listen submit to trigger qslip on empty checkout	99	// listen submit to trigger qslip on empty checkout
93	$('#mainform').bind('submit',function() {	100	$('#mainform').bind('submit',function() {
Lines 874-879 No patron matched <span class="ex">[% message %]</span> Link Here
874	[% END %]	881	[% END %]
875	</li>	882	</li>
876		883
		884	[% SET enrollments = borrower.GetClubEnrollmentsCount %]
		885	[% SET enrollable = borrower.GetEnrollableClubsCount %]
		886	[% IF CAN_user_clubs && ( enrollable \|\| enrollments ) %]
		887	<li>
		888	<a id="clubs-tab-link" href="#clubs-tab">
		889	Clubs ([% enrollments %]/[% enrollable %])
		890	</a>
		891	</li>
		892	[% END %]
		893
877	[% IF relatives_issues_count %]	894	[% IF relatives_issues_count %]
878	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>	895	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
879	[% END %]	896	[% END %]
Lines 915-920 No patron matched <span class="ex">[% message %]</span> Link Here
915	</div>	932	</div>
916	[% END %]	933	[% END %]
917		934
		935	[% IF CAN_user_clubs %]
		936	<div id="clubs-tab">
		937	Loading...
		938	</div>
		939	[% END %]
		940
918	[% INCLUDE borrower_debarments.inc %]	941	[% INCLUDE borrower_debarments.inc %]
919		942
920	<div id="reserves">	943	<div id="reserves">

Lines 67-73 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt (-2 / +2 lines)
67		67
68	[% ELSIF error == "auto_too_soon" %]	68	[% ELSIF error == "auto_too_soon" %]
69		69
70	<p>[% item.biblio.title \| $EncodeUTF8 %] [% item.biblioitem.subtitle \| $EncodeUTF8 %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed before [% soonestrenewdate \| $KohaDates %]. </p>	70	<p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal and cannot be renewed before [% soonestrenewdate \| $KohaDates %]. </p>
71		71
72	[% IF Koha.Preference('AllowRenewalLimitOverride') %]	72	[% IF Koha.Preference('AllowRenewalLimitOverride') %]
73	<form method="post" action="/cgi-bin/koha/circ/renew.pl">	73	<form method="post" action="/cgi-bin/koha/circ/renew.pl">
Lines 79-85 Link Here
79		79
80	[% ELSIF error == "auto_renew" %]	80	[% ELSIF error == "auto_renew" %]
81		81
82	<p>[% item.biblio.title \| $EncodeUTF8 %] [% item.biblioitem.subtitle \| $EncodeUTF8 %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p>	82	<p>[% item.biblio.title %] [% item.biblioitem.subtitle %] ( [% item.barcode %] ) has been scheduled for automatic renewal. </p>
83		83
84	[% IF Koha.Preference('AllowRenewalLimitOverride') %]	84	[% IF Koha.Preference('AllowRenewalLimitOverride') %]
85	<form method="post" action="/cgi-bin/koha/circ/renew.pl">	85	<form method="post" action="/cgi-bin/koha/circ/renew.pl">




[% USE KohaDates %]
[% USE Branches %]
[% USE AuthorisedValues %]
[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo; Club</title>
[% INCLUDE 'doc-head-close.inc' %]
[% INCLUDE 'calendar.inc' %]

<script type="text/javascript">
//<![CDATA[

function CheckForm() {
  if ( !$("#club-name").val() ) {
    alert( _("Name is a required field!")  );
    return false;
  }

  return true;
}

//]]>
</script>

</head>

<body id="clubs_add_modify" class="clubs">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
<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>

<div class="yui-t7">
    <div class="yui-main">
        [% IF stored %]
            <div class="alert">
                <p>Your club was [% IF stored == 'updated' %] updated [% ELSE %] saved [% END %]</p>
                <a href="clubs.pl">Return to patron clubs</a>
            </div>
        [% END %]

        <form method="post" onsubmit="return CheckForm()">
            <input type="hidden" name="id" value="[% club.id %]" />
            <input type="hidden" name="club_template_id" value="[% club_template.id %]" />

            <fieldset class="rows">

                <legend>
                    [% IF club %]
                        Modify club <i>[% club.name %]</i>
                    [% ELSE %]
                        Create a new <i>[% club_template.name %]</i> club
                    [% END %]
                </legend>

                <ol>
                    <li>
                        <label class="required" for="name">Name:</label>
                        <input id="club-name" name="name" type="text" value="[% club.name %]" />
                    </li>

                    <li>
                        <label for="description">Description:</label>
                        <input id="club-template-name" name="description" type="text" value="[% club.description %]" />
                    </li>

                    <li>
                        <label for="date_start">Start date:</label>
                        <input name="date_start" id="from" size="10" readonly="readonly" class="datepickerfrom" value="[% club.date_start | $KohaDates %]">
                    </li>

                    <li>
                        <label for="date_end">End date:</label>
                        <input name="date_end" id="to" size="10" readonly="readonly" class="datepickerto" value="[% club.date_end | $KohaDates %]" >
                    </li>

                    <li>
                        <label for="name">Branch:</label>
                        <select name="branchcode" id="club-template-branchcode">
                            <option value="">&nbsp</option>
                            [% FOREACH b IN Branches.GetBranches() %]
                                [% IF b.branchcode == club.branch.branchcode %]
                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
                                [% ELSE %]
                                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
                                [% END %]
                            [% END %]
                        </select>
                    </li>

                    [% IF club %]
                        [% FOREACH f IN club.club_fields %]
                            <li>
                                <input type="hidden" name="club_template_field_id" value="[% f.club_template_field.id %]" />
                                <input type="hidden" name="club_field_id" value="[% f.id %]" />

                                <label for="club_field">[% f.club_template_field.name %]</label>
                                [% IF f.club_template_field.authorised_value_category %]
                                    <select name="club_field">
                                        [% FOREACH a IN AuthorisedValues.Get( f.club_template_field.authorised_value_category ) %]
                                            [% IF a.authorised_value == f.value %]
                                                <option value="[% a.authorised_value %]" selected="selected">[% a.lib %]</option>
                                            [% ELSE %]
                                                <option value="[% a.authorised_value %]">[% a.lib %]</option>
                                            [% END %]
                                        [% END %]
                                    </select>
                                [% ELSE %]
                                    <input type="text" name="club_field" value="[% f.value %]" />
                                [% END %]
                            </li>
                        [% END %]
                    [% ELSE %]
                        [% FOREACH f IN club_template.club_template_fields %]
                            <li>
                                <input type="hidden" name="club_template_field_id" value="[% f.id %]" />

                                <label for="club_field">[% f.name %]</label>
                                [% IF f.authorised_value_category %]
                                    <select name="club_field">
                                        [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
                                            <option value="[% a.authorised_value %]">[% a.lib %]</option>
                                        [% END %]
                                    </select>
                                [% ELSE %]
                                    <input type="text" name="club_field" />
                                [% END %]
                            </li>
                        [% END %]
                    [% END %]

                </ol>

            </fieldset>

            <input type="submit" class="btn" value="Save" />

            <a href="clubs.pl" class="cancel">Cancel</a>
        </form>
    </div>
</div>

[% INCLUDE 'intranet-bottom.inc' %]




[% USE Branches %]
[% USE Koha %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs</title>
[% INCLUDE 'doc-head-close.inc' %]

<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
[% INCLUDE 'datatables.inc' %]

<script type="text/javascript">
//<![CDATA[
    $(document).ready(function() {
        tTable = $('#club-templates-table').dataTable($.extend(true, {}, dataTablesDefaults, {
            "aoColumnDefs": [
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
            ]
        } ));

        cTable = $('#clubs-table').dataTable($.extend(true, {}, dataTablesDefaults, {
            "aoColumnDefs": [
                { "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
            ]
        } ));
    });

    function ConfirmDeleteTemplate( id, name, a ) {
        if ( confirm( _("Are you sure you want to delete the club template") + name + "?" ) ) {
            $.ajax({
                type: "POST",
                url: '/cgi-bin/koha/svc/club/template/delete',
                data: { id: id },
                success: function( data ) {
                    if ( data.success ) {
                        tTable.fnDeleteRow(a.closest("tr")[0]);
                    } else {
                        alert(_("Unable to delete template!"));
                    }
                },
                dataType: 'json'
            });
        }
    }

    function ConfirmDeleteClub( id, name, a ) {
        if ( confirm( _("Are you sure you want to delete the club ") + name + "?" ) ) {
            $.ajax({
                type: "POST",
                url: '/cgi-bin/koha/svc/club/delete',
                data: { id: id },
                success: function( data ) {
                    if ( data.success ) {
                        cTable.fnDeleteRow(a.closest("tr")[0]);
                    } else {
                        alert(_("Unable to delete club!"));
                    }
                },
                dataType: 'json'
            });
        }
    }
//]]>
</script>

</head>

<body id="clubs_clubs" class="clubs">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
<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>

<div class="yui-t7">
    <div class="yui-main">
        <h1>Patron clubs</h1>


        <h3>Club templates</h3>

        [% IF CAN_user_clubs_edit_templates %]
            <div class="btn-group">
                <a class="btn btn-small" href="templates-add-modify.pl"><i class="icon-plus"></i> New club template</a>
            </div>
        [% END %]

        <table id="club-templates-table">
            <thead>
                <tr>
                    <th>Name</th>
                    <th>Description</th>
                    <th>Public enrollment</th>
                    <th>Email required</th>
                    <th>Branch</th>
                    <th>&nbsp;</th>
                    <th>&nbsp;</th>
                </tr>
            </thead>

            <tbody>
                [% FOREACH t IN club_templates %]
                    <tr>
                        <td>[% t.name %]</td>
                        <td>[% t.description %]</td>
                        <td>
                            [% IF t.is_enrollable_from_opac %]
                                Yes
                            [% ELSE %]
                                No
                            [% END %]
                        </td>
                        <td>
                            [% IF t.is_email_required %]
                                Yes
                            [% ELSE %]
                                No
                            [% END %]
                        </td>
                        <td>[% Branches.GetName( t.branchcode ) %]</td>
                        <td>
                            [% IF CAN_user_clubs_edit_templates %]
                                <a class="btn btn-mini" href="templates-add-modify.pl?id=[% t.id %]">
                                    <i class="icon-edit"></i> Edit
                                </a>
                            [% END %]
                        </td>
                        <td>
                            [% IF CAN_user_clubs_edit_templates %]
                                <a class="btn btn-mini" href="#" onclick='ConfirmDeleteTemplate([% t.id %], "[% t.name | html %]", $(this) ); return false;'>
                                    <i class="icon-trash"></i> Delete
                                </a>
                            [% END %]
                        </td>
                    </tr>
                [% END %]
            </tbody>
        </table>

        <h3>Clubs</h3>

        [% IF CAN_user_clubs_edit_clubs %]
            <div class="btn-group">
                <div class="btn-group">
                    <button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New club <span class="caret"></span></button>
                    <ul class="dropdown-menu">
                        [% FOREACH t IN club_templates %]
                            <li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id %]">[% t.name %]</a></li>
                        [% END %]
                    </ul>
                </div>
            </div>
        [% END %]

        <table id="clubs-table">
            <thead>
                <tr>
                    <th>Name</th>
                    <th>Template</th>
                    <th>Description</th>
                    <th>Public enrollment</th>
                    <th>Email required</th>
                    <th>Branch</th>
                    <th>&nbsp;</th>
                    <th>&nbsp;</th>
                </tr>
            </thead>

            <tbody>
                [% FOREACH c IN clubs %]
                    <tr>
                        <td>[% c.name %]</td>
                        <td>[% c.club_template.name %]</td>
                        <td>[% c.description %]</td>
                        <td>
                            [% IF c.club_template.is_enrollable_from_opac %]
                                Yes
                            [% ELSE %]
                                No
                            [% END %]
                        </td>
                        <td>
                            [% IF c.club_template.is_email_required %]
                                Yes
                            [% ELSE %]
                                No
                            [% END %]
                        </td>
                        <td>[% Branches.GetName( c.branchcode ) %]</td>
                        <td>
                            [% IF CAN_user_clubs_edit_clubs %]
                                <a class="btn btn-mini" href="clubs-add-modify.pl?id=[% c.id %]">
                                    <i class="icon-edit"></i> Edit
                                </a>
                            [% END %]
                        </td>
                        <td>
                            [% IF CAN_user_clubs_edit_clubs %]
                                <a class="btn btn-mini" href="#" onclick='ConfirmDeleteClub([% c.id %], "[% c.name | html %]", $(this) ); return false;'>
                                    <i class="icon-trash"></i> Delete
                                </a>
                            [% END %]
                        </td>
                    </tr>
                [% END %]
            </tbody>
        </table>
    </div>
</div>
[% INCLUDE 'intranet-bottom.inc' %]




[% USE KohaDates %]

[% IF enrollments %]
    <table>
        <thead>
            <tr>
                <th colspan="4">
                    Clubs currently enrolled in
                </th>
            </tr>
            <tr>
                <th>Name</th>
                <th>Description</th>
                <th>Date enrolled</th>
                [% IF CAN_user_clubs_enroll %]<th>&nbsp;</th>[% END %]
            </tr>
        </thead>

        <tbody>
            [% FOREACH e IN enrollments %]
                <tr>
                    <td>[% e.club.name %]</td>
                    <td>[% e.club.description %]</td>
                    <td>[% e.date_enrolled | $KohaDates %]</td>
                    [% IF CAN_user_clubs_enroll %]
                        <td>
                            <a class="btn btn-mini" onclick="cancelEnrollment( [% e.id %] )">
                                <i class="icon-remove"></i> Cancel
                            </a>
                        </td>
                    [% END %]
                </tr>
            [% END %]
        </tbody>
    </table>
[% END %]

[% IF clubs %]
    <table>
        <thead>
            <tr>
                <th colspan="3">
                    Clubs not enrolled in
                </th>
            </tr>
            <tr>
                <th>Name</th>
                <th>Description</th>
                [% IF CAN_user_clubs_enroll %]<th>&nbsp;</th>[% END %]
            </tr>
        </thead>

        <tbody>
            [% FOREACH c IN clubs %]
                <tr>
                    <td>[% c.name %]</td>
                    <td>[% c.description %]</td>
                    [% IF CAN_user_clubs_enroll %]
                        <td>
                            <a class="btn btn-mini" onclick="loadEnrollmentForm([% c.id %])">
                                <i class="icon-plus"></i> Enroll
                            </a>
                        </td>
                    [% END %]
                </tr>
            [% END %]
        </tbody>
    </table>
[% END %]

[% IF CAN_user_clubs_enroll %]
<script type="text/javascript">
function loadEnrollmentForm( id ) {
    $("body").css("cursor", "progress");
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-enroll.pl?borrowernumber=[% borrowernumber %]&id=' + id, function() {
        $("body").css("cursor", "default");
    });

    return false;
}

function cancelEnrollment( id ) {
    $("body").css("cursor", "progress");
    $.ajax({
        type: "POST",
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
        data: { id: id },
        success: function( data ) {
            if ( data.success ) {
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]', function() {
                    $("body").css("cursor", "default");
                });
            } else {
                alert(_("Unable to cancel enrollment!"));
            }
        },
        dataType: 'json'
    });
    return false;
}
</script>
[% END %]




[% USE AuthorisedValues %]
[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]

<h3>
    Enroll in <i>[% club.name %]</i>
</h3>

<div class="container">
    <form id="patron-enrollment-form">
        <input type="hidden" name="id" value="[% club.id %]" />
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
        <fieldset class="rows">
            <ol>
                [% FOREACH f IN club.club_template.club_template_enrollment_fields %]
                    <li>
                        <label>[% f.name %]</label>
                        [% IF f.authorised_value_category %]
                            <select name="[% f.id %]">
                                [% FOREACH a IN AuthorisedValues.Get( f.club_template_field.authorised_value_category ) %]
                                    <option value="[% a.authorised_value %]">[% a.lib %]</option>
                                [% END %]
                            </select>
                        [% ELSE %]
                            <input type="text" name="[% f.id %]" />
                        [% END %]
                        <span class="hint">[% f.description %]</span>
                    </li>
                [% END %]

                <li>
                    <a href="#" class="btn" onclick="addEnrollment(); return false;"><i class="icon-plus"></i> Enroll</a>
                    <a href="#" onclick="showClubs(); return false;">Cancel</a>
                </li>
            </ol>
        </fieldset>
    </form>
</div>

<script type="text/javascript">
function addEnrollment() {
    $("body").css("cursor", "progress");
    $.ajax({
        type: "POST",
        url: '/cgi-bin/koha/svc/club/enroll',
        data: $( "#patron-enrollment-form" ).serialize(),
        success: function( data ) {
            if ( data.success ) {
                $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
                    $("body").css("cursor", "default");
                });
            } else {
                alert(_("Unable to create enrollment!"));
            }
        },
        dataType: 'json'
    });
    return false;
}

function showClubs() {
    $("body").css("cursor", "progress");
    $('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
        $("body").css("cursor", "default");
    });
}
</script>




[% USE Branches %]
[% USE AuthorisedValues %]
[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Tools &rsaquo; Patron clubs &rsaquo; Club template</title>
[% INCLUDE 'doc-head-close.inc' %]

<script type="text/javascript">
//<![CDATA[

function CheckForm() {
  if ( !$("#club-template-name").val() ) {
    alert( _("Name is a required field!")  );
    return false;
  }

  return true;
}

//]]>
</script>

</head>

<body id="clubs_templates_add_modify" class="clubs">
[% INCLUDE 'header.inc' %]
[% INCLUDE 'cat-search.inc' %]
<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>

<div class="yui-t7">
    <div class="yui-main">
        [% IF stored %]
            <div class="alert">
                <p>Your club template was [% IF stored == 'updated' %] updated [% ELSE %] saved [% END %]</p>
                <a href="clubs.pl">Return to patron clubs</a>
            </div>
        [% END %]

        <form method="post" onsubmit="return CheckForm()">
            <input type="hidden" name="id" value="[% club_template.id %]" />

            <fieldset class="rows">

                <legend>
                    [% IF club_template %]
                        Modify club template <i>[% club_template.name %]</i>
                    [% ELSE %]
                        Create a new club template
                    [% END %]
                </legend>

                <ol>
                    <li>
                        <label class="required" for="name">Name:</label>
                        <input id="club-template-name" name="name" type="text" value="[% club_template.name %]" />
                    </li>

                    <li>
                        <label for="description">Description:</label>
                        <input id="club-template-description" name="description" type="text" value="[% club_template.description %]" />
                    </li>

                    <li>
                        <label for="name">Allow public enrollment:</label>
                        [% IF club_template.is_enrollable_from_opac %]
                            <input type="checkbox" id="club-template-is-enrollable-from-opac" name="is_enrollable_from_opac" checked="checked" />
                        [% ELSE %]
                            <input type="checkbox" id="club-template-is-enrollable-from-opac" name="is_enrollable_from_opac" />
                        [% END %]
                        <span class="hint">If a template allows public enrollment, patrons can enroll in a club based on this template from the public catalog.</span>
                    </li>

                    <li>
                        <label for="name">Require valid email address:</label>
                        [% IF club_template.is_email_required %]
                            <input type="checkbox" id="club-template-is-email-required" name="is_email_required" checked="checked" />
                        [% ELSE %]
                            <input type="checkbox" id="club-template-is-email-required" name="is_email_required" />
                        [% END %]
                        <span class="hint">If set, a club based on this template can only be enrolled in by patrons with a valid email address.</span>
                    </li>

                    <li>
                        <label for="name">Branch:</label>
                        <select name="branchcode" id="club-template-branchcode">
                            <option value="">&nbsp</option>
                            [% FOREACH b IN Branches.GetBranches() %]
                                [% IF b.branchcode == club_template.branchcode %]
                                    <option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
                                [% ELSE %]
                                    <option value="[% b.branchcode %]">[% b.branchname %]</option>
                                [% END %]
                            [% END %]
                        </select>
                        <span class="hint">If set, only librarians logged in with this branch will be able to modify this club template.</span>
                    </li>

                </ol>

                <h2>Club fields:</h2>
                <span class="hint">These fields will be used in the creation of clubs based on this template</span>
                <span id="club-template-fields">
                    [% FOREACH f IN club_template.club_template_fields %]
                        <ul>
                            <input type="hidden" name="club_template_field_id" value="[% f.id %]" />
                            <li>
                                <label for="field-name-[% f.id %]">Name:</label>
                                <input name="club_template_field_name" id="field-name-[% f.id %]" value="[% f.name %]" />
                            </li>

                            <li>
                                <label for="field-description-[% f.id %]">Description:</label>
                                <input name="club_template_field_description" id="field-description-[% f.id %]" value="[% f.description %]" />
                            </li>

                            <li>
                                <label for="field-description-[% f.id %]">Authorised value category:</label>
                                <select name="club_template_field_authorised_value_category" id="field-authorised-value-category-[% f.id %]">
                                    <option value="">&nbsp;</option>
                                    [% FOREACH c IN AuthorisedValuesCategories %]
                                        [% IF f.authorised_value_category == c %]
                                            <option selected="selected" value="[% c %]">[% c %]</option>
                                        [% ELSE %]
                                            <option value="[% c %]">[% c %]</option>
                                        [% END %]
                                    [% END %]
                                </select>
                            </li>

                            <li>
                                <label for="field-delete-[% f.id %]">Delete field:</label>
                                <input type="checkbox" name="club_template_field_delete" id="field-delete-[% f.id %]" value="[% f.id %]" />
                            </li>

                            <hr/>
                        </ul>
                    [% END %]
                </span>
                <a href="#" class="btn" onclick="$('#new-field-template').clone().attr('id','').show().appendTo('#club-template-fields'); return false;">
                    Add new field
                </a>

                <h2>Enrollment fields:</h2>
                <span class="hint">These fields will be used when enrolling a patron in a club based on this template</span>
                <span id="club-template-enrollment-fields">
                    [% FOREACH f IN club_template.club_template_enrollment_fields %]
                        <ul>
                            <input type="hidden" name="club_template_enrollment_field_id" value="[% f.id %]" />
                            <li>
                                <label for="enrollment-field-name-[% f.id %]">Name:</label>
                                <input name="club_template_enrollment_field_name" id="enrollment-field-name-[% f.id %]" value="[% f.name %]" />
                            </li>

                            <li>
                                <label for="enrollment-field-description-[% f.id %]">Description:</label>
                                <input name="club_template_enrollment_field_description" id="enrollment-field-description-[% f.id %]" value="[% f.description %]" />
                            </li>

                            <li>
                                <label for="enrollment-field-description-[% f.id %]">Authorised value category:</label>
                                <select name="club_template_enrollment_field_authorised_value_category" id="enrollment-field-authorised-value-category-[% f.id %]">
                                    <option value="">&nbsp;</option>
                                    [% FOREACH c IN AuthorisedValuesCategories %]
                                        [% IF f.authorised_value_category == c %]
                                            <option selected="selected" value="[% c %]">[% c %]</option>
                                        [% ELSE %]
                                            <option value="[% c %]">[% c %]</option>
                                        [% END %]
                                    [% END %]
                                </select>
                            </li>

                            <li>
                                <label for="enrollment-field-delete-[% f.id %]">Delete field:</label>
                                <input type="checkbox" name="club_template_enrollment_field_delete" id="enrollment-field-delete-[% f.id %]" value="[% f.id %]" />
                            </li>

                            <hr/>
                        </ul>
                    [% END %]
                </span>
                <a href="#" class="btn" onclick="$('#new-enrollment-field-template').clone().attr('id','').show().appendTo('#club-template-enrollment-fields'); return false;">
                    Add new field
                </a>

            </fieldset>

            <input type="hidden" name="id" value="[% club_template.id %]" />

            <input type="submit" class="btn" value="Save" />

            <a href="clubs.pl" class="cancel">Cancel</a>
        </form>
    </div>
</div>

<span id="new-field-template" style="display:none">
    <ul>
        <input type="hidden" name="club_template_field_id" value="" />

        <li>
            <label for="club_template_field_name">Name:</label>
            <input name="club_template_field_name" />
        </li>

        <li>
            <label for="club_template_field_description">Description:</label>
            <input name="club_template_field_description" />
        </li>

        <li>
            <label for="club_template_field_authorised_value_category">Authorised value category:</label>
            <select name="club_template_field_authorised_value_category">
                <option value="">&nbsp;</option>
                [% FOREACH c IN AuthorisedValuesCategories %]
                    <option value="[% c %]">[% c %]</option>
                [% END %]
            </select>
        </li>

        <a href="#" onclick="$(this).parent().remove(); return false;">Cancel</a>

        <hr/>
    </ul>
</span>

<span id="new-enrollment-field-template" style="display:none">
    <ul>
        <input type="hidden" name="club_template_enrollment_field_id" value="" />

        <li>
            <label for="club_template_enrollment_field_name">Name:</label>
            <input name="club_template_enrollment_field_name" />
        </li>

        <li>
            <label for="club_template_enrollment_field_description">Description:</label>
            <input name="club_template_enrollment_field_description" />
        </li>

        <li>
            <label for="club_template_enrollment_field_authorised_value_category">Authorised value category:</label>
            <select name="club_template_enrollment_field_authorised_value_category">
                <option value="">&nbsp;</option>
                [% FOREACH c IN AuthorisedValuesCategories %]
                    <option value="[% c %]">[% c %]</option>
                [% END %]
            </select>
        </li>

        <a href="#" onclick="$(this).parent().remove(); return false;">Cancel</a>

        <hr/>
    </ul>
</span>

[% INCLUDE 'intranet-bottom.inc' %]

Lines 46-51 var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+22 lines)
46	columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]	46	columns_settings = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) %]
47		47
48	$(document).ready(function() {	48	$(document).ready(function() {
		49	if ( $('#clubs-tab').length ) {
		50	$('#clubs-tab-link').on('click', function() {
		51	$('#clubs-tab').text(_("Loading..."));
		52	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		53	});
		54	}
		55
49	$('#finesholdsissues').tabs({	56	$('#finesholdsissues').tabs({
50	// Correct table sizing for tables hidden in tabs	57	// Correct table sizing for tables hidden in tabs
51	// http://www.datatables.net/examples/api/tabs_and_scrolling.html	58	// http://www.datatables.net/examples/api/tabs_and_scrolling.html
Lines 431-436 function validate1(date) { Link Here
431	[% END %]	438	[% END %]
432	</li>	439	</li>
433	<li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>	440	<li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
		441	[% SET enrollments = borrower.GetClubEnrollmentsCount %]
		442	[% SET enrollable = borrower.GetEnrollableClubsCount %]
		443	[% IF CAN_user_clubs && ( enrollments \|\| enrollable ) %]
		444	<li>
		445	<a id="clubs-tab-link" href="#clubs-tab">
		446	Clubs ([% enrollments %]/[% enrollable %])
		447	</a>
		448	</li>
		449	[% END %]
434	</ul>	450	</ul>
435		451
436	[% INCLUDE "checkouts-table.inc" %]	452	[% INCLUDE "checkouts-table.inc" %]
Lines 466-471 function validate1(date) { Link Here
466	[% END %]	482	[% END %]
467	</div>	483	</div>
468		484
		485	[% IF CAN_user_clubs && ( enrollments \|\| enrollable ) %]
		486	<div id="clubs-tab">
		487	Loading...
		488	</div>
		489	[% END %]
		490
469	[% INCLUDE borrower_debarments.inc %]	491	[% INCLUDE borrower_debarments.inc %]
470		492
471	<div id="reserves">	493	<div id="reserves">

Lines 20-25 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (+5 lines)
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="holdcount"><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="holdcount"><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>




[% USE KohaDates %]

[% IF enrollments %]
    <table id="clubs-table-enrolled" class="table table-bordered table-striped">
        <thead>
            <tr>
                <th colspan="4">
                    Clubs you are currently enrolled in
                </th>
            </tr>
            <tr>
                <th>Name</th>
                <th>Description</th>
                <th>Date enrolled</th>
                <th>&nbsp;</th>
            </tr>
        </thead>

        <tbody>
            [% FOREACH e IN enrollments %]
                <tr>
                    <td>[% e.club.name %]</td>
                    <td>[% e.club.description %]</td>
                    <td>[% e.date_enrolled | $KohaDates %]</td>
                    [% IF e.club.club_template.is_enrollable_from_opac %]
                        <td>
                            <a class="btn btn-mini" onclick="cancelEnrollment( [% e.id %] )">
                                <i class="icon-remove"></i> Cancel
                            </a>
                        </td>
                    [% END %]
                </tr>
            [% END %]
        </tbody>
    </table>
[% END %]

[% IF clubs %]
    <table id="clubs-table-unenrolled" class="table table-bordered table-striped">
        <thead>
            <tr>
                <th colspan="3">
                    Clubs you can enroll in
                </th>
            </tr>
            <tr>
                <th>Name</th>
                <th>Description</th>
                <th>&nbsp;</th>
            </tr>
        </thead>

        <tbody>
            [% FOREACH c IN clubs %]
                <tr>
                    <td>[% c.name %]</td>
                    <td>[% c.description %]</td>
                    <td>
                        [% IF borrower.FirstValidEmailAddress %]
                            <a class="btn btn-mini" onclick="loadEnrollmentForm([% c.id %])">
                                <i class="icon-plus"></i> Enroll
                            </a>
                        [% ELSE %]
                            <span class="hint">You must have an email address to enroll</span>
                        [% END %]
                    </td>
                </tr>
            [% END %]
        </tbody>
    </table>
[% END %]

<script type="text/javascript">
function loadEnrollmentForm( id ) {
    $("body").css("cursor", "progress");
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/enroll.pl?borrowernumber=[% borrower.borrowernumber %]&id=' + id, function() {
        $("body").css("cursor", "default");
    });

    return false;
}

function cancelEnrollment( id ) {
    $("body").css("cursor", "progress");
    $.ajax({
        type: "POST",
        url: '/cgi-bin/koha/svc/club/cancel_enrollment',
        data: { id: id },
        success: function( data ) {
            if ( data.success ) {
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrower.borrowernumber %]', function() {
                    $("body").css("cursor", "default");
                });
            } else {
                alert(_("Unable to cancel enrollment!"));
            }
        },
        dataType: 'json'
    });
    return false;
}
</script>




[% USE AuthorisedValues %]
[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]

<h3>
    Enroll in <i>[% club.name %]</i>
</h3>

<div class="container">
    <form id="patron-enrollment-form">
        <input type="hidden" name="id" value="[% club.id %]" />
        <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
        <fieldset class="rows">
            <ol>
                [% FOREACH f IN club.club_template.club_template_enrollment_fields %]
                    <li>
                        <label>[% f.name %]</label>
                        [% IF f.authorised_value_category %]
                            <select name="[% f.id %]">
                                [% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
                                    <option value="[% a.authorised_value %]">[% a.lib %]</option>
                                [% END %]
                            </select>
                        [% ELSE %]
                            <input type="text" name="[% f.id %]" />
                        [% END %]
                        <span class="hint">[% f.description %]</span>
                    </li>
                [% END %]

                <li>
                    <a href="#" class="btn" onclick="addEnrollment(); return false;"><i class="icon-plus"></i> Enroll</a>
                    <a href="#" onclick="showClubs(); return false;">Cancel</a>
                </li>
            </ol>
        </fieldset>
    </form>
</div>

<script type="text/javascript">
function addEnrollment() {
    $("body").css("cursor", "progress");
    $.ajax({
        type: "POST",
        url: '/cgi-bin/koha/svc/club/enroll',
        data: $( "#patron-enrollment-form" ).serialize(),
        success: function( data ) {
            if ( data.success ) {
                $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
                    $("body").css("cursor", "default");
                });
            } else {
                alert(_("Unable to create enrollment!"));
            }
        },
        dataType: 'json'
    });
    return false;
}

function showClubs() {
    $("body").css("cursor", "progress");
    $('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]&id=[% club.id %]', function() {
        $("body").css("cursor", "default");
    });
}
</script>

Lines 118-123 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+21 lines)
118	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	118	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]
119	[% END %]	119	[% END %]
120	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]	120	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]
		121	[% IF borrower.GetClubEnrollmentsCount \|\| borrower.GetEnrollableClubsCount(1) %]
		122	<li>
		123	<a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
		124	Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %])
		125	</a>
		126	</li>
		127	[% END %]
		128
121	[% IF ( reserves_count ) %]<li><a href="#opac-user-holds">Holds ([% reserves_count %])</a></li>[% END %]	129	[% IF ( reserves_count ) %]<li><a href="#opac-user-holds">Holds ([% reserves_count %])</a></li>[% END %]
122	</ul>	130	</ul>
123		131
Lines 288-293 Link Here
288	[% END # IF issues_count %]	296	[% END # IF issues_count %]
289	</div> <!-- / .opac-user-checkouts -->	297	</div> <!-- / .opac-user-checkouts -->
290		298
		299	[% IF borrower.GetClubEnrollmentsCount \|\| borrower.GetEnrollableClubsCount(1) %]
		300	<div id="opac-user-clubs">
		301	Loading...
		302	</div>
		303	[% END %]
		304
291	[% IF ( OPACFinesTab ) %]	305	[% IF ( OPACFinesTab ) %]
292	<!-- FINES BOX -->	306	<!-- FINES BOX -->
293	[% IF ( BORROWER_INF.amountoverfive ) %]	307	[% IF ( BORROWER_INF.amountoverfive ) %]
Lines 742-747 Link Here
742	[% END %]	756	[% END %]
743		757
744	$( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future	758	$( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
		759
		760	if ( $('#opac-user-clubs').length ) {
		761	$('#opac-user-clubs-tab-link').on('click', function() {
		762	$('#opac-user-clubs').text(_("Loading..."));
		763	$('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		764	});
		765	}
745	});	766	});
746	//]]>	767	//]]>
747	</script>	768	</script>

Lines 61-66 if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preferen Link Here

(-)a/members/moremember.pl (+2 lines)
61	use DateTime;	61	use DateTime;
62	use Koha::DateUtils;	62	use Koha::DateUtils;
63	use Koha::Database;	63	use Koha::Database;
		64	use Koha::Borrowers;
64		65
65	use vars qw($debug);	66	use vars qw($debug);
66		67
Lines 360-365 $template->param( Link Here
360	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,	361	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,
361	relatives_issues_count => $relatives_issues_count,	362	relatives_issues_count => $relatives_issues_count,
362	relatives_borrowernumbers => \@relatives,	363	relatives_borrowernumbers => \@relatives,
		364	borrower => Koha::Borrowers->find( $borrowernumber ),
363	);	365	);
364		366
365	output_html_with_http_headers $input, $cookie, $template->output;	367	output_html_with_http_headers $input, $cookie, $template->output;




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use Koha::Borrowers;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "clubs/clubs-tab.tt",
        query           => $cgi,
        type            => "opac",
        authnotrequired => 0,
    }
);

my $borrowernumber = $cgi->param('borrowernumber');

my $borrower = Koha::Borrowers->find($borrowernumber);

my @enrollments = $borrower->GetClubEnrollments();
my @clubs = $borrower->GetEnrollableClubs( my $opac = 1 );

$template->param(
    enrollments => \@enrollments,
    clubs       => \@clubs,
    borrower    => $borrower,
);

output_html_with_http_headers( $cgi, $cookie, $template->output );




#!/usr/bin/perl

# Copyright 2013 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# Koha is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.

use Modern::Perl;

use CGI;

use C4::Auth;
use C4::Output;
use Koha::Clubs;

my $cgi = new CGI;

my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
    {
        template_name   => "clubs/enroll.tt",
        query           => $cgi,
        type            => "opac",
        authnotrequired => 0,
    }
);

my $id             = $cgi->param('id');
my $borrowernumber = $cgi->param('borrowernumber');

my $club = Koha::Clubs->find($id);

$template->param(
    club           => $club,
    borrowernumber => $borrowernumber,
);

output_html_with_http_headers( $cgi, $cookie, $template->output );

Lines 36-41 use C4::Letters; Link Here

(-)a/opac/opac-user.pl (+2 lines)
36	use C4::Branch; # GetBranches	36	use C4::Branch; # GetBranches
37	use Koha::DateUtils;	37	use Koha::DateUtils;
38	use Koha::Borrower::Debarments qw(IsDebarred);	38	use Koha::Borrower::Debarments qw(IsDebarred);
		39	use Koha::Borrowers;
39		40
40	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';	41	use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
41		42
Lines 394-399 $template->param( Link Here
394	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),	395	AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
395	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),	396	OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
396	failed_holds => $query->param('failed_holds'),	397	failed_holds => $query->param('failed_holds'),
		398	borrower => Koha::Borrowers->find($borrowernumber),
397	);	399	);
398		400
399	output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };	401	output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);
use Koha::Club::Enrollments;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $cgi->cookie('CGISESSID') );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $borrowernumber = C4::Context->userenv->{'number'};

my $id = $cgi->param('id');

my $enrollment = Koha::Club::Enrollments->find($id);
$enrollment->cancel();

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $enrollment ? 1 : 0 } );




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);
use Koha::Club::Enrollment::Field;
use Koha::Club::Enrollment;
use Koha::Clubs;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $cgi->cookie('CGISESSID') );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $borrowernumber = C4::Context->userenv->{'number'};

my $id = $cgi->param('id');

my $enrollment;
if ( $borrowernumber && $id ) {
    my $club = Koha::Clubs->find($id);

    if ( $club->club_template()->is_enrollable_from_opac() ) {
        $enrollment = Koha::Club::Enrollment->new()->set(
            {
                club_id        => $club->id(),
                borrowernumber => $borrowernumber,
                date_enrolled  => \'NOW()',
                date_created   => \'NOW()',
                branchcode     => C4::Context->userenv
                ? C4::Context->userenv->{'branch'}
                : undef,
            }
        )->store();

        my @enrollment_fields = $club->club_template()->club_template_enrollment_fields();

        foreach my $e (@enrollment_fields) {
            Koha::Club::Enrollment::Field->new()->set(
                {
                    club_enrollment_id                => $enrollment->id(),
                    club_template_enrollment_field_id => $e->id(),
                    value                             => $cgi->param( $e->id() ),
                }
            )->store();
        }
    }
}

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $enrollment ? 1 : 0 } );




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);

use Koha::Club::Enrollments;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'enroll' } );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $id = $cgi->param('id');

my $enrollment = Koha::Club::Enrollments->find($id);
$enrollment->cancel() if $enrollment;

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $enrollment ? 1 : 0 } );




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);
use Koha::Clubs;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) = check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'edit_clubs' } );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $success = 0;

my $id = $cgi->param('id');

my $club = Koha::Clubs->find($id);
if ($club) {
    $success = $club->delete();
}

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $success ? 1 : 0 } );




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);
use Koha::Club::Enrollment::Fields;
use Koha::Club::Enrollments;
use Koha::Clubs;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) =
  check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'enroll' } );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $id             = $cgi->param('id');
my $borrowernumber = $cgi->param('borrowernumber');

my $club = Koha::Clubs->find($id);

my $enrollment;
if ($club) {
    $enrollment = Koha::Club::Enrollment->new(
        {
            club_id        => $club->id(),
            borrowernumber => $borrowernumber,
            date_enrolled  => \'NOW()',
            date_created   => \'NOW()',
            branchcode     => C4::Context->userenv ? C4::Context->userenv->{'branch'} : undef,
        }
    )->store();

    if ($enrollment) {
        my @enrollment_fields = $club->club_template()->club_template_enrollment_fields();

        foreach my $e (@enrollment_fields) {
            my $club_enrollment_field = Koha::Club::Enrollment::Field->new(
                {
                    club_enrollment_id                => $enrollment->id(),
                    club_template_enrollment_field_id => $e->id(),
                    value                             => $cgi->param( $e->id() ),
                }
            )->store();
        }
    }
}

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $enrollment ? 1 : 0 } );




#!/usr/bin/perl

# Copyright 2014 ByWater Solutions
#
# This file is part of Koha.
#
# Koha is free software; you can redistribute it and/or modify it under the
# terms of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
#

use Modern::Perl;

use CGI;
use JSON qw(to_json);

use C4::Auth qw(check_cookie_auth);

use Koha::Club::Templates;

my $cgi = new CGI;

my ( $auth_status, $sessionID ) = check_cookie_auth( $cgi->cookie('CGISESSID'), { clubs => 'edit_templates' } );
if ( $auth_status ne "ok" ) {
    exit 0;
}

my $success = 0;

my $id = $cgi->param('id');

my $club_template = Koha::Club::Templates->find($id);
if ($club_template) {
    $success = $club_template->delete();
}

binmode STDOUT, ':encoding(UTF-8)';
print $cgi->header( -type => 'text/plain', -charset => 'UTF-8' );

print to_json( { success => $success ? 1 : 0 } );

Return to bug 12461

Lines 221-227 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-2 / +3 lines)
221	my $all_perms = get_all_subpermissions();	221	my $all_perms = get_all_subpermissions();
222		222
223	my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow	223	my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
224	editcatalogue updatecharges management tools editauthorities serials reports acquisition);	224	editcatalogue updatecharges management tools editauthorities serials reports acquisition clubs);
225		225
226	# We are going to use the $flags returned by checkauth	226	# We are going to use the $flags returned by checkauth
227	# to create the template's parameters that will indicate	227	# to create the template's parameters that will indicate
Lines 244-251 sub get_template_and_user { Link Here
244	$template->param( CAN_user_staffaccess => 1 );	244	$template->param( CAN_user_staffaccess => 1 );
245	$template->param( CAN_user_plugins => 1 );	245	$template->param( CAN_user_plugins => 1 );
246	$template->param( CAN_user_coursereserves => 1 );	246	$template->param( CAN_user_coursereserves => 1 );
247	foreach my $module ( keys %$all_perms ) {	247	$template->param( CAN_user_clubs => 1 );
248		248
		249	foreach my $module ( keys %$all_perms ) {
249	foreach my $subperm ( keys %{ $all_perms->{$module} } ) {	250	foreach my $subperm ( keys %{ $all_perms->{$module} } ) {
250	$template->param( "CAN_user_${module}_${subperm}" => 1 );	251	$template->param( "CAN_user_${module}_${subperm}" => 1 );
251	}	252	}

Lines 782-787 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/Borrower.pm (-3 / +18 lines)
782	{ is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },	782	{ is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
783	);	783	);
784		784
		785	=head2 club_enrollments
		786
		787	Type: has_many
		788
		789	Related object: L<Koha::Schema::Result::ClubEnrollment>
		790
		791	=cut
		792
		793	__PACKAGE__->has_many(
		794	"club_enrollments",
		795	"Koha::Schema::Result::ClubEnrollment",
		796	{ "foreign.borrowernumber" => "self.borrowernumber" },
		797	{ cascade_copy => 0, cascade_delete => 0 },
		798	);
		799
785	=head2 course_instructors	800	=head2 course_instructors
786		801
787	Type: has_many	802	Type: has_many
Lines 1138-1146 Composing rels: L</aqorder_users> -> ordernumber Link Here
1138	__PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber");	1153	__PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber");
1139		1154
1140		1155
1141	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2015-10-06 10:38:42	1156	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
1142	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:AdaMeazHWWCtMM7rvKX9Lg	1157	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wy9KSEiYp/SxYsw+xW0x1g
1143		1158
1144		1159
1145	# You can replace this text with custom content, and it will be preserved on regeneration	1160	# You can replace this text with custom code or comments, and it will be preserved on regeneration
1146	1;	1161	1;

Lines 337-342 __PACKAGE__->has_many( Link Here

(-)a/Koha/Schema/Result/Branch.pm (-2 / +47 lines)
337	{ cascade_copy => 0, cascade_delete => 0 },	337	{ cascade_copy => 0, cascade_delete => 0 },
338	);	338	);
339		339
		340	=head2 club_enrollments
		341
		342	Type: has_many
		343
		344	Related object: L<Koha::Schema::Result::ClubEnrollment>
		345
		346	=cut
		347
		348	__PACKAGE__->has_many(
		349	"club_enrollments",
		350	"Koha::Schema::Result::ClubEnrollment",
		351	{ "foreign.branchcode" => "self.branchcode" },
		352	{ cascade_copy => 0, cascade_delete => 0 },
		353	);
		354
		355	=head2 club_templates
		356
		357	Type: has_many
		358
		359	Related object: L<Koha::Schema::Result::ClubTemplate>
		360
		361	=cut
		362
		363	__PACKAGE__->has_many(
		364	"club_templates",
		365	"Koha::Schema::Result::ClubTemplate",
		366	{ "foreign.branchcode" => "self.branchcode" },
		367	{ cascade_copy => 0, cascade_delete => 0 },
		368	);
		369
		370	=head2 clubs
		371
		372	Type: has_many
		373
		374	Related object: L<Koha::Schema::Result::Club>
		375
		376	=cut
		377
		378	__PACKAGE__->has_many(
		379	"clubs",
		380	"Koha::Schema::Result::Club",
		381	{ "foreign.branchcode" => "self.branchcode" },
		382	{ cascade_copy => 0, cascade_delete => 0 },
		383	);
		384
340	=head2 collections	385	=head2 collections
341		386
342	Type: has_many	387	Type: has_many
Lines 513-520 Composing rels: L</branchrelations> -> categorycode Link Here
513	__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");	558	__PACKAGE__->many_to_many("categorycodes", "branchrelations", "categorycode");
514		559
515		560
516	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-06 15:26:36	561	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
517	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:CGNPB/MkGLOihDThj43/4A	562	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:lvjA8x8u5RKeZQ0+uiLm7A
518		563
519		564
520	# You can replace this text with custom content, and it will be preserved on regeneration	565	# You can replace this text with custom content, and it will be preserved on regeneration

Lines 3559-3564 CREATE TABLE `additional_field_values` ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+124 lines)
3559	CONSTRAINT `afv_fk` FOREIGN KEY (`field_id`) REFERENCES `additional_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE	3559	CONSTRAINT `afv_fk` FOREIGN KEY (`field_id`) REFERENCES `additional_fields` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
3560	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;	3560	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
3561		3561
		3562	--
		3563	-- Table structure for table 'club_templates'
		3564	--
		3565
		3566	CREATE TABLE IF NOT EXISTS club_templates (
		3567	id int(11) NOT NULL AUTO_INCREMENT,
		3568	`name` tinytext NOT NULL,
		3569	description text,
		3570	is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
		3571	is_email_required tinyint(1) NOT NULL DEFAULT '0',
		3572	`branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
		3573	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		3574	date_updated timestamp NULL DEFAULT NULL,
		3575	is_deletable tinyint(1) NOT NULL DEFAULT '1',
		3576	PRIMARY KEY (id),
		3577	KEY ct_branchcode (branchcode),
		3578	CONSTRAINT `club_templates_ibfk_1` FOREIGN KEY (`branchcode`) REFERENCES `branches` (`branchcode`) ON DELETE CASCADE ON UPDATE CASCADE
		3579	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3580
		3581	--
		3582	-- Table structure for table 'clubs'
		3583	--
		3584
		3585	CREATE TABLE IF NOT EXISTS clubs (
		3586	id int(11) NOT NULL AUTO_INCREMENT,
		3587	club_template_id int(11) NOT NULL,
		3588	`name` tinytext NOT NULL,
		3589	description text,
		3590	date_start date DEFAULT NULL,
		3591	date_end date DEFAULT NULL,
		3592	`branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
		3593	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		3594	date_updated timestamp NULL DEFAULT NULL,
		3595	PRIMARY KEY (id),
		3596	KEY club_template_id (club_template_id),
		3597	KEY branchcode (branchcode),
		3598	CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
		3599	CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode)
		3600	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3601
		3602	--
		3603	-- Table structure for table 'club_enrollments'
		3604	--
		3605
		3606	CREATE TABLE IF NOT EXISTS club_enrollments (
		3607	id int(11) NOT NULL AUTO_INCREMENT,
		3608	club_id int(11) NOT NULL,
		3609	borrowernumber int(11) NOT NULL,
		3610	date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		3611	date_canceled timestamp NULL DEFAULT NULL,
		3612	date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
		3613	date_updated timestamp NULL DEFAULT NULL,
		3614	`branchcode` varchar(10) COLLATE utf8_unicode_ci NULL DEFAULT NULL,
		3615	PRIMARY KEY (id),
		3616	KEY club_id (club_id),
		3617	KEY borrowernumber (borrowernumber),
		3618	KEY branchcode (branchcode),
		3619	CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
		3620	CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
		3621	CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE
		3622	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3623
		3624	--
		3625	-- Table structure for table 'club_template_enrollment_fields'
3626	--
3627
3628	CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
3629	id int(11) NOT NULL AUTO_INCREMENT,
3630	club_template_id int(11) NOT NULL,
3631	`name` tinytext NOT NULL,
3632	description text,
3633	authorised_value_category varchar(16) DEFAULT NULL,
3634	PRIMARY KEY (id),
3635	KEY club_template_id (club_template_id),
3636	CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
3637	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3638
3639	--
3640	-- Table structure for table 'club_enrollment_fields'
3641	--
3642
3643	CREATE TABLE IF NOT EXISTS club_enrollment_fields (
3644	id int(11) NOT NULL AUTO_INCREMENT,
3645	club_enrollment_id int(11) NOT NULL,
3646	club_template_enrollment_field_id int(11) NOT NULL,
3647	`value` text NOT NULL,
3648	PRIMARY KEY (id),
3649	KEY club_enrollment_id (club_enrollment_id),
3650	KEY club_template_enrollment_field_id (club_template_enrollment_field_id),
3651	CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
3652	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
3653	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3654
3655	--
3656	-- Table structure for table 'club_template_fields'
3657	--
3658
3659	CREATE TABLE IF NOT EXISTS club_template_fields (
3660	id int(11) NOT NULL AUTO_INCREMENT,
3661	club_template_id int(11) NOT NULL,
3662	`name` tinytext NOT NULL,
3663	description text,
3664	authorised_value_category varchar(16) DEFAULT NULL,
3665	PRIMARY KEY (id),
3666	KEY club_template_id (club_template_id),
3667	CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE
3668	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3669
3670	--
3671	-- Table structure for table 'club_fields'
3672	--
3673
3674	CREATE TABLE IF NOT EXISTS club_fields (
3675	id int(11) NOT NULL AUTO_INCREMENT,
3676	club_template_field_id int(11) NOT NULL,
3677	club_id int(11) NOT NULL,
3678	`value` text,
3679	PRIMARY KEY (id),
3680	KEY club_template_field_id (club_template_field_id),
3681	KEY club_id (club_id),
3682	CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
3683	CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
3684	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3685
3562	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;	3686	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;
3563	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;	3687	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;
3564	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;	3688	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;

Lines 41-46 use Koha::Borrower::Debarments qw(IsDebarred); Link Here

(-)a/C4/Members.pm (-13 / +4 lines)
41	use Text::Unaccent qw( unac_string );	41	use Text::Unaccent qw( unac_string );
42	use Koha::AuthUtils qw(hash_password);	42	use Koha::AuthUtils qw(hash_password);
43	use Koha::Database;	43	use Koha::Database;
		44	use Koha::Borrowers;
44	use Module::Load;	45	use Module::Load;
45	if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {	46	if ( C4::Context->preference('NorwegianPatronDBEnable') && C4::Context->preference('NorwegianPatronDBEnable') == 1 ) {
46	load Koha::NorwegianPatronDB, qw( NLUpdateHashedPIN NLEncryptPIN NLSync );	47	load Koha::NorwegianPatronDB, qw( NLUpdateHashedPIN NLEncryptPIN NLSync );
Lines 1413-1432 addresses. Link Here
1413		1414
1414	sub GetFirstValidEmailAddress {	1415	sub GetFirstValidEmailAddress {
1415	my $borrowernumber = shift;	1416	my $borrowernumber = shift;
1416	my $dbh = C4::Context->dbh;
1417	my $sth = $dbh->prepare( "SELECT email, emailpro, B_email FROM borrowers where borrowernumber = ? ");
1418	$sth->execute( $borrowernumber );
1419	my $data = $sth->fetchrow_hashref;
1420		1417
1421	if ($data->{'email'}) {	1418	my $borrower = Koha::Borrowers->find( $borrowernumber );
1422	return $data->{'email'};	1419
1423	} elsif ($data->{'emailpro'}) {	1420	return $borrower->FirstValidEmailAddress();
1424	return $data->{'emailpro'};
1425	} elsif ($data->{'B_email'}) {
1426	return $data->{'B_email'};
1427	} else {
1428	return '';
1429	}
1430	}	1421	}
1431		1422
1432	=head2 GetNoticeEmailAddress	1423	=head2 GetNoticeEmailAddress

Line 0 Link Here

(-)a/Koha/Club.pm (+92 lines)
		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::Branches;
		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::Branches->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;

Line 0 Link Here

(-)a/Koha/Club/Enrollment.pm (+80 lines)
		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	=cut
		56
		57	=head3 club
		58
		59	=cut
		60
		61	sub club {
		62	my ( $self ) = @_;
		63	return Koha::Clubs->find( $self->club_id() );
		64	}
65
66	=head3 type
67
68	=cut
69
70	sub type {
71	return 'ClubEnrollment';
72	}
73
74	=head1 AUTHOR
75
76	Kyle M Hall <kyle@bywatersolutions.com>
77
78	=cut
79
80	1;

Line 0 Link Here

(-)a/Koha/Club/Enrollment/Field.pm (+56 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Enrollment/Fields.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Enrollments.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Field.pm (+66 lines)
		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;

Line 0 Link Here

(-)a/Koha/Club/Fields.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Template.pm (+75 lines)
		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;

Line 0 Link Here

(-)a/Koha/Club/Template/EnrollmentField.pm (+54 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Template/EnrollmentFields.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Template/Field.pm (+54 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Template/Fields.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Club/Templates.pm (+60 lines)
	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;

Line 0 Link Here

(-)a/Koha/Clubs.pm (+94 lines)
		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	=cut
75
76	=head3 type
77
78	=cut
79
80	sub type {
81	return 'Club';
82	}
83
84	sub object_class {
85	return 'Koha::Club';
86	}
87
88	=head1 AUTHOR
89
90	Kyle M Hall <kyle@bywatersolutions.com>
91
92	=cut
93
94	1;

Line 0 Link Here

(-)a/Koha/Schema/Result/Club.pm (+197 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubEnrollment.pm (+201 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubEnrollmentField.pm (+112 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubField.pm (+112 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubTemplate.pm (+195 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubTemplateEnrollmentField.pm (+119 lines)
		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;

Line 0 Link Here

(-)a/Koha/Schema/Result/ClubTemplateField.pm (+119 lines)
		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;

Line 0 Link Here

(-)a/clubs/clubs-add-modify.pl (+104 lines)
		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 );

Line 0 Link Here

(-)a/clubs/clubs.pl (+50 lines)
	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 );

Line 0 Link Here

(-)a/clubs/patron-clubs-tab.pl (+55 lines)
	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::Borrowers;
	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::Borrowers->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 );

Line 0 Link Here

(-)a/clubs/patron-enroll.pl (+50 lines)
	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 );

Line 0 Link Here

(-)a/clubs/templates-add-modify.pl (+150 lines)
		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 );

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_12461.sql (+124 lines)
		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;
		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;
		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;
		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;
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;
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;
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;
124

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt (+142 lines)
		1	[% USE KohaDates %]
		2	[% USE Branches %]
		3	[% USE AuthorisedValues %]
		4	[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]
		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
		10	<script type="text/javascript">
		11	//<![CDATA[
		12
		13	function CheckForm() {
		14	if ( !$("#club-name").val() ) {
		15	alert( _("Name is a required field!") );
		16	return false;
		17	}
		18
		19	return true;
		20	}
		21
		22	//]]>
		23	</script>
		24
		25	</head>
		26
		27	<body id="clubs_add_modify" class="clubs">
		28	[% INCLUDE 'header.inc' %]
		29	[% INCLUDE 'cat-search.inc' %]
		30	<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>
		31
		32	<div class="yui-t7">
		33	<div class="yui-main">
		34	[% IF stored %]
		35	<div class="alert">
		36	<p>Your club was [% IF stored == 'updated' %] updated [% ELSE %] saved [% END %]</p>
		37	<a href="clubs.pl">Return to patron clubs</a>
		38	</div>
		39	[% END %]
		40
		41	<form method="post" onsubmit="return CheckForm()">
		42	<input type="hidden" name="id" value="[% club.id %]" />
		43	<input type="hidden" name="club_template_id" value="[% club_template.id %]" />
		44
		45	<fieldset class="rows">
		46
		47	<legend>
		48	[% IF club %]
		49	Modify club <i>[% club.name %]</i>
		50	[% ELSE %]
		51	Create a new <i>[% club_template.name %]</i> club
		52	[% END %]
		53	</legend>
		54
		55	<ol>
		56	<li>
		57	<label class="required" for="name">Name:</label>
		58	<input id="club-name" name="name" type="text" value="[% club.name %]" />
		59	</li>
		60
		61	<li>
		62	<label for="description">Description:</label>
		63	<input id="club-template-name" name="description" type="text" value="[% club.description %]" />
		64	</li>
65
66	<li>
67	<label for="date_start">Start date:</label>
68	<input name="date_start" id="from" size="10" readonly="readonly" class="datepickerfrom" value="[% club.date_start \| $KohaDates %]">
69	</li>
70
71	<li>
72	<label for="date_end">End date:</label>
73	<input name="date_end" id="to" size="10" readonly="readonly" class="datepickerto" value="[% club.date_end \| $KohaDates %]" >
74	</li>
75
76	<li>
77	<label for="name">Branch:</label>
78	<select name="branchcode" id="club-template-branchcode">
79	<option value="">&nbsp</option>
80	[% FOREACH b IN Branches.GetBranches() %]
81	[% IF b.branchcode == club.branch.branchcode %]
82	<option value="[% b.branchcode %]" selected="selected">[% b.branchname %]</option>
83	[% ELSE %]
84	<option value="[% b.branchcode %]">[% b.branchname %]</option>
85	[% END %]
86	[% END %]
87	</select>
88	</li>
89
90	[% IF club %]
91	[% FOREACH f IN club.club_fields %]
92	<li>
93	<input type="hidden" name="club_template_field_id" value="[% f.club_template_field.id %]" />
94	<input type="hidden" name="club_field_id" value="[% f.id %]" />
95
96	<label for="club_field">[% f.club_template_field.name %]</label>
97	[% IF f.club_template_field.authorised_value_category %]
98	<select name="club_field">
99	[% FOREACH a IN AuthorisedValues.Get( f.club_template_field.authorised_value_category ) %]
100	[% IF a.authorised_value == f.value %]
101	<option value="[% a.authorised_value %]" selected="selected">[% a.lib %]</option>
102	[% ELSE %]
103	<option value="[% a.authorised_value %]">[% a.lib %]</option>
104	[% END %]
105	[% END %]
106	</select>
107	[% ELSE %]
108	<input type="text" name="club_field" value="[% f.value %]" />
109	[% END %]
110	</li>
111	[% END %]
112	[% ELSE %]
113	[% FOREACH f IN club_template.club_template_fields %]
114	<li>
115	<input type="hidden" name="club_template_field_id" value="[% f.id %]" />
116
117	<label for="club_field">[% f.name %]</label>
118	[% IF f.authorised_value_category %]
119	<select name="club_field">
120	[% FOREACH a IN AuthorisedValues.Get( f.authorised_value_category ) %]
121	<option value="[% a.authorised_value %]">[% a.lib %]</option>
122	[% END %]
123	</select>
124	[% ELSE %]
125	<input type="text" name="club_field" />
126	[% END %]
127	</li>
128	[% END %]
129	[% END %]
130
131	</ol>
132
133	</fieldset>
134
135	<input type="submit" class="btn" value="Save" />
136
137	<a href="clubs.pl" class="cancel">Cancel</a>
138	</form>
139	</div>
140	</div>
141
142	[% INCLUDE 'intranet-bottom.inc' %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs.tt (+206 lines)
		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	"aoColumnDefs": [
		15	{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
		16	]
		17	} ));
		18
		19	cTable = $('#clubs-table').dataTable($.extend(true, {}, dataTablesDefaults, {
		20	"aoColumnDefs": [
		21	{ "aTargets": [ -1, -2 ], "bSortable": false, "bSearchable": false },
		22	]
		23	} ));
		24	});
		25
		26	function ConfirmDeleteTemplate( id, name, a ) {
		27	if ( confirm( _("Are you sure you want to delete the club template") + name + "?" ) ) {
		28	$.ajax({
		29	type: "POST",
		30	url: '/cgi-bin/koha/svc/club/template/delete',
		31	data: { id: id },
		32	success: function( data ) {
		33	if ( data.success ) {
		34	tTable.fnDeleteRow(a.closest("tr")[0]);
		35	} else {
		36	alert(_("Unable to delete template!"));
		37	}
		38	},
		39	dataType: 'json'
		40	});
		41	}
		42	}
		43
		44	function ConfirmDeleteClub( id, name, a ) {
		45	if ( confirm( _("Are you sure you want to delete the club ") + name + "?" ) ) {
		46	$.ajax({
		47	type: "POST",
		48	url: '/cgi-bin/koha/svc/club/delete',
		49	data: { id: id },
		50	success: function( data ) {
		51	if ( data.success ) {
		52	cTable.fnDeleteRow(a.closest("tr")[0]);
		53	} else {
		54	alert(_("Unable to delete club!"));
		55	}
		56	},
		57	dataType: 'json'
		58	});
		59	}
		60	}
		61	//]]>
		62	</script>
		63
		64	</head>
65
66	<body id="clubs_clubs" class="clubs">
67	[% INCLUDE 'header.inc' %]
68	[% INCLUDE 'cat-search.inc' %]
69	<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>
70
71	<div class="yui-t7">
72	<div class="yui-main">
73	<h1>Patron clubs</h1>
74
75
76	<h3>Club templates</h3>
77
78	[% IF CAN_user_clubs_edit_templates %]
79	<div class="btn-group">
80	<a class="btn btn-small" href="templates-add-modify.pl"><i class="icon-plus"></i> New club template</a>
81	</div>
82	[% END %]
83
84	<table id="club-templates-table">
85	<thead>
86	<tr>
87	<th>Name</th>
88	<th>Description</th>
89	<th>Public enrollment</th>
90	<th>Email required</th>
91	<th>Branch</th>
92	<th> </th>
93	<th> </th>
94	</tr>
95	</thead>
96
97	<tbody>
98	[% FOREACH t IN club_templates %]
99	<tr>
100	<td>[% t.name %]</td>
101	<td>[% t.description %]</td>
102	<td>
103	[% IF t.is_enrollable_from_opac %]
104	Yes
105	[% ELSE %]
106	No
107	[% END %]
108	</td>
109	<td>
110	[% IF t.is_email_required %]
111	Yes
112	[% ELSE %]
113	No
114	[% END %]
115	</td>
116	<td>[% Branches.GetName( t.branchcode ) %]</td>
117	<td>
118	[% IF CAN_user_clubs_edit_templates %]
119	<a class="btn btn-mini" href="templates-add-modify.pl?id=[% t.id %]">
120	<i class="icon-edit"></i> Edit
121	</a>
122	[% END %]
123	</td>
124	<td>
125	[% IF CAN_user_clubs_edit_templates %]
126	<a class="btn btn-mini" href="#" onclick='ConfirmDeleteTemplate([% t.id %], "[% t.name \| html %]", $(this) ); return false;'>
127	<i class="icon-trash"></i> Delete
128	</a>
129	[% END %]
130	</td>
131	</tr>
132	[% END %]
133	</tbody>
134	</table>
135
136	<h3>Clubs</h3>
137
138	[% IF CAN_user_clubs_edit_clubs %]
139	<div class="btn-group">
140	<div class="btn-group">
141	<button class="btn btn-small dropdown-toggle" data-toggle="dropdown"><i class="icon-plus"></i> New club <span class="caret"></span></button>
142	<ul class="dropdown-menu">
143	[% FOREACH t IN club_templates %]
144	<li><a href="/cgi-bin/koha/clubs/clubs-add-modify.pl?club_template_id=[% t.id %]">[% t.name %]</a></li>
145	[% END %]
146	</ul>
147	</div>
148	</div>
149	[% END %]
150
151	<table id="clubs-table">
152	<thead>
153	<tr>
154	<th>Name</th>
155	<th>Template</th>
156	<th>Description</th>
157	<th>Public enrollment</th>
158	<th>Email required</th>
159	<th>Branch</th>
160	<th> </th>
161	<th> </th>
162	</tr>
163	</thead>
164
165	<tbody>
166	[% FOREACH c IN clubs %]
167	<tr>
168	<td>[% c.name %]</td>
169	<td>[% c.club_template.name %]</td>
170	<td>[% c.description %]</td>
171	<td>
172	[% IF c.club_template.is_enrollable_from_opac %]
173	Yes
174	[% ELSE %]
175	No
176	[% END %]
177	</td>
178	<td>
179	[% IF c.club_template.is_email_required %]
180	Yes
181	[% ELSE %]
182	No
183	[% END %]
184	</td>
185	<td>[% Branches.GetName( c.branchcode ) %]</td>
186	<td>
187	[% IF CAN_user_clubs_edit_clubs %]
188	<a class="btn btn-mini" href="clubs-add-modify.pl?id=[% c.id %]">
189	<i class="icon-edit"></i> Edit
190	</a>
191	[% END %]
192	</td>
193	<td>
194	[% IF CAN_user_clubs_edit_clubs %]
195	<a class="btn btn-mini" href="#" onclick='ConfirmDeleteClub([% c.id %], "[% c.name \| html %]", $(this) ); return false;'>
196	<i class="icon-trash"></i> Delete
197	</a>
198	[% END %]
199	</td>
200	</tr>
201	[% END %]
202	</tbody>
203	</table>
204	</div>
205	</div>
206	[% INCLUDE 'intranet-bottom.inc' %]