Attachment #85411 for bug #14570

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

Lines 461-467 C4::Auth - Authenticates Koha users Link Here

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

Lines 760-766 sub CanBookBeIssued { Link Here

(-)a/C4/Circulation.pm (-1 / +1 lines)
760	my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");	760	my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
761	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	761	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
762	if ( defined $no_issues_charge_guarantees ) {	762	if ( defined $no_issues_charge_guarantees ) {
763	my @guarantees = $patron->guarantees();	763	my @guarantees = map { $_->guarantee } $patron->guarantee_relationships();
764	my $guarantees_non_issues_charges;	764	my $guarantees_non_issues_charges;
765	foreach my $g ( @guarantees ) {	765	foreach my $g ( @guarantees ) {
766	$guarantees_non_issues_charges += $g->account->non_issues_charges;	766	$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 627-633 __END__ Link Here

(-)a/C4/SIP/ILS/Patron.pm (-1 lines)
627	\| contactname \| mediumtext \| YES \| \| NULL \| \|	627	\| contactname \| mediumtext \| YES \| \| NULL \| \|
628	\| contactfirstname \| text \| YES \| \| NULL \| \|	628	\| contactfirstname \| text \| YES \| \| NULL \| \|
629	\| contacttitle \| text \| YES \| \| NULL \| \|	629	\| contacttitle \| text \| YES \| \| NULL \| \|
630	\| guarantorid \| int(11) \| YES \| MUL \| NULL \| \|
631	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|	630	\| borrowernotes \| mediumtext \| YES \| \| NULL \| \|
632	\| relationship \| varchar(100) \| YES \| \| NULL \| \|	631	\| relationship \| varchar(100) \| YES \| \| NULL \| \|
633	\| ethnicity \| varchar(50) \| YES \| \| NULL \| \|	632	\| 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::Log;
use Koha::AuthUtils;
use Koha::Checkouts;
use Koha::Old::Checkouts;
use Koha::Database;
use Koha::DateUtils;
use Koha::Exceptions::Password;
use Koha::Holds;
use Koha::Patrons;
use Koha::Patron::Categories;
use Koha::Patron::Relationships;
use Koha::Patron::HouseboundProfile;
use Koha::Patron::HouseboundRole;
use Koha::Patron::Images;
use Koha::Patrons;
use Koha::Virtualshelves;
use Koha::Club::Enrollments;
use Koha::Account;

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

=head3 image

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

=cut

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

    return unless $self->guarantorid();

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

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

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

=head3 library

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 },
        {
            prefetch => 'guarantee',
            order_by => { -asc => [ 'guarantee.surname', 'guarantee.firstname' ] },
        }
    );
}

=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 },
        {
            order_by => { -asc => [ 'surname', 'firstname' ] }
        },
    );

    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 {

Lines 310-316 sub allow_guarantor { Link Here

(-)a/Koha/REST/V1/Auth.pm (-1 / +1 lines)
310	return;	310	return;
311	}	311	}
312		312
313	my $guarantees = $user->guarantees->as_list;	313	my $guarantees = $user->guarantee_relationships->guarantees->as_list;
314	foreach my $guarantee (@{$guarantees}) {	314	foreach my $guarantee (@{$guarantees}) {
315	return 1 if check_object_ownership($c, $guarantee);	315	return 1 if check_object_ownership($c, $guarantee);
316	}	316	}




# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-15 13:15:09
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NhuG8jv9ut+qIIm3vGHsrQ

__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 =




