[Koha-cvs] koha pay.pl [dev_week]

[Kyle Hall]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Kyle Hall <kylemhall>	07/02/09 17:16:50

Modified files:
	.              : pay.pl 

Log message:
	

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/pay.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.9.2.5&r2=1.9.2.5.2.1

Patches:
Index: pay.pl
===================================================================
RCS file: /sources/koha/koha/Attic/pay.pl,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.5.2.1
diff -u -b -r1.9.2.5 -r1.9.2.5.2.1
--- pay.pl	5 Feb 2006 21:59:20 -0000	1.9.2.5
+++ pay.pl	9 Feb 2007 17:16:50 -0000	1.9.2.5.2.1
@@ -2,7 +2,7 @@
 # WARNING: Not enough context to figure out the correct tabstop size
 # WARNING: Assume that this file uses 4-character tabs
 
-# $Id: pay.pl,v 1.9.2.5 2006/02/05 21:59:20 kados Exp $
+# $Id: pay.pl,v 1.9.2.5.2.1 2007/02/09 17:16:50 kylemhall Exp $
 
 #written 11/1/2000 by chris at katipo.oc.nz
 #part of the koha library system, script to facilitate paying off fines
@@ -46,6 +46,15 @@
 my $data=borrdata('',$bornum);
 my $user=$input->remote_user;
 
+my($template, $loggedinuser, $cookie)
+  = get_template_and_user ({ template_name => "members/pay.tmpl",
+                             query => $input,
+                             type => "intranet",
+                             authnotrequired => 0,
+                             flagsrequired => {borrowers => 1},
+                             debug => 1,
+                           });
+
 #get account details
 my %bor;
 $bor{'borrowernumber'}=$bornum;
@@ -68,7 +77,7 @@
 		my $amount=$input->param($names[$i+4]);
 		my $bornum=$input->param($names[$i+5]);
 		my $accountno=$input->param($names[$i+6]);
-		makepayment($bornum,$accountno,$amount,$user);
+		makepayment($bornum,$accountno,$amount,$user,C4::Context->userenv->{branch});
 		$check=2;
 	}
 }
@@ -80,14 +89,6 @@
 $env{'branchcode'}=$user;
 my $total=$input->param('total');
 if ($check ==0){
-	my($template, $loggedinuser, $cookie)
-		= get_template_and_user ({ template_name => "members/pay.tmpl",
-					   query => $input,
-					   type => "intranet",
-					   authnotrequired => 0,
-					   flagsrequired => {borrowers => 1},
-					   debug => 1,
-					 });
 	if ($total ne ''){
 		recordpayment(\%env,$bornum,$total);
 	}