From 6f306ec38ce537d177d1fce2f9fbf81868485b22 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 - Confirm that the payments table only appears when there are payments to list. --- .../prog/en/modules/members/accountline-details.tt | 78 ++++++++++++++-------- 1 file changed, 51 insertions(+), 27 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 ae66f7e..fc0aec3 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,13 +84,14 @@
- [% IF type == 'credit' %] -

Fees paid

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

Payments

- [% END %] - [% IF account_offsets %] + [% IF account_offsets.count > 0 %] + [% IF type == 'credit' %] +

Fees paid

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

Payments

+ [% END %] + @@ -90,7 +102,7 @@ - + @@ -123,19 +135,31 @@ [% END %]
Type Note Transacting librarianDate/Time of changeDate/time of change Amount of change Type of change  
- [% ELSE %] - No details available for this payment. [% 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.1.4