$DBversion = 'XXX';  # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
    # you can use $dbh here like:
    # $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );
    unless (TableExists('borrower_relationships')){
        $dbh->do(q{
            CREATE TABLE `borrower_relationships` (
                  id INT(11) NOT NULL AUTO_INCREMENT,
                  guarantor_id INT(11) NOT NULL,
                  guarantee_id INT(11) NOT NULL,
                  relationship VARCHAR(100) 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;
        });

        $dbh->do(q{
            UPDATE borrowers
            LEFT JOIN borrowers guarantor ON ( borrowers.guarantorid = guarantor.borrowernumber )
            SET borrowers.guarantorid = NULL WHERE guarantor.borrowernumber IS NULL;
        });

        $dbh->do(q{
            INSERT INTO borrower_relationships ( guarantor_id, guarantee_id, relationship )
            SELECT guarantorid, borrowernumber, relationship FROM borrowers WHERE guarantorid IS NOT NULL;
        });

    }

     if( column_exists( 'borrowers', 'guarantorid' ) ) {
        $dbh->do(q{
            ALTER TABLE borrowers DROP guarantorid;
        });
     }

     if( column_exists( 'deletedborrowers', 'guarantorid' ) ) {
        $dbh->do(q{
            ALTER TABLE deletedborrowers DROP guarantorid;
        });
     }

     if( column_exists( 'borrower_modifications', 'guarantorid' ) ) {
        $dbh->do(q{
            ALTER TABLE borrower_modifications DROP guarantorid;
        });
     }

    # Always end with this (adjust the bug info)
    SetVersion( $DBversion );
    print "Upgrade to $DBversion done (Bug 14570 - Make it possible to add multiple guarantors to a record)\n";
}




  `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)),

  `contactname` LONGTEXT,
  `contactfirstname` MEDIUMTEXT,
  `contacttitle` MEDIUMTEXT,
  `guarantorid` int(11) DEFAULT NULL,
  `borrowernotes` LONGTEXT,
  `relationship` varchar(100) DEFAULT NULL,
  `sex` varchar(1) DEFAULT NULL,

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

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

DROP TABLE IF EXISTS 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) 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>




[% USE AuthorisedValues %]
<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 | html %]&amp;categorycode=[% patron.categorycode | html %]">
            <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 | html %]&amp;categorycode=[% patron.categorycode | html %]">
        [% 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 | html %]"><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 | html %]"><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 | html %]"><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 | html %]&amp;categorycode=[% patron.categorycode | html %]"><i class="fa fa-copy"></i> Duplicate</a>
    [% END %]


Lines 812-818 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)
812	</li>	812	</li>
813		813
814	[% IF relatives_issues_count %]	814	[% IF relatives_issues_count %]
815	<li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>	815	<li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count %] Relatives' checkouts</a></li>
816	[% END %]	816	[% END %]
817		817
818	<li>	818	<li>




[% USE raw %]
[% 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 | uri %]" target="blank">[% r.guarantor_id | html %]</a>[% END %]
                            </li>

                            <li>
                                <label for="guarantor_surname">Organization name: </label>
                                <span>[% r.guarantor.surname | html %]</span>
                            </li>
                        [% ELSE %]
                            <li id="contact-details">
                                <span class="label">Patron #:</span>
                                <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id | uri %]" target="blank">[% r.guarantor_id | html %]</a>
                            </li>

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

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

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

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

                <li>
                    <label for="guarantor_firstname">First name: </label>
                    <span class="new_guarantor_firstname_text"></span>
                </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 | html %]">[% pr | html %]</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 %]
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
        [% CASE 'de' %]

[% 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 *********************** -->

                }
            [% END %]

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

            $("#cn_max").hide();
            var content;
            $("#cardnumber").on("keydown", function(e){




[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% SET footerjs = 1 %]

                [% 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 | html %][% 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 | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</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 | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</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 | uri %]">[% 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 100-106 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-3 / +8 lines)
100	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>	100	<div class="alert">You typed in the wrong characters in the box before submitting. Please try again.</div>
101	[% END %]	101	[% END %]
102		102
103	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]	103	[% IF patron.guarantor_relationships && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
104	<fieldset class="rows" id="memberentry_privacy">	104	<fieldset class="rows" id="memberentry_privacy">
105	<legend id="privacy_legend">Privacy</legend>	105	<legend id="privacy_legend">Privacy</legend>
106	<ol>	106	<ol>
Lines 119-125 Link Here
119	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>	119	<span id="update_privacy_guarantor_checkouts_message" class="alert" style="display:none"></span>
120	</span>	120	</span>
121	<span class="hint">	121	<span class="hint">
122	Your guarantor is <i>[% guarantor.firstname \| html %] [% guarantor.surname \| html %]</i>	122	Guaranteed by
		123	[% FOREACH gr IN patron.guarantor_relationships %]
		124	[% SET g = gr.guarantor %]
		125	[% g.firstname \| html %] [% g.surname \| html %]
		126	[%- IF ! loop.last %], [% END %]
		127	[% END %]
123	</span>	128	</span>
124	</li>	129	</li>
125	</ol>	130	</ol>
Lines 1010-1016 Link Here
1010	}	1015	}
1011	});	1016	});
1012		1017
1013	[% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]	1018	[% IF patron.guarantor_relationships && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
1014	$('#update_privacy_guarantor_checkouts').click( function() {	1019	$('#update_privacy_guarantor_checkouts').click( function() {
1015	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')	1020	$.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
1016	.done(function( data ) {	1021	.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 \| html %] [% borrower.guarantor.surname \| html %]</i>	87	Guaranteed by
		88	[% FOREACH gr IN borrower.guarantor_relationships %]
		89	[% SET g = gr.guarantor %]
		90	[% g.firstname \| html %] [% g.surname \| html %]
		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 | uri %]">

                                                    </td>

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

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

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

                                                    <td>

Lines 84-90 if (C4::Context->preference("IndependentBranches")) { Link Here

(-)a/members/deletemem.pl (-3 / +3 lines)
84		84
85	my $op = $input->param('op') \|\| 'delete_confirm';	85	my $op = $input->param('op') \|\| 'delete_confirm';
86	my $dbh = C4::Context->dbh;	86	my $dbh = C4::Context->dbh;
87	my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);	87	my $is_guarantor = $patron->guarantee_relationships->count;
88	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor ) {	88	if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor ) {
89		89
90	$template->param(	90	$template->param(
Lines 96-103 if ( $op eq 'delete_confirm' or $countissues > 0 or $charges or $is_guarantor ) Link Here
96	if ( $charges > 0 ) {	96	if ( $charges > 0 ) {
97	$template->param(charges => $charges);	97	$template->param(charges => $charges);
98	}	98	}
99	if ($is_guarantor) {	99	if ( $is_guarantor ) {
100	$template->param(guarantees => 1);	100	$template->param( guarantees => 1 );
101	}	101	}
102		102
103	# This is silly written but reflect the same conditions as above	103	# This is silly written but reflect the same conditions as above




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

        qr/^add_debarment$/, qr/^debarred_expiration$/, # We already dealt with debarments previously
        qr/^housebound_chooser$/, qr/^housebound_deliverer$/,
        qr/^select_city$/,
        qr/^new_guarantor_/,
        qr/^guarantor_firstname$/,
        qr/^guarantor_surname$/,
        qr/^delete_guarantor$/,
    );
    for my $regexp (@keys_to_delete) {
        for (keys %newdata) {

    }
}

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


            $patron->set_password({ password => $password });
        }

        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 ? $patron : \%newdata, # 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:




$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};

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;


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

    # But we should not hit that with a normal use of the interface
    die "You are doing something wrong updating this child" unless $adult_category;

    $_->delete() for $patron->guarantor_relationships();

    $patron->categorycode($adult_category->categorycode);
    $patron->store;


    # We could redirect with a friendly message
    if ( $patron_categories->count > 1 ) {
        $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 / +59 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
		170	my $success = 1;
166	if ($mybranch) { #yep, we received a specific branch to work on.	171	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";	172	$verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
168	my $query = qq\|	173	my $where = qq\|
169	UPDATE borrowers
170	SET guarantorid ='0',
171	categorycode = ?
172	WHERE dateofbirth <= ?	174	WHERE dateofbirth <= ?
173	AND dateofbirth != '0000-00-00'	175	AND dateofbirth != '0000-00-00'
174	AND branchcode = ?	176	AND branchcode = ?
Lines 177-186 if ( not $noaction ) { Link Here
177	FROM categories	179	FROM categories
178	WHERE category_type = 'C'	180	WHERE category_type = 'C'
179	AND categorycode = ?	181	AND categorycode = ?
180	)\|;	182	)
		183	\|;
		184
		185	my $query = qq\|
		186	DELETE relationships FROM relationships
		187	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		188	$where
		189	\|;
181	my $sth = $dbh->prepare($query);	190	my $sth = $dbh->prepare($query);
		191	$sth->execute( $itsyourbirthday, $mybranch, $fromcat )
		192	or $success = 0;
		193
		194	$query = qq\|
		195	UPDATE borrowers
		196	SET categorycode = ?
		197	$where
		198	\|;
		199	$sth = $dbh->prepare($query);
182	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )	200	my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )
183	or die "can't execute";	201	or $success = 0;
		202
		203	if ( $success ) {
		204	$dbh->commit;
		205	} else {
		206	$dbh->rollback;
		207	die "can't execute";
		208	}
184		209
185	if ( $res eq '0E0' ) {	210	if ( $res eq '0E0' ) {
186	print "No patrons updated\n";	211	print "No patrons updated\n";
Lines 191-200 if ( not $noaction ) { Link Here
191	}	216	}
192	else { # branch was not supplied, processing all branches	217	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";	218	$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\|	219	my $where = qq\|
195	UPDATE borrowers
196	SET guarantorid = '0',
197	categorycode = ?
198	WHERE dateofbirth <= ?	220	WHERE dateofbirth <= ?
199	AND dateofbirth!='0000-00-00'	221	AND dateofbirth!='0000-00-00'
200	AND categorycode IN (	222	AND categorycode IN (
Lines 202-211 if ( not $noaction ) { Link Here
202	FROM categories	224	FROM categories
203	WHERE category_type = 'C'	225	WHERE category_type = 'C'
204	AND categorycode = ?	226	AND categorycode = ?
205	)\|;	227	)
		228	\|;
		229
		230	my $query = qq\|
		231	DELETE relationships FROM relationships
		232	LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
		233	$where
		234	\|;
206	my $sth = $dbh->prepare($query);	235	my $sth = $dbh->prepare($query);
		236	$sth->execute( $itsyourbirthday, $fromcat )
		237	or $success = 0;
		238
		239	$query = qq\|
		240	UPDATE borrowers
		241	SET categorycode = ?
		242	$where
		243	\|;
		244	$sth = $dbh->prepare($query);
207	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )	245	my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )
208	or die "can't execute";	246	or $success = 0;
		247	$dbh->commit;
		248
		249	if ( $success ) {
		250	$dbh->commit;
		251	} else {
		252	$dbh->rollback;
		253	die "can't execute";
		254	}
209		255
210	if ( $res eq '0E0' ) {	256	if ( $res eq '0E0' ) {
211	print "No patrons updated\n";	257	print "No patrons updated\n";
Lines 267-272 else { Link Here
267	my $sth = $dbh->prepare($query);	313	my $sth = $dbh->prepare($query);
268	$sth->execute( $itsyourbirthday, $fromcat )	314	$sth->execute( $itsyourbirthday, $fromcat )
269	or die "Couldn't execute statement: " . $sth->errstr;	315	or die "Couldn't execute statement: " . $sth->errstr;
		316	$dbh->commit;
270		317
271	while ( my @res = $sth->fetchrow_array() ) {	318	while ( my @res = $sth->fetchrow_array() ) {
272	my $firstname = $res[0];	319	my $firstname = $res[0];

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

(-)a/opac/opac-memberentry.pl (-2 / +2 lines)
315		315
316	$template->param(	316	$template->param(
317	borrower => $borrower,	317	borrower => $borrower,
318	guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(),
319	hidden => GetHiddenFields( $mandatory, 'edit' ),	318	hidden => GetHiddenFields( $mandatory, 'edit' ),
320	csrf_token => Koha::Token->new->generate_csrf({	319	csrf_token => Koha::Token->new->generate_csrf({
321	session_id => scalar $cgi->cookie('CGISESSID'),	320	session_id => scalar $cgi->cookie('CGISESSID'),
Lines 336-342 my $captcha = random_string("CCCCC"); Link Here
336		335
337	$template->param(	336	$template->param(
338	captcha => $captcha,	337	captcha => $captcha,
339	captcha_digest => md5_base64($captcha)	338	captcha_digest => md5_base64($captcha),
		339	patron => Koha::Patrons->find( $borrowernumber ),
340	);	340	);
341		341
342	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };	342	output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };




use Koha::Database;
use Koha::ItemTypes;
use Koha::Patron::Attribute::Types;
use Koha::Patrons;
use Koha::Patron::Messages;
use Koha::Patron::Discharge;
use Koha::Patrons;

if (   C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
    || C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
{
    my @relatives;
    # Filter out guarantees that don't want guarantor to see checkouts
    foreach my $gr ( $patron->guarantee_relationships() ) {
        my $g = $gr->guarantee;
        push( @relatives, $g ) if $g->privacy_guarantor_checkouts;
    }
        { prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
      );
    $template->param( relatives => \@relatives );
}





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

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 537-543 subtest 'SearchItems test' => sub { Link Here

(-)a/t/db_dependent/Items.t (-1 / +5 lines)
537		537
538	subtest 'Koha::Item(s) tests' => sub {	538	subtest 'Koha::Item(s) tests' => sub {
539		539
540	plan tests => 5;	540	plan tests => 7;
541		541
542	$schema->storage->txn_begin();	542	$schema->storage->txn_begin();
543		543
Lines 576-581 subtest 'Koha::Item(s) tests' => sub { Link Here
576	is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );	576	is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
577	is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );	577	is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
578		578
		579	my $biblio = $item->biblio();
		580	is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
		581	is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
		582
579	$schema->storage->txn_rollback;	583	$schema->storage->txn_rollback;
580	};	584	};
581		585




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 => 13;
    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}, relationship => 'test' } )->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}, relationship => 'test' } )->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' );
    $_->delete for @guarantees;



    my $guarantor = $builder->build_object( { class => 'Koha::Patrons' } );

    my $order_guarantee1 = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                surname     => 'Zebra',
            }
        }
    )->borrowernumber;
    $builder->build_object(
        {
            class => 'Koha::Patron::Relationships',
            value => {
                guarantor_id  => $guarantor->id,
                guarantee_id => $order_guarantee1,
                relationship => 'test',
            }
        }
    );

    my $order_guarantee2 = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                surname     => 'Yak',
            }
        }
    )->borrowernumber;
    $builder->build_object(
        {
            class => 'Koha::Patron::Relationships',
            value => {
                guarantor_id  => $guarantor->id,
                guarantee_id => $order_guarantee2,
                relationship => 'test',
            }
        }
    );

    my $order_guarantee3 = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                surname     => 'Xerus',
                firstname   => 'Walrus',
            }
        }
    )->borrowernumber;
    $builder->build_object(
        {
            class => 'Koha::Patron::Relationships',
            value => {
                guarantor_id  => $guarantor->id,
                guarantee_id => $order_guarantee3,
                relationship => 'test',
            }
        }
    );

    my $order_guarantee4 = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                surname     => 'Xerus',
                firstname   => 'Vulture',
                guarantorid => $guarantor->borrowernumber
            }
        }
    )->borrowernumber;
    $builder->build_object(
        {
            class => 'Koha::Patron::Relationships',
            value => {
                guarantor_id  => $guarantor->id,
                guarantee_id => $order_guarantee4,
                relationship => 'test',
            }
        }
    );

    my $order_guarantee5 = $builder->build_object(
        {
            class => 'Koha::Patrons',
            value => {
                surname     => 'Xerus',
                firstname   => 'Unicorn',
                guarantorid => $guarantor->borrowernumber
            }
        }
    )->borrowernumber;
    my $r = $builder->build_object(
        {
            class => 'Koha::Patron::Relationships',
            value => {
                guarantor_id  => $guarantor->id,
                guarantee_id => $order_guarantee5,
                relationship => 'test',
            }
        }
    );

    $guarantees = $guarantor->guarantee_relationships->guarantees;

    is( $guarantees->next()->borrowernumber, $order_guarantee5, "Return first guarantor alphabetically" );
    is( $guarantees->next()->borrowernumber, $order_guarantee4, "Return second guarantor alphabetically" );

    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}, relationship => 'test' } )->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}, relationship => 'test' } )->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}, relationship => 'test' } )->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}, relationship => 'test' } )->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 30-45 use C4::Context; Link Here

(-)a/Koha/Patron.pm (-32 / +88 lines)
30	use C4::Log;	30	use C4::Log;
31	use Koha::AuthUtils;	31	use Koha::AuthUtils;
32	use Koha::Checkouts;	32	use Koha::Checkouts;
		33	use Koha::Old::Checkouts;
33	use Koha::Database;	34	use Koha::Database;
34	use Koha::DateUtils;	35	use Koha::DateUtils;
35	use Koha::Exceptions::Password;	36	use Koha::Exceptions::Password;
36	use Koha::Holds;	37	use Koha::Holds;
37	use Koha::Old::Checkouts;	38	use Koha::Patrons;
38	use Koha::Patron::Categories;	39	use Koha::Patron::Categories;
		40	use Koha::Patron::Relationships;
39	use Koha::Patron::HouseboundProfile;	41	use Koha::Patron::HouseboundProfile;
40	use Koha::Patron::HouseboundRole;	42	use Koha::Patron::HouseboundRole;
41	use Koha::Patron::Images;	43	use Koha::Patron::Images;
42	use Koha::Patrons;
43	use Koha::Virtualshelves;	44	use Koha::Virtualshelves;
44	use Koha::Club::Enrollments;	45	use Koha::Club::Enrollments;
45	use Koha::Account;	46	use Koha::Account;
Lines 364-404 sub category { Link Here
364	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );	365	return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
365	}	366	}
366		367
367	=head3 guarantor	368	=head3 image
368
369	Returns a Koha::Patron object for this patron's guarantor
370		369
371	=cut	370	=cut
372		371
373	sub guarantor {
374	my ( $self ) = @_;
375
376	return unless $self->guarantorid();
377
378	return Koha::Patrons->find( $self->guarantorid() );
379	}
380
381	sub image {	372	sub image {
382	my ( $self ) = @_;	373	my ( $self ) = @_;
383		374
384	return scalar Koha::Patron::Images->find( $self->borrowernumber );	375	return scalar Koha::Patron::Images->find( $self->borrowernumber );
385	}	376	}
386		377
		378	=head3 library
		379
		380	Returns a Koha::Library object representing the patron's home library.
		381
		382	=cut
		383
387	sub library {	384	sub library {
388	my ( $self ) = @_;	385	my ( $self ) = @_;
389	return Koha::Library->_new_from_dbic($self->_result->branchcode);	386	return Koha::Library->_new_from_dbic($self->_result->branchcode);
390	}	387	}
391		388
392	=head3 guarantees	389	=head3 guarantor_relationships
		390
		391	Returns Koha::Patron::Relationships object for this patron's guarantors
393		392
394	Returns the guarantees (list of Koha::Patron) of this patron	393	Returns the set of relationships for the patrons that are guarantors for this patron.
		394
		395	This is returned instead of a Koha::Patron object because the guarantor
		396	may not exist as a patron in Koha. If this is true, the guarantors name
		397	exists in the Koha::Patron::Relationship object and will have no guarantor_id.
395		398
396	=cut	399	=cut
397		400
398	sub guarantees {	401	sub guarantor_relationships {
399	my ( $self ) = @_;	402	my ($self) = @_;
400		403
401	return Koha::Patrons->search( { guarantorid => $self->borrowernumber }, { order_by => { -asc => ['surname','firstname'] } } );	404	return Koha::Patron::Relationships->search( { guarantee_id => $self->id } );
		405	}
		406
		407	=head3 guarantee_relationships
		408
		409	Returns Koha::Patron::Relationships object for this patron's guarantors
		410
		411	Returns the set of relationships for the patrons that are guarantees for this patron.
		412
		413	The method returns Koha::Patron::Relationship objects for the sake
		414	of consistency with the guantors method.
		415	A guarantee by definition must exist as a patron in Koha.
		416
		417	=cut
		418
		419	sub guarantee_relationships {
		420	my ($self) = @_;
		421
		422	return Koha::Patron::Relationships->search(
		423	{ guarantor_id => $self->id },
		424	{
		425	prefetch => 'guarantee',
		426	order_by => { -asc => [ 'guarantee.surname', 'guarantee.firstname' ] },
		427	}
		428	);
402	}	429	}
403		430
404	=head3 housebound_profile	431	=head3 housebound_profile
Lines 436-458 Returns the siblings of this patron. Link Here
436	=cut	463	=cut
437		464
438	sub siblings {	465	sub siblings {
439	my ( $self ) = @_;	466	my ($self) = @_;
440		467
441	my $guarantor = $self->guarantor;	468	my @guarantors = $self->guarantor_relationships()->guarantors();
442		469
443	return unless $guarantor;	470	return unless @guarantors;
444		471
445	return Koha::Patrons->search(	472	my @siblings =
446	{	473	map { $_->guarantee_relationships()->guarantees() } @guarantors;
447	guarantorid => {	474
448	'!=' => undef,	475	return unless @siblings;
449	'=' => $guarantor->id,	476
450	},	477	my %seen;
451	borrowernumber => {	478	@siblings =
452	'!=' => $self->borrowernumber,	479	grep { !$seen{ $_->id }++ && ( $_->id != $self->id ) } @siblings;
453	}	480
454	}	481	return wantarray ? @siblings : Koha::Patrons->search( { borrowernumber => { -in => [ map { $_->id } @siblings ] } } );
455	);
456	}	482	}
457		483
458	=head3 merge_with	484	=head3 merge_with
Lines 1216-1221 my $is_child = $patron->is_child Link Here
1216	Return true if the patron has a category with a type Child (C)	1242	Return true if the patron has a category with a type Child (C)
1217		1243
1218	=cut	1244	=cut
		1245
1219	sub is_child {	1246	sub is_child {
1220	my( $self ) = @_;	1247	my( $self ) = @_;
1221	return $self->category->category_type eq 'C' ? 1 : 0;	1248	return $self->category->category_type eq 'C' ? 1 : 0;
Lines 1287-1292 sub generate_userid { Link Here
1287		1314
1288	}	1315	}
1289		1316
		1317
		1318	=head3 add_guarantor
		1319
		1320	my @relationships = $patron->add_guarantor(
		1321	{
		1322	borrowernumber => $borrowernumber,
		1323	relationships => $relationship,
		1324	}
		1325	);
		1326
		1327	Adds a new guarantor to a patron.
		1328
		1329	=cut
		1330
		1331	sub add_guarantor {
		1332	my ( $self, $params ) = @_;
		1333
		1334	my $guarantor_id = $params->{guarantor_id};
		1335	my $relationship = $params->{relationship};
		1336
		1337	return Koha::Patron::Relationship->new(
		1338	{
		1339	guarantee_id => $self->id,
		1340	guarantor_id => $guarantor_id,
		1341	relationship => $relationship
		1342	}
		1343	)->store();
		1344	}
		1345
1290	=head2 Internal methods	1346	=head2 Internal methods
1291		1347
1292	=head3 _type	1348	=head3 _type

Lines 1449-1460 __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); Link Here

(-)a/Koha/Schema/Result/Borrower.pm (-6 lines)
1449	# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-15 13:15:09	1449	# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-02-15 13:15:09
1450	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NhuG8jv9ut+qIIm3vGHsrQ	1450	# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:NhuG8jv9ut+qIIm3vGHsrQ
1451		1451
1452	__PACKAGE__->belongs_to(
1453	"guarantor",
1454	"Koha::Schema::Result::Borrower",
1455	{ borrowernumber => "guarantorid" },
1456	);
1457
1458	__PACKAGE__->add_columns(	1452	__PACKAGE__->add_columns(
1459	'+lost' => { is_boolean => 1 },	1453	'+lost' => { is_boolean => 1 },
1460	'+gonenoaddress' => { is_boolean => 1 }	1454	'+gonenoaddress' => { is_boolean => 1 }

Lines 564-577 my $view = $batch Link Here

(-)a/circ/circulation.pl (-8 / +6 lines)
564	: 'circview';	564	: 'circview';
565		565
566	my @relatives;	566	my @relatives;
567	if ( $borrowernumber ) {	567	if ( $patron ) {
568	if ( $patron ) {	568	if ( my @guarantors = $patron->guarantor_relationships()->guarantors() ) {
569	if ( my $guarantor = $patron->guarantor ) {	569	push( @relatives, $_->id ) for @guarantors;
570	push @relatives, $guarantor->borrowernumber;	570	push( @relatives, $_->id ) for $patron->siblings();
571	push @relatives, $_->borrowernumber for $patron->siblings;	571	} else {
572	} else {	572	push( @relatives, $_->id ) for $patron->guarantee_relationships()->guarantees();
573	push @relatives, $_->borrowernumber for $patron->guarantees;
574	}
575	}	573	}
576	}	574	}
577	my $relatives_issues_count =	575	my $relatives_issues_count =

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

(-)a/installer/data/mysql/kohastructure.sql (-4 / +15 lines)
612	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	612	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
613	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor	613	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
614	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor	614	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
615	`guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
616	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	615	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
617	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor	616	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
618	`sex` varchar(1) default NULL, -- patron/borrower's gender	617	`sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1645-1651 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1645	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	1644	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
1646	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor	1645	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
1647	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor	1646	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
1648	`guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
1649	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	1647	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
1650	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor	1648	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
1651	`sex` varchar(1) default NULL, -- patron/borrower's gender	1649	`sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1680-1686 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1680	KEY `categorycode` (`categorycode`),	1678	KEY `categorycode` (`categorycode`),
1681	KEY `branchcode` (`branchcode`),	1679	KEY `branchcode` (`branchcode`),
1682	UNIQUE KEY `userid` (`userid`),	1680	UNIQUE KEY `userid` (`userid`),
1683	KEY `guarantorid` (`guarantorid`),
1684	KEY `surname_idx` (`surname` (191)),	1681	KEY `surname_idx` (`surname` (191)),
1685	KEY `firstname_idx` (`firstname` (191)),	1682	KEY `firstname_idx` (`firstname` (191)),
1686	KEY `othernames_idx` (`othernames` (191)),	1683	KEY `othernames_idx` (`othernames` (191)),
Lines 3463-3469 CREATE TABLE IF NOT EXISTS `borrower_modifications` ( Link Here
3463	`contactname` LONGTEXT,	3460	`contactname` LONGTEXT,
3464	`contactfirstname` MEDIUMTEXT,	3461	`contactfirstname` MEDIUMTEXT,
3465	`contacttitle` MEDIUMTEXT,	3462	`contacttitle` MEDIUMTEXT,
3466	`guarantorid` int(11) DEFAULT NULL,
3467	`borrowernotes` LONGTEXT,	3463	`borrowernotes` LONGTEXT,
3468	`relationship` varchar(100) DEFAULT NULL,	3464	`relationship` varchar(100) DEFAULT NULL,
3469	`sex` varchar(1) DEFAULT NULL,	3465	`sex` varchar(1) DEFAULT NULL,
Lines 4161-4166 CREATE TABLE IF NOT EXISTS club_fields ( Link Here
4161	CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE	4157	CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
4162	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;	4158	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4163		4159
		4160	--
		4161	-- Table structure for table 'guarantors_guarantees'
		4162	--
		4163
		4164	DROP TABLE IF EXISTS borrower_relationships;
		4165	CREATE TABLE `borrower_relationships` (
		4166	id INT(11) NOT NULL AUTO_INCREMENT,
		4167	guarantor_id INT(11) NULL DEFAULT NULL,
		4168	guarantee_id INT(11) NOT NULL,
		4169	relationship VARCHAR(100) NOT NULL,
		4170	PRIMARY KEY (id),
		4171	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
		4172	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
		4173	) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
		4174
4164	--	4175	--
4165	-- Table structure for table `illrequests`	4176	-- Table structure for table `illrequests`
4166	--	4177	--

Lines 437-443 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-4 / +4 lines)
437		437
438	<tbody>	438	<tbody>
439	[% FOREACH r IN relatives %]	439	[% FOREACH r IN relatives %]
440	[% FOREACH i IN r.issues %]	440	[% FOREACH c IN r.checkouts %]
441	<tr>	441	<tr>
442	<td>	442	<td>
443	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber \| uri %]">	443	<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber \| uri %]">
Lines 446-460 Link Here
446	</td>	446	</td>
447		447
448	<td>	448	<td>
449	[% i.date_due \| $KohaDates %]	449	[% c.date_due \| $KohaDates %]
450	</td>	450	</td>
451		451
452	<td>	452	<td>
453	[% i.item.barcode \| html %]	453	[% c.item.barcode \| html %]
454	</td>	454	</td>
455		455
456	<td>	456	<td>
457	[% i.item.itemcallnumber \| html %]	457	[% c.item.itemcallnumber \| html %]
458	</td>	458	</td>
459		459
460	<td>	460	<td>

