Bugzilla – Attachment 158712 Details for
Bug 18397
Add recipient/sender information to notices tab in staff interface
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18397: Add message delivery details to the notices tab
Bug-18397-Add-message-delivery-details-to-the-noti.patch (text/plain), 8.30 KB, created by
David Nind
on 2023-11-09 13:00:59 UTC
(
hide
)
Description:
Bug 18397: Add message delivery details to the notices tab
Filename:
MIME Type:
Creator:
David Nind
Created:
2023-11-09 13:00:59 UTC
Size:
8.30 KB
patch
obsolete
>From 3690440b6f1b290955a8ec8bf871893242c7512d Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Wed, 8 Nov 2023 16:41:02 +0000 >Subject: [PATCH] Bug 18397: Add message delivery details to the notices tab > >This patch adds further delivery details to the notices tab in patron >details in the staff client. > >Once a message is sent, we display the 'from:', 'to:' and 'cc:' >addresses in the 'Delivery note' column when they exist. > >Test plan >1. Enable KTD to send email [1] (without email configured the > delivery note displayed "Unhandled email failure, check the logs for > further details"). > >2. Add email addresses to two patrons and to KohaAdminEmailAddress, > and run misc/cronjobs/process_message_queue.pl after generating > notices. > >3. For the two patrons with email addresses, make one a guarantor. > >4. Sent Welcome messages (Patron account > More > Send welcome email) - > nothing in delivery note column. > >5. Checkout out an item to the guarantee (item checkout email enabled) - > nothing in delivery note column. > >6. Send the notices by running misc/cronjobs/process_message_queue.pl > again. > >7. Now the 'Delivery note' columns should contain from:, to: and cc: > address details. > >[1] Option 1 - smpt-sink (aka the sandboxes way) > - Install the postfix package inside ktd (sudo apt install postfix) > When asked in the wizard, I named mine 'local' > - Start smpt-sink with > `nohup smtp-sink -u root -D mail 127.0.0.1:25 100 </dev/null >/dev/null 2>&1 &` > > Option 2 - To test sending emails using a Google account: > - Set up an App password for your Google Account > - Edit /etc/koha/sites/kohadev/koha-conf.xml file and add this > configuration near the end (where <user_name> = your Google email > address; <password> = your APP password, not your Google account > password): > > <smtp_server> > <host>smtp.gmail.com</host> > <port>587</port> > <timeout>5</timeout> > <ssl_mode>STARTTLS</ssl_mode> > <user_name>GOOGLEACCOUNTUSER</user_name> > <password>GOOGLEAPPPASSWORD</password> > <debug>1</debug> > </smtp_server> > >Signed-off-by: David Nind <david@davidnind.com> >--- > C4/Letters.pm | 2 +- > .../prog/en/modules/members/notices.tt | 32 ++++++++++++------- > 2 files changed, 21 insertions(+), 13 deletions(-) > >diff --git a/C4/Letters.pm b/C4/Letters.pm >index 47e1252648..a0404ac707 100644 >--- a/C4/Letters.pm >+++ b/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 > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >index 2626046803..ce6abe88a7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt >@@ -94,20 +94,28 @@ > <td data-order="[% QUEUED_MESSAGE.time_queued | html %]">[% QUEUED_MESSAGE.time_queued | $KohaDates with_hours => 1 %]</td> > <td> > [% IF ( QUEUED_MESSAGE.failure_code ) %] >- [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]<span>Invalid borrowernumber [% borrowernumber | html %]</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]<span>Unable to find an email address for this borrower</span> >- [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]<span>Invalid [% matches.0 | html %] email address found [% borrowernumber | html %]</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]<span>Missing from email address</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]<span>Missing SMS number</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]<span>Message is duplicate</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]<span>No notes from SMS driver</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]<span>Unhandled email failure, check the logs for further details</span> >- [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]<span>Unknown error</span> >- [% ELSE %]<span>Error occurred while sending email.</span> >+ [% IF ( QUEUED_MESSAGE.failure_code == "INVALID_BORNUMBER" ) %]<span class="clearfix">Invalid borrowernumber [% borrowernumber | html %]</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_EMAIL' ) %]<span class="clearfix">Unable to find an email address for this borrower</span> >+ [% ELSIF (matches = QUEUED_MESSAGE.failure_code.match('INVALID_EMAIL:(\w+)') ) %]<span class="clearfix">Invalid [% matches.0 | html %] email address found [% borrowernumber | html %]</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_FROM' ) %]<span class="clearfix">Missing from email address</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'MISSING_SMS' ) %]<span class="clearfix">Missing SMS number</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'DUPLICATE_MESSAGE' ) %]<span class="clearfix">Message is duplicate</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'NO_NOTES' ) %]<span class="clearfix">No notes from SMS driver</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == 'SENDMAIL' ) %]<span class="clearfix">Unhandled email failure, check the logs for further details</span> >+ [% ELSIF ( QUEUED_MESSAGE.failure_code == "UNKNOWN_ERROR" ) %]<span class="clearfix">Unknown error</span> >+ [% ELSE %]<span class="clearfix">Error occurred while sending email.</span> > [% END %] > [% END %] >- [% IF ( QUEUED_MESSAGE.cc_address ) %] >- <span>Notice copied to: [% QUEUED_MESSAGE.cc_address | html %]</span> >+ [% IF ( QUEUED_MESSAGE.status == 'sent' ) %] >+ [% IF ( QUEUED_MESSAGE.from_address ) %] >+ <span class="clearfix"><span class="label">from:</span> [% QUEUED_MESSAGE.from_address | html %]</span> >+ [% END %] >+ [% IF ( QUEUED_MESSAGE.to_address ) %] >+ <span class="clearfix"><span class="label">to:</span> [% QUEUED_MESSAGE.to_address | html %]</span> >+ [% END %] >+ [% IF ( QUEUED_MESSAGE.cc_address ) %] >+ <span class="clearfix"><span class="label">cc:</span> [% QUEUED_MESSAGE.cc_address | html %]</span> >+ [% END %] > [% END %] > </td> > </tr> >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 18397
:
61963
|
158666
|
158703
|
158704
|
158712
|
160089