Attachment #74976 for bug #14570

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

Lines 463-469 C4::Auth - Authenticates Koha users Link Here

(-)a/C4/Auth_with_ldap.pm (-1 lines)
463	\| contactname \| mediumtext \| YES \| \| NULL \| \|	463	\| contactname \| mediumtext \| YES \| \| NULL \| \|
464	\| contactfirstname \| text \| YES \| \| NULL \| \|	464	\| contactfirstname \| text \| YES \| \| NULL \| \|
465	\| contacttitle \| text \| YES \| \| NULL \| \|	465	\| contacttitle \| text \| YES \| \| NULL \| \|
466	\| guarantorid \| int(11) \| YES \| MUL \| NULL \| \|
467	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|	466	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|
468	\| relationship \| varchar(100) \| YES \| \| NULL \| \|	467	\| relationship \| varchar(100) \| YES \| \| NULL \| \|
469	\| ethnicity \| varchar(50) \| YES \| \| NULL \| \|	468	\| ethnicity \| varchar(50) \| YES \| \| NULL \| \|

Lines 758-764 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-1 / +1 lines)
758	my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");	758	my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
759	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	759	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
760	if ( defined $no_issues_charge_guarantees ) {	760	if ( defined $no_issues_charge_guarantees ) {
761	my @guarantees = $patron->guarantees();	761	my @guarantees = map { $_->guarantee } $patron->guarantee_relationships();
762	my $guarantees_non_issues_charges;	762	my $guarantees_non_issues_charges;
763	foreach my $g ( @guarantees ) {	763	foreach my $g ( @guarantees ) {
764	$guarantees_non_issues_charges += $g->account->non_issues_charges;	764	$guarantees_non_issues_charges += $g->account->non_issues_charges;




    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
    if ( defined $no_issues_charge_guarantees ) {
        my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );
        my @guarantees = map { $_->guarantee } $p->guarantee_relationships;
        my $guarantees_non_issues_charges;
        foreach my $g ( @guarantees ) {
            $guarantees_non_issues_charges += $g->account->non_issues_charges;

    $new_borrower->{dateexpiry}      ||= undef if exists $new_borrower->{dateexpiry};
    $new_borrower->{debarred}        ||= undef if exists $new_borrower->{debarred};
    $new_borrower->{sms_provider_id} ||= undef if exists $new_borrower->{sms_provider_id};
    $new_borrower->{guarantorid}     ||= undef if exists $new_borrower->{guarantorid};

    my $patron = Koha::Patrons->find( $new_borrower->{borrowernumber} );


    $data{'dateofbirth'}     = undef if ( not $data{'dateofbirth'} );
    $data{'debarred'}        = undef if ( not $data{'debarred'} );
    $data{'sms_provider_id'} = undef if ( not $data{'sms_provider_id'} );
    $data{'guarantorid'}     = undef if ( not $data{'guarantorid'} );

    # get only the columns of Borrower
    # FIXME Do we really need this check?

            FROM   borrowers
            JOIN   categories USING (categorycode)
            LEFT JOIN (
                SELECT guarantor_id
                FROM relationships
                WHERE guarantor_id IS NOT NULL
                    AND guarantor_id <> 0
            ) as tmp ON borrowers.borrowernumber=tmp.guarantor_id
            LEFT JOIN old_issues USING (borrowernumber)
            LEFT JOIN issues USING (borrowernumber)|;
    if ( $filterpatronlist  ){
        $query .= q| LEFT JOIN patron_list_patrons USING (borrowernumber)|;
    }
    $query .= q| WHERE  category_type <> 'S'
        AND tmp.guarantor_id IS NULL
    |;
    my @query_params;
    if ( $filterbranch && $filterbranch ne "" ) {

Lines 616-622 __END__ Link Here

(-)a/C4/SIP/ILS/Patron.pm (-1 lines)
616	\| contactname \| mediumtext \| YES \| \| NULL \| \|	616	\| contactname \| mediumtext \| YES \| \| NULL \| \|
617	\| contactfirstname \| text \| YES \| \| NULL \| \|	617	\| contactfirstname \| text \| YES \| \| NULL \| \|
618	\| contacttitle \| text \| YES \| \| NULL \| \|	618	\| contacttitle \| text \| YES \| \| NULL \| \|
619	\| guarantorid \| int(11) \| YES \| MUL \| NULL \| \|
620	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|	619	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|
621	\| relationship \| varchar(100) \| YES \| \| NULL \| \|	620	\| relationship \| varchar(100) \| YES \| \| NULL \| \|
622	\| ethnicity \| varchar(50) \| YES \| \| NULL \| \|	621	\| ethnicity \| varchar(50) \| YES \| \| NULL \| \|

Lines 28-33 use C4::Context; Link Here

(-)a/Koha/Item.pm (+1 lines)
28	use Koha::Checkouts;	28	use Koha::Checkouts;
29	use Koha::IssuingRules;	29	use Koha::IssuingRules;
30	use Koha::Item::Transfer;	30	use Koha::Item::Transfer;
		31	use Koha::Biblios;
31	use Koha::Patrons;	32	use Koha::Patrons;
32	use Koha::Libraries;	33	use Koha::Libraries;
33		34

Lines 71-78 sub new { Link Here

(-)a/Koha/Object.pm (-2 / +6 lines)
71	next if not exists $attributes->{$column_name} or defined $attributes->{$column_name};	71	next if not exists $attributes->{$column_name} or defined $attributes->{$column_name};
72	delete $attributes->{$column_name};	72	delete $attributes->{$column_name};
73	}	73	}
74	$self->{_result} = $schema->resultset( $class->_type() )	74
75	->new($attributes);	75	eval {
		76	$self->{_result} =
		77	$schema->resultset( $class->_type() )->new($attributes);
		78	};
		79	Carp::cluck("ERROR: $@") if $@;
76	}	80	}
77		81
78	croak("No _type found! Koha::Object must be subclassed!")	82	croak("No _type found! Koha::Object must be subclassed!")




use C4::Context;
use C4::Log;
use Koha::Checkouts;
use Koha::Old::Checkouts;
use Koha::Database;
use Koha::DateUtils;
use Koha::Holds;
use Koha::Patrons;
use Koha::Patron::Categories;
use Koha::Patron::Relationships;
use Koha::Patron::HouseboundProfile;
use Koha::Patron::HouseboundRole;
use Koha::Patron::Images;
use Koha::Patrons;
use Koha::Virtualshelves;
use Koha::Club::Enrollments;
use Koha::Account;

    return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
}

=head3 image

Returns a Koha::Patron object for this patron's guarantor

=cut

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

    return unless $self->guarantorid();

    return Koha::Patrons->find( $self->guarantorid() );
}

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

    return scalar Koha::Patron::Images->find( $self->borrowernumber );
}

=head3 library

=cut

sub library {
    my ( $self ) = @_;
    return Koha::Library->_new_from_dbic($self->_result->branchcode);
}

=head3 guarantor_relationships

Returns Koha::Patron::Relationships object for this patron's guarantors

Returns the set of relationships for the patrons that are guarantors for this patron.

This is returned instead of a Koha::Patron object because the guarantor
may not exist as a patron in Koha. If this is true, the guarantors name
exists in the Koha::Patron::Relationship object and will have no guarantor_id.

=cut

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

    return Koha::Patron::Relationships->search( { guarantee_id => $self->id } );
}

=head3 guarantee_relationships

Returns Koha::Patron::Relationships object for this patron's guarantors

Returns the set of relationships for the patrons that are guarantees for this patron.

The method returns Koha::Patron::Relationship objects for the sake
of consistency with the guantors method.
A guarantee by definition must exist as a patron in Koha.

=cut

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

    return Koha::Patron::Relationships->search( { guarantor_id => $self->id } );
}

=head3 housebound_profile

=cut

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

    my @guarantors = $self->guarantor_relationships()->guarantors();

    return unless @guarantors;

    my @siblings =
      map { $_->guarantee_relationships()->guarantees() } @guarantors;

    return unless @siblings;

    my %seen;
    @siblings =
      grep { !$seen{ $_->id }++ && ( $_->id != $self->id ) } @siblings;

    return wantarray ? @siblings : Koha::Patrons->search( { borrowernumber => { -in => [ map { $_->id } @siblings ] } } );
    );
}

=head3 merge_with




package Koha::Patron::Relationship;

# 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::Patron::Relationship - A class to represent relationships between patrons

Patrons in Koha may be guarantors or guarantees. This class models that relationship
and provides a way to access those relationships.

=head1 API

=head2 Class Methods

=cut

=head3 guarantor

Returns the Koha::Patron object for the guarantor, if there is one

=cut

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

    return unless $self->guarantor_id;

    return scalar Koha::Patrons->find( $self->guarantor_id );
}

=head3 guarantee

Returns the Koha::Patron object for the guarantee

=cut

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

    return scalar Koha::Patrons->find( $self->guarantee_id );
}

=head3 type

=cut

sub _type {
    return 'Relationship';
}

1;




package Koha::Patron::Relationships;

# 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 List::MoreUtils qw( uniq );

use Koha::Database;
use Koha::Patrons;
use Koha::Patron::Relationship;

use base qw(Koha::Objects);

=head1 NAME

Koha::Patron::Relationships - Koha Patron Relationship Object set class

=head1 API

=head2 Class Methods

=cut

=head3 guarantors

Returns all the guarantors in this set of relationships as a list of Koha::Patron objects
or as a Koha::Patrons object depending on the calling context

=cut

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

    my $rs = $self->_resultset();

    my @guarantor_ids = $rs->get_column('guarantor_id')->all();
    # Guarantors may not have a guarantor_id, strip out undefs
    @guarantor_ids = grep { defined $_ } @guarantor_ids;
    @guarantor_ids = uniq( @guarantor_ids );

    my $guarantors = Koha::Patrons->search( { borrowernumber => \@guarantor_ids } );

    return wantarray ? $guarantors->as_list : $guarantors;
}

=head3 guarantees

Returns all the guarantees in this set of relationships as a list of Koha::Patron objects
or as a Koha::Patrons object depending on the calling context

=cut

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

    my $rs = $self->_resultset();

    my @guarantee_ids = uniq( $rs->get_column('guarantee_id')->all() );

    my $guarantees = Koha::Patrons->search( { borrowernumber => \@guarantee_ids } );

    return wantarray ? $guarantees->as_list : $guarantees;
}

=cut

=head3 type

=cut

sub _type {
    return 'Relationship';
}

sub object_class {
    return 'Koha::Patron::Relationship';
}

1;




    );
}

=head3 guarantor

Returns a Koha::Patron object for this borrower's guarantor

=cut

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

    return Koha::Patrons->find( $self->guarantorid() );
}

=head3 search_patrons_to_anonymise

    my $patrons = Koha::Patrons->search_patrons_to_anonymise( { before => $older_than_date, [ library => $library ] } );

Lines 213-218 sub import_patrons { Link Here

(-)a/Koha/Patrons/Import.pm (+23 lines)
213	next LINE;	213	next LINE;
214	}	214	}
215		215
		216	my $relationship = $borrower{relationship};
		217	my $guarantor_id = $borrower{guarantor_id};
		218	my $guarantor_firstname = $borrower{guarantor_firstname};
		219	my $guarantor_surname = $borrower{guarantor_surname};
		220	delete $borrower{relationship};
		221	delete $borrower{guarantor_id};
		222	delete $borrower{guarantor_firstname};
		223	delete $borrower{guarantor_surname};
		224
216	if ($borrowernumber) {	225	if ($borrowernumber) {
217		226
218	# borrower exists	227	# borrower exists
Lines 348-353 sub import_patrons { Link Here
348	);	357	);
349	}	358	}
350	}	359	}
		360
		361	# Add a guarantor if we are given a relationship
		362	if ( $relationship ) {
		363	$guarantor_id \|\|= undef;
		364	Koha::Patron::Relationship->new(
		365	{
		366	guarantee_id => $borrowernumber,
		367	relationship => $relationship,
		368	guarantor_id => $guarantor_id,
		369	firstname => $guarantor_firstname,
		370	surname => $guarantor_surname,
		371	}
		372	)->store();
		373	}
