Attachment #36098 for bug #12461

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





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::Database->new()->schema()->resultset('Borrower')->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::Branch;

# 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::Branch - Koha Branch Object class

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'Branch';
}

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




package Koha::Branches;

# 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::Branch;

use base qw(Koha::Objects);

=head1 NAME

Koha::Branches

=head1 API

=head2 Class Methods

=cut

=head3 type

=cut

sub type {
    return 'Branch';
}

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

=head1 AUTHOR

Kyle M Hall <kyle@bywatersolutions.com>

=cut

1;




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 106-112 Returns: Link Here

(-)a/Koha/Object.pm (-2 / +2 lines)
106	sub store {	106	sub store {
107	my ($self) = @_;	107	my ($self) = @_;
108		108
109	return $self->_result()->update_or_insert() ? 1 : 0;	109	return $self->_result()->update_or_insert() ? $self : undef;
110	}	110	}
111		111
112	=head3 $object->in_storage();	112	=head3 $object->in_storage();
Lines 190-196 sub set { Link Here
190	}	190	}
191	}	191	}
192		192
193	return $self->_result()->set_columns($properties) ? 1 : undef;	193	return $self->_result()->set_columns($properties) ? $self : undef;
194	}	194	}
195		195
196	=head3 $object->id();	196	=head3 $object->id();

Lines 80-85 my $object = Koha::Objects->find( { keypart1 => $keypart1, keypart2 => $keypart2 Link Here

(-)a/Koha/Objects.pm (+2 lines)
80	sub find {	80	sub find {
81	my ( $self, $id ) = @_;	81	my ( $self, $id ) = @_;
82		82
		83	return unless $id;
		84
83	my $result = $self->_resultset()->find($id);	85	my $result = $self->_resultset()->find($id);
84		86
85	my $object = $self->object_class()->_new_from_dbic( $result );	87	my $object = $self->object_class()->_new_from_dbic( $result );




  data_type: 'varchar'
  default_value: (empty string)
  is_nullable: 0
  size: 32

=head2 authorised_value


  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "category",
  { data_type => "varchar", default_value => "", is_nullable => 0, size => 32 },
  "authorised_value",
  { data_type => "varchar", default_value => "", is_nullable => 0, size => 80 },
  "lib",

);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:IzI/WpMbwvfZ8BpHtRCsiQ


# 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("courses", "course_instructors", "course");


# 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;





  data_type: 'varchar'
  is_nullable: 1
  size: 32

=head2 display_checkout


  "staff_searchable",
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
  "authorised_value_category",
  { data_type => "varchar", is_nullable => 1, size => 32 },
  "display_checkout",
  { data_type => "tinyint", default_value => 0, is_nullable => 0 },
  "category_code",

);


# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0gYkMcSOB7FazRAC67cjsw


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




  { 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;




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

=cut


  "tagsubfield",
  { data_type => "char", is_nullable => 1, size => 1 },
  "authorised_values_category",
  { data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 32 },
);

=head1 PRIMARY KEY

);


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


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

Lines 40-45 sub GetAuthValueDropbox { Link Here

(-)a/Koha/Template/Plugin/AuthorisedValues.pm (+6 lines)
40	return C4::Koha::GetAuthvalueDropbox($category, $default);	40	return C4::Koha::GetAuthvalueDropbox($category, $default);
41	}	41	}
42		42
		43	sub Categories {
		44	my ( $self ) = @_;
		45
		46	return GetAuthorisedValueCategories();
		47	}
		48
43	1;	49	1;
44		50
45	=head1 NAME	51	=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 Encode qw{encode decode}; 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 45-50 use C4::Members::Attributes qw(GetBorrowerAttributes); Link Here

(-)a/circ/circulation.pl (+4 lines)
45	use Koha::Borrower::Debarments qw(GetDebarments IsDebarred);	45	use Koha::Borrower::Debarments qw(GetDebarments IsDebarred);
46	use Koha::DateUtils;	46	use Koha::DateUtils;
47	use Koha::Database;	47	use Koha::Database;
		48	use Koha::Borrowers;
48		49
49	use Date::Calc qw(	50	use Date::Calc qw(
50	Today	51	Today
Lines 617-622 $template->param( picture => 1 ) if $picture; Link Here
617		618
618	my $canned_notes = GetAuthorisedValues("BOR_NOTES");	619	my $canned_notes = GetAuthorisedValues("BOR_NOTES");
619		620
		621	my $schema = Koha::Database->new()->schema();
		622
620	$template->param(	623	$template->param(
621	debt_confirmed => $debt_confirmed,	624	debt_confirmed => $debt_confirmed,
622	SpecifyDueDate => $duedatespec_allow,	625	SpecifyDueDate => $duedatespec_allow,
Lines 625-630 $template->param( Link Here
625	canned_bor_notes_loop => $canned_notes,	628	canned_bor_notes_loop => $canned_notes,
626	debarments => GetDebarments({ borrowernumber => $borrowernumber }),	629	debarments => GetDebarments({ borrowernumber => $borrowernumber }),
627	todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59),	630	todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59),
		631	borrower => Koha::Borrowers->find( $borrowernumber ),
628	);	632	);
629		633
630	output_html_with_http_headers $query, $cookie, $template->output;	634	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();

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 );

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

(-)a/installer/data/mysql/en/mandatory/userflags.sql (-1 / +2 lines)
17	(16,'reports','Allow access to the reports module',0),	17	(16,'reports','Allow access to the reports module',0),
18	(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),	18	(17,'staffaccess','Allow staff members to modify permissions for other staff members',0),
19	(18,'coursereserves','Course reserves',0),	19	(18,'coursereserves','Course reserves',0),
20	(19, 'plugins', 'Koha plugins', '0');	20	(19, 'plugins', 'Koha plugins', '0'),
		21	(20, 'clubs', 'Patron clubs', '0');

