From bc14432d5f5f5e73edca19eb9df2d4d8ba8dc14f Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 22 Dec 2003 10:41:22 +0000
Subject: [PATCH] fix for #537 : in borrower screen, the "fine & debts" now
 shows only amount due if >0, "nothing due" if borrower has no debts.

---
 .../default/en/members/moremember.tmpl        | 30 ++++++----------
 moremember.pl                                 | 36 +------------------
 2 files changed, 12 insertions(+), 54 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index cef1dac1d6..c58329c46c 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -98,28 +98,20 @@
 
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 >
 	<TR VALIGN=TOP>
-		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=4><B>FINES & CHARGES</TD>
+		<td  bgcolor="99cc33" background="<!-- TMPL_VAR name="themelang" -->/images/background-mem.gif" colspan=2><B>FINES & CHARGES</TD>
 	</TR>
-
-	<!-- TMPL_LOOP NAME=accountloop -->
-		<!-- TMPL_IF NAME=amountoutstanding -->
-		<tr VALIGN=TOP>
-			<td><!-- TMPL_VAR NAME="date" --></td>
-			<td>
-				<!-- TMPL_IF NAME=biblionumber -->
-				<a href="/cgi-bin/koha/moredetail.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&bib=<!-- TMPL_VAR NAME="blionumber" -->&bi=<!-- TMPL_VAR NAME="biblioitemnumber" -->"><!-- TMPL_VAR NAME="description" --> <!-- TMPL_VAR NAME="title" --></a>
-				<!-- TMPL_ELSE -->
-				&nbsp;
-				<!-- /TMPL_IF -->
-			</td>
-			<td><!-- TMPL_VAR NAME="amount" --></td>
-			<td><!-- TMPL_VAR NAME="amountoutstanding" --></td>
+	<TMPL_IF name="totaldue">
+		<tr valign="top">
+			<td>Total due</td>
+			<td><!-- TMPL_VAR name="totaldue"--></td>
 		</tr>
-		<!-- /TMPL_IF -->
-	<!-- /TMPL_LOOP -->
-
+	<TMPL_ELSE>
+		<tr valign="top">
+			<td colspan=2>No debts</td>
+		</tr>
+	</TMPL_IF>
 	<tr VALIGN=TOP  >
-	<TD colspan=3 align=right>
+	<TD colspan=2 align=right>
 		<p>
 			<br>
 			<a class="button" href=/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->>View Account</a>
diff --git a/moremember.pl b/moremember.pl
index b0da2bf56d..958e434695 100755
--- a/moremember.pl
+++ b/moremember.pl
@@ -123,41 +123,7 @@ $data->{'branchcode'} = &getbranchname($data->{'branchcode'});
 # Converts the categorycode to the description
 $data->{'categorycode'} = &getborrowercategory($data->{'categorycode'});
 
-# FIXME
-# it looks like $numaccts is a temp variable and that the
-# for (my $i;$i<$numaccts;$i++)
-# can be turned into a foreach loop instead
-#
 my ($numaccts,$accts,$total)=getboracctrecord('',\%bor);
-#if ($numaccts > 10){
-#  $numaccts=10;
-#}
-my @accountdata;
-for (my$i=0;$i<$numaccts;$i++){
-	my $amount= $accts->[$i]{'amount'} + 0.00;
-	my $amount2= $accts->[$i]{'amountoutstanding'} + 0.00;
-	my %row = %$accts->[$i];
-	if ($amount2 != 0){
-		my $item=" &nbsp; ";
-		$row{'date'} = format_date($accts->[$i]{'date'});
-
-		if ($accts->[$i]{'accounttype'} ne 'Res'){
-			#get item data
-			#$item=
-		}
-
-		# FIXME
-		# why set this variable if it's not going to be used?
-		#
-		my $env;
-		if ($accts->[$i]{'accounttype'} ne 'Res'){
-			my $iteminfo=C4::Circulation::Circ2::getiteminformation($env,$accts->[$i]->{'itemnumber'},'');
-		# FIXME, seems to me $iteminfo gets not defined
-			%row = (%row , %$iteminfo) if $iteminfo;
-		}
-	}
-	push (@accountdata, \%row);
-}
 
 my ($count,$issue)=borrissues($bornum);
 my $today=ParseDate('today');
@@ -210,7 +176,7 @@ foreach my $reserveline (@$reserves) {
 $template->param($data);
 $template->param(
 		 bornum          => $bornum,
-		 accountloop     => \@accountdata,
+		 totaldue =>$total,
 		 issueloop       => \@issuedata,
 		 reserveloop     => \@reservedata);
 
-- 
2.39.5