From 574e8e7b403385f06de5d9f771796674f5eb4f2e Mon Sep 17 00:00:00 2001
From: wolfpac444 <wolfpac444>
Date: Sun, 13 Apr 2003 03:47:45 +0000
Subject: [PATCH] Bug fixes

---
 .../intranet-tmpl/default/en/members/memberentry.tmpl  |  2 +-
 .../intranet-tmpl/default/en/members/moremember.tmpl   |  3 +--
 koha-tmpl/intranet-tmpl/default/en/newmember.tmpl      | 10 +---------
 newmember.pl                                           | 10 ++++++++--
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
index b8ba1dad0a..899f4063b3 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/memberentry.tmpl
@@ -89,7 +89,7 @@
 	<tr valign=top bgcolor=white>
 		<td  COLSPAN=3><FONT SIZE=2><b>Postal Address*</b></FONT></td>
 		<td><FONT SIZE=2><b>Town*</b></FONT></td>
-		<td><FONT SIZE=2>Area</FONT></td>
+		<td><FONT SIZE=2>Joining Branch</FONT></td>
 	</tr>
 	<tr valign=top bgcolor=white>
 		<td COLSPAN=3><input type=text name=address size=40 value="<TMPL_VAR NAME=address>"></td>
diff --git a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
index 8bcb18a076..b4d7fe9145 100644
--- a/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/members/moremember.tmpl
@@ -32,8 +32,7 @@
 		E-mail: <a href="mailto:<TMPL_VAR NAME="emailaddress">"><TMPL_VAR NAME="emailaddress"></a><br>
 		Text messaging: <TMPL_VAR NAME="textmessaging"><p>
 		Membership Number: <TMPL_VAR NAME="borrowernumber"><BR>
-		Membership: <TMPL_VAR NAME="categorycode"><BR>
-		Area: <TMPL_VAR NAME="area"><BR>
+		Membership Category: <TMPL_VAR NAME="categorycode"><BR>
 		Fee:$30/year, Paid<BR>
 		Joined: <TMPL_VAR NAME="dateenrolled">,  Expires: <TMPL_VAR NAME="expiry"><BR>
 		Joining Branch: <TMPL_VAR NAME="branchcode"><P>
diff --git a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
index 40d7a3ae5c..0782b0493f 100644
--- a/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/newmember.tmpl
@@ -42,15 +42,7 @@
 				<B>Membership Category</B>
 			</td>
 			<td>
-				<TMPL_VAR Name="membercat">
-			</td>
-		</tr>
-		<tr valign=top bgcolor="white" >
-			<td>
-				<B>Area </B>
-			</td>
-			<td>
-				<TMPL_VAR Name="area">
+				<TMPL_VAR Name="memcat">
 			</td>
 		</tr>
 		<tr valign=top bgcolor="white" >
diff --git a/newmember.pl b/newmember.pl
index 024a6f9f5d..cc0d4e264b 100755
--- a/newmember.pl
+++ b/newmember.pl
@@ -149,12 +149,18 @@ if ($ok == 0) {
 	push(@inputsloop, \%line);
     }
 
+    #Get the fee
+    my $dbh = C4::Context->dbh;
+    my $sth = $dbh->prepare("SELECT enrolmentfee FROM categories WHERE categorycode = ?");
+    $sth->execute($data{'categorycode'});
+    my ($fee) = $sth->fetchrow;
+    $sth->finish;
+
     $template->param(name => $name,
 		     bornum => $data{'borrowernumber'},
 		     cardnum => $data{'cardnumber'},
 		     memcat => $data{'categorycode'},
-		     area => $data{'area'},
-		     fee => $data{'fee'},
+		     fee => $fee,
 		     joindate => format_date($data{'joining'}),
 		     expdate => format_date($data{'expiry'}),
 		     branchcode => $data{'branchcode'},
-- 
2.20.1