From 20050c57ed639912e3bb0a83e71622f188302f25 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Mon, 18 Sep 2023 16:29:28 +0100
Subject: [PATCH] Bug 12532: (QA follow-up) Fix issues highlighted by unit
 tests

* YesNo preferences yield '1' or '0' not 'yes' and 'no'.
* Set message_cc address so we can report later that the message went to
  a cc address.
---
 C4/Letters.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index f1a5adfca96..dc9385ad345 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -1322,8 +1322,8 @@ sub _send_message_by_email {
     my $cc_address;
     my @guarantor_address;
     my $count_guarantor_address;
-    if (C4::Context->preference('RedirectGuaranteeEmail') eq 'yes' && $patron) {
-        #Get guanrantor addresses
+    if (C4::Context->preference('RedirectGuaranteeEmail') && $patron) {
+        # Get guarantor addresses
         my $guarantor_relationships = $patron->guarantor_relationships;
         my @guarantors              = $guarantor_relationships->guarantors->as_list;
         foreach my $guarantor (@guarantors) {
@@ -1348,7 +1348,7 @@ sub _send_message_by_email {
             $to_address = $patron->notice_email_address;
         }
         if (!$to_address && !$count_guarantor_address) {
-            warn "FAIL: No 'to_address', email address or guantors email address for borrowernumber ($message->{borrowernumber})";
+            warn "FAIL: No 'to_address', email address or guarantors email address for borrowernumber ($message->{borrowernumber})";
             _set_message_status(
                 {
                     message_id   => $message->{'message_id'},
@@ -1364,6 +1364,7 @@ sub _send_message_by_email {
     }
 
     $cc_address = join( ',', @guarantor_address );
+    _update_message_cc_address( $message->{'message_id'}, $cc_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
@@ -1623,6 +1624,12 @@ sub _update_message_from_address {
     $dbh->do('UPDATE message_queue SET from_address = ? WHERE message_id = ?', undef, ($from_address, $message_id));
 }
 
+sub _update_message_cc_address {
+    my ($message_id, $cc_address) = @_;
+    my $dbh = C4::Context->dbh();
+    $dbh->do('UPDATE message_queue SET cc_address = ? WHERE message_id = ?', undef, ($cc_address, $message_id));
+}
+
 sub _set_message_status {
     my $params = shift or return;
 
-- 
2.41.0