From 9f9c1d5098ecee3926d394e409b6961e7c5e82bf Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Fri, 14 Feb 2020 16:25:21 +0000
Subject: [PATCH] Bug 6508: (follow-up) Remove dependency on jquery for check
 in templates

Should work as before with the test plan from the second patch. But
removes the added jQuery display control code in favor of checking
if fines is set on template level.

For several patrons with and without fines and with credits:
- Check the Fines & Charges only display when there is something to see

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/members/moremember.tt     | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

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 1523f80fa0..cfc2a0ab23 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -702,9 +702,11 @@
                                     <a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count | html %] Relatives' checkouts</a>
                                 </li>
                             [% END %]
-                            <li id="finestab">
-                                <a href="#finesandcharges">Fines &amp; Charges ([% fines | $Price %])</a>
-                            </li>
+                            [% IF ( fines ) %]
+                                <li id="finestab">
+                                    <a href="#finesandcharges">Fines &amp; Charges ([% fines | $Price %])</a>
+                                </li>
+                            [% END %]
                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
                                 <li>
                                     [% IF ( holds_count ) %]
@@ -756,13 +758,15 @@
 
                         [% INCLUDE "relatives-issues-table.inc" %]
 
-                        <div id="finesandcharges">
-                            [% IF ( fines ) %]
-                                <p>Total due: [% fines | $Price %]</p>
-                            [% ELSE %]
-                                <p>No outstanding charges</p>
-                            [% END %]
-                        </div>
+                        [% IF ( fines ) %]
+                            <div id="finesandcharges">
+                                [% IF ( fines ) %]
+                                    <p>Total due: [% fines | $Price %]</p>
+                                [% ELSE %]
+                                    <p>No outstanding charges</p>
+                                [% END %]
+                            </div>
+                        [% END %]
 
                         [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
                             <div id="clubs-tab">
@@ -891,10 +895,6 @@
         columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
 
         $(document).ready(function() {
-            $("#finestab").hide();
-            [% IF fines %]
-                $("#finestab").show();
-            [% END %]
 
             if ( $('#clubs-tab').length ) {
                 $('#clubs-tab-link').on('click', function() {
-- 
2.20.1