351	}	374	}
352		375
353	return {	376	return {




# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wM40W+toV8ca5LFwinkHxA

__PACKAGE__->belongs_to(
    "guarantor",
    "Koha::Schema::Result::Borrower",
    { borrowernumber => "guarantorid" },
);

__PACKAGE__->add_columns(
    '+lost' => { is_boolean => 1 },
    '+gonenoaddress' => { is_boolean => 1 }




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

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

=head1 NAME

Koha::Schema::Result::Relationship

=cut

use strict;
use warnings;

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

=head1 TABLE: C<relationships>

=cut

__PACKAGE__->table("relationships");

=head1 ACCESSORS

=head2 id

  data_type: 'integer'
  is_auto_increment: 1
  is_nullable: 0

=head2 guarantor_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 1

=head2 guarantee_id

  data_type: 'integer'
  is_foreign_key: 1
  is_nullable: 0

=head2 relationship

  data_type: 'varchar'
  is_nullable: 0
  size: 100

=head2 surname

  data_type: 'mediumtext'
  is_nullable: 1

=head2 firstname

  data_type: 'mediumtext'
  is_nullable: 1

=cut

__PACKAGE__->add_columns(
  "id",
  { data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
  "guarantor_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
  "guarantee_id",
  { data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
  "relationship",
  { data_type => "varchar", is_nullable => 0, size => 100 },
  "surname",
  { data_type => "mediumtext", is_nullable => 1 },
  "firstname",
  { data_type => "mediumtext", is_nullable => 1 },
);

=head1 PRIMARY KEY

=over 4

=item * L</id>

=back

=cut

__PACKAGE__->set_primary_key("id");

=head1 RELATIONS

=head2 guarantee

Type: belongs_to

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

=cut

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

=head2 guarantor

Type: belongs_to

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

=cut

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


# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-05-03 13:19:34
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2Nv437KMrKHvpQleXLOjYw


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

Lines 159-168 Link Here

(-)a/api/v1/swagger/definitions/patron.json (-4 lines)
159	"readOnly": true,	159	"readOnly": true,
160	"description": "If any restriction applies to the patron"	160	"description": "If any restriction applies to the patron"
161	},	161	},
162	"guarantor_id": {
163	"type": ["integer", "null"],
164	"description": "patron_id used for children or professionals to link them to guarantor or organizations"
165	},
166	"staff_notes": {	162	"staff_notes": {
167	"type": ["string", "null"],	163	"type": ["string", "null"],
168	"description": "a note on the patron's account"	164	"description": "a note on the patron's account"




    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
    if ( defined $no_issues_charge_guarantees ) {
        my $guarantees_non_issues_charges = 0;
        my $guarantees = $patron->guarantee_relationships->guarantees;
        while ( my $g = $guarantees->next ) {
            $guarantees_non_issues_charges += $g->account->non_issues_charges;
        }

    : 'circview';

my @relatives;
if ( $patron ) {
    if ( my @guarantors = $patron->guarantor_relationships()->guarantors() ) {
        push( @relatives, $_->id ) for @guarantors;
        push( @relatives, $_->id ) for $patron->siblings();
    } else {
        push( @relatives, $_->id ) for $patron->guarantee_relationships()->guarantees();
            push @relatives, $_->borrowernumber for $patron->guarantees;
        }
    }
}
my $relatives_issues_count =




CREATE TABLE `relationships` (
      id INT(11) NOT NULL AUTO_INCREMENT,
      guarantor_id INT(11) NULL DEFAULT NULL,
      guarantee_id INT(11) NOT NULL,
      relationship VARCHAR(100) COLLATE utf8_unicode_ci NOT NULL,
      surname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
      firstname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
      PRIMARY KEY (id),
      CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
      CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

UPDATE borrowers LEFT JOIN borrowers guarantor ON ( borrowers.guarantorid = guarantor.borrowernumber ) SET borrowers.guarantorid = NULL WHERE guarantor.borrowernumber IS NULL;

INSERT INTO relationships ( guarantor_id, guarantee_id, relationship, surname, firstname ) SELECT guarantorid, borrowernumber, relationship, contactname, contactfirstname FROM borrowers WHERE guarantorid IS NOT NULL OR contactname != "";

ALTER TABLE borrowers DROP guarantorid, DROP relationship, DROP contactname, DROP contactfirstname, DROP contacttitle;




  `lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card
  `debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)
  `debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of patron
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
  `guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
  `sex` varchar(1) default NULL, -- patron/borrower's gender
  `password` varchar(60) default NULL, -- patron/borrower's encrypted password
  `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions

  `lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card
  `debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)
  `debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of the patron
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
  `guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
  `sex` varchar(1) default NULL, -- patron/borrower's gender
  `password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password
  `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions

  KEY `categorycode` (`categorycode`),
  KEY `branchcode` (`branchcode`),
  UNIQUE KEY `userid` (`userid`),
  KEY `guarantorid` (`guarantorid`),
  KEY `surname_idx` (`surname` (191)),
  KEY `firstname_idx` (`firstname` (191)),
  KEY `othernames_idx` (`othernames` (191)),

  `lost` tinyint(1) DEFAULT NULL,
  `debarred` date DEFAULT NULL,
  `debarredcomment` varchar(255) DEFAULT NULL,
  `contactname` LONGTEXT,
  `contactfirstname` MEDIUMTEXT,
  `contacttitle` MEDIUMTEXT,
  `guarantorid` int(11) DEFAULT NULL,
  `borrowernotes` LONGTEXT,
  `relationship` varchar(100) DEFAULT NULL,
  `sex` varchar(1) DEFAULT NULL,
  `password` varchar(30) DEFAULT NULL,
  `flags` int(11) DEFAULT NULL,

  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

--
-- Table structure for table 'guarantors_guarantees'
--

DROP TABLE IF EXISTS relationships;
CREATE TABLE `relationships` (
      id INT(11) NOT NULL AUTO_INCREMENT,
      guarantor_id INT(11) NULL DEFAULT NULL,
      guarantee_id INT(11) NOT NULL,
      relationship VARCHAR(100) COLLATE utf8_unicode_ci NOT NULL,
      surname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
      firstname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
      PRIMARY KEY (id),
      CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
      CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

--
-- Table structure for table `illrequests`
--

Lines 7-13 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/columns.def (-1 lines)
7	<field name="borrowers.othernames">Other name</field>	7	<field name="borrowers.othernames">Other name</field>
8	<field name="borrowers.sex">Gender</field>	8	<field name="borrowers.sex">Gender</field>
9	<field name="borrowers.relationship">Relationship</field>	9	<field name="borrowers.relationship">Relationship</field>
10	<field name="borrowers.guarantorid">Guarantor borrower number</field>
11	<field name="borrowers.streetnumber">Street number</field>	10	<field name="borrowers.streetnumber">Street number</field>
12	<field name="borrowers.streettype">Street type</field>	11	<field name="borrowers.streettype">Street type</field>
13	<field name="borrowers.address">Address</field>	12	<field name="borrowers.address">Address</field>




[% SET NorwegianPatronDBEnable = Koha.Preference( 'NorwegianPatronDBEnable' ) %]
<div id="toolbar" class="btn-toolbar">
    [% IF CAN_user_borrowers_edit_borrowers %]
        <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
            <i class="fa fa-pencil"></i> Edit
        </a>
            <a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]">
        [% END %]
        <i class="fa fa-pencil"></i> Edit</a>
    [% END %]

    [% IF CAN_user_borrowers_edit_borrowers %]
        [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
            <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
        [% END %]

        <a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
        [% END %]
        <a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&amp;borrowernumber=[% patron.borrowernumber %]&amp;categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
    [% END %]


Lines 807-813 No patron matched <span class="ex">[% message \| html %]</span> Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
807	</li>	807	</li>
808		808
809	[% IF relatives_issues_count %]	809	[% IF relatives_issues_count %]
810	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>	810	<li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count %] Relatives' checkouts</a></li>
811	[% END %]	811	[% END %]
812		812
813	<li>	813	<li>




[% USE Asset %]
[% USE To %]
[% USE Koha %]
[% USE KohaDates %]
[% USE Branches %]

	</fieldset>
[% END # hide fieldset %]

[% IF show_guarantor || guarantor %]
    [% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
    <fieldset class="rows">
        <legend>Guarantor information</legend>

        <span id="guarantor_relationships">
            [% FOREACH r IN relationships %]
                <fieldset class="rows">
                    <ol>
                        [% IF category_type == 'P' %]
                            [% IF ( r.guarantor_id ) %]
                                <li id="contact-details">
                            [% ELSE %]
                                <li id="contact-details" style="display: none">
                            [% END %]
                                <span class="label">Organization #:</span> [% IF ( r.guarantor_id ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>[% END %]
                            </li>

                            <li>
                                <label for="guarantor_surname">Organization name: </label>
                                [% IF ( r.guarantor_id ) %]
                                    <span>[% r.guarantor.surname %]</span>
                                [% END %]
                            </li>
                        [% ELSE %]
                            [% IF ( r.guarantor_id ) %]
                                <li id="contact-details">
                            [% ELSE %]
                                <li id="contact-details" style="display: none">
                            [% END %]

                                <span class="label">Patron #:</span>
                                [% IF ( r.guarantor_id ) %]
                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>
                                [% END %]

                            </li>

                            [% IF r.surname || r.guarantor.surname %]
                                <li>
                                    <label for="guarantor_surname">Surname: </label>
                                    <span>[% r.surname || r.guarantor.surname %]</span>
                                </li>
                            [% END %]

                            [% IF r.firstname || r.guarantor.firstname  %]
                                <li>
                                    <label for="guarantor_firstname">First name: </label>
                                    <span>[% r.firstname || r.guarantor.firstname %]</span>
                                </li>
                            [% END %]

                            <li>
                                <label for="relationship">Relationship: </label>
                                <span>[% r.relationship %]</span>
                            </li>

                            <li>
                                <label for="delete_guarantor">Delete: </label>
                                <input type="checkbox" name="delete_guarantor" value="[% r.id %]" />
                            </li>
                        [% END %]
                    </ol>
                </fieldset>
            [% END # END relationships foreach %]
        </span>

        <fieldset class="rows guarantor" id="guarantor_template">
            <ol>
                <li class="guarantor_id">
                    <span class="label">Patron #:</span>
                    <span class="new_guarantor_id_text"></span>
                    <input type="hidden" class="new_guarantor_id" name="new_guarantor_id" value=""/>
                </li>

                <li>
                    <label for="guarantor_surname">Surname: </label>
                    <span class="new_guarantor_surname_text"></span>
                    <input type="hidden" class="new_guarantor_surname" name="new_guarantor_surname" value=""/>
                </li>

                <li>
                    <label for="guarantor_firstname">First name: </label>
                    <span class="new_guarantor_firstname_text"></span>
                    <input type="hidden" class="new_guarantor_firstname" name="new_guarantor_firstname" value=""/>
                </li>

                <li>
                    <label for="guarantor_relationship">Relationship: </label>
                    <select class="new_guarantor_relationship" name="new_guarantor_relationship">
                        [% FOREACH pr IN possible_relationships.split('\|') %]
                            <option value="[% pr %]">[% pr %]</option>
                        [% END %]
                    </select>
                </li>

                <li>
                    <label for="guarantor_cancel">&nbsp;</label>
                    <span><a href="#" class="guarantor_cancel">Cancel</a></span>
                </li>
            </ol>
        </fieldset>

        <fieldset class="rows">
            <legend>Add new guarantor</legend>
            <ol>
                <input type="hidden" id="guarantor_id" value=""/>

                [% IF catetory_type == 'P' %]
                    <li>
                        <label for="guarantor_surname">Organization name: </label>
                        <input name="guarantor_surname" id="guarantor_surname" type="hidden" size="20"/>
                    </li>
                [% ELSE %]
                    <li>
                        <label for="guarantor_surname">Surname: </label>
                        <input name="guarantor_surname" id="guarantor_surname" type="text" size="20" />
                    </li>

                    <li>
                        <label for="guarantor_firstname">First name: </label>
                        <input name="guarantor_firstname" id="guarantor_firstname" type="text" size="20" />
                    </li>

                    [% IF ( possible_relationships ) %]
                        <li>
                            <label for="relationship">Relationship: </label>
                            <select name="relationship" id="relationship" >
                                [% FOREACH pr IN possible_relationships.split('\|') %]
                                    <option value="[% pr %]">[% pr %]</option>
                                [% END %]
                            </select>
                        </li>
                    [% END %]
                [% END %]
            </select>
            <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
        </li>
    [% END %]
        </ol>
    </fieldset>

                <li>
                    <span class="label">&nbsp;</span>
                    <a href="#" id="guarantor_add" class="btn btn-sm"><i class="fa fa-plus"></i> Add guarantor</a>
                    <a href="#" id="guarantor_search" class="btn btn-sm"><i class="fa fa-search"></i> Set to patron</a>
                    <a href="#" id="guarantor_clear">Clear</a>
                </li>

                [% IF relationships && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
                    <li>
                        <label for="privacy_guarantor_checkouts">Show checkouts to guarantors</label>
                        <select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
                            [% IF privacy_guarantor_checkouts %]
                                <option value="0">No</option>
                                <option value="1" selected>Yes</option>
                            [% ELSE %]
                                <option value="0" selected>No</option>
                                <option value="1">Yes</option>
                            [% END %]
                        </select>
                        <div class="hint">Allow guarantors of this patron to view this patron's checkouts from the OPAC</div>
                    </li>
                [% END %]
            </ol>
        </fieldset>
    </fieldset>
[% END %]


[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
    [% IF Koha.Preference( 'AddressFormat' ) %]
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]

                    update_category_code( category_code );
                }
            [% END %]

            [% IF guarantor %]
                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) %] );
                $('#guarantor_add').ready(function() {
                    $('#guarantor_add').click();
                });
            [% END %]

        });

        function update_cardnumber_warning(size){




            <li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %]  </a></li>[% END %]</ul></li>
        [% END %]
    [% ELSE %]
        [% IF guarantees %]
            <li>
                <span class="label">Guarantees:</span>
                <ul>
                    [% FOREACH guarantee IN guarantees %]
                        <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname %] [% guarantee.surname %]</a></li>
                    [% END %]
                </ul>
            </li>
        [% ELSIF guarantor_relationships %]
            [% FOREACH gr IN guarantor_relationships %]
                <li>
                    <span class="label">Guarantor:</span>
                    [% IF gr.guarantor_id %]
                        [% SET guarantor = gr.guarantor %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
                    [% ELSE %]
                        [% gr.firstname %] [% gr.surname %]
                    [% END %]
                </li>
            [% END %]
        [% END %]
    [% END %]
	</ol>




                    [% END %]
                </ul>
            </li>
        [% ELSIF guarantor_relationships %]
            [% FOREACH gr IN guarantor_relationships %]
                <li>
                    <span class="label">Guarantor:</span>
                    [% IF gr.guarantor_id %]
                        [% SET guarantor = gr.guarantor %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
                    [% ELSE %]
                        [% gr.firstname %] [% gr.surname %]
                    [% END %]
                </li>
            [% END %]
        [% END %]
    </ol>
</div>
      <div class="action">
        [% IF ( guarantor.borrowernumber ) %]
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1&amp;guarantorid=[% guarantor.borrowernumber %]">Edit</a>
        [% ELSE %]
        <a href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber %]&amp;step=1">Edit</a>
        [% END %]</div>

</div>

<!-- Begin Upload Patron Image Section -->

    <ul>
        <li><a href="#checkouts">[% issuecount %] Checkout(s)</a></li>
        [% IF relatives_issues_count %]
            <li><a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count %] Relatives' checkouts</a></li>
        [% END %]
        <li><a href="#finesandcharges">Fines &amp; Charges</a></li>
        <li>




    var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
}

function Dopopguarantor(link) {
    var newin=window.open(link,'popup','width=800,height=500,resizable=no,toolbar=false,scrollbars=yes,top');
}

function clear_entry(node) {
    var original = $(node).parent();
    $("textarea", original).attr('value', '');

}

function select_user(borrowernumber, borrower) {
    $('#guarantor_id').val(borrower.borrowernumber);
    $('#guarantor_surname').val(borrower.surname);
    $('#guarantor_firstname').val(borrower.firstname);
        $("#contactname, #contactfirstname, #quick_add_form #contactname, #quick_add_form #contactfirstname").parent().find('span').remove();
    }

    $('#guarantor_add').click();
    form.guarantorid.value = id;
    $('#contact-details, #quick_add_form #contact-details')
        .show()
        .find('span')
        .after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>');

    $(form.contactname)
        .val(borrower.surname)
        .before('<span>' + borrower.surname + '</span>').get(0).type = 'hidden';
    $("#quick_add_form #contactname").val(borrower.surname).before('<span>'+borrower.surname+'</span.').attr({type:"hidden"});
    $(form.contactfirstname,"#quick_add_form #contactfirstname")
        .val(borrower.firstname)
        .before('<span>' + borrower.firstname + '</span>').get(0).type = 'hidden';
    $("#quick_add_form #contactfirstname").val(borrower.firstname).before('<span>'+borrower.firstname+'</span.').attr({type:"hidden"});

    form.streetnumber.value = borrower.streetnumber;
    form.address.value = borrower.address;
    form.address2.value = borrower.address2;
    form.city.value = borrower.city;
    form.state.value = borrower.state;
    form.zipcode.value = borrower.zipcode;
    form.country.value = borrower.country;
    form.branchcode.value = borrower.branchcode;

    $("#quick_add_form #streetnumber").val(borrower.streetnumber);
    $("#quick_add_form #address").val(borrower.address);
    $("#quick_add_form #address2").val(borrower.address2);
    $("#quick_add_form #city").val(borrower.city);
    $("#quick_add_form #state").val(borrower.state);
    $("#quick_add_form #zipcode").val(borrower.zipcode);
    $("#quick_add_form #country").val(borrower.country);
    $("#quick_add_form select[name='branchcode']").val(borrower.branchcode);

    form.guarantorsearch.value = LABEL_CHANGE;
    $("#quick_add_form #guarantorsearch").val(LABEL_CHANGE);

    return 0;
}

    });

    $("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");

    $('#guarantor_template').hide();

    $('#guarantor_search').on('click', function(e) {
        e.preventDefault();
        var newin = window.open('guarantor_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
    });

    $('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
        e.preventDefault();
        $(this).parents('fieldset').first().remove();
    });

    $('#guarantor_add').on('click', function(e) {
        e.preventDefault();
        var fieldset = $('#guarantor_template').clone();
        fieldset.removeAttr('id');

        var guarantor_id = $('#guarantor_id').val();
        if ( guarantor_id ) {
            fieldset.find('.new_guarantor_id').first().val( guarantor_id );
            fieldset.find('.new_guarantor_id_text').first().text( guarantor_id );
        } else {
            fieldset.find('.guarantor_id').first().hide();
        }
        $('#guarantor_id').val("");

        var guarantor_surname = $('#guarantor_surname').val();
        fieldset.find('.new_guarantor_surname').first().val( guarantor_surname );
        fieldset.find('.new_guarantor_surname_text').first().text( guarantor_surname );
        $('#guarantor_surname').val("");

        var guarantor_firstname = $('#guarantor_firstname').val();
        fieldset.find('.new_guarantor_firstname').first().val( guarantor_firstname );
        fieldset.find('.new_guarantor_firstname_text').first().text( guarantor_firstname );
        $('#guarantor_firstname').val("");

        var guarantor_relationship = $('#relationship').val();
        fieldset.find('.new_guarantor_relationship').first().val( guarantor_relationship );
        $('#relationship').find('option:eq(0)').prop('selected', true);;

        $('#guarantor_relationships').append( fieldset );
        fieldset.show();
    });

    $("#guarantor_clear").click(function(e) {
        e.preventDefault();
        $("#contact-details").hide().find('a').remove();
        $("#guarantor_id, #guarantor_surname, #guarantor_firstname").val("");
    });

    $(document.body).on('change','select[name="select_city"]',function(){

Lines 99-105 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-2 / +7 lines)
99	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>	99	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
100	[% END %]	100	[% END %]
101		101
102	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]	102	[% IF patron.guarantor_relationships && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
103	<fieldset class="rows" id="memberentry_privacy">	103	<fieldset class="rows" id="memberentry_privacy">
104	<legend id="privacy_legend">Privacy</legend>	104	<legend id="privacy_legend">Privacy</legend>
105	<ol>	105	<ol>
Lines 118-124 Link Here
118	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>	118	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
119	</span>	119	</span>
120	<span class="hint">	120	<span class="hint">
121	Your guarantor is <i>[% guarantor.firstname %] [% guarantor.surname %]</i>	121	Guaranteed by
		122	[% FOREACH gr IN patron.guarantor_relationships %]
		123	[% SET g = gr.guarantor %]
		124	[% g.firstname \|\| gr.firstname %] [% g.surname \|\| gr.surname %]
		125	[%- IF ! loop.last %], [% END %]
		126	[% END %]
122	</span>	127	</span>
123	</li>	128	</li>
124	</ol>	129	</ol>

Lines 71-77 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-2 / +7 lines)
71	</select>	71	</select>
72	</div>	72	</div>
73		73
74	[% IF borrower.guarantorid && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]	74	[% IF borrower.guarantor_relationships && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
75	<div>	75	<div>
76	<label for="privacy_guarantor_checkouts">Allow your guarantor to view your current checkouts?</label>	76	<label for="privacy_guarantor_checkouts">Allow your guarantor to view your current checkouts?</label>
77	<select name="privacy_guarantor_checkouts">	77	<select name="privacy_guarantor_checkouts">
Lines 84-90 Link Here
84	[% END %]	84	[% END %]
85	</select>	85	</select>
86	<span class="hint">	86	<span class="hint">
87	Your guarantor is <i>[% borrower.guarantor.firstname %] [% borrower.guarantor.surname %]</i>	87	Guaranteed by
		88	[% FOREACH gr IN borrower.guarantor_relationships %]
		89	[% SET g = gr.guarantor %]
		90	[% g.firstname \|\| gr.firstname %] [% g.surname \|\| gr.surname %]
		91	[%- IF ! loop.last %], [% END %]
		92	[% END %]
88	</span>	93	</span>
89	</div>	94	</div>
90	[% END %]	95	[% END %]





                                    <tbody>
                                        [% FOREACH r IN relatives %]
                                            [% FOREACH c IN r.checkouts %]
                                                <tr>
                                                    <td>
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
                                                            [% c.item.biblio.title %][% IF ( c.item.enumchron ) %] [% c.item.enumchron %][% END %]
                                                        </a>
                                                    </td>

                                                    <td>
                                                        [% c.date_due | $KohaDates %]
                                                    </td>

                                                    <td>
                                                        [% c.item.barcode %]
                                                    </td>

                                                    <td>
                                                        [% c.item.itemcallnumber %]
                                                    </td>

                                                    <td>

Lines 102-108 if (C4::Context->preference("IndependentBranches")) { Link Here

(-)a/members/deletemem.pl (-3 / +3 lines)
102		102
103	my $op = $input->param('op') \|\| 'delete_confirm';	103	my $op = $input->param('op') \|\| 'delete_confirm';
104	my $dbh = C4::Context->dbh;	104	my $dbh = C4::Context->dbh;
105	my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);	105	my $is_guarantor = $patron->guarantee_relationships->count;
106	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or $deletelocal == 0) {	106	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or $deletelocal == 0) {
107		107
108	$template->param(	108	$template->param(
Lines 114-121 if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or Link Here
114	if ( $charges > 0 ) {	114	if ( $charges > 0 ) {
115	$template->param(charges => $charges);	115	$template->param(charges => $charges);
116	}	116	}
117	if ($is_guarantor) {	117	if ( $is_guarantor ) {
118	$template->param(guarantees => 1);	118	$template->param( guarantees => 1 );
119	}	119	}
120	if ($deletelocal == 0) {	120	if ($deletelocal == 0) {
121	$template->param(keeplocal => 1);	121	$template->param(keeplocal => 1);




    $template->param( sms_providers => \@providers );
}

my $guarantorid    = $input->param('guarantorid');
my $actionType     = $input->param('actionType') || '';
my $modify         = $input->param('modify');
my $delete         = $input->param('delete');

                                     # isn't a duplicate.  Marking FIXME because this
                                     # script needs to be refactored.
my $nok           = $input->param('nok');
my $guarantorinfo = $input->param('guarantorinfo');
my $step          = $input->param('step') || 0;
my @errors;
my $borrower_data;
my $NoUpdateLogin;
my $userenv = C4::Context->userenv;

## Deal with guarantor stuff
$template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;

my $guarantor_id = $input->param('guarantor_id');
my $guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
$template->param( guarantor => $guarantor );

my @delete_guarantor = $input->param('delete_guarantor');
foreach my $id ( @delete_guarantor ) {
    my $r = Koha::Patron::Relationships->find( $id );
    $r->delete() if $r;
}

## Deal with debarments
$template->param(
    debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );

my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
my @field_check=split(/\|/,$check_BorrowerMandatoryField);
foreach (@field_check) {
    $template->param( "mandatory$_" => 1 );
}
# function to designate unwanted fields
my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
@field_check=split(/\|/,$check_BorrowerUnwantedField);
foreach (@field_check) {
    next unless m/\w/o;
    $template->param( "no$_" => 1 );
}
$template->param( "add" => 1 ) if ( $op eq 'add' );
$template->param( "quickadd" => 1 ) if ( $quickadd );

    }
}

  #recover all data from guarantor address phone ,fax... 
if ( $guarantorid ) {
    if (my $guarantor = Koha::Patrons->find( $guarantorid )) {
        my $guarantordata = $guarantor->unblessed;
        $category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
        $guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
        $newdata{'contactfirstname'}= $guarantordata->{'firstname'};
        $newdata{'contactname'}     = $guarantordata->{'surname'};
        $newdata{'contacttitle'}    = $guarantordata->{'title'};
        if ( $op eq 'add' ) {
	        foreach (qw(streetnumber address streettype address2
                        zipcode country city state phone phonepro mobile fax email emailpro branchcode
                        B_streetnumber B_streettype B_address B_address2
                        B_city B_state B_zipcode B_country B_email B_phone)) {
		        $newdata{$_} = $guarantordata->{$_};
	        }
        }
    }
}

###############test to take the right zipcode, country and city name ##############
# set only if parameter was passed from the form
$newdata{'city'}    = $input->param('city')    if defined($input->param('city'));

	if ($op eq 'insert'){
		# we know it's not a duplicate borrowernumber or there would already be an error
        $borrowernumber = &AddMember(%newdata);
        add_guarantors( $borrowernumber, $input );
        $newdata{'borrowernumber'} = $borrowernumber;

        # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.

                                                                # updating any columns in the borrowers table,
                                                                # which can happen if we're only editing the
                                                                # patron attributes or messaging preferences sections
        add_guarantors( $borrowernumber, $input );
        if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
            C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
        }

        'categoryloop'   => \@categoryloop
      };
}
$template->param(
    typeloop      => \@typeloop,
    no_categories => $no_categories,
);


my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );

  push(@relshipdata, \%row);
}

my %flags = (
    'gonenoaddress' => ['gonenoaddress'],
    'lost'          => ['lost']
);

 
my @flagdata;
foreach ( keys(%flags) ) {
    my $key = $_;
    my %row = (
        'key'  => $key,
        'name' => $flags{$key}[0]
    );
    if ( $data{$key} ) {
        $row{'yes'} = ' checked';
        $row{'no'}  = '';
    }
    else {
        $row{'yes'} = '';
        $row{'no'}  = ' checked';
    }
    push @flagdata, \%row;
}

# get Branch Loop

    $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
}

$template->param( "show_guarantor" => ( $category_type =~ /A|I|S|X/ ) ? 1 : 0 ); # associate with step to know where you are
$debug and warn "memberentry step: $step";
$template->param(%data);
$template->param( "step_$step"  => 1) if $step;	# associate with step to know where u are

  check_member    => $check_member,#to know if the borrower already exist(=>1) or not (=>0) 
  "op$op"   => 1);

$guarantorid = $borrower_data->{'guarantorid'} || $guarantorid;
my $guarantor = $guarantorid ? Koha::Patrons->find( $guarantorid ) : undef;
$template->param(
  patron => $patron, # Used by address include templates now
  nodouble  => $nodouble,
  borrowernumber  => $borrowernumber, #register number
  guarantor   => $guarantor,
  guarantorid => $guarantorid,
  relshiploop => \@relshipdata,
  btitle=> $default_borrowertitle,
  guarantorinfo   => $guarantorinfo,
  flagloop  => \@flagdata,
  category_type =>$category_type,
  modify          => $modify,


}

sub add_guarantors {
    my ( $borrowernumber, $input ) = @_;

    my @new_guarantor_id           = scalar $input->param('new_guarantor_id');
    my @new_guarantor_surname      = scalar $input->param('new_guarantor_surname');
    my @new_guarantor_firstname    = scalar $input->param('new_guarantor_firstname');
    my @new_guarantor_relationship = scalar $input->param('new_guarantor_relationship');

    for ( my $i = 0 ; $i < scalar @new_guarantor_id; $i++ ) {
        my $guarantor_id = $new_guarantor_id[$i];
        my $surname      = $new_guarantor_surname[$i];
        my $firstname    = $new_guarantor_firstname[$i];
        my $relationship = $new_guarantor_relationship[$i];

        if ($guarantor_id) {
            Koha::Patron::Relationship->new(
                {
                    guarantee_id => $borrowernumber,
                    guarantor_id => $guarantor_id,
                    relationship => $relationship
                }
            )->store();
        }
        elsif ($surname) {
            Koha::Patron::Relationship->new(
                {
                    guarantee_id => $borrowernumber,
                    surname      => $surname,
                    firstname    => $firstname,
                    relationship => $relationship
                }
            )->store();
        }
    }
}

# Local Variables:
# tab-width: 8
# End:




}

my @relatives;
my $guarantor_relationships = $patron->guarantor_relationships;
my @guarantees              = $patron->guarantee_relationships->guarantees;
my @guarantors              = $guarantor_relationships->guarantors;
if (@guarantors) {
    push( @relatives, $_->id ) for @guarantors;
    push( @relatives, $_->id ) for $patron->siblings();
        guarantor => {
            firstname => $patron->contactfirstname,
            surname   => $patron->contactname,
        }
    );
} else {
    my @guarantees = $patron->guarantees;
    $template->param( guarantees => \@guarantees );
    push @relatives, $_->borrowernumber for @guarantees;
}
else {
    push( @relatives, $_->id ) for @guarantees;
}
$template->param(
    guarantor_relationships => $guarantor_relationships,
    guarantees              => \@guarantees,
);

my $relatives_issues_count =
  Koha::Database->new()->schema()->resultset('Issue')

Lines 34-39 use C4::Output; Link Here

(-)a/members/update-child.pl (-8 / +13 lines)
34	use C4::Members;	34	use C4::Members;
35	use Koha::Patrons;	35	use Koha::Patrons;
36	use Koha::Patron::Categories;	36	use Koha::Patron::Categories;
		37	use Koha::Patrons;
37		38
38	# use Smart::Comments;	39	# use Smart::Comments;
39		40
Lines 54-60 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
54	my $borrowernumber = $input->param('borrowernumber');	55	my $borrowernumber = $input->param('borrowernumber');
55	my $catcode = $input->param('catcode');	56	my $catcode = $input->param('catcode');
56	my $cattype = $input->param('cattype');	57	my $cattype = $input->param('cattype');
57	my $catcode_multi = $input->param('catcode_multi');	58	my $catcode_multi = $input->param('catcode_multi');
58	my $op = $input->param('op');	59	my $op = $input->param('op');
59		60
60	my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";	61	my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
Lines 71-81 if ( $op eq 'multi' ) { Link Here
71	);	72	);
72	output_html_with_http_headers $input, $cookie, $template->output;	73	output_html_with_http_headers $input, $cookie, $template->output;
73	}	74	}
74
75	elsif ( $op eq 'update' ) {	75	elsif ( $op eq 'update' ) {
76	my $patron = Koha::Patrons->find( $borrowernumber );	76	my $patron = Koha::Patrons->find( $borrowernumber );
77	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );	77	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
78		78
		79	$_->delete() for $patron->guarantor_relationships();
		80
79	my $member = $patron->unblessed;	81	my $member = $patron->unblessed;
80	$member->{'guarantorid'} = 0;	82	$member->{'guarantorid'} = 0;
81	$member->{'categorycode'} = $catcode;	83	$member->{'categorycode'} = $catcode;
Lines 85-98 elsif ( $op eq 'update' ) { Link Here
85	delete $member->{password};	87	delete $member->{password};
86	ModMember(%$member);	88	ModMember(%$member);
87		89
88	if ( $catcode_multi ) {	90	if ($catcode_multi) {
89	$template->param(	91	$template->param(
90	SUCCESS => 1,	92	SUCCESS => 1,
91	borrowernumber => $borrowernumber,	93	borrowernumber => $borrowernumber,
92	);	94	);
93	output_html_with_http_headers $input, $cookie, $template->output;	95	output_html_with_http_headers $input, $cookie, $template->output;
94	} else {	96	}
95	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");	97	else {
		98	print $input->redirect(
		99	"/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"
		100	);
96	}	101	}
97	}	102	}
98		103

Lines 163-174 $verbose and print "The age limit for category $fromcat is $agelimit\n"; Link Here

(-)a/misc/cronjobs/j2a.pl (-12 / +45 lines)
163	my $itsyourbirthday = "$year-$mon-$mday";	163	my $itsyourbirthday = "$year-$mon-$mday";
164		164
165	if ( not $noaction ) {	165	if ( not $noaction ) {
		166	# Start a transaction since we need to delete from relationships and update borrowers atomically
		167	$dbh->{AutoCommit} = 0;
		168
166	if ($mybranch) { #yep, we received a specific branch to work on.	169	if ($mybranch) { #yep, we received a specific branch to work on.
167	$verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";	170	$verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
168	my $query = qq\|	171	my $where = qq\|
169	UPDATE borrowers
170	SET guarantorid ='0',
171	categorycode = ?
172	WHERE dateofbirth <= ?	172	WHERE dateofbirth <= ?
173	AND dateofbirth != '0000-00-00'	173	AND dateofbirth != '0000-00-00'
174	AND branchcode = ?	174	AND branchcode = ?
Lines 177-186 if ( not $noaction ) { Link Here
177	FROM categories	177	FROM categories
178	WHERE category_type = 'C'	178	WHERE category_type = 'C'
179	AND categorycode = ?	179	AND categorycode = ?
180	)\|;	180	)
		181	\|;
		182
		183	my $query = qq\|
		184	DELETE relationships FROM relationships
		185	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		186	$where
		187	\|;
181	my $sth = $dbh->prepare($query);	188	my $sth = $dbh->prepare($query);
		189	$sth->execute( $itsyourbirthday, $mybranch, $fromcat )
		190	or ( $dbh->rollback && die "can't execute" );
		191
		192	$query = qq\|
		193	UPDATE borrowers
		194	SET categorycode = ?
		195	$where
		196	\|;
		197	$sth = $dbh->prepare($query);
182	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )	198	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )
183	or die "can't execute";	199	or ( $dbh->rollback && die "can't execute" );
		200
		201	$dbh->commit;
184		202
185	if ( $res eq '0E0' ) {	203	if ( $res eq '0E0' ) {
186	print "No patrons updated\n";	204	print "No patrons updated\n";
Lines 191-200 if ( not $noaction ) { Link Here
191	}	209	}
192	else { # branch was not supplied, processing all branches	210	else { # branch was not supplied, processing all branches
193	$verbose and print "Looking in all branches for patrons to update from $fromcat to $tocat that were born before $itsyourbirthday\n";	211	$verbose and print "Looking in all branches for patrons to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
194	my $query = qq\|	212	my $where = qq\|
195	UPDATE borrowers
196	SET guarantorid = '0',
197	categorycode = ?
198	WHERE dateofbirth <= ?	213	WHERE dateofbirth <= ?
199	AND dateofbirth!='0000-00-00'	214	AND dateofbirth!='0000-00-00'
200	AND categorycode IN (	215	AND categorycode IN (
Lines 202-211 if ( not $noaction ) { Link Here
202	FROM categories	217	FROM categories
203	WHERE category_type = 'C'	218	WHERE category_type = 'C'
204	AND categorycode = ?	219	AND categorycode = ?
205	)\|;	220	)
		221	\|;
		222
		223	my $query = qq\|
		224	DELETE relationships FROM relationships
		225	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		226	$where
		227	\|;
206	my $sth = $dbh->prepare($query);	228	my $sth = $dbh->prepare($query);
		229	$sth->execute( $itsyourbirthday, $fromcat )
		230	or ( $dbh->rollback && die "can't execute" );
		231
		232	$query = qq\|
		233	UPDATE borrowers
		234	SET categorycode = ?
		235	$where
		236	\|;
		237	$sth = $dbh->prepare($query);
207	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )	238	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )
208	or die "can't execute";	239	or ( $dbh->rollback && die "can't execute" );
		240	$dbh->commit;
209		241
210	if ( $res eq '0E0' ) {	242	if ( $res eq '0E0' ) {
211	print "No patrons updated\n";	243	print "No patrons updated\n";
Lines 267-272 else { Link Here
267	my $sth = $dbh->prepare($query);	299	my $sth = $dbh->prepare($query);
268	$sth->execute( $itsyourbirthday, $fromcat )	300	$sth->execute( $itsyourbirthday, $fromcat )
269	or die "Couldn't execute statement: " . $sth->errstr;	301	or die "Couldn't execute statement: " . $sth->errstr;
		302	$dbh->commit;
270		303
271	while ( my @res = $sth->fetchrow_array() ) {	304	while ( my @res = $sth->fetchrow_array() ) {
272	my $firstname = $res[0];	305	my $firstname = $res[0];

Lines 299-305 elsif ( $action eq 'edit' ) { #Display logged in borrower's data Link Here

(-)a/opac/opac-memberentry.pl (-2 / +2 lines)
299		299
300	$template->param(	300	$template->param(
301	borrower => $borrower,	301	borrower => $borrower,
302	guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(),
303	hidden => GetHiddenFields( $mandatory, 'modification' ),	302	hidden => GetHiddenFields( $mandatory, 'modification' ),
304	csrf_token => Koha::Token->new->generate_csrf({	303	csrf_token => Koha::Token->new->generate_csrf({
305	session_id => scalar $cgi->cookie('CGISESSID'),	304	session_id => scalar $cgi->cookie('CGISESSID'),
Lines 320-326 my $captcha = random_string("CCCCC"); Link Here
320		319
321	$template->param(	320	$template->param(
322	captcha => $captcha,	321	captcha => $captcha,
323	captcha_digest => md5_base64($captcha)	322	captcha_digest => md5_base64($captcha),
		323	patron => Koha::Patrons->find( $borrowernumber ),
324	);	324	);
325		325
326	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };	326	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };

Lines 40-45 use Koha::Holds; Link Here

(-)a/opac/opac-user.pl (-8 / +9 lines)
40	use Koha::Database;	40	use Koha::Database;
41	use Koha::ItemTypes;	41	use Koha::ItemTypes;
42	use Koha::Patron::Attribute::Types;	42	use Koha::Patron::Attribute::Types;
		43	use Koha::Patrons;
43	use Koha::Patron::Messages;	44	use Koha::Patron::Messages;
44	use Koha::Patron::Discharge;	45	use Koha::Patron::Discharge;
45	use Koha::Patrons;	46	use Koha::Patrons;
Lines 76-81 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
76	}	77	}
77	);	78	);
78		79
		80	my $patron = Koha::Patrons->find( $borrowernumber );
		81
79	my %renewed = map { $_ => 1 } split( ':', $query->param('renewed') );	82	my %renewed = map { $_ => 1 } split( ':', $query->param('renewed') );
80		83
81	my $show_priority;	84	my $show_priority;
Lines 338-351 my $patron_messages = Koha::Patron::Messages->search( Link Here
338	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')	341	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
339	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )	342	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
340	{	343	{
341	my @relatives =	344	my @relatives;
342	Koha::Database->new()->schema()->resultset("Borrower")->search(	345	# Filter out guarantees that don't want guarantor to see checkouts
343	{	346	foreach my $gr ( $patron->guarantee_relationships() ) {
344	privacy_guarantor_checkouts => 1,	347	my $g = $gr->guarantee;
345	'me.guarantorid' => $borrowernumber	348	push( @relatives, $g ) if $g->privacy_guarantor_checkouts;
346	},	349	}
347	{ prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
348	);
349	$template->param( relatives => \@relatives );	350	$template->param( relatives => \@relatives );
350	}	351	}
351		352




        lost                => '0',
        debarred            => '2015-04-19',
        debarredcomment     => 'You are debarred',
        contactname         => 'myContactname',
        contactfirstname    => 'myContactfirstname',
        contacttitle        => 'myContacttitle',
        guarantorid         => '123454321',
        borrowernotes       => 'borrowernotes',
        relationship        => 'myRelationship',
        sex                 => 'M',
        password            => 'hfkurhfe976634èj!',
        flags               => '55555',


# patron Accessor tests
subtest 'Accessor tests' => sub {
    plan tests => 60;
    is( $patron->borrowernumber, '12345',                           'borrowernumber accessor returns correct value' );
    is( $patron->cardnumber,     '1234567890',                      'cardnumber accessor returns correct value' );
    is( $patron->surname,        'mySurname',                       'surname accessor returns correct value' );

    is( $patron->lost,           '0',                               'lost accessor returns correct value' );
    is( $patron->debarred,       '2015-04-19',                      'debarred accessor returns correct value' );
    is( $patron->debarredcomment,     'You are debarred',      'debarredcomment accessor returns correct value' );
    is( $patron->contactname,         'myContactname',         'contactname accessor returns correct value' );
    is( $patron->contactfirstname,    'myContactfirstname',    'contactfirstname accessor returns correct value' );
    is( $patron->contacttitle,        'myContacttitle',        'contacttitle accessor returns correct value' );
    is( $patron->guarantorid,         '123454321',             'guarantorid accessor returns correct value' );
    is( $patron->borrowernotes,       'borrowernotes',         'borrowernotes accessor returns correct value' );
    is( $patron->relationship,        'myRelationship',        'relationship accessor returns correct value' );
    is( $patron->sex,                 'M',                     'sex accessor returns correct value' );
    is( $patron->password,            'hfkurhfe976634èj!',    'password accessor returns correct value' );
    is( $patron->flags,               '55555',                 'flags accessor returns correct value' );


# patron Set tests
subtest 'Set tests' => sub {
    plan tests => 60;

    $patron->set(
        {

            lost                => '1',
            debarred            => '2016-04-19',
            debarredcomment     => 'You are still debarred',
            contactname         => 'SmyContactname',
            contactfirstname    => 'SmyContactfirstname',
            contacttitle        => 'SmyContacttitle',
            guarantorid         => '223454321',
            borrowernotes       => 'Sborrowernotes',
            relationship        => 'SmyRelationship',
            sex                 => 'F',
            password            => 'zerzerzer#',
            flags               => '666666',

    is( $patron->lost,                '1',                                'lost field set ok' );
    is( $patron->debarred,            '2016-04-19',                       'debarred field set ok' );
    is( $patron->debarredcomment,     'You are still debarred',           'debarredcomment field set ok' );
    is( $patron->contactname,         'SmyContactname',                   'contactname field set ok' );
    is( $patron->contactfirstname,    'SmyContactfirstname',              'contactfirstname field set ok' );
    is( $patron->contacttitle,        'SmyContacttitle',                  'contacttitle field set ok' );
    is( $patron->guarantorid,         '223454321',                        'guarantorid field set ok' );
    is( $patron->borrowernotes,       'Sborrowernotes',                   'borrowernotes field set ok' );
    is( $patron->relationship,        'SmyRelationship',                  'relationship field set ok' );
    is( $patron->sex,                 'F',                                'sex field set ok' );
    is( $patron->password,            'zerzerzer#',                       'password field set ok' );
    is( $patron->flags,               '666666',                           'flags field set ok' );




use C4::Circulation qw( CanBookBeIssued );
use Koha::Account::Lines;
use Koha::Account::Offsets;
use Koha::Patron::Relationship;

my $schema = Koha::Database->new->schema;
$schema->storage->txn_begin;

        }
    }
);

my $guarantee = $builder->build_object(
    {
        class => 'Koha::Patrons',
        value => {
            patron_category => $patron_category->{categorycode},
            guarantorid => $patron->borrowernumber,
        }
    }
);

my $r = $builder->build_object(
    {
        class => 'Koha::Patron::Relationships',
        value => {
            guarantor_id => $patron->id,
            guarantee_id => $guarantee->id,
            relationship => 'parent',
        }
    }
);

my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );

manualinvoice( $guarantee->id, undef, undef, 'L', 10.00 );
( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );

my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->id })->next();
is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );
is( $accountline->accounttype, "L", "Account type is L" );


Lines 507-513 subtest 'SearchItems test' => sub { Link Here

(-)a/t/db_dependent/Items.t (-1 / +5 lines)
507		507
508	subtest 'Koha::Item(s) tests' => sub {	508	subtest 'Koha::Item(s) tests' => sub {
509		509
510	plan tests => 5;	510	plan tests => 7;
511		511
512	$schema->storage->txn_begin();	512	$schema->storage->txn_begin();
513		513
Lines 546-551 subtest 'Koha::Item(s) tests' => sub { Link Here
546	is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );	546	is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
547	is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );	547	is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
548		548
		549	my $biblio = $item->biblio();
		550	is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
		551	is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
		552
549	$schema->storage->txn_rollback;	553	$schema->storage->txn_rollback;
550	};	554	};
551		555




use Koha::Patron;
use Koha::Patrons;
use Koha::Patron::Categories;
use Koha::Patron::Relationship;
use Koha::Database;
use Koha::DateUtils;
use Koha::Virtualshelves;


subtest 'guarantees' => sub {
    plan tests => 8;
    my $guarantees = $new_patron_1->guarantee_relationships;
    is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );
    is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee relationships' );
    my @guarantees = $new_patron_1->guarantee_relationships;
    is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
    is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );

    my $guarantee_1 = $builder->build({ source => 'Borrower' });
    my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
    my $guarantee_2 = $builder->build({ source => 'Borrower' });
    my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_2->{borrowernumber} } )->store();

    $guarantees = $new_patron_1->guarantee_relationships;
    is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantee_relationships should return a Koha::Patrons result set in a scalar context' );
    is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );
    @guarantees = $new_patron_1->guarantee_relationships;
    is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
    is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );
    map { $_->guarantee->delete } @guarantees;
};

subtest 'category' => sub {

    plan tests => 7;
    my $siblings = $new_patron_1->siblings;
    is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
    my $guarantee_1 = $builder->build( { source => 'Borrower' } );
    my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
    my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
    $siblings = $retrieved_guarantee_1->siblings;
    is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );
    my @siblings = $retrieved_guarantee_1->siblings;
    is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );
    is( $siblings->count,  0,       'guarantee_1 should not have siblings yet' );
    my $guarantee_2 = $builder->build( { source => 'Borrower' } );
    my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_2->{borrowernumber} } )->store();
    my $guarantee_3 = $builder->build( { source => 'Borrower' } );
    my $relationship_3 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_3->{borrowernumber} } )->store();
    $siblings = $retrieved_guarantee_1->siblings;
    is( $siblings->count,               2,                               'guarantee_1 should have 2 siblings' );
    is( $guarantee_2->{borrowernumber}, $siblings->next->borrowernumber, 'guarantee_2 should exist in the guarantees' );




use Koha::Holds;
use Koha::List::Patron;
use Koha::Patrons;
use Koha::Patron::Relationship;

use t::lib::Mocks;
use t::lib::TestBuilder;

my $builder = t::lib::TestBuilder->new;
my $dbh = C4::Context->dbh;

# Remove invalid guarantorid's as long as we have no FK
$dbh->do("UPDATE borrowers b1 LEFT JOIN borrowers b2 ON b2.borrowernumber=b1.guarantorid SET b1.guarantorid=NULL where b1.guarantorid IS NOT NULL AND b2.borrowernumber IS NULL");

my $library1 = $builder->build({
    source => 'Branch',
});

            categorycode=>'STAFFER',
            branchcode => $library3->{branchcode},
            dateexpiry => '2015-01-01',
            guarantorid=> undef,
        },
});
my $bor1inlist = $borrower1->{borrowernumber};

            categorycode=>'STAFFER',
            branchcode => $library3->{branchcode},
            dateexpiry => '2015-01-01',
            guarantorid=> undef,
        },
});


            categorycode=>'KIDclamp',
            branchcode => $library3->{branchcode},
            dateexpiry => '2015-01-01',
            guarantorid=> undef, # will be filled later
        },
});


ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');

ModMember( borrowernumber => $bor1inlist, categorycode => 'CIVILIAN' );
my $relationship = Koha::Patron::Relationship->new( { guarantor_id => $bor1inlist, guarantee_id => $guarantee->{borrowernumber} } )->store();

$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');

ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');
$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');

$relationship->delete();

$builder->build({
        source => 'Issue',


# Test GetBorrowersToExpunge and TrackLastPatronActivity
$dbh->do(q|UPDATE borrowers SET lastseen=NULL|);
$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN' } } );
$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN' } } );
$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN' } } );
$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });
is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );
$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });




#!/usr/bin/perl

# 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 Test::More tests => 67;

use C4::Context;

use t::lib::TestBuilder;

BEGIN {
    use_ok('Koha::Objects');
    use_ok('Koha::Patrons');
    use_ok('Koha::Patron::Relationship');
    use_ok('Koha::Patron::Relationships');
}

# Start transaction
my $dbh = C4::Context->dbh;
$dbh->{AutoCommit} = 0;
$dbh->{RaiseError} = 1;

my $builder = t::lib::TestBuilder->new();

# Father
my $kyle = Koha::Patrons->find(
    $builder->build(
        {
            source => 'Borrower',
            value  => {
                firstname => 'Kyle',
                surname   => 'Hall',
            }
        }
    )->{borrowernumber}
);

# Mother
my $chelsea = Koha::Patrons->find(
    $builder->build(
        {
            source => 'Borrower',
            value  => {
                firstname => 'Chelsea',
                surname   => 'Hall',
            }
        }
    )->{borrowernumber}
);

# Children
my $daria = Koha::Patrons->find(
    $builder->build(
        {
            source => 'Borrower',
            value  => {
                firstname => 'Daria',
                surname   => 'Hall',
            }
        }
    )->{borrowernumber}
);

my $kylie = Koha::Patrons->find(
    $builder->build(
        {
            source => 'Borrower',
            value  => {
                firstname => 'Kylie',
                surname   => 'Hall',
            }
        }
    )->{borrowernumber}
);

Koha::Patron::Relationship->new({ guarantor_id => $kyle->id, guarantee_id => $daria->id, relationship => 'father' })->store();
Koha::Patron::Relationship->new({ guarantor_id => $kyle->id, guarantee_id => $kylie->id, relationship => 'father' })->store();
Koha::Patron::Relationship->new({ guarantor_id => $chelsea->id, guarantee_id => $daria->id, relationship => 'mother' })->store();
Koha::Patron::Relationship->new({ guarantor_id => $chelsea->id, guarantee_id => $kylie->id, relationship => 'mother' })->store();
Koha::Patron::Relationship->new({ firstname => 'John', surname => 'Hall', guarantee_id => $daria->id, relationship => 'grandfather' })->store();
Koha::Patron::Relationship->new({ firstname => 'Debra', surname => 'Hall', guarantee_id => $daria->id, relationship => 'grandmother' })->store();
Koha::Patron::Relationship->new({ firstname => 'John', surname => 'Hall', guarantee_id => $kylie->id, relationship => 'grandfather' })->store();
Koha::Patron::Relationship->new({ firstname => 'Debra', surname => 'Hall', guarantee_id => $kylie->id, relationship => 'grandmother' })->store();

my @gr;

@gr = $kyle->guarantee_relationships();
is( @gr, 2, 'Found 2 guarantee relationships for father' );
is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
is( $gr[0]->relationship, 'father', 'Relationship is father' );
is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );

is( $gr[1]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
is( $gr[1]->relationship, 'father', 'Relationship is father' );
is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );

@gr = $chelsea->guarantee_relationships();
is( @gr, 2, 'Found 2 guarantee relationships for mother' );
is( $gr[0]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
is( $gr[0]->relationship, 'mother', 'Relationship is mother' );
is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[0]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );

is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );

@gr = $daria->guarantor_relationships();
is( @gr, 4, 'Found 4 guarantor relationships for child' );
is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
is( $gr[0]->relationship, 'father', 'Relationship is father' );
is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );

is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
is( $gr[1]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
is( $gr[1]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );

is( $gr[2]->guarantor_id, undef, 'Grandfather has no id, not a Koha patron' );
is( $gr[2]->firstname, 'John', 'Grandfather has first name of John' );
is( $gr[2]->surname, 'Hall', 'Grandfather has surname of Hall' );
is( $gr[2]->guarantor, undef, 'Calling guarantor method for Grandfather returns undef' );

is( $gr[3]->guarantor_id, undef, 'Grandmother has no id, not a Koha patron' );
is( $gr[3]->firstname, 'Debra', 'Grandmother has first name of John' );
is( $gr[3]->surname, 'Hall', 'Grandmother has surname of Hall' );
is( $gr[3]->guarantor, undef, 'Calling guarantor method for Grandmother returns undef' );

my @siblings = $daria->siblings;
is( @siblings, 1, 'Method siblings called in list context returns list' );
is( ref($siblings[0]), 'Koha::Patron', 'List contains a Koha::Patron' );
is( $siblings[0]->firstname, 'Kylie', 'Sibling from list first name matches correctly' );
is( $siblings[0]->surname, 'Hall', 'Sibling from list surname matches correctly' );
is( $siblings[0]->id, $kylie->id, 'Sibling from list patron id matches correctly' );

my $siblings = $daria->siblings;
my $sibling = $siblings->next();
is( ref($siblings), 'Koha::Patrons', 'Calling siblings in scalar context results in a Koha::Patrons object' );
is( ref($sibling), 'Koha::Patron', 'Method next returns a Koha::Patron' );
is( $sibling->firstname, 'Kylie', 'Sibling from scalar first name matches correctly' );
is( $sibling->surname, 'Hall', 'Sibling from scalar surname matches correctly' );
is( $sibling->id, $kylie->id, 'Sibling from scalar patron id matches correctly' );

1;

Lines 62-67 my $extended = C4::Context->preference('ExtendedPatronAttributes'); Link Here

(-)a/tools/import_borrowers.pl (-1 / +1 lines)
62		62
63	my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } Koha::Patrons->columns();	63	my @columnkeys = map { $_ ne 'borrowernumber' ? $_ : () } Koha::Patrons->columns();
64	push( @columnkeys, 'patron_attributes' ) if $extended;	64	push( @columnkeys, 'patron_attributes' ) if $extended;
		65	push( @columnkeys, qw( relationship guarantor_id guarantor_firstname guarantor_surname ) );
65		66
66	my $input = CGI->new();	67	my $input = CGI->new();
67		68
68	-

Return to bug 14570

Lines 1389-1400 __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); Link Here

(-)a/Koha/Schema/Result/Borrower.pm (-6 lines)
1389	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53	1389	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-02-16 17:54:53
1390	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wM40W+toV8ca5LFwinkHxA	1390	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:wM40W+toV8ca5LFwinkHxA
1391		1391
1392	__PACKAGE__->belongs_to(
1393	"guarantor",
1394	"Koha::Schema::Result::Borrower",
1395	{ borrowernumber => "guarantorid" },
1396	);
1397
1398	__PACKAGE__->add_columns(	1392	__PACKAGE__->add_columns(
1399	'+lost' => { is_boolean => 1 },	1393	'+lost' => { is_boolean => 1 },
1400	'+gonenoaddress' => { is_boolean => 1 }	1394	'+gonenoaddress' => { is_boolean => 1 }

Lines 503-509 if ( $patron ) { Link Here

(-)a/circ/circulation.pl (-9 / +7 lines)
503	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	503	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
504	if ( defined $no_issues_charge_guarantees ) {	504	if ( defined $no_issues_charge_guarantees ) {
505	my $guarantees_non_issues_charges = 0;	505	my $guarantees_non_issues_charges = 0;
506	my $guarantees = $patron->guarantees;	506	my $guarantees = $patron->guarantee_relationships->guarantees;
507	while ( my $g = $guarantees->next ) {	507	while ( my $g = $guarantees->next ) {
508	$guarantees_non_issues_charges += $g->account->non_issues_charges;	508	$guarantees_non_issues_charges += $g->account->non_issues_charges;
509	}	509	}
Lines 571-584 my $view = $batch Link Here
571	: 'circview';	571	: 'circview';
572		572
573	my @relatives;	573	my @relatives;
574	if ( $borrowernumber ) {	574	if ( $patron ) {
575	if ( $patron ) {	575	if ( my @guarantors = $patron->guarantor_relationships()->guarantors() ) {
576	if ( my $guarantor = $patron->guarantor ) {	576	push( @relatives, $_->id ) for @guarantors;
577	push @relatives, $guarantor->borrowernumber;	577	push( @relatives, $_->id ) for $patron->siblings();
578	push @relatives, $_->borrowernumber for $patron->siblings;	578	} else {
579	} else {	579	push( @relatives, $_->id ) for $patron->guarantee_relationships()->guarantees();
580	push @relatives, $_->borrowernumber for $patron->guarantees;
581	}
582	}	580	}
583	}	581	}
584	my $relatives_issues_count =	582	my $relatives_issues_count =

Lines 579-590 CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower Link Here

(-)a/installer/data/mysql/kohastructure.sql (-16 / +17 lines)
579	`lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card	579	`lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card
580	`debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)	580	`debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)
581	`debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of patron	581	`debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of patron
582	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
583	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
584	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
585	`guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
586	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	582	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
587	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
588	`sex` varchar(1) default NULL, -- patron/borrower's gender	583	`sex` varchar(1) default NULL, -- patron/borrower's gender
589	`password` varchar(60) default NULL, -- patron/borrower's encrypted password	584	`password` varchar(60) default NULL, -- patron/borrower's encrypted password
590	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions	585	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
Lines 1609-1620 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1609	`lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card	1604	`lost` tinyint(1) default NULL, -- set to 1 for yes and 0 for no, flag to note that library marked this patron/borrower as having lost their card
1610	`debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)	1605	`debarred` date default NULL, -- until this date the patron can only check-in (no loans, no holds, etc.), is a fine based on days instead of money (YYYY-MM-DD)
1611	`debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of the patron	1606	`debarredcomment` VARCHAR(255) DEFAULT NULL, -- comment on the stop of the patron
1612	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
1613	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
1614	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
1615	`guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
1616	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	1607	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
1617	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
1618	`sex` varchar(1) default NULL, -- patron/borrower's gender	1608	`sex` varchar(1) default NULL, -- patron/borrower's gender
1619	`password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password	1609	`password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password
1620	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions	1610	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
Lines 1647-1653 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1647	KEY `categorycode` (`categorycode`),	1637	KEY `categorycode` (`categorycode`),
1648	KEY `branchcode` (`branchcode`),	1638	KEY `branchcode` (`branchcode`),
1649	UNIQUE KEY `userid` (`userid`),	1639	UNIQUE KEY `userid` (`userid`),
1650	KEY `guarantorid` (`guarantorid`),
1651	KEY `surname_idx` (`surname` (191)),	1640	KEY `surname_idx` (`surname` (191)),
1652	KEY `firstname_idx` (`firstname` (191)),	1641	KEY `firstname_idx` (`firstname` (191)),
1653	KEY `othernames_idx` (`othernames` (191)),	1642	KEY `othernames_idx` (`othernames` (191)),
Lines 3406-3417 CREATE TABLE IF NOT EXISTS `borrower_modifications` ( Link Here
3406	`lost` tinyint(1) DEFAULT NULL,	3395	`lost` tinyint(1) DEFAULT NULL,
3407	`debarred` date DEFAULT NULL,	3396	`debarred` date DEFAULT NULL,
3408	`debarredcomment` varchar(255) DEFAULT NULL,	3397	`debarredcomment` varchar(255) DEFAULT NULL,
3409	`contactname` LONGTEXT,
3410	`contactfirstname` MEDIUMTEXT,
3411	`contacttitle` MEDIUMTEXT,
3412	`guarantorid` int(11) DEFAULT NULL,
3413	`borrowernotes` LONGTEXT,	3398	`borrowernotes` LONGTEXT,
3414	`relationship` varchar(100) DEFAULT NULL,
3415	`sex` varchar(1) DEFAULT NULL,	3399	`sex` varchar(1) DEFAULT NULL,
3416	`password` varchar(30) DEFAULT NULL,	3400	`password` varchar(30) DEFAULT NULL,
3417	`flags` int(11) DEFAULT NULL,	3401	`flags` int(11) DEFAULT NULL,
Lines 4090-4095 CREATE TABLE IF NOT EXISTS club_fields ( Link Here
4090	CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE	4074	CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
4091	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	4075	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4092		4076
		4077	--
		4078	-- Table structure for table 'guarantors_guarantees'
		4079	--
		4080
		4081	DROP TABLE IF EXISTS relationships;
		4082	CREATE TABLE `relationships` (
		4083	id INT(11) NOT NULL AUTO_INCREMENT,
		4084	guarantor_id INT(11) NULL DEFAULT NULL,
		4085	guarantee_id INT(11) NOT NULL,
		4086	relationship VARCHAR(100) COLLATE utf8_unicode_ci NOT NULL,
		4087	surname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
		4088	firstname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
		4089	PRIMARY KEY (id),
		4090	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
		4091	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
		4092	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
		4093
4093	--	4094	--
4094	-- Table structure for table `illrequests`	4095	-- Table structure for table `illrequests`
4095	--	4096	--

Lines 413-436 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-5 / +5 lines)
413		413
414	<tbody>	414	<tbody>
415	[% FOREACH r IN relatives %]	415	[% FOREACH r IN relatives %]
416	[% FOREACH i IN r.issues %]	416	[% FOREACH c IN r.checkouts %]
417	<tr>	417	<tr>
418	<td>	418	<td>
419	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">	419	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
420	[% i.item.biblio.title %][% IF ( i.item.enumchron ) %] [% i.item.enumchron %][% END %]	420	[% c.item.biblio.title %][% IF ( c.item.enumchron ) %] [% c.item.enumchron %][% END %]
421	</a>	421	</a>
422	</td>	422	</td>
423		423
424	<td>	424	<td>
425	[% i.date_due \| $KohaDates %]	425	[% c.date_due \| $KohaDates %]
426	</td>	426	</td>
427		427
428	<td>	428	<td>
429	[% i.item.barcode %]	429	[% c.item.barcode %]
430	</td>	430	</td>
431		431
432	<td>	432	<td>
433	[% i.item.itemcallnumber %]	433	[% c.item.itemcallnumber %]
434	</td>	434	</td>
435		435
436	<td>	436	<td>

Lines 198-204 sub patronflags { Link Here

(-)a/C4/Members.pm (-9 / +7 lines)
198	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	198	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
199	if ( defined $no_issues_charge_guarantees ) {	199	if ( defined $no_issues_charge_guarantees ) {
200	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );	200	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );
201	my @guarantees = $p->guarantees();	201	my @guarantees = map { $_->guarantee } $p->guarantee_relationships;
202	my $guarantees_non_issues_charges;	202	my $guarantees_non_issues_charges;
203	foreach my $g ( @guarantees ) {	203	foreach my $g ( @guarantees ) {
204	$guarantees_non_issues_charges += $g->account->non_issues_charges;	204	$guarantees_non_issues_charges += $g->account->non_issues_charges;
Lines 317-323 sub ModMember { Link Here
317	$new_borrower->{dateexpiry} \|\|= undef if exists $new_borrower->{dateexpiry};	317	$new_borrower->{dateexpiry} \|\|= undef if exists $new_borrower->{dateexpiry};
318	$new_borrower->{debarred} \|\|= undef if exists $new_borrower->{debarred};	318	$new_borrower->{debarred} \|\|= undef if exists $new_borrower->{debarred};
319	$new_borrower->{sms_provider_id} \|\|= undef if exists $new_borrower->{sms_provider_id};	319	$new_borrower->{sms_provider_id} \|\|= undef if exists $new_borrower->{sms_provider_id};
320	$new_borrower->{guarantorid} \|\|= undef if exists $new_borrower->{guarantorid};
321		320
322	my $patron = Koha::Patrons->find( $new_borrower->{borrowernumber} );	321	my $patron = Koha::Patrons->find( $new_borrower->{borrowernumber} );
323		322
Lines 450-456 sub AddMember { Link Here
450	$data{'dateofbirth'} = undef if ( not $data{'dateofbirth'} );	449	$data{'dateofbirth'} = undef if ( not $data{'dateofbirth'} );
451	$data{'debarred'} = undef if ( not $data{'debarred'} );	450	$data{'debarred'} = undef if ( not $data{'debarred'} );
452	$data{'sms_provider_id'} = undef if ( not $data{'sms_provider_id'} );	451	$data{'sms_provider_id'} = undef if ( not $data{'sms_provider_id'} );
453	$data{'guarantorid'} = undef if ( not $data{'guarantorid'} );
454		452
455	# get only the columns of Borrower	453	# get only the columns of Borrower
456	# FIXME Do we really need this check?	454	# FIXME Do we really need this check?
Lines 657-674 sub GetBorrowersToExpunge { Link Here
657	FROM borrowers	655	FROM borrowers
658	JOIN categories USING (categorycode)	656	JOIN categories USING (categorycode)
659	LEFT JOIN (	657	LEFT JOIN (
660	SELECT guarantorid	658	SELECT guarantor_id
661	FROM borrowers	659	FROM relationships
662	WHERE guarantorid IS NOT NULL	660	WHERE guarantor_id IS NOT NULL
663	AND guarantorid <> 0	661	AND guarantor_id <> 0
664	) as tmp ON borrowers.borrowernumber=tmp.guarantorid	662	) as tmp ON borrowers.borrowernumber=tmp.guarantor_id
665	LEFT JOIN old_issues USING (borrowernumber)	663	LEFT JOIN old_issues USING (borrowernumber)
666	LEFT JOIN issues USING (borrowernumber)\|;	664	LEFT JOIN issues USING (borrowernumber)\|;
667	if ( $filterpatronlist ){	665	if ( $filterpatronlist ){
668	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;	666	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;
669	}	667	}
670	$query .= q\| WHERE category_type <> 'S'	668	$query .= q\| WHERE category_type <> 'S'
671	AND tmp.guarantorid IS NULL	669	AND tmp.guarantor_id IS NULL
672	\|;	670	\|;
673	my @query_params;	671	my @query_params;
674	if ( $filterbranch && $filterbranch ne "" ) {	672	if ( $filterbranch && $filterbranch ne "" ) {

Lines 27-41 use Text::Unaccent qw( unac_string ); Link Here

(-)a/Koha/Patron.pm (-32 / +50 lines)
27	use C4::Context;	27	use C4::Context;
28	use C4::Log;	28	use C4::Log;
29	use Koha::Checkouts;	29	use Koha::Checkouts;
		30	use Koha::Old::Checkouts;
30	use Koha::Database;	31	use Koha::Database;
31	use Koha::DateUtils;	32	use Koha::DateUtils;
32	use Koha::Holds;	33	use Koha::Holds;
33	use Koha::Old::Checkouts;	34	use Koha::Patrons;
34	use Koha::Patron::Categories;	35	use Koha::Patron::Categories;
		36	use Koha::Patron::Relationships;
35	use Koha::Patron::HouseboundProfile;	37	use Koha::Patron::HouseboundProfile;
36	use Koha::Patron::HouseboundRole;	38	use Koha::Patron::HouseboundRole;
37	use Koha::Patron::Images;	39	use Koha::Patron::Images;
38	use Koha::Patrons;
39	use Koha::Virtualshelves;	40	use Koha::Virtualshelves;
40	use Koha::Club::Enrollments;	41	use Koha::Club::Enrollments;
41	use Koha::Account;	42	use Koha::Account;
Lines 141-181 sub category { Link Here
141	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );	142	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
142	}	143	}
143		144
144	=head3 guarantor	145	=head3 image
145
146	Returns a Koha::Patron object for this patron's guarantor
147		146
148	=cut	147	=cut
149		148
150	sub guarantor {
151	my ( $self ) = @_;
152
153	return unless $self->guarantorid();
154
155	return Koha::Patrons->find( $self->guarantorid() );
156	}
157
158	sub image {	149	sub image {
159	my ( $self ) = @_;	150	my ( $self ) = @_;
160		151
161	return scalar Koha::Patron::Images->find( $self->borrowernumber );	152	return scalar Koha::Patron::Images->find( $self->borrowernumber );
162	}	153	}
163		154
		155	=head3 library
		156
		157	=cut
		158
164	sub library {	159	sub library {
165	my ( $self ) = @_;	160	my ( $self ) = @_;
166	return Koha::Library->_new_from_dbic($self->_result->branchcode);	161	return Koha::Library->_new_from_dbic($self->_result->branchcode);
167	}	162	}
168		163
169	=head3 guarantees	164	=head3 guarantor_relationships
		165
		166	Returns Koha::Patron::Relationships object for this patron's guarantors
170		167
171	Returns the guarantees (list of Koha::Patron) of this patron	168	Returns the set of relationships for the patrons that are guarantors for this patron.
		169
		170	This is returned instead of a Koha::Patron object because the guarantor
		171	may not exist as a patron in Koha. If this is true, the guarantors name
		172	exists in the Koha::Patron::Relationship object and will have no guarantor_id.
172		173
173	=cut	174	=cut
174		175
175	sub guarantees {	176	sub guarantor_relationships {
176	my ( $self ) = @_;	177	my ($self) = @_;
		178
		179	return Koha::Patron::Relationships->search( { guarantee_id => $self->id } );
		180	}
		181
		182	=head3 guarantee_relationships
		183
		184	Returns Koha::Patron::Relationships object for this patron's guarantors
		185
		186	Returns the set of relationships for the patrons that are guarantees for this patron.
		187
		188	The method returns Koha::Patron::Relationship objects for the sake
		189	of consistency with the guantors method.
		190	A guarantee by definition must exist as a patron in Koha.
		191
		192	=cut
		193
		194	sub guarantee_relationships {
		195	my ($self) = @_;
177		196
178	return Koha::Patrons->search( { guarantorid => $self->borrowernumber } );	197	return Koha::Patron::Relationships->search( { guarantor_id => $self->id } );
179	}	198	}
180		199
181	=head3 housebound_profile	200	=head3 housebound_profile
Lines 213-235 Returns the siblings of this patron. Link Here
213	=cut	232	=cut
214		233
215	sub siblings {	234	sub siblings {
216	my ( $self ) = @_;	235	my ($self) = @_;
217		236
218	my $guarantor = $self->guarantor;	237	my @guarantors = $self->guarantor_relationships()->guarantors();
219		238
220	return unless $guarantor;	239	return unless @guarantors;
221		240
222	return Koha::Patrons->search(	241	my @siblings =
223	{	242	map { $_->guarantee_relationships()->guarantees() } @guarantors;
224	guarantorid => {	243
225	'!=' => undef,	244	return unless @siblings;
226	'=' => $guarantor->id,	245
227	},	246	my %seen;
228	borrowernumber => {	247	@siblings =
229	'!=' => $self->borrowernumber,	248	grep { !$seen{ $_->id }++ && ( $_->id != $self->id ) } @siblings;
230	}	249
231	}	250	return wantarray ? @siblings : Koha::Patrons->search( { borrowernumber => { -in => [ map { $_->id } @siblings ] } } );
232	);
233	}	251	}
234		252
235	=head3 merge_with	253	=head3 merge_with

Line 0 Link Here

(-)a/Koha/Patron/Relationship.pm (+73 lines)
		1	package Koha::Patron::Relationship;
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it under the
		6	# terms of the GNU General Public License as published by the Free Software
		7	# Foundation; either version 3 of the License, or (at your option) any later
		8	# version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License along
		15	# with Koha; if not, write to the Free Software Foundation, Inc.,
		16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		17
		18	use Modern::Perl;
		19
		20	use Carp;
		21
		22	use Koha::Database;
		23
		24	use base qw(Koha::Object);
		25
		26	=head1 NAME
		27
		28	Koha::Patron::Relationship - A class to represent relationships between patrons
		29
		30	Patrons in Koha may be guarantors or guarantees. This class models that relationship
		31	and provides a way to access those relationships.
		32
		33	=head1 API
		34
		35	=head2 Class Methods
		36
		37	=cut
		38
		39	=head3 guarantor
		40
		41	Returns the Koha::Patron object for the guarantor, if there is one
		42
		43	=cut
		44
		45	sub guarantor {
		46	my ( $self ) = @_;
		47
		48	return unless $self->guarantor_id;
		49
		50	return scalar Koha::Patrons->find( $self->guarantor_id );
		51	}
		52
		53	=head3 guarantee
		54
		55	Returns the Koha::Patron object for the guarantee
		56
		57	=cut
		58
		59	sub guarantee {
		60	my ( $self ) = @_;
		61
		62	return scalar Koha::Patrons->find( $self->guarantee_id );
		63	}
		64
65	=head3 type
66
67	=cut
68
69	sub _type {
70	return 'Relationship';
71	}
72
73	1;

Line 0 Link Here

(-)a/Koha/Patron/Relationships.pm (+94 lines)
		1	package Koha::Patron::Relationships;
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it under the
		6	# terms of the GNU General Public License as published by the Free Software
		7	# Foundation; either version 3 of the License, or (at your option) any later
		8	# version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
		11	# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
		12	# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
		13	#
		14	# You should have received a copy of the GNU General Public License along
		15	# with Koha; if not, write to the Free Software Foundation, Inc.,
		16	# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
		17
		18	use Modern::Perl;
		19
		20	use Carp;
		21	use List::MoreUtils qw( uniq );
		22
		23	use Koha::Database;
		24	use Koha::Patrons;
		25	use Koha::Patron::Relationship;
		26
		27	use base qw(Koha::Objects);
		28
		29	=head1 NAME
		30
		31	Koha::Patron::Relationships - Koha Patron Relationship Object set class
		32
		33	=head1 API
		34
		35	=head2 Class Methods
		36
		37	=cut
		38
		39	=head3 guarantors
		40
		41	Returns all the guarantors in this set of relationships as a list of Koha::Patron objects
		42	or as a Koha::Patrons object depending on the calling context
		43
		44	=cut
		45
		46	sub guarantors {
		47	my ($self) = @_;
		48
		49	my $rs = $self->_resultset();
		50
		51	my @guarantor_ids = $rs->get_column('guarantor_id')->all();
		52	# Guarantors may not have a guarantor_id, strip out undefs
		53	@guarantor_ids = grep { defined $_ } @guarantor_ids;
		54	@guarantor_ids = uniq( @guarantor_ids );
		55
		56	my $guarantors = Koha::Patrons->search( { borrowernumber => \@guarantor_ids } );
		57
		58	return wantarray ? $guarantors->as_list : $guarantors;
		59	}
		60
		61	=head3 guarantees
		62
		63	Returns all the guarantees in this set of relationships as a list of Koha::Patron objects
		64	or as a Koha::Patrons object depending on the calling context
65
66	=cut
67
68	sub guarantees {
69	my ($self) = @_;
70
71	my $rs = $self->_resultset();
72
73	my @guarantee_ids = uniq( $rs->get_column('guarantee_id')->all() );
74
75	my $guarantees = Koha::Patrons->search( { borrowernumber => \@guarantee_ids } );
76
77	return wantarray ? $guarantees->as_list : $guarantees;
78	}
79
80	=cut
81
82	=head3 type
83
84	=cut
85
86	sub _type {
87	return 'Relationship';
88	}
89
90	sub object_class {
91	return 'Koha::Patron::Relationship';
92	}
93
94	1;

Lines 124-141 sub search_upcoming_membership_expires { Link Here

(-)a/Koha/Patrons.pm (-12 lines)
124	);	124	);
125	}	125	}
126		126
127	=head3 guarantor
128
129	Returns a Koha::Patron object for this borrower's guarantor
130
131	=cut
132
133	sub guarantor {
134	my ( $self ) = @_;
135
136	return Koha::Patrons->find( $self->guarantorid() );
137	}
138
139	=head3 search_patrons_to_anonymise	127	=head3 search_patrons_to_anonymise
140		128
141	my $patrons = Koha::Patrons->search_patrons_to_anonymise( { before => $older_than_date, [ library => $library ] } );	129	my $patrons = Koha::Patrons->search_patrons_to_anonymise( { before => $older_than_date, [ library => $library ] } );

Line 0 Link Here

(-)a/Koha/Schema/Result/Relationship.pm (+132 lines)
		1	use utf8;
		2	package Koha::Schema::Result::Relationship;
		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::Relationship
		10
		11	=cut
		12
		13	use strict;
		14	use warnings;
		15
		16	use base 'DBIx::Class::Core';
		17
		18	=head1 TABLE: C<relationships>
		19
		20	=cut
		21
		22	__PACKAGE__->table("relationships");
		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 guarantor_id
		33
		34	data_type: 'integer'
		35	is_foreign_key: 1
		36	is_nullable: 1
		37
		38	=head2 guarantee_id
		39
		40	data_type: 'integer'
		41	is_foreign_key: 1
		42	is_nullable: 0
		43
		44	=head2 relationship
		45
		46	data_type: 'varchar'
		47	is_nullable: 0
		48	size: 100
		49
		50	=head2 surname
		51
		52	data_type: 'mediumtext'
		53	is_nullable: 1
		54
		55	=head2 firstname
		56
		57	data_type: 'mediumtext'
		58	is_nullable: 1
		59
		60	=cut
		61
		62	__PACKAGE__->add_columns(
		63	"id",
		64	{ data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
65	"guarantor_id",
66	{ data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
67	"guarantee_id",
68	{ data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
69	"relationship",
70	{ data_type => "varchar", is_nullable => 0, size => 100 },
71	"surname",
72	{ data_type => "mediumtext", is_nullable => 1 },
73	"firstname",
74	{ data_type => "mediumtext", is_nullable => 1 },
75	);
76
77	=head1 PRIMARY KEY
78
79	=over 4
80
81	=item * L</id>
82
83	=back
84
85	=cut
86
87	__PACKAGE__->set_primary_key("id");
88
89	=head1 RELATIONS
90
91	=head2 guarantee
92
93	Type: belongs_to
94
95	Related object: L<Koha::Schema::Result::Borrower>
96
97	=cut
98
99	__PACKAGE__->belongs_to(
100	"guarantee",
101	"Koha::Schema::Result::Borrower",
102	{ borrowernumber => "guarantee_id" },
103	{ is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
104	);
105
106	=head2 guarantor
107
108	Type: belongs_to
109
110	Related object: L<Koha::Schema::Result::Borrower>
111
112	=cut
113
114	__PACKAGE__->belongs_to(
115	"guarantor",
116	"Koha::Schema::Result::Borrower",
117	{ borrowernumber => "guarantor_id" },
118	{
119	is_deferrable => 1,
120	join_type => "LEFT",
121	on_delete => "CASCADE",
122	on_update => "CASCADE",
123	},
124	);
125
126
127	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2016-05-03 13:19:34
128	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:2Nv437KMrKHvpQleXLOjYw
129
130
131	# You can replace this text with custom code or comments, and it will be preserved on regeneration
132	1;

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_14570.sql (+17 lines)
	1	CREATE TABLE `relationships` (
	2	id INT(11) NOT NULL AUTO_INCREMENT,
	3	guarantor_id INT(11) NULL DEFAULT NULL,
	4	guarantee_id INT(11) NOT NULL,
	5	relationship VARCHAR(100) COLLATE utf8_unicode_ci NOT NULL,
	6	surname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
	7	firstname MEDIUMTEXT COLLATE utf8_unicode_ci NULL DEFAULT NULL,
	8	PRIMARY KEY (id),
	9	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
	10	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
	11	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
	12
	13	UPDATE borrowers LEFT JOIN borrowers guarantor ON ( borrowers.guarantorid = guarantor.borrowernumber ) SET borrowers.guarantorid = NULL WHERE guarantor.borrowernumber IS NULL;
	14
	15	INSERT INTO relationships ( guarantor_id, guarantee_id, relationship, surname, firstname ) SELECT guarantorid, borrowernumber, relationship, contactname, contactfirstname FROM borrowers WHERE guarantorid IS NOT NULL OR contactname != "";
	16
	17	ALTER TABLE borrowers DROP guarantorid, DROP relationship, DROP contactname, DROP contactfirstname, DROP contacttitle;

Lines 6-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-9 / +5 lines)
6	[% SET NorwegianPatronDBEnable = Koha.Preference( 'NorwegianPatronDBEnable' ) %]	6	[% SET NorwegianPatronDBEnable = Koha.Preference( 'NorwegianPatronDBEnable' ) %]
7	<div id="toolbar" class="btn-toolbar">	7	<div id="toolbar" class="btn-toolbar">
8	[% IF CAN_user_borrowers_edit_borrowers %]	8	[% IF CAN_user_borrowers_edit_borrowers %]
9	[% IF ( guarantor ) %]	9	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]">
10	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&guarantorid=[% guarantor.borrowernumber %]&categorycode=[% patron.categorycode %]">	10	<i class="fa fa-pencil"></i> Edit
11	[% ELSE %]	11	</a>
12	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]">
13	[% END %]
14	<i class="fa fa-pencil"></i> Edit</a>
15	[% END %]	12	[% END %]
16		13
17	[% IF CAN_user_borrowers_edit_borrowers %]	14	[% IF CAN_user_borrowers_edit_borrowers %]
18	[% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]	15	[% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
19	<a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>	16	<a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
20	[% END %]	17	[% END %]
21	[% IF CAN_user_borrowers_edit_borrowers %]	18
22	<a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>	19	<a id="changepassword" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber %]"><i class="fa fa-lock"></i> Change password</a>
23	[% END %]
24	<a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>	20	<a id="duplicate" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=duplicate&borrowernumber=[% patron.borrowernumber %]&categorycode=[% patron.categorycode %]"><i class="fa fa-copy"></i> Duplicate</a>
25	[% END %]	21	[% END %]
26		22

Lines 1-4 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-103 / +169 lines)
1	[% USE Asset %]	1	[% USE Asset %]
		2	[% USE To %]
2	[% USE Koha %]	3	[% USE Koha %]
3	[% USE KohaDates %]	4	[% USE KohaDates %]
4	[% USE Branches %]	5	[% USE Branches %]
Lines 289-401 Link Here
289	</fieldset>	290	</fieldset>
290	[% END # hide fieldset %]	291	[% END # hide fieldset %]
291		292
292	[% IF ( showguarantor ) %]	293	[% IF show_guarantor \|\| guarantor %]
293	<input type="hidden" id="guarantorid" name="guarantorid" value="[% guarantorid %]" />	294	[% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
294	[% UNLESS step_6 %]	295	<fieldset class="rows">
295	<input type="hidden" name="branchcode" value="[% branchcode %]" />	296	<legend>Guarantor information</legend>
296	[% END %]	297
297	<fieldset id="memberentry_guarantor" class="rows">	298	<span id="guarantor_relationships">
298	<legend id="guarantor_lgd">Guarantor information</legend>	299	[% FOREACH r IN relationships %]
299	<ol>	300	<fieldset class="rows">
300	[% IF ( P ) %]	301	<ol>
301	[% IF ( guarantorid ) %]	302	[% IF category_type == 'P' %]
302	<li id="contact-details">	303	[% IF ( r.guarantor_id ) %]
303	[% ELSE %]	304	<li id="contact-details">
304	<li id="contact-details" style="display: none">	305	[% ELSE %]
305	[% END %]	306	<li id="contact-details" style="display: none">
306	<span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]	307	[% END %]
307	</li>	308	<span class="label">Organization #:</span> [% IF ( r.guarantor_id ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>[% END %]
308	<li>	309	</li>
309	<label for="contactname">Organization name: </label>	310
310	[% IF ( guarantorid ) %]	311	<li>
311	<span>[% contactname %]</span>	312	<label for="guarantor_surname">Organization name: </label>
312	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	313	[% IF ( r.guarantor_id ) %]
313	[% ELSE %]	314	<span>[% r.guarantor.surname %]</span>
314	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	315	[% END %]
315	[% END %]	316	</li>
316	</li>	317	[% ELSE %]
317	[% ELSE %]	318	[% IF ( r.guarantor_id ) %]
318	[% IF ( C ) %]	319	<li id="contact-details">
319	[% IF ( guarantorid ) %]	320	[% ELSE %]
320	<li id="contact-details">	321	<li id="contact-details" style="display: none">
321	[% ELSE %]	322	[% END %]
322	<li id="contact-details" style="display: none">	323
323	[% END %]	324	<span class="label">Patron #:</span>
324	<span class="label">Patron #:</span>	325	[% IF ( r.guarantor_id ) %]
325	[% IF guarantorid %]	326	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>
326	[% IF logged_in_user.can_see_patron_infos( guarantor ) %]	327	[% END %]
327	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid \| html %]</a>	328
328	[% ELSE %]	329	</li>
329	[% guarantorid \| html %]	330
330	[% END %]	331	[% IF r.surname \|\| r.guarantor.surname %]
331	[% END %]	332	<li>
332	</li>	333	<label for="guarantor_surname">Surname: </label>
333	[% UNLESS nocontactname %]	334	<span>[% r.surname \|\| r.guarantor.surname %]</span>
334	<li>	335	</li>
335	<label for="contactname">Surname: </label>	336	[% END %]
336	[% IF ( guarantorid ) %]	337
337	<span>[% contactname %]</span>	338	[% IF r.firstname \|\| r.guarantor.firstname %]
338	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	339	<li>
339	[% ELSE %]	340	<label for="guarantor_firstname">First name: </label>
340	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	341	<span>[% r.firstname \|\| r.guarantor.firstname %]</span>
341	[% END %]	342	</li>
342	</li>	343	[% END %]
343	[% END %]	344
344	[% UNLESS nocontactfirstname %]	345	<li>
345	<li>	346	<label for="relationship">Relationship: </label>
346	<label for="contactfirstname">First name: </label>	347	<span>[% r.relationship %]</span>
347	[% IF ( guarantorid ) %]	348	</li>
348	<span>[% contactfirstname %]</span>	349
349	<input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname \| html %]" />	350	<li>
350	[% ELSE %]	351	<label for="delete_guarantor">Delete: </label>
351	<input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname \| html %]" />	352	<input type="checkbox" name="delete_guarantor" value="[% r.id %]" />
352	[% END %]	353	</li>
353	</li>	354	[% END %]
354	[% END %]	355	</ol>
355	[% IF ( relshiploop ) %]	356	</fieldset>
356	<li>	357	[% END # END relationships foreach %]
357	<label for="relationship">Relationship: </label>	358	</span>
358	<select name="relationship" id="relationship" >	359
359	[% FOREACH relshiploo IN relshiploop %]	360	<fieldset class="rows guarantor" id="guarantor_template">
360	[% IF ( relshiploo.selected ) %]	361	<ol>
361	<option value="[% relshiploo.relationship %]" selected="selected" >[% relshiploo.relationship %]</option>	362	<li class="guarantor_id">
362	[% ELSE %]	363	<span class="label">Patron #:</span>
363	<option value="[% relshiploo.relationship %]">[% relshiploo.relationship %]</option>	364	<span class="new_guarantor_id_text"></span>
364	[% END %]	365	<input type="hidden" class="new_guarantor_id" name="new_guarantor_id" value=""/>
365	[% END %]	366	</li>
366	</select>	367
367	</li>	368	<li>
368	[% END %]	369	<label for="guarantor_surname">Surname: </label>
369	[% END %]	370	<span class="new_guarantor_surname_text"></span>
370	[% END %]	371	<input type="hidden" class="new_guarantor_surname" name="new_guarantor_surname" value=""/>
371	<li>	372	</li>
372	<span class="label"> </span>	373
373	[% IF ( guarantorid ) %]	374	<li>
374	<input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />	375	<label for="guarantor_firstname">First name: </label>
375	[% ELSE %]	376	<span class="new_guarantor_firstname_text"></span>
376	<input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" />	377	<input type="hidden" class="new_guarantor_firstname" name="new_guarantor_firstname" value=""/>
377	[% END %]	378	</li>
378	<input id="guarantordelete" type="button" value="Delete" />	379
379	</li>	380	<li>
380	[% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]	381	<label for="guarantor_relationship">Relationship: </label>
381	<li>	382	<select class="new_guarantor_relationship" name="new_guarantor_relationship">
382	<label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>	383	[% FOREACH pr IN possible_relationships.split('\\|') %]
383	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">	384	<option value="[% pr %]">[% pr %]</option>
384	[% IF privacy_guarantor_checkouts %]	385	[% END %]
385	<option value="0">No</option>	386	</select>
386	<option value="1" selected>Yes</option>	387	</li>
		388
		389	<li>
		390	<label for="guarantor_cancel"> </label>
		391	<span><a href="#" class="guarantor_cancel">Cancel</a></span>
		392	</li>
		393	</ol>
		394	</fieldset>
		395
		396	<fieldset class="rows">
		397	<legend>Add new guarantor</legend>
		398	<ol>
		399	<input type="hidden" id="guarantor_id" value=""/>
		400
		401	[% IF catetory_type == 'P' %]
		402	<li>
		403	<label for="guarantor_surname">Organization name: </label>
		404	<input name="guarantor_surname" id="guarantor_surname" type="hidden" size="20"/>
		405	</li>
387	[% ELSE %]	406	[% ELSE %]
388	<option value="0" selected>No</option>	407	<li>
389	<option value="1">Yes</option>	408	<label for="guarantor_surname">Surname: </label>
		409	<input name="guarantor_surname" id="guarantor_surname" type="text" size="20" />
		410	</li>
		411
		412	<li>
		413	<label for="guarantor_firstname">First name: </label>
		414	<input name="guarantor_firstname" id="guarantor_firstname" type="text" size="20" />
		415	</li>
		416
		417	[% IF ( possible_relationships ) %]
		418	<li>
		419	<label for="relationship">Relationship: </label>
		420	<select name="relationship" id="relationship" >
		421	[% FOREACH pr IN possible_relationships.split('\\|') %]
		422	<option value="[% pr %]">[% pr %]</option>
		423	[% END %]
		424	</select>
		425	</li>
		426	[% END %]
390	[% END %]	427	[% END %]
391	</select>
392	<div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
393	</li>
394	[% END %]
395	</ol>
396	</fieldset>
397		428
		429	<li>
		430	<span class="label"> </span>
		431	<a href="#" id="guarantor_add" class="btn btn-sm"><i class="fa fa-plus"></i> Add guarantor</a>
		432	<a href="#" id="guarantor_search" class="btn btn-sm"><i class="fa fa-search"></i> Set to patron</a>
		433	<a href="#" id="guarantor_clear">Clear</a>
		434	</li>
		435
		436	[% IF relationships && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
		437	<li>
		438	<label for="privacy_guarantor_checkouts">Show checkouts to guarantors</label>
		439	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
		440	[% IF privacy_guarantor_checkouts %]
		441	<option value="0">No</option>
		442	<option value="1" selected>Yes</option>
		443	[% ELSE %]
		444	<option value="0" selected>No</option>
		445	<option value="1">Yes</option>
		446	[% END %]
		447	</select>
		448	<div class="hint">Allow guarantors of this patron to view this patron's checkouts from the OPAC</div>
		449	</li>
		450	[% END %]
		451	</ol>
		452	</fieldset>
		453	</fieldset>
398	[% END %]	454	[% END %]
		455
		456
399	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]	457	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
400	[% IF Koha.Preference( 'AddressFormat' ) %]	458	[% IF Koha.Preference( 'AddressFormat' ) %]
401	[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]	459	[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
Lines 1185-1190 Link Here
1185	update_category_code( category_code );	1243	update_category_code( category_code );
1186	}	1244	}
1187	[% END %]	1245	[% END %]
		1246
		1247	[% IF guarantor %]
		1248	select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) %] );
		1249	$('#guarantor_add').ready(function() {
		1250	$('#guarantor_add').click();
		1251	});
		1252	[% END %]
		1253
1188	});	1254	});
1189		1255
1190	function update_cardnumber_warning(size){	1256	function update_cardnumber_warning(size){

Lines 47-54 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-2 / +21 lines)
47	<li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %] </a></li>[% END %]</ul></li>	47	<li><span class="label">Guarantees:</span><ul>[% FOREACH guaranteeloo IN guaranteeloop %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guaranteeloo.borrowernumber %]">[% guaranteeloo.name %] </a></li>[% END %]</ul></li>
48	[% END %]	48	[% END %]
49	[% ELSE %]	49	[% ELSE %]
50	[% IF ( guarantor.borrowernumber ) %]	50	[% IF guarantees %]
51	<li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber %]">[% guarantor.surname %], [% guarantor.firstname %]</a></li>	51	<li>
		52	<span class="label">Guarantees:</span>
		53	<ul>
		54	[% FOREACH guarantee IN guarantees %]
		55	<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname %] [% guarantee.surname %]</a></li>
		56	[% END %]
		57	</ul>
		58	</li>
		59	[% ELSIF guarantor_relationships %]
		60	[% FOREACH gr IN guarantor_relationships %]
		61	<li>
		62	<span class="label">Guarantor:</span>
		63	[% IF gr.guarantor_id %]
		64	[% SET guarantor = gr.guarantor %]
		65	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
		66	[% ELSE %]
		67	[% gr.firstname %] [% gr.surname %]
		68	[% END %]
		69	</li>
		70	[% END %]
