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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-12 / +20 lines)
Lines 1-5 Link Here
1
[% USE Koha %]
1
[% USE Koha %]
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Price %]
3
4
4
[% INCLUDE 'doc-head-open.inc' %]
5
[% INCLUDE 'doc-head-open.inc' %]
5
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
6
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
Lines 31-38 Link Here
31
                                <ul>
32
                                <ul>
32
                                    [% FOREACH bor_messages_loo IN bor_messages_loop %]
33
                                    [% FOREACH bor_messages_loo IN bor_messages_loop %]
33
                                        <li>
34
                                        <li>
34
                                        <strong>[% bor_messages_loo.message.raw %]</strong><br>
35
                                        <strong>[% bor_messages_loo.message %]</strong><br>
35
                                        &nbsp;&nbsp;&nbsp;<i>Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %]</i>
36
                                        <i>[% bor_messages_loo.message_date | $KohaDates %] [% bor_messages_loo.branchname %]</i>
36
                                        </li>
37
                                        </li>
37
                                    [% END %]
38
                                    [% END %]
38
39
Lines 89-104 Link Here
89
                        <div class="alert">
90
                        <div class="alert">
90
                            <ul>
91
                            <ul>
91
                                [% IF ( userdebarred ) %]
92
                                [% IF ( userdebarred ) %]
92
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INFO.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %][% IF ( BORROWER_INFO.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment.raw %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-account.pl">your account page</a> shows your account to be clear, please contact the library.</li>
93
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
94
                                    [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
95
                                    [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
96
                                    <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> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
93
                                [% END %]
97
                                [% END %]
94
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
98
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
95
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS OPACPatronDetails %]<a href="/cgi-bin/koha/opac-memberentry.pl">contact information</a>[% ELSE %]contact information[% END %] on file.  Please contact the library[% IF OPACPatronDetails %] or use the <a href="/cgi-bin/koha/opac-memberentry.pl">online update form</a> to submit current information (<em>Please note:</em> there may be a delay in restoring your account if you submit online)[% END %].</li>
99
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.
100
                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
101
                                [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
102
                                    </li>
96
                                [% END %]
103
                                [% END %]
97
                                [% IF ( BORROWER_INFO.lost ) %]
104
                                [% IF ( BORROWER_INFO.lost ) %]
98
                                    <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. If this is an error, please contact the library.</li>
105
                                    <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li>
99
                                [% END %]
106
                                [% END %]
100
                                [% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
107
                                [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]
101
                                    <li id="renewal_blocked_fines"><strong>Please note: </strong> Since you have <a href="/cgi-bin/koha/opac-account.pl">[% IF renewal_blocked_fines != "0.00" %] more than <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines %]</span> in [% END %] fines</a>, you cannot renew your books online. Please pay your fines if you wish to renew your books.</li>
108
                                    <li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0  %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines | $Price %]</span>.[% ELSE %]You have fines.[% END %]
109
                                    <em>Please pay your fines if you wish to renew your books.</em> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
102
                                [% END %]
110
                                [% END %]
103
                            </ul>
111
                            </ul>
104
                        </div>
112
                        </div>
Lines 112-120 Link Here
112
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
120
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
113
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
121
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
114
                            [% IF ( OPACFinesTab ) %]
122
                            [% IF ( OPACFinesTab ) %]
115
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
123
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
116
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
124
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
117
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
125
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
118
                            [% END %]
126
                            [% END %]
119
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
127
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
120
                        </ul>
128
                        </ul>
Lines 297-303 Link Here
297
                                        <tbody>
305
                                        <tbody>
298
                                            <tr>
306
                                            <tr>
299
                                                <td>You currently owe fines and charges amounting to:</td>
307
                                                <td>You currently owe fines and charges amounting to:</td>
300
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding %]</a></td>
308
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding | $Price %]</a></td>
301
                                            </tr>
309
                                            </tr>
302
                                        </tbody>
310
                                        </tbody>
303
                                    </table>
311
                                    </table>
Lines 324-330 Link Here
324
                                        <thead><tr><th colspan="2">Amount</th></tr></thead>
332
                                        <thead><tr><th colspan="2">Amount</th></tr></thead>
325
                                        <tbody>
333
                                        <tbody>
326
                                            <tr>
334
                                            <tr>
327
                                                <td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding %]</a></td>
335
                                                <td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding | $Price %]</a></td>
328
                                            </tr>
336
                                            </tr>
329
                                        </tbody>
337
                                        </tbody>
330
                                    </table>
338
                                    </table>
(-)a/opac/opac-user.pl (-4 / +4 lines)
Lines 113-120 if ( C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstandi Link Here
113
    $borr->{'flagged'} = 1;
113
    $borr->{'flagged'} = 1;
114
    $canrenew = 0;
114
    $canrenew = 0;
115
    $template->param(
115
    $template->param(
116
        renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
116
        renewal_blocked_fines => $no_renewal_amt,
117
        renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),
117
        renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding},
118
    );
118
    );
119
}
119
}
120
120
Lines 123-129 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
123
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
123
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
124
}
124
}
125
125
126
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
126
my @bordat;
127
$bordat[0] = $borr;
127
128
128
# Warningdate is the date that the warning starts appearing
129
# Warningdate is the date that the warning starts appearing
129
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
130
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
130
- 

Return to bug 15374