Attachment 149363 Details for Bug 33345 – Bug 33345: On-site checkout checkbox does not work since issue date using flatpickr

[patch] Bug 33345: On-site checkout checkbox does not work since issue date using flatpickr

Bug-33345-On-site-checkout-checkbox-does-not-work-.patch (text/plain), 2.70 KB, created by Katrin Fischer on 2023-04-09 12:19:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2023-04-09 12:19:46 UTC

Size: 2.70 KB

patch

obsolete

>From e0aa02fb37190aeefd6618ff2a52aa03901e189c Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>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 <david@davidnind.com>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> 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 61065c726d..7b35a8c860 100755
>--- a/circ/circulation.pl
>+++ b/circ/circulation.pl
>@@ -627,7 +627,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 ffb0a930d8..7fa5918048 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -1093,7 +1093,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.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33345: 148786 | 148787 | 149298 | 149363