From d77006331b3691310e8c7643cb6eb240783abc8c Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 17 Jan 2023 14:14:36 +0000
Subject: [PATCH] Bug 30979: Always show self-checkout when preference enabled

This patch updates the display logic such that if the truested
self-checkout option is enabled we always show the checkout button and
prompt a login when no user is found.

Signed-off-by: Silvia Meakins <smeakins@eso.org>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../bootstrap/en/includes/masthead.inc        |  2 +-
 .../bootstrap/en/includes/opac-bottom.inc     |  4 ++--
 .../opac-tmpl/bootstrap/js/modals/checkout.js | 24 +++++++++++++++++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index aeac56d833..d916d73973 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -81,7 +81,7 @@
                         </div> <!-- / .dropdown-menu -->
                     </li> <!-- / .nav-item.dropdown -->
                 [% END # / IF virtualshelves %]
-                [% IF ( Koha.Preference( 'OpacTrustedCheckout' ) && loggedinusername ) %]
+                [% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
                     <li class="nav-item">
                         <a href="#" class="nav-link" title="Self check out" id="comenulink" role="button" data-toggle="modal" data-target="#checkoutModal">
                             <i id="checkout-icon" class="fa fa-barcode fa-icon-black" aria-hidden="true"></i> <span class="checkout-label">Self checkout</span>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
index 4a142d2641..25ce50d38e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
@@ -117,7 +117,7 @@
     [% END # /IF OpacLangSelectorMode == 'both' || OpacLangSelectorMode == 'footer' %]
 [% END # / UNLESS is_popup %]
 
-[% IF ( Koha.Preference( 'OpacTrustedCheckout' ) && loggedinusername ) %]
+[% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
     [% INCLUDE 'modals/checkout.inc' %]
 [% END %]
 
@@ -305,7 +305,7 @@ $(document).ready(function() {
         </script>
     [% END %]
 [% END %]
-[% IF ( Koha.Preference( 'OpacTrustedCheckout' ) && loggedinusername ) %]
+[% IF Koha.Preference( 'OpacTrustedCheckout' ) %]
     [% Asset.js("js/modals/checkout.js") | $raw %]
 [% END %]
 [% KohaPlugins.get_plugins_opac_js | $raw %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
index 0c666c55e7..6261803076 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
+++ b/koha-tmpl/opac-tmpl/bootstrap/js/modals/checkout.js
@@ -61,6 +61,30 @@ $(document).ready(function() {
         $('#checkoutConfirm').replaceWith('<button type="submit" id="checkoutSubmit" class="btn btn-primary">Submit</button>');
     };
 
+    // Before modal show, check login
+    $('#checkoutModal').on('show.bs.modal', function(e) {
+       // Redirect to login modal if not logged in
+       if (logged_in_user_id === "") {
+           let url = new URL(window.location.href);
+           url.searchParams.append('modal','checkout');
+           $('#modalAuth').append('<input type="hidden" name="return" value="' + url.href +'" />');
+           $('#loginModal').modal('show');
+           return false;
+       }
+    });
+
+    // Detect that we were redirected here after login and re-open modal
+    let urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has('modal')) {
+        let modal = urlParams.get('modal');
+        history.replaceState && history.replaceState(
+            null, '', location.pathname + location.search.replace(/[\?&]modal=[^&]+/, '').replace(/^&/, '?')
+        );
+        if (modal == 'checkout') {
+            $("#checkoutModal").modal('show');
+        }
+    }
+
     // On modal show, clear any prior results and set focus
     $('#checkoutModal').on('shown.bs.modal', function(e) {
         $('#checkoutResults').replaceWith('<div id="checkoutResults"></div>');
-- 
2.39.5