@@ -, +, @@
source for message
---
.../prog/en/includes/blocked-fines.inc | 22 ++++++++++++++++++++++
.../prog/en/modules/circ/circulation.tt | 14 +++++---------
.../prog/en/modules/members/moremember.tt | 19 +------------------
3 files changed, 28 insertions(+), 27 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
@@ -0,0 +1,22 @@
+[% USE Price %]
+[% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
+
+[% IF NoIssuesCharge && fines > NoIssuesCharge %]
+
+ Fees & Charges:
+ Patron has
+ Outstanding fees & charges
+ [% IF ( fines ) %]
+ of [% fines | $Price %]
+ [% END %]
+ .
+
+ [% IF !Koha.Preference('AllowFineOverride') %]
+ Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
+ [% END %]
+
+ Make payment
+ or
+ Pay all fines
+
+[% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -783,15 +783,11 @@ No patron matched [% message %]
[% IF ( odues ) %][% IF ( nonreturns ) %]Overdues: Patron has ITEMS OVERDUE. See highlighted items below[% END %]
[% END %]
- [% IF ( charges ) %]
-
- Fees & Charges: Patron has Outstanding fees & charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %].
- [% IF ( charges_is_blocker ) %]
- Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
- [% END %]
- Make payment or
- Pay all fines
- [% END %]
+ [% IF ( charges ) %]
+ [% INCLUDE 'blocked-fines.inc'
+ fines = chargesamount
+ %]
+ [% END %]
[% IF ( credits ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -174,24 +174,7 @@ function validate1(date) {
[% IF ( was_renewed ) %]Patron's account has been renewed until [% dateexpiry | $KohaDates %]
[% END %]
[% IF fines %]
- [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
- [% IF NoIssuesCharge && fines > NoIssuesCharge %]
-
- Fees & Charges:
- Patron has
- Outstanding fees & charges
- [% IF ( chargesamount ) %]
- of [% chargesamount %]
- [% END %]
- .
- [% IF !Koha.Preference('AllowFineOverride') %]
- Checkouts are BLOCKED because fine balance is OVER THE LIMIT.
- [% END %]
- Make payment
- or
- Pay all fines
-
- [% END %]
+ [% INCLUDE 'blocked-fines.inc' %]
[% END %]
[% IF ( flagged ) %]
--