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

(-)a/C4/Letters.pm (-18 / +45 lines)
Lines 43-49 BEGIN { Link Here
43
    $VERSION = 3.07.00.049;
43
    $VERSION = 3.07.00.049;
44
	@ISA = qw(Exporter);
44
	@ISA = qw(Exporter);
45
	@EXPORT = qw(
45
	@EXPORT = qw(
46
	&GetLetters &GetPreparedLetter &GetWrappedLetter &addalert &getalert &delalert &findrelatedto &SendAlerts &GetPrintMessages
46
       &GetLetters &GetPreparedLetter &GetWrappedLetter &addalert &getalert &delalert &findrelatedto &SendAlerts &GetPrintMessages &GetMessageTransportTypes
47
	);
47
	);
48
}
48
}
49
49
Lines 98-117 $template->param(LETTERLOOP => \@letterloop); Link Here
98
sub GetLetters {
98
sub GetLetters {
99
99
100
    # returns a reference to a hash of references to ALL letters...
100
    # returns a reference to a hash of references to ALL letters...
101
    my $cat = shift;
101
    my ( $cat, $message_transport_type ) = @_;
102
    $message_transport_type ||= 'email';
102
    my %letters;
103
    my %letters;
103
    my $dbh = C4::Context->dbh;
104
    my $dbh = C4::Context->dbh;
104
    my $sth;
105
    my $sth;
105
    if (defined $cat) {
106
    my $query = q{
106
        my $query = "SELECT * FROM letter WHERE module = ? ORDER BY name";
107
        SELECT * FROM letter WHERE
107
        $sth = $dbh->prepare($query);
108
    };
108
        $sth->execute($cat);
109
    $query .= q{ module = ? AND } if defined $cat;
109
    }
110
    $query .= q{ message_transport_type = ? ORDER BY name};
110
    else {
111
    $sth = $dbh->prepare($query);
111
        my $query = "SELECT * FROM letter ORDER BY name";
112
    $sth->execute((defined $cat ? $cat : ()), $message_transport_type);
112
        $sth = $dbh->prepare($query);
113
113
        $sth->execute;
114
    }
115
    while ( my $letter = $sth->fetchrow_hashref ) {
114
    while ( my $letter = $sth->fetchrow_hashref ) {
116
        $letters{ $letter->{'code'} } = $letter->{'name'};
115
        $letters{ $letter->{'code'} } = $letter->{'name'};
117
    }
116
    }
Lines 125-131 sub GetLetters { Link Here
125
#        short-term fix, our will work.
124
#        short-term fix, our will work.
126
our %letter;
125
our %letter;
127
sub getletter {
126
sub getletter {
128
    my ( $module, $code, $branchcode ) = @_;
127
    my ( $module, $code, $branchcode, $message_transport_type ) = @_;
128
    $message_transport_type ||= 'email';
129
129
130
130
131
    if ( C4::Context->preference('IndependentBranches')
131
    if ( C4::Context->preference('IndependentBranches')
Lines 136-152 sub getletter { Link Here
136
    }
136
    }
137
    $branchcode //= '';
137
    $branchcode //= '';
138
138
139
    if ( my $l = $letter{$module}{$code}{$branchcode} ) {
139
    if ( my $l = $letter{$module}{$code}{$branchcode}{$message_transport_type} ) {
140
        return { %$l }; # deep copy
140
        return { %$l }; # deep copy
141
    }
141
    }
142
142
143
    my $dbh = C4::Context->dbh;
143
    my $dbh = C4::Context->dbh;
144
    my $sth = $dbh->prepare("select * from letter where module=? and code=? and (branchcode = ? or branchcode = '') order by branchcode desc limit 1");
144
    my $sth = $dbh->prepare(q{
145
    $sth->execute( $module, $code, $branchcode );
145
        SELECT *
146
        FROM letter
147
        WHERE module=? AND code=? AND (branchcode = ? OR branchcode = '') AND message_transport_type = ?
148
        ORDER BY branchcode DESC LIMIT 1
149
    });
150
    $sth->execute( $module, $code, $branchcode, $message_transport_type );
146
    my $line = $sth->fetchrow_hashref
151
    my $line = $sth->fetchrow_hashref
147
      or return;
152
      or return;
148
    $line->{'content-type'} = 'text/html; charset="UTF-8"' if $line->{is_html};
153
    $line->{'content-type'} = 'text/html; charset="UTF-8"' if $line->{is_html};
149
    $letter{$module}{$code}{$branchcode} = $line;
154
    $letter{$module}{$code}{$branchcode}{$message_transport_type} = $line;
150
    return { %$line };
155
    return { %$line };
151
}
156
}
152
157
Lines 448-454 sub GetPreparedLetter { Link Here
448
    my $letter_code = $params{letter_code} or croak "No letter_code";
453
    my $letter_code = $params{letter_code} or croak "No letter_code";
449
    my $branchcode  = $params{branchcode} || '';
454
    my $branchcode  = $params{branchcode} || '';
450
455
451
    my $letter = getletter( $module, $letter_code, $branchcode )
456
    my $letter = getletter( $module, $letter_code, $branchcode, $params{message_transport_type} )
452
        or warn( "No $module $letter_code letter"),
457
        or warn( "No $module $letter_code letter"),
453
            return;
458
            return;
454
459
Lines 842-847 ENDSQL Link Here
842
    return $sth->fetchall_arrayref({});
847
    return $sth->fetchall_arrayref({});
843
}
848
}
844
849
850
=head2 GetMessageTransportTypes
851
852
  my @mtt = GetMessageTransportTypes();
853
854
  returns a list of hashes
855
856
=cut
857
858
sub GetMessageTransportTypes {
859
    my $dbh = C4::Context->dbh();
860
    my $sth = $dbh->prepare("
861
        SELECT message_transport_type
862
        FROM message_transport_types
863
        ORDER BY message_transport_type
864
    ");
865
    $sth->execute;
866
    my @mtts = map{
867
        $_->[0]
868
    } @{ $sth->fetchall_arrayref() };
869
    return \@mtts;
870
}
871
845
=head2 _add_attachements
872
=head2 _add_attachements
846
873
847
named parameters:
874
named parameters:
(-)a/koha-tmpl/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.insertatcaret.js (+46 lines)
Line 0 Link Here
1
/*!
2
 * jQuery insertAtCaret
3
 * Allows inserting text where the caret is in a textarea
4
 * Copyright (c) 2003-2010 phpMyAdmin devel team
5
 * Version: 1.0
6
 * Developed by the phpMyAdmin devel team. Modified by Alex King and variaas
7
 * http://alexking.org/blog/2003/06/02/inserting-at-the-cursor-using-javascript
8
 * http://www.mail-archive.com/jquery-en@googlegroups.com/msg08708.html
9
 * Licensed under the GPL license:
10
 * http://www.gnu.org/licenses/gpl.html
11
 */
12
;(function($) {
13
14
$.fn.insertAtCaret = function (myValue) {
15
16
    return this.each(function() {
17
18
        //IE support
19
        if (document.selection) {
20
21
            this.focus();
22
            sel = document.selection.createRange();
23
            sel.text = myValue;
24
            this.focus();
25
26
        } else if (this.selectionStart || this.selectionStart == '0') {
27
28
            //MOZILLA / NETSCAPE support
29
            var startPos = this.selectionStart;
30
            var endPos = this.selectionEnd;
31
            var scrollTop = this.scrollTop;
32
            this.value = this.value.substring(0, startPos)+ myValue+ this.value.substring(endPos,this.value.length);
33
            this.focus();
34
            this.selectionStart = startPos + myValue.length;
35
            this.selectionEnd = startPos + myValue.length;
36
            this.scrollTop = scrollTop;
37
38
        } else {
39
40
            this.value += myValue;
41
            this.focus();
42
        }
43
    });
44
};
45
46
})(jQuery);
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/letter.tt (-161 / +167 lines)
Lines 3-8 Link Here
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
4
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/datatables.css" />
5
[% INCLUDE 'datatables.inc' %]
5
[% INCLUDE 'datatables.inc' %]
6
<script type="text/javascript" src="[% interface %]/[% theme %]/en/lib/jquery/plugins/jquery.insertatcaret.js"></script>
6
<script type="text/javascript">
7
<script type="text/javascript">
7
//<![CDATA[
8
//<![CDATA[
8
$(document).ready(function() {
9
$(document).ready(function() {
Lines 23-28 $(document).ready(function() { Link Here
23
            return true;
24
            return true;
24
      });
25
      });
25
    [% END %]
26
    [% END %]
27
28
    $("#submit").click( function(event) {
29
        $("fieldset.mtt").each( function(){
30
            var title = $(this).find('input[name="title"]').val();
31
            var content = $(this).find('textarea[name="content"]').val();
32
            if (
33
                    ( title.length == 0 && content.length > 0 )
34
                 || ( title.length > 0 && content.length == 0 )
35
            ) {
36
                var mtt = $(this).find('input[name="message_transport_type"]').val();
37
                alert("You must specify a title and a content for " + mtt);
38
                event.preventDefault();
39
            }
40
        } );
41
        return true;
42
    });
43
44
    var sms_limit = 160;
45
    $("#content_sms").on("keyup", function(){
46
        var length = $(this).val().length;
47
        $("#sms_counter").html(length + "/" + sms_limit);
48
        if ( length  > sms_limit ) {
49
            $("#sms_counter").css("color", "red");
50
        } else {
51
            $("#sms_counter").css("color", "black");
52
        }
53
    });
26
}); 
54
}); 
27
[% IF ( add_form ) %]
55
[% IF ( add_form ) %]
28
	
56
	
Lines 49-109 $(document).ready(function() { Link Here
49
		}
77
		}
50
		return true;
78
		return true;
51
		}
79
		}
