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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-9 / +16 lines)
Lines 2-7 Link Here
2
[% USE KohaDates %]
2
[% USE KohaDates %]
3
[% USE Branches %]
3
[% USE Branches %]
4
[% USE ItemTypes %]
4
[% USE ItemTypes %]
5
[% USE Price %]
5
6
6
[% INCLUDE 'doc-head-open.inc' %]
7
[% INCLUDE 'doc-head-open.inc' %]
7
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
8
<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog &rsaquo; Your library home</title>
Lines 91-106 Link Here
91
                        <div class="alert">
92
                        <div class="alert">
92
                            <ul>
93
                            <ul>
93
                                [% IF ( userdebarred ) %]
94
                                [% IF ( userdebarred ) %]
94
                                    <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 %]"</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>
95
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
96
                                    [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
97
                                    [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
98
                                    <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>
95
                                [% END %]
99
                                [% END %]
96
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
100
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
97
                                    <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>
101
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.
102
                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
103
                                [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
104
                                    </li>
98
                                [% END %]
105
                                [% END %]
99
                                [% IF ( BORROWER_INFO.lost ) %]
106
                                [% IF ( BORROWER_INFO.lost ) %]
100
                                    <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>
107
                                    <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>
101
                                [% END %]
108
                                [% END %]
102
                                [% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
109
                                [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]
103
                                    <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>
110
                                    <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 %]
104
                                [% END %]
111
                                [% END %]
105
                            </ul>
112
                            </ul>
106
                        </div>
113
                        </div>
Lines 115-123 Link Here
115
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
122
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
116
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
123
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
117
                            [% IF ( OPACFinesTab ) %]
124
                            [% IF ( OPACFinesTab ) %]
118
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
125
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
119
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
126
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
120
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
127
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
121
                            [% END %]
128
                            [% END %]
122
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
129
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
123
                        </ul>
130
                        </ul>
Lines 300-306 Link Here
300
                                        <tbody>
307
                                        <tbody>
301
                                            <tr>
308
                                            <tr>
302
                                                <td>You currently owe fines and charges amounting to:</td>
309
                                                <td>You currently owe fines and charges amounting to:</td>
303
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding %]</a></td>
310
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding | $Price %]</a></td>
304
                                            </tr>
311
                                            </tr>
305
                                        </tbody>
312
                                        </tbody>
306
                                    </table>
313
                                    </table>
(-)a/opac/opac-user.pl (-6 / +2 lines)
Lines 118-126 if ( C4::Context->preference('OpacRenewalAllowed') Link Here
118
    $borr->{'flagged'} = 1;
118
    $borr->{'flagged'} = 1;
119
    $canrenew = 0;
119
    $canrenew = 0;
120
    $template->param(
120
    $template->param(
121
        renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
121
        renewal_blocked_fines => $no_renewal_amt,
122
        renewal_blocked_fines_amountoutstanding =>
122
        renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding},
123
          sprintf( '%.02f', $borr->{amountoutstanding} ),
124
    );
123
    );
125
}
124
}
126
125
Lines 129-136 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
129
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
128
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
130
}
129
}
131
130
132
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
133
134
# Warningdate is the date that the warning starts appearing
131
# Warningdate is the date that the warning starts appearing
135
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
132
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
136
    my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day );
133
    my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day );
137
- 

Return to bug 16621