@@ -, +, @@
addresses
---
basket/sendbasket.pl | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 6 +++---
.../prog/en/modules/circ/transferstoreceive.tt | 6 +++---
koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt | 2 +-
opac/opac-sendbasket.pl | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
--- a/basket/sendbasket.pl
+++ a/basket/sendbasket.pl
@@ -58,7 +58,7 @@ if ($email_add) {
);
my $patron = Koha::Patrons->find($borrowernumber);
- my $user_email = $patron->first_valid_email_address;
+ my $user_email = $patron->notice_email_address;
my $comment = $query->param('comment');
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
@@ -54,9 +54,9 @@
[% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %]
[% IF ( reserveloo.borrower.phone ) %] [% reserveloo.borrower.phone | html %][% END %]
- [% IF ( reserveloo.borrower.first_valid_email_address ) %]
-
- [% reserveloo.borrower.first_valid_email_address | html %]
+ [% IF ( reserveloo.borrower.notice_email_address ) %]
+
+ [% reserveloo.borrower.notice_email_address | html %]
[% END %]
|
[% Branches.GetName( reserveloo.item.homebranch ) | html %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
@@ -72,11 +72,11 @@
[% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
[% IF ( reser.patron.phone ) %]
[% reser.patron.phone | html %][% END %]
- [% IF ( reser.patron.first_valid_email_address ) %]
+ [% IF ( reser.patron.notice_email_address ) %]
[% BLOCK subject %]Hold:[% END %]
-
- [% reser.patron.first_valid_email_address | html %]
+
+ [% reser.patron.notice_email_address | html %]
[% END %]
[% ELSIF ( reser.recall ) %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
@@ -55,7 +55,7 @@
[% c.name | html %] |
[% c.description | html %] |
- [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.first_valid_email_address ) %]
+ [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.notice_email_address ) %]
--- a/opac/opac-sendbasket.pl
+++ a/opac/opac-sendbasket.pl
@@ -48,7 +48,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
my $bib_list = $query->param('bib_list') || '';
my $email_add = $query->param('email_add');
-if ($email_add) {
+if ( $email_add ) {
die "Wrong CSRF token"
unless Koha::Token->new->check_csrf(
{
@@ -58,7 +58,7 @@ if ($email_add) {
);
my $patron = Koha::Patrons->find($borrowernumber);
- my $user_email = $patron->first_valid_email_address;
+ my $user_email = $patron->notice_email_address;
my $comment = $query->param('comment');
--
|