Lines 176-182 sub patronflags { Link Here

(-)a/C4/Members.pm (-7 / +7 lines)
176	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );	176	$no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
177	if ( defined $no_issues_charge_guarantees ) {	177	if ( defined $no_issues_charge_guarantees ) {
178	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );	178	my $p = Koha::Patrons->find( $patroninformation->{borrowernumber} );
179	my @guarantees = $p->guarantees();	179	my @guarantees = map { $_->guarantee } $p->guarantee_relationships;
180	my $guarantees_non_issues_charges;	180	my $guarantees_non_issues_charges;
181	foreach my $g ( @guarantees ) {	181	foreach my $g ( @guarantees ) {
182	$guarantees_non_issues_charges += $g->account->non_issues_charges;	182	$guarantees_non_issues_charges += $g->account->non_issues_charges;
Lines 397-414 sub GetBorrowersToExpunge { Link Here
397	FROM borrowers	397	FROM borrowers
398	JOIN categories USING (categorycode)	398	JOIN categories USING (categorycode)
399	LEFT JOIN (	399	LEFT JOIN (
400	SELECT guarantorid	400	SELECT guarantor_id
401	FROM borrowers	401	FROM borrower_relationships
402	WHERE guarantorid IS NOT NULL	402	WHERE guarantor_id IS NOT NULL
403	AND guarantorid <> 0	403	AND guarantor_id <> 0
404	) as tmp ON borrowers.borrowernumber=tmp.guarantorid	404	) as tmp ON borrowers.borrowernumber=tmp.guarantor_id
405	LEFT JOIN old_issues USING (borrowernumber)	405	LEFT JOIN old_issues USING (borrowernumber)
406	LEFT JOIN issues USING (borrowernumber)\|;	406	LEFT JOIN issues USING (borrowernumber)\|;
407	if ( $filterpatronlist ){	407	if ( $filterpatronlist ){
408	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;	408	$query .= q\| LEFT JOIN patron_list_patrons USING (borrowernumber)\|;
409	}	409	}
410	$query .= q\| WHERE category_type <> 'S'	410	$query .= q\| WHERE category_type <> 'S'
411	AND tmp.guarantorid IS NULL	411	AND tmp.guarantor_id IS NULL
412	\|;	412	\|;
413	my @query_params;	413	my @query_params;
414	if ( $filterbranch && $filterbranch ne "" ) {	414	if ( $filterbranch && $filterbranch ne "" ) {

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 (+99 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(
76	{ borrowernumber => \@guarantee_ids },
77	{
78	order_by => { -asc => [ 'surname', 'firstname' ] }
79	},
80	);
81
82	return wantarray ? $guarantees->as_list : $guarantees;
83	}
84
85	=cut
86
87	=head3 type
88
89	=cut
90
91	sub _type {
92	return 'BorrowerRelationship';
93	}
94
95	sub object_class {
96	return 'Koha::Patron::Relationship';
97	}
98
99	1;

Lines 125-142 sub search_upcoming_membership_expires { Link Here

(-)a/Koha/Patrons.pm (-12 lines)
125	);	125	);
126	}	126	}
127		127
128	=head3 guarantor
129
130	Returns a Koha::Patron object for this borrower's guarantor
131
132	=cut
133
134	sub guarantor {
135	my ( $self ) = @_;
136
137	return Koha::Patrons->find( $self->guarantorid() );
138	}
139
140	=head3 search_patrons_to_anonymise	128	=head3 search_patrons_to_anonymise
141		129
142	my $patrons = Koha::Patrons->search_patrons_to_anonymise( { before => $older_than_date, [ library => $library ] } );	130	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.perl (+52 lines)
	1	$DBversion = 'XXX'; # will be replaced by the RM
	2	if( CheckVersion( $DBversion ) ) {
	3	# you can use $dbh here like:
	4	# $dbh->do( "ALTER TABLE biblio ADD COLUMN badtaste int" );
	5	unless (TableExists('borrower_relationships')){
	6	$dbh->do(q{
	7	CREATE TABLE `borrower_relationships` (
	8	id INT(11) NOT NULL AUTO_INCREMENT,
	9	guarantor_id INT(11) NOT NULL,
	10	guarantee_id INT(11) NOT NULL,
	11	relationship VARCHAR(100) NOT NULL,
	12	PRIMARY KEY (id),
	13	CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
	14	CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
	15	) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
	16	});
	17
	18	$dbh->do(q{
	19	UPDATE borrowers
	20	LEFT JOIN borrowers guarantor ON ( borrowers.guarantorid = guarantor.borrowernumber )
	21	SET borrowers.guarantorid = NULL WHERE guarantor.borrowernumber IS NULL;
	22	});
	23
	24	$dbh->do(q{
	25	INSERT INTO borrower_relationships ( guarantor_id, guarantee_id, relationship )
	26	SELECT guarantorid, borrowernumber, relationship FROM borrowers WHERE guarantorid IS NOT NULL;
	27	});
	28
	29	}
	30
	31	if( column_exists( 'borrowers', 'guarantorid' ) ) {
	32	$dbh->do(q{
	33	ALTER TABLE borrowers DROP guarantorid;
	34	});
	35	}
	36
	37	if( column_exists( 'deletedborrowers', 'guarantorid' ) ) {
	38	$dbh->do(q{
	39	ALTER TABLE deletedborrowers DROP guarantorid;
	40	});
	41	}
	42
	43	if( column_exists( 'borrower_modifications', 'guarantorid' ) ) {
	44	$dbh->do(q{
	45	ALTER TABLE borrower_modifications DROP guarantorid;
	46	});
	47	}
	48
	49	# Always end with this (adjust the bug info)
	50	SetVersion( $DBversion );
	51	print "Upgrade to $DBversion done (Bug 14570 - Make it possible to add multiple guarantors to a record)\n";
	52	}

Lines 6-26 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-10 / +6 lines)
6	[% USE AuthorisedValues %]	6	[% USE AuthorisedValues %]
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 \| html %]&categorycode=[% patron.categorycode \| html %]">
10	<a id="editpatron" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=modify&destination=circ&borrowernumber=[% patron.borrowernumber \| html %]&guarantorid=[% guarantor.borrowernumber \| html %]&categorycode=[% patron.categorycode \| html %]">	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 \| html %]&categorycode=[% patron.categorycode \| html %]">
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 \| html %]"><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 \| html %]"><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 \| html %]"><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 \| html %]"><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 \| html %]&categorycode=[% patron.categorycode \| html %]"><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 \| html %]&categorycode=[% patron.categorycode \| html %]"><i class="fa fa-copy"></i> Duplicate</a>
25	[% END %]	21	[% END %]
26		22

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-170 / +232 lines)
1	[% USE raw %]	1	[% USE raw %]
2	[% USE Asset %]	2	[% USE Asset %]
		3	[% USE To %]
