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

(-)a/Koha/Catalog/Concern.pm (-1 / +18 lines)
Lines 102-107 sub resolve { Link Here
102
102
103
    # Optionally add to message_queue here to notify reporter
103
    # Optionally add to message_queue here to notify reporter
104
    if ( $params->{notify} ) {
104
    if ( $params->{notify} ) {
105
        my $letter = C4::Letters::GetPreparedLetter(
106
            module      => 'catalog',
107
            letter_code => 'CONCERN_RESOLVE',
108
            branchcode  => $self->resolver->branchcode,
109
            tables      => { catalog_concerns => $self->id }
110
        );
111
112
        if ($letter) {
113
            my $message_id = C4::Letters::EnqueueLetter(
114
                {
115
                    letter                 => $letter,
116
                    borrowernumber         => $self->reporter_id,
117
                    message_transport_type => 'email',
118
                }
119
            );
120
            C4::Letters::SendQueuedMessages( { message_id => $message_id } );
121
        }
105
122
106
    }
123
    }
107
124
Lines 137-143 sub store { Link Here
137
                {
154
                {
138
                    letter                 => $letter,
155
                    letter                 => $letter,
139
                    message_transport_type => 'email',
156
                    message_transport_type => 'email',
140
                    to_address             => C4::Preference('CatalogerEmails'),
157
                    to_address             => C4::Context->preference('CatalogerEmails'),
141
                    reply_address          => $self->reporter->notice_email_address,
158
                    reply_address          => $self->reporter->notice_email_address,
142
                }
159
                }
143
            );
160
            );
(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (+7 lines)
Lines 55-59 return { Link Here
55
            }
55
            }
56
        );
56
        );
57
57
58
        $dbh->do(
59
            q{
60
                INSERT IGNORE INTO letter(module,code,branchcode,name,is_html,title,content,message_transport_type)
61
                VALUES ( 'catalog', 'CONCERN_RESOLVE', '', 'Concern resolved', '1', 'Catalog concern resolved', "Dear [% INCLUDE 'patron-title.inc' patron => catalog_concern.reporter %],\r\n\r\nThe library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=catalog_concern.biblio link = 0 %] as resolved.\r\n\r\nThe following comment was left:   \r\n[% catalog_concern.resolution_message %]\r\n\r\nThankyou", 'email' );
62
            }
63
        );
64
58
    },
65
    },
59
}
66
}
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-1 / +18 lines)
Lines 59-64 tables: Link Here
59
            - ""
59
            - ""
60
            - "You can mark this concern as resolved from the concern management <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
60
            - "You can mark this concern as resolved from the concern management <a href='[% Koha.Preference('IntranetBaseURL') %]/cgi-bin/koha/cataloguing/concerns.pl'>page</a>."
61
61
62
        - module: catalog
63
          code: CONCERN_RESOLVE
64
          branchcode: ""
65
          name: "Concern resolved"
66
          is_html: 1
67
          title: "Catalog concern resolved"
68
          message_transport_type: email
69
          lang: default
70
          content:
71
            - "Dear [% INCLUDE 'patron-title.inc' patron => catalog_concern.reporter %],"
72
            - ""
73
            - "The library has now marked your concern with [% INCLUDE 'biblio-title.inc' biblio=catalog_concern.biblio link = 0 %] as resolved."
74
            - ""
75
            - "The following comment was left: "
76
            - "[% catalog_concern.resolution_message %]"
77
            - ""
78
            - "Thankyou"
79
62
        - module: circulation
80
        - module: circulation
63
          code: ACCOUNT_CREDIT
81
          code: ACCOUNT_CREDIT
64
          branchcode: ""
82
          branchcode: ""
65
- 

Return to bug 31028