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

(-)a/C4/Auth_with_ldap.pm (-1 lines)
Lines 468-474 C4::Auth - Authenticates Koha users Link Here
468
		| contactname         | mediumtext   | YES  |     | NULL    |                |
468
		| contactname         | mediumtext   | YES  |     | NULL    |                |
469
		| contactfirstname    | text         | YES  |     | NULL    |                |
469
		| contactfirstname    | text         | YES  |     | NULL    |                |
470
		| contacttitle        | text         | YES  |     | NULL    |                |
470
		| contacttitle        | text         | YES  |     | NULL    |                |
471
		| guarantorid         | int(11)      | YES  | MUL | NULL    |                |
472
		| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
471
		| borrowernotes       | mediumtext   | YES  |     | NULL    |                |
473
		| relationship        | varchar(100) | YES  |     | NULL    |                |
472
		| relationship        | varchar(100) | YES  |     | NULL    |                |
474
		| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
473
		| ethnicity           | varchar(50)  | YES  |     | NULL    |                |
(-)a/C4/Circulation.pm (-1 / +1 lines)
Lines 786-792 sub CanBookBeIssued { Link Here
786
    my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
786
    my $no_issues_charge_guarantees = C4::Context->preference("NoIssuesChargeGuarantees");
787
    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
787
    $no_issues_charge_guarantees = undef unless looks_like_number( $no_issues_charge_guarantees );
788
    if ( defined $no_issues_charge_guarantees ) {
788
    if ( defined $no_issues_charge_guarantees ) {
789
        my @guarantees = $patron->guarantees();
789
        my @guarantees = map { $_->guarantee } $patron->guarantee_relationships();
790
        my $guarantees_non_issues_charges;
790
        my $guarantees_non_issues_charges;
791
        foreach my $g ( @guarantees ) {
791
        foreach my $g ( @guarantees ) {
792
            $guarantees_non_issues_charges += $g->account->non_issues_charges;
792
            $guarantees_non_issues_charges += $g->account->non_issues_charges;
(-)a/C4/Members.pm (-7 / +7 lines)
Lines 176-182 sub patronflags { Link Here
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 "" ) {
(-)a/C4/SIP/ILS/Patron.pm (-1 lines)
Lines 627-633 __END__ Link Here
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    |                |
(-)a/Koha/Object.pm (-2 / +6 lines)
Lines 72-79 sub new { Link Here
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!")
(-)a/Koha/Patron.pm (-33 / +87 lines)
Lines 27-34 use Text::Unaccent qw( unac_string ); Link Here
27
27
28
use C4::Context;
28
use C4::Context;
29
use C4::Log;
29
use C4::Log;
30
use Koha::Account;
30
use Koha::AuthUtils;
31
use Koha::AuthUtils;
31
use Koha::Checkouts;
32
use Koha::Checkouts;
33
use Koha::Club::Enrollments;
32
use Koha::Database;
34
use Koha::Database;
33
use Koha::DateUtils;
35
use Koha::DateUtils;
34
use Koha::Exceptions::Password;
36
use Koha::Exceptions::Password;
Lines 39-50 use Koha::Patron::Categories; Link Here
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;
44
use Koha::Patron::Relationships;
42
use Koha::Patrons;
45
use Koha::Patrons;
43
use Koha::Virtualshelves;
44
use Koha::Club::Enrollments;
45
use Koha::Account;
46
use Koha::Subscription::Routinglists;
46
use Koha::Subscription::Routinglists;
47
use Koha::Token;
47
use Koha::Token;
48
use Koha::Virtualshelves;
48
49
49
use base qw(Koha::Object);
50
use base qw(Koha::Object);
50
51
Lines 365-405 sub category { Link Here
365
    return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
366
    return Koha::Patron::Category->_new_from_dbic( $self->_result->categorycode );
366
}
367
}
367
368
368
=head3 guarantor
369
=head3 image
369
370
Returns a Koha::Patron object for this patron's guarantor
371
370
372
=cut
371
=cut
373
372
374
sub guarantor {
375
    my ( $self ) = @_;
376
377
    return unless $self->guarantorid();
378
379
    return Koha::Patrons->find( $self->guarantorid() );
380
}
381
382
sub image {
373
sub image {
383
    my ( $self ) = @_;
374
    my ( $self ) = @_;
384
375
385
    return scalar Koha::Patron::Images->find( $self->borrowernumber );
376
    return scalar Koha::Patron::Images->find( $self->borrowernumber );
386
}
377
}
387
378
379
=head3 library
380
381
Returns a Koha::Library object representing the patron's home library.
382
383
=cut
384
388
sub library {
385
sub library {
389
    my ( $self ) = @_;
386
    my ( $self ) = @_;
390
    return Koha::Library->_new_from_dbic($self->_result->branchcode);
387
    return Koha::Library->_new_from_dbic($self->_result->branchcode);
391
}
388
}
392
389
393
=head3 guarantees
390
=head3 guarantor_relationships
391
392
Returns Koha::Patron::Relationships object for this patron's guarantors
394
393
395
Returns the guarantees (list of Koha::Patron) of this patron
394
Returns the set of relationships for the patrons that are guarantors for this patron.
395
396
This is returned instead of a Koha::Patron object because the guarantor
397
may not exist as a patron in Koha. If this is true, the guarantors name
398
exists in the Koha::Patron::Relationship object and will have no guarantor_id.
396
399
397
=cut
400
=cut
398
401
399
sub guarantees {
402
sub guarantor_relationships {
400
    my ( $self ) = @_;
403
    my ($self) = @_;
401
404
402
    return Koha::Patrons->search( { guarantorid => $self->borrowernumber }, { order_by => { -asc => ['surname','firstname'] } } );
405
    return Koha::Patron::Relationships->search( { guarantee_id => $self->id } );
406
}
407
408
=head3 guarantee_relationships
409
410
Returns Koha::Patron::Relationships object for this patron's guarantors
411
412
Returns the set of relationships for the patrons that are guarantees for this patron.
413
414
The method returns Koha::Patron::Relationship objects for the sake
415
of consistency with the guantors method.
416
A guarantee by definition must exist as a patron in Koha.
417
418
=cut
419
420
sub guarantee_relationships {
421
    my ($self) = @_;
422
423
    return Koha::Patron::Relationships->search(
424
        { guarantor_id => $self->id },
425
        {
426
            prefetch => 'guarantee',
427
            order_by => { -asc => [ 'guarantee.surname', 'guarantee.firstname' ] },
428
        }
429
    );
403
}
430
}
404
431
405
=head3 housebound_profile
432
=head3 housebound_profile
Lines 437-459 Returns the siblings of this patron. Link Here
437
=cut
464
=cut
438
465
439
sub siblings {
466
sub siblings {
440
    my ( $self ) = @_;
467
    my ($self) = @_;
441
468
442
    my $guarantor = $self->guarantor;
469
    my @guarantors = $self->guarantor_relationships()->guarantors();
443
470
444
    return unless $guarantor;
471
    return unless @guarantors;
445
472
446
    return Koha::Patrons->search(
473
    my @siblings =
447
        {
474
      map { $_->guarantee_relationships()->guarantees() } @guarantors;
448
            guarantorid => {
475
449
                '!=' => undef,
476
    return unless @siblings;
450
                '=' => $guarantor->id,
477
451
            },
478
    my %seen;
452
            borrowernumber => {
479
    @siblings =
453
                '!=' => $self->borrowernumber,
480
      grep { !$seen{ $_->id }++ && ( $_->id != $self->id ) } @siblings;
454
            }
481
455
        }
482
    return wantarray ? @siblings : Koha::Patrons->search( { borrowernumber => { -in => [ map { $_->id } @siblings ] } } );
456
    );
457
}
483
}
458
484
459
=head3 merge_with
485
=head3 merge_with
Lines 1392-1397 sub _anonymize_column { Link Here
1392
    $self->$col($val);
1418
    $self->$col($val);
1393
}
1419
}
1394
1420
1421
=head3 add_guarantor
1422
1423
    my @relationships = $patron->add_guarantor(
1424
        {
1425
            borrowernumber => $borrowernumber,
1426
            relationships  => $relationship,
1427
        }
1428
    );
1429
1430
    Adds a new guarantor to a patron.
1431
1432
=cut
1433
1434
sub add_guarantor {
1435
    my ( $self, $params ) = @_;
1436
1437
    my $guarantor_id = $params->{guarantor_id};
1438
    my $relationship = $params->{relationship};
1439
1440
    return Koha::Patron::Relationship->new(
1441
        {
1442
            guarantee_id => $self->id,
1443
            guarantor_id => $guarantor_id,
1444
            relationship => $relationship
1445
        }
1446
    )->store();
1447
}
1448
1395
=head2 Internal methods
1449
=head2 Internal methods
1396
1450
1397
=head3 _type
1451
=head3 _type
(-)a/Koha/Patron/Relationship.pm (+73 lines)
Line 0 Link Here
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;
(-)a/Koha/Patron/Relationships.pm (+99 lines)
Line 0 Link Here
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;
(-)a/Koha/Patrons.pm (-12 lines)
Lines 125-142 sub search_upcoming_membership_expires { Link Here
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 ] } );
(-)a/Koha/Patrons/Import.pm (+16 lines)
Lines 214-219 sub import_patrons { Link Here
214
            next LINE;
214
            next LINE;
215
        }
215
        }
216
216
217
        my $relationship        = $borrower{relationship};
218
        my $guarantor_id        = $borrower{guarantor_id};
219
        delete $borrower{relationship};
220
        delete $borrower{guarantor_id};
221
217
        if ($borrowernumber) {
222
        if ($borrowernumber) {
218
223
219
            # borrower exists
224
            # borrower exists
Lines 350-355 sub import_patrons { Link Here
350
                );
355
                );
351
            }
356
            }
352
        }
