From be7de017a0836827e8c626426068d75d85573b6e Mon Sep 17 00:00:00 2001 From: Jenny Way Date: Tue, 16 Jan 2018 22:05:39 +0000 Subject: [PATCH] Bug 19188: Self checkout missing currency symbol Test plan: 1. Under administration and system preferences, enable WebBasedSelfCheck 2. In OPAC give user fine by going to 'my account' at top right 3. Then under fines tab 'create manual invoice' 4. Make sure this amount is more than noissuescharge which can be changed under system preferences 5. Go to the web based self check from the OPAC URL 6. Log in as your user 7. Try to check out an item 7. Error 'Item cannot be checked out' should occur 8. With the patch, the currency symbol should show for the amount. Signed-off-by: Owen Leonard Signed-off-by: Marcel de Rooy Signed-off-by: Katrin Fischer Updated test plan. --- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 4 ++-- opac/sco/sco-main.pl | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index d25f0eb645..2d644a4c71 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -1,4 +1,4 @@ - [% USE raw %] +[% USE raw %] [% USE Asset %] [% USE Koha %] [% USE KohaDates %] @@ -69,7 +69,7 @@ [% ELSIF ( circ_error_NOT_FOR_LOAN ) %] This item is not for loan. [% ELSIF ( circ_error_DEBT ) %] - You owe the library [% DEBT | $Price %] and cannot check out. + You owe the library [% currencySym %] [% DEBT | $Price %] and cannot check out. [% ELSIF ( circ_error_WTHDRAWN ) %] This item has been withdrawn from the collection. [% ELSIF ( circ_error_RESTRICTED ) %] diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index ac89db749c..56e7b48b6c 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -200,6 +200,7 @@ elsif ( $patron && ( $op eq 'checkout' ) ) { ); if ($issue_error eq 'DEBT') { $template->param(DEBT => $impossible->{DEBT}); + $template->param(currencySym => $currencySymbol); } if ( $issue_error eq "NO_MORE_RENEWALS" ) { $return_only = 1; @@ -224,6 +225,7 @@ elsif ( $patron && ( $op eq 'checkout' ) ) { ); if ($issue_error eq 'DEBT') { $template->param(DEBT => $needconfirm->{DEBT}); + $template->param(currencySym => $currencySymbol); } } else { if ( $confirmed || $issuenoconfirm ) { # we'll want to call getpatroninfo again to get updated issues. -- 2.30.2