80
        function insertValueQuery(mtt_id) {
81
            var fieldset = $("#" + mtt_id);
82
            var myQuery = $(fieldset).find('textarea[name="content"]');
83
            var myListBox = $(fieldset).find('select[name="SQLfieldname"]');
52
84
53
		function Check(f) {
85
            if($(myListBox).find('option').length > 0) {
54
			var ok=1;
86
                var chaineAj = "";
55
			var _alertString="";
87
                var NbSelect = 0;
56
			var alertString2;
88
                $(myListBox).find('option').each( function (){
57
/*			if (!(isNotNull(window.document.Aform.code))) {
89
                    if ( $(this).attr('selected') ) {
58
				_alertString += "\n- " + _("Code missing");
90
                        NbSelect++;
59
			}*/
91
                        if (NbSelect > 1)
60
/*			if (!(isNotNull(window.document.Aform.name))) {
92
                            chaineAj += ", ";
61
				_alertString += "\n- " + _("Name missing");
93
                        chaineAj += $(this).val();
62
			}*/
94
                    }
63
			if (_alertString.length==0) {
95
                } );
64
				document.Aform.submit();
96
                $(myQuery).insertAtCaret(chaineAj);
65
			} else {
97
            }
66
				alertString2  = _("Form not submitted because of the following problem(s)");
98
        }
67
				alertString2 += "\n------------------------------------------------------------------------------------\n";
68
				alertString2 += _alertString;
69
				alert(alertString2);
70
			}
