[Koha-cvs] koha koha-tmpl/intranet-tmpl/prog/en/memberspay...

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Changes by:	Bruno Toumi <btoumi>	06/06/13 09:19:19

Modified files:
	koha-tmpl/intranet-tmpl/prog/en/members: pay.tmpl 
	members        : memberentry.pl pay.pl 

Log message:
	pay.pl: bug fix , add variable declaration
	pay.tmpl bug fix modify wrong url to access pay.pl
	add back url ( from pay.tmpl to moremember.tmpl )
	memberentry.pl: replace variable name

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl?cvsroot=koha&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/koha/members/memberentry.pl?cvsroot=koha&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/koha/members/pay.pl?cvsroot=koha&r1=1.2&r2=1.3

Patches:
Index: koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl	18 Jan 2006 17:23:32 -0000	1.2
+++ koha-tmpl/intranet-tmpl/prog/en/members/pay.tmpl	13 Jun 2006 09:19:18 -0000	1.3
@@ -4,8 +4,10 @@
 <!-- TMPL_INCLUDE NAME="menu-members.inc" -->
 
 <h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
-<form action="/cgi-bin/koha/pay.pl" method="post">
+<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR name="bornum" -->">Back to borrower</a> 
+<form action="/cgi-bin/koha/members/pay.pl" method="post">
 	<input type="hidden" name="bornum" value="<!-- TMPL_VAR name="bornum" -->" />
+
 <table>
 <tr>
 	<th>Fines &amp; Charges</th>
@@ -41,5 +43,4 @@
 </tr>
 </table>
 <input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
-
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file

Index: members/memberentry.pl
===================================================================
RCS file: /sources/koha/koha/members/memberentry.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- members/memberentry.pl	12 Jun 2006 15:12:11 -0000	1.30
+++ members/memberentry.pl	13 Jun 2006 09:19:18 -0000	1.31
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: memberentry.pl,v 1.30 2006/06/12 15:12:11 btoumi Exp $
+# $Id: memberentry.pl,v 1.31 2006/06/13 09:19:18 btoumi Exp $
 
 # Copyright 2006 SAN OUEST PROVENCE et Paul POULAIN
 #
@@ -56,7 +56,6 @@
 			     flagsrequired => {borrowers => 1},
 			     debug => 1,
 			     });
-my $borrowerid=$input->param('borrowerid');
 my $guarantorid=$input->param('guarantorid');
 my $borrowernumber=$input->param('borrowernumber');
 my $actionType=$input->param('actionType') || '';
@@ -94,11 +93,7 @@
     foreach my $column (keys %$borrower_data){
 	$data{$column}=$borrower_data->{$column};
     }
-    $data{'borrowerid'}=$borrowernumber;
-    if (!$borrowerid){
-	$borrowerid=$borrowernumber;
     }
-}    
 
 if ($op eq 'add' or $op eq 'modify') {
 	my @names=$input->param;
@@ -210,7 +205,7 @@
 			        if ($data{'organisations'}){				    
 				    # need to add the members organisations
 				    my @orgs=split(/\|/,$data{'organisations'});
-				    add_member_orgs($borrowerid,\@orgs);
+				    add_member_orgs($borrowernumber,\@orgs);
 				 }
 				logaction($loggedinuser,"MEMBERS","add member", $borrowernumber, "");
 			}

Index: members/pay.pl
===================================================================
RCS file: /sources/koha/koha/members/pay.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- members/pay.pl	7 Jun 2006 03:36:51 -0000	1.2
+++ members/pay.pl	13 Jun 2006 09:19:18 -0000	1.3
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: pay.pl,v 1.2 2006/06/07 03:36:51 rangi Exp $
+# $Id: pay.pl,v 1.3 2006/06/13 09:19:18 btoumi Exp $
 
 # written 11/1/2000 by chris at katipo.oc.nz
 # part of the koha library system, script to facilitate paying off fines
@@ -140,6 +140,7 @@
 		$bornum=$input->param("bornum$value");
 		my $itemno=$input->param("itemnumber$value");
 		my $amount=$input->param("amount$value");
+	        my $accountno=$input->param("accountno$value");
 	        writeoff($bornum,$accountno,$itemno,$accounttype,$amount);
 	}
 	$bornum=$input->param('bornum');