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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-25 / +21 lines)
Lines 92-123 Link Here
92
92
93
        [% IF ( userdebarred ) %]
93
        [% IF ( userdebarred ) %]
94
            <li class="userdebarred blocker">
94
            <li class="userdebarred blocker">
95
                <span class="circ-hlt"> Restricted since [% debarredsince | $KohaDates %]:</span> Patron's account is restricted
95
                <span class="circ-hlt">Account restricted since [% debarredsince | $KohaDates %]</span>
96
                [% IF ( userdebarreddate ) %]
96
                <ul>
97
                    until [% userdebarreddate | $KohaDates %]
97
                    [% FOREACH restriction IN patron.restrictions %]
98
                [% END %]
98
                        <li class="[% restriction.type.code | lower | html %]_restriction">
99
99
                            <span class="restriction_expiration">
100
                [% IF ( debarredcomment ) %]
100
                                [% IF restriction.expiration %]
101
                    with the explanation: <br />
101
                                    <strong>Restriction expiring [% restriction.expiration | $KohaDates %]</strong>
102
                    <em>
102
                                [% ELSE %]
103
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
103
                                    <strong>Indefinite restriction</strong>
104
                            Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
104
                                [% END %]
105
                        [% ELSE %]
105
                            </span>
106
                            [% FOREACH restriction IN patron.restrictions %]
106
                            [% IF restriction.comment.search('OVERDUES_PROCESS') %]
107
                                <div class="[% restriction.type.code | lower | html %]_restriction">
107
                                Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
108
                                    <span class="restriction_expiration">
108
                            [% ELSE %]
109
                                        [% IF restriction.expiration %]
109
                                [% IF restriction.comment %]
110
                                            [% restriction.expiration | $KohaDates %]
110
                                    <span class="restriction_detail">[%- restriction.comment | html_line_break -%]</span>
111
                                        [% ELSE %]
111
                                [% END %]
112
                                            <strong>Indefinite</strong>
113
                                        [% END %]
114
                                    </span>
115
                                    <span class="restriction_detail"> [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%] </span>
116
                                </div>
117
                            [% END %]
112
                            [% END %]
118
                        [% END %] </em
113
                            <span class="restriction_type">([%- restriction.type.display_text | html -%])</span>
119
                    ><br />
114
                        </li>
120
                [% END %]
115
                    [% END %]
116
                </ul>
121
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="(new bootstrap.Tab($('#reldebarments-tab'))).show()"><i class="fa fa-ban"></i> View restrictions</a>
117
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="(new bootstrap.Tab($('#reldebarments-tab'))).show()"><i class="fa fa-ban"></i> View restrictions</a>
122
            </li>
118
            </li>
123
            <!-- /.blocker -->
119
            <!-- /.blocker -->
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/patron-restrictions.inc (+27 lines)
Line 0 Link Here
1
<li class="userdebarred blocker">
2
    <strong>Your account has been frozen</strong>
3
    <ul>
4
        [% FOREACH restriction IN logged_in_user.restrictions %]
5
            <li class="[% restriction.type.code | lower | html %]_restriction">
6
                <span class="restriction_expiration">
7
                    [% IF restriction.expiration %]
8
                        <strong>Restriction expiring [% restriction.expiration | $KohaDates %]</strong>
9
                    [% ELSE %]
10
                        <strong>Indefinite restriction</strong>
11
                    [% END %]
12
                </span>
13
                [% IF restriction.comment.search('OVERDUES_PROCESS') %]
14
                    <span class="restriction_detail">Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]</span>
15
                [% ELSE %]
16
                    [% IF restriction.comment %]
17
                        <span class="restriction_detail">[%- restriction.comment | html_line_break -%]</span>
18
                    [% END %]
19
                [% END %]
20
            </li>
21
        [% END %]
22
        <li>
23
            <span>Usually the reason for freezing an account is old overdues or damage fees. If it appears that your account is clear, please contact the library.</span>
24
            <a href="/cgi-bin/koha/opac-account.pl">Check your charges page.</a> <a href="/cgi-bin/koha/opac-user.pl?opac-user-overdues=1">Check your overdues.</a>
25
        </li>
26
    </ul>
