[Koha-cvs] koha circ/circulation.pl koha-tmpl/intranet-tmp... [dev_week]

[Kyle Hall]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	07/04/27 14:08:32

Modified files:
	circ           : circulation.pl 
	koha-tmpl/intranet-tmpl/ccfls/en/circ: circulation.tmpl 

Log message:
	Added rounding to 2 decimal places to finetotal, added fine amount to ccfl circ template.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.81.2.14.2.17&r2=1.81.2.14.2.18
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1.2.9&r2=1.1.2.1.2.10

Patches:
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.81.2.14.2.17
retrieving revision 1.81.2.14.2.18
diff -u -b -r1.81.2.14.2.17 -r1.81.2.14.2.18
--- circ/circulation.pl	19 Apr 2007 20:44:32 -0000	1.81.2.14.2.17
+++ circ/circulation.pl	27 Apr 2007 14:08:32 -0000	1.81.2.14.2.18
@@ -131,6 +131,7 @@
 if ($borrowernumber) {
 	$borrower = getpatroninformation(\%env,$borrowernumber,0);
 	my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
+	$fines = sprintf("%.2f", $fines);
 	# Warningdate is the date that the warning starts appearing
 	my ($today_year,$today_month,$today_day) = Today();
 	my ($warning_year,$warning_month,$warning_day) = split /-/, $borrower->{'expiry'};
@@ -191,6 +192,7 @@
 if ($borrowernumber) {
 	$borrower = getpatroninformation(\%env,$borrowernumber,0);
 	my ($od,$issue,$fines)=borrdata2(\%env,$borrowernumber);
+	$fines = sprintf("%.2f", $fines);
 	$template->param(
 		overduecount => $od,
 		issuecount => $issue,
@@ -331,7 +333,7 @@
     	push @issued_itemtypes_count, $data;
 	}
 }
-$issued_itemtypes_loop = \@issued_itemtypes_count;
+my $issued_itemtypes_loop = \@issued_itemtypes_count;
 
 #### / JF
 

Index: koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/ccfls/en/circ/Attic/circulation.tmpl,v
retrieving revision 1.1.2.1.2.9
retrieving revision 1.1.2.1.2.10
diff -u -b -r1.1.2.1.2.9 -r1.1.2.1.2.10
--- koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl	27 Mar 2007 13:53:54 -0000	1.1.2.1.2.9
+++ koha-tmpl/intranet-tmpl/ccfls/en/circ/circulation.tmpl	27 Apr 2007 14:08:32 -0000	1.1.2.1.2.10
@@ -196,9 +196,9 @@
 -->
 
 <!-- TMPL_IF NAME="noissues" -->
-<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+<!-- TMPL_IF NAME="charges" --><li><span class="error">Fines:</span> Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a> of <!-- TMPL_VAR NAME="finetotal" -->. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
 <!-- TMPL_ELSE -->
-	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a>. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
+	<!-- TMPL_IF name="charges" --><li>Fines: Patron has <a href="/cgi-bin/koha/boraccount.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">outstanding fines</a> of $<!-- TMPL_VAR NAME="finetotal" -->. Make <a href="/cgi-bin/koha/pay.pl?bornum=<!-- TMPL_VAR name="borrowernumber" -->">Payment</a></li><!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 </ul>