3	[% USE Koha %]	4	[% USE Koha %]
4	[% USE KohaDates %]	5	[% USE KohaDates %]
5	[% USE Branches %]	6	[% USE Branches %]
Lines 317-429 Link Here
317	</fieldset>	318	</fieldset>
318	[% END # hide fieldset %]	319	[% END # hide fieldset %]
319		320
320	[% IF ( showguarantor ) %]	321	[% IF show_guarantor \|\| guarantor %]
321	<input type="hidden" id="guarantorid" name="guarantorid" value="[% guarantorid \| html %]" />	322	[% SET possible_relationships = Koha.Preference('borrowerRelationship') %]
322	[% UNLESS step_6 %]	323	<fieldset class="rows">
323	<input type="hidden" name="branchcode" value="[% branchcode \| html %]" />	324	<legend>Guarantor information</legend>
324	[% END %]	325
325	<fieldset id="memberentry_guarantor" class="rows">	326	<span id="guarantor_relationships">
326	<legend id="guarantor_lgd">Guarantor information</legend>	327	[% FOREACH r IN relationships %]
327	<ol>	328	<fieldset class="rows">
328	[% IF ( P ) %]	329	<ol>
329	[% IF ( guarantorid ) %]	330	[% IF category_type == 'P' %]
330	<li id="contact-details">	331	<li id="contact-details">
331	[% ELSE %]	332	<span class="label">Organization #:</span> [% IF ( r.guarantor_id ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id \| uri %]" target="blank">[% r.guarantor_id \| html %]</a>[% END %]
332	<li id="contact-details" style="display: none">	333	</li>
333	[% END %]	334
334	<span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid \| uri %]" target="blank">[% guarantorid \| html %]</a>[% END %]	335	<li>
335	</li>	336	<label for="guarantor_surname">Organization name: </label>
336	<li>	337	<span>[% r.guarantor.surname \| html %]</span>
337	<label for="contactname">Organization name: </label>	338	</li>
338	[% IF ( guarantorid ) %]	339	[% ELSE %]
339	<span>[% contactname \| html %]</span>	340	<li id="contact-details">
340	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	341	<span class="label">Patron #:</span>
341	[% ELSE %]	342	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% r.guarantor_id \| uri %]" target="blank">[% r.guarantor_id \| html %]</a>
342	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	343	</li>
343	[% END %]	344
344	</li>	345	[% IF r.guarantor.surname %]
345	[% ELSE %]	346	<li>
346	[% IF ( C ) %]	347	<label for="guarantor_surname">Surname: </label>
347	[% IF ( guarantorid ) %]	348	<span>[% r.guarantor.surname \| html %]</span>
348	<li id="contact-details">	349	</li>
349	[% ELSE %]	350	[% END %]
350	<li id="contact-details" style="display: none">	351
351	[% END %]	352	[% IF r.guarantor.firstname %]
352	<span class="label">Patron #:</span>	353	<li>
353	[% IF guarantorid %]	354	<label for="guarantor_firstname">First name: </label>
354	[% IF logged_in_user.can_see_patron_infos( guarantor ) %]	355	<span>[% r.guarantor.firstname \| html %]</span>
355	<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid \| uri %]" target="blank">[% guarantorid \| html %]</a>	356	</li>
356	[% ELSE %]	357	[% END %]
357	[% guarantorid \| html %]	358
358	[% END %]	359	<li>
359	[% END %]	360	<label for="relationship">Relationship: </label>
360	</li>	361	<span>[% r.relationship \| html %]</span>
361	[% UNLESS nocontactname %]	362	</li>
362	<li>	363
363	<label for="contactname">Surname: </label>	364	<li>
364	[% IF ( guarantorid ) %]	365	<label for="delete_guarantor-[% r.id \| uri %]">Delete: </label>
365	<span>[% contactname \| html %]</span>	366	<input type="checkbox" id="delete_guarantor-[% r.id \| uri %]" name="delete_guarantor" value="[% r.id \| html %]" />
366	<input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname \| html %]" />	367	</li>
367	[% ELSE %]	368	[% END %]
368	<input name="contactname" id="contactname" type="text" size="20" value="[% contactname \| html %]" />	369	</ol>
369	[% END %]	370	</fieldset>
370	</li>	371	[% END # END relationships foreach %]
371	[% END %]	372	</span>
372	[% UNLESS nocontactfirstname %]	373
373	<li>	374	<fieldset class="rows guarantor" id="guarantor_template">
374	<label for="contactfirstname">First name: </label>	375	<ol>
375	[% IF ( guarantorid ) %]	376	<li class="guarantor_id">
376	<span>[% contactfirstname \| html %]</span>	377	<span class="label">Patron #:</span>
377	<input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname \| html %]" />	378	<span class="new_guarantor_id_text"></span>
378	[% ELSE %]	379	<input type="hidden" class="new_guarantor_id" name="new_guarantor_id" value=""/>
379	<input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname \| html %]" />	380	</li>
380	[% END %]	381
381	</li>	382	<li>
382	[% END %]	383	<label for="guarantor_surname">Surname: </label>
383	[% IF ( relshiploop ) %]	384	<span class="new_guarantor_surname_text"></span>
384	<li>	385	</li>
385	<label for="relationship">Relationship: </label>	386
386	<select name="relationship" id="relationship" >	387	<li>
387	[% FOREACH relshiploo IN relshiploop %]	388	<label for="guarantor_firstname">First name: </label>
388	[% IF ( relshiploo.selected ) %]	389	<span class="new_guarantor_firstname_text"></span>
389	<option value="[% relshiploo.relationship \| html %]" selected="selected" >[% relshiploo.relationship \| html %]</option>	390	</li>
390	[% ELSE %]	391
391	<option value="[% relshiploo.relationship \| html %]">[% relshiploo.relationship \| html %]</option>	392	<li>
392	[% END %]	393	<label for="guarantor_relationship">Relationship: </label>
393	[% END %]	394	<select class="new_guarantor_relationship" name="new_guarantor_relationship">
394	</select>	395	[% FOREACH pr IN possible_relationships.split('\\|') %]
395	</li>	396	<option value="[% pr \| html %]">[% pr \| html %]</option>
396	[% END %]	397	[% END %]
397	[% END %]	398	</select>
398	[% END %]	399	</li>
399	<li>	400
400	<span class="label"> </span>	401	<li>
401	[% IF ( guarantorid ) %]	402	<label for="guarantor_cancel"> </label>
402	<input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />	403	<span><a href="#" class="guarantor_cancel">Cancel</a></span>
403	[% ELSE %]	404	</li>
404	<input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" />	405	</ol>
405	[% END %]	406	</fieldset>
406	<input id="guarantordelete" type="button" value="Delete" />	407
407	</li>	408	<ol>
408	[% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]	409	<input type="hidden" id="guarantor_id" value="" />
409	<li>	410	<input name="guarantor_surname" id="guarantor_surname" type="hidden" />
410	<label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>	411	<input name="guarantor_firstname" id="guarantor_firstname" type="hidden" />
411	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">	412
412	[% IF privacy_guarantor_checkouts %]	413	<li>
413	<option value="0">No</option>	414	<a href="#" id="guarantor_search" class="btn btn-sm"><i class="fa fa-search"></i> Search</a>
414	<option value="1" selected>Yes</option>	415	</li>
415	[% ELSE %]	416
416	<option value="0" selected>No</option>	417	[% IF relationships && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
417	<option value="1">Yes</option>	418	<li>
		419	<label for="privacy_guarantor_checkouts">Show checkouts to guarantors</label>
		420	<select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
		421	[% IF privacy_guarantor_checkouts %]
		422	<option value="0">No</option>
		423	<option value="1" selected>Yes</option>
		424	[% ELSE %]
		425	<option value="0" selected>No</option>
		426	<option value="1">Yes</option>
		427	[% END %]
		428	</select>
		429	<div class="hint">Allow guarantors of this patron to view this patron's checkouts from the OPAC</div>
		430	</li>
418	[% END %]	431	[% END %]
419	</select>	432	</ol>
420	<div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
421	</li>
422	[% END %]
423	</ol>
424	</fieldset>	433	</fieldset>
425
426	[% END %]	434	[% END %]
		435
		436
427	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]	437	[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
428	[% SWITCH Koha.Preference( 'AddressFormat' ) %]	438	[% SWITCH Koha.Preference( 'AddressFormat' ) %]
429	[% CASE 'de' %]	439	[% CASE 'de' %]
Lines 434-517 Link Here
434	[% END # nostreet && nocity etc group%]	444	[% END # nostreet && nocity etc group%]
435		445
436	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]	446	[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
437	<fieldset class="rows" id="memberentry_contact">	447	<fieldset class="rows" id="memberentry_contact">
438	<legend id="contact_lgd">Contact</legend><ol>	448	<legend id="contact_lgd">Contact</legend><ol>
439	[% UNLESS nophone %]
440	<li>
441	[% IF ( mandatoryphone ) %]
442	<label for="phone" class="required">
443	[% ELSE %]
444	<label for="phone">
445	[% END %]
446	Primary phone: </label>
447	<input type="text" id="phone" name="phone" value="[% phone \| html %]" />
448	[% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
449		449
450	</li>	450	[% UNLESS nocontactname %]
		451	<li>
		452	[% IF ( mandatorycontactname ) %]
		453	<label for="contactname" class="required">
		454	[% ELSE %]
		455	<label for="contactname">
		456	[% END %]
		457	Guarantor surname: </label>
		458	<input type="text" id="contactname" name="contactname" value="[% contactname \| html %]" />
		459	[% IF ( mandatorycontactname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor surname</div>
		460	</li>
		461	[% END %]
		462
		463	[% UNLESS nocontactfirstname %]
		464	<li>
		465	[% IF ( mandatorycontactfirstname ) %]
		466	<label for="contactfirstname" class="required">
		467	[% ELSE %]
		468	<label for="contactfirstname">
		469	[% END %]
		470	Guarantor first name: </label>
		471	<input type="text" id="contactfirstname" name="contactfirstname" value="[% contactfirstname \| html %]" />
		472	[% IF ( mandatorycontactfirstname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor first name</div>
		473	</li>
451	[% END %]	474	[% END %]
		475
		476	[% UNLESS norelationship %]
		477	[% IF possible_relationships %]
		478	<li>
		479	<label for="relationship">Relationship: </label>
		480	<select class="relationship" name="relationship">
		481	<option value=""></option>
		482	[% FOREACH pr IN possible_relationships.split('\\|') %]
		483	[% IF pr == relationship %]
		484	<option value="[% pr %]" selected="selected">[% pr %]</option>
		485	[% ELSE %]
		486	<option value="[% pr %]">[% pr %]</option>
		487	[% END %]
		488	[% END %]
		489	</select>
		490	</li>
		491	[% END %]
		492	[% END %]
		493
		494	[% UNLESS nophone %]
		495	<li>
		496	[% IF ( mandatoryphone ) %]
		497	<label for="phone" class="required">
		498	[% ELSE %]
		499	<label for="phone">
		500	[% END %]
		501	Primary phone: </label>
		502	<input type="text" id="phone" name="phone" value="[% phone \| html %]" />
		503	[% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
		504	</li>
		505	[% END %]
		506
452	[% UNLESS nophonepro %]	507	[% UNLESS nophonepro %]
453	<li>	508	<li>
454	[% IF ( mandatoryphonepro ) %]	509	[% IF ( mandatoryphonepro ) %]
455	<label for="phonepro" class="required">	510	<label for="phonepro" class="required">
456	[% ELSE %]	511	[% ELSE %]
457	<label for="phonepro">	512	<label for="phonepro">
458	[% END %]	513	[% END %]
459	Secondary phone: </label>	514	Secondary phone: </label>
460	<input type="text" id="phonepro" name="phonepro" value="[% phonepro \| html %]" />	515	<input type="text" id="phonepro" name="phonepro" value="[% phonepro \| html %]" />
461	[% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]	516	[% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
462	</li>	517	</li>
463	[% END %]	518	[% END %]
		519
464	[% UNLESS nomobile %]	520	[% UNLESS nomobile %]
465	<li>	521	<li>
466	[% IF ( mandatorymobile ) %]	522	[% IF ( mandatorymobile ) %]
467	<label for="mobile" class="required">	523	<label for="mobile" class="required">
468	[% ELSE %]	524	[% ELSE %]
469	<label for="mobile">	525	<label for="mobile">
470	[% END %]	526	[% END %]
471	Other phone: </label>	527	Other phone: </label>
472	<input type="text" id="mobile" name="mobile" value="[% mobile \| html %]" />	528	<input type="text" id="mobile" name="mobile" value="[% mobile \| html %]" />
473	[% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]	529	[% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
474	</li>	530	</li>
475	[% END %]	531	[% END %]
476	[% UNLESS noemail %]
477	<li>
478	[% IF ( mandatoryemail ) %]
479	<label for="email" class="required">
480	[% ELSE %]
481	<label for="email">
482	[% END %]
483	Primary email: </label>
484	<input type="text" id="email" name="email" size="45" value="[% email \| html %]" />
485	[% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
486		532
487	</li>	533	[% UNLESS noemail %]
		534	<li>
		535	[% IF ( mandatoryemail ) %]
		536	<label for="email" class="required">
		537	[% ELSE %]
		538	<label for="email">
		539	[% END %]
		540	Primary email: </label>
		541	<input type="text" id="email" name="email" size="45" value="[% email \| html %]" />
		542	[% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
		543	</li>
488	[% END %]	544	[% END %]
		545
489	[% UNLESS noemailpro %]	546	[% UNLESS noemailpro %]
490	<li>	547	<li>
491	[% IF ( mandatoryemailpro ) %]	548	[% IF ( mandatoryemailpro ) %]
492	<label for="emailpro" class="required">	549	<label for="emailpro" class="required">
493	[% ELSE %]	550	[% ELSE %]
494	<label for="emailpro">	551	<label for="emailpro">
495	[% END %]	552	[% END %]
496	Secondary email: </label>	553	Secondary email: </label>
497	<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro \| html %]" />	554	<input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro \| html %]" />
498	[% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]	555	[% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
499	</li>	556	</li>
500	[% END %]	557	[% END %]
		558
501	[% UNLESS nofax %]	559	[% UNLESS nofax %]
502	<li>	560	<li>
503	[% IF ( mandatoryfax ) %]	561	[% IF ( mandatoryfax ) %]
504	<label for="fax" class="required">	562	<label for="fax" class="required">
505	[% ELSE %]	563	[% ELSE %]
506	<label for="fax">	564	<label for="fax">
507	[% END %]	565	[% END %]
508	Fax: </label>	566	Fax: </label>
509	<input type="text" id="fax" name="fax" value="[% fax \| html %]" />	567	<input type="text" id="fax" name="fax" value="[% fax \| html %]" />
510	[% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]	568	[% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
511	</li>	569	</li>
512	[% END %]	570	[% END %]
513	</ol>	571	</ol>
514	</fieldset>	572	</fieldset>
515	[%END # hide fieldset %]	573	[%END # hide fieldset %]
516		574
517	<!-- ********************** STEP_1 ********************* -->	575	<!-- ********************** STEP_1 ********************* -->
Lines 1174-1179 Link Here
1174	}	1232	}
1175	[% END %]	1233	[% END %]
1176		1234
		1235	[% IF guarantor %]
		1236	select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) \| $raw %] );
		1237	[% END %]
		1238
1177	$("#cn_max").hide();	1239	$("#cn_max").hide();
1178	var content;	1240	var content;
1179	$("#cardnumber").on("keydown", function(e){	1241	$("#cardnumber").on("keydown", function(e){

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 / +67 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 224-229 if ( $op eq 'insert' \|\| $op eq 'modify' \|\| $op eq 'save' \|\| $op eq 'duplicate' ) Link Here
224	qr/^add_debarment$/, qr/^debarred_expiration$/, # We already dealt with debarments previously	235	qr/^add_debarment$/, qr/^debarred_expiration$/, # We already dealt with debarments previously
225	qr/^housebound_chooser$/, qr/^housebound_deliverer$/,	236	qr/^housebound_chooser$/, qr/^housebound_deliverer$/,
226	qr/^select_city$/,	237	qr/^select_city$/,
		238	qr/^new_guarantor_/,
		239	qr/^guarantor_firstname$/,
		240	qr/^guarantor_surname$/,
		241	qr/^delete_guarantor$/,
227	);	242	);
228	for my $regexp (@keys_to_delete) {	243	for my $regexp (@keys_to_delete) {
229	for (keys %newdata) {	244	for (keys %newdata) {
Lines 248-273 if ( ( $op eq 'insert' ) and !$nodouble ) { Link Here
248	}	263	}
249	}	264	}
250		265
251	#recover all data from guarantor address phone ,fax...
252	if ( $guarantorid ) {
253	if (my $guarantor = Koha::Patrons->find( $guarantorid )) {
254	my $guarantordata = $guarantor->unblessed;
255	$category_type = $guarantordata->{categorycode} eq 'I' ? 'P' : 'C';
256	$guarantorinfo=$guarantordata->{'surname'}." , ".$guarantordata->{'firstname'};
257	$newdata{'contactfirstname'}= $guarantordata->{'firstname'};
258	$newdata{'contactname'} = $guarantordata->{'surname'};
259	$newdata{'contacttitle'} = $guarantordata->{'title'};
260	if ( $op eq 'add' ) {
261	foreach (qw(streetnumber address streettype address2
262	zipcode country city state phone phonepro mobile fax email emailpro branchcode
263	B_streetnumber B_streettype B_address B_address2
264	B_city B_state B_zipcode B_country B_email B_phone)) {
265	$newdata{$_} = $guarantordata->{$_};
266	}
267	}
268	}
269	}
270
271	###############test to take the right zipcode, country and city name ##############	266	###############test to take the right zipcode, country and city name ##############
272	# set only if parameter was passed from the form	267	# set only if parameter was passed from the form
273	$newdata{'city'} = $input->param('city') if defined($input->param('city'));	268	$newdata{'city'} = $input->param('city') if defined($input->param('city'));
Lines 435-440 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
435	# Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store	430	# Lot of code will need to be removed from this script to handle exceptions raised by Koha::Patron->store
436	warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn	431	warn "Patron creation failed! - $@"; # Maybe we must die instead of just warn
437	} else {	432	} else {
		433	add_guarantors( $patron, $input );
438	$borrowernumber = $patron->borrowernumber;	434	$borrowernumber = $patron->borrowernumber;
439	}	435	}
440		436
Lines 541-546 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
541	$patron->set_password({ password => $password });	537	$patron->set_password({ password => $password });
542	}	538	}
543		539
		540	add_guarantors( $patron, $input );
544	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {	541	if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
545	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);	542	C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
546	}	543	}
Lines 639-649 foreach my $category_type (qw(C A S P I X)) { Link Here
639	'categoryloop' => \@categoryloop	636	'categoryloop' => \@categoryloop
640	};	637	};
641	}	638	}
642		639	$template->param(
643	$template->param('typeloop' => \@typeloop,	640	typeloop => \@typeloop,
644	no_categories => $no_categories);	641	no_categories => $no_categories,
645	if($no_categories){ $no_add = 1; }	642	);
646
647		643
648	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );	644	my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
649	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );	645	my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
Lines 668-691 while (@relationships) { Link Here
668	push(@relshipdata, \%row);	664	push(@relshipdata, \%row);
669	}	665	}
670		666
671	my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],	667	my %flags = (
672	'lost' => ['lost']);	668	'gonenoaddress' => ['gonenoaddress'],
		669	'lost' => ['lost']
		670	);
