Bugzilla – Attachment 107785 Details for
Bug 16748
Batch checkout needs set due date
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 16748: Add the ability to define due date in batch checkout
Bug-16748-Add-the-ability-to-define-due-date-in-ba.patch (text/plain), 4.51 KB, created by
Jonathan Druart
on 2020-08-04 15:07:14 UTC
(
hide
)
Description:
Bug 16748: Add the ability to define due date in batch checkout
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2020-08-04 15:07:14 UTC
Size:
4.51 KB
patch
obsolete
>From e84ca750fe417057984577d8884e60798c2c987f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Tue, 4 Aug 2020 16:55:56 +0200 >Subject: [PATCH] Bug 16748: Add the ability to define due date in batch > checkout > >This patch allows the librarian to pick the due date when batch checkout > >Test plan: >Batch checkout using a hard due date >=> Notice that the due date is taken into account >Batch checkout the same barcodes with a different due date, to trigger the confirmation step >=> Notice that the due date is taken into account for the renewals >--- > .../circ/circulation_batch_checkouts.tt | 21 +++++++++++++++++++ > .../prog/en/modules/circ/renew.tt | 18 ++++++++++++++++ > 2 files changed, 39 insertions(+) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >index 4df661a155..111c157e2c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt >@@ -77,6 +77,13 @@ > </li> > </ol> > </fieldset> >+ [% IF Koha.Preference('SpecifyDueDate') %] >+ <fieldset class="rows"> >+ <legend>Due date: </legend> >+ <label for="duedatespec">Hard due date [% INCLUDE 'date-format.inc' %]:</label> >+ <input type="text" size="20" id="duedatespec" name="duedatespec" value="[% duedatespec | $KohaDates with_hours => 1 %]" /> >+ </fieldset> >+ [% END %] > <input type="hidden" name="op" value="show" /> > <fieldset class="action"> > <input type="hidden" name="borrowernumber" id="borrowernumber" value="[% patron.borrowernumber | html %]" /> >@@ -274,6 +281,7 @@ > <input type="hidden" name="issueconfirmed" value="1" /> > <input type="hidden" name="debt_confirmed" value="1" /> > <input type="hidden" name="branch" value="[% branch | html %]" /> >+ <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" /> > <input type="hidden" name="batch" value="1" /> > <input type="submit" id="checkoutrenew" class="approve" value="Checkout or renew" /> > </fieldset> >@@ -315,7 +323,20 @@ > ], > "bPaginate": false > })); >+ >+ [% IF Koha.Preference('SpecifyDueDate') %] >+ $("#duedatespec").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 %] > }); >+ > </script> > [% INCLUDE 'str/members-menu.inc' %] > [% Asset.js("js/members-menu.js") | $raw %] >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..b45c0394db 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/renew.tt >@@ -168,6 +168,11 @@ > <fieldset> > <legend>Renew</legend> > >+ [% IF Koha.Preference('SpecifyDueDate') %] >+ <label for="hard_due_date">Hard due date [% INCLUDE 'date-format.inc' %]:</label> >+ <input type="text" size="20" id="hard_due_date" name="hard_due_date" value="[% hard_due_date | $KohaDates with_hours => 1 %]" /> >+ [% END %] >+ > <label for="barcode">Enter item barcode: </label> > > <input name="barcode" id="barcode" size="14" class="focus" type="text" /> >@@ -215,6 +220,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 %] >+ > }); > </script> > [% END %] >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 16748
:
107781
|
107782
|
107783
|
107785
|
107863
|
107864
|
108079
|
108344