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

(-)a/circ/add_message.pl (-7 / +9 lines)
Lines 63-70 if ( $op eq 'cud-edit_message' && $message_id ) { Link Here
63
        )->store;
63
        )->store;
64
    }
64
    }
65
65
66
    if ( $message_type eq 'E' ) {
66
    if ( $message_type eq 'E' or $message_type eq 'SMS' ) {
67
        my $logged_in_patron = Koha::Patrons->find($loggedinuser);
67
        my $message_transport_type = $message_type eq 'SMS' ? 'sms' : 'email';
68
        my $logged_in_patron       = Koha::Patrons->find($loggedinuser);
68
        if ( !$logged_in_patron->has_permission( { borrowers => 'send_messages_to_borrowers' } ) ) {
69
        if ( !$logged_in_patron->has_permission( { borrowers => 'send_messages_to_borrowers' } ) ) {
69
            C4::Output::output_and_exit( $input, $cookie, $template, 'insufficient_permission' );
70
            C4::Output::output_and_exit( $input, $cookie, $template, 'insufficient_permission' );
70
        }
71
        }
Lines 78-87 if ( $op eq 'cud-edit_message' && $message_id ) { Link Here
78
79
79
        if ($letter_code) {
80
        if ($letter_code) {
80
            $letter = C4::Letters::GetPreparedLetter(
81
            $letter = C4::Letters::GetPreparedLetter(
81
                module      => 'add_message',
82
                module                 => 'add_message',
82
                letter_code => $letter_code,
83
                letter_code            => $letter_code,
83
                lang        => $patron->lang,
84
                lang                   => $patron->lang,
84
                tables      => {
85
                message_transport_type => $message_transport_type,
86
                tables                 => {
85
                    'borrowers' => $borrowernumber,
87
                    'borrowers' => $borrowernumber,
86
                    'branches'  => $branchcode,
88
                    'branches'  => $branchcode,
87
                },
89
                },
Lines 92-98 if ( $op eq 'cud-edit_message' && $message_id ) { Link Here
92
            {
94
            {
93
                letter                 => $letter,
95
                letter                 => $letter,
94
                borrowernumber         => $borrowernumber,
96
                borrowernumber         => $borrowernumber,
95
                message_transport_type => 'email',
97
                message_transport_type => $message_transport_type,
96
            }
98
            }
97
        ) or warn "can't enqueue letter";
99
        ) or warn "can't enqueue letter";
98
    }
100
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc (+3 lines)
Lines 188-193 Link Here
188
                                    <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
188
                                    <option value="B">OPAC - [% patron.firstname | html %] [% patron.surname | html %]</option>
189
                                    [% IF CAN_user_borrowers_send_messages_to_borrowers %]
189
                                    [% IF CAN_user_borrowers_send_messages_to_borrowers %]
190
                                        <option value="E">Email - email addresses of patron</option>
190
                                        <option value="E">Email - email addresses of patron</option>
191
                                        [% IF Koha.Preference("SMSSendDriver") %]
192
                                            <option value="SMS">SMS - sms number of patron</option>
193
                                        [% END %]
191
                                    [% END %]
194
                                    [% END %]
192
                                </select>
195
                                </select>
193
                            </li>
196
                            </li>
(-)a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js (-2 / +11 lines)
Lines 94-100 $(document).ready(function () { Link Here
94
    });
94
    });
95
95
96
    $("#message_type").on("change", function () {
96
    $("#message_type").on("change", function () {
97
        if ($(this).val() == "E") {
97
        if ($(this).val() == "E" || $(this).val() == "SMS") {
98
            $("label[for='borrower_message']").show();
98
            $("label[for='borrower_message']").show();
99
            $("#subject_form").show();
99
            $("#subject_form").show();
100
            $("label[for='select_patron_notice']").show();
100
            $("label[for='select_patron_notice']").show();
Lines 114-119 $(document).ready(function () { Link Here
114
            $("#borrower_message").prop("disabled", false);
114
            $("#borrower_message").prop("disabled", false);
115
            $("#select_patron_messages").val("");
115
            $("#select_patron_messages").val("");
116
        }
116
        }
117
        if ($(this).val() == "SMS") {
118
            $("#borrower_subject").val(__("SMS added by a librarian"));
119
            $("#subject_form").hide();
120
        } else {
121
            if (
122
                $("#borrower_subject").val() == __("SMS added by a librarian")
123
            ) {
124
                $("#borrower_subject").val("");
125
            }
126
        }
117
    });
127
    });
118
128
119
    $("#select_patron_notice").on("change", function () {
129
    $("#select_patron_notice").on("change", function () {
120
- 

Return to bug 40933