From 0abbcf2c2c242993db44edd7881bb765041cd62f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
Date: Wed, 10 Aug 2016 11:42:28 +0200
Subject: [PATCH] Bug 17100: Do not display payments if patron has nothing to
 pay
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This alternative patch moves logic and formatting to the template file.

To test:
* without patch
  1/ find a patron with no lines in accountlines table : print summary shows no "account fines and payments" => OK
  2/ find a patron with some lines in accountlines table and the total amount > 0 : print summary shows a table "account fines and payments" with fines to recover => OK
  3/ find a patron with some lines in accountlines table but the total amount = 0 : print summary shows a table "account fines and payments" with nothing in it => NOK

* with the patch, same cases as before :
  1/ same as without patch
  2/ same as without patch
  3/ print summary does not show "account fines and payments"

- Additionally, verify that formatting follows syspref 'CurrencyFormat'
- Verify that amount column is right-aligned

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
(cherry picked from commit 492a64cef95c6afb1644cbb4f1be181c2442cbd8)
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
(cherry picked from commit 7602198e60e0a43c1d35164db2c49d26412bfc08)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
---
 .../en/modules/members/moremember-print.tt    | 28 ++++++++++---------
 members/summary-print.pl                      |  9 +-----
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
index 1c09a91f40..dc08222cbc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
@@ -1,6 +1,7 @@
 [% USE Koha %]
 [% USE Branches %]
 [% USE KohaDates %]
+[% USE Price %]
 [% INCLUDE 'doc-head-open.inc' %]
     <title>Summary for [% firstname %] [% surname %] ([% cardnumber %])</title>
     [% INCLUDE 'doc-head-close.inc' %]
@@ -71,7 +72,7 @@
         </table>
     [% END %]
 
-    [% IF ( accounts && ( totaldue != '0.00' ) ) %]
+    [% IF accounts && ( totaldue < 0 || totaldue > 0 ) %]
         <table>
             <caption>Account fines and payments</caption>
             <tr>
@@ -82,23 +83,24 @@
             </tr>
 
             [% FOREACH account IN accounts %]
-                [% NEXT IF account.amountoutstanding == '0.00' %]
-                <tr>
-                    <td>
-                        [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% END %]
-                        [% account.description %]&nbsp;[% IF ( account.printtitle ) %] [% account.title |html %][% END %]
-                        [% IF ( account.itemnumber ) %]</a>[% END %]
-                    </td>
-                    <td>[% account.date | $KohaDates %]</td>
-                    <td>[% account.amount %]</td>
-                    <td>[% account.amountoutstanding %]</td>
-                </tr>
+                [% IF ( account.amountoutstanding < 0 ) || ( account.amountoutstanding > 0 ) %]
+                    <tr>
+                        <td>
+                            [% IF ( account.itemnumber ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.biblionumber %]&amp;itemnumber=[% account.itemnumber %]">[% END %]
+                            [% account.description %]&nbsp;[% IF ( account.printtitle ) %] [% account.title |html %][% END %]
+                            [% IF ( account.itemnumber ) %]</a>[% END %]
+                        </td>
+                        <td>[% account.date | $KohaDates %]</td>
+                        <td style="text-align:right;">[% account.amount | $Price %]</td>
+                        <td style="text-align:right;">[% account.amountoutstanding | $Price %]</td>
+                    </tr>
+                [% END %]
             [% END %]
 
             <tfoot>
                 <tr>
                     <td colspan="3">Total due</td>
-                    <td colspan="2">[% totaldue %]</td>
+                    <td colspan="2" style="text-align:right;">[% totaldue | $Price %]</td>
                 </tr>
             </tfoot>
         </table>
diff --git a/members/summary-print.pl b/members/summary-print.pl
index 1544d99b32..81aaf159e8 100755
--- a/members/summary-print.pl
+++ b/members/summary-print.pl
@@ -43,11 +43,6 @@ my $data = GetMember( 'borrowernumber' => $borrowernumber );
 
 my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
 foreach my $accountline (@$accts) {
-    $accountline->{amount} = sprintf( '%.2f', $accountline->{amount} )
-        if ( $accountline->{amount} ) ;
-    $accountline->{amountoutstanding} = sprintf( '%.2f', $accountline->{amountoutstanding} )
-        if ( $accountline->{amountoutstanding} );
-
     if (   $accountline->{accounttype} ne 'F'
         && $accountline->{accounttype} ne 'FU' )
     {
@@ -56,8 +51,6 @@ foreach my $accountline (@$accts) {
 }
 
 our $totalprice = 0;
-my $total_format = '';
-$total_format = sprintf( "%.2f", $total ) if ($total);
 
 $template->param(
     %$data,
@@ -65,7 +58,7 @@ $template->param(
     borrowernumber => $borrowernumber,
 
     accounts => $accts,
-    totaldue => $total_format,
+    totaldue => $total,
 
     issues     => build_issue_data( GetPendingIssues($borrowernumber) ),
     totalprice => $totalprice,
-- 
2.39.5