52	[% END %]	71	[% END %]
53	[% END %]	72	[% END %]
54	</ol>	73	</ol>

Lines 129-138 function Dopop(link) { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (-52 / +53 lines)
129	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');	129	var newin=window.open(link,'popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=no,top');
130	}	130	}
131		131
132	function Dopopguarantor(link) {
133	var newin=window.open(link,'popup','width=800,height=500,resizable=no,toolbar=false,scrollbars=yes,top');
134	}
135
136	function clear_entry(node) {	132	function clear_entry(node) {
137	var original = $(node).parent();	133	var original = $(node).parent();
138	$("textarea", original).attr('value', '');	134	$("textarea", original).attr('value', '');
Lines 170-217 function update_category_code(category_code) { Link Here
170	}	166	}
171		167
172	function select_user(borrowernumber, borrower) {	168	function select_user(borrowernumber, borrower) {
173	var form = $('#entryform').get(0);	169	$('#guarantor_id').val(borrower.borrowernumber);
174	if (form.guarantorid.value) {	170	$('#guarantor_surname').val(borrower.surname);
175	$("#contact-details, #quick_add_form #contact-details").find('a').remove();	171	$('#guarantor_firstname').val(borrower.firstname);
176	$("#contactname, #contactfirstname, #quick_add_form #contactname, #quick_add_form #contactfirstname").parent().find('span').remove();
177	}
178		172
179	var id = borrower.borrowernumber;	173	$('#guarantor_add').click();
180	form.guarantorid.value = id;
181	$('#contact-details, #quick_add_form #contact-details')
182	.show()
183	.find('span')
184	.after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>');
185
186	$(form.contactname)
187	.val(borrower.surname)
188	.before('<span>' + borrower.surname + '</span>').get(0).type = 'hidden';
189	$("#quick_add_form #contactname").val(borrower.surname).before('<span>'+borrower.surname+'</span.').attr({type:"hidden"});
190	$(form.contactfirstname,"#quick_add_form #contactfirstname")
191	.val(borrower.firstname)
192	.before('<span>' + borrower.firstname + '</span>').get(0).type = 'hidden';
193	$("#quick_add_form #contactfirstname").val(borrower.firstname).before('<span>'+borrower.firstname+'</span.').attr({type:"hidden"});
194
195	form.streetnumber.value = borrower.streetnumber;
196	form.address.value = borrower.address;
197	form.address2.value = borrower.address2;
198	form.city.value = borrower.city;
199	form.state.value = borrower.state;
200	form.zipcode.value = borrower.zipcode;
201	form.country.value = borrower.country;
202	form.branchcode.value = borrower.branchcode;
203
204	$("#quick_add_form #streetnumber").val(borrower.streetnumber);
205	$("#quick_add_form #address").val(borrower.address);
206	$("#quick_add_form #address2").val(borrower.address2);
207	$("#quick_add_form #city").val(borrower.city);
208	$("#quick_add_form #state").val(borrower.state);
209	$("#quick_add_form #zipcode").val(borrower.zipcode);
210	$("#quick_add_form #country").val(borrower.country);
211	$("#quick_add_form select[name='branchcode']").val(borrower.branchcode);
212
213	form.guarantorsearch.value = LABEL_CHANGE;
214	$("#quick_add_form #guarantorsearch").val(LABEL_CHANGE);
215		174
216	return 0;	175	return 0;
217	}	176	}
Lines 284-296 $(document).ready(function(){ Link Here
284	});	243	});
285		244
286	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");	245	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
287	$("#guarantordelete").click(function() {	246
288	$("#quick_add_form #contact-details, #contact-details").hide().find('a').remove();	247	$('#guarantor_template').hide();
289	$("#quick_add_form #guarantorid, #quick_add_form #contactname, #quick_add_form #contactfirstname, #guarantorid, #contactname, #contactfirstname").each(function () { this.value = ""; });	248
290	$("#quick_add_form #contactname, #quick_add_form #contactfirstname, #contactname, #contactfirstname")	249	$('#guarantor_search').on('click', function(e) {
291	.each(function () { this.type = 'text'; })	250	e.preventDefault();
292	.parent().find('span').remove();	251	var newin = window.open('guarantor_search.pl','popup','width=600,height=400,resizable=no,toolbar=false,scrollbars=yes,top');
293	$("#quick_add_form #guarantorsearch, #guarantorsearch").val(LABEL_SET_TO_PATRON);	252	});
		253
		254	$('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
		255	e.preventDefault();
		256	$(this).parents('fieldset').first().remove();
		257	});
		258
		259	$('#guarantor_add').on('click', function(e) {
		260	e.preventDefault();
		261	var fieldset = $('#guarantor_template').clone();
		262	fieldset.removeAttr('id');
		263
		264	var guarantor_id = $('#guarantor_id').val();
		265	if ( guarantor_id ) {
		266	fieldset.find('.new_guarantor_id').first().val( guarantor_id );
		267	fieldset.find('.new_guarantor_id_text').first().text( guarantor_id );
		268	} else {
		269	fieldset.find('.guarantor_id').first().hide();
		270	}
		271	$('#guarantor_id').val("");
		272
		273	var guarantor_surname = $('#guarantor_surname').val();
		274	fieldset.find('.new_guarantor_surname').first().val( guarantor_surname );
		275	fieldset.find('.new_guarantor_surname_text').first().text( guarantor_surname );
		276	$('#guarantor_surname').val("");
		277
		278	var guarantor_firstname = $('#guarantor_firstname').val();
		279	fieldset.find('.new_guarantor_firstname').first().val( guarantor_firstname );
		280	fieldset.find('.new_guarantor_firstname_text').first().text( guarantor_firstname );
		281	$('#guarantor_firstname').val("");
		282
		283	var guarantor_relationship = $('#relationship').val();
		284	fieldset.find('.new_guarantor_relationship').first().val( guarantor_relationship );
		285	$('#relationship').find('option:eq(0)').prop('selected', true);;
		286
		287	$('#guarantor_relationships').append( fieldset );
		288	fieldset.show();
		289	});
		290
		291	$("#guarantor_clear").click(function(e) {
		292	e.preventDefault();
		293	$("#contact-details").hide().find('a').remove();
		294	$("#guarantor_id, #guarantor_surname, #guarantor_firstname").val("");
294	});	295	});
295		296
296	$(document.body).on('change','select[name="select_city"]',function(){	297	$(document.body).on('change','select[name="select_city"]',function(){

Lines 83-89 if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) { Link Here

(-)a/members/memberentry.pl (-51 / +77 lines)
83	$template->param( sms_providers => \@providers );	83	$template->param( sms_providers => \@providers );
84	}	84	}
85		85
86	my $guarantorid = $input->param('guarantorid');
87	my $actionType = $input->param('actionType') \|\| '';	86	my $actionType = $input->param('actionType') \|\| '';
88	my $modify = $input->param('modify');	87	my $modify = $input->param('modify');
89	my $delete = $input->param('delete');	88	my $delete = $input->param('delete');
Lines 99-111 $nodouble = 1 if ($op eq 'modify' or $op eq 'duplicate'); # FIXME hack to rep Link Here
99	# isn't a duplicate. Marking FIXME because this	98	# isn't a duplicate. Marking FIXME because this
100	# script needs to be refactored.	99	# script needs to be refactored.
101	my $nok = $input->param('nok');	100	my $nok = $input->param('nok');
102	my $guarantorinfo = $input->param('guarantorinfo');
103	my $step = $input->param('step') \|\| 0;	101	my $step = $input->param('step') \|\| 0;
104	my @errors;	102	my @errors;
105	my $borrower_data;	103	my $borrower_data;
106	my $NoUpdateLogin;	104	my $NoUpdateLogin;
107	my $userenv = C4::Context->userenv;	105	my $userenv = C4::Context->userenv;
108		106
		107	## Deal with guarantor stuff
		108	$template->param( relationships => scalar $patron->guarantor_relationships ) if $patron;
		109
		110	my $guarantor_id = $input->param('guarantor_id');
		111	my $guarantor = Koha::Patrons->find( $guarantor_id ) if $guarantor_id;
		112	$template->param( guarantor => $guarantor );
		113
		114	my @delete_guarantor = $input->param('delete_guarantor');
		115	foreach my $id ( @delete_guarantor ) {
		116	my $r = Koha::Patron::Relationships->find( $id );
		117	$r->delete() if $r;
		118	}
		119
109	## Deal with debarments	120	## Deal with debarments
110	$template->param(	121	$template->param(
111	debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );	122	debarments => scalar GetDebarments( { borrowernumber => $borrowernumber } ) );
Lines 137-150 $template->param("uppercasesurnames" => C4::Context->preference('uppercasesurnam Link Here
137	my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");	148	my $check_BorrowerMandatoryField=C4::Context->preference("BorrowerMandatoryField");
138	my @field_check=split(/\\|/,$check_BorrowerMandatoryField);	149	my @field_check=split(/\\|/,$check_BorrowerMandatoryField);
139	foreach (@field_check) {	150	foreach (@field_check) {
140	$template->param( "mandatory$_" => 1);	151	$template->param( "mandatory$_" => 1 );
141	}	152	}
142	# function to designate unwanted fields	153	# function to designate unwanted fields
143	my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");	154	my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
144	@field_check=split(/\\|/,$check_BorrowerUnwantedField);	155	@field_check=split(/\\|/,$check_BorrowerUnwantedField);
145	foreach (@field_check) {	156	foreach (@field_check) {
146	next unless m/\w/o;	157	next unless m/\w/o;
147	$template->param( "no$_" => 1);	158	$template->param( "no$_" => 1 );
148	}	159	}
149	$template->param( "add" => 1 ) if ( $op eq 'add' );	160	$template->param( "add" => 1 ) if ( $op eq 'add' );
150	$template->param( "quickadd" => 1 ) if ( $quickadd );	161	$template->param( "quickadd" => 1 ) if ( $quickadd );
Lines 246-271 if ( ( $op eq 'insert' ) and !$nodouble ) { Link Here
246	}	257	}
247	}	258	}
248		259
249	#recover all data from guarantor address phone ,fax...
250	if ( $guarantorid ) {
251	if (my $guarantor = Koha::Patrons->find( $guarantorid )) {
252	my $guarantordata = $guarantor->unblessed;
253	$category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
254	$guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
255	$newdata{'contactfirstname'}= $guarantordata->{'firstname'};
256	$newdata{'contactname'} = $guarantordata->{'surname'};
257	$newdata{'contacttitle'} = $guarantordata->{'title'};
258	if ( $op eq 'add' ) {
259	foreach (qw(streetnumber address streettype address2
260	zipcode country city state phone phonepro mobile fax email emailpro branchcode
261	B_streetnumber B_streettype B_address B_address2
262	B_city B_state B_zipcode B_country B_email B_phone)) {
263	$newdata{$_} = $guarantordata->{$_};
264	}
265	}
266	}
267	}
268
269	###############test to take the right zipcode, country and city name ##############	260	###############test to take the right zipcode, country and city name ##############
270	# set only if parameter was passed from the form	261	# set only if parameter was passed from the form
271	$newdata{'city'} = $input->param('city') if defined($input->param('city'));	262	$newdata{'city'} = $input->param('city') if defined($input->param('city'));
Lines 423-428 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
423	if ($op eq 'insert'){	414	if ($op eq 'insert'){
424	# we know it's not a duplicate borrowernumber or there would already be an error	415	# we know it's not a duplicate borrowernumber or there would already be an error
425	$borrowernumber = &AddMember(%newdata);	416	$borrowernumber = &AddMember(%newdata);
		417	add_guarantors( $borrowernumber, $input );
426	$newdata{'borrowernumber'} = $borrowernumber;	418	$newdata{'borrowernumber'} = $borrowernumber;
427		419
428	# If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.	420	# If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode.
Lines 520-525 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
520	# updating any columns in the borrowers table,	512	# updating any columns in the borrowers table,
521	# which can happen if we're only editing the	513	# which can happen if we're only editing the
522	# patron attributes or messaging preferences sections	514	# patron attributes or messaging preferences sections
		515	add_guarantors( $borrowernumber, $input );
523	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {	516	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
524	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);	517	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
525	}	518	}
Lines 627-637 foreach my $category_type (qw(C A S P I X)) { Link Here
627	'categoryloop' => \@categoryloop	620	'categoryloop' => \@categoryloop
628	};	621	};
629	}	622	}
630		623	$template->param(
631	$template->param('typeloop' => \@typeloop,	624	typeloop => \@typeloop,
632	no_categories => $no_categories);	625	no_categories => $no_categories,
633	if($no_categories){ $no_add = 1; }	626	);
634
635		627
636	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );	628	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
637	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );	629	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
Lines 656-679 while (@relationships) { Link Here
656	push(@relshipdata, \%row);	648	push(@relshipdata, \%row);
657	}	649	}
658		650
659	my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],	651	my %flags = (
660	'lost' => ['lost']);	652	'gonenoaddress' => ['gonenoaddress'],
		653	'lost' => ['lost']
		654	);
