From 9334fe9392230218061ea5958186b7928138a563 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 2 Apr 2024 17:03:21 +0000 Subject: [PATCH] Bug 36494: Flatpickr error on checkout page if the patron is blocked from checking out This patch add some error-handling to the recent change to circulation.tt where we handle dates and on-site checkouts. This prevents an error in the console when the patron is blocked and the "specify due date" field is hidden. To test, apply the patch and make sure OnSiteCheckouts is enabled. - Go to Circulation and check out to a patron. - Under the restrictions tab, add a manual restriction. - When the page reloads and the checkout form is no longer visible, confirm that there is no error in the browser console. Confirm that the Bug 18885 test plan still works. Signed-off-by: David Nind Signed-off-by: Emily Lamancusa Signed-off-by: Katrin Fischer (cherry picked from commit cc15deb0011fe2e816428451e442a10f144974e1) Signed-off-by: Fridolin Somers --- .../prog/en/modules/circ/circulation.tt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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 521dbabcaa..3fcc185306 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1008,11 +1008,14 @@ // On-site checkout function toggle_onsite_checkout(){ - const duedatespec_fp = document.querySelector("#duedatespec")._flatpickr; - if ( $("#onsite_checkout").prop('checked') ) { - duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]"); - } else { - duedatespec_fp.setDate(""); + const duedatespec = document.querySelector("#duedatespec"); + if( duedatespec ){ + const duedatespec_fp = duedatespec._flatpickr; + if ( $("#onsite_checkout").prop('checked') ) { + duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]"); + } else { + duedatespec_fp.setDate(""); + } } } -- 2.39.5