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

(-)a/C4/Form/MessagingPreferences.pm (-1 / +19 lines)
Lines 142-147 sub set_form_values { Link Here
142
    my ($target_params, $template) = @_;
142
    my ($target_params, $template) = @_;
143
    # walk through the options and update them with these borrower_preferences
143
    # walk through the options and update them with these borrower_preferences
144
    my $messaging_options = Koha::Patron::Message::Preferences->get_options;
144
    my $messaging_options = Koha::Patron::Message::Preferences->get_options;
145
    my $patron;
146
    if ($target_params->{borrowernumber}) {
147
        $patron = Koha::Patrons->find($target_params->{borrowernumber});
148
    }
149
145
    PREF: foreach my $option ( @$messaging_options ) {
150
    PREF: foreach my $option ( @$messaging_options ) {
146
        my $pref = Koha::Patron::Message::Preferences->find( { %{ $target_params }, message_attribute_id => $option->{'message_attribute_id'} } );
151
        my $pref = Koha::Patron::Message::Preferences->find( { %{ $target_params }, message_attribute_id => $option->{'message_attribute_id'} } );
147
        $option->{ $option->{'message_name'} } = 1;
152
        $option->{ $option->{'message_name'} } = 1;
Lines 154-162 sub set_form_values { Link Here
154
                selected   => $_ == $days_in_advance  }
159
                selected   => $_ == $days_in_advance  }
155
            } ( 0..MAX_DAYS_IN_ADVANCE );
160
            } ( 0..MAX_DAYS_IN_ADVANCE );
156
        }
161
        }
162
163
        if ($patron && $option->{'transport_email'} and !$patron->email) {
164
            $option->{'transports_email'} = 0;
165
            $option->{'transports_email_disabled'} = 1;
166
        }
167
        if ($patron && $option->{'transport_sms'} and !$patron->smsalertnumber) {
168
            $option->{'transports_sms'} = 0;
169
            $option->{'transports_sms_disabled'} = 1;
170
        }
171
157
        next unless $pref;
172
        next unless $pref;
158
        foreach my $transport ( keys %{$pref->message_transport_types} ) {
173
        foreach my $transport ( keys %{$pref->message_transport_types} ) {
159
            $option->{'transports_'.$transport} = 1;
174
            if (!$option->{'transports_'.$transport.'_disabled'}) {
175
                $option->{'transports_'.$transport.'_disabled'} = 0;
176
                $option->{'transports_'.$transport} = 1;
177
            }
160
        }
178
        }
161
        $option->{'digest'} = 1 if $pref->wants_digest;
179
        $option->{'digest'} = 1 if $pref->wants_digest;
162
    }
180
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-4 / +4 lines)
Lines 60-66 Link Here
60
                 value="sms" disabled="disabled" />
60
                 value="sms" disabled="disabled" />
61
              [% END %]
61
              [% END %]
62
          [% ELSE %]
62
          [% ELSE %]
63
              [% IF ( messaging_preference.transports_sms ) %]
63
              [% IF ( messaging_preference.transports_sms and !messaging_preference.transports_sms_disabled ) %]
64
                 <input type="checkbox"
64
                 <input type="checkbox"
65
                 id="sms[% messaging_preference.message_attribute_id | html %]"
65
                 id="sms[% messaging_preference.message_attribute_id | html %]"
66
                 name="[% messaging_preference.message_attribute_id | html %]"
66
                 name="[% messaging_preference.message_attribute_id | html %]"
Lines 69-75 Link Here
69
                 <input type="checkbox"
69
                 <input type="checkbox"
70
                 id="sms[% messaging_preference.message_attribute_id | html %]"
70
                 id="sms[% messaging_preference.message_attribute_id | html %]"
71
                 name="[% messaging_preference.message_attribute_id | html %]"
71
                 name="[% messaging_preference.message_attribute_id | html %]"
72
                 value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
72
                 value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]"[% IF messaging_preference.transports_sms_disabled %] disabled="disabled"[% END %] />
73
              [% END %]
73
              [% END %]
74
          [% END %]
74
          [% END %]
75
          </td>
75
          </td>
Lines 159-165 Link Here
159
                   value="email" disabled="disabled" />
159
                   value="email" disabled="disabled" />
160
              [% END %]
160
              [% END %]
161
          [% ELSE %]
161
          [% ELSE %]
162
              [% IF ( messaging_preference.transports_email ) %]
162
              [% IF ( messaging_preference.transports_email and !messaging_preference.transports_email_disabled ) %]
163
            <input type="checkbox"
163
            <input type="checkbox"
164
                 id="email[% messaging_preference.message_attribute_id | html %]"
164
                 id="email[% messaging_preference.message_attribute_id | html %]"
165
                 name="[% messaging_preference.message_attribute_id | html %]"
165
                 name="[% messaging_preference.message_attribute_id | html %]"
Lines 168-174 Link Here
168
            <input type="checkbox"
168
            <input type="checkbox"
169
                 id="email[% messaging_preference.message_attribute_id | html %]"
169
                 id="email[% messaging_preference.message_attribute_id | html %]"
170
                 name="[% messaging_preference.message_attribute_id | html %]"
170
                 name="[% messaging_preference.message_attribute_id | html %]"
171
                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
