@@ -, +, @@ --- C4/Members.pm | 2 +- Koha/Patron.pm | 8 ++++---- circ/circulation.pl | 12 ++++-------- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- 4 files changed, 11 insertions(+), 15 deletions(-) --- a/C4/Members.pm +++ a/C4/Members.pm @@ -977,7 +977,7 @@ sub GetFirstValidEmailAddress { my $borrower = Koha::Patrons->find( $borrowernumber ); - return $borrower->FirstValidEmailAddress(); + return $borrower->first_valid_email_address(); } =head2 GetNoticeEmailAddress --- a/Koha/Patron.pm +++ a/Koha/Patron.pm @@ -585,14 +585,14 @@ sub holds { return Koha::Holds->_new_from_dbic($holds_rs); } -=head3 FirstValidEmailAddress +=head3 first_valid_email_address =cut -sub FirstValidEmailAddress { +sub first_valid_email_address { my ($self) = @_; - return $self->email() || $self->emailpro() || $self->b_email() || q{}; + return $self->email() || $self->emailpro() || $self->B_email() || q{}; } =head3 get_club_enrollments @@ -627,7 +627,7 @@ sub get_enrollable_clubs { my $params; $params->{is_enrollable_from_opac} = $is_enrollable_from_opac if $is_enrollable_from_opac; - $params->{is_email_required} = 0 unless $self->FirstValidEmailAddress(); + $params->{is_email_required} = 0 unless $self->first_valid_email_address(); $params->{borrower} = $self; --- a/circ/circulation.pl +++ a/circ/circulation.pl @@ -24,13 +24,9 @@ use strict; use warnings; - use CGI qw ( -utf8 ); use DateTime; use DateTime::Duration; -use MARC::Record; -use CGI::Session; - use C4::Output; use C4::Print; use C4::Auth qw/:DEFAULT get_session haspermission/; @@ -40,21 +36,23 @@ use C4::Utils::DataTables::Members; use C4::Members; use C4::Biblio; use C4::Search; +use MARC::Record; use C4::Reserves; +use Koha::Holds; use C4::Context; +use CGI::Session; use C4::Members::Attributes qw(GetBorrowerAttributes); use Koha::AuthorisedValues; +use Koha::Patron; use Koha::Patron::Debarments qw(GetDebarments); use Koha::DateUtils; use Koha::Database; use Koha::BiblioFrameworks; -use Koha::Patrons; use Koha::Patron::Messages; use Koha::Patron::Images; use Koha::SearchEngine; use Koha::SearchEngine::Search; use Koha::Patron::Modifications; -use Koha::Holds; use Date::Calc qw( Today @@ -649,7 +647,6 @@ my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber}); $template->param( picture => 1 ) if $patron_image; my $has_modifications = Koha::Patron::Modifications->search( { borrowernumber => $borrowernumber } )->count; - $template->param( debt_confirmed => $debt_confirmed, SpecifyDueDate => $duedatespec_allow, @@ -659,7 +656,6 @@ $template->param( has_modifications => $has_modifications, override_high_holds => $override_high_holds, nopermission => scalar $query->param('nopermission'), - borrower => Koha::Patrons->find( $borrowernumber ), ); output_html_with_http_headers $query, $cookie, $template->output; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -898,8 +898,8 @@ No patron matched [% message | html %] [% END %] - [% SET enrollments = borrower.get_club_enrollments_count %] - [% SET enrollable = borrower.get_enrollable_clubs_count %] + [% SET enrollments = patron.get_club_enrollments_count %] + [% SET enrollable = patron.get_enrollable_clubs_count %] [% IF CAN_user_clubs && ( enrollable || enrollments ) %]
  • --