From 1169b729ef43fe5109301d2793f8d94e10eaf245 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 24 Oct 2018 16:09:12 +0000 Subject: [PATCH] Bug 21913: Clean up payment details page This patch makes various corrections and improvements to the payment details page: - Grid converted to Bootstrap - Correct title tag - Add patron toolbar - Adding missing patron-related JavaScript - Improve some language To test, apply the patch and locate a patron who has one or more payments on their account. - Open Fines -> Account -> Details of a transaction - Confirm that the page looks correct and adjusts well at various browser widths. - Confirm that patron toolbar items work correctly Signed-off-by: Jose-Mario Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../en/modules/members/accountline-details.tt | 148 ++++++++++-------- 1 file changed, 85 insertions(+), 63 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 48292b55f6..1e9855bbc2 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 @@ -1,29 +1,40 @@ +[% USE raw %] +[% USE Asset %] [%- USE Price -%] [%- USE KohaDates -%] [%- USE AuthorisedValues -%] [%- USE Branches -%] - +[% SET footerjs = 1 %] [% PROCESS 'accounts.inc' %] - [% INCLUDE 'doc-head-open.inc' %] -Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %] +Koha › Patrons › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Details of fee [% INCLUDE 'doc-head-close.inc' %] - + + [% INCLUDE 'header.inc' %] [% INCLUDE 'patron-search.inc' %] - + + +
+
+
+
+ + [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] -
-
-
-
[% IF accountline %] [% IF type == 'credit' %] -

Details for payment

+

Details of payment

[% ELSIF type == 'debit' %] -

Details for fee

+

Details of fee

[% END %] @@ -73,69 +84,80 @@
+ [% IF type == 'credit' %]

Fees paid

[% ELSIF type == 'debit' %]

Payments

[% END %] - [% IF account_offsets %] - - - - - - - - - - - - - - - - - - - [% FOREACH ao IN account_offsets %] - [% IF type == 'credit' %] - [% SET offset_accountline = ao.debit %] - [% ELSIF type == 'debit' %] - [% SET offset_accountline = ao.credit %] - [% END %] +
Date createdDate updatedAmountAmount outstandingTypeNoteTransacting librarianDate/Time of changeAmount of changeType of change 
+ + + + + + + + + + + + + + + - [% IF offset_accountline %] - - - - - - - - - - - - - - [% END %] + + [% FOREACH ao IN account_offsets %] + [% IF type == 'credit' %] + [% SET offset_accountline = ao.debit %] + [% ELSIF type == 'debit' %] + [% SET offset_accountline = ao.credit %] [% END %] - -
Date createdDate updatedAmountAmount outstandingTypeNoteTransacting librarianDate/time of changeAmount of changeType of change 
[% offset_accountline.date | $KohaDates %][% offset_accountline.timestamp | $KohaDates with_hours => 1 %][% offset_accountline.amount | $Price %][% offset_accountline.amountoutstanding | $Price %][% PROCESS account_type_description account=offset_accountline %][% offset_accountline.note | html %][% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %][% ao.created_on | $KohaDates with_hours => 1 %][% ao.amount | $Price %][% PROCESS offset_type_description account_offset=ao %] Details
- [% ELSE %] - No details available for this payment. - [% END %] + + [% IF offset_accountline %] + + [% offset_accountline.date | $KohaDates %] + [% offset_accountline.timestamp | $KohaDates with_hours => 1 %] + [% offset_accountline.amount | $Price %] + [% offset_accountline.amountoutstanding | $Price %] + [% PROCESS account_type_description account=offset_accountline %] + [% offset_accountline.note | html %] + [% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %] + [% ao.created_on | $KohaDates with_hours => 1 %] + [% ao.amount | $Price %] + [% PROCESS offset_type_description account_offset=ao %] + Details + + [% END %] + [% END %] + + [% ELSE %]
-

Account line not found.

+ [% IF type == 'credit' %] + Payment not found + [% ELSIF type == 'debit' %] + Fee not found + [% END %]
[% END %] -
-
-
- [% INCLUDE 'circ-menu.inc' %] -
-
+
+
+ +
+ +
+
+ + +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'str/members-menu.inc' %] + [% Asset.js("js/members-menu.js") | $raw %] +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5