From dcd495de24dd2bca4079a25e6b0a968b3b40f899 Mon Sep 17 00:00:00 2001
From: Jonathan Druart
Date: Sun, 7 Jan 2018 13:41:07 -0300
Subject: [PATCH] Bug 12001: Format DEBT correctly
Before this patchset, DEBT was formatted in the module, now it should be
done template-side.
Signed-off-by: Tomas Cohen Arazi
Signed-off-by: Josef Moravec
Signed-off-by: Jonathan Druart
---
C4/Circulation.pm | 12 ++++++------
.../prog/en/modules/circ/circulation.tt | 2 +-
.../en/modules/circ/circulation_batch_checkouts.tt | 2 +-
.../opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 3 ++-
opac/sco/sco-main.pl | 9 ++-------
5 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/C4/Circulation.pm b/C4/Circulation.pm
index 9bd4e06cb5..d583e5372c 100644
--- a/C4/Circulation.pm
+++ b/C4/Circulation.pm
@@ -776,20 +776,20 @@ sub CanBookBeIssued {
if ( C4::Context->preference("IssuingInProcess") ) {
if ( $non_issues_charges > $amountlimit && !$inprocess && !$allowfineoverride) {
- $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $issuingimpossible{DEBT} = $non_issues_charges;
} elsif ( $non_issues_charges > $amountlimit && !$inprocess && $allowfineoverride) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $needsconfirmation{DEBT} = $non_issues_charges;
} elsif ( $allfinesneedoverride && $non_issues_charges > 0 && $non_issues_charges <= $amountlimit && !$inprocess ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $needsconfirmation{DEBT} = $non_issues_charges;
}
}
else {
if ( $non_issues_charges > $amountlimit && $allowfineoverride ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $needsconfirmation{DEBT} = $non_issues_charges;
} elsif ( $non_issues_charges > $amountlimit && !$allowfineoverride) {
- $issuingimpossible{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $issuingimpossible{DEBT} = $non_issues_charges;
} elsif ( $non_issues_charges > 0 && $allfinesneedoverride ) {
- $needsconfirmation{DEBT} = sprintf( "%.2f", $non_issues_charges );
+ $needsconfirmation{DEBT} = $non_issues_charges;
}
}
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index 1e637fa63b..4c66febb6b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -97,7 +97,7 @@
[% END %]
[% IF ( DEBT ) %]
- The patron has a debt of [% DEBT %].
+ The patron has a debt of [% DEBT | $Price %].
[% END %]
[% IF ( DEBT_GUARANTEES ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
index 4eefdbff66..b40a9b3c2c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt
@@ -247,7 +247,7 @@
The barcode was not found [% checkout_info.barcode |html %].
[% END %]
[% IF checkout_info.DEBT %]
- The patron has a debt of [% checkout_info.DEBT %].
+ The patron has a debt of [% checkout_info.DEBT | $Price %].
[% END %]
[% END %]
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 b0e9747f5c..8cadb1712f 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,6 +1,7 @@
[% USE Koha %]
[% USE KohaDates %]
[% USE AudioAlerts %]
+[% USE Price %]
[% INCLUDE 'doc-head-open.inc' %]
[% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha [% END %] › Self checkout
@@ -53,7 +54,7 @@
[% ELSIF ( circ_error_NOT_FOR_LOAN ) %]
This item is not for loan.
[% ELSIF ( circ_error_DEBT ) %]
- You owe the library [% amount %] and cannot check out.
+ You owe the library [% 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 4a148585f7..cec66b6a3b 100755
--- a/opac/sco/sco-main.pl
+++ b/opac/sco/sco-main.pl
@@ -114,11 +114,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,7 +158,7 @@ elsif ( $patron and $op eq "checkout" ) {
hide_main => 1,
);
if ($issue_error eq 'DEBT') {
- $template->param(amount => $currencySymbol.$impossible->{DEBT});
+ $template->param(DEBT => $impossible->{DEBT});
}
#warn "issue_error: " . $issue_error ;
if ( $issue_error eq "NO_MORE_RENEWALS" ) {
@@ -195,7 +190,7 @@ elsif ( $patron and $op eq "checkout" ) {
hide_main => 1,
);
if ($issue_error eq 'DEBT') {
- $template->param(amount => $currencySymbol.$needconfirm->{DEBT});
+ $template->param(DEBT => $needconfirm->{DEBT});
}
} else {
if ( $confirmed || $issuenoconfirm ) { # we'll want to call getpatroninfo again to get updated issues.
--
2.39.5