Attachment #45918 for bug #15374

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

Lines 1-5 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-10 / +18 lines)
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 32-38 Link Here
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 %]</strong><br>	35	<strong>[% bor_messages_loo.message %]</strong><br>
35	<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 90-105 Link Here
90	<div class="alert">	91	<div class="alert">
91	<ul>	92	<ul>
92	[% IF ( userdebarred ) %]	93	[% IF ( userdebarred ) %]
93	<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen[% IF ( BORROWER_INF.userdebarreddate ) %] until <span id="userdebarred_date">[% BORROWER_INF.userdebarreddate \| $KohaDates %]</span>[% END %][% IF ( BORROWER_INF.debarredcomment ) %] with the comment <span id="userdebarred_comment">"[% BORROWER_INF.debarredcomment %]"</span>[% END %]. Usually the reason for freezing an account is old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your account page</a> shows your account to be clear, please contact the library.</li>	94	<li id="userdebarred"><strong>Please note:</strong> Your account has been frozen.
		95	[% IF ( BORROWER_INF.debarredcomment ) %] Comment: <span id="userdebarred_comment">"[% BORROWER_INF.debarredcomment %]"</span>[% END %]
		96	[% IF ( BORROWER_INF.userdebarreddate ) %] End date: <span id="userdebarred_date">[% BORROWER_INF.userdebarreddate \| $KohaDates %]</span>[% END %]
		97	<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> <a href="/cgi-bin/koha/opac-account.pl">Go to your account page</a></li>
94	[% END %]	98	[% END %]
95	[% IF ( BORROWER_INF.gonenoaddress ) %]	99	[% IF ( BORROWER_INF.gonenoaddress ) %]
96	<li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date [% UNLESS ( BORROWER_INF.OPACPatronDetails ) %]<a href="/cgi-bin/koha/opac-userupdate.pl">contact information</a>[% ELSE %]contact information[% END %] on file. Please contact the library[% IF ( BORROWER_INF.OPACPatronDetails ) %] or use the <a href="/cgi-bin/koha/opac-userupdate.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>	100	<li id="gonenoaddress"><strong>Please note:</strong> According to our records, we don't have up-to-date contact information. Please contact the library.
		101	<a href="/cgi-bin/koha/opac-memberentry.pl">[% IF ( Koha.Preference('OPACPatronDetails') ) %]Update your contact information[% ELSE %]Go to your contact information[% END %]</a>
		102	[% IF ( Koha.Preference('OPACPatronDetails') ) %]<em>(Please note: there may be a delay in restoring your account if you submit online.)</em>[% END %]
		103	</li>
97	[% END %]	104	[% END %]
98	[% IF ( BORROWER_INF.lost ) %]	105	[% IF ( BORROWER_INF.lost ) %]
99	<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>	106	<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>
100	[% END %]	107	[% END %]
101	[% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]	108	[% IF ( renewal_blocked_fines ) && ( OpacRenewalAllowed ) %]
102	<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>	109	<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 %]
		110	<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>
103	[% END %]	111	[% END %]
104	</ul>	112	</ul>
105	</div>	113	</div>
Lines 113-121 Link Here
113	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>	121	<li><a href="#opac-user-checkouts">Checked out ([% issues_count %])</a></li>
114	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]	122	[% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count %])</a></li>[% END %]
115	[% IF ( OPACFinesTab ) %]	123	[% IF ( OPACFinesTab ) %]
116	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	124	[% IF ( BORROWER_INF.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding \| $Price %])</a></li>[% END %]
117	[% IF ( BORROWER_INF.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	125	[% IF ( BORROWER_INF.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% BORROWER_INF.amountoutstanding \| $Price %])</a></li>[% END %]
118	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding %])</a></li>[% END %]	126	[% IF ( BORROWER_INF.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% BORROWER_INF.amountoutstanding \| $Price %])</a></li>[% END %]
119	[% END %]	127	[% END %]
120	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]	128	[% IF ( waiting_count ) %][% IF ( BORROWER_INF.atdestination ) %]<li><a href="#opac-user-waiting">Waiting ([% waiting_count %])</a></li>[% END %][% END %]
121	[% 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 %]
Lines 299-305 Link Here
299	<tbody>	307	<tbody>
300	<tr>	308	<tr>
301	<td>You currently owe fines and charges amounting to:</td>	309	<td>You currently owe fines and charges amounting to:</td>
302	<td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>	310	<td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding \| $Price %]</a></td>
303	</tr>	311	</tr>
304	</tbody>	312	</tbody>
305	</table>	313	</table>
Lines 326-332 Link Here
326	<thead><tr><th colspan="2">Amount</th></tr></thead>	334	<thead><tr><th colspan="2">Amount</th></tr></thead>
327	<tbody>	335	<tbody>
328	<tr>	336	<tr>
329	<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding %]</a></td>	337	<td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% BORROWER_INF.amountoutstanding \| $Price %]</a></td>
330	</tr>	338	</tr>
331	</tbody>	339	</tbody>
332	</table>	340	</table>




    $borr->{'flagged'} = 1;
    $canrenew = 0;
    $template->param(
        renewal_blocked_fines => $no_renewal_amt,
        renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding},
    );
}


    $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
}

$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};

my @bordat;
$bordat[0] = $borr;

- 

Return to bug 15374

Lines 111-118 if ( C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstandi Link Here

(-)a/opac/opac-user.pl (-5 / +2 lines)
111	$borr->{'flagged'} = 1;	111	$borr->{'flagged'} = 1;
112	$canrenew = 0;	112	$canrenew = 0;
113	$template->param(	113	$template->param(
114	renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),	114	renewal_blocked_fines => $no_renewal_amt,
115	renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),	115	renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding},
116	);	116	);
117	}	117	}
118		118
Lines 121-128 if ( $borr->{'amountoutstanding'} < 0 ) { Link Here
121	$borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );	121	$borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} );
122	}	122	}
123		123
124	$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
125
126	my @bordat;	124	my @bordat;
127	$bordat[0] = $borr;	125	$bordat[0] = $borr;
128		126
129	-