From 1e6974bcb3643c2a31a84d0f8a216463c278b225 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       | 24 ++++++++++++++++++-
 .../prog/en/modules/circ/renew.tt             | 18 ++++++++++++++
 2 files changed, 41 insertions(+), 1 deletion(-)

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..8483d5763b 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
@@ -1,6 +1,7 @@
 [% USE raw %]
 [% USE Asset %]
 [% USE Branches %]
+[% USE Koha %]
 [% USE KohaDates %]
 [% USE Price %]
 [% USE AuthorisedValues %]
@@ -77,6 +78,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 %]" />
@@ -259,7 +267,7 @@
               [% END %]
 
               [% IF checkout_info.issue.date_due %]
-                <li>Due on [% checkout_info.issue.date_due | $KohaDates %]</li>
+                <li>Due on [% checkout_info.issue.date_due | $KohaDates as_due_date => 1 %]</li>
               [% END %]
             </td>
           </tr>
@@ -274,6 +282,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 +324,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