From 01d03b22425d019ca2ffd32ddaa56dddd3ec9bb8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 2 Nov 2022 10:50:28 +0000 Subject: [PATCH] Bug 31028: (follow-up) Update notice module codes This patch updates the notice codes from 'catalog' to 'catalogue' to be consistent with the existing codebase. Signed-off-by: David Nind Signed-off-by: Helen Oliver Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi --- Koha/REST/V1/Tickets.pm | 2 +- Koha/Ticket.pm | 4 ++-- installer/data/mysql/atomicupdate/bug_31028.pl | 8 ++++---- installer/data/mysql/en/mandatory/sample_notices.yml | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Koha/REST/V1/Tickets.pm b/Koha/REST/V1/Tickets.pm index 1422eb2d32..b27a56d3da 100644 --- a/Koha/REST/V1/Tickets.pm +++ b/Koha/REST/V1/Tickets.pm @@ -228,7 +228,7 @@ sub add_update { ? 'TICKET_RESOLVE' : 'TICKET_UPDATE'; my $letter = C4::Letters::GetPreparedLetter( - module => 'catalog', + module => 'catalogue', letter_code => $notice, branchcode => $update->user->branchcode, tables => { ticket_updates => $update->id } diff --git a/Koha/Ticket.pm b/Koha/Ticket.pm index f7693d794a..bec743b783 100644 --- a/Koha/Ticket.pm +++ b/Koha/Ticket.pm @@ -117,7 +117,7 @@ sub store { # Send patron acknowledgement my $acknowledgement_letter = C4::Letters::GetPreparedLetter( - module => 'catalog', + module => 'catalogue', letter_code => 'TICKET_ACKNOWLEDGE', branchcode => $self->reporter->branchcode, tables => { tickets => $self->id } @@ -140,7 +140,7 @@ sub store { # notify the library if a notice exists my $notify_letter = C4::Letters::GetPreparedLetter( - module => 'catalog', + module => 'catalogue', letter_code => 'TICKET_NOTIFY', branchcode => $self->reporter->branchcode, tables => { tickets => $self->id } diff --git a/installer/data/mysql/atomicupdate/bug_31028.pl b/installer/data/mysql/atomicupdate/bug_31028.pl index e322ab18aa..37599d24e8 100644 --- a/installer/data/mysql/atomicupdate/bug_31028.pl +++ b/installer/data/mysql/atomicupdate/bug_31028.pl @@ -89,7 +89,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) - VALUES ( 'catalog', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],\r\n\r\nThankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].\r\n\r\nYou reported: \r\n[% ticket.body %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [% INCLUDE 'patron-title.inc' patron => ticket.reporter %],\r\n\r\nThankyou for your report concerning [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 %].\r\n\r\nYou reported: \r\n[% ticket.body %]\r\n\r\nThankyou", 'email' ); } ); say $out "Added new notice 'TICKET_ACKNOWLEDGE'"; @@ -97,7 +97,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) - VALUES ( 'catalog', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has added an update to the concern you reported against [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %].\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); } ); say $out "Added new notice 'TICKET_UPDATE'"; @@ -105,7 +105,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) - VALUES ( 'catalog', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); + VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left: \r\n[% ticket_update.message %]\r\n\r\nThankyou", 'email' ); } ); say $out "Added new notice 'TICKET_RESOLVE'"; @@ -121,7 +121,7 @@ return { $dbh->do( q{ INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type) - VALUES ( 'catalog', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "Dear cataloger,\r\n\r\n[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]\r\n\r\n\r\n\r\n[% ticket.body %]\r\n\r\n\r\n\r\nYou can mark this concern as resolved from the concern management page.", 'email' ); + VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "Dear cataloger,\r\n\r\n[% INCLUDE 'patron-title.inc' patron => ticket.reporter %] reported the following concern with [% INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 %]\r\n\r\n\r\n\r\n[% ticket.body %]\r\n\r\n\r\n\r\nYou can mark this concern as resolved from the concern management page.", 'email' ); } ); say $out "Added new notice 'TICKET_NOTIFY'"; diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index f3befe2a73..21668a7c9a 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -43,7 +43,7 @@ tables: - "" - "Your library." - - module: catalog + - module: catalogue code: TICKET_ACKNOWLEDGE branchcode: "" name: "Concern acknowledgement" @@ -61,7 +61,7 @@ tables: - "" - "Thankyou" - - module: catalog + - module: catalogue code: TICKET_RESOLVE branchcode: "" name: "Concern resolved" @@ -79,7 +79,7 @@ tables: - "" - "Thankyou" - - module: catalog + - module: catalogue code: TICKET_UPDATE branchcode: "" name: "Concern updated" @@ -97,7 +97,7 @@ tables: - "" - "Thankyou" - - module: catalog + - module: catalogue code: TICKET_NOTIFY branchcode: "" name: "Concern notification" -- 2.39.5