From a4423d2914e277e6444a33c621fd3135741bc575 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 28 Sep 2023 12:48:36 +0000 Subject: [PATCH] Bug 34946: Remove the use of event attributes from self checkout and check-in This patch removes the use of event attributes from the self checkout and self check-in templates. These events are defined now along with the other in-page JS. To test you must have SelfCheckInModule and WebBasedSelfCheck preferences enabled. And SelfCheckoutByLogin = cardnumber. - Navigate to the self checkout interface (/cgi-bin/koha/sco/sco-main.pl). - When the page loads, cursor focus should be automatically placed in the barcode field. - Test the "munge history" feature from Bug 10016: [1] Start a web-based self-check session. [2] Enter a patron barcode. [3] Allow the self-check session to time out. [4] Use the back button. You should get the patron barcode entry form; you should not be prompted to resubmit form input. [5] Enter a patron barcode, perform some transactions, then use the finish button. [6] Next, use the back button. You should get the patron barcode entry form. - Test the updated checkout_confirm function by submitting the "magic" barcode for checkout: __KOHA_NEW_CIRC__. The user's session should be ended. - Navigate to the self check-in interface (/cgi-bin/koha/sco/sci-main.pl). - Test the cursor focus and "munge history" feature on this page too. Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit 76d522a90346ccbdb38793c048d61e73e869d9a0) Signed-off-by: Fridolin Somers (cherry picked from commit b27a2a2eb09a7390d9e56af2b03c42df6d692dcf) Signed-off-by: Matt Blenkinsop --- .../bootstrap/en/modules/sci/sci-main.tt | 10 +++++++++- .../bootstrap/en/modules/sco/sco-main.tt | 15 +++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt index ea3a4aecf6..c780bb13da 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sci/sci-main.tt @@ -51,7 +51,7 @@ [% Asset.js('js/Gettext.js') | $raw %] [% Asset.js('js/i18n.js') | $raw %] - + [% INCLUDE 'masthead-sci.inc' %]
@@ -209,6 +209,14 @@ var barcodes = []; + $( window ).on( "load", function() { + dofocus(); + }); + + $( window ).on( "unload", function() { + mungeHistory(); + }); + $(document).ready(function() { // Barcodes scanning table initially hidden $("#sci_barcodes_table").hide(); diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index 1f40f5ce39..2e94b64efe 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -32,7 +32,7 @@ [% Asset.js('js/Gettext.js') | $raw %] [% Asset.js('js/i18n.js') | $raw %] - + [% INCLUDE 'masthead-sco.inc' %]
@@ -241,7 +241,7 @@ [% IF ( validuser ) %]
-
+

[% IF ( Koha.Preference('SCOAllowCheckin') ) %] Check out, return, or renew an item: @@ -499,6 +499,13 @@ } [% END %] + $( window ).on( "load", function() { + dofocus(); + }); + + $( window ).on( "unload", function() { + mungeHistory(); + }); $(document).ready(function() { dofocus(); @@ -533,6 +540,10 @@ return true; }); + + $("#scan_form").on("submit", function(){ + return checkout_confirm('[% patronid | html %]'); + }); }); -- 2.39.5