@@ -, +, @@
---
.../intranet-tmpl/prog/en/modules/pos/register.tt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt
@@ -103,8 +103,8 @@
[% IF credit.debit %]
[% accountline.accountlines_id | html %]
- { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }
- [% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]
+ { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }
+
[%- PROCESS account_type_description account=credit.debit -%]
[%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
@@ -127,7 +127,7 @@
[% IF debit.credit %]
[% accountline.accountlines_id | html %]
- { "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }
+ { "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }
[%- PROCESS account_type_description account=debit.credit -%]
@@ -192,8 +192,8 @@
[% IF credit.debit %]
[% accountline.accountlines_id | html %]
- { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]" }
- [% IF accountline.timestamp %][% accountline.timestamp | $KohaDates with_hours => 1 %][% END %]
+ { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% AuthorisedValues.GetByCode( 'PAYMENT_TYPE', accountline.payment_type ) | html %])", "amount": "[% accountline.amount * -1 | $Price %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }
+
[%- PROCESS account_type_description account=credit.debit -%]
[%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%]
@@ -342,7 +342,7 @@
var details = JSON.parse(rows.data().pluck(1).pop());
var identifier = details.identifier || group;
return $(' ')
- .append( ''+identifier+' ' )
+ .append( ''+details.timestamp+' ('+identifier+') ' )
.append( ''+details.description+' ' )
.append( ''+details.amount+' ' )
.append( ' ' + _("Print receipt") + ' ');
@@ -366,7 +366,7 @@
var details = JSON.parse(rows.data().pluck(1).pop());
var identifier = details.identifier || group;
return $(' ')
- .append( ''+identifier+' ' )
+ .append( ''+details.timestamp+' ('+identifier+') ' )
.append( ''+details.description+' ' )
.append( ''+details.amount+' ' )
.append( ' Print receipt ');
--