@@ -, +, @@ - Apply patch - Log in to OPAC - with blocked /debarred user (with and without comment and date) - with user who has to much fines - with user who has his card marked as lost - with user with an account that is about to expire - with user with expired account - with user with uncertain address information - with user who has got a circulation message (from checkout page) - with user who has a OPAC note - Verify that information is correct and displays nicely and that links in messages work - Carefully examine code - Search for regressions --- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 32 ++++++++++++-------- opac/opac-user.pl | 7 +++-- 2 files changed, 24 insertions(+), 15 deletions(-) --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -1,5 +1,6 @@ [% USE Koha %] [% USE KohaDates %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home @@ -32,7 +33,7 @@ [% FOREACH bor_messages_loo IN bor_messages_loop %]
  • [% bor_messages_loo.message %]
    -    Written on [% bor_messages_loo.message_date | $KohaDates %] by [% bor_messages_loo.branchname %] + [% bor_messages_loo.message_date | $KohaDates %] [% bor_messages_loo.branchname %]
  • [% END %] @@ -89,16 +90,23 @@
    @@ -113,9 +121,9 @@ [% IF relatives %]
  • Relatives' checkouts
  • [% END %] [% IF ( overdues_count ) %]
  • Overdue ([% overdues_count %])
  • [% END %] [% IF ( OPACFinesTab ) %] - [% IF ( BORROWER_INF.amountoverfive ) %]
  • Fines ([% BORROWER_INF.amountoutstanding %])
  • [% END %] - [% IF ( BORROWER_INF.amountoverzero ) %]
  • Fines ([% BORROWER_INF.amountoutstanding %])
  • [% END %] - [% IF ( BORROWER_INF.amountlessthanzero ) %]
  • Credits ([% BORROWER_INF.amountoutstanding %])
  • [% END %] + [% IF ( BORROWER_INF.amountoverfive ) %]
  • Fines ([% BORROWER_INF.amountoutstanding | $Price %])
  • [% END %] + [% IF ( BORROWER_INF.amountoverzero ) %]
  • Fines ([% BORROWER_INF.amountoutstanding | $Price %])
  • [% END %] + [% IF ( BORROWER_INF.amountlessthanzero ) %]
  • Credits ([% BORROWER_INF.amountoutstanding | $Price %])
  • [% END %] [% END %] [% IF ( RESERVES.count ) %]
  • Holds ([% RESERVES.count %])
  • [% END %] @@ -298,7 +306,7 @@ You currently owe fines and charges amounting to: - [% BORROWER_INFO.amountoutstanding %] + [% BORROWER_INF.amountoutstanding | $Price %] @@ -325,7 +333,7 @@ Amount - You have a credit of:[% BORROWER_INFO.amountoutstanding %] + You have a credit of:[% BORROWER_INF.amountoutstanding | $Price %] --- a/opac/opac-user.pl +++ a/opac/opac-user.pl @@ -113,8 +113,8 @@ if ( C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstandi $borr->{'flagged'} = 1; $canrenew = 0; $template->param( - renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ), - renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ), + renewal_blocked_fines => $no_renewal_amt, + renewal_blocked_fines_amountoutstanding => $borr->{amountoutstanding}, ); } @@ -123,7 +123,8 @@ if ( $borr->{'amountoutstanding'} < 0 ) { $borr->{'amountoutstanding'} = -1 * ( $borr->{'amountoutstanding'} ); } -$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'}; +my @bordat; +$bordat[0] = $borr; # Warningdate is the date that the warning starts appearing if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) { --