Attachment #77290 for bug #14570

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

Lines 462-468 C4::Auth - Authenticates Koha users Link Here

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

            FROM   borrowers
            JOIN   categories USING (categorycode)
            LEFT JOIN (
                SELECT guarantor_id
                FROM borrower_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 72-79 sub new { Link Here

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


            # Set default values if not set
            $self->sms_provider_id(undef) unless $self->sms_provider_id;
            $self->guarantorid(undef)     unless $self->guarantorid;

            unless ( $self->in_storage ) {    #AddMember


    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

Returns a Koha::Library object representing the patron's home 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

Return true if the patron has a category with a type Child (C)

=cut

sub is_child {
    my( $self ) = @_;
    return $self->category->category_type eq 'C' ? 1 : 0;


}


=head3 add_guarantor

    my @relationships = $patron->add_guarantor(
        {
            borrowernumber => $borrowernumber,
            relationships  => $relationship,
        }
    );

    Adds a new guarantor to a patron.

=cut

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

    my $guarantor_id = $params->{guarantor_id};
    my $relationship = $params->{relationship};

    return Koha::Patron::Relationship->new(
        {
            guarantee_id => $self->id,
            guarantor_id => $guarantor_id,
            relationship => $relationship
        }
    )->store();
}

=head2 Internal methods

=head3 _type




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 'BorrowerRelationship';
}

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 'BorrowerRelationship';
}

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 (+16 lines)
213	next LINE;	213	next LINE;
214	}	214	}
215		215
		216	my $relationship = $borrower{relationship};
		217	my $guarantor_id = $borrower{guarantor_id};
		218	delete $borrower{relationship};
		219	delete $borrower{guarantor_id};
		220
216	if ($borrowernumber) {	221	if ($borrowernumber) {
217		222
218	# borrower exists	223	# borrower exists
Lines 349-354 sub import_patrons { Link Here
349	);	354	);
350	}	355	}
351	}	356	}
		357
		358	# Add a guarantor if we are given a relationship
		359	if ( $guarantor_id ) {
		360	Koha::Patron::Relationship->new(
		361	{
		362	guarantee_id => $borrowernumber,
		363	relationship => $relationship,
		364	guarantor_id => $guarantor_id,
		365	}
		366	)->store();
		367	}