661		655
662
663	my @flagdata;	656	my @flagdata;
664	foreach (keys(%flags)) {	657	foreach ( keys(%flags) ) {
665	my $key = $_;	658	my $key = $_;
666	my %row = ('key' => $key,	659	my %row = (
667	'name' => $flags{$key}[0]);	660	'key' => $key,
668	if ($data{$key}) {	661	'name' => $flags{$key}[0]
669	$row{'yes'}=' checked';	662	);
670	$row{'no'}='';	663	if ( $data{$key} ) {
671	}	664	$row{'yes'} = ' checked';
672	else {	665	$row{'no'} = '';
673	$row{'yes'}='';	666	}
674	$row{'no'}=' checked';	667	else {
675	}	668	$row{'yes'} = '';
676	push @flagdata,\%row;	669	$row{'no'} = ' checked';
		670	}
		671	push @flagdata, \%row;
677	}	672	}
678		673
679	# get Branch Loop	674	# get Branch Loop
Lines 749-755 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
749	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));	744	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
750	}	745	}
751		746
752	$template->param( "showguarantor" => ($category_type=~/A\|I\|S\|X/) ? 0 : 1); # associate with step to know where you are	747	$template->param( "show_guarantor" => ( $category_type =~ /A\|I\|S\|X/ ) ? 1 : 0 ); # associate with step to know where you are
753	$debug and warn "memberentry step: $step";	748	$debug and warn "memberentry step: $step";
754	$template->param(%data);	749	$template->param(%data);
755	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are	750	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are
Lines 763-779 $template->param( Link Here
763	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)	758	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)
764	"op$op" => 1);	759	"op$op" => 1);
765		760
766	$guarantorid = $borrower_data->{'guarantorid'} \|\| $guarantorid;
767	my $guarantor = $guarantorid ? Koha::Patrons->find( $guarantorid ) : undef;
768	$template->param(	761	$template->param(
769	patron => $patron, # Used by address include templates now	762	patron => $patron, # Used by address include templates now
770	nodouble => $nodouble,	763	nodouble => $nodouble,
771	borrowernumber => $borrowernumber, #register number	764	borrowernumber => $borrowernumber, #register number
772	guarantor => $guarantor,
773	guarantorid => $guarantorid,
774	relshiploop => \@relshipdata,	765	relshiploop => \@relshipdata,
775	btitle=> $default_borrowertitle,	766	btitle=> $default_borrowertitle,
776	guarantorinfo => $guarantorinfo,
777	flagloop => \@flagdata,	767	flagloop => \@flagdata,
778	category_type =>$category_type,	768	category_type =>$category_type,
779	modify => $modify,	769	modify => $modify,
Lines 901-906 sub patron_attributes_form { Link Here
901		891
902	}	892	}
903		893
		894	sub add_guarantors {
		895	my ( $borrowernumber, $input ) = @_;
		896
		897	my @new_guarantor_id = scalar $input->param('new_guarantor_id');
		898	my @new_guarantor_surname = scalar $input->param('new_guarantor_surname');
		899	my @new_guarantor_firstname = scalar $input->param('new_guarantor_firstname');
		900	my @new_guarantor_relationship = scalar $input->param('new_guarantor_relationship');
		901
		902	for ( my $i = 0 ; $i < scalar @new_guarantor_id; $i++ ) {
		903	my $guarantor_id = $new_guarantor_id[$i];
		904	my $surname = $new_guarantor_surname[$i];
		905	my $firstname = $new_guarantor_firstname[$i];
		906	my $relationship = $new_guarantor_relationship[$i];
		907
		908	if ($guarantor_id) {
		909	Koha::Patron::Relationship->new(
		910	{
		911	guarantee_id => $borrowernumber,
		912	guarantor_id => $guarantor_id,
		913	relationship => $relationship
		914	}
		915	)->store();
		916	}
		917	elsif ($surname) {
		918	Koha::Patron::Relationship->new(
		919	{
		920	guarantee_id => $borrowernumber,
		921	surname => $surname,
		922	firstname => $firstname,
		923	relationship => $relationship
		924	}
		925	)->store();
		926	}
		927	}
		928	}
		929
904	# Local Variables:	930	# Local Variables:
905	# tab-width: 8	931	# tab-width: 8
906	# End:	932	# End:

Lines 172-193 if ( $patron->is_child ) { Link Here

(-)a/members/moremember.pl (-15 / +13 lines)
172	}	172	}
173		173
174	my @relatives;	174	my @relatives;
175	if ( my $guarantor = $patron->guarantor ) {	175	my $guarantor_relationships = $patron->guarantor_relationships;
176	$template->param( guarantor => $guarantor );	176	my @guarantees = $patron->guarantee_relationships->guarantees;
177	push @relatives, $guarantor->borrowernumber;	177	my @guarantors = $guarantor_relationships->guarantors;
178	push @relatives, $_->borrowernumber for $patron->siblings;	178	if (@guarantors) {
179	} elsif ( $patron->contactname \|\| $patron->contactfirstname ) {	179	push( @relatives, $_->id ) for @guarantors;
180	$template->param(	180	push( @relatives, $_->id ) for $patron->siblings();
181	guarantor => {
182	firstname => $patron->contactfirstname,
183	surname => $patron->contactname,
184	}
185	);
186	} else {
187	my @guarantees = $patron->guarantees;
188	$template->param( guarantees => \@guarantees );
189	push @relatives, $_->borrowernumber for @guarantees;
190	}	181	}
		182	else {
		183	push( @relatives, $_->id ) for @guarantees;
		184	}
		185	$template->param(
		186	guarantor_relationships => $guarantor_relationships,
		187	guarantees => \@guarantees,
		188	);
