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

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-18 / +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 103-127 Using this account is not recommended because some parts of Koha will not functi Link Here
103
                        <div class="alert">
104
                        <div class="alert">
104
                            <ul>
105
                            <ul>
105
                                [% IF ( userdebarred ) %]
106
                                [% IF ( userdebarred ) %]
106
                                    <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 %]
107
                                    <li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
107
                                    [% IF ( BORROWER_INFO.debarredcomment ) %] with the comment
108
                                    [% IF ( BORROWER_INFO.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INFO.debarredcomment %]"</span>[% END %]
108
                                    <span id="userdebarred_comment">
109
                                    [% IF ( BORROWER_INFO.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INFO.userdebarreddate | $KohaDates %]</span>[% END %]
109
                                        [% IF BORROWER_INFO.debarredcomment.search('OVERDUES_PROCESS') %]
110
                                    <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>
110
                                            "Restriction added by overdues process [% BORROWER_INFO.debarredcomment.remove('OVERDUES_PROCESS ') %]"
111
                                        [% ELSE %]
112
                                            [% BORROWER_INFO.debarredcomment %]
113
                                        [% END %]
114
                                    </span>
115
                                    [% 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>
116
                                [% END %]
111
                                [% END %]
117
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
112
                                [% IF ( BORROWER_INFO.gonenoaddress ) %]
118
                                    <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>
113
                                    <li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.
114
                                <a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
115
                                [% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
116
                                    </li>
119
                                [% END %]
117
                                [% END %]
120
                                [% IF ( BORROWER_INFO.lost ) %]
118
                                [% IF ( BORROWER_INFO.lost ) %]
121
                                    <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>
119
                                    <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>
122
                                [% END %]
120
                                [% END %]
123
                                [% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
121
                                [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %]
124
                                    <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>
122
                                    <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 %]
125
                                [% END %]
123
                                [% END %]
126
                            </ul>
124
                            </ul>
127
                        </div>
125
                        </div>
Lines 136-144 Using this account is not recommended because some parts of Koha will not functi Link Here
136
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
134
                            [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %]
137
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
135
                            [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
138
                            [% IF ( OPACFinesTab ) %]
136
                            [% IF ( OPACFinesTab ) %]
139
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
137
                                [% IF ( BORROWER_INFO.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
140
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
138
                                [% IF ( BORROWER_INFO.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
141
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding %])</a></li>[% END %]
139
                                [% IF ( BORROWER_INFO.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INFO.amountoutstanding | $Price %])</a></li>[% END %]
142
                            [% END %]
140
                            [% END %]
143
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
141
                            [% IF ( RESERVES.count ) %]<li><a href="#opac-user-holds">Holds ([% RESERVES.count %])</a></li>[% END %]
144
                        </ul>
142
                        </ul>
Lines 321-327 Using this account is not recommended because some parts of Koha will not functi Link Here
321
                                        <tbody>
319
                                        <tbody>
322
                                            <tr>
320
                                            <tr>
323
                                                <td>You currently owe fines and charges amounting to:</td>
321
                                                <td>You currently owe fines and charges amounting to:</td>
324
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding %]</a></td>
322
                                                <td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INFO.amountoutstanding | $Price %]</a></td>
325
                                            </tr>
323
                                            </tr>
326
                                        </tbody>
324
                                        </tbody>
327
                                    </table>
325
                                    </table>
(-)a/opac/opac-user.pl (-6 / +2 lines)
Lines 122-130 if ( C4::Context->preference('OpacRenewalAllowed') Link Here
122
    $borr->{'flagged'} = 1;
122
    $borr->{'flagged'} = 1;
123
    $canrenew = 0;
123
    $canrenew = 0;
124
    $template->param(
124
    $template->param(
125
        renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
125
        renewal_blocked_fines => $no_renewal_amt,
126
        renewal_blocked_fines_amountoutstanding =>
126
        renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding},
127
          sprintf( '%.02f', $borr->{amountoutstanding} ),
128
    );
127
    );
129
}
128
}
130
129
Lines 133-140 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
133
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
132
    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
134
}
133
}
135
134
136
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
137
138
# Warningdate is the date that the warning starts appearing
135
# Warningdate is the date that the warning starts appearing
139
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
136
if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
140
    my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day );
137
    my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day );
141
- 

Return to bug 16621