@@ -, +, @@ checkouts on OPAC + Translatability fixes for OPAC Summary page - This patch will be easiest to test if you keep three tabs open - system preferences, a patron detail page, and OPAC summary page - Set some system preferences: - OPACFineNoRenewals = 2 - noissuescharge = 4 - OpacRenewalAllowed = Allow - Set up a patron with fines of $3 - Log in to the OPAC and verify the message from patch from Bug 15374, saying the user cannot renew books. Confirm link to accounts page works. - Set OpacRenewalAllowed = Don't allow - Refresh OPAC Summary and confirm the message disappears - Set OpacRenewalAllowed = Allow - Give the patron total fines of $5 (add $2) - Refresh OPAC Summary and verify message appears saying user is BLOCKED from checkouts. Confirm link to accounts page works - Set OpacRenewalAllowed = Don't allow - Refresh OPAC Summary and confirm message is still there - 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 | 33 +++++++++++++------- opac/opac-user.pl | 18 ++++++++--- 2 files changed, 36 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,6 +1,7 @@ [% USE Koha %] [% USE KohaDates %] [% USE Branches %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home @@ -33,7 +34,7 @@ [% FOREACH message IN patron_messages %]
  • [% message.message %]
    -    Written on [% message.message_date | $KohaDates %] by [% Branches.GetName(message.branchcode) %] + [% message.message_date | $KohaDates %] [% message.branchname %]
  • [% END %] @@ -90,16 +91,26 @@
    @@ -114,9 +125,9 @@ [% IF relatives %]
  • Relatives' checkouts
  • [% END %] [% IF ( overdues_count ) %]
  • Overdue ([% overdues_count %])
  • [% END %] [% IF ( OPACFinesTab ) %] - [% IF ( BORROWER_INFO.amountoverfive ) %]
  • Fines ([% BORROWER_INFO.amountoutstanding %])
  • [% END %] - [% IF ( BORROWER_INFO.amountoverzero ) %]
  • Fines ([% BORROWER_INFO.amountoutstanding %])
  • [% END %] - [% IF ( BORROWER_INFO.amountlessthanzero ) %]
  • Credits ([% BORROWER_INFO.amountoutstanding %])
  • [% END %] + [% IF ( BORROWER_INFO.amountoverfive ) %]
  • Fines ([% BORROWER_INFO.amountoutstanding | $Price %])
  • [% END %] + [% IF ( BORROWER_INFO.amountoverzero ) %]
  • Fines ([% BORROWER_INFO.amountoutstanding | $Price %])
  • [% END %] + [% IF ( BORROWER_INFO.amountlessthanzero ) %]
  • Credits ([% BORROWER_INFO.amountoutstanding | $Price %])
  • [% END %] [% END %] [% IF ( RESERVES.count ) %]
  • Holds ([% RESERVES.count %])
  • [% END %] @@ -299,7 +310,7 @@ You currently owe fines and charges amounting to: - [% BORROWER_INFO.amountoutstanding %] + [% BORROWER_INFO.amountoutstanding | $Price %] @@ -326,7 +337,7 @@ Amount - You have a credit of:[% BORROWER_INFO.amountoutstanding %] + You have a credit of:[% BORROWER_INFO.amountoutstanding | $Price %] --- a/opac/opac-user.pl +++ a/opac/opac-user.pl @@ -118,9 +118,18 @@ if ( C4::Context->preference('OpacRenewalAllowed') $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}, + ); +} + +my $checkoutsblockedamount = C4::Context->preference( 'noissuescharge' ); +$checkoutsblockedamount ||=0; +if ( C4::Context->preference( 'noissuescharge' ) && $borr->{amountoutstanding} > $checkoutsblockedamount ) { + $borr->{'flagged'} = 1; + $canrenew = 0; + $template->param( + checkouts_blocked_amount => sprintf ( '%.02f', $checkoutsblockedamount ), ); } @@ -129,7 +138,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') ) { --