From 1e5e9f5e808d9e17c704f5bd757bc6d51d43059b Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Fri, 26 Oct 2018 13:01:30 -0300
Subject: [PATCH] Bug 20629: (QA follow-up) Remove actions_col

The actions_col template param requires a DB search, only to display the
'Actions' column header vs. an empty string. But there will always be
buttons in there, that were added *after*.
It made sense when only the 'Reverse' button was displayed, but now both
'Print' and 'Details' are displayed anyway.

This patch removes it for good :-D

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 .../prog/en/modules/members/boraccount.tt      | 18 +++++-------------
 members/boraccount.pl                          |  5 -----
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
index 8a86afc7d5..226c1c6226 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt
@@ -47,11 +47,7 @@
           <th>Note</th>
           <th>Amount</th>
           <th>Outstanding</th>
-          [% IF ( actions_col ) %]
-              <th>Actions</th>
-          [% ELSE %]
-              <th>&nbsp;</th>
-          [% END %]
+          <th>Actions</th>
         </tr>
     </thead>
 
@@ -71,17 +67,13 @@
       [% IF account.amountoutstanding <= 0 %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td>
       <td class="actions">
         [% IF ( account.is_credit ) %]
-          <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
+          <a target="_blank" href="printfeercpt.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
         [% ELSE %]
-          <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | html %]&amp;borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
+          <a target="_blank" href="printinvoice.pl?action=print&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a>
         [% END %]
         <a href="accountline-details.pl?accountlines_id=[% account.accountlines_id | uri %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a>
-        [% IF ( actions_col) %]
-          [% IF account.is_credit %]
-              <a href="boraccount.pl?action=void&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a>
-          [% ELSE %]
-            &nbsp;
-          [% END %]
+        [% IF account.is_credit %]
+          <a href="boraccount.pl?action=void&amp;accountlines_id=[% account.accountlines_id | uri %]&amp;borrowernumber=[% account.borrowernumber | uri %]" class="btn btn-default btn-xs void"><i class="fa fa-ban"></i> Void</a>
         [% END %]
       </td>
     </tr>
diff --git a/members/boraccount.pl b/members/boraccount.pl
index 743c04a543..74f8e29988 100755
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -79,10 +79,6 @@ if($total <= 0){
         $totalcredit = 1;
 }
 
-my $actions_col = ( Koha::Account::Lines->search(
-    { borrowernumber => $patron->borrowernumber },
-    { where => { amount => { '<=', 0 } } } )->count > 0 ) ? 1 : 0;
-
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = GetBorrowerAttributes($borrowernumber);
     $template->param(
@@ -96,7 +92,6 @@ $template->param(
     finesview           => 1,
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-    actions_col         => $actions_col,
     accounts            => \@accountlines,
 );
 
-- 
2.39.5