From 55168c687bcf193044b7e84ed78aa332720e58ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 15 Dec 2015 00:11:01 +0100 Subject: [PATCH] Bug 15775 - User should know when they are blocked from checkouts on OPAC + Translatability fixes for OPAC Summary page EDIT: Fixing merge conflicts When a user has been blocked from checkouts in the staff client for having too many fines, they will now see a message about this in the OPAC To test: - 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 Translability tests: - 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 Sponsored-by: Catalyst IT --- .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 35 +++++++++++++------- opac/opac-user.pl | 18 +++++++--- 2 files changed, 37 insertions(+), 16 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index d45222e..3f83995 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/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 @@ -32,8 +33,8 @@ @@ -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 %] diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 0828739..c68f7fd 100755 --- a/opac/opac-user.pl +++ b/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') ) { -- 1.7.10.4