From f0ac00147c24b7c26c9c794700a4fb98af39993e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Fri, 18 Nov 2022 16:29:46 +0000 Subject: [PATCH] Bug 32254: (follow-up) Add missing div around "Older transactions" To test: - Tools -> Cash summary for and Tools -> Transaction history for - In the "Older transactions" section, submit start and end dates which will return results. - The table of results should be styled correctly. --- .../prog/en/modules/pos/register.tt | 126 +++++++++--------- 1 file changed, 64 insertions(+), 62 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt index bcc34136ae..c479770d01 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -197,73 +197,75 @@ [% IF trange_f %] - - - - - - - - - - - - [% FOREACH accountline IN past_accountlines %] - [% IF accountline.is_credit %] - [% FOREACH credit IN accountline.credit_offsets %] - [% IF credit.debit %] - - - - - - - -
IDDATATransactionDescriptionPriceTotalActions
[% 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 %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } - [%- PROCESS account_type_description account=credit.debit -%] - [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%] - [%- IF ( credit.debit.itemnumber ) -%] ([% credit.debit.item.biblio.title | html %])[%- END -%] - [% credit.debit.amount | $Price %] - [% 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') %] - +
+ + + + + + + + + + + + [% FOREACH accountline IN past_accountlines %] + [% IF accountline.is_credit %] + [% FOREACH credit IN accountline.credit_offsets %] + [% IF credit.debit %] + + + + + + + + + [% END %] - - - [% END %] + [% END %] + [% ELSE %] + [% FOREACH debit IN accountline.debit_offsets %] + [% IF debit.credit %] + + + + + + + + + + [% END %] + [% END %] + [% END %] [% END %] - [% ELSE %] - [% FOREACH debit IN accountline.debit_offsets %] - [% IF debit.credit %] + + - - + + - - - - - [% END %] - [% END %] - [% END %] - [% END %] - - - - - - - - -
IDDATATransactionDescriptionPriceTotalActions
[% 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 %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } + [%- PROCESS account_type_description account=credit.debit -%] + [%- IF credit.debit.description -%] ([% credit.debit.description | html %])[%- END -%] + [%- IF ( credit.debit.itemnumber ) -%] ([% credit.debit.item.biblio.title | html %])[%- END -%] + [% credit.debit.amount | $Price %] + [% 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 %] +
[% 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 %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" } + [%- 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 -%] + [% debit.credit.amount | $Price %] + [%- IF debit.credit.credit_type_code == 'REFUND' -%] Details[%- END -%] +
[% 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 %]", "timestamp": "[% accountline.timestamp | $KohaDates with_hours => 1 %]" }Total income: [% past_accountlines.total * -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 -%] - [% debit.credit.amount | $Price %] - [%- IF debit.credit.credit_type_code == 'REFUND' -%] Details[%- END -%] -
Total income: [% past_accountlines.total * -1 | $Price %]
+ +
+ [% END %]
-- 2.20.1