From 0d1a46d57ed5bb1c6efa12b9c835659f17efc122 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Fri, 26 Jan 2024 17:35:38 +0000
Subject: [PATCH] Bug 14180: Add option to always load the issues table

To test:
 1. APPLY PATCH, updatedatebase, restart_all
 2. Search for the system preference 'AlwaysLoadCheckoutsTable' and set it to 'Do'.
 3. Go to 'circ/circulation.pl?borrowernumber=X' for a patron with checkouts. ( Check out tab ).
 4. The table should load right away.
 5. Go to 'members/moremember.pl?borrowernumber=X' for a patron with checkouts. ( Details tab ).
 6. The table should load right way.
 7. Set a value in the 'LoadCheckoutsTableDelay' system preference.
 8. Back on 'circ/circulation.pl?borrowernumber=X', make sure the delay is honored. You should see a message like "Checkouts table will automatically load in X seconds".
 9. The delay should NOT be honored on'members/moremember.pl?borrowernumber=X', that table should load right away/
10. Turn off 'AlwaysLoadCheckoutsTable' and make sure the table does not load, or loads according to the cookie set when checking the 'Always show checkouts automatically' checkbox.

Signed-off-by: Kelly <kelly@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../prog/en/includes/checkouts-table.inc      |  9 +--
 .../admin/preferences/circulation.pref        |  8 ++-
 .../prog/en/modules/circ/circulation.tt       |  1 +
 .../prog/en/modules/members/moremember.tt     |  3 +-
 koha-tmpl/intranet-tmpl/prog/js/checkouts.js  | 62 +++++++++++--------
 5 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
index 8bae177e8f..d95ace2ac1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table.inc
@@ -7,7 +7,7 @@
         <p>
             <a id="issues-table-load-now-button" href="#" class="btn btn-default"><i class="fa fa-book"></i> Show checkouts</a>
             [% SET LoadCheckoutsTableDelay = Koha.Preference('LoadCheckoutsTableDelay') %]
-            [% IF LoadCheckoutsTableDelay && page == 'circulation' %]
+            [% IF LoadCheckoutsTableDelay && patronpage == 'circ' %]
             <span id="issues-table-load-delay">
                 <i id="issues-table-load-delay-spinner" class="fa fa-spinner fa-pulse fa-fw"></i>
                 <span id="issues-table-load-delay-message">Checkouts table will show automatically in [% LoadCheckoutsTableDelay | html %] seconds...</span>
@@ -46,9 +46,10 @@
             </thead>
             [% INCLUDE 'checkouts-table-footer.inc' %]
         </table>
-
-        <label for="issues-table-load-immediately">Always show checkouts automatically</label>
-        <input id="issues-table-load-immediately" type="checkbox" />
+        [% UNLESS Koha.Preference( 'AlwaysLoadCheckoutsTable' ) %]
+            <label for="issues-table-load-immediately">Always show checkouts automatically</label>
+            <input id="issues-table-load-immediately" type="checkbox" />
+        [% END %]
 
         <div id="issues-table-actions" style="display: none;">
             <fieldset class="action">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index f08873bbd0..4b36e859cb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@ -176,11 +176,17 @@ Circulation:
                   0: "Don't use"
             - circulation desks.
     Checkout policy:
+        -
+            - pref: AlwaysLoadCheckoutsTable
+              choices:
+                  1: "Do"
+                  0: "Don't"
+            - always load the checksouts table.
         -
             - Delay the automatic loading of the checkouts table on the checkouts page by
             - pref: LoadCheckoutsTableDelay
               class: integer
-            - seconds when "Always show checkouts automatically" is enabled.
+            - seconds when "Always show checkouts automatically" or <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AlwaysLoadCheckoutsTable">AlwaysLoadCheckoutsTable</a> are enabled.
         -
             - pref: OnSiteCheckoutAutoCheck
               choices:
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 bd2fce08fb..c269d95ebe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -998,6 +998,7 @@
     <script>
         /* Set some variable needed in circulation.js */
         const LoadCheckoutsTableDelay = [% Koha.Preference('LoadCheckoutsTableDelay') || 0 | html %];
+        const AlwaysLoadCheckoutsTable = [% Koha.Preference('AlwaysLoadCheckoutsTable') | html %];
         var logged_in_user_borrowernumber = "[% logged_in_user.borrowernumber | html %]";
         var ClaimReturnedLostValue = "[% Koha.Preference('ClaimReturnedLostValue') | html %]";
         var ClaimReturnedChargeFee = "[% Koha.Preference('ClaimReturnedChargeFee') | html %]";
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 dbd55ea139..3360a04a6a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -761,7 +761,6 @@
         var SuspendHoldsIntranet = [% ( Koha.Preference('SuspendHoldsIntranet') ) ? 1 : 0 | html %];
     </script>
     [% Asset.js("js/pages/circulation.js") | $raw %]
