From 263b77c6bea73fcef9fee7034170915c80a7cf9c Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Thu, 3 Nov 2022 15:41:07 +0000
Subject: [PATCH] Bug 31819: Fix formatting of item form in acq when ordering

To test:
1. Apply patch and regenerate CSS ( yarn build )
2. Add to order from an empty record to an order, make sure the page looks good.
3. Add to order from an existing record to an order, make sure the page looks good.
4. In neworderempty.pl add some new items to the order by clicking 'Add item'. The item lists table should now appear, confirm it looks right.
5. Save the form, ensuring everthing still works as it should.
---
 .../prog/css/src/staff-global.scss              | 17 +++++++++++++++++
 .../prog/en/modules/acqui/neworderempty.tt      | 15 ++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 115128e8bb9..269eb834142 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -2571,6 +2571,23 @@ td.bundle {
     }
 }
 
+#acq_neworderempty {
+    .subfield_line {
+        display: flex;
+        flex-basis: 100%;
+    }
+
+    fieldset.rows label, fieldset.rows span.label {
+      flex-basis: 25% !important;
+      font-size: 100%;
+      margin-right: 1rem;
+    }    
+
+    input[type="text"], select {
+      flex-basis: 50%;
+    }
+}
+
 #ADD-contact {
     margin: 0 0 8px 8px;
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 49142ebc3df..ecc07af1d10 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -284,9 +284,9 @@
     [% UNLESS subscriptionid || basket.is_standing %][% # it is a suggestion, we have not items %]
       [% IF (AcqCreateItemOrdering) %]
 
-      <div id="items_list" style="display:none">
-          <p><strong>Items list</strong></p>
-          <div style="width:100%;overflow:auto;">
+      <fieldset id="items_list" style="display:none">
+          <div class="page-section"style="width:100%;overflow:auto;">
+            <legend>Items list</legend>
               <table>
                   <thead>
                       <tr>
@@ -310,7 +310,7 @@
                   </tbody>
               </table>
           </div>
-      </div>
+      </fieldset>
 
       <fieldset class="rows" id="itemfieldset">
           <legend>Item</legend>
@@ -396,6 +396,8 @@
                 [% END %]
                 </select>
                 <span class="required">Required</span>
+            </li>
+            <li>
                 <label for="showallbudgets" style="float:none;">&nbsp;Show inactive:</label>
                 <input type="checkbox" id="showallbudgets" />
             </li>
@@ -486,10 +488,9 @@
             </li>
             <li>
                 <label for="estimated_delivery_date">Estimated delivery date: </label>
-                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>
-                <div class="hint">[% INCLUDE 'date-format.inc' %]</div>
+                <input type="text" id="estimated_delivery_date" size="10" name="estimated_delivery_date" class="flatpickr" value="[% estimated_delivery_date | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]
             </li>
-            <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
+            <li>
                 <label for="sort1">Statistic 1: </label>
                 <input id="sort1" type="text" id="sort1" size="20" name="sort1" value="[% sort1 | html %]" />
             <li>
-- 
2.30.2