Lines 71-75 INSERT INTO permissions (module_bit, code, description) VALUES Link Here

(-)a/installer/data/mysql/en/mandatory/userpermissions.sql (-1 / +4 lines)
71	(19, 'manage', 'Manage plugins ( install / uninstall )'),	71	(19, 'manage', 'Manage plugins ( install / uninstall )'),
72	(19, 'tool', 'Use tool plugins'),	72	(19, 'tool', 'Use tool plugins'),
73	(19, 'report', 'Use report plugins'),	73	(19, 'report', 'Use report plugins'),
74	(19, 'configure', 'Configure plugins')	74	(19, 'configure', 'Configure plugins'),
		75	(20, 'edit_templates', 'Create and update club templates'),
		76	(20, 'edit_clubs', 'Create and update clubs'),
		77	(20, 'enroll', 'Enroll patrons in clubs')
75	;	78	;




    ON DELETE SET NULL ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

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

DROP TABLE IF EXISTS 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(11) 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)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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(11) DEFAULT NULL,
  PRIMARY KEY (id),
  KEY club_id (club_id),
  KEY borrowernumber (borrowernumber),
  KEY branchcode (branchcode)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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) 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 branchcode (branchcode)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

-- --------------------------------------------------------

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

DROP TABLE IF EXISTS 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)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

--
-- Constraints for table `clubs`
--
ALTER TABLE `clubs`
  ADD CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode);

--
-- Constraints for table `club_enrollments`
--
ALTER TABLE `club_enrollments`
  ADD CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;

--
-- Constraints for table `club_enrollment_fields`
--
ALTER TABLE `club_enrollment_fields`
  ADD CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD 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;

--
-- Constraints for table `club_fields`
--
ALTER TABLE `club_fields`
  ADD CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
  ADD CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE;

--
-- Constraints for table `club_templates`
--
ALTER TABLE `club_templates`
  ADD CONSTRAINT club_templates_ibfk_1 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;

--
-- Constraints for table `club_template_enrollment_fields`
--
ALTER TABLE `club_template_enrollment_fields`
  ADD CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;

--
-- Constraints for table `club_template_fields`
--
ALTER TABLE `club_template_fields`
  ADD CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;

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




    SetVersion($DBversion);
}

$DBversion = "3.19.00.XXX";
if ( CheckVersion($DBversion) ) {
    $dbh->do("INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES ('21', 'clubs', 'Patron clubs', '0')");

    $dbh->do("
        INSERT INTO permissions (module_bit, code, description) VALUES
        (21, 'edit_templates', 'Create and update club templates'),
        (21, 'edit_clubs', 'Create and update clubs'),
        (21, 'enroll', 'Enroll patrons in clubs')
    ");

    $dbh->do("
        CREATE TABLE 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(11) 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)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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(11) DEFAULT NULL,
            PRIMARY KEY (id),
            KEY club_id (club_id),
            KEY borrowernumber (borrowernumber),
            KEY branchcode (branchcode)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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) CHARACTER SET utf8 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 branchcode (branchcode)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        CREATE TABLE 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)
        ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    ");

    $dbh->do("
        ALTER TABLE `clubs`
            ADD CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
            ADD CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode);
    ");

    $dbh->do("
        ALTER TABLE `club_enrollments`
            ADD CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
            ADD CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
            ADD CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
    ");

    $dbh->do("
        ALTER TABLE `club_enrollment_fields`
            ADD CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
            ADD 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;
    ");

    $dbh->do("
        ALTER TABLE `club_fields`
            ADD CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
            ADD CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE;
    ");

    $dbh->do("
        ALTER TABLE `club_templates`
            ADD CONSTRAINT club_templates_ibfk_1 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
    ");

    $dbh->do("
        ALTER TABLE `club_template_enrollment_fields`
            ADD CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
    ");

    $dbh->do("
        ALTER TABLE `club_template_fields`
            ADD CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
    ");

   print "Upgrade to $DBversion done (Bug 12461 - Add patron clubs feature)\n";
   SetVersion ($DBversion);
}

=head1 FUNCTIONS

=head2 TableExists($table)

Lines 67-72 $(document).ready(function() { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+22 lines)
67	);	67	);
68	});	68	});
69		69
		70	if ( $('#clubs-tab').length ) {
		71	$('#clubs-tab-link').on('click', function() {
		72	$('#clubs-tab').text(_("Loading..."));
		73	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		74	});
		75	}
70		76
71	[% IF !( CircAutoPrintQuickSlip == 'clear' ) %]	77	[% IF !( CircAutoPrintQuickSlip == 'clear' ) %]
72	// listen submit to trigger qslip on empty checkout	78	// listen submit to trigger qslip on empty checkout
Lines 772-777 No patron matched <span class="ex">[% message %]</span> Link Here
772	[% END %]	778	[% END %]
773	</li>	779	</li>
774		780
		781	[% SET enrollments = borrower.GetClubEnrollmentsCount %]
		782	[% SET enrollable = borrower.GetEnrollableClubsCount %]
		783	[% IF CAN_user_clubs && ( enrollable \|\| enrollments ) %]
		784	<li>
		785	<a id="clubs-tab-link" href="#clubs-tab">
		786	Clubs ([% enrollments %]/[% enrollable %])
		787	</a>
		788	</li>
		789	[% END %]
		790