27
</li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt (-40 / +6 lines)
Lines 30-37 Link Here
30
        <div id="holds" class="maincontent">
30
        <div id="holds" class="maincontent">
31
            <h1>Placing a hold</h1>
31
            <h1>Placing a hold</h1>
32
            [% IF ( message ) %]
32
            [% IF ( message ) %]
33
                <div id="holdmessages" class="alert">
33
                <div id="holdmessages" class="alert alert-warning">
34
                    <p>Sorry, you cannot place holds.</p>
34
                    <h2>Sorry, you cannot place holds.</h2>
35
                    <ul>
35
                    <ul>
36
                        [% IF ( GNA ) %]
36
                        [% IF ( GNA ) %]
37
                            <li id="gna">
37
                            <li id="gna">
Lines 49-89 Link Here
49
                        [% END %]
49
                        [% END %]
50
50
51
                        [% IF ( debarred ) %]
51
                        [% IF ( debarred ) %]
52
                            <li id="debarred">
52
                            [% INCLUDE "patron-restrictions.inc" %]
53
                                Your account has been frozen.
54
                                [% IF debarred_comment %]
55
                                    Comment:<br />
56
                                    <span id="userdebarred_comment">
57
                                        <strong>
58
                                            [% IF debarred_comment.search('OVERDUES_PROCESS') %]
59
                                                Restriction added by overdues process [% debarred_comment.remove('OVERDUES_PROCESS ') | html_line_break %]
60
                                            [% ELSE %]
61
                                                [% FOR restriction IN logged_in_user.restrictions %]
62
                                                    <div class="patron_restriction">
63
                                                        [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]
64
                                                            : <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>, frozen until:
65
                                                            <span class="restriction_expiration">
66
                                                                [%- IF restriction.expiration -%]
67
                                                                    [%- restriction.expiration | $KohaDates -%]
68
                                                                [%- ELSE -%]
69
                                                                    <strong>Indefinite</strong>
70
                                                                [%- END -%]
71
                                                            </span>
72
                                                        [% END %]
73
                                                    </div>
74
                                                [% END %]
75
                                            [% END %]
76
                                        </strong>
77
                                    </span>
78
                                [% END %]
79
80
                                [% IF debarred_date && debarred_date != '9999-12-31' %]
81
                                    End date:
82
                                    <span id="userdebarred_date">[% debarred_date | $KohaDates %]</span>
83
                                [% END %]
84
                                <br /><em>Usually the reason for freezing an account is old overdues or damage fees. If shows your account to be clear, please contact the library.</em>
85
                                <a href="/cgi-bin/koha/opac-account.pl">Go to your charges page</a>
86
                            </li>
87
                        [% END %]
53
                        [% END %]
88
54
89
                        [% IF ( too_much_oweing ) %]
55
                        [% IF ( too_much_oweing ) %]
Lines 273-281 Link Here
273
                                                                [% END %]
239
                                                                [% END %]
274
                                                            </select>
240
                                                            </select>
275
                                                            [% IF at_least_one_library_not_available_for_pickup %]
241
                                                            [% IF at_least_one_library_not_available_for_pickup %]
276
                                                                <div class="at_least_one_library_not_available_note"
242
                                                                <div class="at_least_one_library_not_available_note">
277
                                                                    >Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items</div
243
                                                                    Note: Library policy does not allow hold/pickup of an item available locally. Please come to the library to retrieve these items
278
                                                                >
244
                                                                </div>
279
                                                            [% END %]
245
                                                            [% END %]
