From 9a2677f401d83064448594880bdcd57a85cb8038 Mon Sep 17 00:00:00 2001
From: btoumi
Date: Thu, 22 Jun 2006 10:07:49 +0000
Subject: [PATCH] Members.pm ,memberentry(A)(P)(C).tmpl,memberentry.pl:bug fix
with wrong field name memberentry.pl:translate title in english ;=) (i hope
is ok) buf fix with bad condition
---
C4/Members.pm | 14 ++++----
.../prog/en/members/memberentryA.tmpl | 24 +++++++-------
.../prog/en/members/memberentryC.tmpl | 18 +++++------
.../prog/en/members/memberentryP.tmpl | 32 +++++++++----------
members/memberentry.pl | 20 ++++++------
5 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/C4/Members.pm b/C4/Members.pm
index 201901497f..47642b8d48 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -466,15 +466,15 @@ sub newmember {
. ",contactnote="
. $dbh->quote( $data{'contactnote'} )
. ",B_address="
- . $dbh->quote( $data{'b_address'} )
+ . $dbh->quote( $data{'B_address'} )
. ",B_zipcode="
- . $dbh->quote( $data{'b_zipcode'} )
+ . $dbh->quote( $data{'B_zipcode'} )
. ",B_city="
- . $dbh->quote( $data{'b_city'} )
+ . $dbh->quote( $data{'B_city'} )
. ",B_phone="
- . $dbh->quote( $data{'b_phone'} )
+ . $dbh->quote( $data{'B_phone'} )
. ",B_email="
- . $dbh->quote( $data{'b_email'}, )
+ . $dbh->quote( $data{'B_email'}, )
. ",password="
. $dbh->quote( $data{'password'} )
. ",userid="
@@ -498,9 +498,9 @@ sub newmember {
. ",relationship="
. $dbh->quote( $data{'relationship'} )
. ",B_streetnumber="
- . $dbh->quote( $data{'b_streetnumber'})
+ . $dbh->quote( $data{'B_streetnumber'})
. ",B_streettype="
- . $dbh->quote( $data{'b_streettype'})
+ . $dbh->quote( $data{'B_streettype'})
. ",gonenoaddress="
. $dbh->quote( $data{'gonenoaddress'})
. ",lost="
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
index 4cf10434ff..42b3291f59 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryA.tmpl
@@ -73,9 +73,9 @@
">
">
">
- ">
- ">
- ">
+ ">
+ ">
+ ">
" >
" >
" >
@@ -349,31 +349,31 @@
@@ -496,9 +496,9 @@
">
">
">
- ">
- ">
- ">
+ ">
+ ">
+ ">
" >
" >
" >
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
index c2bb81ed70..5f8c2beb6f 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryC.tmpl
@@ -79,8 +79,8 @@
" >
" >
" >
- " >
- " >
+ " >
+ " >
" >
@@ -244,7 +244,7 @@
Member
-
+
@@ -538,8 +538,8 @@
" >
" >
" >
-
" >
-
" >
+
" >
+
" >
" >
diff --git a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
index 50da94fe16..69080d3972 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/members/memberentryP.tmpl
@@ -76,10 +76,10 @@
" >
">
">
-
">
-
">
-
">
-
">
+
">
+
">
+
">
+
">
">
@@ -442,39 +442,39 @@
-
+
Adress
- ">
+ ">
-
+
Zipcode
- ">
+ ">
-
+
City
- ">
+ ">
-
+
Phone (home)
- ">
+ ">
@@ -540,10 +540,10 @@
" >
">
">
- ">
- ">
- ">
- ">
+ ">
+ ">
+ ">
+ ">
">
diff --git a/members/memberentry.pl b/members/memberentry.pl
index 0d09c40140..785e31fe7f 100755
--- a/members/memberentry.pl
+++ b/members/memberentry.pl
@@ -145,7 +145,7 @@ if ($category_type eq 'C' and $guarantorid ne '' ){
$data{'city'}= $borrower_city;
$data{'zipcode'}=$borrower_zipcode;
}
- if ($categorycode ne 'I') {
+ if ($category_type ne 'I') {
my $age = get_age(format_date_in_iso($data{dateofbirth}));
my (undef,$agelimitmin,$agelimitmax,undef)=getborrowercategory($data{'categorycode'});
if ($age > $agelimitmax
@@ -324,9 +324,9 @@ if ($delete){
}
push(@relshipdata, \%row);
}
- my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Adresse érronée'],
- 'lost' => ['lost', 'Carte Perdue'],
- 'debarred' => ['debarred', 'Lecteur exclu']);
+ my %flags = ( 'gonenoaddress' => ['gonenoaddress', 'Gone no address '],
+ 'lost' => ['lost', 'Lost'],
+ 'debarred' => ['debarred', 'Debarred']);
my @flagdata;
foreach (keys(%flags)) {
@@ -437,7 +437,7 @@ if ($delete){
foreach my $error (@errors) {
$template->param( $error => 1);
}
- $template->param(nok => 1);
+ $template->param(nok => 1);
}
else {
$step++;
@@ -476,11 +476,11 @@ if ($delete){
fax => $data{'fax'},
phonepro => $data{'phonepro'},
emailpro => $data{'emailpro'},
- b_address => $data{'b_address'},
- b_city => $data{'b_city'},
- b_zipcode => $data{'b_zipcode'},
- b_email => $data{'b_email'},
- b_phone => $data{'b_phone'},
+ B_address => $data{'B_address'},
+ B_city => $data{'B_city'},
+ B_zipcode => $data{'B_zipcode'},
+ B_email => $data{'B_email'},
+ B_phone => $data{'B_phone'},
dateofbirth => $data{'dateofbirth'},
branchcode => $data{'branchcode'},
catcodepopup => $catcodepopup,
--
2.39.5