71
		}
72
		// GPL code coming from PhpMyAdmin
73
		function insertValueQuery() {
74
			var myQuery = document.Aform.content;
75
			var myListBox = document.Aform.SQLfieldname;
76
		
77
			if(myListBox.options.length > 0) {
78
				var chaineAj = "";
79
				var NbSelect = 0;
80
				for(var i=0; i<myListBox.options.length; i++) {
81
					if (myListBox.options[i].selected){
82
						NbSelect++;
83
						if (NbSelect > 1)
84
							chaineAj += ", ";
85
						chaineAj += myListBox.options[i].value;
86
					}
87
				}
88
		
89
				//IE support
90
				if (document.selection) {
91
					myQuery.focus();
92
					sel = document.selection.createRange();
93
					sel.text = chaineAj;
94
					document.Aform.insert.focus();
95
				}
96
				//MOZILLA/NETSCAPE support
97
				else if (document.Aform.content.selectionStart || document.Aform.content.selectionStart == "0") {
98
					var startPos = document.Aform.content.selectionStart;
99
					var endPos = document.Aform.content.selectionEnd;
100
					var chaineSql = document.Aform.content.value;
101
					myQuery.value = chaineSql.substring(0, startPos) +'<<'+ chaineAj+'>>' + chaineSql.substring(endPos, chaineSql.length);
102
				} else {
103
					myQuery.value += chaineAj;
104
				}
105
			}
106
		}
107
	[% END %]
99
	[% END %]
108
		//]]>
100
		//]]>
109
		</script>
101
		</script>
