Bugzilla – Attachment 97017 Details for
Bug 23354
Add a 'Point of sale' screen to allow anonymous payments
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23354: (follow-up) Responses to feedback
Bug-23354-follow-up-Responses-to-feedback.patch (text/plain), 5.85 KB, created by
Kyle M Hall (khall)
on 2020-01-08 16:09:48 UTC
(
hide
)
Description:
Bug 23354: (follow-up) Responses to feedback
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2020-01-08 16:09:48 UTC
Size:
5.85 KB
patch
obsolete
>From 5987acd015bb9aa45fb4492418f91f8d1101318d 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 > >Sponsored-by: PTFS Europe >Sponsored-by: Cheshire Libraries Shared Services > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > .../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 @@ > <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.21.0 (Apple Git-122.2)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23354
:
92066
|
92431
|
92432
|
92433
|
92502
|
92830
|
92831
|
92832
|
92833
|
92834
|
92873
|
92874
|
92875
|
92876
|
92877
|
92878
|
92890
|
92891
|
92892
|
92893
|
92894
|
92895
|
93116
|
93117
|
93118
|
93119
|
93120
|
93121
|
93122
|
93123
|
93124
|
93465
|
93466
|
93467
|
93468
|
93469
|
93470
|
93471
|
93472
|
93473
|
93604
|
93605
|
93606
|
93607
|
93608
|
93609
|
93610
|
93611
|
93612
|
94689
|
94690
|
94691
|
94692
|
94693
|
94694
|
94695
|
94696
|
94697
|
94698
|
94699
|
95678
|
95679
|
95680
|
95681
|
95682
|
95683
|
95684
|
95685
|
95686
|
95687
|
95688
|
95689
|
95690
|
95691
|
95692
|
95693
|
97013
|
97014
|
97015
|
97016
|
97017
|
97018
|
97019
|
97020
|
97021
|
97022
|
97023
|
97024
|
97025
|
97026
|
97027
|
97028
|
97029
|
97169
|
97170
|
97171
|
97188
|
97189
|
97200
|
97201
|
97202
|
97203
|
97204
|
97205
|
97206
|
97207
|
97208
|
97209
|
97210
|
97211
|
97212
|
97213
|
97214
|
97215
|
97216
|
97217
|
97218
|
97219
|
97271
|
97272
|
97273
|
97274
|
97275
|
97276
|
97277
|
97278
|
97279
|
97280
|
97281
|
97282
|
97283
|
97284
|
97285
|
97286
|
97287
|
97288
|
97289
|
97290
|
97291
|
97292
|
97725
|
97726
|
100167