From 1ccbd0b7a939518836fbb08bf3333ee8349a19cf Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 1 Mar 2022 16:24:55 +0000 Subject: [PATCH] Bug 17648: (QA follow-up) Further code cleaning We actually have a Koha::Patron method to do all the work of finding the right patron primary email address for notices.. we can use that here instead of doing it long hand. Signed-off-by: Katrin Fischer Signed-off-by: Fridolin Somers Signed-off-by: Kyle M Hall --- members/memberentry.pl | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/members/memberentry.pl b/members/memberentry.pl index 14eb2d7715..3958b6210e 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -462,24 +462,9 @@ if ((!$nok) and $nodouble and ($op eq 'insert' or $op eq 'save')){ # If 'AutoEmailOpacUser' syspref is on, email user their account details from the 'notice' that matches the user's branchcode. if ( C4::Context->preference("AutoEmailOpacUser") ) { #look for defined primary email address, if blank - attempt to use borr.email and borr.emailpro instead - my $emailaddr; - if (C4::Context->preference("AutoEmailPrimaryAddress") ne 'OFF' && - $newdata{C4::Context->preference("AutoEmailPrimaryAddress")} =~ /\w\@\w/ ) { - $emailaddr = $newdata{C4::Context->preference("AutoEmailPrimaryAddress")} - } - elsif ($newdata{email} =~ /\w\@\w/) { - $emailaddr = $newdata{email} - } - elsif ($newdata{emailpro} =~ /\w\@\w/) { - $emailaddr = $newdata{emailpro} - } - elsif ($newdata{B_email} =~ /\w\@\w/) { - $emailaddr = $newdata{B_email} - } + my $emailaddr = $patron->notice_email_address; # if we manage to find a valid email address, send notice if ($emailaddr) { - $newdata{emailaddr} = $emailaddr; - my $err; eval { my $letter = GetPreparedLetter( module => 'members', -- 2.39.5