From 9189dd4f71d2d68d467e35f694b09e98dbce1f0e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 4 Aug 2020 16:55:56 +0200 Subject: [PATCH] Bug 16112: Add the ability to define due date for batch renew Same as bug 16748, for batch renew. Test plan: Check an item in Renew it using the circ/renew.pl page => You can pick a due date! => The date is kept from one renew to another Renew it until you reach the maximum number of renewals => You get a warning with "continue without renewing" => The date is still kept Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- circ/renew.pl | 5 +++++ .../prog/en/modules/circ/renew.tt | 20 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/circ/renew.pl b/circ/renew.pl index c3f1d2a4b3..fb513806b4 100755 --- a/circ/renew.pl +++ b/circ/renew.pl @@ -48,6 +48,7 @@ $barcode =~ s/^\s*|\s*$//g; # remove leading/trailing whitespae $barcode = barcodedecode($barcode) if( $barcode && C4::Context->preference('itemBarcodeInputFilter')); my $override_limit = $cgi->param('override_limit'); my $override_holds = $cgi->param('override_holds'); +my $hard_due_date = $cgi->param('hard_due_date'); my ( $item, $issue, $borrower ); my $error = q{}; @@ -99,6 +100,9 @@ if ($barcode) { if ( $cgi->param('renewonholdduedate') ) { $date_due = dt_from_string( scalar $cgi->param('renewonholdduedate')); } + if ( C4::Context->preference('SpecifyDueDate') && $hard_due_date ) { + $date_due = dt_from_string( $hard_due_date ); + } $date_due = AddRenewal( undef, $item->itemnumber(), $branchcode, $date_due ); $template->param( date_due => $date_due ); } @@ -125,6 +129,7 @@ if ($barcode) { ); } +$template->param( hard_due_date => ($hard_due_date ? output_pref({ str => $hard_due_date, dateformat => 'iso' }) : undef) ); # Checking if there is a Fast Cataloging Framework $template->param( fast_cataloging => 1 ) if Koha::BiblioFrameworks->find( 'FA' ); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt index 608ed5c84d..d9d335e828 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt @@ -144,6 +144,7 @@ [% END %]
+
@@ -168,6 +169,12 @@
Renew + [% IF Koha.Preference('SpecifyDueDate') %] + + +
+ [% END %] + @@ -215,6 +222,19 @@ }).on('change', function(e) { if ( ! is_valid_date( $(this).val() ) ) {$(this).val('');} }); + + [% IF Koha.Preference('SpecifyDueDate') %] + $("#hard_due_date").datetimepicker({ + onClose: function(dateText, inst) { + validate_date(dateText, inst); + }, + hour: 23, + minute: 59 + }).on("change", function(e, value) { + if ( ! is_valid_date( $(this).val() ) ) {$(this).val("");} + }); + [% END %] + }); [% END %] -- 2.39.5