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

(-)a/C4/Form/MessagingPreferences.pm (-1 / +15 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 = Koha::Patrons->find($target_params->{borrowernumber});
145
    PREF: foreach my $option ( @$messaging_options ) {
146
    PREF: foreach my $option ( @$messaging_options ) {
146
        my $pref = Koha::Patron::Message::Preferences->find( { %{ $target_params }, message_attribute_id => $option->{'message_attribute_id'} } );
147
        my $pref = Koha::Patron::Message::Preferences->find( { %{ $target_params }, message_attribute_id => $option->{'message_attribute_id'} } );
147
        $option->{ $option->{'message_name'} } = 1;
148
        $option->{ $option->{'message_name'} } = 1;
Lines 154-162 sub set_form_values { Link Here
154
                selected   => $_ == $days_in_advance  }
155
                selected   => $_ == $days_in_advance  }
155
            } ( 0..MAX_DAYS_IN_ADVANCE );
156
            } ( 0..MAX_DAYS_IN_ADVANCE );
156
        }
157
        }
158
159
        if ($option->{'transport_email'} and !$patron->email) {
160
            $option->{'transports_email'} = 0;
161
            $option->{'transports_email_disabled'} = 1;
162
        }
163
        if ($option->{'transport_sms'} and !$patron->smsalertnumber) {
164
            $option->{'transports_sms'} = 0;
165
            $option->{'transports_sms_disabled'} = 1;
166
        }
167
157
        next unless $pref;
168
        next unless $pref;
158
        foreach my $transport ( keys %{$pref->message_transport_types} ) {
169
        foreach my $transport ( keys %{$pref->message_transport_types} ) {
159
            $option->{'transports_'.$transport} = 1;
170
            if (!$option->{'transports_'.$transport.'_disabled'}) {
171
                $option->{'transports_'.$transport.'_disabled'} = 0;
172
                $option->{'transports_'.$transport} = 1;
173
            }
160
        }
174
        }
161
        $option->{'digest'} = 1 if $pref->wants_digest;
175
        $option->{'digest'} = 1 if $pref->wants_digest;
162
    }
176
    }
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-5 / +22 lines)
Lines 1-6 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
<!-- snippet for form to set borrower and patron category messaging preferences -->
2
<!-- snippet for form to set borrower and patron category messaging preferences -->
3
3
<ol>
4
[% IF !patron.email %]
5
<li>
6
    <div class="alert alert-warning">
7
        <h4>Patron is missing email address</h4>
8
        <p>Because of this you will be unable to set them email messaging preferences. Please <a href="memberentry.pl?borrowernumber=[% patron.borrowernumber %]">modify patron</a> and set a primary email address.</p>
9
    </div>
10
</li>
11
[% END %]
12
[% IF SMSSendDriver and !SMSnumber %]
13
<li>
14
    <div class="alert alert-warning">
15
        <h4>Patron is missing SMS number</h4>
16
        <p>Because of this you will be unable to set them SMS messaging preferences. Please see the bottom of this page and set an SMS number.</p>
17
    </div>
18
</li>
19
[% END %]
20
</ol>
4
<input type="hidden" name="modify" value="yes" />
21
<input type="hidden" name="modify" value="yes" />
5
<input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
22
<input type="hidden" name="borrowernumber" value="[% borrowernumber | html %]" />
6
  <table>
23
  <table>
Lines 60-66 Link Here
60
                 value="sms" disabled="disabled" />
77
                 value="sms" disabled="disabled" />
61
              [% END %]
78
              [% END %]
62
          [% ELSE %]
79
          [% ELSE %]
63
              [% IF ( messaging_preference.transports_sms ) %]
80
              [% IF ( messaging_preference.transports_sms and !messaging_preference.transports_sms_disabled ) %]
64
                 <input type="checkbox"
81
                 <input type="checkbox"
65
                 id="sms[% messaging_preference.message_attribute_id | html %]"
82
                 id="sms[% messaging_preference.message_attribute_id | html %]"
66
                 name="[% messaging_preference.message_attribute_id | html %]"
83
                 name="[% messaging_preference.message_attribute_id | html %]"
Lines 69-75 Link Here
69
                 <input type="checkbox"
86
                 <input type="checkbox"
70
                 id="sms[% messaging_preference.message_attribute_id | html %]"