352	}	368	}
353		369
354	return {	370	return {




# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-06 14:12:40
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LaQWPXzF1Amzt8fgEEyHdg

__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::BorrowerRelationship;

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

=head1 NAME

Koha::Schema::Result::BorrowerRelationship

=cut

use strict;
use warnings;

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

=head1 TABLE: C<borrower_relationships>

=cut

__PACKAGE__->table("borrower_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

=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 },
);

=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.07046 @ 2018-07-18 10:52:59
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R8RThgcrct40Zq0UMW3TWQ


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




    : '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 `borrower_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,
      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 borrower_relationships ( guarantor_id, guarantee_id, relationship ) SELECT guarantorid, borrowernumber, relationship FROM borrowers WHERE guarantorid IS NOT NULL;

ALTER TABLE borrowers DROP guarantorid;
ALTER TABLE deletedborrowers DROP guarantorid;
ALTER TABLE borrowermodification DROP guarantorid;




  `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

  `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

  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,

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

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

DROP TABLE IF EXISTS borrower_relationships;
CREATE TABLE `borrower_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,
      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;guarantor_id=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
        [% END %]
        [% IF CAN_user_borrowers_edit_borrowers %]
            <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="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>
        <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' %]
                            <li id="contact-details">
                                <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>
                                <span>[% r.guarantor.surname %]</span>
                            </li>
                        [% ELSE %]
                            <li id="contact-details">
                                <span class="label">Patron #:</span>
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>
                            </li>

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

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

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

                            <li>
                                <label for="delete_guarantor-[% r.id %]">Delete: </label>
                                <input type="checkbox" id="delete_guarantor-[% r.id %]" 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>

            <ol>
                <input type="hidden" id="guarantor_id" value="" />
                <input name="guarantor_surname" id="guarantor_surname" type="hidden" />
                <input name="guarantor_firstname" id="guarantor_firstname" type="hidden" />

                <li>
                    <a href="#" id="guarantor_search" class="btn btn-sm"><i class="fa fa-search"></i> Search</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>
            <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
        </li>
    [% END %]
        </ol>
    </fieldset>

[% END %]


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

[% END # nostreet && nocity etc group%]

[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
    <fieldset class="rows" id="memberentry_contact">
        <legend id="contact_lgd">Contact</legend><ol>
        [% UNLESS nophone %]
      <li>
      [% IF ( mandatoryphone ) %]
      <label for="phone" class="required">
      [% ELSE %]
      <label for="phone">
      [% END %]
      Primary phone: </label>
        <input type="text" id="phone" name="phone" value="[% phone | html %]" />
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>

        [% UNLESS nocontactname %]
            <li>
                [% IF ( mandatorycontactname ) %]
                    <label for="contactname" class="required">
                [% ELSE %]
                    <label for="contactname">
                [% END %]
                Guarantor surname: </label>
                <input type="text" id="contactname" name="contactname" value="[% contactname | html %]" />
                [% IF ( mandatorycontactname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor surname</div>
            </li>
        [% END %]

        [% UNLESS nocontactfirstname %]
            <li>
                [% IF ( mandatorycontactfirstname ) %]
                    <label for="contactfirstname" class="required">
                [% ELSE %]
                    <label for="contactfirstname">
                [% END %]
                Guarantor first name: </label>
                <input type="text" id="contactfirstname" name="contactfirstname" value="[% contactfirstname | html %]" />
                [% IF ( mandatorycontactfirstname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor first name</div>
            </li>
        [% END %]

		[% UNLESS norelationship %]
			[% IF possible_relationships %]
                <li>
                    <label for="relationship">Relationship: </label>
                    <select class="relationship" name="relationship">
                        <option value=""></option>
                        [% FOREACH pr IN possible_relationships.split('\|') %]
                            [% IF pr == relationship %]
                                <option value="[% pr %]" selected="selected">[% pr %]</option>
                            [% ELSE %]
                                <option value="[% pr %]">[% pr %]</option>
                            [% END %]
                        [% END %]
                    </select>
                </li>
			[% END %]
		[% END %]

        [% UNLESS nophone %]
            <li>
                [% IF ( mandatoryphone ) %]
                    <label for="phone" class="required">
                [% ELSE %]
                    <label for="phone">
                [% END %]
                Primary phone: </label>
                <input type="text" id="phone" name="phone" value="[% phone | html %]" />
                [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
            </li>
        [% END %]

        [% UNLESS nophonepro %]
            <li>
                [% IF ( mandatoryphonepro ) %]
                    <label for="phonepro" class="required">
                [% ELSE %]
                    <label for="phonepro">
                [% END %]
                Secondary phone: </label>
                <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" />
                [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
            </li>
        [% END %]

        [% UNLESS nomobile %]
            <li>
                [% IF ( mandatorymobile ) %]
                    <label for="mobile" class="required">
                [% ELSE %]
                    <label for="mobile">
                [% END %]
                Other phone: </label>
                <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" />
                [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
            </li>
        [% END %]
        [% UNLESS noemail %]
    <li>
      [% IF ( mandatoryemail ) %]
      <label for="email" class="required">
      [% ELSE %]
      <label for="email">
      [% END %]
      Primary email: </label>
        <input type="text" id="email" name="email" size="45" value="[% email | html %]" />
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>

        [% UNLESS noemail %]
            <li>
                [% IF ( mandatoryemail ) %]
                    <label for="email" class="required">
                [% ELSE %]
                    <label for="email">
                [% END %]
                Primary email: </label>
                <input type="text" id="email" name="email" size="45" value="[% email | html %]" />
                [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
            </li>
        [% END %]

        [% UNLESS noemailpro %]
            <li>
                [% IF ( mandatoryemailpro ) %]
                    <label for="emailpro" class="required">
                [% ELSE %]
                    <label for="emailpro">
                [% END %]
                Secondary email: </label>
                <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" />
                [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
            </li>
        [% END %]

        [% UNLESS nofax %]
            <li>
                [% IF ( mandatoryfax ) %]
                    <label for="fax" class="required">
                [% ELSE %]
                    <label for="fax">
                [% END %]
                Fax: </label>
                <input type="text" id="fax" name="fax" value="[% fax | html %]" />
                [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
            </li>
        [% END %]
    </ol>
</fieldset>
[%END # hide fieldset %]

<!-- ************************ STEP_1 *********************** -->

                    update_category_code( category_code );
                }
            [% END %]

            [% IF guarantor %]
                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) %] );
            [% END %]

        });

        function update_cardnumber_warning(size){




                [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth | $KohaDates %]</li>[% END %]
                [% IF ( sex ) %]<li><span class="label">Gender:</span>[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %][% END %]
            [% END %]

            [% 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>
                        [% SET guarantor = gr.guarantor %]
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
                    </li>
                [% END %]
            [% END %]
	    </ol>
	</div>
    </div>
    </div>




                                                    [% END %]
                                                </ul>
                                            </li>
                                        [% ELSIF guarantor_relationships %]
                                            [% FOREACH gr IN guarantor_relationships %]
                                                <li>
                                                    <span class="label">Guarantor:</span>
                                                    [% SET guarantor = gr.guarantor %]
                                                    [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
                                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
                                                    [% END %]
                                                </li>
                                            [% END %]
                                        [% END %]
                                    </ol>
                                </div> [% # /div.rows %]




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

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

    $(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();
    });

    $(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 (-3 / +8 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 %] [% g.surname %]
		125	[%- IF ! loop.last %], [% END %]
		126	[% END %]
122	</span>	127	</span>
123	</li>	128	</li>
124	</ol>	129	</ol>
Lines 997-1003 Link Here
997	}	1002	}
998	});	1003	});
999		1004
1000	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]	1005	[% IF patron.guarantor_relationships && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
1001	$('#update_privacy_guarantor_checkouts').click( function() {	1006	$('#update_privacy_guarantor_checkouts').click( function() {
1002	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')	1007	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
1003	.done(function( data ) {	1008	.done(function( data ) {

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 %] [% g.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 109-115 if ( $patron->is_child ) { Link Here

(-)a/members/deletemem.pl (-3 / +3 lines)
109		109
110	my $op = $input->param('op') \|\| 'delete_confirm';	110	my $op = $input->param('op') \|\| 'delete_confirm';
111	my $dbh = C4::Context->dbh;	111	my $dbh = C4::Context->dbh;
112	my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);	112	my $is_guarantor = $patron->guarantee_relationships->count;
113	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or $deletelocal == 0) {	113	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or $deletelocal == 0) {
114		114
115	$template->param(	115	$template->param(
Lines 121-128 if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor or Link Here
121	if ( $charges > 0 ) {	121	if ( $charges > 0 ) {
122	$template->param(charges => $charges);	122	$template->param(charges => $charges);
123	}	123	}
124	if ($is_guarantor) {	124	if ( $is_guarantor ) {
125	$template->param(guarantees => 1);	125	$template->param( guarantees => 1 );
126	}	126	}
127	if ($deletelocal == 0) {	127	if ($deletelocal == 0) {
128	$template->param(keeplocal => 1);	128	$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->multi_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'));

            # Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store
            warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn
        } else {
            add_guarantors( $patron, $input );
            $borrowernumber = $patron->borrowernumber;
        }


                                                                # updating any columns in the borrowers table,
                                                                # which can happen if we're only editing the
                                                                # patron attributes or messaging preferences sections
        add_guarantors( $patron, $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/ ) ? 0 : 1 ); # 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 ( $patron, $input ) = @_;

    my @new_guarantor_id           = $input->multi_param('new_guarantor_id');
    my @new_guarantor_relationship = $input->multi_param('new_guarantor_relationship');

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

        next unless $guarantor_id;

        $patron->add_guarantor(
            {
                guarantee_id => $patron->id,
                guarantor_id => $guarantor_id,
                relationship => $relationship,
            }
        );
    }
}

# 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')




use C4::Output;
use Koha::Patrons;
use Koha::Patron::Categories;
use Koha::Patrons;

# use Smart::Comments;


my $borrowernumber = $input->param('borrowernumber');
my $catcode        = $input->param('catcode');
my $cattype        = $input->param('cattype');
my $catcode_multi  = $input->param('catcode_multi');
my $op             = $input->param('op');

my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";

    );
    output_html_with_http_headers $input, $cookie, $template->output;
}

elsif ( $op eq 'update' ) {
    my $patron         = Koha::Patrons->find( $borrowernumber );
    output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );

    $_->delete() for $patron->guarantor_relationships();
    $patron->guarantorid(undef);
    $patron->categorycode($catcode);
    $patron->store;

    if ($catcode_multi) {
        $template->param(
            SUCCESS        => 1,
            borrowernumber => $borrowernumber,
        );
        output_html_with_http_headers $input, $cookie, $template->output;
    }
    else {
        print $input->redirect(
            "/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"
        );
    }
}


Lines 95-100 C<juv2adult.pl> - Suggests that you read this help. :) Link Here

(-)a/misc/cronjobs/j2a.pl (-12 / +46 lines)
95	C<juv2adult.pl> -b=<branchcode> -f=<categorycode> -t=<categorycode> - Processes a single branch, and updates the patron categories from fromcat to tocat.	95	C<juv2adult.pl> -b=<branchcode> -f=<categorycode> -t=<categorycode> - Processes a single branch, and updates the patron categories from fromcat to tocat.
96		96
97	C<juv2adult.pl> -f=<categorycode> -t=<categorycode> -v -n - Processes all branches, shows all messages, and reports the patrons who would be affected. Takes no action on the database.	97	C<juv2adult.pl> -f=<categorycode> -t=<categorycode> -v -n - Processes all branches, shows all messages, and reports the patrons who would be affected. Takes no action on the database.
		98
98	=cut	99	=cut
99		100
100	# These variables are set by command line options.	101	# These variables are set by command line options.
Lines 163-174 $verbose and print "The age limit for category $fromcat is $agelimit\n"; Link Here
163	my $itsyourbirthday = "$year-$mon-$mday";	164	my $itsyourbirthday = "$year-$mon-$mday";
164		165
165	if ( not $noaction ) {	166	if ( not $noaction ) {
		167	# Start a transaction since we need to delete from relationships and update borrowers atomically
		168	$dbh->{AutoCommit} = 0;
		169
166	if ($mybranch) { #yep, we received a specific branch to work on.	170	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";	171	$verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
168	my $query = qq\|	172	my $where = qq\|
169	UPDATE borrowers
170	SET guarantorid ='0',
171	categorycode = ?
172	WHERE dateofbirth <= ?	173	WHERE dateofbirth <= ?
173	AND dateofbirth != '0000-00-00'	174	AND dateofbirth != '0000-00-00'
174	AND branchcode = ?	175	AND branchcode = ?
Lines 177-186 if ( not $noaction ) { Link Here
177	FROM categories	178	FROM categories
178	WHERE category_type = 'C'	179	WHERE category_type = 'C'
179	AND categorycode = ?	180	AND categorycode = ?
180	)\|;	181	)
		182	\|;
		183
		184	my $query = qq\|
		185	DELETE relationships FROM relationships
		186	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		187	$where
		188	\|;
181	my $sth = $dbh->prepare($query);	189	my $sth = $dbh->prepare($query);
		190	$sth->execute( $itsyourbirthday, $mybranch, $fromcat )
		191	or ( $dbh->rollback && die "can't execute" );
		192
		193	$query = qq\|
		194	UPDATE borrowers
		195	SET categorycode = ?
		196	$where
		197	\|;
		198	$sth = $dbh->prepare($query);
182	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )	199	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )
183	or die "can't execute";	200	or ( $dbh->rollback && die "can't execute" );
		201
		202	$dbh->commit;
184		203
185	if ( $res eq '0E0' ) {	204	if ( $res eq '0E0' ) {
186	print "No patrons updated\n";	205	print "No patrons updated\n";
Lines 191-200 if ( not $noaction ) { Link Here
191	}	210	}
192	else { # branch was not supplied, processing all branches	211	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";	212	$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\|	213	my $where = qq\|
195	UPDATE borrowers
196	SET guarantorid = '0',
197	categorycode = ?
198	WHERE dateofbirth <= ?	214	WHERE dateofbirth <= ?
199	AND dateofbirth!='0000-00-00'	215	AND dateofbirth!='0000-00-00'
200	AND categorycode IN (	216	AND categorycode IN (
Lines 202-211 if ( not $noaction ) { Link Here
202	FROM categories	218	FROM categories
203	WHERE category_type = 'C'	219	WHERE category_type = 'C'
204	AND categorycode = ?	220	AND categorycode = ?
205	)\|;	221	)
		222	\|;
		223
		224	my $query = qq\|
		225	DELETE relationships FROM relationships
		226	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		227	$where
		228	\|;
206	my $sth = $dbh->prepare($query);	229	my $sth = $dbh->prepare($query);
		230	$sth->execute( $itsyourbirthday, $fromcat )
		231	or ( $dbh->rollback && die "can't execute" );
		232
		233	$query = qq\|
		234	UPDATE borrowers
		235	SET categorycode = ?
		236	$where
		237	\|;
		238	$sth = $dbh->prepare($query);
207	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )	239	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )
208	or die "can't execute";	240	or ( $dbh->rollback && die "can't execute" );
		241	$dbh->commit;
209		242
210	if ( $res eq '0E0' ) {	243	if ( $res eq '0E0' ) {
211	print "No patrons updated\n";	244	print "No patrons updated\n";
Lines 267-272 else { Link Here
267	my $sth = $dbh->prepare($query);	300	my $sth = $dbh->prepare($query);
268	$sth->execute( $itsyourbirthday, $fromcat )	301	$sth->execute( $itsyourbirthday, $fromcat )
269	or die "Couldn't execute statement: " . $sth->errstr;	302	or die "Couldn't execute statement: " . $sth->errstr;
		303	$dbh->commit;
270		304
271	while ( my @res = $sth->fetchrow_array() ) {	305	while ( my @res = $sth->fetchrow_array() ) {
272	my $firstname = $res[0];	306	my $firstname = $res[0];

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

(-)a/opac/opac-memberentry.pl (-2 / +2 lines)
312		312
313	$template->param(	313	$template->param(
314	borrower => $borrower,	314	borrower => $borrower,
315	guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(),
316	hidden => GetHiddenFields( $mandatory, 'modification' ),	315	hidden => GetHiddenFields( $mandatory, 'modification' ),
317	csrf_token => Koha::Token->new->generate_csrf({	316	csrf_token => Koha::Token->new->generate_csrf({
318	session_id => scalar $cgi->cookie('CGISESSID'),	317	session_id => scalar $cgi->cookie('CGISESSID'),
Lines 333-339 my $captcha = random_string("CCCCC"); Link Here
333		332
334	$template->param(	333	$template->param(
335	captcha => $captcha,	334	captcha => $captcha,
336	captcha_digest => md5_base64($captcha)	335	captcha_digest => md5_base64($captcha),
		336	patron => Koha::Patrons->find( $borrowernumber ),
337	);	337	);
338		338
339	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };	339	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::Holds;
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');

Koha::Patrons->find($bor1inlist)->set({ categorycode => 'CIVILIAN' })->store;
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 => 59;

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

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, 2, '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' );

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 1419-1430 __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); Link Here

(-)a/Koha/Schema/Result/Borrower.pm (-6 lines)
1419	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-06 14:12:40	1419	# Created by DBIx::Class::Schema::Loader v0.07042 @ 2018-07-06 14:12:40
1420	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LaQWPXzF1Amzt8fgEEyHdg	1420	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:LaQWPXzF1Amzt8fgEEyHdg
1421		1421
1422	__PACKAGE__->belongs_to(
1423	"guarantor",
1424	"Koha::Schema::Result::Borrower",
1425	{ borrowernumber => "guarantorid" },
1426	);
1427
1428	__PACKAGE__->add_columns(	1422	__PACKAGE__->add_columns(
1429	'+lost' => { is_boolean => 1 },	1423	'+lost' => { is_boolean => 1 },
1430	'+gonenoaddress' => { is_boolean => 1 }	1424	'+gonenoaddress' => { is_boolean => 1 }

Lines 571-584 my $view = $batch Link Here

(-)a/circ/circulation.pl (-8 / +6 lines)
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 582-588 CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower Link Here

(-)a/installer/data/mysql/kohastructure.sql (-8 / +15 lines)
582	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	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	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	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	585	`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	586	`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	587	`sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1612-1618 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1612	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	1611	`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	1612	`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	1613	`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	1614	`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	1615	`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	1616	`sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1647-1653 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1647	KEY `categorycode` (`categorycode`),	1645	KEY `categorycode` (`categorycode`),
1648	KEY `branchcode` (`branchcode`),	1646	KEY `branchcode` (`branchcode`),
1649	UNIQUE KEY `userid` (`userid`),	1647	UNIQUE KEY `userid` (`userid`),
1650	KEY `guarantorid` (`guarantorid`),
1651	KEY `surname_idx` (`surname` (191)),	1648	KEY `surname_idx` (`surname` (191)),
1652	KEY `firstname_idx` (`firstname` (191)),	1649	KEY `firstname_idx` (`firstname` (191)),
1653	KEY `othernames_idx` (`othernames` (191)),	1650	KEY `othernames_idx` (`othernames` (191)),
Lines 3449-3460 CREATE TABLE IF NOT EXISTS `borrower_modifications` ( Link Here
3449	`lost` tinyint(1) DEFAULT NULL,	3446	`lost` tinyint(1) DEFAULT NULL,
3450	`debarred` date DEFAULT NULL,	3447	`debarred` date DEFAULT NULL,
3451	`debarredcomment` varchar(255) DEFAULT NULL,	3448	`debarredcomment` varchar(255) DEFAULT NULL,
3452	`contactname` LONGTEXT,
3453	`contactfirstname` MEDIUMTEXT,
3454	`contacttitle` MEDIUMTEXT,
3455	`guarantorid` int(11) DEFAULT NULL,
3456	`borrowernotes` LONGTEXT,	3449	`borrowernotes` LONGTEXT,
3457	`relationship` varchar(100) DEFAULT NULL,
3458	`sex` varchar(1) DEFAULT NULL,	3450	`sex` varchar(1) DEFAULT NULL,
3459	`password` varchar(30) DEFAULT NULL,	3451	`password` varchar(30) DEFAULT NULL,
3460	`flags` int(11) DEFAULT NULL,	3452	`flags` int(11) DEFAULT NULL,
Lines 4135-4140 CREATE TABLE IF NOT EXISTS club_fields ( Link Here
4135	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	4127	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4136		4128
4137	--	4129	--
		4130	-- Table structure for table 'guarantors_guarantees'
		4131	--
		4132
		4133	DROP TABLE IF EXISTS borrower_relationships;
		4134	CREATE TABLE `borrower_relationships` (
		4135	id INT(11) NOT NULL AUTO_INCREMENT,
		4136	guarantor_id INT(11) NULL DEFAULT NULL,
		4137	guarantee_id INT(11) NOT NULL,
		4138	relationship VARCHAR(100) COLLATE utf8_unicode_ci NOT NULL,
		4139	PRIMARY KEY (id),
		4140	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
		4141	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
		4142	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
		4143
		4144	--
4138	-- Table structure for table `illrequests`	4145	-- Table structure for table `illrequests`
4139	--	4146	--
4140		4147

Lines 428-451 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-5 / +5 lines)
428		428
429	<tbody>	429	<tbody>
430	[% FOREACH r IN relatives %]	430	[% FOREACH r IN relatives %]
431	[% FOREACH i IN r.issues %]	431	[% FOREACH c IN r.checkouts %]
432	<tr>	432	<tr>
433	<td>	433	<td>
434	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">	434	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber %]">
435	[% i.item.biblio.title %][% IF ( i.item.enumchron ) %] [% i.item.enumchron %][% END %]	435	[% c.item.biblio.title %][% IF ( c.item.enumchron ) %] [% c.item.enumchron %][% END %]
436	</a>	436	</a>
437	</td>	437	</td>
438		438
439	<td>	439	<td>
440	[% i.date_due \| $KohaDates %]	440	[% c.date_due \| $KohaDates %]
441	</td>	441	</td>
442		442
443	<td>	443	<td>
444	[% i.item.barcode %]	444	[% c.item.barcode %]
445	</td>	445	</td>
446		446
447	<td>	447	<td>
448	[% i.item.itemcallnumber %]	448	[% c.item.itemcallnumber %]
449	</td>	449	</td>
450		450
451	<td>	451	<td>

Lines 189-195 sub patronflags { Link Here

(-)a/C4/Members.pm (-7 / +7 lines)
189	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	189	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
190	if ( defined $no_issues_charge_guarantees ) {	190	if ( defined $no_issues_charge_guarantees ) {
191	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );	191	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );
192	my @guarantees = $p->guarantees();	192	my @guarantees = map { $_->guarantee } $p->guarantee_relationships;
193	my $guarantees_non_issues_charges;	193	my $guarantees_non_issues_charges;
194	foreach my $g ( @guarantees ) {	194	foreach my $g ( @guarantees ) {
195	$guarantees_non_issues_charges += $g->account->non_issues_charges;	195	$guarantees_non_issues_charges += $g->account->non_issues_charges;
Lines 410-427 sub GetBorrowersToExpunge { Link Here
410	FROM borrowers	410	FROM borrowers
411	JOIN categories USING (categorycode)	411	JOIN categories USING (categorycode)
412	LEFT JOIN (	412	LEFT JOIN (
413	SELECT guarantorid	413	SELECT guarantor_id
414	FROM borrowers	414	FROM borrower_relationships
415	WHERE guarantorid IS NOT NULL	415	WHERE guarantor_id IS NOT NULL
416	AND guarantorid <> 0	416	AND guarantor_id <> 0
417	) as tmp ON borrowers.borrowernumber=tmp.guarantorid	417	) as tmp ON borrowers.borrowernumber=tmp.guarantor_id
418	LEFT JOIN old_issues USING (borrowernumber)	418	LEFT JOIN old_issues USING (borrowernumber)
419	LEFT JOIN issues USING (borrowernumber)\|;	419	LEFT JOIN issues USING (borrowernumber)\|;
420	if ( $filterpatronlist ){	420	if ( $filterpatronlist ){
421	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;	421	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;
422	}	422	}
423	$query .= q\| WHERE category_type <> 'S'	423	$query .= q\| WHERE category_type <> 'S'
424	AND tmp.guarantorid IS NULL	424	AND tmp.guarantor_id IS NULL
425	\|;	425	\|;
426	my @query_params;	426	my @query_params;
427	if ( $filterbranch && $filterbranch ne "" ) {	427	if ( $filterbranch && $filterbranch ne "" ) {

Lines 29-43 use Text::Unaccent qw( unac_string ); Link Here

(-)a/Koha/Patron.pm (-33 / +82 lines)
29	use C4::Context;	29	use C4::Context;
30	use C4::Log;	30	use C4::Log;
31	use Koha::Checkouts;	31	use Koha::Checkouts;
		32	use Koha::Old::Checkouts;
32	use Koha::Database;	33	use Koha::Database;
33	use Koha::DateUtils;	34	use Koha::DateUtils;
34	use Koha::Holds;	35	use Koha::Holds;
35	use Koha::Old::Checkouts;	36	use Koha::Patrons;
36	use Koha::Patron::Categories;	37	use Koha::Patron::Categories;
		38	use Koha::Patron::Relationships;
37	use Koha::Patron::HouseboundProfile;	39	use Koha::Patron::HouseboundProfile;
38	use Koha::Patron::HouseboundRole;	40	use Koha::Patron::HouseboundRole;
39	use Koha::Patron::Images;	41	use Koha::Patron::Images;
40	use Koha::Patrons;
41	use Koha::Virtualshelves;	42	use Koha::Virtualshelves;
42	use Koha::Club::Enrollments;	43	use Koha::Club::Enrollments;
43	use Koha::Account;	44	use Koha::Account;
Lines 200-206 sub store { Link Here
200		201
201	# Set default values if not set	202	# Set default values if not set
202	$self->sms_provider_id(undef) unless $self->sms_provider_id;	203	$self->sms_provider_id(undef) unless $self->sms_provider_id;
203	$self->guarantorid(undef) unless $self->guarantorid;
204		204
205	unless ( $self->in_storage ) { #AddMember	205	unless ( $self->in_storage ) { #AddMember
206		206
Lines 412-452 sub category { Link Here
412	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );	412	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
413	}	413	}
414		414
415	=head3 guarantor	415	=head3 image
416
417	Returns a Koha::Patron object for this patron's guarantor
418		416
419	=cut	417	=cut
420		418
421	sub guarantor {
422	my ( $self ) = @_;
423
424	return unless $self->guarantorid();
425
426	return Koha::Patrons->find( $self->guarantorid() );
427	}
428
429	sub image {	419	sub image {
430	my ( $self ) = @_;	420	my ( $self ) = @_;
431		421
432	return scalar Koha::Patron::Images->find( $self->borrowernumber );	422	return scalar Koha::Patron::Images->find( $self->borrowernumber );
433	}	423	}
434		424
		425	=head3 library
		426
		427	Returns a Koha::Library object representing the patron's home library.
		428
		429	=cut
		430
435	sub library {	431	sub library {
436	my ( $self ) = @_;	432	my ( $self ) = @_;
437	return Koha::Library->_new_from_dbic($self->_result->branchcode);	433	return Koha::Library->_new_from_dbic($self->_result->branchcode);
438	}	434	}
439		435
440	=head3 guarantees	436	=head3 guarantor_relationships
441		437
442	Returns the guarantees (list of Koha::Patron) of this patron	438	Returns Koha::Patron::Relationships object for this patron's guarantors
		439
		440	Returns the set of relationships for the patrons that are guarantors for this patron.
		441
		442	This is returned instead of a Koha::Patron object because the guarantor
		443	may not exist as a patron in Koha. If this is true, the guarantors name
		444	exists in the Koha::Patron::Relationship object and will have no guarantor_id.
443		445
444	=cut	446	=cut
445		447
446	sub guarantees {	448	sub guarantor_relationships {
447	my ( $self ) = @_;	449	my ($self) = @_;
		450
		451	return Koha::Patron::Relationships->search( { guarantee_id => $self->id } );
		452	}
		453
		454	=head3 guarantee_relationships
		455
		456	Returns Koha::Patron::Relationships object for this patron's guarantors
		457
		458	Returns the set of relationships for the patrons that are guarantees for this patron.
		459
		460	The method returns Koha::Patron::Relationship objects for the sake
		461	of consistency with the guantors method.
		462	A guarantee by definition must exist as a patron in Koha.
		463
		464	=cut
		465
		466	sub guarantee_relationships {
		467	my ($self) = @_;
448		468
449	return Koha::Patrons->search( { guarantorid => $self->borrowernumber } );	469	return Koha::Patron::Relationships->search( { guarantor_id => $self->id } );
450	}	470	}
451		471
452	=head3 housebound_profile	472	=head3 housebound_profile
Lines 484-506 Returns the siblings of this patron. Link Here
484	=cut	504	=cut
485		505
486	sub siblings {	506	sub siblings {
487	my ( $self ) = @_;	507	my ($self) = @_;
488		508
489	my $guarantor = $self->guarantor;	509	my @guarantors = $self->guarantor_relationships()->guarantors();
490		510
491	return unless $guarantor;	511	return unless @guarantors;
492		512
493	return Koha::Patrons->search(	513	my @siblings =
494	{	514	map { $_->guarantee_relationships()->guarantees() } @guarantors;
495	guarantorid => {	515
496	'!=' => undef,	516	return unless @siblings;
497	'=' => $guarantor->id,	517
498	},	518	my %seen;
499	borrowernumber => {	519	@siblings =
500	'!=' => $self->borrowernumber,	520	grep { !$seen{ $_->id }++ && ( $_->id != $self->id ) } @siblings;
501	}	521
502	}	522	return wantarray ? @siblings : Koha::Patrons->search( { borrowernumber => { -in => [ map { $_->id } @siblings ] } } );
503	);
504	}	523	}
505		524
506	=head3 merge_with	525	=head3 merge_with
Lines 1222-1227 my $is_child = $patron->is_child Link Here
1222	Return true if the patron has a category with a type Child (C)	1241	Return true if the patron has a category with a type Child (C)
1223		1242
1224	=cut	1243	=cut
		1244
1225	sub is_child {	1245	sub is_child {
1226	my( $self ) = @_;	1246	my( $self ) = @_;
1227	return $self->category->category_type eq 'C' ? 1 : 0;	1247	return $self->category->category_type eq 'C' ? 1 : 0;
Lines 1293-1298 sub generate_userid { Link Here
1293		1313
1294	}	1314	}
1295		1315
		1316
		1317	=head3 add_guarantor
		1318
		1319	my @relationships = $patron->add_guarantor(
		1320	{
		1321	borrowernumber => $borrowernumber,
		1322	relationships => $relationship,
		1323	}
		1324	);
		1325
		1326	Adds a new guarantor to a patron.
		1327
		1328	=cut
		1329
		1330	sub add_guarantor {
		1331	my ( $self, $params ) = @_;
		1332
		1333	my $guarantor_id = $params->{guarantor_id};
		1334	my $relationship = $params->{relationship};
		1335
		1336	return Koha::Patron::Relationship->new(
		1337	{
		1338	guarantee_id => $self->id,
		1339	guarantor_id => $guarantor_id,
		1340	relationship => $relationship
		1341	}
		1342	)->store();
		1343	}
		1344
1296	=head2 Internal methods	1345	=head2 Internal methods
1297		1346
1298	=head3 _type	1347	=head3 _type

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 'BorrowerRelationship';
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 'BorrowerRelationship';
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/BorrowerRelationship.pm (+118 lines)
		1	use utf8;
		2	package Koha::Schema::Result::BorrowerRelationship;
		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::BorrowerRelationship
		10
		11	=cut
		12
		13	use strict;
		14	use warnings;
		15
		16	use base 'DBIx::Class::Core';
		17
		18	=head1 TABLE: C<borrower_relationships>
		19
		20	=cut
		21
		22	__PACKAGE__->table("borrower_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	=cut
		51
		52	__PACKAGE__->add_columns(
		53	"id",
		54	{ data_type => "integer", is_auto_increment => 1, is_nullable => 0 },
		55	"guarantor_id",
		56	{ data_type => "integer", is_foreign_key => 1, is_nullable => 1 },
		57	"guarantee_id",
		58	{ data_type => "integer", is_foreign_key => 1, is_nullable => 0 },
		59	"relationship",
		60	{ data_type => "varchar", is_nullable => 0, size => 100 },
		61	);
		62
		63	=head1 PRIMARY KEY
		64
65	=over 4
66
67	=item * L</id>
68
69	=back
70
71	=cut
72
73	__PACKAGE__->set_primary_key("id");
74
75	=head1 RELATIONS
76
77	=head2 guarantee
78
79	Type: belongs_to
80
81	Related object: L<Koha::Schema::Result::Borrower>
82
83	=cut
84
85	__PACKAGE__->belongs_to(
86	"guarantee",
87	"Koha::Schema::Result::Borrower",
88	{ borrowernumber => "guarantee_id" },
89	{ is_deferrable => 1, on_delete => "CASCADE", on_update => "CASCADE" },
90	);
91
92	=head2 guarantor
93
94	Type: belongs_to
95
96	Related object: L<Koha::Schema::Result::Borrower>
97
98	=cut
99
100	__PACKAGE__->belongs_to(
101	"guarantor",
102	"Koha::Schema::Result::Borrower",
103	{ borrowernumber => "guarantor_id" },
104	{
105	is_deferrable => 1,
106	join_type => "LEFT",
107	on_delete => "CASCADE",
108	on_update => "CASCADE",
109	},
110	);
111
112
113	# Created by DBIx::Class::Schema::Loader v0.07046 @ 2018-07-18 10:52:59
114	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:R8RThgcrct40Zq0UMW3TWQ
115
116
117	# You can replace this text with custom code or comments, and it will be preserved on regeneration
118	1;

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_14570.sql (+17 lines)
	1	CREATE TABLE `borrower_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	PRIMARY KEY (id),
	7	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
	8	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
	9	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
	10
	11	UPDATE borrowers LEFT JOIN borrowers guarantor ON ( borrowers.guarantorid = guarantor.borrowernumber ) SET borrowers.guarantorid = NULL WHERE guarantor.borrowernumber IS NULL;
	12
	13	INSERT INTO borrower_relationships ( guarantor_id, guarantee_id, relationship ) SELECT guarantorid, borrowernumber, relationship FROM borrowers WHERE guarantorid IS NOT NULL;
	14
	15	ALTER TABLE borrowers DROP guarantorid;
	16	ALTER TABLE deletedborrowers DROP guarantorid;
	17	ALTER TABLE borrowermodification DROP guarantorid;

Lines 6-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-10 / +6 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&guarantor_id=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
20	[% END %]
21	[% IF CAN_user_borrowers_edit_borrowers %]
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>
23	[% END %]	17	[% END %]
		18
		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>
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 (-170 / +235 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 297-409 Link Here
297	</fieldset>	298	</fieldset>
298	[% END # hide fieldset %]	299	[% END # hide fieldset %]
299		300
300	[% IF ( showguarantor ) %]	301	[% IF show_guarantor \|\| guarantor %]
301	<input type="hidden" id="guarantorid" name="guarantorid" value="[% guarantorid %]" />	302	[% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
302	[% UNLESS step_6 %]	303	<fieldset class="rows">
303	<input type="hidden" name="branchcode" value="[% branchcode %]" />	304	<legend>Guarantor information</legend>
304	[% END %]	305
305	<fieldset id="memberentry_guarantor" class="rows">	306	<span id="guarantor_relationships">
306	<legend id="guarantor_lgd">Guarantor information</legend>	307	[% FOREACH r IN relationships %]
307	<ol>	308	<fieldset class="rows">
308	[% IF ( P ) %]	309	<ol>
309	[% IF ( guarantorid ) %]	310	[% IF category_type == 'P' %]
310	<li id="contact-details">	311	<li id="contact-details">
311	[% ELSE %]	312	<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 %]
312	<li id="contact-details" style="display: none">	313	</li>
313	[% END %]	314
314	<span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]	315	<li>
315	</li>	316	<label for="guarantor_surname">Organization name: </label>
316	<li>	317	<span>[% r.guarantor.surname %]</span>
317	<label for="contactname">Organization name: </label>	318	</li>
318	[% IF ( guarantorid ) %]	319	[% ELSE %]
319	<span>[% contactname %]</span>	320	<li id="contact-details">
320	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	321	<span class="label">Patron #:</span>
321	[% ELSE %]	322	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id %]" target="blank">[% r.guarantor_id %]</a>
322	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	323	</li>
323	[% END %]	324
324	</li>	325	[% IF r.guarantor.surname %]
325	[% ELSE %]	326	<li>
326	[% IF ( C ) %]	327	<label for="guarantor_surname">Surname: </label>
327	[% IF ( guarantorid ) %]	328	<span>[% r.guarantor.surname %]</span>
328	<li id="contact-details">	329	</li>
329	[% ELSE %]	330	[% END %]
330	<li id="contact-details" style="display: none">	331
331	[% END %]	332	[% IF r.guarantor.firstname %]
332	<span class="label">Patron #:</span>	333	<li>
333	[% IF guarantorid %]	334	<label for="guarantor_firstname">First name: </label>
334	[% IF logged_in_user.can_see_patron_infos( guarantor ) %]	335	<span>[% r.guarantor.firstname %]</span>
335	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid \| html %]</a>	336	</li>
336	[% ELSE %]	337	[% END %]
337	[% guarantorid \| html %]	338
338	[% END %]	339	<li>
339	[% END %]	340	<label for="relationship">Relationship: </label>
340	</li>	341	<span>[% r.relationship %]</span>
341	[% UNLESS nocontactname %]	342	</li>
342	<li>	343
343	<label for="contactname">Surname: </label>	344	<li>
344	[% IF ( guarantorid ) %]	345	<label for="delete_guarantor-[% r.id %]">Delete: </label>
345	<span>[% contactname %]</span>	346	<input type="checkbox" id="delete_guarantor-[% r.id %]" name="delete_guarantor" value="[% r.id %]" />
346	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	347	</li>
347	[% ELSE %]	348	[% END %]
348	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	349	</ol>
349	[% END %]	350	</fieldset>
350	</li>	351	[% END # END relationships foreach %]
351	[% END %]	352	</span>
352	[% UNLESS nocontactfirstname %]	353
353	<li>	354	<fieldset class="rows guarantor" id="guarantor_template">
354	<label for="contactfirstname">First name: </label>	355	<ol>
355	[% IF ( guarantorid ) %]	356	<li class="guarantor_id">
356	<span>[% contactfirstname %]</span>	357	<span class="label">Patron #:</span>
357	<input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname \| html %]" />	358	<span class="new_guarantor_id_text"></span>
358	[% ELSE %]	359	<input type="hidden" class="new_guarantor_id" name="new_guarantor_id" value=""/>
359	<input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname \| html %]" />	360	</li>
360	[% END %]	361
361	</li>	362	<li>
362	[% END %]	363	<label for="guarantor_surname">Surname: </label>
363	[% IF ( relshiploop ) %]	364	<span class="new_guarantor_surname_text"></span>
364	<li>	365	<input type="hidden" class="new_guarantor_surname" name="new_guarantor_surname" value=""/>
365	<label for="relationship">Relationship: </label>	366	</li>
366	<select name="relationship" id="relationship" >	367
367	[% FOREACH relshiploo IN relshiploop %]	368	<li>
368	[% IF ( relshiploo.selected ) %]	369	<label for="guarantor_firstname">First name: </label>
369	<option value="[% relshiploo.relationship %]" selected="selected" >[% relshiploo.relationship %]</option>	370	<span class="new_guarantor_firstname_text"></span>
370	[% ELSE %]	371	<input type="hidden" class="new_guarantor_firstname" name="new_guarantor_firstname" value=""/>
371	<option value="[% relshiploo.relationship %]">[% relshiploo.relationship %]</option>	372	</li>
372	[% END %]	373
373	[% END %]	374	<li>
374	</select>	375	<label for="guarantor_relationship">Relationship: </label>
375	</li>	376	<select class="new_guarantor_relationship" name="new_guarantor_relationship">
376	[% END %]	377	[% FOREACH pr IN possible_relationships.split('\\|') %]
377	[% END %]	378	<option value="[% pr %]">[% pr %]</option>
378	[% END %]	379	[% END %]
379	<li>	380	</select>
380	<span class="label"> </span>	381	</li>
381	[% IF ( guarantorid ) %]	382
382	<input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />	383	<li>
383	[% ELSE %]	384	<label for="guarantor_cancel"> </label>
384	<input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" />	385	<span><a href="#" class="guarantor_cancel">Cancel</a></span>
385	[% END %]	386	</li>
386	<input id="guarantordelete" type="button" value="Delete" />	387	</ol>
387	</li>	388	</fieldset>
388	[% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]	389
389	<li>	390	<ol>
390	<label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>	391	<input type="hidden" id="guarantor_id" value="" />
391	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">	392	<input name="guarantor_surname" id="guarantor_surname" type="hidden" />
392	[% IF privacy_guarantor_checkouts %]	393	<input name="guarantor_firstname" id="guarantor_firstname" type="hidden" />
393	<option value="0">No</option>	394
394	<option value="1" selected>Yes</option>	395	<li>
395	[% ELSE %]	396	<a href="#" id="guarantor_search" class="btn btn-sm"><i class="fa fa-search"></i> Search</a>
396	<option value="0" selected>No</option>	397	</li>
397	<option value="1">Yes</option>	398
		399	[% IF relationships && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
		400	<li>
		401	<label for="privacy_guarantor_checkouts">Show checkouts to guarantors</label>
		402	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
		403	[% IF privacy_guarantor_checkouts %]
		404	<option value="0">No</option>
		405	<option value="1" selected>Yes</option>
		406	[% ELSE %]
		407	<option value="0" selected>No</option>
		408	<option value="1">Yes</option>
		409	[% END %]
		410	</select>
		411	<div class="hint">Allow guarantors of this patron to view this patron's checkouts from the OPAC</div>
		412	</li>
398	[% END %]	413	[% END %]
399	</select>	414	</ol>
400	<div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
401	</li>
402	[% END %]
403	</ol>
404	</fieldset>	415	</fieldset>
405
406	[% END %]	416	[% END %]
		417
		418
407	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]	419	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
408	[% IF Koha.Preference( 'AddressFormat' ) %]	420	[% IF Koha.Preference( 'AddressFormat' ) %]
409	[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]	421	[% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
Lines 413-496 Link Here
413	[% END # nostreet && nocity etc group%]	425	[% END # nostreet && nocity etc group%]
414		426
415	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]	427	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
416	<fieldset class="rows" id="memberentry_contact">	428	<fieldset class="rows" id="memberentry_contact">
417	<legend id="contact_lgd">Contact</legend><ol>	429	<legend id="contact_lgd">Contact</legend><ol>
418	[% UNLESS nophone %]
419	<li>
420	[% IF ( mandatoryphone ) %]
421	<label for="phone" class="required">
422	[% ELSE %]
423	<label for="phone">
424	[% END %]
425	Primary phone: </label>
426	<input type="text" id="phone" name="phone" value="[% phone \| html %]" />
427	[% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
428		430
429	</li>	431	[% UNLESS nocontactname %]
		432	<li>
		433	[% IF ( mandatorycontactname ) %]
		434	<label for="contactname" class="required">
		435	[% ELSE %]
		436	<label for="contactname">
		437	[% END %]
		438	Guarantor surname: </label>
		439	<input type="text" id="contactname" name="contactname" value="[% contactname \| html %]" />
		440	[% IF ( mandatorycontactname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor surname</div>
		441	</li>
430	[% END %]	442	[% END %]
		443
		444	[% UNLESS nocontactfirstname %]
		445	<li>
		446	[% IF ( mandatorycontactfirstname ) %]
		447	<label for="contactfirstname" class="required">
		448	[% ELSE %]
		449	<label for="contactfirstname">
		450	[% END %]
		451	Guarantor first name: </label>
		452	<input type="text" id="contactfirstname" name="contactfirstname" value="[% contactfirstname \| html %]" />
		453	[% IF ( mandatorycontactfirstname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor first name</div>
		454	</li>
		455	[% END %]
		456
		457	[% UNLESS norelationship %]
		458	[% IF possible_relationships %]
		459	<li>
		460	<label for="relationship">Relationship: </label>
		461	<select class="relationship" name="relationship">
		462	<option value=""></option>
		463	[% FOREACH pr IN possible_relationships.split('\\|') %]
		464	[% IF pr == relationship %]
		465	<option value="[% pr %]" selected="selected">[% pr %]</option>
		466	[% ELSE %]
		467	<option value="[% pr %]">[% pr %]</option>
		468	[% END %]
		469	[% END %]
		470	</select>
		471	</li>
		472	[% END %]
		473	[% END %]
		474
		475	[% UNLESS nophone %]
		476	<li>
		477	[% IF ( mandatoryphone ) %]
		478	<label for="phone" class="required">
		479	[% ELSE %]
		480	<label for="phone">
		481	[% END %]
		482	Primary phone: </label>
		483	<input type="text" id="phone" name="phone" value="[% phone \| html %]" />
		484	[% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
		485	</li>
		486	[% END %]
		487
431	[% UNLESS nophonepro %]	488	[% UNLESS nophonepro %]
432	<li>	489	<li>
433	[% IF ( mandatoryphonepro ) %]	490	[% IF ( mandatoryphonepro ) %]
434	<label for="phonepro" class="required">	491	<label for="phonepro" class="required">
435	[% ELSE %]	492	[% ELSE %]
436	<label for="phonepro">	493	<label for="phonepro">
437	[% END %]	494	[% END %]
438	Secondary phone: </label>	495	Secondary phone: </label>
439	<input type="text" id="phonepro" name="phonepro" value="[% phonepro \| html %]" />	496	<input type="text" id="phonepro" name="phonepro" value="[% phonepro \| html %]" />
440	[% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]	497	[% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
441	</li>	498	</li>
442	[% END %]	499	[% END %]
		500
443	[% UNLESS nomobile %]	501	[% UNLESS nomobile %]
444	<li>	502	<li>
445	[% IF ( mandatorymobile ) %]	503	[% IF ( mandatorymobile ) %]
446	<label for="mobile" class="required">	504	<label for="mobile" class="required">
447	[% ELSE %]	505	[% ELSE %]
448	<label for="mobile">	506	<label for="mobile">
449	[% END %]	507	[% END %]
450	Other phone: </label>	508	Other phone: </label>
451	<input type="text" id="mobile" name="mobile" value="[% mobile \| html %]" />	509	<input type="text" id="mobile" name="mobile" value="[% mobile \| html %]" />
452	[% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]	510	[% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
453	</li>	511	</li>
454	[% END %]	512	[% END %]
455	[% UNLESS noemail %]
456	<li>
457	[% IF ( mandatoryemail ) %]
458	<label for="email" class="required">
459	[% ELSE %]
460	<label for="email">
461	[% END %]
462	Primary email: </label>
463	<input type="text" id="email" name="email" size="45" value="[% email \| html %]" />
464	[% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
465		513
466	</li>	514	[% UNLESS noemail %]
		515	<li>
		516	[% IF ( mandatoryemail ) %]
		517	<label for="email" class="required">
		518	[% ELSE %]
		519	<label for="email">
		520	[% END %]
		521	Primary email: </label>
		522	<input type="text" id="email" name="email" size="45" value="[% email \| html %]" />
		523	[% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
		524	</li>
467	[% END %]	525	[% END %]
		526
468	[% UNLESS noemailpro %]	527	[% UNLESS noemailpro %]
469	<li>	528	<li>
470	[% IF ( mandatoryemailpro ) %]	529	[% IF ( mandatoryemailpro ) %]
471	<label for="emailpro" class="required">	530	<label for="emailpro" class="required">
472	[% ELSE %]	531	[% ELSE %]
473	<label for="emailpro">	532	<label for="emailpro">
474	[% END %]	533	[% END %]
475	Secondary email: </label>	534	Secondary email: </label>
476	<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro \| html %]" />	535	<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro \| html %]" />
477	[% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]	536	[% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
478	</li>	537	</li>
479	[% END %]	538	[% END %]
		539
480	[% UNLESS nofax %]	540	[% UNLESS nofax %]
481	<li>	541	<li>
482	[% IF ( mandatoryfax ) %]	542	[% IF ( mandatoryfax ) %]
483	<label for="fax" class="required">	543	<label for="fax" class="required">
484	[% ELSE %]	544	[% ELSE %]
485	<label for="fax">	545	<label for="fax">
486	[% END %]	546	[% END %]
487	Fax: </label>	547	Fax: </label>
488	<input type="text" id="fax" name="fax" value="[% fax \| html %]" />	548	<input type="text" id="fax" name="fax" value="[% fax \| html %]" />
489	[% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]	549	[% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
490	</li>	550	</li>
491	[% END %]	551	[% END %]
492	</ol>	552	</ol>
493	</fieldset>	553	</fieldset>
494	[%END # hide fieldset %]	554	[%END # hide fieldset %]
495		555
496	<!-- ********************** STEP_1 ********************* -->	556	<!-- ********************** STEP_1 ********************* -->
Lines 1193-1198 Link Here
1193	update_category_code( category_code );	1253	update_category_code( category_code );
1194	}	1254	}
1195	[% END %]	1255	[% END %]
		1256
		1257	[% IF guarantor %]
		1258	select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) %] );
		1259	[% END %]
		1260
1196	});	1261	});
1197		1262
1198	function update_cardnumber_warning(size){	1263	function update_cardnumber_warning(size){

Lines 42-57 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-10 / +20 lines)
42	[% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth \| $KohaDates %]</li>[% END %]	42	[% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth \| $KohaDates %]</li>[% END %]
43	[% IF ( sex ) %]<li><span class="label">Gender:</span>[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %][% END %]	43	[% IF ( sex ) %]<li><span class="label">Gender:</span>[% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]</li>[% END %][% END %]
44	[% END %]	44	[% END %]
45	[% IF ( isguarantee ) %]	45
46	[% IF ( guaranteeloop ) %]	46	[% IF guarantees %]
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>
48	[% END %]	48	<span class="label">Guarantees:</span>
49	[% ELSE %]	49	<ul>
50	[% IF ( guarantor.borrowernumber ) %]	50	[% FOREACH guarantee IN 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><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber %]">[% guarantee.firstname %] [% guarantee.surname %]</a></li>
52	[% END %]	52	[% END %]
53	[% END %]	53	</ul>
54	</ol>	54	</li>
		55	[% ELSIF guarantor_relationships %]
		56	[% FOREACH gr IN guarantor_relationships %]
		57	<li>
		58	<span class="label">Guarantor:</span>
		59	[% SET guarantor = gr.guarantor %]
		60	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id %]">[% guarantor.firstname %] [% guarantor.surname %]</a>
		61	</li>
		62	[% END %]
		63	[% END %]
		64	</ol>
55	</div>	65	</div>
56	</div>	66	</div>
57	</div>	67	</div>

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

(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (-51 / +41 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();	172
		173	var fieldset = $('#guarantor_template').clone();
		174	fieldset.removeAttr('id');
		175
		176	var guarantor_id = $('#guarantor_id').val();
		177	if ( guarantor_id ) {
		178	fieldset.find('.new_guarantor_id').first().val( guarantor_id );
		179	fieldset.find('.new_guarantor_id_text').first().text( guarantor_id );
		180	} else {
		181	fieldset.find('.guarantor_id').first().hide();
177	}	182	}
		183	$('#guarantor_id').val("");
		184
		185	var guarantor_surname = $('#guarantor_surname').val();
		186	fieldset.find('.new_guarantor_surname').first().val( guarantor_surname );
		187	fieldset.find('.new_guarantor_surname_text').first().text( guarantor_surname );
		188	$('#guarantor_surname').val("");
		189
		190	var guarantor_firstname = $('#guarantor_firstname').val();
		191	fieldset.find('.new_guarantor_firstname').first().val( guarantor_firstname );
		192	fieldset.find('.new_guarantor_firstname_text').first().text( guarantor_firstname );
		193	$('#guarantor_firstname').val("");
178		194
179	var id = borrower.borrowernumber;	195	var guarantor_relationship = $('#relationship').val();
180	form.guarantorid.value = id;	196	fieldset.find('.new_guarantor_relationship').first().val( guarantor_relationship );
181	$('#contact-details, #quick_add_form #contact-details')	197	$('#relationship').find('option:eq(0)').prop('selected', true);;
182	.show()	198
183	.find('span')	199	$('#guarantor_relationships').append( fieldset );
184	.after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>');	200	fieldset.show();
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		201
216	return 0;	202	return 0;
217	}	203	}
Lines 284-296 $(document).ready(function(){ Link Here
284	});	270	});
285		271
286	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");	272	$("fieldset.rows input, fieldset.rows select").addClass("noEnterSubmit");
287	$("#guarantordelete").click(function() {	273
288	$("#quick_add_form #contact-details, #contact-details").hide().find('a').remove();	274	$('#guarantor_template').hide();
289	$("#quick_add_form #guarantorid, #quick_add_form #contactname, #quick_add_form #contactfirstname, #guarantorid, #contactname, #contactfirstname").each(function () { this.value = ""; });	275
290	$("#quick_add_form #contactname, #quick_add_form #contactfirstname, #contactname, #contactfirstname")	276	$('#guarantor_search').on('click', function(e) {
291	.each(function () { this.type = 'text'; })	277	e.preventDefault();
292	.parent().find('span').remove();	278	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);	279	});
		280
		281	$('#guarantor_relationships').on('click', '.guarantor_cancel', function(e) {
		282	e.preventDefault();
		283	$(this).parents('fieldset').first().remove();
294	});	284	});
295		285
296	$(document.body).on('change','select[name="select_city"]',function(){	286	$(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 / +63 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->multi_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 249-274 if ( ( $op eq 'insert' ) and !$nodouble ) { Link Here
249	}	260	}
250	}	261	}
251		262
252	#recover all data from guarantor address phone ,fax...
253	if ( $guarantorid ) {
254	if (my $guarantor = Koha::Patrons->find( $guarantorid )) {
255	my $guarantordata = $guarantor->unblessed;
256	$category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
257	$guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
258	$newdata{'contactfirstname'}= $guarantordata->{'firstname'};
259	$newdata{'contactname'} = $guarantordata->{'surname'};
260	$newdata{'contacttitle'} = $guarantordata->{'title'};
261	if ( $op eq 'add' ) {
262	foreach (qw(streetnumber address streettype address2
263	zipcode country city state phone phonepro mobile fax email emailpro branchcode
264	B_streetnumber B_streettype B_address B_address2
265	B_city B_state B_zipcode B_country B_email B_phone)) {
266	$newdata{$_} = $guarantordata->{$_};
267	}
268	}
269	}
270	}
271
272	###############test to take the right zipcode, country and city name ##############	263	###############test to take the right zipcode, country and city name ##############
273	# set only if parameter was passed from the form	264	# set only if parameter was passed from the form
274	$newdata{'city'} = $input->param('city') if defined($input->param('city'));	265	$newdata{'city'} = $input->param('city') if defined($input->param('city'));
Lines 434-439 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
434	# Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store	425	# Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store
435	warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn	426	warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn
436	} else {	427	} else {
		428	add_guarantors( $patron, $input );
437	$borrowernumber = $patron->borrowernumber;	429	$borrowernumber = $patron->borrowernumber;
438	}	430	}
439		431
Lines 537-542 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
537	# updating any columns in the borrowers table,	529	# updating any columns in the borrowers table,
538	# which can happen if we're only editing the	530	# which can happen if we're only editing the
539	# patron attributes or messaging preferences sections	531	# patron attributes or messaging preferences sections
		532	add_guarantors( $patron, $input );
540	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {	533	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
541	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);	534	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
542	}	535	}
Lines 644-654 foreach my $category_type (qw(C A S P I X)) { Link Here
644	'categoryloop' => \@categoryloop	637	'categoryloop' => \@categoryloop
645	};	638	};
646	}	639	}
647		640	$template->param(
648	$template->param('typeloop' => \@typeloop,	641	typeloop => \@typeloop,
649	no_categories => $no_categories);	642	no_categories => $no_categories,
650	if($no_categories){ $no_add = 1; }	643	);
651
652		644
653	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );	645	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
654	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );	646	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
Lines 673-696 while (@relationships) { Link Here
673	push(@relshipdata, \%row);	665	push(@relshipdata, \%row);
674	}	666	}
675		667
676	my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],	668	my %flags = (
677	'lost' => ['lost']);	669	'gonenoaddress' => ['gonenoaddress'],
		670	'lost' => ['lost']
		671	);
678		672
679
680	my @flagdata;	673	my @flagdata;
681	foreach (keys(%flags)) {	674	foreach ( keys(%flags) ) {
682	my $key = $_;	675	my $key = $_;
683	my %row = ('key' => $key,	676	my %row = (
684	'name' => $flags{$key}[0]);	677	'key' => $key,
685	if ($data{$key}) {	678	'name' => $flags{$key}[0]
686	$row{'yes'}=' checked';	679	);
687	$row{'no'}='';	680	if ( $data{$key} ) {
688	}	681	$row{'yes'} = ' checked';
689	else {	682	$row{'no'} = '';
690	$row{'yes'}='';	683	}
691	$row{'no'}=' checked';	684	else {
692	}	685	$row{'yes'} = '';
693	push @flagdata,\%row;	686	$row{'no'} = ' checked';
		687	}
		688	push @flagdata, \%row;
694	}	689	}
695		690
696	# get Branch Loop	691	# get Branch Loop
Lines 766-772 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
766	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));	761	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
767	}	762	}
768		763
769	$template->param( "showguarantor" => ($category_type=~/A\|I\|S\|X/) ? 0 : 1); # associate with step to know where you are	764	$template->param( "show_guarantor" => ( $category_type =~ /A\|I\|S\|X/ ) ? 0 : 1 ); # associate with step to know where you are
770	$debug and warn "memberentry step: $step";	765	$debug and warn "memberentry step: $step";
771	$template->param(%data);	766	$template->param(%data);
772	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are	767	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are
Lines 780-796 $template->param( Link Here
780	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)	775	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)
781	"op$op" => 1);	776	"op$op" => 1);
782		777
783	$guarantorid = $borrower_data->{'guarantorid'} \|\| $guarantorid;
784	my $guarantor = $guarantorid ? Koha::Patrons->find( $guarantorid ) : undef;
785	$template->param(	778	$template->param(
786	patron => $patron, # Used by address include templates now	779	patron => $patron, # Used by address include templates now
787	nodouble => $nodouble,	780	nodouble => $nodouble,
788	borrowernumber => $borrowernumber, #register number	781	borrowernumber => $borrowernumber, #register number
789	guarantor => $guarantor,
790	guarantorid => $guarantorid,
791	relshiploop => \@relshipdata,	782	relshiploop => \@relshipdata,
792	btitle=> $default_borrowertitle,	783	btitle=> $default_borrowertitle,
793	guarantorinfo => $guarantorinfo,
794	flagloop => \@flagdata,	784	flagloop => \@flagdata,
795	category_type =>$category_type,	785	category_type =>$category_type,
796	modify => $modify,	786	modify => $modify,
Lines 918-923 sub patron_attributes_form { Link Here
918		908
919	}	909	}
920		910
		911	sub add_guarantors {
		912	my ( $patron, $input ) = @_;
		913
		914	my @new_guarantor_id = $input->multi_param('new_guarantor_id');
		915	my @new_guarantor_relationship = $input->multi_param('new_guarantor_relationship');
		916
		917	for ( my $i = 0 ; $i < scalar @new_guarantor_id; $i++ ) {
		918	my $guarantor_id = $new_guarantor_id[$i];
		919	my $relationship = $new_guarantor_relationship[$i];
		920
		921	next unless $guarantor_id;
		922
		923	$patron->add_guarantor(
		924	{
		925	guarantee_id => $patron->id,
		926	guarantor_id => $guarantor_id,
		927	relationship => $relationship,
		928	}
		929	);
		930	}
		931	}
		932
921	# Local Variables:	933	# Local Variables:
922	# tab-width: 8	934	# tab-width: 8
923	# End:	935	# 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 33-38 use C4::Auth; Link Here

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

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 34-39 use C4::Circulation; Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-15 / +21 lines)
34	use Koha::Holds;	34	use Koha::Holds;
35	use Koha::Patrons;	35	use Koha::Patrons;
36	use Koha::Patron::Categories;	36	use Koha::Patron::Categories;
		37	use Koha::Patron::Relationship;
37	use Koha::Database;	38	use Koha::Database;
38	use Koha::DateUtils;	39	use Koha::DateUtils;
39	use Koha::Virtualshelves;	40	use Koha::Virtualshelves;
Lines 84-106 subtest 'library' => sub { Link Here
84		85
85	subtest 'guarantees' => sub {	86	subtest 'guarantees' => sub {
86	plan tests => 8;	87	plan tests => 8;
87	my $guarantees = $new_patron_1->guarantees;	88	my $guarantees = $new_patron_1->guarantee_relationships;
88	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	89	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );
89	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee' );	90	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee relationships' );
90	my @guarantees = $new_patron_1->guarantees;	91	my @guarantees = $new_patron_1->guarantee_relationships;
91	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	92	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
92	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );	93	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );
93		94
94	my $guarantee_1 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	95	my $guarantee_1 = $builder->build({ source => 'Borrower' });
95	my $guarantee_2 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	96	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
		97	my $guarantee_2 = $builder->build({ source => 'Borrower' });
		98	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_2->{borrowernumber} } )->store();
96		99
97	$guarantees = $new_patron_1->guarantees;	100	$guarantees = $new_patron_1->guarantee_relationships;
98	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	101	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantee_relationships should return a Koha::Patrons result set in a scalar context' );
99	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );	102	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );
100	@guarantees = $new_patron_1->guarantees;	103	@guarantees = $new_patron_1->guarantee_relationships;
101	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	104	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
102	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );	105	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );
103	$_->delete for @guarantees;	106	map { $_->guarantee->delete } @guarantees;
104	};	107	};
105		108
106	subtest 'category' => sub {	109	subtest 'category' => sub {
Lines 114-128 subtest 'siblings' => sub { Link Here
114	plan tests => 7;	117	plan tests => 7;
115	my $siblings = $new_patron_1->siblings;	118	my $siblings = $new_patron_1->siblings;
116	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );	119	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
117	my $guarantee_1 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	120	my $guarantee_1 = $builder->build( { source => 'Borrower' } );
		121	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_1->{borrowernumber} } )->store();
118	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);	122	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
119	$siblings = $retrieved_guarantee_1->siblings;	123	$siblings = $retrieved_guarantee_1->siblings;
120	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );	124	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );
121	my @siblings = $retrieved_guarantee_1->siblings;	125	my @siblings = $retrieved_guarantee_1->siblings;
122	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );	126	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );
123	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );	127	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );
124	my $guarantee_2 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	128	my $guarantee_2 = $builder->build( { source => 'Borrower' } );
125	my $guarantee_3 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	129	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_2->{borrowernumber} } )->store();
		130	my $guarantee_3 = $builder->build( { source => 'Borrower' } );
		131	my $relationship_3 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_3->{borrowernumber} } )->store();
126	$siblings = $retrieved_guarantee_1->siblings;	132	$siblings = $retrieved_guarantee_1->siblings;
127	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );	133	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );
128	is( $guarantee_2->{borrowernumber}, $siblings->next->borrowernumber, 'guarantee_2 should exist in the guarantees' );	134	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 / +6 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 232-238 my $borrower1 = $builder->build({ Link Here
232	categorycode=>'STAFFER',	230	categorycode=>'STAFFER',
233	branchcode => $library3->{branchcode},	231	branchcode => $library3->{branchcode},
234	dateexpiry => '2015-01-01',	232	dateexpiry => '2015-01-01',
235	guarantorid=> undef,
236	},	233	},
237	});	234	});
238	my $bor1inlist = $borrower1->{borrowernumber};	235	my $bor1inlist = $borrower1->{borrowernumber};
Lines 242-248 my $borrower2 = $builder->build({ Link Here
242	categorycode=>'STAFFER',	239	categorycode=>'STAFFER',
243	branchcode => $library3->{branchcode},	240	branchcode => $library3->{branchcode},
244	dateexpiry => '2015-01-01',	241	dateexpiry => '2015-01-01',
245	guarantorid=> undef,
246	},	242	},
247	});	243	});
248		244
Lines 252-258 my $guarantee = $builder->build({ Link Here
252	categorycode=>'KIDclamp',	248	categorycode=>'KIDclamp',
253	branchcode => $library3->{branchcode},	249	branchcode => $library3->{branchcode},
254	dateexpiry => '2015-01-01',	250	dateexpiry => '2015-01-01',
255	guarantorid=> undef, # will be filled later
256	},	251	},
257	});	252	});
258		253
Lines 287-293 $patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_ Link Here
287	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');	282	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');
288		283
289	Koha::Patrons->find($bor1inlist)->set({ categorycode => 'CIVILIAN' })->store;	284	Koha::Patrons->find($bor1inlist)->set({ categorycode => 'CIVILIAN' })->store;
290	Koha::Patrons->find($guarantee->{borrowernumber})->set({ guarantorid => $bor1inlist })->store;	285	my $relationship = Koha::Patron::Relationship->new( { guarantor_id => $bor1inlist, guarantee_id => $guarantee->{borrowernumber} } )->store();
291		286
292	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );	287	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
293	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');	288	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');
Lines 297-303 $patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02', patron_list Link Here
297	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');	292	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');
298	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );	293	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
299	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');	294	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');
300	Koha::Patrons->find($guarantee->{borrowernumber})->set({ guarantorid => undef })->store;	295	$relationship->delete();
301		296
302	$builder->build({	297	$builder->build({
303	source => 'Issue',	298	source => 'Issue',
Lines 325-333 is( scalar(@$patstodel),2,'Borrowers without issues deleted by last issue date') Link Here
325		320
326	# Test GetBorrowersToExpunge and TrackLastPatronActivity	321	# Test GetBorrowersToExpunge and TrackLastPatronActivity
327	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);	322	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);
328	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN', guarantorid => undef } } );	323	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN' } } );
329	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN', guarantorid => undef } } );	324	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN' } } );
330	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN', guarantorid => undef } } );	325	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN' } } );
331	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });	326	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });
332	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );	327	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );
333	$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });	328	$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });

Line 0 Link Here

(-)a/t/db_dependent/Patron/Relationships.t (+167 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 => 59;
		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
96	my @gr;
97
98	@gr = $kyle->guarantee_relationships();
99	is( @gr, 2, 'Found 2 guarantee relationships for father' );
100	is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
101	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
102	is( $gr[0]->relationship, 'father', 'Relationship is father' );
103	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
104	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
105	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
106	is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
107
108	is( $gr[1]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
109	is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
110	is( $gr[1]->relationship, 'father', 'Relationship is father' );
111	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
112	is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
113	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
114	is( $gr[1]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
115
116	@gr = $chelsea->guarantee_relationships();
117	is( @gr, 2, 'Found 2 guarantee relationships for mother' );
118	is( $gr[0]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
119	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
120	is( $gr[0]->relationship, 'mother', 'Relationship is mother' );
121	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
122	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
123	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
124	is( $gr[0]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
125
126	is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
127	is( $gr[1]->guarantee_id, $kylie->id, 'Guarantee matches for first relationship' );
128	is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
129	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
130	is( $gr[1]->guarantee->id, $kylie->id, 'Koha::Patron returned is the correct guarantee' );
131	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
132	is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
133
134	@gr = $daria->guarantor_relationships();
135	is( @gr, 2, 'Found 4 guarantor relationships for child' );
136	is( $gr[0]->guarantor_id, $kyle->id, 'Guarantor matches for first relationship' );
137	is( $gr[0]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
138	is( $gr[0]->relationship, 'father', 'Relationship is father' );
139	is( ref($gr[0]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
140	is( $gr[0]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
141	is( ref($gr[0]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
142	is( $gr[0]->guarantor->id, $kyle->id, 'Koha::Patron returned is the correct guarantor' );
143
144	is( $gr[1]->guarantor_id, $chelsea->id, 'Guarantor matches for first relationship' );
145	is( $gr[1]->guarantee_id, $daria->id, 'Guarantee matches for first relationship' );
146	is( $gr[1]->relationship, 'mother', 'Relationship is mother' );
147	is( ref($gr[1]->guarantee), 'Koha::Patron', 'Method guarantee returns a Koha::Patron' );
148	is( $gr[1]->guarantee->id, $daria->id, 'Koha::Patron returned is the correct guarantee' );
149	is( ref($gr[1]->guarantor), 'Koha::Patron', 'Method guarantor returns a Koha::Patron' );
150	is( $gr[1]->guarantor->id, $chelsea->id, 'Koha::Patron returned is the correct guarantor' );
151
152	my @siblings = $daria->siblings;
153	is( @siblings, 1, 'Method siblings called in list context returns list' );
154	is( ref($siblings[0]), 'Koha::Patron', 'List contains a Koha::Patron' );
155	is( $siblings[0]->firstname, 'Kylie', 'Sibling from list first name matches correctly' );
156	is( $siblings[0]->surname, 'Hall', 'Sibling from list surname matches correctly' );
157	is( $siblings[0]->id, $kylie->id, 'Sibling from list patron id matches correctly' );
158
159	my $siblings = $daria->siblings;
160	my $sibling = $siblings->next();
161	is( ref($siblings), 'Koha::Patrons', 'Calling siblings in scalar context results in a Koha::Patrons object' );
162	is( ref($sibling), 'Koha::Patron', 'Method next returns a Koha::Patron' );
163	is( $sibling->firstname, 'Kylie', 'Sibling from scalar first name matches correctly' );
164	is( $sibling->surname, 'Hall', 'Sibling from scalar surname matches correctly' );
165	is( $sibling->id, $kylie->id, 'Sibling from scalar patron id matches correctly' );
166
167	1;