Bugzilla – Attachment 70376 Details for
Bug 18915
Creating a checkout note (patron note) sends an incomplete email message
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18915: Fix checkout note email message
Bug-18915-Fix-checkout-note-email-message.patch (text/plain), 7.98 KB, created by
Biblibre Sandboxes
on 2018-01-09 15:49:53 UTC
(
hide
)
Description:
Bug 18915: Fix checkout note email message
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2018-01-09 15:49:53 UTC
Size:
7.98 KB
patch
obsolete
>From 825b858b2bffb0bbce39e8c5993b77687a02c797 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Sun, 27 Aug 2017 23:20:40 +0000 >Subject: [PATCH] Bug 18915: Fix checkout note email message > >This patch replaces the <<biblio.item>> in the email with ><<biblio.title>> and uses CHECKOUT_NOTE instead of PATRON_NOTE. >This patch also adds the notice to >installer/data/mysql/en/mandatory/sample_notices.sql, and updates the >PATRON_NOTE entry in installer/data/mysql/updatedatabase.pl > >To test: >1) Apply patch and update database >2) View the message_queue table in mysql >3) Check out an item if haven't already >4) Go to OPAC and set a checkout note for an item >5) View message_queue table and confirm it the title is included in the >email and all instances of 'patron note' have been replaced with >'checkout note' >6) Disable javascript in browser >7) repeat steps 4 and 5 and confirm all works as expected > >Sponsored-by: Catalyst IT > >Signed-off-by: Marjorie Vila <marjorie.barry-vila@collecto.ca> >--- > .../mysql/atomicupdate/bug_18915_-_modifying_patron_note_notice.sql | 1 + > installer/data/mysql/en/mandatory/sample_notices.sql | 3 ++- > installer/data/mysql/updatedatabase.pl | 2 +- > opac/opac-issue-note.pl | 2 +- > opac/svc/patron_notes | 2 +- > 5 files changed, 6 insertions(+), 4 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_18915_-_modifying_patron_note_notice.sql > >diff --git a/installer/data/mysql/atomicupdate/bug_18915_-_modifying_patron_note_notice.sql b/installer/data/mysql/atomicupdate/bug_18915_-_modifying_patron_note_notice.sql >new file mode 100644 >index 0000000..80035b2 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_18915_-_modifying_patron_note_notice.sql >@@ -0,0 +1 @@ >+UPDATE letter SET code = 'CHECKOUT_NOTE', name = 'Checkout note on item set by patron', title = 'Checkout note', content = REPLACE(content, "<<biblio.item>>", "<<biblio.title>>") WHERE code = 'PATRON_NOTE'; >diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql >index 7a5c4da..0eb0051 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.sql >+++ b/installer/data/mysql/en/mandatory/sample_notices.sql >@@ -173,4 +173,5 @@ INSERT INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title` > ('circulation', 'AR_COMPLETED', '', 'Article request - completed', 0, 'Article request completed', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nWe have completed your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\nYou may pick your article up at <<branches.branchname>>.\r\n\r\nThank you!', 'email'), > ('circulation', 'AR_PENDING', '', 'Article request - open', 0, 'Article request received', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>)\r\n\r\nWe have received your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\n\r\nThank you!', 'email'), > ('circulation', 'AR_SLIP', '', 'Article request - print slip', 0, 'Article request', 'Article request:\r\n\r\n<<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nTitle: <<biblio.title>>\r\nBarcode: <<items.barcode>>\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n', 'print'), >-('circulation', 'AR_PROCESSING', '', 'Article request - processing', 0, 'Article request processing', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nWe are now processing your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\nThank you!', 'email'); >+('circulation', 'AR_PROCESSING', '', 'Article request - processing', 0, 'Article request processing', 'Dear <<borrowers.firstname>> <<borrowers.surname>> (<<borrowers.cardnumber>>),\r\n\r\nWe are now processing your request for an article from <<biblio.title>> (<<items.barcode>>).\r\n\r\nArticle requested:\r\nTitle: <<article_requests.title>>\r\nAuthor: <<article_requests.author>>\r\nVolume: <<article_requests.volume>>\r\nIssue: <<article_requests.issue>>\r\nDate: <<article_requests.date>>\r\nPages: <<article_requests.pages>>\r\nChapters: <<article_requests.chapters>>\r\nNotes: <<article_requests.patron_notes>>\r\n\r\nThank you!', 'email'), >+('circulation', 'CHECKOUT_NOTE', '', 'Checkout note on item set by patron', '0', 'Checkout note', '<<borrowers.firstname>> <<borrowers.surname>> has added a note to the item <<biblio.title>> - <<biblio.author>> (<<biblio.biblionumber>>).','email'); >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index a9b40c4..2a4541b 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -14308,7 +14308,7 @@ if( CheckVersion( $DBversion ) ) { > > $dbh->do(q| > INSERT IGNORE INTO letter (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) >- VALUES ('circulation', 'PATRON_NOTE', '', 'Patron note on item', '0', 'Patron issue note', '<<borrowers.firstname>> <<borrowers.surname>> has added a note to the item <<biblio.item>> - <<biblio.author>> (<<biblio.biblionumber>>).','email'); >+ VALUES ('circulation', 'CHECKOUT_NOTE', '', 'Checkout note on item set by patron', '0', 'Checkout note', '<<borrowers.firstname>> <<borrowers.surname>> has added a note to the item <<biblio.title>> - <<biblio.author>> (<<biblio.biblionumber>>).','email'); > |); > > $dbh->do(q| >diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl >index 86c6d67..c279545 100755 >--- a/opac/opac-issue-note.pl >+++ b/opac/opac-issue-note.pl >@@ -72,7 +72,7 @@ if ( $action eq 'issuenote' && C4::Context->preference('AllowCheckoutNotes') ) { > my $branch = Koha::Libraries->find( $issue->branchcode ); > my $letter = C4::Letters::GetPreparedLetter ( > module => 'circulation', >- letter_code => 'PATRON_NOTE', >+ letter_code => 'CHECKOUT_NOTE', > branchcode => $branch, > tables => { > 'biblio' => $biblio->biblionumber, >diff --git a/opac/svc/patron_notes b/opac/svc/patron_notes >index 5cd9f0a..130b0c9 100755 >--- a/opac/svc/patron_notes >+++ b/opac/svc/patron_notes >@@ -82,7 +82,7 @@ if ($is_ajax) { > my $biblionumber = $issue->item->biblionumber; > my $letter = C4::Letters::GetPreparedLetter ( > module => 'circulation', >- letter_code => 'PATRON_NOTE', >+ letter_code => 'CHECKOUT_NOTE', > branchcode => $branch, > tables => { > 'biblio' => $biblionumber, >-- >2.7.4
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 18915
:
64937
|
66518
|
69839
|
69840
|
70376
|
70377
|
70378
|
70460
|
70461
|
70462
|
70463
|
70492