673		671
674
675	my @flagdata;	672	my @flagdata;
676	foreach (keys(%flags)) {	673	foreach ( keys(%flags) ) {
677	my $key = $_;	674	my $key = $_;
678	my %row = ('key' => $key,	675	my %row = (
679	'name' => $flags{$key}[0]);	676	'key' => $key,
680	if ($data{$key}) {	677	'name' => $flags{$key}[0]
681	$row{'yes'}=' checked';	678	);
682	$row{'no'}='';	679	if ( $data{$key} ) {
683	}	680	$row{'yes'} = ' checked';
684	else {	681	$row{'no'} = '';
685	$row{'yes'}='';	682	}
686	$row{'no'}=' checked';	683	else {
687	}	684	$row{'yes'} = '';
688	push @flagdata,\%row;	685	$row{'no'} = ' checked';
		686	}
		687	push @flagdata, \%row;
689	}	688	}
690		689
691	# get Branch Loop	690	# get Branch Loop
Lines 761-767 if (C4::Context->preference('EnhancedMessagingPreferences')) { Link Here
761	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));	760	$template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
762	}	761	}
763		762
764	$template->param( "showguarantor" => ($category_type=~/A\|I\|S\|X/) ? 0 : 1); # associate with step to know where you are	763	$template->param( "show_guarantor" => ( $category_type =~ /A\|I\|S\|X/ ) ? 0 : 1 ); # associate with step to know where you are
765	$debug and warn "memberentry step: $step";	764	$debug and warn "memberentry step: $step";
766	$template->param(%data);	765	$template->param(%data);
767	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are	766	$template->param( "step_$step" => 1) if $step; # associate with step to know where u are
Lines 775-791 $template->param( Link Here
775	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)	774	check_member => $check_member,#to know if the borrower already exist(=>1) or not (=>0)
776	"op$op" => 1);	775	"op$op" => 1);
777		776
778	$guarantorid = $borrower_data->{'guarantorid'} \|\| $guarantorid;
779	my $guarantor = $guarantorid ? Koha::Patrons->find( $guarantorid ) : undef;
780	$template->param(	777	$template->param(
781	patron => $patron ? $patron : \%newdata, # Used by address include templates now	778	patron => $patron ? $patron : \%newdata, # Used by address include templates now
782	nodouble => $nodouble,	779	nodouble => $nodouble,
783	borrowernumber => $borrowernumber, #register number	780	borrowernumber => $borrowernumber, #register number
784	guarantor => $guarantor,
785	guarantorid => $guarantorid,
786	relshiploop => \@relshipdata,	781	relshiploop => \@relshipdata,
787	btitle=> $default_borrowertitle,	782	btitle=> $default_borrowertitle,
788	guarantorinfo => $guarantorinfo,
789	flagloop => \@flagdata,	783	flagloop => \@flagdata,
790	category_type =>$category_type,	784	category_type =>$category_type,
791	modify => $modify,	785	modify => $modify,
Lines 913-918 sub patron_attributes_form { Link Here
913		907
914	}	908	}
915		909
		910	sub add_guarantors {
		911	my ( $patron, $input ) = @_;
		912
		913	my @new_guarantor_id = $input->multi_param('new_guarantor_id');
		914	my @new_guarantor_relationship = $input->multi_param('new_guarantor_relationship');
		915
		916	for ( my $i = 0 ; $i < scalar @new_guarantor_id; $i++ ) {
		917	my $guarantor_id = $new_guarantor_id[$i];
		918	my $relationship = $new_guarantor_relationship[$i];
		919
		920	next unless $guarantor_id;
		921
		922	$patron->add_guarantor(
		923	{
		924	guarantee_id => $patron->id,
		925	guarantor_id => $guarantor_id,
		926	relationship => $relationship,
		927	}
		928	);
		929	}
		930	}
		931
916	# Local Variables:	932	# Local Variables:
917	# tab-width: 8	933	# tab-width: 8
918	# End:	934	# End:

Lines 162-183 if ( $patron->is_debarred ) { Link Here

(-)a/members/moremember.pl (-15 / +13 lines)
162	$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};	162	$data->{ "sex_".$data->{'sex'}."_p" } = 1 if defined $data->{sex};
163		163
164	my @relatives;	164	my @relatives;
165	if ( my $guarantor = $patron->guarantor ) {	165	my $guarantor_relationships = $patron->guarantor_relationships;
166	$template->param( guarantor => $guarantor );	166	my @guarantees = $patron->guarantee_relationships->guarantees;
167	push @relatives, $guarantor->borrowernumber;	167	my @guarantors = $guarantor_relationships->guarantors;
168	push @relatives, $_->borrowernumber for $patron->siblings;	168	if (@guarantors) {
169	} elsif ( $patron->contactname \|\| $patron->contactfirstname ) {	169	push( @relatives, $_->id ) for @guarantors;
170	$template->param(	170	push( @relatives, $_->id ) for $patron->siblings();
171	guarantor => {
172	firstname => $patron->contactfirstname,
173	surname => $patron->contactname,
174	}
175	);
176	} else {
177	my @guarantees = $patron->guarantees;
178	$template->param( guarantees => \@guarantees );
179	push @relatives, $_->borrowernumber for @guarantees;
180	}	171	}
		172	else {
		173	push( @relatives, $_->id ) for @guarantees;
		174	}
		175	$template->param(
		176	guarantor_relationships => $guarantor_relationships,
		177	guarantees => \@guarantees,
		178	);
181		179
182	my $relatives_issues_count =	180	my $relatives_issues_count =
183	Koha::Database->new()->schema()->resultset('Issue')	181	Koha::Database->new()->schema()->resultset('Issue')

Lines 33-38 use C4::Auth; Link Here

(-)a/members/update-child.pl (-7 / +11 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 68-74 if ( $op eq 'multi' ) { Link Here
68	);	69	);
69	output_html_with_http_headers $input, $cookie, $template->output;	70	output_html_with_http_headers $input, $cookie, $template->output;
70	}	71	}
71
72	elsif ( $op eq 'update' ) {	72	elsif ( $op eq 'update' ) {
73	my $patron = Koha::Patrons->find( $borrowernumber );	73	my $patron = Koha::Patrons->find( $borrowernumber );
74	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );	74	output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
Lines 84-90 elsif ( $op eq 'update' ) { Link Here
84	# But we should not hit that with a normal use of the interface	84	# But we should not hit that with a normal use of the interface
85	die "You are doing something wrong updating this child" unless $adult_category;	85	die "You are doing something wrong updating this child" unless $adult_category;
86		86
87	$patron->guarantorid(undef);	87	$_->delete() for $patron->guarantor_relationships();
		88
88	$patron->categorycode($adult_category->categorycode);	89	$patron->categorycode($adult_category->categorycode);
89	$patron->store;	90	$patron->store;
90		91
Lines 92-103 elsif ( $op eq 'update' ) { Link Here
92	# We could redirect with a friendly message	93	# We could redirect with a friendly message
93	if ( $patron_categories->count > 1 ) {	94	if ( $patron_categories->count > 1 ) {
94	$template->param(	95	$template->param(
95	SUCCESS => 1,	96	SUCCESS => 1,
96	borrowernumber => $borrowernumber,	97	borrowernumber => $borrowernumber,
97	);	98	);
98	output_html_with_http_headers $input, $cookie, $template->output;	99	output_html_with_http_headers $input, $cookie, $template->output;
99	} else {	100	}
100	print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber");	101	else {
		102	print $input->redirect(
		103	"/cgi-bin/koha/members/moremember.pl?borrowernumber=$borrowernumber"
		104	);
101	}	105	}
102	}	106	}
103		107

