From 00b76faf0ac30601fb3ff12a6cd71bcdab1b7177 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Tue, 18 Apr 2017 14:03:37 -0400 Subject: [PATCH] Bug 18423 - Followup - enable Add child button for institutional borrowers If they can have guarantors and we shwo the button on one page I think we should in fact show it on all. Signed-off-by: Jonathan Druart --- members/boraccount.pl | 2 +- members/deletemem.pl | 2 +- members/files.pl | 2 +- members/mancredit.pl | 2 +- members/maninvoice.pl | 2 +- members/member-flags.pl | 2 +- members/member-password.pl | 2 +- members/notices.pl | 2 +- members/pay.pl | 2 +- members/paycollect.pl | 2 +- members/printfeercpt.pl | 2 +- members/printinvoice.pl | 2 +- members/readingrec.pl | 2 +- members/routing-lists.pl | 2 +- members/statistics.pl | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/members/boraccount.pl b/members/boraccount.pl index 8f86c04f3b..6199bf7ba0 100755 --- a/members/boraccount.pl +++ b/members/boraccount.pl @@ -92,7 +92,7 @@ foreach my $accountline ( @{$accts}) { } } -$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/deletemem.pl b/members/deletemem.pl index 7543a4a49d..6c3b4d2f3f 100755 --- a/members/deletemem.pl +++ b/members/deletemem.pl @@ -111,7 +111,7 @@ if ($countissues > 0 or $flags->{'CHARGES'} or $data->{'borrowernumber'} or $de my $patron_image = Koha::Patron::Images->find($bor->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; - $template->param( adultborrower => 1 ) if ( $bor->{category_type} eq 'A' ); + $template->param( adultborrower => 1 ) if ( $bor->{category_type} eq 'A' || $bor->{category_type} eq 'I' ); $template->param(borrowernumber => $member, surname => $bor->{'surname'}, diff --git a/members/files.pl b/members/files.pl index 4f28f1fbef..8d3dfc5e62 100755 --- a/members/files.pl +++ b/members/files.pl @@ -119,7 +119,7 @@ else { my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; - $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' ); + $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' || $data->{category_type} eq 'I' ); $template->param( files => Koha::Patron::Files->new( borrowernumber => $borrowernumber ) ->GetFilesInfo(), diff --git a/members/mancredit.pl b/members/mancredit.pl index 7270002b67..47fab515a2 100755 --- a/members/mancredit.pl +++ b/members/mancredit.pl @@ -80,7 +80,7 @@ if ($add){ $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; } - $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' ); + $template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' || $data->{category_type} eq 'I' ); my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/maninvoice.pl b/members/maninvoice.pl index b7839b80ab..e20744ff2f 100755 --- a/members/maninvoice.pl +++ b/members/maninvoice.pl @@ -106,7 +106,7 @@ if ($add){ $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; } - $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); + $template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/member-flags.pl b/members/member-flags.pl index 2fce9f4e4e..50062f6b71 100755 --- a/members/member-flags.pl +++ b/members/member-flags.pl @@ -166,7 +166,7 @@ if ($input->param('newflags')) { $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; } -$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' || $bor->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($bor->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/member-password.pl b/members/member-password.pl index 9e2a04d0a7..ab49ca9c76 100755 --- a/members/member-password.pl +++ b/members/member-password.pl @@ -107,7 +107,7 @@ if ( $bor->{'category_type'} eq 'C' ) { $template->param( 'catcode' => $catcodes->[0] ) if $cnt == 1; } -$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $bor->{'category_type'} eq 'A' || $bor->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($bor->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/notices.pl b/members/notices.pl index 872231d8c2..2c694f7207 100755 --- a/members/notices.pl +++ b/members/notices.pl @@ -74,7 +74,7 @@ if (C4::Context->preference('ExtendedPatronAttributes')) { } $template->param(%$borrower); -$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' ); $template->param( QUEUED_MESSAGES => $queued_messages, borrowernumber => $borrowernumber, diff --git a/members/pay.pl b/members/pay.pl index fdd0ef7928..5ebb9e72fd 100755 --- a/members/pay.pl +++ b/members/pay.pl @@ -223,7 +223,7 @@ sub borrower_add_additional_fields { $b_ref->{catcode} = $catcodes->[0]; } } - } elsif ( $b_ref->{category_type} eq 'A' ) { + } elsif ( $b_ref->{category_type} eq 'A' || $b_ref->{category_type} eq 'I' ) { $b_ref->{adultborrower} = 1; } diff --git a/members/paycollect.pl b/members/paycollect.pl index 68eeed42cd..449fde4720 100755 --- a/members/paycollect.pl +++ b/members/paycollect.pl @@ -173,7 +173,7 @@ sub borrower_add_additional_fields { $b_ref->{catcode} = $catcodes->[0]; } } - } elsif ( $b_ref->{category_type} eq 'A' ) { + } elsif ( $b_ref->{category_type} eq 'A' || $b_ref->{category_type} eq 'I' ) { $b_ref->{adultborrower} = 1; } diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl index ef5cdd2645..5e650976aa 100755 --- a/members/printfeercpt.pl +++ b/members/printfeercpt.pl @@ -113,7 +113,7 @@ for (my $i=0;$i<$numaccts;$i++){ push(@accountrows, \%row); } -$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/printinvoice.pl b/members/printinvoice.pl index 8a465023cb..cf923a6bba 100755 --- a/members/printinvoice.pl +++ b/members/printinvoice.pl @@ -112,7 +112,7 @@ for ( my $i = 0 ; $i < $numaccts ; $i++ ) { push( @accountrows, \%row ); } -$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' ); my $patron_image = Koha::Patron::Images->find($data->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; diff --git a/members/readingrec.pl b/members/readingrec.pl index 56a77a00f4..555183c81b 100755 --- a/members/readingrec.pl +++ b/members/readingrec.pl @@ -103,7 +103,7 @@ if ( $data->{'category_type'} eq 'C') { $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; } -$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $data->{'category_type'} eq 'A' || $data->{'category_type'} eq 'I' ); if (! $limit){ $limit = 'full'; } diff --git a/members/routing-lists.pl b/members/routing-lists.pl index c8377db2aa..021bd2014a 100755 --- a/members/routing-lists.pl +++ b/members/routing-lists.pl @@ -83,7 +83,7 @@ if ($borrowernumber) { routinglistview => 1 ); - $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' ); + $template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' || $borrower->{'category_type'} eq 'I' ); } ################################################################################## diff --git a/members/statistics.pl b/members/statistics.pl index b99a22233c..6f05eb85c3 100755 --- a/members/statistics.pl +++ b/members/statistics.pl @@ -99,7 +99,7 @@ $template->param( picture => 1 ) if $patron_image; $template->param(%$borrower); -$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' ); +$template->param( adultborrower => 1 ) if ( $borrower->{category_type} eq 'A' || $borrower->{category_type} eq 'I' ); $template->param( statisticsview => 1, -- 2.39.5