Lines 153-227 $(document).ready(function() { Link Here
153
            </select>
145
            </select>
154
            [% END %]
146
            [% END %]
155
        [% END %]
147
        [% END %]
156
148
        [% IF letter %]
157
[% IF ( letter ) %]
149
          <table id="lettert">
158
        <table id="lettert">
150
            <thead>
159
		<thead><tr>
151
              <tr>
160
			<th>Library</th>
152
                <th>Library</th>
161
			<th>Module</th>
153
                <th>Module</th>
162
			<th>Code</th>
154
                <th>Code</th>
163
			<th>Name</th>
155
                <th>Name</th>
164
            <th>Copy notice</th>
156
                <th>Copy notice</th>
165
			<th>&nbsp;</th>
157
                <th>&nbsp;</th>
166
			<th>&nbsp;</th>
158
                <th>&nbsp;</th>
167
		</tr></thead>
159
              </tr>
168
		<tbody>
160
            </thead>
169
    [% FOREACH lette IN letter %]
161
            <tbody>
170
        [% can_edit = lette.branchcode || !independant_branch %]
162
              [% FOREACH lette IN letter %]
171
        [% UNLESS ( loop.odd ) %]
163
                [% can_edit = lette.branchcode || !independant_branch %]
172
			<tr class="highlight">
164
                <tr>
173
        [% ELSE %]
165
                  <td>[% lette.branchname || "(All libraries)" %]</td>
174
			<tr>
166
                  <td>[% lette.module %]</td>
175
        [% END %]
167
                  <td>[% lette.code %]</td>
176
				<td>[% lette.branchname || "(All libraries)" %]</td>
168
                  <td>[% lette.name %]</td>
177
				<td>[% lette.module %]</td>
169
                  <td style="white-space: nowrap">
178
				<td>[% lette.code %]</td>
170
                    [% IF !independant_branch || !lette.branchcode %]
179
				<td>[% lette.name %]</td>
171
                      <form method="post" action="/cgi-bin/koha/tools/letter.pl">
180
				<td style="white-space: nowrap">
181
        [% IF !independant_branch || !lette.branchcode %]
182
                    <form method="post" action="/cgi-bin/koha/tools/letter.pl">
183
                        <input type="hidden" name="op" value="copy" />
172
                        <input type="hidden" name="op" value="copy" />
184
				        <input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
173
                        <input type="hidden" name="oldbranchcode" value="[% lette.branchcode %]" />
185
                        <input type="hidden" name="module" value="[% lette.module %]" />
174
                        <input type="hidden" name="module" value="[% lette.module %]" />
186
                        <input type="hidden" name="code" value="[% lette.code %]" />
175
                        <input type="hidden" name="code" value="[% lette.code %]" />
187
            [% IF independant_branch %]
176
                        [% IF independant_branch %]
188
                        <input type="hidden" name="branchcode" value="[% independant_branch %]" />
177
                          <input type="hidden" name="branchcode" value="[% independant_branch %]" />
189
            [% ELSE %]
178
                        [% ELSE %]
190
                        [% select_for_copy %]
179
                          [% select_for_copy %]
191
            [% END %]
180
                        [% END %]
192
                        <input type="submit" value="Copy" />
181
                        <input type="submit" value="Copy" />
193
                    </form>
182
                      </form>
194
        [% END %]
183
                    [% END %]
195
                </td>
184
                  </td>
196
                <td>
185
                  <td>
197
        [% IF can_edit %]
186
                    [% IF can_edit %]
198
                    <a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;branchcode=[% lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Edit</a>
187
                      <a href="/cgi-bin/koha/tools/letter.pl?op=add_form&amp;branchcode=[% lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Edit</a>
199
        [% END %]
188
                    [% END %]
200
				</td>
189
                  </td>
201
				<td>
190
                  <td>
202
        [% IF !lette.protected && can_edit %]
191
                    [% IF !lette.protected && can_edit %]
203
					<a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;branchcode=[%lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
192
                      <a href="/cgi-bin/koha/tools/letter.pl?op=delete_confirm&amp;branchcode=[%lette.branchcode %]&amp;module=[% lette.module %]&amp;code=[% lette.code %]">Delete</a>
204
        [% END %]
193
                    [% END %]
205
				</td>
194
                  </td>
206
			</tr>
195
                </tr>
207
    [% END %]
196
              [% END %]
208
        </tbody>
197
            </tbody>
209
		</table>
198
          </table>
210
[% ELSE %]
211
    <div class="dialog message">
212
        [% IF ( branchcode ) %]
213
           <p>There are no notices for this library.</p>
214
        [% ELSE %]
199
        [% ELSE %]
215
            <p>There are no notices.</p>
200
          <div class="dialog message">
201
          [% IF ( branchcode ) %]
202
             <p>There are no notices for this library.</p>
203
          [% ELSE %]
204
              <p>There are no notices.</p>
205
          [% END %]
206
          </div>
216
        [% END %]
207
        [% END %]
217
    </div>
218
[% END %]
219
[% END %]
208
[% END %]
220
209
221
	
210
	
222
[% IF ( add_form ) %]
211
[% IF ( add_form ) %]
223
<h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1>
212
<h1>[% IF ( modify ) %]Modify notice[% ELSE %]Add notice[% END %]</h1>
224
		<form action="?" name="Aform" method="post">
213
          <form name="Aform" method="post" enctype="multipart/form-data">
225
		<input type="hidden" name="op" id="op" value="add_validate" />
214
		<input type="hidden" name="op" id="op" value="add_validate" />
226
		<input type="hidden" name="checked" value="0" />
215
		<input type="hidden" name="checked" value="0" />
227
		[% IF ( modify ) %]
216
		[% IF ( modify ) %]
Lines 249-293 $(document).ready(function() { Link Here
249
				<label for="module">Koha module:</label>
238
				<label for="module">Koha module:</label>
250
				<input type="hidden" name="oldmodule" value="[% module %]" />
239
				<input type="hidden" name="oldmodule" value="[% module %]" />
251
		[% IF ( modify ) %]<select name="module" id="module">[% END %] [% IF ( adding ) %] <select name="module" id="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&amp;module='+this.value+'&amp;content='+window.document.forms['Aform'].elements['content'].value;">[% END %]
240
		[% IF ( modify ) %]<select name="module" id="module">[% END %] [% IF ( adding ) %] <select name="module" id="module" onchange="javascript:window.location.href = unescape(window.location.pathname)+'?op=add_form&amp;module='+this.value+'&amp;content='+window.document.forms['Aform'].elements['content'].value;">[% END %]
252
                                    [% IF ( catalogue ) %]
241
                                    [% IF ( module == "catalogue" ) %]
253
                                    <option value="catalogue" selected="selected">Catalog</option>
242
                                      <option value="catalogue" selected="selected">Catalog</option>
254
                                    [% ELSE %]
243
                                    [% ELSE %]
255
                                    <option value="catalogue" >Catalog</option>
244
                                      <option value="catalogue" >Catalog</option>
256
                                    [% END %]
245
                                    [% END %]
257
                                    [% IF ( circulation ) %]
246
                                    [% IF ( module == "circulation" ) %]
258
                                    <option value="circulation" selected="selected">Circulation</option>
247
                                      <option value="circulation" selected="selected">Circulation</option>
259
                                    [% ELSE %]
248
                                    [% ELSE %]
260
                                    <option value="circulation">Circulation</option>
249
                                      <option value="circulation">Circulation</option>
261
                                    [% END %]
250
                                    [% END %]
262
                                    [% IF ( claimacquisition ) %]
251
                                    [% IF ( module == "claimacquisition" ) %]
263
                                    <option value="claimacquisition" selected="selected">Claim acquisition</option>
252
                                      <option value="claimacquisition" selected="selected">Claim acquisition</option>
264
                                    [% ELSE %]
253
                                    [% ELSE %]
265
                                    <option value="claimacquisition">Claim acquisition</option>
254
                                      <option value="claimacquisition">Claim acquisition</option>
266
                                    [% END %]
255
                                    [% END %]
267
                                    [% IF ( claimissues ) %]
256
                                    [% IF ( module == "claimissues" ) %]
268
                                    <option value="claimissues" selected="selected">Claim serial issue</option>
257
                                      <option value="claimissues" selected="selected">Claim serial issue</option>
269
                                    [% ELSE %]
258
                                    [% ELSE %]
270
                                    <option value="claimissues">Claim serial issue</option>
259
                                      <option value="claimissues">Claim serial issue</option>
271
                                    [% END %]
260
                                    [% END %]
272
                                    [% IF ( reserves ) %]
261
                                    [% IF ( module == "reserves" ) %]
273
                                    <option value="reserves" selected="selected">Holds</option>
262
                                      <option value="reserves" selected="selected">Holds</option>
274
                                    [% ELSE %]
263
                                    [% ELSE %]
275
                                    <option value="reserves">Holds</option>
264
                                      <option value="reserves">Holds</option>
276
                                    [% END %]
265
                                    [% END %]
277
                                    [% IF ( members ) %]
266
                                    [% IF ( module == "members" ) %]
278
                                    <option value="members" selected="selected">Members</option>
267
                                      <option value="members" selected="selected">Members</option>
279
                                    [% ELSE %]
268
                                    [% ELSE %]
280
                                    <option value="members">Members</option>
269
                                      <option value="members">Members</option>
281
                                    [% END %]
270
                                    [% END %]
282
                                    [% IF ( serial ) %]
271
                                    [% IF ( module == "serial" ) %]
283
                                    <option value="serial" selected="selected">Serials (routing list)</option>
272
                                      <option value="serial" selected="selected">Serials (routing list)</option>
284
                                    [% ELSE %]
273
                                    [% ELSE %]
285
                                    <option value="serial">Serials (routing list)</option>
274
                                      <option value="serial">Serials (routing list)</option>
286
                                    [% END %]
275
                                    [% END %]
287
                                    [% IF ( suggestions ) %]
276
                                    [% IF ( module == "suggestions" ) %]
288
                                    <option value="suggestions" selected="selected">Suggestions</option>
277
                                      <option value="suggestions" selected="selected">Suggestions</option>
289
                                    [% ELSE %]
278
                                    [% ELSE %]
290
                                    <option value="suggestions">Suggestions</option>
279
                                      <option value="suggestions">Suggestions</option>
291
                                    [% END %]
280
                                    [% END %]
292
				</select>
281
				</select>
293
			</li>
282
			</li>
Lines 297-329 $(document).ready(function() { Link Here
297
		<li>
286
		<li>
298
			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="[% name %]" />
287
			<label for="name">Name:</label><input type="text" id="name" name="name" size="60" value="[% name %]" />
299
		</li>
288
		</li>
300
		<li>
301
            <label for="is_html">HTML message:</label>
302
      [% IF is_html %]
303
      <input type="checkbox" id="is_html" name="is_html" value="1" checked />
304
      [% ELSE %]
305
      <input type="checkbox" id="is_html" name="is_html" value="1" />
306
      [% END %]
307
		</li>
308
		<li>
309
            <label for="title">Message subject:</label><input type="text" id="title" name="title" size="60" value="[% title %]" />
310
		</li>
311
		<li>
312
            <label for="SQLfieldname">Message body:</label>
313
		</li>
314
		<li>
315
		<table>
316
		<tr><td><select name="SQLfieldname" id="SQLfieldname" size="9">
317
			[% FOREACH SQLfieldnam IN SQLfieldname %]
318
				<option value="[% SQLfieldnam.value %]">[% SQLfieldnam.text %]</option>
319
			[% END %]
320
		</select></td><td><input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery()" title="Insert" /></td><td><textarea name="content" cols="80" rows="15">[% content %]</textarea></td></tr></table>
321
289
322
		</li>
290
        [% FOREACH letter IN letters %]
323
		</ol>
291
          <li>
324
                [% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %]
292
            <fieldset class="rows mtt" id="[% letter.message_transport_type %]">
293
              <legend>[% letter.message_transport_type %]</legend>
294
              <ol>
295
                <li>
296
                  <input type="hidden" name="message_transport_type" value="[% letter.message_transport_type %]" />
297
                  <label for="is_html_[% letter.message_transport_type %]">HTML message:</label>
298
                  [% IF letter.is_html %]
299
                    <input type="checkbox" name="is_html_[% letter.message_transport_type %]" id="is_html_[% letter.message_transport_type %]" value="1" checked="checked" />
300
                  [% ELSE %]
301
                    <input type="checkbox" name="is_html_[% letter.message_transport_type %]" id="is_html_[% letter.message_transport_type %]" value="1" />
302
                  [% END %]
303
                </li>
304
                <li>
305
                  <label for="title">Message subject:</label><input type="text" id="title" name="title" size="60" value="[% letter.title %]" />
306
                </li>
307
                <li>
308
                  <label for="SQLfieldname">Message body: [% IF letter.message_transport_type == 'sms' %]<span id="sms_counter">[% letter.content.length %]/160</span>[% END %]</label>
309
                  <table>
310
                    <tr>
311
                      <td>
312
                        <select name="SQLfieldname" multiple="multiple" size="9">
313
                          [% FOREACH SQLfieldnam IN SQLfieldname %]
314
                            <option value="[% SQLfieldnam.value %]">[% SQLfieldnam.text %]</option>
315
                          [% END %]
316
                        </select>
317
                      </td>
318
                      <td><input type="button" name="insert" value="&gt;&gt;" onclick="insertValueQuery('[% letter.message_transport_type %]')" title="Insert" /></td>
319
                      <td><textarea name="content" id="content_[% letter.message_transport_type %]" cols="80" rows="15">[% letter.content %]</textarea></td>
320
                    </tr>
321
                  </table>
322
                </li>
323
              </ol>
324
            </fieldset>
325
          </li>
326
        [% END %]
327
        </ol>
328
329
        [% IF code.search('DGST') %] <span class="overdue">Warning, this is a template for a Digest, as such, any references to branch data ( e.g. branches.branchname ) will refer to the borrower's home branch.</span> [% END %]
325
		</fieldset>
330
		</fieldset>
326
		<fieldset class="action"><input type="button" value="Submit" onclick="Check(this.form)" class="button" /> <a class="cancel" href="/cgi-bin/koha/tools/letter.pl">Cancel</a></fieldset>
331
          <fieldset class="action"><input type="submit" id="submit" value="Submit" class="button" /> <a class="cancel" href="/cgi-bin/koha/tools/letter.pl">Cancel</a></fieldset>
327
      <input type="hidden" name="searchfield" value="[% searchfield %]" />
332
      <input type="hidden" name="searchfield" value="[% searchfield %]" />
328
		</form>
333
		</form>
329
[% END %]
334
[% END %]
Lines 358-363 $(document).ready(function() { Link Here
358
		<input type="hidden" name="branchcode" value="[% branchcode %]" />
363
		<input type="hidden" name="branchcode" value="[% branchcode %]" />
359
		<input type="hidden" name="code" value="[% code %]" />
364
		<input type="hidden" name="code" value="[% code %]" />
360
		<input type="hidden" name="module" value="[% module %]" />
365
		<input type="hidden" name="module" value="[% module %]" />
366
        <input type="hidden" name="message_transport_type" value="*" />
361
                <input type="submit" value="Yes, delete" class="approve" />
367
                <input type="submit" value="Yes, delete" class="approve" />
362
				</form>
368
				</form>
363
369
(-)a/t/db_dependent/Letters.t (-2 / +11 lines)
Lines 19-25 Link Here
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
21
22
use Test::More tests => 4;
22
use Test::More tests => 5;
23
23
24
use C4::Context;
24
use C4::Context;
25
use C4::Letters;
25
use C4::Letters;
Lines 31-37 my $dbh = C4::Context->dbh; Link Here
31
$dbh->{AutoCommit} = 0;
31
$dbh->{AutoCommit} = 0;
32
$dbh->{RaiseError} = 1;
32
$dbh->{RaiseError} = 1;
33
33
34
$dbh->do('DELETE FROM message_queue');
34
$dbh->do(q|DELETE FROM letter|);
35
$dbh->do(q|DELETE FROM message_queue|);
36
$dbh->do(q|DELETE FROM message_transport_types|);
35
37
36
my $borrowernumber = AddMember(
38
my $borrowernumber = AddMember(
37
    firstname    => 'Jane',
39
    firstname    => 'Jane',
Lines 40-45 my $borrowernumber = AddMember( Link Here
40
    branchcode   => 'CPL',
42
    branchcode   => 'CPL',
41
);
43
);
42
44
45
$dbh->do(q|
46
    INSERT INTO message_transport_types( message_transport_type ) VALUES ('email'), ('phone'), ('print'), ('sms')
47
|);
48
49
my $mtts = C4::Letters::GetMessageTransportTypes();
50
is_deeply( $mtts, ['email', 'phone', 'print', 'sms'], 'GetMessageTransportTypes returns all values' );
51
43
my $message_id = C4::Letters::EnqueueLetter({
52
my $message_id = C4::Letters::EnqueueLetter({
44
    borrowernumber         => $borrowernumber,
53
    borrowernumber         => $borrowernumber,
45
    message_transport_type => 'sms',
54
    message_transport_type => 'sms',
(-)a/tools/letter.pl (-56 / +108 lines)
Lines 47-60 use C4::Auth; Link Here
47
use C4::Context;
47
use C4::Context;
48
use C4::Output;
48
use C4::Output;
49
use C4::Branch; # GetBranches
49
use C4::Branch; # GetBranches
50
use C4::Letters;
50
use C4::Members::Attributes;
51
use C4::Members::Attributes;
51
52
52
# _letter_from_where($branchcode,$module, $code)
53
# _letter_from_where($branchcode,$module, $code, $mtt)
53
# - return FROM WHERE clause and bind args for a letter
54
# - return FROM WHERE clause and bind args for a letter
54
sub _letter_from_where {
55
sub _letter_from_where {
55
    my ($branchcode, $module, $code) = @_;
56
    my ($branchcode, $module, $code, $mtt) = @_;
56
    my $sql = q{FROM letter WHERE branchcode = ? AND module = ? AND code = ?};
57
    my $sql = q{FROM letter WHERE branchcode = ? AND module = ? AND code = ?};
57
    my @args = ($branchcode || '', $module, $code);
58
    $sql .= q{ AND message_transport_type = ?} if $mtt ne '*';
59
    my @args = ( $branchcode || '', $module, $code, ($mtt ne '*' ? $mtt : ()) );
58
# Mysql is retarded. cause branchcode is part of the primary key it cannot be null. How does that
60
# Mysql is retarded. cause branchcode is part of the primary key it cannot be null. How does that
59
# work with foreign key constraint I wonder...
61
# work with foreign key constraint I wonder...
60
62
Lines 68-79 sub _letter_from_where { Link Here
68
    return ($sql, \@args);
70
    return ($sql, \@args);
69
}
71
}
70
72
71
# letter_exists($branchcode,$module, $code)
73
# get_letters($branchcode,$module, $code, $mtt)
72
# - return true if a letter with the given $branchcode, $module and $code exists
74
# - return letters with the given $branchcode, $module, $code and $mtt exists
73
sub letter_exists {
75
sub get_letters {
74
    my ($sql, $args) = _letter_from_where(@_);
76
    my ($sql, $args) = _letter_from_where(@_);
75
    my $dbh = C4::Context->dbh;
77
    my $dbh = C4::Context->dbh;
76
    my $letter = $dbh->selectrow_hashref("SELECT * $sql", undef, @$args);
78
    my $letter = $dbh->selectall_hashref("SELECT * $sql", 'message_transport_type', undef, @$args);
77
    return $letter;
79
    return $letter;
78
}
80
}
79
81
Lines 90-96 my $searchfield = $input->param('searchfield'); Link Here
90
my $script_name = '/cgi-bin/koha/tools/letter.pl';
92
my $script_name = '/cgi-bin/koha/tools/letter.pl';
91
our $branchcode  = $input->param('branchcode');
93
our $branchcode  = $input->param('branchcode');
92
my $code        = $input->param('code');
94
my $code        = $input->param('code');
93
my $module      = $input->param('module');
95
my $module      = $input->param('module') || '';
94
my $content     = $input->param('content');
96
my $content     = $input->param('content');
95
my $op          = $input->param('op') || '';
97
my $op          = $input->param('op') || '';
96
my $dbh = C4::Context->dbh;
98
my $dbh = C4::Context->dbh;
Lines 135-141 elsif ( $op eq 'delete_confirm' ) { Link Here
135
    delete_confirm($branchcode, $module, $code);
137
    delete_confirm($branchcode, $module, $code);
136
}
138
}
137
elsif ( $op eq 'delete_confirmed' ) {
139
elsif ( $op eq 'delete_confirmed' ) {
138
    delete_confirmed($branchcode, $module, $code);
140
    my $mtt = $input->param('message_transport_type');
141
    delete_confirmed($branchcode, $module, $code, $mtt);
139
    $op = q{}; # next operation is to return to default screen
142
    $op = q{}; # next operation is to return to default screen
140
}
143
}
141
else {
144
else {
Lines 152-176 if ($op) { Link Here
152
output_html_with_http_headers $input, $cookie, $template->output;
155
output_html_with_http_headers $input, $cookie, $template->output;
153
156
154
sub add_form {
157
sub add_form {
155
    my ($branchcode,$module, $code ) = @_;
158
    my ( $branchcode,$module, $code ) = @_;
156
159
157
    my $letter;
160
    my $letters;
158
    # if code has been passed we can identify letter and its an update action
161
    # if code has been passed we can identify letter and its an update action
159
    if ($code) {
162
    if ($code) {
160
        $letter = letter_exists($branchcode,$module, $code);
163
        $letters = get_letters($branchcode,$module, $code, '*');
161
    }
164
    }
162
    if ($letter) {
165
163
        $template->param( modify => 1 );
166
    my $message_transport_types = GetMessageTransportTypes();
164
        $template->param( code   => $letter->{code} );
167
    my @letter_loop;
168
    if ($letters) {
169
        my $first_flag = 1;
170
        for my $mtt ( @$message_transport_types ) {
171
            if ( $first_flag ) {
172
                $template->param(
173
                    modify     => 1,
174
                    code       => $code,
175
                    branchcode => $branchcode,
176
                    name       => $letters->{$mtt}{name},
177
                );
178
                $first_flag = 0;
179
            }
180
181
            push @letter_loop, {
182
                message_transport_type => $mtt,
183
                is_html    => $letters->{$mtt}{is_html},
184
                title      => $letters->{$mtt}{title},
185
                content    => $letters->{$mtt}{content},
186
            };
187
        }
165
    }
188
    }
166
    else { # initialize the new fields
189
    else { # initialize the new fields
167
        $letter = {
190
        for my $mtt ( @$message_transport_types ) {
191
            $mtt = $mtt->{message_transport_type};
192
            push @letter_loop, {
193
                message_transport_type => $mtt,
194
            }
195
        }
196
        $template->param(
168
            branchcode => $branchcode,
197
            branchcode => $branchcode,
169
            module     => $module,
198
            module     => $module,
170
        };
199
        );
171
        $template->param( adding => 1 );
200
        $template->param( adding => 1 );
172
    }
201
    }
173
202
203
    $template->param(
204
        letters => \@letter_loop,
205
    );
206
174
    my $field_selection;
207
    my $field_selection;
175
    push @{$field_selection}, add_fields('branches');
208
    push @{$field_selection}, add_fields('branches');
176
    if ($module eq 'reserves') {
209
    if ($module eq 'reserves') {
Lines 212-224 sub add_form { Link Here
212
    }
245
    }
213
246
214
    $template->param(
247
    $template->param(
215
        branchcode => $letter->{branchcode},
216
        name       => $letter->{name},
217
        is_html    => $letter->{is_html},
218
        title      => $letter->{title},
219
        content    => $letter->{content},
220
        module     => $module,
248
        module     => $module,
221
        $module    => 1,
222
        branchloop => _branchloop($branchcode),
249
        branchloop => _branchloop($branchcode),
223
        SQLfieldname => $field_selection,
250
        SQLfieldname => $field_selection,
224
    );
251
    );
Lines 233-254 sub add_validate { Link Here
233
    my $oldmodule     = $input->param('oldmodule');
260
    my $oldmodule     = $input->param('oldmodule');
234
    my $code          = $input->param('code');
261
    my $code          = $input->param('code');
235
    my $name          = $input->param('name');
262
    my $name          = $input->param('name');
236
    my $is_html       = $input->param('is_html');
263
    my @mtt           = $input->param('message_transport_type');
237
    my $title         = $input->param('title');
264
    my @title         = $input->param('title');
238
    my $content       = $input->param('content');
265
    my @content       = $input->param('content');
239
    if (letter_exists($oldbranchcode,$oldmodule, $code)) {
266
    for my $mtt ( @mtt ) {
240
        $dbh->do(
267
        my $is_html = $input->param("is_html_$mtt");
241
            q{UPDATE letter SET branchcode = ?, module = ?, name = ?, is_html = ?, title = ?, content = ? WHERE branchcode = ? AND module = ? AND code = ?},
268
        my $title   = shift @title;
242
            undef,
269
        my $content = shift @content;
243
            $branchcode, $module, $name, $is_html || 0, $title, $content,
270
        my $letter = get_letters($oldbranchcode,$oldmodule, $code, $mtt);
244
            $oldbranchcode, $oldmodule, $code
271
        unless ( $title and $content ) {
245
        );
272
            delete_confirmed( $oldbranchcode, $oldmodule, $code, $mtt );
246
    } else {
273
            next;
247
        $dbh->do(
274
        }
248
            q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
275
        if ( exists $letter->{$mtt} ) {
249
            undef,
276
            $dbh->do(
250
            $branchcode, $module, $code, $name, $is_html || 0, $title, $content
277
                q{
251
        );
278
                    UPDATE letter
279
                    SET branchcode = ?, module = ?, name = ?, is_html = ?, title = ?, content = ?
280
                    WHERE branchcode = ? AND module = ? AND code = ? AND message_transport_type = ?
281
                },
282
                undef,
283
                $branchcode, $module, $name, $is_html || 0, $title, $content,
284
                $oldbranchcode, $oldmodule, $code, $mtt
285
            );
286
        } else {
287
            $dbh->do(
288
                q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content,message_transport_type) VALUES (?,?,?,?,?,?,?,?)},
289
                undef,
290
                $branchcode, $module, $code, $name, $is_html || 0, $title, $content, $mtt
291
            );
292
        }
252
    }
293
    }
253
    # set up default display
294
    # set up default display
254
    default_display($branchcode);
295
    default_display($branchcode);
Lines 261-291 sub add_copy { Link Here
261
    my $module        = $input->param('module');
302
    my $module        = $input->param('module');
262
    my $code          = $input->param('code');
303
    my $code          = $input->param('code');
263
304
264
    return if letter_exists($branchcode,$module, $code);
305
    return if keys %{ get_letters($branchcode,$module, $code, '*') };
265
306
266
    my $old_letter = letter_exists($oldbranchcode,$module, $code);
307
    my $old_letters = get_letters($oldbranchcode,$module, $code, '*');
267
308
268
    $dbh->do(
309
    my $message_transport_types = GetMessageTransportTypes();
269
        q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content) VALUES (?,?,?,?,?,?,?)},
310
    for my $mtt ( @$message_transport_types ) {
270
        undef,
311
        next unless exists $old_letters->{$mtt};
271
        $branchcode, $module, $code, $old_letter->{name}, $old_letter->{is_html}, $old_letter->{title}, $old_letter->{content}
312
        my $old_letter = $old_letters->{$mtt};
272
    );
313
314
        $dbh->do(
315
            q{INSERT INTO letter (branchcode,module,code,name,is_html,title,content,message_transport_type) VALUES (?,?,?,?,?,?,?,?)},
316
            undef,
317
            $branchcode, $module, $code, $old_letter->{name}, $old_letter->{is_html}, $old_letter->{title}, $old_letter->{content}, $mtt
318
        );
319
    }
273
}
320
}
274
321
275
sub delete_confirm {
322
sub delete_confirm {
276
    my ($branchcode, $module, $code) = @_;
323
    my ($branchcode, $module, $code) = @_;
277
    my $dbh = C4::Context->dbh;
324
    my $dbh = C4::Context->dbh;
278
    my $letter = letter_exists($branchcode, $module, $code);
325
    my $letter = get_letters($branchcode, $module, $code, '*');
279
    $template->param( branchcode => $branchcode, branchname => GetBranchName($branchcode) );
326
    my @values = values %$letter;
280
    $template->param( code => $code );
327
    $template->param(
281
    $template->param( module => $module);
328
        branchcode => $branchcode,
282
    $template->param( name => $letter->{name});
329
        branchname => GetBranchName($branchcode),
330
        code => $code,
331
        module => $module,
332
        name => $values[0]->{name},
333
    );
283
    return;
334
    return;
284
}
335
}
285
336
286
sub delete_confirmed {
337
sub delete_confirmed {
287
    my ($branchcode, $module, $code) = @_;
338
    my ($branchcode, $module, $code, $mtt) = @_;
288
    my ($sql, $args) = _letter_from_where($branchcode, $module, $code);
339
    my ($sql, $args) = _letter_from_where($branchcode, $module, $code, $mtt);
289
    my $dbh    = C4::Context->dbh;
340
    my $dbh    = C4::Context->dbh;
290
    $dbh->do("DELETE $sql", undef, @$args);
341
    $dbh->do("DELETE $sql", undef, @$args);
291
    # setup default display for screen
342
    # setup default display for screen
Lines 302-308 sub retrieve_letters { Link Here
302
    my ($sql, @where, @args);
353
    my ($sql, @where, @args);
303
    $sql = "SELECT branchcode, module, code, name, branchname
354
    $sql = "SELECT branchcode, module, code, name, branchname
304
            FROM letter
355
            FROM letter
305
            LEFT OUTER JOIN branches USING (branchcode)";
356
            LEFT OUTER JOIN branches USING (branchcode)
357
    ";
306
    if ($searchstring && $searchstring=~m/(\S+)/) {
358
    if ($searchstring && $searchstring=~m/(\S+)/) {
307
        $searchstring = $1 . q{%};
359
        $searchstring = $1 . q{%};
308
        push @where, 'code LIKE ?';
360
        push @where, 'code LIKE ?';
Lines 318-325 sub retrieve_letters { Link Here
318
    }
370
    }
319
371
320
    $sql .= " WHERE ".join(" AND ", @where) if @where;
372
    $sql .= " WHERE ".join(" AND ", @where) if @where;
373
    $sql .= " GROUP BY branchcode,module,code";
321
    $sql .= " ORDER BY module, code, branchcode";
374
    $sql .= " ORDER BY module, code, branchcode";
322
#   use Data::Dumper; die Dumper($sql, \@args);
375
323
    return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
376
    return $dbh->selectall_arrayref($sql, { Slice => {} }, @args);
324
}
377
}
325
378
326
- 

Return to bug 9016