From fadf73ca5ae3126c5f94e8ec6237bfb1c1fc8db9 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Mon, 27 Mar 2023 11:29:01 -1000 Subject: [PATCH] Bug 33345: On-site checkout checkbox does not work since issue date using flatpickr Since Bug 30718, date due uses flatpickr. The JavaScript code setting due date via on-site checkout checkbox needs to be adapted. Sort of like Bug 30717. This patch renames the variable sent to template 'today_due_date_and_time' to avoid confusion with variable 'todaysdate' used in other templates. Test plan : 1) Enable system preference 'OnSiteCheckouts' 2) Go to a patron circulation page /cgi-bin/koha/circ/circulation.pl 3) Click on settings icon inside barcode input => Check due date input is empty 4) Click on 'On-site checkout' => Check due date input is filled with today date at 23:59 5) Fill barcode input and do check-out 6) Check due date is correct Signed-off-by: David Nind Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi (cherry picked from commit dae97fd2b70da860cced08e572a402ce477b5285) Signed-off-by: Matt Blenkinsop --- circ/circulation.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 2cd85b6dad..5cbea04237 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -626,7 +626,7 @@ $template->param( debt_confirmed => $debt_confirmed, SpecifyDueDate => $duedatespec_allow, PatronAutoComplete => C4::Context->preference("PatronAutoComplete"), - todaysdate => dt_from_string()->set(hour => 23)->set(minute => 59), + today_due_date_and_time => dt_from_string()->set(hour => 23)->set(minute => 59), restriction_types => scalar Koha::Patron::Restriction::Types->search(), has_modifications => $has_modifications, override_high_holds => $override_high_holds, 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 881b75c54d..4e22f8a3f1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1083,7 +1083,8 @@ // On-site checkout function toggle_onsite_checkout(){ if ( $("#onsite_checkout").prop('checked') ) { - $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1 %]") + const duedatespec_fp = document.querySelector("#duedatespec")._flatpickr; + duedatespec_fp.setDate("[% today_due_date_and_time | $KohaDates dateformat => 'iso', with_hours => 1 %]"); } } -- 2.39.5