280
                                                        [% END # / UNLESS bibitemloo.holdable %]
246
                                                        [% END # / UNLESS bibitemloo.holdable %]
281
                                                    </li>
247
                                                    </li>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-32 / +4 lines)
Lines 167-202 Link Here
167
                                    [% IF ( discharge_available ) %]
167
                                    [% IF ( discharge_available ) %]
168
                                        <li id="discharged"> <strong>Please note:</strong> Your account is frozen because it has been discharged. <a href="/cgi-bin/koha/opac-discharge.pl?op=get">Get your discharge</a> </li>
168
                                        <li id="discharged"> <strong>Please note:</strong> Your account is frozen because it has been discharged. <a href="/cgi-bin/koha/opac-discharge.pl?op=get">Get your discharge</a> </li>
169
                                    [% ELSE %]
169
                                    [% ELSE %]
170
                                        <li id="userdebarred">
170
                                        [% INCLUDE "patron-restrictions.inc" %]
171
                                            <strong>Please note:</strong> Your account has been frozen.
172
                                            [% IF ( borrower.debarredcomment ) %]
173
                                                Comment:<br />
174
                                                <ul id="userdebarred_comment">
175
                                                    [% FOREACH restriction IN logged_in_user.restrictions %]
176
                                                        <li class="patron_restriction">
177
                                                            <strong>[%- restriction.type.display_text | html -%]: </strong>
178
                                                            [% IF restriction.comment.search('OVERDUES_PROCESS') %]
179
                                                                Restriction added by overdues process [% restriction.comment.remove('OVERDUES_PROCESS ') | html_line_break %]
180
                                                            [% ELSE %]
181
                                                                [%- IF restriction.comment -%]
182
                                                                    <span class="restriction_comment">[% restriction.comment | html_line_break %]</span>.
183
                                                                [%- END -%]
184
                                                            [% END %]
185
                                                            [%- IF restriction.expiration -%]
186
                                                                Account frozen until <span class="restriction_expiration">[%- restriction.expiration | $KohaDates -%]</span>
187
                                                            [%- ELSE -%]
188
                                                                <strong>Account frozen indefinitely</strong>
189
                                                            [%- END -%]
190
                                                        </li>
191
                                                    [% END %]
192
                                                </ul>
193
                                            [% END %]
194
195
                                            <p
196
                                                ><em>Usually the reason for freezing an account is old overdues or damage fees. If your account shows to be clear, please contact the library.</em>
197
                                                <a href="/cgi-bin/koha/opac-account.pl">Go to your charges page</a></p
198
                                            >
199
                                        </li>
200
                                    [% END %]
171
                                    [% END %]
201
                                [% END %]
172
                                [% END %]
202
                                [% IF ( borrower.gonenoaddress ) %]
173
                                [% IF ( borrower.gonenoaddress ) %]
Lines 1094-1101 Link Here
1094
        $(document).ready(function(){
1065
        $(document).ready(function(){
1095
            [% IF ( opac_user_holds ) %]
1066
            [% IF ( opac_user_holds ) %]
1096
                $("#opac-user-views a[href='#opac-user-holds_panel']").tab("show");
1067
                $("#opac-user-views a[href='#opac-user-holds_panel']").tab("show");
1097
            [% END %]
1068
            [% ELSIF ( opac_user_overdues ) %]
1098
            [% IF ( opac_user_article_requests ) %]
1069
                $("#opac-user-views a[href='#opac-user-overdues_panel']").tab("show");
1070
            [% ELSIF ( opac_user_article_requests ) %]
1099
                $("#opac-user-views a[href='#opac-user-article-requests_panel']").tab("show");
1071
                $("#opac-user-views a[href='#opac-user-article-requests_panel']").tab("show");
1100
            [% END %]
1072
            [% END %]
1101
            $('#article-requests-table caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests.size | html %]'));
1073
            $('#article-requests-table caption .count').html(AR_CAPTION_COUNT.format('[% current_article_requests.size | html %]'));
(-)a/opac/opac-user.pl (-1 / +1 lines)
Lines 430-435 $template->param( Link Here
430
    OpacHoldNotes              => C4::Context->preference('OpacHoldNotes'),
430
    OpacHoldNotes              => C4::Context->preference('OpacHoldNotes'),
431
    failed_holds               => scalar $query->param('failed_holds'),
431
    failed_holds               => scalar $query->param('failed_holds'),
432
    opac_user_holds            => scalar $query->param('opac-user-holds')            || 0,
432
    opac_user_holds            => scalar $query->param('opac-user-holds')            || 0,
433
    opac_user_overdues         => scalar $query->param('opac-user-overdues')         || 0,
433
    opac_user_article_requests => scalar $query->param('opac-user-article-requests') || 0,
434
    opac_user_article_requests => scalar $query->param('opac-user-article-requests') || 0,
434
);
435
);
435
436
436
- 

Return to bug 39498