Bug 14497 [QA Followup] - Refactor code to have a single source for message

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc
new file mode 100644 (file)
index 0000000..596c0c7
--- /dev/null
+++ b/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 %]
+    <li>
+        <span class="circ-hlt">Fees &amp; Charges:</span>
+        Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">
+            Outstanding fees &amp; charges
+            [% IF ( fines ) %]
+                of [% fines | $Price %]
+            [% END %]
+        </a>.
+
+        [% IF !Koha.Preference('AllowFineOverride') %]
+            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
+        [% END %]
+
+        <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a>
+        or
+        <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li>
+    </li>
+[% END %]

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 3028242..b578473 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -844,14 +844,9 @@ No patron matched <span class="ex">[% message %]</span>
             [% END %]
 
             [% IF ( charges ) %]
-                <li>
-                    <span class="circ-hlt">Fees &amp; Charges:</span> Patron has  <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">Outstanding fees &amp; charges[% IF ( chargesamount ) %] of [% chargesamount %][% END %]</a>.
-                        [% IF ( charges_is_blocker ) %]
-                            <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
-                        [% END %]
-                    <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a> or
-                    <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a>
-                </li>
+                [% INCLUDE 'blocked-fines.inc'
+                    fines = chargesamount
+                %]
             [% END %]
 
             [% IF ( charges_guarantees ) %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
index 81a18c9..a3398ea 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -174,24 +174,7 @@ function validate1(date) {
     [% IF ( was_renewed ) %]<div class="dialog message">Patron's account has been renewed until [% dateexpiry | $KohaDates %]</div>[% END %]
 
     [% IF fines %]
-        [% SET NoIssuesCharge = Koha.Preference('noissuescharge') %]
-        [% IF NoIssuesCharge && fines > NoIssuesCharge %]
-            <li>
-                <span class="circ-hlt">Fees &amp; Charges:</span>
-                Patron has <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% borrowernumber %]">
-                    Outstanding fees &amp; charges
-                    [% IF ( chargesamount ) %]
-                        of [% chargesamount %]
-                    [% END %]
-                </a>.
-                [% IF !Koha.Preference('AllowFineOverride') %]
-                    <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
-                [% END %]
-                <a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% borrowernumber %]">Make payment</a>
-                or
-                <a href="/cgi-bin/koha/members/paycollect.pl?borrowernumber=[% borrowernumber %]">Pay all fines</a></li>
-            </li>
-        [% END %]
+        [% INCLUDE 'blocked-fines.inc' %]
     [% END %]
 
     [% IF ( flagged ) %]