775	[% IF relatives_issues_count %]	791	[% IF relatives_issues_count %]
776	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>	792	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
777	[% END %]	793	[% END %]
Lines 812-817 No patron matched <span class="ex">[% message %]</span> Link Here
812	</div>	828	</div>
813	[% END %]	829	[% END %]
814		830
		831	[% IF CAN_user_clubs %]
		832	<div id="clubs-tab">
		833	Loading...
		834	</div>
		835	[% END %]
		836
815	[% INCLUDE borrower_debarments.inc %]	837	[% INCLUDE borrower_debarments.inc %]
816		838
817	<div id="reserves">	839	<div id="reserves">




[% USE KohaDates %]
[% USE EncodeUTF8 %]
[% 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>
[% 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">
        <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 | $EncodeUTF8 %]</option>
                                [% ELSE %]
                                    <option value="[% b.branchcode %]">[% b.branchname | $EncodeUTF8 %]</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>
[% 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 EncodeUTF8 %]
[% 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 | $EncodeUTF8 %]</td>
                    <td>[% e.club.description | $EncodeUTF8 %]</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 | $EncodeUTF8 %]</td>
                    <td>[% c.description | $EncodeUTF8 %]</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 EncodeUTF8 %]
[% USE AuthorisedValues %]
[% SET AuthorisedValuesCategories = AuthorisedValues.Categories %]

<h3>
    Enroll in <i>[% club.name | $EncodeUTF8 %]</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>
