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 <david@davidnind.com>
Signed-off-by: Helen Oliver <HOliver@tavi-port.ac.uk>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

diff --git a/Koha/REST/V1/Tickets.pm b/Koha/REST/V1/Tickets.pm
index 1422eb2..b27a56d 100644 (file)
--- 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 f7693d7..bec743b 100644 (file)
--- 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 e322ab1..37599d2 100644 (file)
--- 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 <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", '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 <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>.", '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 f3befe2..21668a7 100644 (file)
--- 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"