87
                 id="sms[% messaging_preference.message_attribute_id | html %]"
71
                 name="[% messaging_preference.message_attribute_id | html %]"
88
                 name="[% messaging_preference.message_attribute_id | html %]"
72
                 value="sms" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
89
                 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 %]
90
              [% END %]
74
          [% END %]
91
          [% END %]
75
          </td>
92
          </td>
Lines 127-133 Link Here
127
                   value="email" disabled="disabled" />
144
                   value="email" disabled="disabled" />
128
              [% END %]
145
              [% END %]
129
          [% ELSE %]
146
          [% ELSE %]
130
              [% IF ( messaging_preference.transports_email ) %]
147
              [% IF ( messaging_preference.transports_email and !messaging_preference.transports_email_disabled ) %]
131
            <input type="checkbox"
148
            <input type="checkbox"
132
                 id="email[% messaging_preference.message_attribute_id | html %]"
149
                 id="email[% messaging_preference.message_attribute_id | html %]"
133
                 name="[% messaging_preference.message_attribute_id | html %]"
150
                 name="[% messaging_preference.message_attribute_id | html %]"
Lines 136-142 Link Here
136
            <input type="checkbox"
153
            <input type="checkbox"
137
                 id="email[% messaging_preference.message_attribute_id | html %]"
154
                 id="email[% messaging_preference.message_attribute_id | html %]"
138
                 name="[% messaging_preference.message_attribute_id | html %]"
155
                 name="[% messaging_preference.message_attribute_id | html %]"
139
                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]" />
156
                 value="email" class="active_notify" data-attr-id="[% messaging_preference.message_attribute_id | html %]"[% IF messaging_preference.transports_email_disabled %] disabled="disabled"[% END %] />
140
              [% END %]
157
              [% END %]
141
          [% END %]
158
          [% END %]
142
      </td>
159
      </td>
(-)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>Your user account is missing email address</h4>
40
                                <p>Because of this you will be unable to receive email notifications. Please go to <a href="opac-memberentry.pl">your personal details</a> and set a primary email address.</p>
41
                            </div>
42
                        [% END %]
43
                        [% IF SMSSendDriver and !SMSnumber %]
44
                            <div class="alert alert-warning">
45
                                <h4>Your user account is missing SMS number</h4>
46
                                <p>Because of this you will be unable to receive SMS notifications. Please see the bottom of this page and set an 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 83-92 Link Here
83
                                            [% IF ( SMSSendDriver ) %]
95
                                            [% IF ( SMSSendDriver ) %]
84
                                                [% IF ( messaging_preference.transport_sms ) %]
96
                                                [% IF ( messaging_preference.transport_sms ) %]
85
                                                    <td>
97
                                                    <td>
86
                                                        [% IF ( messaging_preference.transports_sms ) %]
98
                                                        [% IF ( messaging_preference.transports_sms and !messaging_preference.transports_sms_disabled ) %]
87
                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
99
                                                        <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" checked="checked" />
88
                                                        [% ELSE %]
100
                                                        [% ELSE %]
89
                                                            <input type="checkbox" id="sms[% messaging_preference.message_attribute_id | html %]" name="[% messaging_preference.message_attribute_id | html %]" value="sms" />
101
                                                            <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 %] />
90
                                                        [% END %]
102
                                                        [% END %]
91
                                                    </td>
103
                                                    </td>
92
                                                [% ELSE %]
104
                                                [% ELSE %]
Lines 115-124 Link Here
115
127
116
                                            [% IF ( messaging_preference.transport_email ) %]
128
                                            [% IF ( messaging_preference.transport_email ) %]
117
                                                <td>
129
                                                <td>
118
                                                    [% IF ( messaging_preference.transports_email ) %]
130
                                                    [% IF ( messaging_preference.transports_email and !messaging_preference.transports_email_disabled ) %]
119
                                                        <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;" />
131
                                                        <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;" />
120
                                                    [% ELSE %]
132
                                                    [% ELSE %]
121
                                                        <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;" />
133
                                                        <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 %] />
122
                                                    [% END %]
134
                                                    [% END %]
123
                                                </td>
135
                                                </td>
124
                                            [% ELSE %]
136
                                            [% ELSE %]
125
- 

Return to bug 18595