191		189
192	my $relatives_issues_count =	190	my $relatives_issues_count =
193	Koha::Database->new()->schema()->resultset('Issue')	191	Koha::Database->new()->schema()->resultset('Issue')

Lines 95-106 my $patron = Koha::Patron->new( Link Here

(-)a/t/Patron.t (-22 / +2 lines)
95	lost => '0',	95	lost => '0',
96	debarred => '2015-04-19',	96	debarred => '2015-04-19',
97	debarredcomment => 'You are debarred',	97	debarredcomment => 'You are debarred',
98	contactname => 'myContactname',
99	contactfirstname => 'myContactfirstname',
100	contacttitle => 'myContacttitle',
101	guarantorid => '123454321',
102	borrowernotes => 'borrowernotes',	98	borrowernotes => 'borrowernotes',
103	relationship => 'myRelationship',
104	sex => 'M',	99	sex => 'M',
105	password => 'hfkurhfe976634èj!',	100	password => 'hfkurhfe976634èj!',
106	flags => '55555',	101	flags => '55555',
Lines 125-131 my $patron = Koha::Patron->new( Link Here
125		120
126	# patron Accessor tests	121	# patron Accessor tests
127	subtest 'Accessor tests' => sub {	122	subtest 'Accessor tests' => sub {
128	plan tests => 65;	123	plan tests => 60;
129	is( $patron->borrowernumber, '12345', 'borrowernumber accessor returns correct value' );	124	is( $patron->borrowernumber, '12345', 'borrowernumber accessor returns correct value' );
130	is( $patron->cardnumber, '1234567890', 'cardnumber accessor returns correct value' );	125	is( $patron->cardnumber, '1234567890', 'cardnumber accessor returns correct value' );
131	is( $patron->surname, 'mySurname', 'surname accessor returns correct value' );	126	is( $patron->surname, 'mySurname', 'surname accessor returns correct value' );
Lines 166-177 subtest 'Accessor tests' => sub { Link Here
166	is( $patron->lost, '0', 'lost accessor returns correct value' );	161	is( $patron->lost, '0', 'lost accessor returns correct value' );
167	is( $patron->debarred, '2015-04-19', 'debarred accessor returns correct value' );	162	is( $patron->debarred, '2015-04-19', 'debarred accessor returns correct value' );
168	is( $patron->debarredcomment, 'You are debarred', 'debarredcomment accessor returns correct value' );	163	is( $patron->debarredcomment, 'You are debarred', 'debarredcomment accessor returns correct value' );
169	is( $patron->contactname, 'myContactname', 'contactname accessor returns correct value' );
170	is( $patron->contactfirstname, 'myContactfirstname', 'contactfirstname accessor returns correct value' );
171	is( $patron->contacttitle, 'myContacttitle', 'contacttitle accessor returns correct value' );
172	is( $patron->guarantorid, '123454321', 'guarantorid accessor returns correct value' );
173	is( $patron->borrowernotes, 'borrowernotes', 'borrowernotes accessor returns correct value' );	164	is( $patron->borrowernotes, 'borrowernotes', 'borrowernotes accessor returns correct value' );
174	is( $patron->relationship, 'myRelationship', 'relationship accessor returns correct value' );
175	is( $patron->sex, 'M', 'sex accessor returns correct value' );	165	is( $patron->sex, 'M', 'sex accessor returns correct value' );
176	is( $patron->password, 'hfkurhfe976634èj!', 'password accessor returns correct value' );	166	is( $patron->password, 'hfkurhfe976634èj!', 'password accessor returns correct value' );
177	is( $patron->flags, '55555', 'flags accessor returns correct value' );	167	is( $patron->flags, '55555', 'flags accessor returns correct value' );
Lines 195-201 subtest 'Accessor tests' => sub { Link Here
195		185
196	# patron Set tests	186	# patron Set tests
197	subtest 'Set tests' => sub {	187	subtest 'Set tests' => sub {
198	plan tests => 65;	188	plan tests => 60;
199		189
200	$patron->set(	190	$patron->set(
201	{	191	{
Lines 239-250 subtest 'Set tests' => sub { Link Here
239	lost => '1',	229	lost => '1',
240	debarred => '2016-04-19',	230	debarred => '2016-04-19',
241	debarredcomment => 'You are still debarred',	231	debarredcomment => 'You are still debarred',
242	contactname => 'SmyContactname',
243	contactfirstname => 'SmyContactfirstname',
244	contacttitle => 'SmyContacttitle',
245	guarantorid => '223454321',
246	borrowernotes => 'Sborrowernotes',	232	borrowernotes => 'Sborrowernotes',
247	relationship => 'SmyRelationship',
248	sex => 'F',	233	sex => 'F',
249	password => 'zerzerzer#',	234	password => 'zerzerzer#',
250	flags => '666666',	235	flags => '666666',
Lines 307-318 subtest 'Set tests' => sub { Link Here
307	is( $patron->lost, '1', 'lost field set ok' );	292	is( $patron->lost, '1', 'lost field set ok' );
308	is( $patron->debarred, '2016-04-19', 'debarred field set ok' );	293	is( $patron->debarred, '2016-04-19', 'debarred field set ok' );
309	is( $patron->debarredcomment, 'You are still debarred', 'debarredcomment field set ok' );	294	is( $patron->debarredcomment, 'You are still debarred', 'debarredcomment field set ok' );
310	is( $patron->contactname, 'SmyContactname', 'contactname field set ok' );
311	is( $patron->contactfirstname, 'SmyContactfirstname', 'contactfirstname field set ok' );
312	is( $patron->contacttitle, 'SmyContacttitle', 'contacttitle field set ok' );
313	is( $patron->guarantorid, '223454321', 'guarantorid field set ok' );
314	is( $patron->borrowernotes, 'Sborrowernotes', 'borrowernotes field set ok' );	295	is( $patron->borrowernotes, 'Sborrowernotes', 'borrowernotes field set ok' );
315	is( $patron->relationship, 'SmyRelationship', 'relationship field set ok' );
316	is( $patron->sex, 'F', 'sex field set ok' );	296	is( $patron->sex, 'F', 'sex field set ok' );
317	is( $patron->password, 'zerzerzer#', 'password field set ok' );	297	is( $patron->password, 'zerzerzer#', 'password field set ok' );
318	is( $patron->flags, '666666', 'flags field set ok' );	298	is( $patron->flags, '666666', 'flags field set ok' );

Lines 26-31 use C4::Accounts qw( manualinvoice ); Link Here

(-)a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t (-6 / +19 lines)
26	use C4::Circulation qw( CanBookBeIssued );	26	use C4::Circulation qw( CanBookBeIssued );
27	use Koha::Account::Lines;	27	use Koha::Account::Lines;
28	use Koha::Account::Offsets;	28	use Koha::Account::Offsets;
		29	use Koha::Patron::Relationship;
29		30
30	my $schema = Koha::Database->new->schema;	31	my $schema = Koha::Database->new->schema;
31	$schema->storage->txn_begin;	32	$schema->storage->txn_begin;
Lines 52-63 my $patron = $builder->build_object( Link Here
52	}	53	}
53	}	54	}
54	);	55	);
55	my $guarantee = $builder->build(	56
		57	my $guarantee = $builder->build_object(
56	{	58	{
57	source => 'Borrower',	59	class => 'Koha::Patrons',
58	value => {	60	value => {
		61	patron_category => $patron_category->{categorycode},
59	guarantorid => $patron->borrowernumber,	62	guarantorid => $patron->borrowernumber,
60	categorycode => $patron_category->{categorycode},	63	}
		64	}
		65	);
		66
		67	my $r = $builder->build_object(
		68	{
		69	class => 'Koha::Patron::Relationships',
		70	value => {
		71	guarantor_id => $patron->id,
		72	guarantee_id => $guarantee->id,
		73	relationship => 'parent',
61	}	74	}
62	}	75	}
63	);	76	);
Lines 68-78 t::lib::Mocks::mock_preference( 'AllowFineOverride', '' ); Link Here
68	my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );	81	my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
69	is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );	82	is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );
70		83
71	manualinvoice( $guarantee->{borrowernumber}, undef, undef, 'L', 10.00 );	84	manualinvoice( $guarantee->id, undef, undef, 'L', 10.00 );
72	( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );	85	( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
73	is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );	86	is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );
74		87
75	my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->{borrowernumber} })->next();	88	my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->id })->next();
76	is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );	89	is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );
77	is( $accountline->accounttype, "L", "Account type is L" );	90	is( $accountline->accounttype, "L", "Account type is L" );
78		91