Lines 39-44 use Koha::Holds; Link Here

(-)a/opac/opac-user.pl (-8 / +7 lines)
39	use Koha::Database;	39	use Koha::Database;
40	use Koha::ItemTypes;	40	use Koha::ItemTypes;
41	use Koha::Patron::Attribute::Types;	41	use Koha::Patron::Attribute::Types;
		42	use Koha::Patrons;
42	use Koha::Patron::Messages;	43	use Koha::Patron::Messages;
43	use Koha::Patron::Discharge;	44	use Koha::Patron::Discharge;
44	use Koha::Patrons;	45	use Koha::Patrons;
Lines 340-353 my $patron_messages = Koha::Patron::Messages->search( Link Here
340	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')	341	if ( C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
341	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )	342	\|\| C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
342	{	343	{
343	my @relatives =	344	my @relatives;
344	Koha::Database->new()->schema()->resultset("Borrower")->search(	345	# Filter out guarantees that don't want guarantor to see checkouts
345	{	346	foreach my $gr ( $patron->guarantee_relationships() ) {
346	privacy_guarantor_checkouts => 1,	347	my $g = $gr->guarantee;
347	'me.guarantorid' => $borrowernumber	348	push( @relatives, $g ) if $g->privacy_guarantor_checkouts;
348	},	349	}
349	{ prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
350	);
351	$template->param( relatives => \@relatives );	350	$template->param( relatives => \@relatives );
352	}	351	}
353		352

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 (-7 / +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 => {
59	guarantorid => $patron->borrowernumber,	61	patron_category => $patron_category->{categorycode},
60	categorycode => $patron_category->{categorycode},	62	}
		63	}
		64	);
		65
		66	my $r = $builder->build_object(
		67	{
		68	class => 'Koha::Patron::Relationships',
		69	value => {
		70	guarantor_id => $patron->id,
		71	guarantee_id => $guarantee->id,
		72	relationship => 'parent',
61	}	73	}
62	}	74	}
63	);	75	);
Lines 68-78 t::lib::Mocks::mock_preference( 'AllowFineOverride', '' ); Link Here
68	my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );	80	my ( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
69	is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );	81	is( $issuingimpossible->{DEBT_GUARANTEES}, undef, "Patron can check out item" );
70		82
71	manualinvoice( $guarantee->{borrowernumber}, undef, undef, 'L', 10.00 );	83	manualinvoice( $guarantee->id, undef, undef, 'L', 10.00 );
72	( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );	84	( $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" );	85	is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );
74		86
75	my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->{borrowernumber} })->next();	87	my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->id })->next();
76	is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );	88	is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );
77	is( $accountline->accounttype, "L", "Account type is L" );	89	is( $accountline->accounttype, "L", "Account type is L" );
78		90

