From 54c9b488dcc5514ae001c9fa547470eb980d4a39 Mon Sep 17 00:00:00 2001
From: Hammat Wele <hammat.wele@inlibro.com>
Date: Fri, 25 Aug 2023 23:39:24 +0000
Subject: [PATCH] Bug 12532: (follow-up) Send email to guarantor using the CC
 field
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

In This patch the CC field is used to send the message to the guarantors. If the «to» field is empty (the guarantee has no address) we send the message «to» the garantors.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 C4/Letters.pm  | 33 +++++++++++++++++++++++++++------
 Koha/Patron.pm | 28 ++++------------------------
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 32be8193b6..dd48978119 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -40,6 +40,7 @@ use Koha::Patrons;
 use Koha::SMS::Providers;
 use Koha::SMTP::Servers;
 use Koha::Subscriptions;
+use Data::Dumper;
 
 use constant SERIALIZED_EMAIL_CONTENT_TYPE => 'message/rfc822';
 
@@ -1317,12 +1318,23 @@ sub _send_message_by_email {
     my $message = shift or return;
     my ( $username, $password, $method, $smtp_transports ) = @_;
 
-    my $patron;
+    my $patron = Koha::Patrons->find( $message->{borrowernumber} );
     my $to_address = $message->{'to_address'};
-    my $use_garantor = C4::Context->preference('RedirectGuaranteeEmail');
-    if($use_garantor eq 'yes' || !$to_address) {
-        $patron = Koha::Patrons->find( $message->{borrowernumber} );
-        unless ($patron or $to_address) {
+    my $cc_address;
+    my @guarantor_address;
+    my $count_guarantor_address;
+    if (C4::Context->preference('RedirectGuaranteeEmail') eq 'yes' && $patron) {
+        #Get guanrantor adresses
+        my $guarantor_relationships = $patron->guarantor_relationships;
+        my @guarantors              = $guarantor_relationships->guarantors->as_list;
+        foreach my $guarantor (@guarantors) {
+            my $address = $guarantor->notice_email_address;
+            push( @guarantor_address, $address ) if $address;
+        }
+        $count_guarantor_address = scalar @guarantor_address;
+    }
+    unless ($to_address) {
+        if (!$patron && !$count_guarantor_address) {
             warn "FAIL: No 'to_address' and INVALID borrowernumber ($message->{borrowernumber})";
             _set_message_status(
                 {
@@ -1336,7 +1348,7 @@ sub _send_message_by_email {
         if ($patron) {
             $to_address = $patron->notice_email_address;
         }
-        unless ($to_address) {  
+        if (!$to_address && !$count_guarantor_address) {
             # warn "FAIL: No 'to_address' and no email for " . ($member->{surname} ||'') . ", borrowernumber ($message->{borrowernumber})";
             # warning too verbose for this more common case?
             _set_message_status(
@@ -1348,8 +1360,12 @@ sub _send_message_by_email {
             );
             return;
         }
+        if (!$to_address && $count_guarantor_address) {
+            $to_address = shift @guarantor_address;
+        }
     }
 
+    $cc_address = join( ',', @guarantor_address );
     # Skip this message if we exceed domain limits in this run
     if( Koha::Notice::Util->exceeds_limit({ to => $to_address, limits => $domain_limits }) ) {
         # Save the to_address if you delay the message so that we dont need to look it up again
@@ -1404,6 +1420,11 @@ sub _send_message_by_email {
                 ? ( bcc => C4::Context->preference('NoticeBcc') )
                 : ()
             ),
+            (
+                $cc_address
+                ? ( cc => $cc_address )
+                : ()
+            ),
             from     => $from_address,
             reply_to => $message->{'reply_address'} || $branch_replyto,
             sender   => $branch_returnpath,
diff --git a/Koha/Patron.pm b/Koha/Patron.pm
index d9a0f257d1..df9b6b9313 100644
--- a/Koha/Patron.pm
+++ b/Koha/Patron.pm
@@ -1579,36 +1579,16 @@ Returns the empty string if no email address.
 
 =cut
 
-sub notice_email_address {
-    my ($self) = @_;
-    my $address;
-    my $guarantor_address;
+sub notice_email_address{
+    my ( $self ) = @_;
 
     my $which_address = C4::Context->preference("EmailFieldPrimary");
-
     # if syspref is set to 'first valid' (value == OFF), look up email address
     if ( $which_address eq 'OFF' ) {
-        $address = $self->first_valid_email_address;
-    }
-    else {
-        $address = $self->$which_address || '';
+        return $self->first_valid_email_address;
     }
 
-    my $use_guarantor = C4::Context->preference('RedirectGuaranteeEmail');
-    if ($use_guarantor) {
-        my @guarantors =
-          map { $_->guarantors->as_list } $self->guarantor_relationships();
-        if (@guarantors) {
-            foreach my $guarantor (@guarantors) {
-                $guarantor_address = $guarantor->notice_email_address;
-                if ($address) {
-                    $address .= ', ';
-                }
-                $address .= $guarantor_address if $guarantor_address;
-            }
-        }
-    }
-    return $address;
+    return $self->$which_address || '';
 }
 
 =head3 first_valid_email_address
-- 
2.20.1