@@ -, +, @@
---
.../en/includes/modals/cashup_summary.inc | 33 ++++++++++
.../prog/en/modules/pos/register.tt | 65 ++-----------------
.../intranet-tmpl/prog/js/cashup_modal.js | 52 +++++++++++++++
3 files changed, 89 insertions(+), 61 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/modals/cashup_summary.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/js/cashup_modal.js
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cashup_summary.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cashup_summary.inc
@@ -0,0 +1,33 @@
+
+
+
+
+
+
+
+ - Cash register:
+ - Period: to
+
+
+
+
+ Type |
+ Total |
+
+
+
+
+
+
+
+
+
+
+
+
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -59,8 +59,7 @@
Summary
[% IF register.last_cashup %]
- - Last cashup: [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (Summary)
-
+ - Last cashup: [% register.last_cashup.timestamp | $KohaDates with_hours => 1 %] (Summary)
[% END %]
- Float: [% register.starting_float | $Price %]
- Total income (cash): [% accountlines.credits_total * -1 | $Price %] ([% accountlines.credits_total(payment_type => 'CASH') * -1 | $Price %])
@@ -304,68 +303,12 @@
-
- [% IF register.last_cashup %]
-
-
-
-
-
-
- - Cash register: [% register.description | html %]
- - Period: [% register.last_cashup.cashup_summary.from_date | $KohaDates with_hours => 1 %] to [% register.last_cashup.cashup_summary.to_date | $KohaDates with_hours => 1 %]
-
-
-
-
- Type |
- Total |
-
-
-
- [%- FOREACH out IN register.last_cashup.cashup_summary.outgoing -%]
-
- [%- PROCESS account_type_description account=out -%] |
- [% out.total * -1 | $Price %] |
-
- [%- END -%]
- [%- FOREACH in IN register.last_cashup.cashup_summary.income -%]
-
- [%- PROCESS account_type_description account=in -%] |
- [% in.total * -1 | $Price %] |
-
- [%- END -%]
-
-
-
- Total |
- [% ( register.last_cashup.cashup_summary.outgoing_transactions.total + register.last_cashup.cashup_summary.income_transactions.total) * -1 | $Price %] |
-
- [% FOREACH pt IN payment_types %]
-
- [% pt.lib | html %] |
- [% ( register.last_cashup.cashup_summary.outgoing_transactions.total( payment_type => pt.authorised_value ) + register.last_cashup.cashup_summary.income_transactions.total( payment_type => pt.authorised_value )) * -1 | $Price %] |
-
- [% END %]
-
-
-
-
-
-
-
-
- [% END %]
+ [% INCLUDE 'modals/cashup_summary.inc' %]
-[% MACRO jsinclude BLOCK %]
+ [% MACRO jsinclude BLOCK %]
[% INCLUDE 'datatables.inc' %]
[% Asset.js("lib/jquery/plugins/rowGroup/dataTables.rowGroup.min.js") | $raw %]
+ [% Asset.js("js/cashup_modal.js") | $raw %]
[% INCLUDE 'calendar.inc' %]