View | Details | Raw Unified | Return to bug 31028
Collapse All | Expand All

(-)a/Koha/REST/V1/Tickets.pm (-1 / +1 lines)
Lines 215-221 sub add_update { Link Here
215
              ? 'TICKET_RESOLVE'
215
              ? 'TICKET_RESOLVE'
216
              : 'TICKET_UPDATE';
216
              : 'TICKET_UPDATE';
217
            my $letter = C4::Letters::GetPreparedLetter(
217
            my $letter = C4::Letters::GetPreparedLetter(
218
                module      => 'catalog',
218
                module      => 'catalogue',
219
                letter_code => $notice,
219
                letter_code => $notice,
220
                branchcode  => $update->user->branchcode,
220
                branchcode  => $update->user->branchcode,
221
                tables      => { ticket_updates => $update->id }
221
                tables      => { ticket_updates => $update->id }
(-)a/Koha/Ticket.pm (-2 / +2 lines)
Lines 118-124 sub store { Link Here
118
118
119
        # Send patron acknowledgement
119
        # Send patron acknowledgement
120
        my $acknowledgement_letter = C4::Letters::GetPreparedLetter(
120
        my $acknowledgement_letter = C4::Letters::GetPreparedLetter(
121
            module      => 'catalog',
121
            module      => 'catalogue',
122
            letter_code => 'TICKET_ACKNOWLEDGE',
122
            letter_code => 'TICKET_ACKNOWLEDGE',
123
            branchcode  => $self->reporter->branchcode,
123
            branchcode  => $self->reporter->branchcode,
124
            tables      => { tickets => $self->id }
124
            tables      => { tickets => $self->id }
Lines 141-147 sub store { Link Here
141
141
142
            # notify the library if a notice exists
142
            # notify the library if a notice exists
143
            my $notify_letter = C4::Letters::GetPreparedLetter(
143
            my $notify_letter = C4::Letters::GetPreparedLetter(
144
                module      => 'catalog',
144
                module      => 'catalogue',
145
                letter_code => 'TICKET_NOTIFY',
145
                letter_code => 'TICKET_NOTIFY',
146
                branchcode  => $self->reporter->branchcode,
146
                branchcode  => $self->reporter->branchcode,
147
                tables      => { tickets => $self->id }
147
                tables      => { tickets => $self->id }
(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (-4 / +4 lines)
Lines 89-95 return { Link Here
89
        $dbh->do(
89
        $dbh->do(
90
            q{
90
            q{
91
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
91
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
92
                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' );
92
                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' );
93
            }
93
            }
94
        );
94
        );
95
        say $out "Added new notice 'TICKET_ACKNOWLEDGE'";
95
        say $out "Added new notice 'TICKET_ACKNOWLEDGE'";
Lines 97-103 return { Link Here
97
        $dbh->do(
97
        $dbh->do(
98
            q{
98
            q{
99
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
99
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
100
                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' );
100
                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' );
101
            }
101
            }
102
        );
102
        );
103
        say $out "Added new notice 'TICKET_UPDATE'";
103
        say $out "Added new notice 'TICKET_UPDATE'";
Lines 105-111 return { Link Here
105
        $dbh->do(
105
        $dbh->do(
106
            q{
106
            q{
107
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
107
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
108
                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' );
108
                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' );
109
            }
109
            }
110
        );
110
        );
111
        say $out "Added new notice 'TICKET_RESOLVE'";
111
        say $out "Added new notice 'TICKET_RESOLVE'";
Lines 121-127 return { Link Here
121
        $dbh->do(
121
        $dbh->do(
122
            q{
122
            q{
123
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
123
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
124
                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' );
124
                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' );
125
            }
125
            }
126
        );
126
        );
127
        say $out "Added new notice 'TICKET_NOTIFY'";
127
        say $out "Added new notice 'TICKET_NOTIFY'";
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-5 / +4 lines)
Lines 43-49 tables: Link Here
43
            - ""
43
            - ""
44
            - "Your library."
44
            - "Your library."
45
45
46
        - module: catalog
46
        - module: catalogue
47
          code: TICKET_ACKNOWLEDGE
47
          code: TICKET_ACKNOWLEDGE
48
          branchcode: ""
48
          branchcode: ""
49
          name: "Concern acknowledgement"
49
          name: "Concern acknowledgement"
Lines 61-67 tables: Link Here
61
            - ""
61
            - ""
62
            - "Thankyou"
62
            - "Thankyou"
63
63
64
        - module: catalog
64
        - module: catalogue
65
          code: TICKET_RESOLVE
65
          code: TICKET_RESOLVE
66
          branchcode: ""
66
          branchcode: ""
67
          name: "Concern resolved"
67
          name: "Concern resolved"
Lines 79-85 tables: Link Here
79
            - ""
79
            - ""
80
            - "Thankyou"
80
            - "Thankyou"
81
81
82
        - module: catalog
82
        - module: catalogue
83
          code: TICKET_UPDATE
83
          code: TICKET_UPDATE
84
          branchcode: ""
84
          branchcode: ""
85
          name: "Concern updated"
85
          name: "Concern updated"
Lines 97-103 tables: Link Here
97
            - ""
97
            - ""
98
            - "Thankyou"
98
            - "Thankyou"
99
99
100
        - module: catalog
100
        - module: catalogue
101
          code: TICKET_NOTIFY
101
          code: TICKET_NOTIFY
102
          branchcode: ""
102
          branchcode: ""
103
          name: "Concern notification"
103
          name: "Concern notification"
104
- 

Return to bug 31028