From 1100dcf0fc69de841eef23f8e1b3c1b390b48fbc Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 25 Feb 2021 14:20:14 +0000
Subject: [PATCH] Bug 27795: Misalignment of TOTAL value in lateorders page

This patch corrects the colspan in the footer of the late orders page.

It also adds a quantity total cell to the footer and changes the
container of the buttons at the bottom of the page from a <p> tag to
the standard <fieldset class="action">.

To test, apply the patch and go to Acquisitions -> Late orders.

In the footer of the late orders page, there should be a total under the
"Quantity" column. The total cost number should be correctly aligned
under the "total cost" header cell.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 42a32bc1727dc4723e07a83cc53e5951a09a20b2)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../prog/en/modules/acqui/lateorders.tt              | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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 16ed1d54f5..58955f8ba4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -50,6 +50,7 @@
 	</p>
 	[% END %]
     [% SET total = 0 %]
+    [% SET total_quantity = 0 %]
     [% IF bookseller_filter %]
         <p><a id="CheckAll" href="#"><i class="fa fa-check"></i> Check all</a> <a id="CheckNone" href="#"><i class="fa fa-remove"></i> Uncheck all</a></p>
     [% END %]
@@ -108,7 +109,10 @@
                         [% END %]
                    [% END %]
             </td>
-            <td>[% lateorder.quantity | html %]</td>
+            <td>
+                [% lateorder.quantity | html %]
+                [% SET total_quantity = total_quantity + lateorder.quantity %]
+            </td>
             <td>
                 [% SET subtotal = (lateorder.quantity - lateorder.quantityreceived) * lateorder.rrp %]
                 [% SET total = total + subtotal %]
@@ -176,14 +180,14 @@
       <tfoot>
         <tr>
             <th colspan="6">Total</th>
+            <th>[% total_quantity | html %]</th>
             <th>[% total | $Price %]</th>
             <th colspan="10">&nbsp;</th>
         </tr>
       </tfoot>
     </table>
-    <div class="spacer"></div>
 
-    <p style="display:block;">
+    <fieldset class="action">
         <div class="btn-group">
           <a id="exportbutton" class="btn btn-default" href="/cgi-bin/koha/acqui/lateorders-export.pl"><i class="fa fa-download"></i> Export as CSV</a>
           <a class="btn btn-default dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></a>
@@ -198,7 +202,7 @@
         </div>
 
         <input type="submit"  class="btn btn-default" value="Claim order" />
-    </p>
+    </fieldset>
 </form>
 [% ELSE %]<p>There are no late orders.</p>
 [% END %]
-- 
2.39.5