From f733910f2662eb6451a0c56672dbc3fa121305b1 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 14 Mar 2023 15:07:46 +0000 Subject: [PATCH] Bug 33223: Replace 'first_valid' with 'notice' for email addresses 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 Signed-off-by: Marcel de Rooy Signed-off-by: Tomas Cohen Arazi --- 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(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index bcd949c334..3d5438fb42 100755 --- a/basket/sendbasket.pl +++ b/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'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index e6caa50f4a..2893d0acbb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt index de3ddb3bbc..81b0fbadb5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt +++ b/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 ) %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt index 4358d097a3..b18cd068d4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt +++ b/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 ) %] diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl index a273e144a6..ae0ec81e1c 100755 --- a/opac/opac-sendbasket.pl +++ b/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'); -- 2.39.5