@@ -, +, @@ payments --- .../intranet-tmpl/prog/en/modules/pos/register.tt | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -113,9 +113,9 @@ [% credit.debit.amount | $Price %] - [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED' ) %] - - [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber %] + [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %] + + [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %] [% END %] @@ -192,7 +192,7 @@ [% IF credit.debit %] [% accountline.accountlines_id | html %] - { "type": "credit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% accountline.payment_type | html %])", "amount": "[% accountline.amount * -1 | $Price %]" } + { "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 %] [%- PROCESS account_type_description account=credit.debit -%] @@ -202,8 +202,10 @@ [% credit.debit.amount | $Price %] - [% IF CAN_user_cash_management_refund_cash_registers && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %] + [% IF CAN_user_cash_management_anonymous_refund && !(credit.debit.status == 'REFUNDED') && !(credit.debit.debit_type_code == 'PAYOUT') %] + [% ELSIF CAN_user_updatecharges_refund && !(credit.debit.status == 'REFUNDED') && credit.debit.borrowernumber && !(credit.debit.debit_type_code == 'PAYOUT') %] + [% END %] @@ -214,11 +216,13 @@ [% IF debit.credit %] [% accountline.accountlines_id | html %] - { "type": "debit", "identifier": "[%- accountline.credit_number | html -%]", "description": "[%- PROCESS account_type_description account=accountline -%] ([% 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 %]" } [%- PROCESS account_type_description account=debit.credit -%] - [%- IF debit.credit.description %][% debit.credit.description | html %][% END %] -  [% IF ( debit.credit.itemnumber ) %][% debit.credit.item.biblio.title | html %][% END %] + + [%- IF debit.credit.description %][% debit.credit.description | html %][%- END -%] + [%- IF ( debit.credit.itemnumber ) -%] ([% debit.credit.item.biblio.title | html %])[%- END -%] + [% debit.credit.amount | $Price %] --