Bug 18789: Use Koha::Patron->is_adult where needed

Test plan:
When editing adult's info you must see the "Add child" button

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 4ce738c..a64844e 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -466,9 +466,6 @@ if ($patron) {
         holds_count  => $holds->count(),
         WaitingHolds => $waiting_holds,
     );
-
-    my $category_type = $patron->category->category_type;
-    $template->param( adultborrower => 1 ) if ( $category_type eq 'A' || $category_type eq 'I' );
 }
 
 #title

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
index 59d4c0d..467997f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -15,7 +15,7 @@
     [% END %]
 
     [% IF CAN_user_borrowers_edit_borrowers %]
-        [% IF adultborrower AND Koha.Preference("borrowerRelationship") %]
+        [% IF patron.is_adult AND Koha.Preference("borrowerRelationship") %]
             <a id="addchild" class="btn btn-default btn-sm" href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;guarantorid=[% patron.borrowernumber %]"><i class="fa fa-plus"></i> Add child</a>
         [% END %]
         [% IF CAN_user_borrowers_edit_borrowers %]

diff --git a/members/boraccount.pl b/members/boraccount.pl
index d30dfe3..8643b90 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -96,8 +96,6 @@ foreach my $accountline ( @{$accts}) {
     }
 }
 
-$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = GetBorrowerAttributes($borrowernumber);
     $template->param(

diff --git a/members/deletemem.pl b/members/deletemem.pl
index ec5abe1..86ba249 100755 (executable)
--- a/members/deletemem.pl
+++ b/members/deletemem.pl
@@ -109,8 +109,6 @@ my $dbh = C4::Context->dbh;
 my $is_guarantor = $dbh->selectrow_array("SELECT COUNT(*) FROM borrowers WHERE guarantorid=?", undef, $member);
 if ( $op eq 'delete_confirm' or $countissues > 0 or $flags->{'CHARGES'}  or $is_guarantor or $deletelocal == 0) {
 
-    $template->param( adultborrower => 1 ) if $patron->category->category_type =~ /^(A|I)$/;
-
     $template->param(
         patron => $patron,
     );

diff --git a/members/files.pl b/members/files.pl
index 4fc42fc..7927eae 100755 (executable)
--- a/members/files.pl
+++ b/members/files.pl
@@ -114,10 +114,6 @@ else {
         );
     }
 
-
-    $template->param( adultborrower => 1 )
-        if ( $patron_category->category_type eq 'A' || $patron_category->category_type eq 'I' );
-
     $template->param(
         files => Koha::Patron::Files->new( borrowernumber => $borrowernumber )
           ->GetFilesInfo(),

diff --git a/members/housebound.pl b/members/housebound.pl
index 0e52085..9d65f4f 100755 (executable)
--- a/members/housebound.pl
+++ b/members/housebound.pl
@@ -62,9 +62,8 @@ my $patron = Koha::Patrons->find($borrowernumber);
 output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 # Get supporting cast
-my ( $branch, $category, $houseboundprofile, $visit );
+my ( $branch, $houseboundprofile, $visit );
 if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
-    $category = Koha::Patron::Categories->new->find($patron->categorycode);
     $houseboundprofile = $patron->housebound_profile;
 }
 if ( $visit_id ) {
@@ -167,7 +166,6 @@ if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
     );
 }
 
-$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
 $template->param(
     housebound_profile => $houseboundprofile,
     visit              => $houseboundvisit,

diff --git a/members/mancredit.pl b/members/mancredit.pl
index b1de0cc..9dfd2e6 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -85,8 +85,6 @@ if ($add){
         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
     }
 
-    $template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
-
     if (C4::Context->preference('ExtendedPatronAttributes')) {
         my $attributes = GetBorrowerAttributes($borrowernumber);
         $template->param(

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 6700188..68a4850 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -113,8 +113,6 @@ if ($add){
         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
     }
 
-    $template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
-
     if (C4::Context->preference('ExtendedPatronAttributes')) {
         my $attributes = GetBorrowerAttributes($borrowernumber);
         $template->param(

diff --git a/members/member-flags.pl b/members/member-flags.pl
index 66debb6..63bb249 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -187,8 +187,6 @@ if ($input->param('newflags')) {
         $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
     }
 
-$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A|I)$/ );
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = GetBorrowerAttributes($bor->{'borrowernumber'});
     $template->param(

diff --git a/members/member-password.pl b/members/member-password.pl
index 1a56dad..0e4db74 100755 (executable)
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -101,8 +101,6 @@ if ( $category_type eq 'C') {
     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
 }
 
-$template->param( adultborrower => 1 ) if ( $category_type =~ /^(A|I)$/ );
-
 if ( C4::Context->preference('ExtendedPatronAttributes') ) {
     my $attributes = GetBorrowerAttributes( $bor->{'borrowernumber'} );
     $template->param(

diff --git a/members/moremember.pl b/members/moremember.pl
index 8550dee..ebbdcac 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -196,8 +196,6 @@ my $relatives_issues_count =
   Koha::Database->new()->schema()->resultset('Issue')
   ->count( { borrowernumber => \@relatives } );
 
-$template->param( adultborrower => 1 ) if ( $category_type eq 'A' || $category_type eq 'I' );
-
 my %bor;
 $bor{'borrowernumber'} = $borrowernumber;
 

diff --git a/members/notices.pl b/members/notices.pl
index 0541fd8..f307393 100755 (executable)
--- a/members/notices.pl
+++ b/members/notices.pl
@@ -74,7 +74,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' );
 $template->param(
     patron             => $patron,
     QUEUED_MESSAGES    => $queued_messages,

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index da02121..d6080fb 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -114,8 +114,6 @@ for (my $i=0;$i<$numaccts;$i++){
     push(@accountrows, \%row);
 }
 
-$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
-
 $template->param(
     patron               => $patron,
     finesview           => 1,

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 0a36d22..552e0cd 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -114,8 +114,6 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
     push( @accountrows, \%row );
 }
 
-$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
-
 $template->param(
     patron         => $patron,
     finesview      => 1,

diff --git a/members/readingrec.pl b/members/readingrec.pl
index a8eaffe..7a63201 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -99,7 +99,6 @@ if ( $category->category_type eq 'C') {
     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
 }
 
-$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
 if (! $limit){
        $limit = 'full';
 }

diff --git a/members/routing-lists.pl b/members/routing-lists.pl
index ff2de51..ca150ab 100755 (executable)
--- a/members/routing-lists.pl
+++ b/members/routing-lists.pl
@@ -72,8 +72,6 @@ $template->param(
     routinglistview => 1
 );
 
-$template->param( adultborrower => 1 ) if ( $category->category_type =~ /^(A|I)$/ );
-
 $template->param(
     patron            => $patron,
     findborrower      => $findborrower,

diff --git a/members/statistics.pl b/members/statistics.pl
index 98c157e..2e3087e 100755 (executable)
--- a/members/statistics.pl
+++ b/members/statistics.pl
@@ -84,8 +84,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
     );
 }
 
-$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
-
 $template->param(
     patron             => $patron,
     statisticsview     => 1,