From a365ca8c445d30627f52e36324e17ac1e693a1f0 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 12 Aug 2014 10:18:12 +1200 Subject: [PATCH] [PASSED QA] Bug 9530 making changes to basket/sendbasket.pl To Test 1/ Edit the new systempreferences (ReplytoDefault and ReturnpathDefault) 2/ Optionally edit the branch the mail will be sent from, adding email addresses 3/ Test some mails, test sending a cart email from the staff client 4/ Check that the mails have the correct From, Replyto and ReturnPath set The rules are If the values are set in the branch use that, else use the syspref Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize --- basket/sendbasket.pl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl index 3ac4170..a9314a3 100755 --- a/basket/sendbasket.pl +++ b/basket/sendbasket.pl @@ -30,6 +30,7 @@ use C4::Items; use C4::Auth; use C4::Output; use C4::Biblio; +use Koha::Email; my $query = new CGI; @@ -50,13 +51,9 @@ my $email_sender = $query->param('email_sender'); my $dbh = C4::Context->dbh; if ( $email_add ) { - my $email_from = C4::Context->preference('KohaAdminEmailAddress'); + my $email = Koha::Email->new(); + my %mail = $email->create_message_headers({ to => $email_add }); my $comment = $query->param('comment'); - my %mail = ( - To => $email_add, - From => $email_from - ); - my ( $template2, $borrowernumber, $cookie ) = get_template_and_user( { template_name => "basket/sendbasket.tt", -- 1.7.10.4