-    [% Asset.js("js/checkouts.js") | $raw %]
     [% IF Koha.Preference('ClaimReturnedLostValue') %]
         [% Asset.js("js/resolve_claim_modal.js") | $raw %]
     [% END %]
@@ -775,6 +774,7 @@
     [% Asset.js("js/recalls.js") | $raw %]
     <script>
         const LoadCheckoutsTableDelay = 0;
+        const AlwaysLoadCheckoutsTable = [% Koha.Preference('AlwaysLoadCheckoutsTable') | html %];
 
         table_settings_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
         table_settings_relatives_issues_table = [% TablesSettings.GetTableSettings( 'members', 'moremember', 'relatives-issues-table', 'json' ) | $raw %]
@@ -834,6 +834,7 @@
             });
         });
     </script>
+    [% Asset.js("js/checkouts.js") | $raw %]
     [% Asset.js("js/tables/bookings.js") | $raw %]
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
index 19b16d3331..b9dd65f390 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/checkouts.js
@@ -485,12 +485,41 @@ function LoadIssuesTable() {
 var loadIssuesTableDelayTimeoutId;
 var barcodefield = $("#barcode");
 
-$('#issues-table-load-now-button').click(function(){
-    if ( loadIssuesTableDelayTimeoutId ) clearTimeout(loadIssuesTableDelayTimeoutId);
-    LoadIssuesTable();
-    barcodefield.focus();
-    return false;
-});
+if ( AlwaysLoadCheckoutsTable ) {
+    if ( LoadCheckoutsTableDelay ) {
+        setTimeout( function(){ LoadIssuesTable() }, LoadCheckoutsTableDelay * 1000);
+    } else {
+        LoadIssuesTable();
+    }
+
+} else {
+    $('#issues-table-load-immediately').change(function(){
+        if ( this.checked && typeof issuesTable === 'undefined') {
+            $('#issues-table-load-now-button').click();
+        }
+        barcodefield.focus();
+    });
+    $('#issues-table-load-now-button').click(function(){
+        if ( loadIssuesTableDelayTimeoutId ) clearTimeout(loadIssuesTableDelayTimeoutId);
+        LoadIssuesTable();
+        barcodefield.focus();
+        return false;
+    });
+
+    if ( Cookies.get("issues-table-load-immediately-" + script) == "true" ) {
+        if ( LoadCheckoutsTableDelay ) {
+            setTimeout( function(){ LoadIssuesTable() }, LoadCheckoutsTableDelay * 1000);
+        } else {
+            LoadIssuesTable();
+        }
+        $('#issues-table-load-immediately').prop('checked', true);
+    } else {
+        $('#issues-table-load-delay').hide();
+    }
+    $('#issues-table-load-immediately').on( "change", function(){
+        Cookies.set("issues-table-load-immediately-" + script, $(this).is(':checked'), { expires: 365, sameSite: 'Lax'  });
+    });
+}
 
 $(document).ready(function() {
 
@@ -785,27 +814,6 @@ $(document).ready(function() {
 
     var ymd = flatpickr.formatDate(new Date(), "Y-m-d");
 
-    $('#issues-table-load-immediately').change(function(){
-        if ( this.checked && typeof issuesTable === 'undefined') {
-            $('#issues-table-load-now-button').click();
-        }
-        barcodefield.focus();
-    });
-
-    if ( Cookies.get("issues-table-load-immediately-" + script) == "true" ) {
-        if ( LoadCheckoutsTableDelay ) {
-            loadIssuesTableDelayTimeoutId = setTimeout( function(){ LoadIssuesTable() }, LoadCheckoutsTableDelay * 1000);
-        } else {
-            LoadIssuesTable();
-        }
-        $('#issues-table-load-immediately').prop('checked', true);
-    } else {
-        $('#issues-table-load-delay').hide();
-    }
-    $('#issues-table-load-immediately').on( "change", function(){
-        Cookies.set("issues-table-load-immediately-" + script, $(this).is(':checked'), { expires: 365, sameSite: 'Lax'  });
-    });
-
     // Don't load relatives' issues table unless it is clicked on
     var relativesIssuesTable;
     $("#relatives-issues-tab").click( function() {
-- 
2.39.5