From 78e8195fdedd97b464874feacd9572469f09b2d0 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 5 Sep 2019 10:13:57 +0100
Subject: [PATCH] Bug 23354: (follow-up) Responses to feedback

This patch impliments a number of refinements requested after the first
round of feedback from the sponsors.

1) Fix padding on pay page
2) Switch 'items to add' from right to left on the page
3) Fix editable columns on pay page
4) Add explanitory text to pay page
---
 .../prog/css/src/staff-global.scss            |  9 +++
 .../intranet-tmpl/prog/en/modules/pos/pay.tt  | 67 ++++++++++---------
 2 files changed, 43 insertions(+), 33 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 60ced2786b..07288ff0b4 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -3829,6 +3829,15 @@ input.renew {
     }
 }
 
+#payForm {
+    fieldset {
+        &.rows {
+            padding-left: 1em;
+            padding-right: 2em;
+        }
+    }
+}
+
 #helper {
     span {
         display: none;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
index 163d64f05f..229703d137 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -27,6 +27,39 @@
         <form name="payForm" id="payForm" method="post" action="/cgi-bin/koha/pos/pay.pl">
             <div class="row">
 
+                <div class="col-sm-6">
+                    <fieldset class="rows">
+                        <legend>Items for purchase</legend>
+                            Please select items from below to add to this transaction:
+                            [% SET invoice_types = AuthorisedValues.GetAuthValueDropbox('MANUAL_INV') %]
+                            [% IF invoice_types %]
+                            <table id="invoices">
+                            <thead>
+                                <tr>
+                                    <th>Code</th>
+                                    <th>Description</th>
+                                    <th>Cost</th>
+                                    <th>Action</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                            [% FOREACH invoice IN invoice_types %]
+                                <tr>
+                                    <td>[% invoice.authorised_value | html %]</td>
+                                    <td>[% invoice.lib_opac | html %]</td>
+                                    <td>[% invoice.lib | html %]</td>
+                                    <td>
+                                        <button class="add_button" data-invoice-code="[% invoice.lib_opac %]" data-invoice-title="[% invoice.authorised_value | html %]" data-invoice-price="[% invoice.lib | html %]"><i class="fa fa-plus"></i> Add</button>
+                                    </td>
+                                </tr>
+                            [% END %]
+                            </table>
+                            [% ELSE %]
+                            You have no manual invoice types defined
+                            [% END %]
+                    </fieldset>
+                </div>
+
                 <div class="col-sm-6">
 
                     <fieldset class="rows">
@@ -102,38 +135,6 @@
                     </fieldset>
                 </div>
 
-                <div class="col-sm-6">
-                    <fieldset class="rows">
-                        <legend>Items for purchase</legend>
-                            [% SET invoice_types = AuthorisedValues.GetAuthValueDropbox('MANUAL_INV') %]
-                            [% IF invoice_types %]
-                            <table id="invoices">
-                            <thead>
-                                <tr>
-                                    <th>Code</th>
-                                    <th>Description</th>
-                                    <th>Cost</th>
-                                    <th>Action</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                            [% FOREACH invoice IN invoice_types %]
-                                <tr>
-                                    <td>[% invoice.authorised_value | html %]</td>
-                                    <td>[% invoice.lib_opac | html %]</td>
-                                    <td>[% invoice.lib | html %]</td>
-                                    <td>
-                                        <button class="add_button" data-invoice-code="[% invoice.lib_opac %]" data-invoice-title="[% invoice.authorised_value | html %]" data-invoice-price="[% invoice.lib | html %]"><i class="fa fa-plus"></i> Add</button>
-                                    </td>
-                                </tr>
-                            [% END %]
-                            </table>
-                            [% ELSE %]
-                            You have no manual invoice types defined
-                            [% END %]
-                    </fieldset>
-                </div>
-
                 <div class="action">
                     <input type="submit" name="submitbutton" value="Confirm" />
                     <a class="cancel" href="/cgi-bin/koha/pos/pay.pl">Cancel</a>
@@ -272,7 +273,7 @@
                     return '£'+price;
                 }
             }, {
-                "aTargets": [-2, -3],
+                "aTargets": [-3, -4],
                 "sClass" : "editable",
             }],
             "aaSorting": [
-- 
2.20.1