From 1c22c56c9e5274241fb56a60b9039794663351af Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 17 May 2021 08:17:14 +0100 Subject: [PATCH] Bug 22435: Alternative Three - Account Details Another alternative to try, feedback welcome. Signed-off-by: Victor Grousset/tuxayo Signed-off-by: Nick Clemens --- .../en/modules/members/accountline-details.tt | 51 ++++++++++++------- 1 file changed, 34 insertions(+), 17 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 502b6a78a0..c6e9fb6285 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 @@ -7,7 +7,7 @@ [% SET footerjs = 1 %] [% PROCESS 'accounts.inc' %] [% INCLUDE 'doc-head-open.inc' %] -Details of fee › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha +Details of [% IF type == 'credit' %]credit[% ELSE %]debit[% END %] › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Patrons › Koha [% INCLUDE 'doc-head-close.inc' %] @@ -24,24 +24,27 @@ Patrons - [% IF type == 'credit' %] + + [% IF accountline %] + [% IF accountline.credit_type_code %]
  • Account for [% INCLUDE 'patron-title.inc' %]
  • - Details of payment + Details of credit ([% accountline.id | html %])
  • - [% ELSIF type == 'debit' %] + [% ELSIF accountline.debit_type_code %]
  • Account for [% INCLUDE 'patron-title.inc' %]
  • - Details of fee + Details of debit ([% accountline.id | html %])
  • + [% END %] [% ELSE %]
  • @@ -61,16 +64,16 @@ [% IF accountline %] [% IF accountline.credit_type_code %] -

    Details of payment

    +

    Details of credit

    [% ELSIF accountline.debit_type_code %] -

    Details of fee

    +

    Details of debit

    [% END %] - + @@ -83,7 +86,7 @@
    DateDescription of chargesDescription Barcode Due date Return date
    - [% accountline.date |$KohaDates %] + [% accountline.date | $KohaDates %] [%- PROCESS account_type_description account=accountline -%] @@ -138,11 +141,17 @@ - - - - - + + + + + + + + + + + @@ -167,14 +176,17 @@ - + + + [%- IF offset_accountline -%] + + [%- ELSE -%] + + + + [%- END -%] [% END %] -- 2.20.1
    DateChangeActionRelationTransacting librarianDateChangeActionRelated transaction
    IncreaseDecreaseTypeAmountLibrarian Note
    [% ao.created_on | $KohaDates with_hours => 1%][% ao.amount | $Price %][%- IF ao.amount > 0 -%][% ao.amount | $Price %][% END %][%- IF ao.amount < 0 -%][% ao.amount | $Price %][% END %] [% PROCESS ao_description ao=ao %] - [%- IF offset_accountline -%] [% PROCESS account_type_description account=offset_accountline %] ([% offset_accountline.id | html %]) - [%- END -%] + + [% offset_accountline.amount | $Price %] [% IF offset_accountline.manager_id %] @@ -187,6 +199,11 @@ [% END %] [% offset_accountline.note | html %]