Lines 35-40 use Koha::Holds; Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-15 / +21 lines)
35	use Koha::Patron;	35	use Koha::Patron;
36	use Koha::Patrons;	36	use Koha::Patrons;
37	use Koha::Patron::Categories;	37	use Koha::Patron::Categories;
		38	use Koha::Patron::Relationship;
38	use Koha::Database;	39	use Koha::Database;
39	use Koha::DateUtils;	40	use Koha::DateUtils;
40	use Koha::Virtualshelves;	41	use Koha::Virtualshelves;
Lines 85-107 subtest 'library' => sub { Link Here
85		86
86	subtest 'guarantees' => sub {	87	subtest 'guarantees' => sub {
87	plan tests => 8;	88	plan tests => 8;
88	my $guarantees = $new_patron_1->guarantees;	89	my $guarantees = $new_patron_1->guarantee_relationships;
89	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	90	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );
90	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee' );	91	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee relationships' );
91	my @guarantees = $new_patron_1->guarantees;	92	my @guarantees = $new_patron_1->guarantee_relationships;
92	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	93	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
93	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );	94	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );
94		95
95	my $guarantee_1 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	96	my $guarantee_1 = $builder->build({ source => 'Borrower' });
96	my $guarantee_2 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	97	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
		98	my $guarantee_2 = $builder->build({ source => 'Borrower' });
		99	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_2->{borrowernumber} } )->store();
