Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 33223: Replace 'first_valid' with 'notice' for email addresses

Browse source 
This patch replaces the uses of first_valid_email_address with
notice_email_address in waiting_holds, transferstoreceive, clubs and
sendbasket so that we take EmailFieldPrimary into account for these
notices too.

Signed-off-by: David Cook <dcook@prosentient.com.au>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Martin Renvoize 2023-03-14 15:07:46 +00:00 committed by Tomas Cohen Arazi
parent 878b0d0e0f
commit f733910f26
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
basket/sendbasket.pl
View file

@ -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');

6
koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc
View file

@ -54,9 +54,9 @@
</td>
<td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %]</a>
[% IF ( reserveloo.borrower.phone ) %]<br /><span class="patron_phone">[% reserveloo.borrower.phone | html %]</span>[% END %]
[% IF ( reserveloo.borrower.first_valid_email_address ) %]
<span class="patron_email"><br /><a href="mailto:[% reserveloo.borrower.first_valid_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]">
[% reserveloo.borrower.first_valid_email_address | html %]</a></span>
[% IF ( reserveloo.borrower.notice_email_address ) %]
<span class="patron_email"><br /><a href="mailto:[% reserveloo.borrower.notice_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]">
[% reserveloo.borrower.notice_email_address | html %]</a></span>
[% END %]
</td>
<td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td>

6
koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt
View file

@ -72,11 +72,11 @@
[% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
</a>
[% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
[% IF ( reser.patron.first_valid_email_address ) %]
[% IF ( reser.patron.notice_email_address ) %]
<br />
[% BLOCK subject %]Hold:[% END %]
<a href="mailto:[% reser.patron.first_valid_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
[% reser.patron.first_valid_email_address | html %]
<a href="mailto:[% reser.patron.notice_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
[% reser.patron.notice_email_address | html %]
</a>
[% END %]
[% ELSIF ( reser.recall ) %]

2
koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt
View file

@ -55,7 +55,7 @@
<td>[% c.name | html %]</td>
<td>[% c.description | html %]</td>
<td>
[% 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 ) %]
<button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id | html%])">
<i class="fa fa-plus" aria-hidden="true"></i> Enroll
</button>

4
opac/opac-sendbasket.pl
View file

@ -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');