Bug 32455: Use from_email_address for 'from' field for hold notices

This patch updates two occurrences where the inbound library email is
used as the from address

To test:
 1 - Set a unique 'Email' and 'Reply to' address for a library
 2 - Find a patron of that library, ensure they have an email
 3 - Ensure their messaging preference for holds is 'email'
 4 - Set system preference ReservesMaxPickupDelay to -1
 5 - Set system preference  ExpireReservesMaxPickUpDelay to Allow
 6 - Set system preference ExpireReservesAutoFill to Do
 7 - Place and fill a hold for that patron at that library
 8 - Check the patron's notification tab, confirm the from address is the 'Reply to'
 9 - Place a hold for another patron on the same item
10 - Run the expired holds cronjob:
     perl misc/cronjobs/holds/cancel_expired_holds.pl --reason=whatever
11 - Check the message_queue - notice the from address is the 'reply to'
12 - Apply patch
13 - Repeat 1-11, confirm the from addresses are correct now

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 6ff7149..987543e 100644 (file)
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -1888,7 +1888,7 @@ sub _koha_notify_reserve {
     } );
 
     my $library = Koha::Libraries->find( $hold->branchcode );
-    my $inbound_email_address = $library->inbound_email_address;
+    my $from_email_address = $library->from_email_address;
 
     my %letter_params = (
         module => 'reserves',
@@ -1919,7 +1919,7 @@ sub _koha_notify_reserve {
         C4::Letters::EnqueueLetter( {
             letter => $letter,
             borrowernumber => $borrowernumber,
-            from_address => $inbound_email_address,
+            from_address => $from_email_address,
             message_transport_type => $mtt,
         } );
     };
@@ -1980,7 +1980,7 @@ sub _koha_notify_hold_changed {
             letter                 => $letter,
             borrowernumber         => $patron->id,
             message_transport_type => 'email',
-            from_address           => $email,
+            from_address           => $library->from_email_address,
             to_address             => $email,
         }
     );