97		100
98	$guarantees = $new_patron_1->guarantees;	101	$guarantees = $new_patron_1->guarantee_relationships;
99	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	102	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantee_relationships should return a Koha::Patrons result set in a scalar context' );
100	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );	103	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );
101	@guarantees = $new_patron_1->guarantees;	104	@guarantees = $new_patron_1->guarantee_relationships;
102	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	105	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
103	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );	106	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );
104	$_->delete for @guarantees;	107	map { $_->guarantee->delete } @guarantees;
105	};	108	};
106		109
107	subtest 'category' => sub {	110	subtest 'category' => sub {
Lines 115-129 subtest 'siblings' => sub { Link Here
115	plan tests => 7;	118	plan tests => 7;
116	my $siblings = $new_patron_1->siblings;	119	my $siblings = $new_patron_1->siblings;
117	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );	120	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
118	my $guarantee_1 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	121	my $guarantee_1 = $builder->build( { source => 'Borrower' } );
		122	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
119	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);	123	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
120	$siblings = $retrieved_guarantee_1->siblings;	124	$siblings = $retrieved_guarantee_1->siblings;
121	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );	125	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );
122	my @siblings = $retrieved_guarantee_1->siblings;	126	my @siblings = $retrieved_guarantee_1->siblings;
123	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );	127	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );
124	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );	128	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );
125	my $guarantee_2 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	129	my $guarantee_2 = $builder->build( { source => 'Borrower' } );
126	my $guarantee_3 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	130	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_2->{borrowernumber} } )->store();
		131	my $guarantee_3 = $builder->build( { source => 'Borrower' } );
		132	my $relationship_3 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_3->{borrowernumber} } )->store();