Lines 34-39 use C4::Auth qw(checkpw_hash); Link Here

(-)a/t/db_dependent/Koha/Patrons.t (-38 / +111 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 83-103 subtest 'library' => sub { Link Here
83		84
84	subtest 'guarantees' => sub {	85	subtest 'guarantees' => sub {
85	plan tests => 13;	86	plan tests => 13;
86	my $guarantees = $new_patron_1->guarantees;	87	my $guarantees = $new_patron_1->guarantee_relationships;
87	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	88	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );
88	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee' );	89	is( $guarantees->count, 0, 'new_patron_1 should have 0 guarantee relationships' );
89	my @guarantees = $new_patron_1->guarantees;	90	my @guarantees = $new_patron_1->guarantee_relationships;
90	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	91	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
91	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );	92	is( scalar(@guarantees), 0, 'new_patron_1 should have 0 guarantee' );
92		93
93	my $guarantee_1 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	94	my $guarantee_1 = $builder->build({ source => 'Borrower' });
94	my $guarantee_2 = $builder->build({ source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber }});	95	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_1->{borrowernumber}, relationship => 'test' } )->store();
		96	my $guarantee_2 = $builder->build({ source => 'Borrower' });
		97	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->id, guarantee_id => $guarantee_2->{borrowernumber}, relationship => 'test' } )->store();
