Attachment #125344 for bug #28803

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




        );
        return;
    };
    my $email = try {
        Koha::Email->create(
            {
                to => $to_address,
                (
                    C4::Context->preference('NoticeBcc')
                    ? ( bcc => C4::Context->preference('NoticeBcc') )
                    : ()
                ),
                from     => $from_address,
                reply_to => $message->{'reply_address'} || $branch_replyto,
                sender   => $branch_returnpath,
                subject  => "" . $message->{subject}
            }
        );
    }
    catch {
        _set_message_status(
            {
                message_id   => $message->{'message_id'},
                status       => 'failed',
                failure_code => 'INVALID_EMAIL'
            }
        );
        return 0;
    };
    return unless $email;

    if ( $is_html ) {
        $email->html_body(

Lines 95-100 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt (-1 / +1 lines)
95	[% IF ( QUEUED_MESSAGE.failure_code ) %]	95	[% IF ( QUEUED_MESSAGE.failure_code ) %]
96	[% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber \| html %]	96	[% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber \| html %]
97	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower	97	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower
		98	[% ELSIF ( QUEUED_MESSAGE.failure_code == "INVALID_EMAIL" ) %]Invalid email address found [% borrowernumber \| html %]
98	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address	99	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address
99	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number	100	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number
100	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate	101	[% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate
101	-

Return to bug 28803

Lines 1389-1408 sub _send_message_by_email { Link Here

(-)a/C4/Letters.pm (-14 / +27 lines)
1389	);	1389	);
1390	return;	1390	return;
1391	};	1391	};
1392	my $email = Koha::Email->create(	1392	my $email = try {
1393	{	1393	Koha::Email->create(
1394	to => $to_address,	1394	{
1395	(	1395	to => $to_address,
1396	C4::Context->preference('NoticeBcc')	1396	(
1397	? ( bcc => C4::Context->preference('NoticeBcc') )	1397	C4::Context->preference('NoticeBcc')
1398	: ()	1398	? ( bcc => C4::Context->preference('NoticeBcc') )
1399	),	1399	: ()
1400	from => $from_address,	1400	),
1401	reply_to => $message->{'reply_address'} \|\| $branch_replyto,	1401	from => $from_address,
1402	sender => $branch_returnpath,	1402	reply_to => $message->{'reply_address'} \|\| $branch_replyto,
1403	subject => "" . $message->{subject}	1403	sender => $branch_returnpath,
1404	}	1404	subject => "" . $message->{subject}
1405	);	1405	}
		1406	);
		1407	}
		1408	catch {
		1409	_set_message_status(
		1410	{
		1411	message_id => $message->{'message_id'},
		1412	status => 'failed',
		1413	failure_code => 'INVALID_EMAIL'
		1414	}
		1415	);
		1416	return 0;
		1417	};
		1418	return unless $email;
1406		1419
1407	if ( $is_html ) {	1420	if ( $is_html ) {
1408	$email->html_body(	1421	$email->html_body(