From 0ef8e6aff959c54622897f77eded0c3ae6772bf4 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 28 Feb 2023 16:40:34 +0000 Subject: [PATCH] Bug 33090: Add page-section to accountline-details This patch adds page-section containers to the accountlines details display page. Note: This patch contains whitespace changes, so use diff accordingly. To test, apply the patch and locate a patron with charges on their account (lost item fee, account renewal fee, overdue fine, etc). - From the patron detail page, click the "Accounting" tab in the sidebar menu. - Click the "Transactions" tab. - Click the "Details" button for an individual charge. - On the transaction detail page, confirm that the page sections look correct. Signed-off-by: Owen Leonard Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- .../en/modules/members/accountline-details.tt | 275 +++++++++--------- 1 file changed, 140 insertions(+), 135 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index 4890fd27e9..55385bd360 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -81,159 +81,164 @@

Details of debit

[% END %] - - - - - - - - - - [% FOREACH value IN af_values %] - - [% END %] - - - - - - - - - + [% END %] -

History

-
DateDescriptionBarcodeDue dateReturn dateNote[% value.field.name | html %]AmountOutstanding
- [% accountline.date | $KohaDates %] - - [%- PROCESS account_type_description account=accountline -%] - [%- IF accountline.payment_type -%] - , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %] - [%- END =%] - [%- IF accountline.description -%] - , [% accountline.description | html %] - [%- END -%] +
-   - [% IF ( accountline.itemnumber ) %] - [% SET biblio = accountline.item.biblio %] - [% biblio.title | html %] + + + + + + + + + + [% FOREACH value IN af_values %] + [% END %] - + + + + - + + + + +   + [% IF ( accountline.itemnumber ) %] + [% SET biblio = accountline.item.biblio %] + [% biblio.title | html %] + [% END %] + - + - + - [% FOREACH value IN af_values %] - [% END %] - + - - - -
DateDescriptionBarcodeDue dateReturn dateNote[% value.field.name | html %]AmountOutstanding
- [% IF ( accountline.itemnumber ) %] - [% accountline.item.barcode | html %] - [% END %] -
+ [% accountline.date | $KohaDates %] + + [%- PROCESS account_type_description account=accountline -%] + [%- IF accountline.payment_type -%] + , [% AuthorisedValues.GetByCode('PAYMENT_TYPE', accountline.payment_type) | html %] + [%- END =%] + [%- IF accountline.description -%] + , [% accountline.description | html %] + [%- END -%] - - [% IF ( accountline.issue_id ) %] - [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %] - [% END %] - - [% IF ( accountline.issue_id ) %] - [% accountline.checkout.returndate | $KohaDates with_hours => 1 %] - [% END %] - + [% IF ( accountline.itemnumber ) %] + [% accountline.item.barcode | html %] + [% END %] + - [% accountline.note | html_line_break %] - + [% IF ( accountline.issue_id ) %] + [% accountline.checkout.date_due | $KohaDates as_due_date => 1 %] + [% END %] + - [% IF value.field.authorised_value_category %] - [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %] - [% ELSE %] - [% value.value | html %] + [% IF ( accountline.issue_id ) %] + [% accountline.checkout.returndate | $KohaDates with_hours => 1 %] [% END %] - [% accountline.amount | $Price %] - + [% accountline.note | html_line_break %] + - [% accountline.amountoutstanding | $Price %] -
+ [% FOREACH value IN af_values %] +
+ [% IF value.field.authorised_value_category %] + [% AuthorisedValues.GetByCode( value.field.authorised_value_category, value.value ) | html %] + [% ELSE %] + [% value.value | html %] + [% END %] +
- - - - - - - - - - - - - - - - + - - [% FOREACH ao IN account_offsets %] - [% IF ao.credit_id == accountline.accountlines_id %] - [% SET offset_accountline = ao.debit %] - [% ELSIF ao.debit_id == accountline.accountlines_id %] - [% SET offset_accountline = ao.credit %] - [% END %] + + + +
DateChangeActionRelated transaction
IncreaseDecreaseTypeAmountLibrarianNote
+ [% accountline.amount | $Price %] +
+ [% accountline.amountoutstanding | $Price %] +
+ + +
+

History

+ + + + + + + + + + + + + + + + + - [%- BLOCK ao_description -%] - [%- SWITCH ao.type -%] - [%- CASE 'CREATE' -%]Created - [%- CASE 'OVERDUE_INCREASE' -%]Increase - [%- CASE 'OVERDUE_DECREASE' -%]Decrease - [%- CASE 'APPLY' -%]Applied - [%- CASE 'VOID' -%]Reversed + + [% FOREACH ao IN account_offsets %] + [% IF ao.credit_id == accountline.accountlines_id %] + [% SET offset_accountline = ao.debit %] + [% ELSIF ao.debit_id == accountline.accountlines_id %] + [% SET offset_accountline = ao.credit %] + [% END %] + + [%- BLOCK ao_description -%] + [%- SWITCH ao.type -%] + [%- CASE 'CREATE' -%]Created + [%- CASE 'OVERDUE_INCREASE' -%]Increase + [%- CASE 'OVERDUE_DECREASE' -%]Decrease + [%- CASE 'APPLY' -%]Applied + [%- CASE 'VOID' -%]Reversed + [%- END -%] [%- END -%] - [%- END -%] - - - - - - [%- IF offset_accountline -%] - - - + + + + + [%- IF offset_accountline -%] + + + - [%- ELSE -%] - - - - [%- END -%] - - - [% END %] - -
DateChangeActionRelated transaction
IncreaseDecreaseTypeAmountLibrarianNote
[% ao.created_on | $KohaDates with_hours => 1%][%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %][%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %] - [% PROCESS ao_description ao=ao %] - - [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) - - [% offset_accountline.amount | $Price %] - - [% IF offset_accountline.manager_id %] - - [% IF offset_accountline.manager.firstname %] - [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %] - [% ELSE %] - [% offset_accountline.manager.surname | html %] +
[% ao.created_on | $KohaDates with_hours => 1%][%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %][%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %] + [% PROCESS ao_description ao=ao %] + + [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) + + [% offset_accountline.amount | $Price %] + + [% IF offset_accountline.manager_id %] + + [% IF offset_accountline.manager.firstname %] + [% offset_accountline.manager.firstname | html %] [% offest_accountline.manager.surname | html %] + [% ELSE %] + [% offset_accountline.manager.surname | html %] + [% END %] + [% END %] - - [% END %] - [% offset_accountline.note | html %]
+ + [%- ELSE -%] + + + + [%- END -%] + [% offset_accountline.note | html %] + + [% END %] + + +
[% ELSE %]
Account not found -- 2.39.2