gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 16235: Making borrower account actions buttons 

EDIT: Fixing some indenting and adding actions class to the cells so the buttons don't wrap
EDIT: Comment 6
EDIT: Moving the buttons into one column
EDIT: Fixing typo and js error
EDIT: removing tabs

To test:
1) Go to a borrower's account page who has paid fines before
	a) Confirm column heading is now 'Actions' and covers both Reverse column and Print column
	b) Confirm Reverse and Print show as buttons and work as expected
2) Go to a borrower's account page who has never paid fines (or create a new borrower)
	a) Create a manual credit (just to put something in their account)
	b) Go back to their account page
	c) Confirm the Reverse column does not show as the column heading for Print is   (since there is only one action in this column and it's written on every button)
	d) Confirm Print shows as a button and works as expected

Sponsored-by: Catalyst IT

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Followed test plan. White spaces OK.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Aleisha 2016-04-11 02:10:54 +00:00 committed by Kyle M Hall
parent e6d3daea92
commit fb740c4d2b
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
View File

@ -14,7 +14,8 @@ $(document).ready(function() {
'aaSorting': [[0, 'desc']],
"sDom": 'C<"top pager"ilpf><"#filter_c">tr<"bottom pager"ip>',
"aoColumnDefs": [
{ "sType": "title-string", "aTargets" : [ "title-string" ] }
{ "sType": "title-string", "aTargets" : [ "title-string" ] },
{ "bSortable": false, "bSearchable": false, "aTargets": [-1] }
]
}));
$("#filter_c").html('<p><a href="#" id="filter_transacs">'+txtActivefilter+'</a>');
@ -66,9 +67,10 @@ $(document).ready(function() {
<th>Amount</th>
<th>Outstanding</th>
[% IF ( reverse_col ) %]
<th>Actions</th>
[% ELSE %]
<th>&nbsp;</th>
[% END %]
<th>Print</th>
</tr>
</thead>
@ -104,21 +106,19 @@ $(document).ready(function() {
<td>[% account.note | html_line_break %]</td>
[% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount %]</td>
[% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding %]</td>
[% IF ( reverse_col ) %]
<td>
[% IF ( account.payment ) %]
<a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]">Reverse</a>
[% ELSE %]
&nbsp;
[% END %]
</td>
[% END %]
<td>
[% IF ( account.payment ) %]
<a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]">Print</a>
[% ELSE %]
<a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]">Print</a>
[% END %]
<td class="actions">
[% IF ( account.payment ) %]
<a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
[% ELSE %]
<a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-print"></i> Print</a>
[% END %]
[% IF ( reverse_col) %]
[% IF ( account.payment ) %]
<a href="boraccount.pl?action=reverse&amp;accountlines_id=[% account.accountlines_id %]&amp;borrowernumber=[% account.borrowernumber %]" class="btn btn-mini"><i class="fa fa-undo"></i> Reverse</a>
[% ELSE %]
&nbsp;
[% END %]
[% END %]
</td>
</tr>
@ -131,11 +131,7 @@ $(document).ready(function() {
[% ELSE %]
<td class="debit"style="text-align: right;">[% total %]</td>
[% END %]
[% IF ( reverse_col ) %]
<td colspan="2"></td>
[% ELSE %]
<td></td>
[% END %]
<td></td>
</tr>
</tfoot>
</table>