From 9782fa1846575bba8a53e934a16ca94a55bea8b1 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 12 Sep 2017 15:28:07 -0300
Subject: [PATCH] Bug 19303: Move C4::Members::GetFirstValidEmailAddress to
 Koha::Patron->first_valid_email_address

This new Koha::Patron->first_valid_email_address already exists, it
should be called directly

Test plan:
- With a logged in user who have an email address defined, send a basket.
The email should be marked sent by this email address

- On the "Holds awaiting pickup", the email address must be displayed as well

Signed-off-by: David Bourgault <david.bourgault@inlibro.com>

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 C4/Members.pm           | 22 ++--------------------
 Koha/Patron.pm          |  6 ++++++
 opac/opac-sendbasket.pl |  2 +-
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/C4/Members.pm b/C4/Members.pm
index 2d942819a6..ecd9f59833 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -64,7 +64,6 @@ BEGIN {
         &GetPendingIssues
         &GetAllIssues
 
-        &GetFirstValidEmailAddress
         &GetNoticeEmailAddress
 
         &GetMemberAccountRecords
@@ -879,24 +878,6 @@ sub get_cardnumber_length {
     return ( $min, $max );
 }
 
-=head2 GetFirstValidEmailAddress
-
-  $email = GetFirstValidEmailAddress($borrowernumber);
-
-Return the first valid email address for a borrower, given the borrowernumber.  For now, the order 
-is defined as email, emailpro, B_email.  Returns the empty string if the borrower has no email 
-addresses.
-
-=cut
-
-sub GetFirstValidEmailAddress {
-    my $borrowernumber = shift;
-
-    my $borrower = Koha::Patrons->find( $borrowernumber );
-
-    return $borrower->first_valid_email_address();
-}
-
 =head2 GetNoticeEmailAddress
 
   $email = GetNoticeEmailAddress($borrowernumber);
@@ -912,7 +893,8 @@ sub GetNoticeEmailAddress {
     my $which_address = C4::Context->preference("AutoEmailPrimaryAddress");
     # if syspref is set to 'first valid' (value == OFF), look up email address
     if ( $which_address eq 'OFF' ) {
-        return GetFirstValidEmailAddress($borrowernumber);
+        my $patron = Koha::Patrons->find( $borrowernumber );
+        return $patron->first_valid_email_address();
     }
     # specified email address field
     my $dbh = C4::Context->dbh;
diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index db2e9acad8..3fa5ec457c 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -621,6 +621,12 @@ sub old_holds {
 
 =head3 first_valid_email_address
 
+my $first_valid_email_address = $patron->first_valid_email_address
+
+Return the first valid email address for a patron.
+For now, the order  is defined as email, emailpro, B_email.
+Returns the empty string if the borrower has no email addresses.
+
 =cut
 
 sub first_valid_email_address {
diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl
index c51e8c434d..6ae9dfe938 100755
--- a/opac/opac-sendbasket.pl
+++ b/opac/opac-sendbasket.pl
@@ -59,7 +59,7 @@ if ( $email_add ) {
     });
     my $email = Koha::Email->new();
     my $patron = Koha::Patrons->find( $borrowernumber );
-    my $user_email = GetFirstValidEmailAddress($borrowernumber)
+    my $user_email = $patron->first_valid_email_address
     || C4::Context->preference('KohaAdminEmailAddress');
 
     my $email_replyto = $patron->firstname . " " . $patron->surname . " <$user_email>";
-- 
2.39.5