View | Details | Raw Unified | Return to bug 28581
Collapse All | Expand All

(-)a/C4/Letters.pm (-3 / +12 lines)
Lines 910-920 sub _parseletter { Link Here
910
  my $success = EnqueueLetter( { letter => $letter, 
910
  my $success = EnqueueLetter( { letter => $letter, 
911
        borrowernumber => '12', message_transport_type => 'email' } )
911
        borrowernumber => '12', message_transport_type => 'email' } )
912
912
913
places a letter in the message_queue database table, which will
913
Places a letter in the message_queue database table, which will
914
eventually get processed (sent) by the process_message_queue.pl
914
eventually get processed (sent) by the process_message_queue.pl
915
cronjob when it calls SendQueuedMessages.
915
cronjob when it calls SendQueuedMessages.
916
916
917
return message_id on success
917
Return message_id on success
918
919
Parameters
920
* letter - required; A letter hashref as returned from GetPreparedLetter
921
* message_transport_type - required; One of the available mtts
922
* borrowernumber - optional if 'to_address' is passed; The borrowernumber of the patron we enqueuing the notice for
923
* to_address - optional if 'borrowernumber' is passed; The destination email address for the notice (defaults to patron->notice_email_address)
924
* from_address - optional; The from address for the notice, defaults to patron->library->from_email_address
925
* reply_address - optional; The reply address for the notice, defaults to patron->library->reply_to
918
926
919
=cut
927
=cut
920
928
Lines 1351-1356 sub _send_message_by_email { Link Here
1351
        $branch_returnpath = $library->branchreturnpath;
1359
        $branch_returnpath = $library->branchreturnpath;
1352
    }
1360
    }
1353
1361
1362
    # NOTE: Patron may not be defined above so branch_email may be undefined still
1363
    # so we need to fallback to KohaAdminEmailAddress as a last resort.
1354
    my $from_address =
1364
    my $from_address =
1355
         $message->{'from_address'}
1365
         $message->{'from_address'}
1356
      || $branch_email
1366
      || $branch_email
1357
- 

Return to bug 28581