[% 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 clubss</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 42-47 var MSG_ADD_MESSAGE = _("Add a new message"); Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (+22 lines)
42	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");	42	var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export");
43		43
44	$(document).ready(function() {	44	$(document).ready(function() {
		45	if ( $('#clubs-tab').length ) {
		46	$('#clubs-tab-link').on('click', function() {
		47	$('#clubs-tab').text(_("Loading..."));
		48	$('#clubs-tab').load('/cgi-bin/koha/clubs/patron-clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		49	});
		50	}
		51
45	$('#finesholdsissues').tabs({	52	$('#finesholdsissues').tabs({
46	// Correct table sizing for tables hidden in tabs	53	// Correct table sizing for tables hidden in tabs
47	// http://www.datatables.net/examples/api/tabs_and_scrolling.html	54	// http://www.datatables.net/examples/api/tabs_and_scrolling.html
Lines 424-429 function validate1(date) { Link Here
424	[% END %]	431	[% END %]
425	</li>	432	</li>
426	<li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>	433	<li><a id="debarments-tab-link" href="#reldebarments">[% debarments.size %] Restrictions</a></li>
		434	[% SET enrollments = borrower.GetClubEnrollmentsCount %]
		435	[% SET enrollable = borrower.GetEnrollableClubsCount %]
		436	[% IF CAN_user_clubs && ( enrollments \|\| enrollable ) %]
		437	<li>
		438	<a id="clubs-tab-link" href="#clubs-tab">
		439	Clubs ([% enrollments %]/[% enrollable %])
		440	</a>
		441	</li>
		442	[% END %]
427	</ul>	443	</ul>
428		444
429	[% INCLUDE "checkouts-table.inc" %]	445	[% INCLUDE "checkouts-table.inc" %]
Lines 456-461 function validate1(date) { Link Here
456	[% END %]	472	[% END %]
457	</div>	473	</div>
458		474
		475	[% IF CAN_user_clubs && ( enrollments \|\| enrollable ) %]
		476	<div id="clubs-tab">
		477	Loading...
		478	</div>
		479	[% END %]
		480
459	[% INCLUDE borrower_debarments.inc %]	481	[% INCLUDE borrower_debarments.inc %]
460		482
461	<div id="reserves">	483	<div id="reserves">




[% USE EncodeUTF8 %]
[% 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 | $EncodeUTF8 %]</td>
                    <td>[% e.club.description | $EncodeUTF8 %]</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 | $EncodeUTF8 %]</td>
                    <td>[% c.description | $EncodeUTF8 %]</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 111-116 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (+21 lines)
111	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	111	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]
112	[% END %]	112	[% END %]
113	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]	113	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]
		114	[% IF borrower.GetClubEnrollmentsCount \|\| borrower.GetEnrollableClubsCount(1) %]
		115	<li>
		116	<a id="opac-user-clubs-tab-link" href="#opac-user-clubs">
		117	Clubs ([% borrower.GetClubEnrollmentsCount %]/[% borrower.GetEnrollableClubsCount(1) %])
		118	</a>
		119	</li>
		120	[% END %]
		121
114	[% IF ( reserves_count ) %]<li><a href="#opac-user-holds">Holds ([% reserves_count %])</a></li>[% END %]	122	[% IF ( reserves_count ) %]<li><a href="#opac-user-holds">Holds ([% reserves_count %])</a></li>[% END %]
115	</ul>	123	</ul>
116		124
Lines 280-285 Link Here
280	[% END # IF issues_count %]	288	[% END # IF issues_count %]
281	</div> <!-- / .opac-user-checkouts -->	289	</div> <!-- / .opac-user-checkouts -->
282		290
		291	[% IF borrower.GetClubEnrollmentsCount \|\| borrower.GetEnrollableClubsCount(1) %]
		292	<div id="opac-user-clubs">
		293	Loading...
		294	</div>
		295	[% END %]
		296
283	[% IF ( OPACFinesTab ) %]	297	[% IF ( OPACFinesTab ) %]
284	<!-- FINES BOX -->	298	<!-- FINES BOX -->
285	[% IF ( BORROWER_INF.amountoverfive ) %]	299	[% IF ( BORROWER_INF.amountoverfive ) %]
Lines 727-732 Link Here
727	[% END %]	741	[% END %]
728		742
729	$( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future	743	$( ".suspend-until" ).datepicker({ minDate: 1 }); // Require that "until date" be in the future
		744
		745	if ( $('#opac-user-clubs').length ) {
		746	$('#opac-user-clubs-tab-link').on('click', function() {
		747	$('#opac-user-clubs').text(_("Loading..."));
		748	$('#opac-user-clubs').load('/cgi-bin/koha/clubs/clubs-tab.pl?borrowernumber=[% borrowernumber %]');
		749	});
		750	}
730	});	751	});
731	//]]>	752	//]]>
732	</script>	753	</script>

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

(-)a/members/moremember.pl (-1 / +3 lines)
62	use DateTime;	62	use DateTime;
63	use Koha::DateUtils;	63	use Koha::DateUtils;
64	use Koha::Database;	64	use Koha::Database;
		65	use Koha::Borrowers;
65		66
66	use vars qw($debug);	67	use vars qw($debug);
67		68
Lines 384-390 $template->param( Link Here
384	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,	385	PatronsPerPage => C4::Context->preference("PatronsPerPage") \|\| 20,
385	relatives_issues_count => $relatives_issues_count,	386	relatives_issues_count => $relatives_issues_count,
386	relatives_borrowernumbers => \@relatives,	387	relatives_borrowernumbers => \@relatives,
387	address => $address	388	address => $address,
		389	borrower => Koha::Borrowers->find( $borrowernumber ),
388	);	390	);
389		391
390	output_html_with_http_headers $input, $cookie, $template->output;	392	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 );




use C4::Branch; # GetBranches
use Koha::DateUtils;
use Koha::Borrower::Debarments qw(IsDebarred);
use Koha::Borrowers;

use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';


    patronupdate => $patronupdate,
    OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
    userview => 1,
);

$template->param(
    SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
    AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
    OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
    borrower => Koha::Borrowers->find($borrowernumber),
);

output_html_with_http_headers $query, $cookie, $template->output;




#!/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 1521-1540 addresses. Link Here

(-)a/C4/Members.pm (-13 / +3 lines)
1521		1521
1522	sub GetFirstValidEmailAddress {	1522	sub GetFirstValidEmailAddress {
1523	my $borrowernumber = shift;	1523	my $borrowernumber = shift;
1524	my $dbh = C4::Context->dbh;
1525	my $sth = $dbh->prepare( "SELECT email, emailpro, B_email FROM borrowers where borrowernumber = ? ");
1526	$sth->execute( $borrowernumber );
1527	my $data = $sth->fetchrow_hashref;
1528		1524
1529	if ($data->{'email'}) {	1525	my $borrower = Koha::Database->new()->schema()->resultset('Borrower')->find( $borrowernumber );
1530	return $data->{'email'};	1526
1531	} elsif ($data->{'emailpro'}) {	1527	return $borrower->FirstValidEmailAddress();
1532	return $data->{'emailpro'};
1533	} elsif ($data->{'B_email'}) {
1534	return $data->{'B_email'};
1535	} else {
1536	return '';
1537	}
1538	}	1528	}
1539		1529
1540	=head2 GetNoticeEmailAddress	1530	=head2 GetNoticeEmailAddress

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 3502-3507 CREATE TABLE items_search_fields ( Link Here

(-)a/installer/data/mysql/kohastructure.sql (+178 lines)
3502	ON DELETE SET NULL ON UPDATE CASCADE	3502	ON DELETE SET NULL ON UPDATE CASCADE
3503	) ENGINE=InnoDB DEFAULT CHARSET=utf8;	3503	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3504		3504
		3505	--
		3506	-- Table structure for table 'clubs'
		3507	--
		3508
		3509	DROP TABLE IF EXISTS clubs;
		3510	CREATE TABLE IF NOT EXISTS clubs (
		3511	id int(11) NOT NULL AUTO_INCREMENT,
		3512	club_template_id int(11) NOT NULL,
		3513	`name` tinytext NOT NULL,
		3514	description text,
		3515	date_start date DEFAULT NULL,
		3516	date_end date DEFAULT NULL,
		3517	branchcode varchar(11) DEFAULT NULL,
		3518	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		3519	date_updated timestamp NULL DEFAULT NULL,
		3520	PRIMARY KEY (id),
		3521	KEY club_template_id (club_template_id),
		3522	KEY branchcode (branchcode)
		3523	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3524
		3525	-- --------------------------------------------------------
		3526
		3527	--
		3528	-- Table structure for table 'club_enrollments'
		3529	--
		3530
		3531	DROP TABLE IF EXISTS club_enrollments;
		3532	CREATE TABLE IF NOT EXISTS club_enrollments (
		3533	id int(11) NOT NULL AUTO_INCREMENT,
		3534	club_id int(11) NOT NULL,
		3535	borrowernumber int(11) NOT NULL,
		3536	date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		3537	date_canceled timestamp NULL DEFAULT NULL,
		3538	date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
		3539	date_updated timestamp NULL DEFAULT NULL,
		3540	branchcode varchar(11) DEFAULT NULL,
		3541	PRIMARY KEY (id),
		3542	KEY club_id (club_id),
		3543	KEY borrowernumber (borrowernumber),
		3544	KEY branchcode (branchcode)
		3545	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3546
		3547	-- --------------------------------------------------------
		3548
		3549	--
		3550	-- Table structure for table 'club_enrollment_fields'
		3551	--
		3552
		3553	DROP TABLE IF EXISTS club_enrollment_fields;
		3554	CREATE TABLE IF NOT EXISTS club_enrollment_fields (
		3555	id int(11) NOT NULL AUTO_INCREMENT,
		3556	club_enrollment_id int(11) NOT NULL,
		3557	club_template_enrollment_field_id int(11) NOT NULL,
		3558	`value` text NOT NULL,
		3559	PRIMARY KEY (id),
		3560	KEY club_enrollment_id (club_enrollment_id),
		3561	KEY club_template_enrollment_field_id (club_template_enrollment_field_id)
		3562	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		3563
		3564	-- --------------------------------------------------------
		3565
		3566	--
		3567	-- Table structure for table 'club_fields'
		3568	--
3569
3570	DROP TABLE IF EXISTS club_fields;
3571	CREATE TABLE IF NOT EXISTS club_fields (
3572	id int(11) NOT NULL AUTO_INCREMENT,
3573	club_template_field_id int(11) NOT NULL,
3574	club_id int(11) NOT NULL,
3575	`value` text,
3576	PRIMARY KEY (id),
3577	KEY club_template_field_id (club_template_field_id),
3578	KEY club_id (club_id)
3579	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3580
3581	-- --------------------------------------------------------
3582
3583	--
3584	-- Table structure for table 'club_templates'
3585	--
3586
3587	DROP TABLE IF EXISTS club_templates;
3588	CREATE TABLE IF NOT EXISTS club_templates (
3589	id int(11) NOT NULL AUTO_INCREMENT,
3590	`name` tinytext NOT NULL,
3591	description text,
3592	is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
3593	is_email_required tinyint(1) NOT NULL DEFAULT '0',
3594	branchcode varchar(10) DEFAULT NULL,
3595	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
3596	date_updated timestamp NULL DEFAULT NULL,
3597	is_deletable tinyint(1) NOT NULL DEFAULT '1',
3598	PRIMARY KEY (id),
3599	KEY branchcode (branchcode)
3600	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3601
3602	-- --------------------------------------------------------
3603
3604	--
3605	-- Table structure for table 'club_template_enrollment_fields'
3606	--
3607
3608	DROP TABLE IF EXISTS club_template_enrollment_fields;
3609	CREATE TABLE IF NOT EXISTS club_template_enrollment_fields (
3610	id int(11) NOT NULL AUTO_INCREMENT,
3611	club_template_id int(11) NOT NULL,
3612	`name` tinytext NOT NULL,
3613	description text,
3614	authorised_value_category varchar(16) DEFAULT NULL,
3615	PRIMARY KEY (id),
3616	KEY club_template_id (club_template_id)
3617	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3618
3619	-- --------------------------------------------------------
3620
3621	--
3622	-- Table structure for table 'club_template_fields'
3623	--
3624
3625	DROP TABLE IF EXISTS club_template_fields;
3626	CREATE TABLE IF NOT EXISTS club_template_fields (
3627	id int(11) NOT NULL AUTO_INCREMENT,
3628	club_template_id int(11) NOT NULL,
3629	`name` tinytext NOT NULL,
3630	description text,
3631	authorised_value_category varchar(16) DEFAULT NULL,
3632	PRIMARY KEY (id),
3633	KEY club_template_id (club_template_id)
3634	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
3635
3636	--
3637	-- Constraints for table `clubs`
3638	--
3639	ALTER TABLE `clubs`
3640	ADD CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
3641	ADD CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode);
3642
3643	--
3644	-- Constraints for table `club_enrollments`
3645	--
3646	ALTER TABLE `club_enrollments`
3647	ADD CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
3648	ADD CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
3649	ADD CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
3650
3651	--
3652	-- Constraints for table `club_enrollment_fields`
3653	--
3654	ALTER TABLE `club_enrollment_fields`
3655	ADD CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
3656	ADD 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;
3657
3658	--
3659	-- Constraints for table `club_fields`
3660	--
3661	ALTER TABLE `club_fields`
3662	ADD CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
3663	ADD CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE;
3664
3665	--
3666	-- Constraints for table `club_templates`
3667	--
3668	ALTER TABLE `club_templates`
3669	ADD CONSTRAINT club_templates_ibfk_1 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
3670
3671	--
3672	-- Constraints for table `club_template_enrollment_fields`
3673	--
3674	ALTER TABLE `club_template_enrollment_fields`
3675	ADD CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
3676
3677	--
3678	-- Constraints for table `club_template_fields`
3679	--
3680	ALTER TABLE `club_template_fields`
3681	ADD CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
3682
3505	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;	3683	/!40103 SET TIME_ZONE=@OLD_TIME_ZONE /;
3506	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;	3684	/!40101 SET SQL_MODE=@OLD_SQL_MODE /;
3507	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;	3685	/!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS /;

Lines 9656-9661 if(CheckVersion($DBversion)) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+153 lines)
9656	SetVersion($DBversion);	9656	SetVersion($DBversion);
9657	}	9657	}
9658		9658
		9659	$DBversion = "3.19.00.XXX";
		9660	if ( CheckVersion($DBversion) ) {
		9661	$dbh->do("INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES ('21', 'clubs', 'Patron clubs', '0')");
		9662
		9663	$dbh->do("
		9664	INSERT INTO permissions (module_bit, code, description) VALUES
		9665	(21, 'edit_templates', 'Create and update club templates'),
		9666	(21, 'edit_clubs', 'Create and update clubs'),
		9667	(21, 'enroll', 'Enroll patrons in clubs')
		9668	");
		9669
		9670	$dbh->do("
		9671	CREATE TABLE clubs (
		9672	id int(11) NOT NULL AUTO_INCREMENT,
		9673	club_template_id int(11) NOT NULL,
		9674	`name` tinytext NOT NULL,
		9675	description text,
		9676	date_start date DEFAULT NULL,
		9677	date_end date DEFAULT NULL,
		9678	branchcode varchar(11) DEFAULT NULL,
		9679	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		9680	date_updated timestamp NULL DEFAULT NULL,
		9681	PRIMARY KEY (id),
		9682	KEY club_template_id (club_template_id),
		9683	KEY branchcode (branchcode)
		9684	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		9685	");
		9686
		9687	$dbh->do("
		9688	CREATE TABLE club_enrollments (
		9689	id int(11) NOT NULL AUTO_INCREMENT,
		9690	club_id int(11) NOT NULL,
		9691	borrowernumber int(11) NOT NULL,
		9692	date_enrolled timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
		9693	date_canceled timestamp NULL DEFAULT NULL,
		9694	date_created timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
		9695	date_updated timestamp NULL DEFAULT NULL,
		9696	branchcode varchar(11) DEFAULT NULL,
		9697	PRIMARY KEY (id),
		9698	KEY club_id (club_id),
		9699	KEY borrowernumber (borrowernumber),
		9700	KEY branchcode (branchcode)
		9701	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		9702	");
		9703
		9704	$dbh->do("
		9705	CREATE TABLE club_enrollment_fields (
		9706	id int(11) NOT NULL AUTO_INCREMENT,
		9707	club_enrollment_id int(11) NOT NULL,
		9708	club_template_enrollment_field_id int(11) NOT NULL,
		9709	`value` text NOT NULL,
		9710	PRIMARY KEY (id),
		9711	KEY club_enrollment_id (club_enrollment_id),
		9712	KEY club_template_enrollment_field_id (club_template_enrollment_field_id)
		9713	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
		9714	");
		9715
		9716	$dbh->do("
		9717	CREATE TABLE club_fields (
		9718	id int(11) NOT NULL AUTO_INCREMENT,
		9719	club_template_field_id int(11) NOT NULL,
		9720	club_id int(11) NOT NULL,
		9721	`value` text,
		9722	PRIMARY KEY (id),
9723	KEY club_template_field_id (club_template_field_id),
9724	KEY club_id (club_id)
9725	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
9726	");
9727
9728	$dbh->do("
9729	CREATE TABLE club_templates (
9730	id int(11) NOT NULL AUTO_INCREMENT,
9731	`name` tinytext NOT NULL,
9732	description text,
9733	is_enrollable_from_opac tinyint(1) NOT NULL DEFAULT '0',
9734	is_email_required tinyint(1) NOT NULL DEFAULT '0',
9735	branchcode varchar(10) CHARACTER SET utf8 DEFAULT NULL,
9736	date_created timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
9737	date_updated timestamp NULL DEFAULT NULL,
9738	is_deletable tinyint(1) NOT NULL DEFAULT '1',
9739	PRIMARY KEY (id),
9740	KEY branchcode (branchcode)
9741	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
9742	");
9743
9744	$dbh->do("
9745	CREATE TABLE club_template_enrollment_fields (
9746	id int(11) NOT NULL AUTO_INCREMENT,
9747	club_template_id int(11) NOT NULL,
9748	`name` tinytext NOT NULL,
9749	description text,
9750	authorised_value_category varchar(16) DEFAULT NULL,
9751	PRIMARY KEY (id),
9752	KEY club_template_id (club_template_id)
9753	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
9754	");
9755
9756	$dbh->do("
9757	CREATE TABLE club_template_fields (
9758	id int(11) NOT NULL AUTO_INCREMENT,
9759	club_template_id int(11) NOT NULL,
9760	`name` tinytext NOT NULL,
9761	description text,
9762	authorised_value_category varchar(16) DEFAULT NULL,
9763	PRIMARY KEY (id),
9764	KEY club_template_id (club_template_id)
9765	) ENGINE=InnoDB DEFAULT CHARSET=utf8;
9766	");
9767
9768	$dbh->do("
9769	ALTER TABLE `clubs`
9770	ADD CONSTRAINT clubs_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE,
9771	ADD CONSTRAINT clubs_ibfk_2 FOREIGN KEY (branchcode) REFERENCES branches (branchcode);
9772	");
9773
9774	$dbh->do("
9775	ALTER TABLE `club_enrollments`
9776	ADD CONSTRAINT club_enrollments_ibfk_1 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE,
9777	ADD CONSTRAINT club_enrollments_ibfk_2 FOREIGN KEY (borrowernumber) REFERENCES borrowers (borrowernumber) ON DELETE CASCADE ON UPDATE CASCADE,
9778	ADD CONSTRAINT club_enrollments_ibfk_3 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
9779	");
9780
9781	$dbh->do("
9782	ALTER TABLE `club_enrollment_fields`
9783	ADD CONSTRAINT club_enrollment_fields_ibfk_1 FOREIGN KEY (club_enrollment_id) REFERENCES club_enrollments (id) ON DELETE CASCADE ON UPDATE CASCADE,
9784	ADD 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;
9785	");
9786
9787	$dbh->do("
9788	ALTER TABLE `club_fields`
9789	ADD CONSTRAINT club_fields_ibfk_3 FOREIGN KEY (club_template_field_id) REFERENCES club_template_fields (id) ON DELETE CASCADE ON UPDATE CASCADE,
9790	ADD CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE;
9791	");
9792
9793	$dbh->do("
9794	ALTER TABLE `club_templates`
9795	ADD CONSTRAINT club_templates_ibfk_1 FOREIGN KEY (branchcode) REFERENCES branches (branchcode) ON DELETE SET NULL ON UPDATE CASCADE;
9796	");
9797
9798	$dbh->do("
9799	ALTER TABLE `club_template_enrollment_fields`
9800	ADD CONSTRAINT club_template_enrollment_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
9801	");
9802
9803	$dbh->do("
9804	ALTER TABLE `club_template_fields`
9805	ADD CONSTRAINT club_template_fields_ibfk_1 FOREIGN KEY (club_template_id) REFERENCES club_templates (id) ON DELETE CASCADE ON UPDATE CASCADE;
9806	");
9807
9808	print "Upgrade to $DBversion done (Bug 12461 - Add patron clubs feature)\n";
9809	SetVersion ($DBversion);
9810	}
9811
9659	=head1 FUNCTIONS	9812	=head1 FUNCTIONS
9660		9813
9661	=head2 TableExists($table)	9814	=head2 TableExists($table)

Lines 208-214 sub get_template_and_user { Link Here

(-)a/C4/Auth.pm (-1 / +2 lines)
208	my $all_perms = get_all_subpermissions();	208	my $all_perms = get_all_subpermissions();
209		209
210	my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow	210	my @flagroots = qw(circulate catalogue parameters borrowers permissions reserveforothers borrow
211	editcatalogue updatecharges management tools editauthorities serials reports acquisition);	211	editcatalogue updatecharges management tools editauthorities serials reports acquisition clubs);
212	# We are going to use the $flags returned by checkauth	212	# We are going to use the $flags returned by checkauth
213	# to create the template's parameters that will indicate	213	# to create the template's parameters that will indicate
214	# which menus the user can access.	214	# which menus the user can access.
Lines 231-236 sub get_template_and_user { Link Here
231	$template->param( CAN_user_staffaccess => 1 );	231	$template->param( CAN_user_staffaccess => 1 );
232	$template->param( CAN_user_plugins => 1 );	232	$template->param( CAN_user_plugins => 1 );
233	$template->param( CAN_user_coursereserves => 1 );	233	$template->param( CAN_user_coursereserves => 1 );
		234	$template->param( CAN_user_clubs => 1 );
234	foreach my $module (keys %$all_perms) {	235	foreach my $module (keys %$all_perms) {
235	foreach my $subperm (keys %{ $all_perms->{$module} }) {	236	foreach my $subperm (keys %{ $all_perms->{$module} }) {
236	$template->param( "CAN_user_${module}_${subperm}" => 1 );	237	$template->param( "CAN_user_${module}_${subperm}" => 1 );

Line 0 Link Here

(-)a/Koha/Branch.pm (+52 lines)
	1	package Koha::Branch;
	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::Branch - Koha Branch Object class
	31
	32	=head1 API
	33
	34	=head2 Class Methods
	35
	36	=cut
	37
	38	=head3 type
	39
	40	=cut
	41
	42	sub type {
	43	return 'Branch';
	44	}
	45
	46	=head1 AUTHOR
	47
	48	Kyle M Hall <kyle@bywatersolutions.com>
	49
	50	=cut
	51
	52	1;

Line 0 Link Here

(-)a/Koha/Branches.pm (+58 lines)
	1	package Koha::Branches;
	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::Branch;
	27
	28	use base qw(Koha::Objects);
	29
	30	=head1 NAME
	31
	32	Koha::Branches
	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 'Branch';
	46	}
	47
	48	sub object_class {
	49	return 'Koha::Branch';
	50	}
	51
	52	=head1 AUTHOR
	53
	54	Kyle M Hall <kyle@bywatersolutions.com>
	55
	56	=cut
	57
	58	1;

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;

Lines 34-40 __PACKAGE__->table("authorised_values"); Link Here

(-)a/Koha/Schema/Result/AuthorisedValue.pm (-4 / +4 lines)
34	data_type: 'varchar'	34	data_type: 'varchar'
35	default_value: (empty string)	35	default_value: (empty string)
36	is_nullable: 0	36	is_nullable: 0
37	size: 16	37	size: 32
38		38
39	=head2 authorised_value	39	=head2 authorised_value
40		40
Lines 67-73 __PACKAGE__->add_columns( Link Here
67	"id",	67	"id",
68	{ data_type => "integer", is_auto_increment => 1, is_nullable => 0 },	68	{ data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
69	"category",	69	"category",
70	{ data_type => "varchar", default_value => "", is_nullable => 0, size => 16 },	70	{ data_type => "varchar", default_value => "", is_nullable => 0, size => 32 },
71	"authorised_value",	71	"authorised_value",
72	{ data_type => "varchar", default_value => "", is_nullable => 0, size => 80 },	72	{ data_type => "varchar", default_value => "", is_nullable => 0, size => 80 },
73	"lib",	73	"lib",
Lines 123-130 __PACKAGE__->has_many( Link Here
123	);	123	);
124		124
125		125
126	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-04 19:23:41	126	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
127	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:aaIEvlA6wPG2o0Zx2JGk6A	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

Lines 783-788 __PACKAGE__->belongs_to( Link Here

(-)a/Koha/Schema/Result/Borrower.pm (-3 / +18 lines)
783	{ is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },	783	{ is_deferrable => 1, on_delete => "RESTRICT", on_update => "RESTRICT" },
784	);	784	);
785		785
		786	=head2 club_enrollments
		787
		788	Type: has_many
		789
		790	Related object: L<Koha::Schema::Result::ClubEnrollment>
		791
		792	=cut
		793
		794	__PACKAGE__->has_many(
		795	"club_enrollments",
		796	"Koha::Schema::Result::ClubEnrollment",
		797	{ "foreign.borrowernumber" => "self.borrowernumber" },
		798	{ cascade_copy => 0, cascade_delete => 0 },
		799	);
		800
786	=head2 course_instructors	801	=head2 course_instructors
787		802
788	Type: has_many	803	Type: has_many
Lines 1129-1137 Composing rels: L</course_instructors> -> course Link Here
1129	__PACKAGE__->many_to_many("courses", "course_instructors", "course");	1144	__PACKAGE__->many_to_many("courses", "course_instructors", "course");
1130		1145
1131		1146
1132	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-12-31 14:08:18	1147	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
1133	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:mOTD/GsDpo3RPjUjTHrLRQ	1148	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Wy9KSEiYp/SxYsw+xW0x1g
1134		1149
1135		1150
1136	# You can replace this text with custom content, and it will be preserved on regeneration	1151	# You can replace this text with custom code or comments, and it will be preserved on regeneration
1137	1;	1152	1;

Lines 69-75 __PACKAGE__->table("borrower_attribute_types"); Link Here

(-)a/Koha/Schema/Result/BorrowerAttributeType.pm (-4 / +4 lines)
69		69
70	data_type: 'varchar'	70	data_type: 'varchar'
71	is_nullable: 1	71	is_nullable: 1
72	size: 10	72	size: 32
73		73
74	=head2 display_checkout	74	=head2 display_checkout
75		75
Lines 108-114 __PACKAGE__->add_columns( Link Here
108	"staff_searchable",	108	"staff_searchable",
109	{ data_type => "tinyint", default_value => 0, is_nullable => 0 },	109	{ data_type => "tinyint", default_value => 0, is_nullable => 0 },
110	"authorised_value_category",	110	"authorised_value_category",
111	{ data_type => "varchar", is_nullable => 1, size => 10 },	111	{ data_type => "varchar", is_nullable => 1, size => 32 },
112	"display_checkout",	112	"display_checkout",
113	{ data_type => "tinyint", default_value => 0, is_nullable => 0 },	113	{ data_type => "tinyint", default_value => 0, is_nullable => 0 },
114	"category_code",	114	"category_code",
Lines 162-169 __PACKAGE__->has_many( Link Here
162	);	162	);
163		163
164		164
165	# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21	165	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:54:50
166	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:xFtIJw7nKVVk6dzBVDO60A	166	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:0gYkMcSOB7FazRAC67cjsw
167		167
168		168
169	# You can replace this text with custom content, and it will be preserved on regeneration	169	# You can replace this text with custom content, and it will be preserved on regeneration

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;

Lines 52-58 __PACKAGE__->table("items_search_fields"); Link Here

(-)a/Koha/Schema/Result/ItemsSearchField.pm (-4 / +4 lines)
52	data_type: 'varchar'	52	data_type: 'varchar'
53	is_foreign_key: 1	53	is_foreign_key: 1
54	is_nullable: 1	54	is_nullable: 1
55	size: 16	55	size: 32
56		56
57	=cut	57	=cut
58		58
Lines 66-72 __PACKAGE__->add_columns( Link Here
66	"tagsubfield",	66	"tagsubfield",
67	{ data_type => "char", is_nullable => 1, size => 1 },	67	{ data_type => "char", is_nullable => 1, size => 1 },
68	"authorised_values_category",	68	"authorised_values_category",
69	{ data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 16 },	69	{ data_type => "varchar", is_foreign_key => 1, is_nullable => 1, size => 32 },
70	);	70	);
71		71
72	=head1 PRIMARY KEY	72	=head1 PRIMARY KEY
Lines 104-111 __PACKAGE__->belongs_to( Link Here
104	);	104	);
105		105
106		106
107	# Created by DBIx::Class::Schema::Loader v0.07039 @ 2014-11-04 19:23:41	107	# Created by DBIx::Class::Schema::Loader v0.07040 @ 2015-01-12 09:56:17
108	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:4zpzfz1VNYNVM5M/btiPOA	108	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ksXOlPg5I17uICtnWlKR4w
109		109
110		110
111	# You can replace this text with custom code or comments, and it will be preserved on regeneration	111	# You can replace this text with custom code or comments, and it will be preserved on regeneration

Line 0 Link Here

(-)a/clubs/clubs-add-modify.pl (+103 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
		48	my $club_template_id = $cgi->param('club_template_id');
		49	my $club_template = $club->club_template() \|\| Koha::Club::Templates->find($club_template_id);
		50	$club_template_id \|\|= $club_template->id();
		51
		52	my $date_start = $cgi->param('date_start');
		53	$date_start = $date_start ? dt_from_string($date_start) : undef;
		54	my $date_end = $cgi->param('date_end');
		55	$date_end = $date_end ? dt_from_string($date_end) : undef;
		56
		57	if ( $cgi->param('name') ) { # Update or create club
		58	$club->set(
		59	{
		60	club_template_id => $cgi->param('club_template_id') \|\| undef,
		61	name => $cgi->param('name') \|\| undef,
		62	description => $cgi->param('description') \|\| undef,
		63	branchcode => $cgi->param('branchcode') \|\| undef,
		64	date_start => $date_start,
65	date_end => $date_end,
66	date_updated => dt_from_string(),
67	}
68	)->store();
69
70	my @club_template_field_id = $cgi->param('club_template_field_id');
71	my @club_field_id = $cgi->param('club_field_id');
72	my @club_field = $cgi->param('club_field');
73
74	for ( my $i = 0 ; $i < @club_template_field_id ; $i++ ) {
75	my $club_template_field_id = $club_template_field_id[$i] \|\| undef;
76	my $club_field_id = $club_field_id[$i] \|\| undef;
77	my $club_field = $club_field[$i] \|\| undef;
78
79	my $field =
80	$club_field_id
81	? Koha::Club::Fields->find($club_field_id)
82	: Koha::Club::Field->new();
83
84	$field->set(
85	{
86	club_id => $club->id(),
87	club_template_field_id => $club_template_field_id,
88	value => $club_field,
89	}
90	)->store();
91	}
92
93	$id \|\|= $club->id();
94	}
95
96	$club = Koha::Clubs->find($id);
97
98	$template->param(
99	club_template => $club_template,
100	club => $club,
101	);
102
103	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 );