From f06df1e9e0c455ef0d5fbce4a62c0cc824a6ba69 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 1 Feb 2018 14:32:54 -0300 Subject: [PATCH] Bug 19188: Use the Price template plugin with_symbol => 1 To make it displayed correctly depending on the configuration of the currency --- koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 2 +- opac/sco/sco-main.pl | 12 ++---------- 2 files changed, 3 insertions(+), 11 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 9a2213e392..3671cc8fcb 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 @@ -54,7 +54,7 @@ [% ELSIF ( circ_error_NOT_FOR_LOAN ) %] This item is not for loan. [% ELSIF ( circ_error_DEBT ) %] - You owe the library [% currencySym %] [% amount | $Price %] and cannot check out. + You owe the library [% amount | $Price with_symbol => 1%] 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 b2a956b415..081d7efec4 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -44,7 +44,6 @@ use C4::Members; use C4::Biblio; use C4::Items; use Koha::DateUtils qw( dt_from_string ); -use Koha::Acquisition::Currencies; use Koha::Patrons; use Koha::Patron::Images; use Koha::Patron::Messages; @@ -114,11 +113,6 @@ if ( $patronid ) { $borrower = $patron->unblessed if $patron; } -my $currencySymbol = ""; -if ( my $active_currency = Koha::Acquisition::Currencies->get_active ) { - $currencySymbol = $active_currency->symbol; -} - my $branch = $issuer->{branchcode}; my $confirm_required = 0; my $return_only = 0; @@ -163,8 +157,7 @@ elsif ( $patron and $op eq "checkout" ) { hide_main => 1, ); if ($issue_error eq 'DEBT') { - $template->param(currencySym => $currencySymbol, - amount => $impossible->{DEBT}); + $template->param(amount => $impossible->{DEBT}); } #warn "issue_error: " . $issue_error ; if ( $issue_error eq "NO_MORE_RENEWALS" ) { @@ -196,8 +189,7 @@ elsif ( $patron and $op eq "checkout" ) { hide_main => 1, ); if ($issue_error eq 'DEBT') { - $template->param(currencySym => $currencySymbol, - amount => $needconfirm->{DEBT}); + $template->param(amount => $needconfirm->{DEBT}); } } else { if ( $confirmed || $issuenoconfirm ) { # we'll want to call getpatroninfo again to get updated issues. -- 2.11.0