95		98
96	$guarantees = $new_patron_1->guarantees;	99	$guarantees = $new_patron_1->guarantee_relationships;
97	is( ref($guarantees), 'Koha::Patrons', 'Koha::Patron->guarantees should return a Koha::Patrons result set in a scalar context' );	100	is( ref($guarantees), 'Koha::Patron::Relationships', 'Koha::Patron->guarantee_relationships should return a Koha::Patrons result set in a scalar context' );
98	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );	101	is( $guarantees->count, 2, 'new_patron_1 should have 2 guarantees' );
99	@guarantees = $new_patron_1->guarantees;	102	@guarantees = $new_patron_1->guarantee_relationships;
100	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantees should return an array in a list context' );	103	is( ref(\@guarantees), 'ARRAY', 'Koha::Patron->guarantee_relationships should return an array in a list context' );
101	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );	104	is( scalar(@guarantees), 2, 'new_patron_1 should have 2 guarantees' );
102	$_->delete for @guarantees;	105	$_->delete for @guarantees;
103		106
Lines 107-146 subtest 'guarantees' => sub { Link Here
107		110
108	my $guarantor = $builder->build_object( { class => 'Koha::Patrons' } );	111	my $guarantor = $builder->build_object( { class => 'Koha::Patrons' } );
109		112
110	my $order_guarantee1 = $builder->build_object( { class => 'Koha::Patrons' , value => {	113	my $order_guarantee1 = $builder->build_object(
111	surname => 'Zebra',	114	{
112	guarantorid => $guarantor->borrowernumber	115	class => 'Koha::Patrons',
		116	value => {
		117	surname => 'Zebra',
		118	}
113	}	119	}
114	})->borrowernumber;	120	)->borrowernumber;
		121	$builder->build_object(
		122	{
		123	class => 'Koha::Patron::Relationships',
		124	value => {
		125	guarantor_id => $guarantor->id,
		126	guarantee_id => $order_guarantee1,
		127	relationship => 'test',
		128	}
		129	}
		130	);
115		131
116	my $order_guarantee2 = $builder->build_object( { class => 'Koha::Patrons' , value => {	132	my $order_guarantee2 = $builder->build_object(
117	surname => 'Yak',	133	{
118	guarantorid => $guarantor->borrowernumber	134	class => 'Koha::Patrons',
		135	value => {
		136	surname => 'Yak',
		137	}
119	}	138	}
120	})->borrowernumber;	139	)->borrowernumber;
		140	$builder->build_object(
		141	{
		142	class => 'Koha::Patron::Relationships',
		143	value => {
		144	guarantor_id => $guarantor->id,
		145	guarantee_id => $order_guarantee2,
		146	relationship => 'test',
		147	}
		148	}
		149	);
121		150
122	my $order_guarantee3 = $builder->build_object( { class => 'Koha::Patrons' , value => {	151	my $order_guarantee3 = $builder->build_object(
123	surname => 'Xerus',	152	{
124	firstname => 'Walrus',	153	class => 'Koha::Patrons',
125	guarantorid => $guarantor->borrowernumber	154	value => {
		155	surname => 'Xerus',
		156	firstname => 'Walrus',
		157	}
126	}	158	}
127	})->borrowernumber;	159	)->borrowernumber;
		160	$builder->build_object(
		161	{
		162	class => 'Koha::Patron::Relationships',
		163	value => {
		164	guarantor_id => $guarantor->id,
		165	guarantee_id => $order_guarantee3,
		166	relationship => 'test',
		167	}
		168	}
		169	);
128		170
129	my $order_guarantee4 = $builder->build_object( { class => 'Koha::Patrons' , value => {	171	my $order_guarantee4 = $builder->build_object(
130	surname => 'Xerus',	172	{
131	firstname => 'Vulture',	173	class => 'Koha::Patrons',
132	guarantorid => $guarantor->borrowernumber	174	value => {
		175	surname => 'Xerus',
		176	firstname => 'Vulture',
		177	guarantorid => $guarantor->borrowernumber
		178	}
		179	}
		180	)->borrowernumber;
		181	$builder->build_object(
		182	{
		183	class => 'Koha::Patron::Relationships',
		184	value => {
		185	guarantor_id => $guarantor->id,
		186	guarantee_id => $order_guarantee4,
		187	relationship => 'test',
		188	}
133	}	189	}
134	})->borrowernumber;	190	);
135		191
136	my $order_guarantee5 = $builder->build_object( { class => 'Koha::Patrons' , value => {	192	my $order_guarantee5 = $builder->build_object(
137	surname => 'Xerus',	193	{
138	firstname => 'Unicorn',	194	class => 'Koha::Patrons',
139	guarantorid => $guarantor->borrowernumber	195	value => {
		196	surname => 'Xerus',
		197	firstname => 'Unicorn',
		198	guarantorid => $guarantor->borrowernumber
		199	}
140	}	200	}
141	})->borrowernumber;	201	)->borrowernumber;
		202	my $r = $builder->build_object(
		203	{
		204	class => 'Koha::Patron::Relationships',
		205	value => {
		206	guarantor_id => $guarantor->id,
		207	guarantee_id => $order_guarantee5,
		208	relationship => 'test',
		209	}
		210	}
		211	);
142		212
143	$guarantees = $guarantor->guarantees();	213	$guarantees = $guarantor->guarantee_relationships->guarantees;
144		214
145	is( $guarantees->next()->borrowernumber, $order_guarantee5, "Return first guarantor alphabetically" );	215	is( $guarantees->next()->borrowernumber, $order_guarantee5, "Return first guarantor alphabetically" );
146	is( $guarantees->next()->borrowernumber, $order_guarantee4, "Return second guarantor alphabetically" );	216	is( $guarantees->next()->borrowernumber, $order_guarantee4, "Return second guarantor alphabetically" );
Lines 160-174 subtest 'siblings' => sub { Link Here
160	plan tests => 7;	230	plan tests => 7;
161	my $siblings = $new_patron_1->siblings;	231	my $siblings = $new_patron_1->siblings;
162	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );	232	is( $siblings, undef, 'Koha::Patron->siblings should not crashed if the patron has no guarantor' );
163	my $guarantee_1 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	233	my $guarantee_1 = $builder->build( { source => 'Borrower' } );
		234	my $relationship_1 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_1->{borrowernumber}, relationship => 'test' } )->store();
164	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);	235	my $retrieved_guarantee_1 = Koha::Patrons->find($guarantee_1);
165	$siblings = $retrieved_guarantee_1->siblings;	236	$siblings = $retrieved_guarantee_1->siblings;
166	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );	237	is( ref($siblings), 'Koha::Patrons', 'Koha::Patron->siblings should return a Koha::Patrons result set in a scalar context' );
167	my @siblings = $retrieved_guarantee_1->siblings;	238	my @siblings = $retrieved_guarantee_1->siblings;
168	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );	239	is( ref( \@siblings ), 'ARRAY', 'Koha::Patron->siblings should return an array in a list context' );
169	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );	240	is( $siblings->count, 0, 'guarantee_1 should not have siblings yet' );
170	my $guarantee_2 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	241	my $guarantee_2 = $builder->build( { source => 'Borrower' } );
171	my $guarantee_3 = $builder->build( { source => 'Borrower', value => { guarantorid => $new_patron_1->borrowernumber } } );	242	my $relationship_2 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_2->{borrowernumber}, relationship => 'test' } )->store();
		243	my $guarantee_3 = $builder->build( { source => 'Borrower' } );
		244	my $relationship_3 = Koha::Patron::Relationship->new( { guarantor_id => $new_patron_1->borrowernumber, guarantee_id => $guarantee_3->{borrowernumber}, relationship => 'test' } )->store();
172	$siblings = $retrieved_guarantee_1->siblings;	245	$siblings = $retrieved_guarantee_1->siblings;
173	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );	246	is( $siblings->count, 2, 'guarantee_1 should have 2 siblings' );
174	is( $guarantee_2->{borrowernumber}, $siblings->next->borrowernumber, 'guarantee_2 should exist in the guarantees' );	247	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 215-221 my $borrower1 = $builder->build({ Link Here
215	categorycode=>'STAFFER',	213	categorycode=>'STAFFER',
216	branchcode => $library3->{branchcode},	214	branchcode => $library3->{branchcode},
217	dateexpiry => '2015-01-01',	215	dateexpiry => '2015-01-01',
218	guarantorid=> undef,
219	},	216	},
220	});	217	});
221	my $bor1inlist = $borrower1->{borrowernumber};	218	my $bor1inlist = $borrower1->{borrowernumber};
Lines 225-231 my $borrower2 = $builder->build({ Link Here
225	categorycode=>'STAFFER',	222	categorycode=>'STAFFER',
226	branchcode => $library3->{branchcode},	223	branchcode => $library3->{branchcode},
227	dateexpiry => '2015-01-01',	224	dateexpiry => '2015-01-01',
228	guarantorid=> undef,
229	},	225	},
230	});	226	});
231		227
Lines 235-241 my $guarantee = $builder->build({ Link Here
235	categorycode=>'KIDclamp',	231	categorycode=>'KIDclamp',
236	branchcode => $library3->{branchcode},	232	branchcode => $library3->{branchcode},
237	dateexpiry => '2015-01-01',	233	dateexpiry => '2015-01-01',
238	guarantorid=> undef, # will be filled later
239	},	234	},
240	});	235	});
241		236
Lines 270-276 $patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_ Link Here
270	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');	265	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Staff patron not deleted by last issue date');
271		266
272	Koha::Patrons->find($bor1inlist)->set({ categorycode => 'CIVILIAN' })->store;	267	Koha::Patrons->find($bor1inlist)->set({ categorycode => 'CIVILIAN' })->store;
273	Koha::Patrons->find($guarantee->{borrowernumber})->set({ guarantorid => $bor1inlist })->store;	268	my $relationship = Koha::Patron::Relationship->new( { guarantor_id => $bor1inlist, guarantee_id => $guarantee->{borrowernumber}, relationship => 'test' } )->store();
274		269
275	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );	270	$patstodel = GetBorrowersToExpunge( {patron_list_id => $list1->patron_list_id()} );
276	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');	271	ok( scalar(@$patstodel)== 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted from list');
Lines 280-286 $patstodel = GetBorrowersToExpunge( {expired_before => '2015-01-02', patron_list Link Here
280	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');	275	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by expirationdate and list');
281	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );	276	$patstodel = GetBorrowersToExpunge( {not_borrowed_since => '2016-01-02', patron_list_id => $list1->patron_list_id() } );
282	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');	277	ok( scalar(@$patstodel) == 1 && $patstodel->[0]->{'borrowernumber'} eq $bor2inlist,'Guarantor patron not deleted by last issue date');
283	Koha::Patrons->find($guarantee->{borrowernumber})->set({ guarantorid => undef })->store;	278	$relationship->delete();
284		279
285	$builder->build({	280	$builder->build({
286	source => 'Issue',	281	source => 'Issue',
Lines 308-316 is( scalar(@$patstodel),2,'Borrowers without issues deleted by last issue date') Link Here
308		303
309	# Test GetBorrowersToExpunge and TrackLastPatronActivity	304	# Test GetBorrowersToExpunge and TrackLastPatronActivity
310	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);	305	$dbh->do(q\|UPDATE borrowers SET lastseen=NULL\|);
311	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN', guarantorid => undef } } );	306	$builder->build({ source => 'Borrower', value => { lastseen => '2016-01-01 01:01:01', categorycode => 'CIVILIAN' } } );
312	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN', guarantorid => undef } } );	307	$builder->build({ source => 'Borrower', value => { lastseen => '2016-02-02 02:02:02', categorycode => 'CIVILIAN' } } );
313	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN', guarantorid => undef } } );	308	$builder->build({ source => 'Borrower', value => { lastseen => '2016-03-03 03:03:03', categorycode => 'CIVILIAN' } } );
314	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });	309	$patstodel = GetBorrowersToExpunge( { last_seen => '1999-12-12' });
315	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );	310	is( scalar @$patstodel, 0, 'TrackLastPatronActivity - 0 patrons must be deleted' );
316	$patstodel = GetBorrowersToExpunge( { last_seen => '2016-02-15' });	311	$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;