Attachment #146697 for bug #31028

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

Lines 1617-1623 sub _process_tt { Link Here

(-)a/C4/Letters.pm (-1 / +1 lines)
1617	my $tt_params = { %{ _get_tt_params( $tables ) }, %{ _get_tt_params( $loops, 'is_a_loop' ) }, %$substitute, %$objects };	1617	my $tt_params = { %{ _get_tt_params( $tables ) }, %{ _get_tt_params( $loops, 'is_a_loop' ) }, %$substitute, %$objects };
1618		1618
1619	$content = add_tt_filters( $content );	1619	$content = add_tt_filters( $content );
1620	$content = qq\|[% USE KohaDates %][% USE Remove_MARC_punctuation %][% PROCESS 'html_helpers.inc' %]$content\|;	1620	$content = qq\|[% USE KohaDates %][% USE Remove_MARC_punctuation %]$content\|;
1621		1621
1622	my $output;	1622	my $output;
1623	my $schema = Koha::Database->new->schema;	1623	my $schema = Koha::Database->new->schema;




        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thankyou", 'email' );
            }
        );
        say $out "Added new notice 'TICKET_ACKNOWLEDGE'";

        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );
            }
        );
        say $out "Added new notice 'TICKET_UPDATE'";

        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left:   <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );
            }
        );
        say $out "Added new notice 'TICKET_RESOLVE'";

        $dbh->do(
            q{
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
                VALUES ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "[%- USE Koha -%][%- PROCESS 'html_helpers.inc' -%]\r\nDear cataloger,<br><br>[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br><br>[%- ticket.body -%]<br><br>You 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'";




          message_transport_type: email
          lang: default
          content:
            - "[%- PROCESS 'html_helpers.inc' -%]"
            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>"
            - "<br>"
            - "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>"

          message_transport_type: email
          lang: default
          content:
            - "[%- PROCESS 'html_helpers.inc' -%]"
            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
            - "<br>"
            - "The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%] as resolved.<br>"

          message_transport_type: email
          lang: default
          content:
            - "[%- PROCESS 'html_helpers.inc' -%]"
            - "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
            - "<br>"
            - "The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br>"

          message_transport_type: email
          lang: default
          content:
            - "[%- PROCESS 'html_helpers.inc' -%]"
            - "[%- USE Koha -%]"
            - "Dear cataloger,<br>"
            - "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br>"
- 

Return to bug 31028

Lines 52-57 tables: Link Here

(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-1 / +4 lines)
52	message_transport_type: email	52	message_transport_type: email
53	lang: default	53	lang: default
54	content:	54	content:
		55	- "[%- PROCESS 'html_helpers.inc' -%]"
55	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>"	56	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br>"
56	- "<br>"	57	- "<br>"
57	- "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>"	58	- "Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br>"
Lines 70-75 tables: Link Here
70	message_transport_type: email	71	message_transport_type: email
71	lang: default	72	lang: default
72	content:	73	content:
		74	- "[%- PROCESS 'html_helpers.inc' -%]"
73	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"	75	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
74	- "<br>"	76	- "<br>"
75	- "The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%] as resolved.<br>"	77	- "The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%] as resolved.<br>"
Lines 88-93 tables: Link Here
88	message_transport_type: email	90	message_transport_type: email
89	lang: default	91	lang: default
90	content:	92	content:
		93	- "[%- PROCESS 'html_helpers.inc' -%]"
91	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"	94	- "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br>"
92	- "<br>"	95	- "<br>"
93	- "The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br>"	96	- "The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br>"
Lines 106-111 tables: Link Here
106	message_transport_type: email	109	message_transport_type: email
107	lang: default	110	lang: default
108	content:	111	content:
		112	- "[%- PROCESS 'html_helpers.inc' -%]"
109	- "[%- USE Koha -%]"	113	- "[%- USE Koha -%]"
110	- "Dear cataloger,<br>"	114	- "Dear cataloger,<br>"
111	- "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br>"	115	- "[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%] reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br>"
112	-

Lines 89-95 return { Link Here

(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (-4 / +4 lines)
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 ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thankyou", 'email' );	92	VALUES ( 'catalogue', 'TICKET_ACKNOWLEDGE', '', 'Concern acknowledgement', '1', 'Catalog concern acknowledgement', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%],<br><br>Thankyou for your report concerning [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 0 -%].<br><br>You reported: <br>[%- ticket.body -%]<br><br>Thankyou", '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 ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );	100	VALUES ( 'catalogue', 'TICKET_UPDATE', '', 'Concern updated', '1', 'Catalog concern updated', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has added an update to the concern you reported against [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%].<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", '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 ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", 'email' );	108	VALUES ( 'catalogue', 'TICKET_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "[%- PROCESS 'html_helpers.inc' -%]Dear [%- INCLUDE 'patron-title.inc' patron => ticket_update.ticket.reporter -%],<br><br>The library has now marked your concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket_update.ticket.biblio link = 0 -%]as resolved.<br><br>The following comment was left: <br>[%- ticket_update.message -%]<br><br>Thankyou", '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 ( 'catalogue', 'TICKET_NOTIFY', '', 'Catalog concern notification', '1', 'Catalog concern reported', "[%- USE Koha -%]\r\nDear cataloger,<br><br>[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br><br>[%- ticket.body -%]<br><br>You 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', "[%- USE Koha -%][%- PROCESS 'html_helpers.inc' -%]\r\nDear cataloger,<br><br>[%- INCLUDE 'patron-title.inc' patron => ticket.reporter -%]reported the following concern with [%- INCLUDE 'biblio-title.inc' biblio=ticket.biblio link = 1 -%]<br><br>[%- ticket.body -%]<br><br>You 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'";