From dd2dc613a361b379a229e34cabdcb68493a46a8f Mon Sep 17 00:00:00 2001 From: Martin Renvoize 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 Sponsored-by: PTFS Europe Sponsored-by: Cheshire Libraries Shared Services Signed-off-by: Kyle M Hall Signed-off-by: Josef Moravec Signed-off-by: Martin Renvoize --- .../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 13c6789ec3..5e02ed1d3c 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -3897,6 +3897,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 @@
+
+
+ Items for purchase + Please select items from below to add to this transaction: + [% SET invoice_types = AuthorisedValues.GetAuthValueDropbox('MANUAL_INV') %] + [% IF invoice_types %] + + + + + + + + + + + [% FOREACH invoice IN invoice_types %] + + + + + + + [% END %] +
CodeDescriptionCostAction
[% invoice.authorised_value | html %][% invoice.lib_opac | html %][% invoice.lib | html %] + +
+ [% ELSE %] + You have no manual invoice types defined + [% END %] +
+
+
@@ -102,38 +135,6 @@
-
-
- Items for purchase - [% SET invoice_types = AuthorisedValues.GetAuthValueDropbox('MANUAL_INV') %] - [% IF invoice_types %] - - - - - - - - - - - [% FOREACH invoice IN invoice_types %] - - - - - - - [% END %] -
CodeDescriptionCostAction
[% invoice.authorised_value | html %][% invoice.lib_opac | html %][% invoice.lib | html %] - -
- [% ELSE %] - You have no manual invoice types defined - [% END %] -
-
-
Cancel @@ -272,7 +273,7 @@ return '£'+price; } }, { - "aTargets": [-2, -3], + "aTargets": [-3, -4], "sClass" : "editable", }], "aaSorting": [ -- 2.39.5