171
                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]"[% IF messaging_preference.transports_email_disabled %] disabled="disabled"[% END %] />
172
              [% END %]
172
              [% END %]
173
          [% END %]
173
          [% END %]
174
      </td>
174
      </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (+12 lines)
Lines 1410-1415 legend:hover { Link Here
1410
                                        <div id="messaging_prefs_loading" class="form-message" style="display:none">
1410
                                        <div id="messaging_prefs_loading" class="form-message" style="display:none">
1411
                                            <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults
1411
                                            <img src="[% interface | html %]/[% theme | html %]/img/spinner-small.gif" alt="" /> Loading new messaging defaults
1412
                                        </div>
1412
                                        </div>
1413
                                        [% IF patron && !patron.email %]
1414
                                            <div class="dialog message">
1415
                                                <h4>Patron is missing email address</h4>
1416
                                                <p>Because of this you will be unable to select email messaging preferences. Please <a href="memberentry.pl?borrowernumber=[% patron.borrowernumber %]">modify patron</a> and set primary email address.</p>
1417
                                            </div>
1418
                                        [% END %]
1419
                                        [% IF patron && SMSSendDriver and !SMSnumber %]
1420
                                            <div class="dialog message">
1421
                                                <h4>Patron is missing SMS number</h4>
1422
                                                <p>Because of this you will be unable to select SMS messaging preferences. Please provide patron's SMS number first.</p>
1423
                                            </div>
1424
                                        [% END %]
1413
                                        <input type="hidden" name="setting_messaging_prefs" value="1" />
1425
                                        <input type="hidden" name="setting_messaging_prefs" value="1" />
1414
                                        [% INCLUDE 'messaging-preference-form.inc' %]
1426
                                        [% INCLUDE 'messaging-preference-form.inc' %]
1415
                                        [% IF ( SMSSendDriver ) %]
1427
                                        [% IF ( SMSSendDriver ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-5 / +16 lines)
Lines 34-39 Link Here
34
                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' )  %]
34
                [% IF Koha.Preference( 'EnhancedMessagingPreferencesOPAC' )  %]
35
                    <div id="usermessaging" class="maincontent">
35
                    <div id="usermessaging" class="maincontent">
36
                        <h3>Your messaging settings</h3>
36
                        <h3>Your messaging settings</h3>
37
                        [% IF !logged_in_user.email %]
38
                            <div class="alert alert-warning">
39
                                <h4>Cannot select email notifications</h4>
40
                                <p>Your email address is missing. We cannot send you emails before you provide your email address. Please go to <a href="opac-memberentry.pl">your personal details</a> to set primary email address.</p>
41
                            </div>
42
                        [% END %]
43
                        [% IF SMSSendDriver and !SMSnumber %]
44
                            <div class="alert alert-warning">
45
                                <h4>Cannot select SMS notifications</h4>
46
                                <p>Your SMS number is missing. We cannot send you SMS messages before you provide your SMS number. Please see the bottom of this page to set SMS number.</p>
47
                            </div>
48
                        [% END %]
37
                        [% IF ( settings_updated ) %]
49
                        [% IF ( settings_updated ) %]
38
                            <div class="alert alert-success"><h4>Settings updated</h4></div>
50
                            <div class="alert alert-success"><h4>Settings updated</h4></div>
39
                        [% END %]
51
                        [% END %]
Lines 84-93 Link Here
84
                                            [% IF ( SMSSendDriver ) %]
96
                                            [% IF ( SMSSendDriver ) %]
85
                                                [% IF ( messaging_preference.transport_sms ) %]
97
                                                [% IF ( messaging_preference.transport_sms ) %]
86
                                                    <td>
98
                                                    <td>
87
                                                        [% IF ( messaging_preference.transports_sms ) %]
99
                                                        [% IF ( messaging_preference.transports_sms and !messaging_preference.transports_sms_disabled ) %]
88
                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
100
                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
89
                                                        [% ELSE %]
101
                                                        [% ELSE %]
90
                                                            <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
102
                                                            <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms"[% IF messaging_preference.transports_sms_disabled %] disabled="disabled"[% END %] />
91
                                                        [% END %]
103
                                                        [% END %]
92
                                                    </td>
104
                                                    </td>
93
                                                [% ELSE %]
105
                                                [% ELSE %]
Lines 135-144 Link Here
135
147
136
                                            [% IF ( messaging_preference.transport_email ) %]
148
                                            [% IF ( messaging_preference.transport_email ) %]
137
                                                <td>
149
                                                <td>
138
                                                    [% IF ( messaging_preference.transports_email ) %]
150
                                                    [% IF ( messaging_preference.transports_email and !messaging_preference.transports_email_disabled ) %]
139
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
151
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" checked="checked" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
140
                                                    [% ELSE %]
152
                                                    [% ELSE %]
141
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;" />
153
                                                        <input type="checkbox" id="email[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="email" onclick = "document.opacmessaging.none[% messaging_preference.message_attribute_id | html %].checked=false;"[% IF messaging_preference.transports_email_disabled %] disabled="disabled"[% END %] />
142
                                                    [% END %]
154
                                                    [% END %]
143
                                                </td>
155
                                                </td>
144
                                            [% ELSE %]
156
                                            [% ELSE %]
145
- 

Return to bug 18595