Attachment 114456 Details for Bug 12532 – Bug 12532 - Rebase and correction of the patch by adding the possibility of sending emails to several guarantors

[patch] Bug 12532 - Rebase and correction of the patch by adding the possibility of sending emails to several guarantors

Bug-12532---Rebase-and-correction-of-the-patch-by-.patch (text/plain), 3.00 KB, created by Alexis Ripetti on 2020-12-16 17:25:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexis Ripetti

Created: 2020-12-16 17:25:18 UTC

Size: 3.00 KB

patch

obsolete

>From 0d62d3fd0de5a8f97551dd37633bf7b9746d07e6 Mon Sep 17 00:00:00 2001
>From: Alexis Ripetti <alexis.ripetti@inLibro.com>
>Date: Wed, 16 Dec 2020 12:05:35 -0500
>Subject: [PATCH] Bug 12532 - Rebase and correction of the patch by adding the
> possibility of sending emails to several guarantors
>
>---
> C4/Letters.pm  |  5 +++++
> Koha/Email.pm  |  9 ++++++---
> Koha/Patron.pm | 22 ++++++++++++----------
> 3 files changed, 23 insertions(+), 13 deletions(-)
>
>diff --git a/C4/Letters.pm b/C4/Letters.pm
>index aa2aa5f8d5..7badad56ba 100644
>--- a/C4/Letters.pm
>+++ b/C4/Letters.pm
>@@ -1405,6 +1405,11 @@ sub _send_message_by_email {
>       if !$message->{to_address}
>       || $message->{to_address} ne $email->email->header('To');
> 
>+    _update_message_from_address($message->{'message_id'},$email->email->header('From') ) 
>+      if !$message->{from_address} 
>+      || $message->{from_address} ne $email->email->header('From');
>+
>+
>     try {
>         $email->send_or_die({ transport => $smtp_server->transport });
> 
>diff --git a/Koha/Email.pm b/Koha/Email.pm
>index e91a49e402..82aa2624f8 100644
>--- a/Koha/Email.pm
>+++ b/Koha/Email.pm
>@@ -87,9 +87,12 @@ sub create {
>         $args->{to} = $params->{to};
>     }
> 
>-    Koha::Exceptions::BadParameter->throw("Invalid 'to' parameter: ".$args->{to})
>-        unless Email::Valid->address($args->{to}); # to is mandatory
>-
>+    my @emails = split(',', $args->{to}); 
>+    foreach my $email (@emails) {
>+        $email =~ s/ //g;
>+        Koha::Exceptions::BadParameter->throw("Invalid 'to' parameter: ".$email)
>+            unless Email::Valid->address($email); # to is mandatory
>+    }
>     my $addresses = {};
>     $addresses->{reply_to} = $params->{reply_to};
>     $addresses->{reply_to} ||= C4::Context->preference('ReplytoDefault')
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>index 0c402ace66..cfe9413740 100755
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -1244,17 +1244,19 @@ sub notice_email_address{
> 
>     my $use_guarantor = C4::Context->preference('RedirectGuaranteeEmail');
>     if ($use_guarantor) {
>-        my $guarantor = $self->guarantor;
>-        if ($guarantor) {
>-            if ( $which_address eq 'OFF' ) {
>-                $guarantor_address = $guarantor->first_valid_email_address;
>-            } else {
>-                $guarantor_address = $guarantor->$which_address || '';
>-            }
>-            if ($address){
>-                $address .= ', ';
>-            }
>+        my @guarantors = map { $_->guarantor } $self->guarantor_relationships();
>+        if (@guarantors) {
>+            foreach my $guarantor (@guarantors) {
>+                if ( $which_address eq 'OFF' ) {
>+                    $guarantor_address = $guarantor->first_valid_email_address;
>+                } else {
>+                    $guarantor_address = $guarantor->$which_address || '';
>+                }
>+                if ($address){
>+                    $address .= ', ';
>+                }
>                 $address .=  $guarantor_address if $guarantor_address;
>+            }
>         }
>     }
>     return $address;
>-- 
>2.25.1

Actions: View | Diff | Splinter Review

Attachments on bug 12532: 29510 | 30747 | 35313 | 36752 | 39787 | 39925 | 48645 | 53649 | 53689 | 53690 | 53699 | 53700 | 55985 | 56052 | 56053 | 59445 | 59446 | 59447 | 63197 | 64802 | 64824 | 67115 | 68340 | 70865 | 72064 | 72617 | 75099 | 77606 | 80313 | 85134 | 85135 | 87815 | 87816 | 88208 | 88209 | 88210 | 88211 | 88212 | 88213 | 88295 | 88296 | 114455 | 114456 | 114457 | 114458 | 114459 | 114460 | 114461 | 131091 | 131092 | 131093 | 131094 | 149233 | 150071 | 150208 | 150217 | 150240 | 150256 | 151028 | 151029 | 154854 | 154855 | 154856 | 154857 | 155036 | 155037 | 155828 | 155829 | 155830 | 155831 | 155832 | 155833 | 155834 | 155835 | 155836 | 155837 | 155873 | 155874 | 155875 | 155876 | 155877 | 155878 | 155879 | 155880 | 155881 | 155882 | 155883 | 155886 | 155934 | 155935 | 155936 | 155937 | 155938 | 155939 | 155940 | 155941 | 155942 | 155943 | 155944 | 155945 | 155946