127	$siblings = $retrieved_guarantee_1->siblings;	133	$siblings = $retrieved_guarantee_1->siblings;
128	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );	134	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );
129	is( $guarantee_2->{borrowernumber}, $siblings->next->borrowernumber, 'guarantee_2 should exist in the guarantees' );	135	is( $guarantee_2->{borrowernumber}, $siblings->next->borrowernumber, 'guarantee_2 should exist in the guarantees' );

Lines 27-32 use Koha::Database; Link Here

(-)a/t/db_dependent/Members.t (-11 / +7 lines)
27	use Koha::Holds;	27	use Koha::Holds;
28	use Koha::List::Patron;	28	use Koha::List::Patron;
29	use Koha::Patrons;	29	use Koha::Patrons;
		30	use Koha::Patron::Relationship;
30		31
31	use t::lib::Mocks;	32	use t::lib::Mocks;
32	use t::lib::TestBuilder;	33	use t::lib::TestBuilder;
Lines 40-48 $schema->storage->txn_begin; Link Here
40	my $builder = t::lib::TestBuilder->new;	41	my $builder = t::lib::TestBuilder->new;
41	my $dbh = C4::Context->dbh;	42	my $dbh = C4::Context->dbh;
42		43
43	# Remove invalid guarantorid's as long as we have no FK
44	$dbh->do("UPDATE borrowers b1 LEFT JOIN borrowers b2 ON b2.borrowernumber=b1.guarantorid SET b1.guarantorid=NULL where b1.guarantorid IS NOT NULL AND b2.borrowernumber IS NULL");
45
46	my $library1 = $builder->build({	44	my $library1 = $builder->build({
47	source => 'Branch',	45	source => 'Branch',
48	});	46	});
Lines 228-234 my $borrower1 = $builder->build({ Link Here
228	categorycode=>'STAFFER',	226	categorycode=>'STAFFER',
229	branchcode => $library3->{branchcode},	227	branchcode => $library3->{branchcode},
230	dateexpiry => '2015-01-01',	228	dateexpiry => '2015-01-01',
231	guarantorid=> undef,
232	},	229	},
233	});	230	});
234	my $bor1inlist = $borrower1->{borrowernumber};	231	my $bor1inlist = $borrower1->{borrowernumber};
Lines 238-244 my $borrower2 = $builder->build({ Link Here
238	categorycode=>'STAFFER',	235	categorycode=>'STAFFER',
239	branchcode => $library3->{branchcode},	236	branchcode => $library3->{branchcode},
240	dateexpiry => '2015-01-01',	237	dateexpiry => '2015-01-01',
241	guarantorid=> undef,
242	},	238	},
243	});	239	});
244		240
Lines 248-254 my $guarantee = $builder->build({ Link Here
248	categorycode=>'KIDclamp',	244	categorycode=>'KIDclamp',
249	branchcode => $library3->{branchcode},	245	branchcode => $library3->{branchcode},
250	dateexpiry => '2015-01-01',	246	dateexpiry => '2015-01-01',
251	guarantorid=> undef, # will be filled later
252	},	247	},
253	});	248	});
254		249
Lines 283-289 $patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_ Link Here
283	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');	278	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');
284		279
285	ModMember( borrowernumber => $bor1inlist, categorycode => 'CIVILIAN' );	280	ModMember( borrowernumber => $bor1inlist, categorycode => 'CIVILIAN' );
286	ModMember( borrowernumber => $guarantee->{borrowernumber} ,guarantorid=>$bor1inlist );	281	my $relationship = Koha::Patron::Relationship->new( { guarantor_id => $bor1inlist, guarantee_id => $guarantee->{borrowernumber} } )->store();
287		282
288	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );	283	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
289	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');	284	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');
Lines 293-299 $patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02', patron_list Link Here
293	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');	288	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');
294	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );	289	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
295	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');	290	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');
296	ModMember( borrowernumber => $guarantee->{borrowernumber}, guarantorid=>'' );	291
		292	$relationship->delete();
297		293
298	$builder->build({	294	$builder->build({
299	source => 'Issue',	295	source => 'Issue',
Lines 321-329 is( scalar(@$patstodel),2,'Borrowers without issues deleted by last issue date') Link Here
321		317
322	# Test GetBorrowersToExpunge and TrackLastPatronActivity	318	# Test GetBorrowersToExpunge and TrackLastPatronActivity
323	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);	319	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);
324	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN', guarantorid => undef } } );	320	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN' } } );
325	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN', guarantorid => undef } } );	321	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN' } } );
326	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN', guarantorid => undef } } );	322	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN' } } );
327	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });	323	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });
328	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );	324	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );
329	$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });	325	$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });

Line 0 Link Here

(-)a/t/db_dependent/Patron/Relationships.t (+181 lines)
		1	#!/usr/bin/perl
		2
		3	# This file is part of Koha.
		4	#
		5	# Koha is free software; you can redistribute it and/or modify it
		6	# under the terms of the GNU General Public License as published by
		7	# the Free Software Foundation; either version 3 of the License, or
		8	# (at your option) any later version.
		9	#
		10	# Koha is distributed in the hope that it will be useful, but
		11	# WITHOUT ANY WARRANTY; without even the implied warranty of
		12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		13	# GNU General Public License for more details.
		14	#
		15	# You should have received a copy of the GNU General Public License
		16	# along with Koha; if not, see <http://www.gnu.org/licenses>.
		17
		18	use Modern::Perl;
		19
		20	use Test::More tests => 67;
		21
		22	use C4::Context;
		23
		24	use t::lib::TestBuilder;
		25
		26	BEGIN {
		27	use_ok('Koha::Objects');
		28	use_ok('Koha::Patrons');
		29	use_ok('Koha::Patron::Relationship');
		30	use_ok('Koha::Patron::Relationships');
		31	}
		32
		33	# Start transaction
		34	my $dbh = C4::Context->dbh;
		35	$dbh->{AutoCommit} = 0;
		36	$dbh->{RaiseError} = 1;
		37
		38	my $builder = t::lib::TestBuilder->new();
		39
		40	# Father
		41	my $kyle = Koha::Patrons->find(
		42	$builder->build(
		43	{
		44	source => 'Borrower',
		45	value => {
		46	firstname => 'Kyle',
		47	surname => 'Hall',
		48	}
		49	}
		50	)->{borrowernumber}
		51	);
		52
		53	# Mother
		54	my $chelsea = Koha::Patrons->find(
		55	$builder->build(
		56	{
		57	source => 'Borrower',
		58	value => {
		59	firstname => 'Chelsea',
		60	surname => 'Hall',
		61	}
		62	}
		63	)->{borrowernumber}
		64	);
65
66	# Children
67	my $daria = Koha::Patrons->find(
68	$builder->build(
69	{
70	source => 'Borrower',
71	value => {
72	firstname => 'Daria',
73	surname => 'Hall',
74	}
75	}
76	)->{borrowernumber}
77	);
78
79	my $kylie = Koha::Patrons->find(
80	$builder->build(
81	{
82	source => 'Borrower',
83	value => {
84	firstname => 'Kylie',
85	surname => 'Hall',
86	}
87	}
88	)->{borrowernumber}
89	);
90
91	Koha::Patron::Relationship->new({ guarantor_id => $kyle->id, guarantee_id => $daria->id, relationship => 'father' })->store();
92	Koha::Patron::Relationship->new({ guarantor_id => $kyle->id, guarantee_id => $kylie->id, relationship => 'father' })->store();
93	Koha::Patron::Relationship->new({ guarantor_id => $chelsea->id, guarantee_id => $daria->id, relationship => 'mother' })->store();
94	Koha::Patron::Relationship->new({ guarantor_id => $chelsea->id, guarantee_id => $kylie->id, relationship => 'mother' })->store();
95	Koha::Patron::Relationship->new({ firstname => 'John', surname => 'Hall', guarantee_id => $daria->id, relationship => 'grandfather' })->store();
96	Koha::Patron::Relationship->new({ firstname => 'Debra', surname => 'Hall', guarantee_id => $daria->id, relationship => 'grandmother' })->store();
97	Koha::Patron::Relationship->new({ firstname => 'John', surname => 'Hall', guarantee_id => $kylie->id, relationship => 'grandfather' })->store();
98	Koha::Patron::Relationship->new({ firstname => 'Debra', surname => 'Hall', guarantee_id => $kylie->id, relationship => 'grandmother' })->store();
99
100	my @gr;
101
102	@gr = $kyle->guarantee_relationships();
103	is( @gr, 2, 'Found 2 guarantee relationships for father' );
104	is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
105	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
106	is( $gr[0]->relationship, 'father', 'Relationship is father' );
107	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
108	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
109	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
110	is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
111
112	is( $gr[1]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
113	is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
114	is( $gr[1]->relationship, 'father', 'Relationship is father' );
115	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
116	is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
117	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
118	is( $gr[1]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
119
120	@gr = $chelsea->guarantee_relationships();
121	is( @gr, 2, 'Found 2 guarantee relationships for mother' );
122	is( $gr[0]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
123	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
124	is( $gr[0]->relationship, 'mother', 'Relationship is mother' );
125	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
126	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
127	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
128	is( $gr[0]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
129
130	is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
131	is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
132	is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
133	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
134	is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
135	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
136	is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
137
138	@gr = $daria->guarantor_relationships();
139	is( @gr, 4, 'Found 4 guarantor relationships for child' );
140	is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
141	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
142	is( $gr[0]->relationship, 'father', 'Relationship is father' );
143	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
144	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
145	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
146	is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
147
148	is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
149	is( $gr[1]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
150	is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
151	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
152	is( $gr[1]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
153	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
154	is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
155
156	is( $gr[2]->guarantor_id, undef, 'Grandfather has no id, not a Koha patron' );
157	is( $gr[2]->firstname, 'John', 'Grandfather has first name of John' );
158	is( $gr[2]->surname, 'Hall', 'Grandfather has surname of Hall' );
159	is( $gr[2]->guarantor, undef, 'Calling guarantor method for Grandfather returns undef' );
160
161	is( $gr[3]->guarantor_id, undef, 'Grandmother has no id, not a Koha patron' );
162	is( $gr[3]->firstname, 'Debra', 'Grandmother has first name of John' );
163	is( $gr[3]->surname, 'Hall', 'Grandmother has surname of Hall' );
164	is( $gr[3]->guarantor, undef, 'Calling guarantor method for Grandmother returns undef' );
165
166	my @siblings = $daria->siblings;
167	is( @siblings, 1, 'Method siblings called in list context returns list' );
168	is( ref($siblings[0]), 'Koha::Patron', 'List contains a Koha::Patron' );
169	is( $siblings[0]->firstname, 'Kylie', 'Sibling from list first name matches correctly' );
170	is( $siblings[0]->surname, 'Hall', 'Sibling from list surname matches correctly' );
171	is( $siblings[0]->id, $kylie->id, 'Sibling from list patron id matches correctly' );
172
173	my $siblings = $daria->siblings;
174	my $sibling = $siblings->next();
175	is( ref($siblings), 'Koha::Patrons', 'Calling siblings in scalar context results in a Koha::Patrons object' );
176	is( ref($sibling), 'Koha::Patron', 'Method next returns a Koha::Patron' );
177	is( $sibling->firstname, 'Kylie', 'Sibling from scalar first name matches correctly' );
178	is( $sibling->surname, 'Hall', 'Sibling from scalar surname matches correctly' );
179	is( $sibling->id, $kylie->id, 'Sibling from scalar patron id matches correctly' );
180
181	1;