Bug 29234: Further clean Z3950 Tests

[koha-ffzg.git] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / lateorders.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 5d5ecf9..ad78d32 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -38,7 +38,7 @@
             <main>
 
 <h1>[% IF bookseller_filter %][% bookseller_filter.name | html %] : [% END %]Late orders</h1>
-<div id="acqui_lateorders">
+<div id="acqui_lateorders" class="page-section">
 
 [% IF error_claim %]
     [% IF ( error_claim == "no_email" ) %]
@@ -114,7 +114,7 @@
                 <p class="delivery_date">
                     <span>[% estimated_delivery_date | $KohaDates %]</span>
                     [% IF CAN_user_acquisition_order_manage %]
-                        <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-delivery_date="[% estimated_delivery_date | $KohaDates %]" id="delivery_date_[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date">
+                        <a class="edit_delivery_date noExport" data-ordernumber="[% lateorder.ordernumber | html %]" data-delivery_date="[% estimated_delivery_date | html %]" id="delivery_date_[% lateorder.ordernumber | html %]" href="/cgi-bin/koha/acqui/moddeliverydate.pl?ordernumber=[% lateorder.ordernumber | html %]" title="Edit delivery date">
                             <i class="fa fa-pencil"></i> Edit
                         </a>
                     [% END %]
@@ -266,8 +266,8 @@
             [% END %]
         </select>
 </ol>
-    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
 </fieldset>
+    <fieldset class="action"><input type="submit" class="btn btn-primary" value="Filter" /></fieldset>
     </form>
 [% INCLUDE 'acquisitions-menu.inc' %]
 </aside>
@@ -308,7 +308,7 @@
                     <h4 class="modal-title" id="dateEditorLabel">Estimated delivery date</h4>
                 </div>
                 <div class="modal-body">
-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
+                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | html %]"/>
                 <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
                 <input type="hidden" id="date_ordernumber" name="ordernumber" value="" />
                 <input type="hidden" name="op" value="save" />
@@ -412,10 +412,11 @@
                 e.preventDefault();
                 var ordernumber = $(this).data("ordernumber");
                 var modalTitle = $(this).attr("title") + " (order number " + ordernumber + ")";
-                var date_text = $( "#delivery_date_" + ordernumber ).data("delivery_date");
+                var delivery_date = $( "#delivery_date_" + ordernumber ).data("delivery_date");
+                const estimated_delivery_date = document.querySelector("#estimated_delivery_date")._flatpickr;
+                estimated_delivery_date.setDate( delivery_date );
                 $("#dateEditor .modal-title").text(modalTitle);
                 $("#date_ordernumber").val(ordernumber);
-                $("#estimated_delivery_date").val(date_text);
                 $("#dateEditor").modal("show");
             });