@@ -, +, @@
---
.../intranet-tmpl/prog/en/modules/pos/pay.tt | 1 -
.../prog/en/modules/pos/register.tt | 41 ++++++++++++-------
2 files changed, 27 insertions(+), 15 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/pay.tt
@@ -185,7 +185,6 @@
[% END %]
[% MACRO jsinclude BLOCK %]
- [% Asset.js("js/admin-menu.js") | $raw %]
[% INCLUDE 'format_price.inc' %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("lib/jquery/plugins/jquery.jeditable.mini.js") | $raw %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -9,6 +9,7 @@
[% INCLUDE 'doc-head-open.inc' %]
Koha › Cashup
[% INCLUDE 'doc-head-close.inc' %]
+[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
@@ -53,6 +54,9 @@
Receipt ID
|
+
+ Transaction
+ |
Description of charges
|
@@ -69,22 +73,10 @@
[% FOREACH accountline IN accountlines %]
[% IF accountline.is_credit %]
-
- [% accountline.accountlines_id %] |
-
- [%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])
- |
- |
-
- [% accountline.amount * -1 | $Price %]
- |
-
-
- |
-
[% FOREACH credit IN accountline.credit_offsets %]
[% accountline.accountlines_id %] |
+ { "type": "credit", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" } |
[%- PROCESS account_type_description account=credit.debit -%] |
[% credit.debit.amount | $Price %] |
|
@@ -96,7 +88,7 @@
- Total income: |
+ Total income: |
[% accountlines.total * -1 | $Price %] |
|
@@ -113,7 +105,28 @@
[% MACRO jsinclude BLOCK %]
+ [% INCLUDE 'datatables.inc' %]
+ [% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]