@@ -, +, @@
---
C4/Letters.pm | 2 +-
.../prog/en/modules/members/notices.tt | 32 ++++++++++++-------
2 files changed, 21 insertions(+), 13 deletions(-)
--- a/C4/Letters.pm
+++ a/C4/Letters.pm
@@ -1116,7 +1116,7 @@ sub GetQueuedMessages {
my $dbh = C4::Context->dbh();
my $statement = << 'ENDSQL';
-SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued, updated_on, failure_code
+SELECT message_id, borrowernumber, subject, content, message_transport_type, status, time_queued, updated_on, failure_code, from_address, to_address, cc_address
FROM message_queue
ENDSQL
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt
@@ -94,20 +94,28 @@
[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %] |
[% IF ( QUEUED_MESSAGE.failure_code ) %]
- [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %]
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower
- [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %]
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver
- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details
- [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error
- [% ELSE %]Error occurred while sending email.
+ [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]Invalid borrowernumber [% borrowernumber | html %]
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]Unable to find an email address for this borrower
+ [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]Invalid [% matches.0 | html %] email address found [% borrowernumber | html %]
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]Missing from email address
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]Missing SMS number
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]Message is duplicate
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]No notes from SMS driver
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]Unhandled email failure, check the logs for further details
+ [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]Unknown error
+ [% ELSE %]Error occurred while sending email.
[% END %]
[% END %]
- [% IF ( QUEUED_MESSAGE.cc_address ) %]
- Notice copied to: [% QUEUED_MESSAGE.cc_address | html %]
+ [% IF ( QUEUED_MESSAGE.status == 'sent' ) %]
+ [% IF ( QUEUED_MESSAGE.from_address ) %]
+ from: [% QUEUED_MESSAGE.from_address | html %]
+ [% END %]
+ [% IF ( QUEUED_MESSAGE.to_address ) %]
+ to: [% QUEUED_MESSAGE.to_address | html %]
+ [% END %]
+ [% IF ( QUEUED_MESSAGE.cc_address ) %]
+ cc: [% QUEUED_MESSAGE.cc_address | html %]
+ [% END %]
[% END %]
|
--