Bugzilla – Attachment 83793 Details for
Bug 21913
Clean up payment details page
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21913: Clean up payment details page
Bug-21913-Clean-up-payment-details-page.patch (text/plain), 10.02 KB, created by
Owen Leonard
on 2019-01-11 14:09:33 UTC
(
hide
)
Description:
Bug 21913: Clean up payment details page
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2019-01-11 14:09:33 UTC
Size:
10.02 KB
patch
obsolete
>From 2d86127535af455e9cd897e1dd8d296ca3f7d9a8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 >--- > .../prog/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 48292b5..1e9855b 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' %] >-<title>Koha › Patrons › Account for [% INCLUDE 'patron-title.inc' %]</title> >+<title>Koha › Patrons › [% INCLUDE 'patron-title.inc' no_html = 1 %] › Details of fee</title> > [% INCLUDE 'doc-head-close.inc' %] > </head> >-<body id="pat_discharges" class="pat"> >+ >+<body id="pat_accountline_details" class="pat"> > [% INCLUDE 'header.inc' %] > [% INCLUDE 'patron-search.inc' %] > >-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account for [% INCLUDE 'patron-title.inc' %]</a> › Details for account line [% accountline.id | html %]</div> >+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> › <a href="/cgi-bin/koha/members/boraccount.pl?borrowernumber=[% patron.borrowernumber | html %]">Account for [% INCLUDE 'patron-title.inc' %]</a> › >+ [% IF type == 'credit' %] >+ Details of payment >+ [% ELSIF type == 'debit' %] >+ Details of fee >+ [% END %] >+</div> >+ >+<div class="main container-fluid"> >+ <div class="row"> >+ <div class="col-sm-10 col-sm-push-2"> >+ <main> >+ >+ [% INCLUDE 'members-toolbar.inc' borrowernumber=patron.borrowernumber %] > >-<div id="doc3" class="yui-t2"> >-<div id="bd"> >- <div id="yui-main"> >- <div class="yui-b"> > [% IF accountline %] > [% IF type == 'credit' %] >- <h2>Details for payment</h2> >+ <h2>Details of payment</h2> > [% ELSIF type == 'debit' %] >- <h2>Details for fee</h2> >+ <h2>Details of fee</h2> > [% END %] > > <table id="table_account_fines"> >@@ -73,69 +84,80 @@ > </tbody> > </table> > >+ > [% IF type == 'credit' %] > <h3>Fees paid</h3> > [% ELSIF type == 'debit' %] > <h3>Payments</h3> > [% END %] > >- [% IF account_offsets %] >- <table class="accountline-offsets-table" id="accountline-debits-table"> >- <thead> >- <tr> >- <th>Date created</th> >- <th>Date updated</th> >- <th>Amount</th> >- <th>Amount outstanding</th> >- <th>Type</th> >- <th>Note</th> >- <th>Transacting librarian</th> >- <th>Date/Time of change</th> >- <th>Amount of change</th> >- <th>Type of change</th> >- <th> </th> >- </tr> >- </thead> >- >- <tbody> >- [% FOREACH ao IN account_offsets %] >- [% IF type == 'credit' %] >- [% SET offset_accountline = ao.debit %] >- [% ELSIF type == 'debit' %] >- [% SET offset_accountline = ao.credit %] >- [% END %] >+ <table class="accountline-offsets-table" id="accountline-debits-table"> >+ <thead> >+ <tr> >+ <th>Date created</th> >+ <th>Date updated</th> >+ <th>Amount</th> >+ <th>Amount outstanding</th> >+ <th>Type</th> >+ <th>Note</th> >+ <th>Transacting librarian</th> >+ <th>Date/time of change</th> >+ <th>Amount of change</th> >+ <th>Type of change</th> >+ <th> </th> >+ </tr> >+ </thead> > >- [% IF offset_accountline %] >- <tr> >- <td>[% offset_accountline.date | $KohaDates %]</td> >- <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 %]</td> >- <td>[% offset_accountline.amount | $Price %]</td> >- <td>[% offset_accountline.amountoutstanding | $Price %]</td> >- <td>[% PROCESS account_type_description account=offset_accountline %]</td> >- <td>[% offset_accountline.note | html %]</td> >- <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td> >- <td>[% ao.created_on | $KohaDates with_hours => 1 %]</td> >- <td>[% ao.amount | $Price %]</td> >- <td>[% PROCESS offset_type_description account_offset=ao %]</td> >- <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td> >- </tr> >- [% END %] >+ <tbody> >+ [% FOREACH ao IN account_offsets %] >+ [% IF type == 'credit' %] >+ [% SET offset_accountline = ao.debit %] >+ [% ELSIF type == 'debit' %] >+ [% SET offset_accountline = ao.credit %] > [% END %] >- </tbody> >- </table> >- [% ELSE %] >- No details available for this payment. >- [% END %] >+ >+ [% IF offset_accountline %] >+ <tr> >+ <td>[% offset_accountline.date | $KohaDates %]</td> >+ <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 %]</td> >+ <td>[% offset_accountline.amount | $Price %]</td> >+ <td>[% offset_accountline.amountoutstanding | $Price %]</td> >+ <td>[% PROCESS account_type_description account=offset_accountline %]</td> >+ <td>[% offset_accountline.note | html %]</td> >+ <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | uri %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td> >+ <td>[% ao.created_on | $KohaDates with_hours => 1 %]</td> >+ <td>[% ao.amount | $Price %]</td> >+ <td>[% PROCESS offset_type_description account_offset=ao %]</td> >+ <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td> >+ </tr> >+ [% END %] >+ [% END %] >+ </tbody> >+ </table> > [% ELSE %] > <div class="dialog message"> >- <p>Account line not found.</p> >+ [% IF type == 'credit' %] >+ Payment not found >+ [% ELSIF type == 'debit' %] >+ Fee not found >+ [% END %] > </div> > [% END %] >- </div> >- </div> > >- <div class="yui-b"> >- [% INCLUDE 'circ-menu.inc' %] >- </div> >-</div> >+ </main> >+ </div> <!-- /.col-sm-10.col-sm-push-2 --> >+ >+ <div class="col-sm-2 col-sm-pull-10"> >+ <aside> >+ [% INCLUDE 'circ-menu.inc' %] >+ </aside> >+ </div> <!-- /.col-sm-2.col-sm-pull-10 --> >+ </div> <!-- /.row --> >+ >+ >+[% MACRO jsinclude BLOCK %] >+ [% INCLUDE 'str/members-menu.inc' %] >+ [% Asset.js("js/members-menu.js") | $raw %] >+[% END %] >+ > [% INCLUDE 'intranet-bottom.inc' %] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21913
:
82757
|
83793
|
83828
|
83848