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

Test plan:
When you are on a page related to a child you should see the "Update
child to adult patron" 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 5657bfb..4ce738c 100755 (executable)
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -618,7 +618,6 @@ if ( $patron ) {
         patron            => $patron,
         categoryname      => $patron->category->description,
         expiry            => $patron->dateexpiry,
-        is_child          => ( $patron->category->category_type eq 'C' ),
     );
 }
 

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 be1682b..59d4c0d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
@@ -69,7 +69,7 @@
                 [% ELSE %]
                     <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li>
                 [% END %]
-                [% IF ( is_child ) %]
+                [% IF ( patron.is_child ) %]
                     <li><a id="updatechild" href="#">Update child to adult patron</a></li>
                 [% ELSE %]
                     <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="Patron is an adult" id="updatechild" href="#">Update child to adult patron</a></li>

diff --git a/members/boraccount.pl b/members/boraccount.pl
index f4bf63f..d30dfe3 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -111,7 +111,6 @@ $template->param(
     finesview           => 1,
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-    is_child            => ($patron->category->category_type eq 'C'),
     reverse_col         => $reverse_col,
     accounts            => $accts,
 );

diff --git a/members/mancredit.pl b/members/mancredit.pl
index fe7c24b..b1de0cc 100755 (executable)
--- a/members/mancredit.pl
+++ b/members/mancredit.pl
@@ -99,7 +99,6 @@ if ($add){
 
     $template->param(
         finesview      => 1,
-        is_child       => ($patron->category->category_type eq 'C'), # FIXME is_child should be a Koha::Patron method
         );
     output_html_with_http_headers $input, $cookie, $template->output;
 }

diff --git a/members/maninvoice.pl b/members/maninvoice.pl
index 2271164..6700188 100755 (executable)
--- a/members/maninvoice.pl
+++ b/members/maninvoice.pl
@@ -126,7 +126,6 @@ if ($add){
     $template->param(
         patron         => $patron,
         finesview      => 1,
-        is_child       => ($patron->category->category_type eq 'C'),
     );
     output_html_with_http_headers $input, $cookie, $template->output;
 }

diff --git a/members/member-flags.pl b/members/member-flags.pl
index bc6237e..66debb6 100755 (executable)
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -200,7 +200,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 $template->param(
     patron         => $patron,
     loop           => \@loop,
-    is_child       => ( $category_type eq 'C' ),
     csrf_token =>
         Koha::Token->new->generate_csrf( { session_id => scalar $input->cookie('CGISESSID'), } ),
 );

diff --git a/members/member-password.pl b/members/member-password.pl
index 6a07825..1a56dad 100755 (executable)
--- a/members/member-password.pl
+++ b/members/member-password.pl
@@ -114,7 +114,6 @@ if ( C4::Context->preference('ExtendedPatronAttributes') ) {
 $template->param(
     patron                     => $patron,
     destination                => $destination,
-    is_child                   => ( $category_type eq 'C' ),
     csrf_token                 => Koha::Token->new->generate_csrf({ session_id => scalar $input->cookie('CGISESSID'), }),
 );
 

diff --git a/members/moremember.pl b/members/moremember.pl
index be981f9..8550dee 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -353,7 +353,6 @@ $template->param(
     totaldue_raw    => $total,
     overdues_exist  => $overdues_exist,
     StaffMember     => $category_type eq 'S',
-    is_child        => $category_type eq 'C',
     $category_type  => 1, # [% IF ( I ) %] = institutional/organisation
     samebranch      => $samebranch,
     quickslip       => $quickslip,

diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl
index 8979ae6..da02121 100755 (executable)
--- a/members/printfeercpt.pl
+++ b/members/printfeercpt.pl
@@ -121,7 +121,6 @@ $template->param(
     finesview           => 1,
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-    is_child            => ($category->category_type eq 'C'),
     accounts            => \@accountrows );
 
 output_html_with_http_headers $input, $cookie, $template->output;

diff --git a/members/printinvoice.pl b/members/printinvoice.pl
index 7b110e9..0a36d22 100755 (executable)
--- a/members/printinvoice.pl
+++ b/members/printinvoice.pl
@@ -121,7 +121,6 @@ $template->param(
     finesview      => 1,
     total          => sprintf( "%.2f", $total ),
     totalcredit    => $totalcredit,
-    is_child       => ( $category->category_type eq 'C' ),
     accounts       => \@accountrows
 );
 

diff --git a/members/readingrec.pl b/members/readingrec.pl
index 327c573..a8eaffe 100755 (executable)
--- a/members/readingrec.pl
+++ b/members/readingrec.pl
@@ -115,7 +115,6 @@ if (C4::Context->preference('ExtendedPatronAttributes')) {
 $template->param(
     patron            => $patron,
     readingrecordview => 1,
-    is_child          => ( $category->category_type eq 'C' ),
     loop_reading      => $issues,
 );
 output_html_with_http_headers $input, $cookie, $template->output;