From 5e48009adcd7623e8bfa758490cb8806b66557f4 Mon Sep 17 00:00:00 2001 From: Lari Taskula Date: Fri, 31 Jul 2020 00:47:42 +0000 Subject: [PATCH] Bug 24101: Calculate on-site checkouts due date via circulation rules To test: 1. Set circulation rules to both normal and on-site checkouts, define loan period explicitly and make it different for both types of checkouts 2. Checkout two items, one as normal checkout and one as an on-site checkout 3. Observe they follow your circulation rules --- circ/circulation.pl | 5 +--- .../prog/en/modules/circ/circulation.tt | 26 ------------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index 5ec80c8f15..536fabdc76 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -200,10 +200,7 @@ $template->param( auto_renew => $session->param('auto_renew') ); my ($datedue,$invalidduedate); my $duedatespec_allow = C4::Context->preference('SpecifyDueDate'); -if( $onsite_checkout && !$duedatespec_allow ) { - $datedue = output_pref({ dt => dt_from_string, dateonly => 1, dateformat => 'iso' }); - $datedue .= ' 23:59:00'; -} elsif( $duedatespec_allow ) { +if( $duedatespec_allow ) { if ( $duedatespec ) { $datedue = eval { dt_from_string( $duedatespec ) }; if (! $datedue ) { 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 682573dc0a..4bf8fe5bdb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -1079,28 +1079,6 @@ [% UNLESS ( patron.borrowernumber ) %][% UNLESS ( borrowers ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] - // On-site checkout - function toggle_onsite_checkout(){ - if ( $("#onsite_checkout").prop('checked') ) { - $("#duedatespec").val("[% todaysdate | $KohaDates with_hours => 1 %]") - [% IF !Koha.Preference('SpecifyDueDate') %] - $("#duedatespec").datetimepicker('destroy'); - [% END %] - } else { - $("#duedatespec").datetimepicker({ - onClose: function(dateText, inst) { - if (validate_date(dateText, inst) ) { - $("#barcode").focus(); - } - }, - hour: 23, - minute: 59 - }).on("change", function(e, value) { - if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");} - }); - } - } - function Dopop(link) { var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top'); } @@ -1129,10 +1107,6 @@ } }); [% END %] - toggle_onsite_checkout(); - $("#onsite_checkout").click(function(){ - toggle_onsite_checkout(); - }); [% IF HIGHHOLDS %] [% IF !override_high_holds %] -- 2.17.1