357
        }
358
359
        # Add a guarantor if we are given a relationship
360
        if ( $guarantor_id ) {
361
            Koha::Patron::Relationship->new(
362
                {
363
                    guarantee_id => $borrowernumber,
364
                    relationship => $relationship,
365
                    guarantor_id => $guarantor_id,
366
                }
367
            )->store();
368
        }
353
    }
369
    }
354
370
355
    return {
371
    return {
(-)a/Koha/REST/V1/Auth.pm (-1 / +1 lines)
Lines 314-320 sub allow_guarantor { Link Here
314
        return;
314
        return;
315
    }
315
    }
316
316
317
    my $guarantees = $user->guarantees->as_list;
317
    my $guarantees = $user->guarantee_relationships->guarantees->as_list;
318
    foreach my $guarantee (@{$guarantees}) {
318
    foreach my $guarantee (@{$guarantees}) {
319
        return 1 if check_object_ownership($c, $guarantee);
319
        return 1 if check_object_ownership($c, $guarantee);
320
    }
320
    }
(-)a/Koha/Schema/Result/Borrower.pm (-6 lines)
Lines 1532-1543 __PACKAGE__->many_to_many("ordernumbers", "aqorder_users", "ordernumber"); Link Here
1532
# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-04-25 10:08:38
1532
# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-04-25 10:08:38
1533
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3qd/l8OkObSn8gTKTsHrkA
1533
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:3qd/l8OkObSn8gTKTsHrkA
1534
1534
1535
__PACKAGE__->belongs_to(
1536
    "guarantor",
1537
    "Koha::Schema::Result::Borrower",
1538
    { borrowernumber => "guarantorid" },
1539
);
1540
1541
__PACKAGE__->add_columns(
1535
__PACKAGE__->add_columns(
1542
    '+anonymized' => { is_boolean => 1 },
1536
    '+anonymized' => { is_boolean => 1 },
1543
    '+lost'          => { is_boolean => 1 },
1537
    '+lost'          => { is_boolean => 1 },
(-)a/Koha/Schema/Result/BorrowerRelationship.pm (+118 lines)
Line 0 Link Here
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;
(-)a/api/v1/swagger/definitions/patron.json (-4 lines)
Lines 159-168 Link Here
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"
(-)a/circ/circulation.pl (-8 / +6 lines)
Lines 556-569 my $view = $batch Link Here
556
    : 'circview';
556
    : 'circview';
557
557
558
my @relatives;
558
my @relatives;
559
if ( $borrowernumber ) {
559
if ( $patron ) {
560
    if ( $patron ) {
560
    if ( my @guarantors = $patron->guarantor_relationships()->guarantors() ) {
561
        if ( my $guarantor = $patron->guarantor ) {
561
        push( @relatives, $_->id ) for @guarantors;
562
            push @relatives, $guarantor->borrowernumber;
562
        push( @relatives, $_->id ) for $patron->siblings();
563
            push @relatives, $_->borrowernumber for $patron->siblings;
563
    } else {
564
        } else {
564
        push( @relatives, $_->id ) for $patron->guarantee_relationships()->guarantees();
565
            push @relatives, $_->borrowernumber for $patron->guarantees;
566
        }
567
    }
565
    }
568
}
566
}
569
my $relatives_issues_count =
567
my $relatives_issues_count =
(-)a/installer/data/mysql/atomicupdate/bug_14570.perl (+52 lines)
Line 0 Link Here
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
}
(-)a/installer/data/mysql/kohastructure.sql (-4 / +15 lines)
Lines 579-585 CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower Link Here
579
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
579
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
580
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
580
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
581
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
581
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
582
  `guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
583
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
582
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
584
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
583
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
585
  `sex` varchar(1) default NULL, -- patron/borrower's gender
584
  `sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1613-1619 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1613
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
1612
  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
1614
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
1613
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
1615
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
1614
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
1616
  `guarantorid` int(11) default NULL, -- borrowernumber used for children or professionals to link them to guarantors or organizations
1617
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
1615
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client
1618
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
1616
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
1619
  `sex` varchar(1) default NULL, -- patron/borrower's gender
1617
  `sex` varchar(1) default NULL, -- patron/borrower's gender
Lines 1649-1655 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1649
  KEY `categorycode` (`categorycode`),
1647
  KEY `categorycode` (`categorycode`),
1650
  KEY `branchcode` (`branchcode`),
1648
  KEY `branchcode` (`branchcode`),
1651
  UNIQUE KEY `userid` (`userid`),
1649
  UNIQUE KEY `userid` (`userid`),
1652
  KEY `guarantorid` (`guarantorid`),
1653
  KEY `surname_idx` (`surname` (191)),
1650
  KEY `surname_idx` (`surname` (191)),
1654
  KEY `firstname_idx` (`firstname` (191)),
1651
  KEY `firstname_idx` (`firstname` (191)),
1655
  KEY `othernames_idx` (`othernames` (191)),
1652
  KEY `othernames_idx` (`othernames` (191)),
Lines 3439-3445 CREATE TABLE IF NOT EXISTS `borrower_modifications` ( Link Here
3439
  `contactname` LONGTEXT,
3436
  `contactname` LONGTEXT,
3440
  `contactfirstname` MEDIUMTEXT,
3437
  `contactfirstname` MEDIUMTEXT,
3441
  `contacttitle` MEDIUMTEXT,
3438
  `contacttitle` MEDIUMTEXT,
3442
  `guarantorid` int(11) DEFAULT NULL,
3443
  `borrowernotes` LONGTEXT,
3439
  `borrowernotes` LONGTEXT,
3444
  `relationship` varchar(100) DEFAULT NULL,
3440
  `relationship` varchar(100) DEFAULT NULL,
3445
  `sex` varchar(1) DEFAULT NULL,
3441
  `sex` varchar(1) DEFAULT NULL,
Lines 4137-4142 CREATE TABLE IF NOT EXISTS club_fields ( Link Here
4137
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
4133
  CONSTRAINT club_fields_ibfk_4 FOREIGN KEY (club_id) REFERENCES clubs (id) ON DELETE CASCADE ON UPDATE CASCADE
4138
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4134
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4139
4135
4136
--
4137
-- Table structure for table 'guarantors_guarantees'
4138
--
4139
4140
DROP TABLE IF EXISTS borrower_relationships;
4141
CREATE TABLE `borrower_relationships` (
4142
      id INT(11) NOT NULL AUTO_INCREMENT,
4143
      guarantor_id INT(11) NULL DEFAULT NULL,
4144
      guarantee_id INT(11) NOT NULL,
4145
      relationship VARCHAR(100) NOT NULL,
4146
      PRIMARY KEY (id),
4147
      CONSTRAINT r_guarantor FOREIGN KEY ( guarantor_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE,
4148
      CONSTRAINT r_guarantee FOREIGN KEY ( guarantee_id ) REFERENCES borrowers ( borrowernumber ) ON UPDATE CASCADE ON DELETE CASCADE
4149
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
4150
4140
--
4151
--
4141
-- Table structure for table `illrequests`
4152
-- Table structure for table `illrequests`
4142
--
4153
--
(-)a/koha-tmpl/intranet-tmpl/prog/en/columns.def (-1 lines)
Lines 7-13 Link Here
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>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (-9 / +2 lines)
Lines 6-26 Link Here
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" 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>
10
            <a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;guarantorid=[% guarantor.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
11
        [% ELSE %]
12
            <a id="editpatron" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=modify&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;categorycode=[% patron.categorycode | html %]">
13
        [% END %]
14
        <i class="fa fa-pencil"></i> Edit</a>
15
    [% END %]
10
    [% END %]
16
11
17
    [% IF CAN_user_borrowers_edit_borrowers %]
12
    [% IF CAN_user_borrowers_edit_borrowers %]
18
        [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
13
        [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
19
            <a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add child</a>
14
            <a id="addchild" class="btn btn-default" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber | html %]"><i class="fa fa-plus"></i> Add child</a>
20
        [% END %]
15
        [% END %]
21
        [% IF CAN_user_borrowers_edit_borrowers %]
16
        <a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
22
            <a id="changepassword" class="btn btn-default" href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | html %]"><i class="fa fa-lock"></i> Change password</a>
23
        [% END %]
24
        <a id="duplicate" class="btn btn-default" 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>
17
        <a id="duplicate" class="btn btn-default" 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>
25
    [% END %]
18
    [% END %]
26
19
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (-1 / +1 lines)
Lines 832-838 Link Here
832
                                </li>
832
                                </li>
833
833
834
                                [% IF relatives_issues_count %]
834
                                [% IF relatives_issues_count %]
835
                                    <li><a id="relatives-issues-tab" href="#relatives-issues">Relatives' checkouts</a></li>
835
                                    <li><a id="relatives-issues-tab" href="#relatives-issues">[% relatives_issues_count %] Relatives' checkouts</a></li>
836
                                [% END %]
836
                                [% END %]
837
837
838
                                <li>
838
                                <li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-170 / +232 lines)
Lines 1-5 Link Here
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">&nbsp;</span>
401
                <li>
401
            [% IF ( guarantorid ) %]
402
                    <label for="guarantor_cancel">&nbsp;</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
    [% IF Koha.Preference( 'AddressFormat' ) %]
438
    [% IF Koha.Preference( 'AddressFormat' ) %]
429
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
439
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
Lines 431-514 Link Here
431
[% END # nostreet && nocity etc group%]
441
[% END # nostreet && nocity etc group%]
432
442
433
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
443
[% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
434
  <fieldset class="rows" id="memberentry_contact">
444
    <fieldset class="rows" id="memberentry_contact">
435
    <legend id="contact_lgd">Contact</legend><ol>
445
        <legend id="contact_lgd">Contact</legend><ol>
436
        [% UNLESS nophone %]
437
      <li>
438
      [% IF ( mandatoryphone ) %]
439
      <label for="phone" class="required">
440
      [% ELSE %]
441
      <label for="phone">
442
      [% END %]
443
      Primary phone: </label>
444
        <input type="text" id="phone" name="phone" value="[% phone | html %]" />
445
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
446
446
447
    </li>
447
        [% UNLESS nocontactname %]
448
            <li>
449
                [% IF ( mandatorycontactname ) %]
450
                    <label for="contactname" class="required">
451
                [% ELSE %]
452
                    <label for="contactname">
453
                [% END %]
454
                Guarantor surname: </label>
455
                <input type="text" id="contactname" name="contactname" value="[% contactname | html %]" />
456
                [% IF ( mandatorycontactname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor surname</div>
457
            </li>
458
        [% END %]
459
460
        [% UNLESS nocontactfirstname %]
461
            <li>
462
                [% IF ( mandatorycontactfirstname ) %]
463
                    <label for="contactfirstname" class="required">
464
                [% ELSE %]
465
                    <label for="contactfirstname">
466
                [% END %]
467
                Guarantor first name: </label>
468
                <input type="text" id="contactfirstname" name="contactfirstname" value="[% contactfirstname | html %]" />
469
                [% IF ( mandatorycontactfirstname ) %]<span class="required">Required</span>[% END %]<div class="hint">Non-patron guarantor first name</div>
470
            </li>
448
        [% END %]
471
        [% END %]
472
473
		[% UNLESS norelationship %]
474
			[% IF possible_relationships %]
475
                <li>
476
                    <label for="relationship">Relationship: </label>
477
                    <select class="relationship" name="relationship">
478
                        <option value=""></option>
479
                        [% FOREACH pr IN possible_relationships.split('\|') %]
480
                            [% IF pr == relationship %]
481
                                <option value="[% pr %]" selected="selected">[% pr %]</option>
482
                            [% ELSE %]
483
                                <option value="[% pr %]">[% pr %]</option>
484
                            [% END %]
485
                        [% END %]
486
                    </select>
487
                </li>
488
			[% END %]
489
		[% END %]
490
491
        [% UNLESS nophone %]
492
            <li>
493
                [% IF ( mandatoryphone ) %]
494
                    <label for="phone" class="required">
495
                [% ELSE %]
496
                    <label for="phone">
497
                [% END %]
498
                Primary phone: </label>
499
                <input type="text" id="phone" name="phone" value="[% phone | html %]" />
500
                [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
501
            </li>
502
        [% END %]
503
449
        [% UNLESS nophonepro %]
504
        [% UNLESS nophonepro %]
450
    <li>
505
            <li>
451
      [% IF ( mandatoryphonepro ) %]
506
                [% IF ( mandatoryphonepro ) %]
452
      <label for="phonepro" class="required">
507
                    <label for="phonepro" class="required">
453
      [% ELSE %]
508
                [% ELSE %]
454
      <label for="phonepro">
509
                    <label for="phonepro">
455
      [% END %]
510
                [% END %]
456
      Secondary phone: </label>
511
                Secondary phone: </label>
457
    <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" />
512
                <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" />
458
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
513
                [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
459
    </li>
514
            </li>
460
        [% END %]
515
        [% END %]
516
461
        [% UNLESS nomobile %]
517
        [% UNLESS nomobile %]
462
    <li>
518
            <li>
463
      [% IF ( mandatorymobile ) %]
519
                [% IF ( mandatorymobile ) %]
464
      <label for="mobile" class="required">
520
                    <label for="mobile" class="required">
465
      [% ELSE %]
521
                [% ELSE %]
466
      <label for="mobile">
522
                    <label for="mobile">
467
      [% END %]
523
                [% END %]
468
      Other phone: </label>
524
                Other phone: </label>
469
        <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" />
525
                <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" />
470
	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
526
                [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
471
    </li>
527
            </li>
472
        [% END %]
528
        [% END %]
473
        [% UNLESS noemail %]
474
    <li>
475
      [% IF ( mandatoryemail ) %]
476
      <label for="email" class="required">
477
      [% ELSE %]
478
      <label for="email">
479
      [% END %]
480
      Primary email: </label>
481
        <input type="text" id="email" name="email" size="45" value="[% email | html %]" />
482
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
483
529
484
    </li>
530
        [% UNLESS noemail %]
531
            <li>
532
                [% IF ( mandatoryemail ) %]
533
                    <label for="email" class="required">
534
                [% ELSE %]
535
                    <label for="email">
536
                [% END %]
537
                Primary email: </label>
538
                <input type="text" id="email" name="email" size="45" value="[% email | html %]" />
539
                [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
540
            </li>
485
        [% END %]
541
        [% END %]
542
486
        [% UNLESS noemailpro %]
543
        [% UNLESS noemailpro %]
487
    <li>
544
            <li>
488
      [% IF ( mandatoryemailpro ) %]
545
                [% IF ( mandatoryemailpro ) %]
489
      <label for="emailpro" class="required">
546
                    <label for="emailpro" class="required">
490
      [% ELSE %]
547
                [% ELSE %]
491
      <label for="emailpro">
548
                    <label for="emailpro">
492
      [% END %]
549
                [% END %]
493
      Secondary email: </label>
550
                Secondary email: </label>
494
        <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" />
551
                <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" />
495
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
552
                [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
496
    </li>
553
            </li>
497
        [% END %]
554
        [% END %]
555
498
        [% UNLESS nofax %]
556
        [% UNLESS nofax %]
499
    <li>
557
            <li>
500
      [% IF ( mandatoryfax ) %]
558
                [% IF ( mandatoryfax ) %]
501
      <label for="fax" class="required">
559
                    <label for="fax" class="required">
502
      [% ELSE %]
560
                [% ELSE %]
503
      <label for="fax">
561
                    <label for="fax">
504
      [% END %]
562
                [% END %]
505
      Fax: </label>
563
                Fax: </label>
506
        <input type="text" id="fax" name="fax" value="[% fax | html %]" />
564
                <input type="text" id="fax" name="fax" value="[% fax | html %]" />
507
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
565
                [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
508
    </li>
566
            </li>
509
        [% END %]
567
        [% END %]
510
	</ol>
568
    </ol>
511
  </fieldset>
569
</fieldset>
512
[%END # hide fieldset %]
570
[%END # hide fieldset %]
513
571
514
<!-- ************************ STEP_1 *********************** -->
572
<!-- ************************ STEP_1 *********************** -->
Lines 1172-1177 Link Here
1172
                }
1230
                }
1173
            [% END %]
1231
            [% END %]
1174
1232
1233
            [% IF guarantor %]
1234
                select_user( '[% guarantor.borrowernumber %]', [% To.json( guarantor.unblessed ) | $raw %] );
1235
            [% END %]
1236
1175
            $("#cn_max").hide();
1237
            $("#cn_max").hide();
1176
            var content;
1238
            var content;
1177
            $("#cardnumber").on("keydown", function(e){
1239
            $("#cardnumber").on("keydown", function(e){
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-6 / +20 lines)
Lines 1-3 Link Here
1
[% USE raw %]
1
[% USE Koha %]
2
[% USE Koha %]
2
[% USE KohaDates %]
3
[% USE KohaDates %]
3
[% SET footerjs = 1 %]
4
[% SET footerjs = 1 %]
Lines 40-52 Link Here
40
                [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %]</li>[% END %]
41
                [% IF ( patron.dateofbirth ) %]<li><span class="label">Date of birth:</span>[% patron.dateofbirth | $KohaDates %]</li>[% END %]
41
                [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex | html %][% END %]</li>[% END %]
42
                [% IF ( patron.sex ) %]<li><span class="label">Gender:</span>[% IF ( patron.sex == 'F' ) %]Female[% ELSIF ( patron.sex == 'M' ) %]Male[% ELSE %][% patron.sex | html %][% END %]</li>[% END %]
42
            [% END %]
43
            [% END %]
43
            [% IF ( guarantees ) %]
44
44
                <li><span class="label">Guarantees:</span><ul>[% FOREACH guarantee IN guarantees %]<li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=guarantee %]</a></li>[% END %]</ul></li>
45
            [% IF guarantees %]
45
            [% END %]
46
                <li>
46
            [% IF ( guarantor ) %]
47
                    <span class="label">Guarantees:</span>
47
                <li><span class="label">Guarantor:</span><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.surname | html %], [% guarantor.firstname | html %]</a></li>
48
                    <ul>
49
                        [% FOREACH guarantee IN guarantees %]
50
                            <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantee.borrowernumber | uri %]">[% guarantee.firstname | html %] [% guarantee.surname | html %]</a></li>
51
                        [% END %]
52
                    </ul>
53
                </li>
54
            [% ELSIF guarantor_relationships %]
55
                [% FOREACH gr IN guarantor_relationships %]
56
                    <li>
57
                        <span class="label">Guarantor:</span>
58
                        [% SET guarantor = gr.guarantor %]
59
                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
60
                    </li>
61
                [% END %]
48
            [% END %]
62
            [% END %]
49
        </ol>
63
	    </ol>
50
    </div>
64
    </div>
51
</div>
65
</div>
52
</div>
66
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-9 / +10 lines)
Lines 265-279 Link Here
265
                                                    [% END %]
265
                                                    [% END %]
266
                                                </ul>
266
                                                </ul>
267
                                            </li>
267
                                            </li>
268
                                        [% ELSIF guarantor %]
268
                                        [% ELSIF guarantor_relationships %]
269
                                            <li>
269
                                            [% FOREACH gr IN guarantor_relationships %]
270
                                                <span class="label">Guarantor:</span>
270
                                                <li>
271
                                                [% IF guarantor.borrowernumber AND logged_in_user.can_see_patron_infos( guarantor ) %]
271
                                                    <span class="label">Guarantor:</span>
272
                                                    <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.borrowernumber | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
272
                                                    [% SET guarantor = gr.guarantor %]
273
                                                [% ELSE %]
273
                                                    [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
274
                                                    [% guarantor.firstname | html %] [% guarantor.surname | html %]
274
                                                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantor.id | uri %]">[% guarantor.firstname | html %] [% guarantor.surname | html %]</a>
275
                                                [% END %]
275
                                                    [% END %]
276
                                            </li>
276
                                                </li>
277
                                            [% END %]
277
                                        [% END %]
278
                                        [% END %]
278
                                    </ol>
279
                                    </ol>
279
                                </div> [% # /div.rows %]
280
                                </div> [% # /div.rows %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/members.js (-51 / +41 lines)
Lines 129-138 function Dopop(link) { Link Here
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_city',function(){
286
    $(document.body).on('change','.select_city',function(){
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt (-3 / +8 lines)
Lines 100-106 Link Here
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 1014-1020 Link Here
1014
                }
1019
                }
1015
            });
1020
            });
1016
1021
1017
            [% IF borrower.guarantorid && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
1022
            [% IF patron.guarantor_relationships && !Koha.Preference('OPACPrivacy') && Koha.Preference('AllowPatronToSetCheckoutsVisibilityForGuarantor') %]
1018
                $('#update_privacy_guarantor_checkouts').click( function() {
1023
                $('#update_privacy_guarantor_checkouts').click( function() {
1019
                    $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
1024
                    $.post( "/cgi-bin/koha/svc/patron/show_checkouts_to_relatives", { privacy_guarantor_checkouts: $('#privacy_guarantor_checkouts').val() }, null, 'json')
1020
                     .done(function( data ) {
1025
                     .done(function( data ) {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-privacy.tt (-2 / +7 lines)
Lines 71-77 Link Here
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 %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-4 / +4 lines)
Lines 428-434 Link Here
428
428
429
                                    <tbody>
429
                                    <tbody>
430
                                        [% FOREACH r IN relatives %]
430
                                        [% FOREACH r IN relatives %]
431
                                            [% FOREACH i IN r.issues %]
431
                                            [% FOREACH c IN r.checkouts %]
432
                                                <tr>
432
                                                <tr>
433
                                                    <td>
433
                                                    <td>
434
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | uri %]">
434
                                                        <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% i.item.biblio.biblionumber | uri %]">
Lines 437-451 Link Here
437
                                                    </td>
437
                                                    </td>
438
438
439
                                                    <td>
439
                                                    <td>
440
                                                        [% i.date_due | $KohaDates %]
440
                                                        [% c.date_due | $KohaDates %]
441
                                                    </td>
441
                                                    </td>
442
442
443
                                                    <td>
443
                                                    <td>
444
                                                        [% i.item.barcode | html %]
444
                                                        [% c.item.barcode | html %]
445
                                                    </td>
445
                                                    </td>
446
446
447
                                                    <td>
447
                                                    <td>
448
                                                        [% i.item.itemcallnumber | html %]
448
                                                        [% c.item.itemcallnumber | html %]
449
                                                    </td>
449
                                                    </td>
450
450
451
                                                    <td>
451
                                                    <td>
(-)a/members/deletemem.pl (-3 / +3 lines)
Lines 84-90 if (C4::Context->preference("IndependentBranches")) { Link Here
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
(-)a/members/memberentry.pl (-51 / +67 lines)
Lines 83-89 if ( C4::Context->preference('SMSSendDriver') eq 'Email' ) { Link Here
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
            $newdata{'borrowernumber'} = $borrowernumber;
435
            $newdata{'borrowernumber'} = $borrowernumber;
440
        }
436
        }
Lines 542-547 if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ Link Here
542
            $patron->set_password({ password => $password });
538
            $patron->set_password({ password => $password });
543
        }
539
        }
544
540
541
        add_guarantors( $patron, $input );
545
        if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
542
        if (C4::Context->preference('ExtendedPatronAttributes') and $input->param('setting_extended_patron_attributes')) {
546
            C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
543
            C4::Members::Attributes::SetBorrowerAttributes($borrowernumber, $extended_patron_attributes);
547
        }
544
        }
Lines 640-650 foreach my $category_type (qw(C A S P I X)) { Link Here
640
        'categoryloop'   => \@categoryloop
637
        'categoryloop'   => \@categoryloop
641
      };
638
      };
642
}
639
}
643
640
$template->param(
644
$template->param('typeloop' => \@typeloop,
641
    typeloop      => \@typeloop,
645
        no_categories => $no_categories);
642
    no_categories => $no_categories,
646
if($no_categories){ $no_add = 1; }
643
);
647
648
644
649
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
645
my $cities = Koha::Cities->search( {}, { order_by => 'city_name' } );
650
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
646
my $roadtypes = C4::Koha::GetAuthorisedValues( 'ROADTYPE' );
Lines 669-692 while (@relationships) { Link Here
669
  push(@relshipdata, \%row);
665
  push(@relshipdata, \%row);
670
}
666
}
671
667
672
my %flags = ( 'gonenoaddress' => ['gonenoaddress' ],
668
my %flags = (
673
        'lost'          => ['lost']);
669
    'gonenoaddress' => ['gonenoaddress'],
670
    'lost'          => ['lost']
671
);
674
672
675
 
676
my @flagdata;
673
my @flagdata;
677
foreach (keys(%flags)) {
674
foreach ( keys(%flags) ) {
678
	my $key = $_;
675
    my $key = $_;
679
	my %row =  ('key'   => $key,
676
    my %row = (
680
		    'name'  => $flags{$key}[0]);
677
        'key'  => $key,
681
	if ($data{$key}) {
678
        'name' => $flags{$key}[0]
682
		$row{'yes'}=' checked';
679
    );
683
		$row{'no'}='';
680
    if ( $data{$key} ) {
684
    }
681
        $row{'yes'} = ' checked';
685
	else {
682
        $row{'no'}  = '';
686
		$row{'yes'}='';
683
    }
687
		$row{'no'}=' checked';
684
    else {
688
	}
685
        $row{'yes'} = '';
689
	push @flagdata,\%row;
686
        $row{'no'}  = ' checked';
687
    }
688
    push @flagdata, \%row;
690
}
689
}
691
690
692
# get Branch Loop
691
# 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:
(-)a/members/moremember.pl (-15 / +13 lines)
Lines 99-120 if ( $patron->is_debarred ) { Link Here
99
$template->param( flagged => 1 ) if $patron->account_locked;
99
$template->param( flagged => 1 ) if $patron->account_locked;
100
100
101
my @relatives;
101
my @relatives;
102
if ( my $guarantor = $patron->guarantor ) {
102
my $guarantor_relationships = $patron->guarantor_relationships;
103
    $template->param( guarantor => $guarantor );
103
my @guarantees              = $patron->guarantee_relationships->guarantees;
104
    push @relatives, $guarantor->borrowernumber;
104
my @guarantors              = $guarantor_relationships->guarantors;
105
    push @relatives, $_->borrowernumber for $patron->siblings;
105
if (@guarantors) {
106
} elsif ( $patron->contactname || $patron->contactfirstname ) {
106
    push( @relatives, $_->id ) for @guarantors;
107
    $template->param(
107
    push( @relatives, $_->id ) for $patron->siblings();
108
        guarantor => {
109
            firstname => $patron->contactfirstname,
110
            surname   => $patron->contactname,
111
        }
112
    );
113
} else {
114
    my @guarantees = $patron->guarantees;
115
    $template->param( guarantees => \@guarantees );
116
    push @relatives, $_->borrowernumber for @guarantees;
117
}
108
}
109
else {
110
    push( @relatives, $_->id ) for @guarantees;
111
}
112
$template->param(
113
    guarantor_relationships => $guarantor_relationships,
114
    guarantees              => \@guarantees,
115
);
118
116
119
my $relatives_issues_count =
117
my $relatives_issues_count =
120
    Koha::Checkouts->count({ borrowernumber => \@relatives });
118
    Koha::Checkouts->count({ borrowernumber => \@relatives });
(-)a/members/update-child.pl (-7 / +11 lines)
Lines 33-38 use C4::Auth; Link Here
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
(-)a/misc/cronjobs/j2a.pl (-12 / +59 lines)
Lines 96-101 C<juv2adult.pl> - Suggests that you read this help. :) Link Here
96
C<juv2adult.pl> -b=<branchcode> -f=<categorycode> -t=<categorycode>  - Processes a single branch, and updates the patron categories from fromcat to tocat.
96
C<juv2adult.pl> -b=<branchcode> -f=<categorycode> -t=<categorycode>  - Processes a single branch, and updates the patron categories from fromcat to tocat.
97
97
98
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
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.
99
99
=cut
100
=cut
100
101
101
# These variables are set by command line options.
102
# These variables are set by command line options.
Lines 164-175 $verbose and print "The age limit for category $fromcat is $agelimit\n"; Link Here
164
my $itsyourbirthday = "$year-$mon-$mday";
165
my $itsyourbirthday = "$year-$mon-$mday";
165
166
166
if ( not $noaction ) {
167
if ( not $noaction ) {
168
    # Start a transaction since we need to delete from relationships and update borrowers atomically
169
    $dbh->{AutoCommit} = 0;
170
171
    my $success = 1;
167
    if ($mybranch) {    #yep, we received a specific branch to work on.
172
    if ($mybranch) {    #yep, we received a specific branch to work on.
168
        $verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
173
        $verbose and print "Looking for patrons of $mybranch to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
169
        my $query = qq|
174
        my $where = qq|
170
            UPDATE borrowers
171
            SET guarantorid ='0',
172
                categorycode = ?
173
            WHERE dateofbirth <= ?
175
            WHERE dateofbirth <= ?
174
              AND dateofbirth != '0000-00-00'
176
              AND dateofbirth != '0000-00-00'
175
              AND branchcode = ?
177
              AND branchcode = ?
Lines 178-187 if ( not $noaction ) { Link Here
178
                FROM categories
180
                FROM categories
179
                WHERE category_type = 'C'
181
                WHERE category_type = 'C'
180
                  AND categorycode = ?
182
                  AND categorycode = ?
181
              )|;
183
              )
184
        |;
185
186
        my $query = qq|
187
            DELETE relationships FROM relationships
188
            LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
189
            $where
190
        |;
182
        my $sth = $dbh->prepare($query);
191
        my $sth = $dbh->prepare($query);
192
        $sth->execute( $itsyourbirthday, $mybranch, $fromcat )
193
          or $success = 0;
194
195
        $query = qq|
196
            UPDATE borrowers
197
            SET categorycode = ?
198
            $where
199
        |;
200
        $sth = $dbh->prepare($query);
183
        my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )
201
        my $res = $sth->execute( $tocat, $itsyourbirthday, $mybranch, $fromcat )
184
          or die "can't execute";
202
          or $success = 0;
203
204
        if ( $success ) {
205
            $dbh->commit;
206
        } else {
207
            $dbh->rollback;
208
            die "can't execute";
209
        }
185
210
186
        if ( $res eq '0E0' ) {
211
        if ( $res eq '0E0' ) {
187
            print "No patrons updated\n";
212
            print "No patrons updated\n";
Lines 192-201 if ( not $noaction ) { Link Here
192
    }
217
    }
193
    else {    # branch was not supplied, processing all branches
218
    else {    # branch was not supplied, processing all branches
194
        $verbose and print "Looking in all branches for patrons to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
219
        $verbose and print "Looking in all branches for patrons to update from $fromcat to $tocat that were born before $itsyourbirthday\n";
195
        my $query = qq|
220
        my $where = qq|
196
            UPDATE borrowers
197
            SET guarantorid = '0',
198
                categorycode = ?
199
            WHERE dateofbirth <= ?
221
            WHERE dateofbirth <= ?
200
              AND dateofbirth!='0000-00-00'
222
              AND dateofbirth!='0000-00-00'
201
              AND categorycode IN (
223
              AND categorycode IN (
Lines 203-212 if ( not $noaction ) { Link Here
203
                FROM categories
225
                FROM categories
204
                WHERE category_type = 'C'
226
                WHERE category_type = 'C'
205
                  AND categorycode = ?
227
                  AND categorycode = ?
206
              )|;
228
              )
229
        |;
230
231
        my $query = qq|
232
            DELETE relationships FROM relationships
233
            LEFT JOIN borrowers ON ( borrowers.borrowernumber = relationships.guarantee_id )
234
            $where
235
        |;
207
        my $sth = $dbh->prepare($query);
236
        my $sth = $dbh->prepare($query);
237
        $sth->execute( $itsyourbirthday, $fromcat )
238
          or $success = 0;
239
240
        $query = qq|
241
            UPDATE borrowers
242
            SET categorycode = ?
243
            $where
244
        |;
245
        $sth = $dbh->prepare($query);
208
        my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )
246
        my $res = $sth->execute( $tocat, $itsyourbirthday, $fromcat )
209
          or die "can't execute";
247
          or $success = 0;
248
        $dbh->commit;
249
250
        if ( $success ) {
251
            $dbh->commit;
252
        } else {
253
            $dbh->rollback;
254
            die "can't execute";
255
        }
210
256
211
        if ( $res eq '0E0' ) {
257
        if ( $res eq '0E0' ) {
212
            print "No patrons updated\n";
258
            print "No patrons updated\n";
Lines 268-273 else { Link Here
268
        my $sth = $dbh->prepare($query);
314
        my $sth = $dbh->prepare($query);
269
        $sth->execute( $itsyourbirthday, $fromcat )
315
        $sth->execute( $itsyourbirthday, $fromcat )
270
          or die "Couldn't execute statement: " . $sth->errstr;
316
          or die "Couldn't execute statement: " . $sth->errstr;
317
        $dbh->commit;
271
318
272
        while ( my @res = $sth->fetchrow_array() ) {
319
        while ( my @res = $sth->fetchrow_array() ) {
273
            my $firstname = $res[0];
320
            my $firstname = $res[0];
(-)a/opac/opac-memberentry.pl (-2 / +2 lines)
Lines 312-318 elsif ( $action eq 'edit' ) { #Display logged in borrower's data Link Here
312
312
313
    $template->param(
313
    $template->param(
314
        borrower  => $borrower,
314
        borrower  => $borrower,
315
        guarantor => scalar Koha::Patrons->find($borrowernumber)->guarantor(),
316
        hidden => GetHiddenFields( $mandatory, 'edit' ),
315
        hidden => GetHiddenFields( $mandatory, 'edit' ),
317
        csrf_token => Koha::Token->new->generate_csrf({
316
        csrf_token => Koha::Token->new->generate_csrf({
318
            session_id => scalar $cgi->cookie('CGISESSID'),
317
            session_id => scalar $cgi->cookie('CGISESSID'),
Lines 333-339 my $captcha = random_string("CCCCC"); Link Here
333
332
334
$template->param(
333
$template->param(
335
    captcha        => $captcha,
334
    captcha        => $captcha,
336
    captcha_digest => md5_base64($captcha)
335
    captcha_digest => md5_base64($captcha),
336
    patron         => Koha::Patrons->find( $borrowernumber ),
337
);
337
);
338
338
339
output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };
339
output_html_with_http_headers $cgi, $cookie, $template->output, undef, { force_no_caching => 1 };
(-)a/opac/opac-user.pl (-8 / +7 lines)
Lines 39-44 use Koha::Holds; Link Here
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 330-343 my $patron_messages = Koha::Patron::Messages->search( Link Here
330
if (   C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
331
if (   C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
331
    || C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
332
    || C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
332
{
333
{
333
    my @relatives =
334
    my @relatives;
334
      Koha::Database->new()->schema()->resultset("Borrower")->search(
335
    # Filter out guarantees that don't want guarantor to see checkouts
335
        {
336
    foreach my $gr ( $patron->guarantee_relationships() ) {
336
            privacy_guarantor_checkouts => 1,
337
        my $g = $gr->guarantee;
337
            'me.guarantorid'           => $borrowernumber
338
        push( @relatives, $g ) if $g->privacy_guarantor_checkouts;
338
        },
339
    }
339
        { prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
340
      );
341
    $template->param( relatives => \@relatives );
340
    $template->param( relatives => \@relatives );
342
}
341
}
343
342
(-)a/t/Patron.t (-22 / +2 lines)
Lines 95-106 my $patron = Koha::Patron->new( Link Here
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' );
(-)a/t/db_dependent/Circulation/NoIssuesChargeGuarantees.t (-6 / +18 lines)
Lines 26-31 use C4::Circulation qw( CanBookBeIssued ); Link Here
26
use Koha::Account;
26
use Koha::Account;
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 73-79 $account->add_debit({ amount => 10.00, type => 'lost_item', interface => 'test' Link Here
73
( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
85
( $issuingimpossible, $needsconfirmation ) = CanBookBeIssued( $patron, $item->{barcode} );
74
is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );
86
is( $issuingimpossible->{DEBT_GUARANTEES} + 0, '10.00' + 0, "Patron cannot check out item due to debt for guarantee" );
75
87
76
my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->{borrowernumber} })->next();
88
my $accountline = Koha::Account::Lines->search({ borrowernumber => $guarantee->id })->next();
77
is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );
89
is( $accountline->amountoutstanding, "10.000000", "Found 10.00 amount outstanding" );
78
is( $accountline->accounttype, "L", "Account type is L" );
90
is( $accountline->accounttype, "L", "Account type is L" );
79
91
(-)a/t/db_dependent/Items.t (-1 / +5 lines)
Lines 550-556 subtest 'SearchItems test' => sub { Link Here
550
550
551
subtest 'Koha::Item(s) tests' => sub {
551
subtest 'Koha::Item(s) tests' => sub {
552
552
553
    plan tests => 5;
553
    plan tests => 7;
554
554
555
    $schema->storage->txn_begin();
555
    $schema->storage->txn_begin();
556
556
Lines 589-594 subtest 'Koha::Item(s) tests' => sub { Link Here
589
    is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
589
    is( ref($holdingbranch), 'Koha::Library', "Got Koha::Library from holding_branch method" );
590
    is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
590
    is( $holdingbranch->branchcode(), $library2->{branchcode}, "Home branch code matches holdingbranch" );
591
591
592
    my $biblio = $item->biblio();
593
    is( ref($biblio), 'Koha::Biblio', "Got Koha::Biblio from biblio method" );
594
    is( $biblio->title(), 'Silence in the library', 'Title matches biblio title' );
595
592
    $schema->storage->txn_rollback;
596
    $schema->storage->txn_rollback;
593
};
597
};
594
598
(-)a/t/db_dependent/Koha/Patrons.t (-38 / +111 lines)
Lines 34-39 use C4::Auth qw(checkpw_hash); Link Here
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' );
(-)a/t/db_dependent/Members.t (-11 / +6 lines)
Lines 27-32 use Koha::Database; Link Here
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' });
(-)a/t/db_dependent/Patron/Relationships.t (+167 lines)
Line 0 Link Here
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;
(-)a/tools/import_borrowers.pl (-1 / +1 lines)
Lines 62-67 my $extended = C4::Context->preference('ExtendedPatronAttributes'); Link Here
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