[Koha-cvs] koha C4/Members.pm koha-tmpl/intranet-tmpl/prog... [rel_3_0]
Bruno Toumi
btoumi at ouestprovence.fr
Fri Dec 1 17:54:47 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Bruno Toumi <btoumi> 06/12/01 16:54:47
Modified files:
C4 : Members.pm
koha-tmpl/intranet-tmpl/prog/en/members: moremember.tmpl
members : moremember.pl
Log message:
bug fix :worn field name in sql syntax
add (firstname and surname ) display for quarantor and guarantees instead of cardnumber
add borrowers display link with borrowers category type
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.24&r2=1.32.2.25
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.15&r2=1.12.2.16
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.28.2.11&r2=1.28.2.12
Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.24
retrieving revision 1.32.2.25
diff -u -b -r1.32.2.24 -r1.32.2.25
--- C4/Members.pm 30 Nov 2006 17:20:22 -0000 1.32.2.24
+++ C4/Members.pm 1 Dec 2006 16:54:47 -0000 1.32.2.25
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Members.pm,v 1.32.2.24 2006/11/30 17:20:22 toins Exp $
+# $Id: Members.pm,v 1.32.2.25 2006/12/01 16:54:47 btoumi Exp $
use strict;
require Exporter;
@@ -29,7 +29,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.32.2.24 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.25 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -713,7 +713,7 @@
my $dbh = C4::Context->dbh;
my $sth =
$dbh->prepare(
-"select cardnumber,borrowernumber, firstname, surname from borrowers where guarantor=?"
+"select cardnumber,borrowernumber, firstname, surname from borrowers where guarantorid=?"
);
$sth->execute($borrowernumber);
@@ -746,12 +746,12 @@
my ($borrowernumber) = @_;
my $dbh = C4::Context->dbh;
my $sth =
- $dbh->prepare("select guarantor from borrowers where borrowernumber=?");
+ $dbh->prepare("select guarantorid from borrowers where borrowernumber=?");
$sth->execute($borrowernumber);
my $data = $sth->fetchrow_hashref;
$sth->finish;
$sth = $dbh->prepare("Select * from borrowers where borrowernumber=?");
- $sth->execute( $data->{'guarantor'} );
+ $sth->execute( $data->{'guarantorid'} );
$data = $sth->fetchrow_hashref;
$sth->finish;
return ($data);
Index: koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl,v
retrieving revision 1.12.2.15
retrieving revision 1.12.2.16
diff -u -b -r1.12.2.15 -r1.12.2.16
--- koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 27 Nov 2006 17:21:12 -0000 1.12.2.15
+++ koha-tmpl/intranet-tmpl/prog/en/members/moremember.tmpl 1 Dec 2006 16:54:47 -0000 1.12.2.16
@@ -76,27 +76,42 @@
<fieldset>
<legend>Borrower Information</legend>
- <p><label>Title:</label><!-- TMPL_VAR NAME="title" --> </p>
- <p><label>First Name:</label><!-- TMPL_VAR NAME="firstname" --></p>
- <p><label>Last Name: </label><!-- TMPL_VAR NAME="surname" --></p>
- <p><label>Othernames: </label><!-- TMPL_VAR NAME="othernames" --></p>
- <p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p>
- <p><label>Address: </label><!-- TMPL_VAR NAME="streetnumber" --> ,<!--TMPL_IF NAME="roaddetails"--> <!-- TMPL_VAR NAME="roaddetails" -->,<!-- /TMPL_IF --><!-- TMPL_VAR NAME="address" --></p>
+ <!-- TMPL_UNLESS NAME="I" --> <p><label>Title:</label><!-- TMPL_VAR NAME="title" --> </p>
+ <p><label>First Name:</label><!-- TMPL_VAR NAME="firstname" --></p><!-- /TMPL_UNLESS -->
+ <p>
+ <!-- TMPL_IF NAME="I" --><label>Organisation Name: </label><!-- TMPL_ELSE --><label>Last Name: </label><!-- /TMPL_IF --><!-- TMPL_VAR NAME="surname" -->
+ </p>
+ <!-- TMPL_UNLESS NAME="I" --><p><label>Othernames: </label><!-- TMPL_VAR NAME="othernames" --></p>
+ <p><label>Initials: </label><!-- TMPL_VAR NAME="initials" --></p><!-- /TMPL_UNLESS -->
+ <p><label>Address: </label><!-- TMPL_VAR NAME="streetnumber" --> <!--TMPL_IF NAME="roaddetails"--> <!-- TMPL_VAR NAME="roaddetails" -->,<!-- /TMPL_IF --><!-- TMPL_VAR NAME="address" --></p>
<p><label>City: </label><!-- TMPL_VAR NAME="city" --></p>
<p><label>Zip Code: </label><!-- TMPL_VAR NAME="zipcode" --></p>
<!-- TMPL_UNLESS NAME="I"-->
+ <!-- TMPL_UNLESS NAME="C"-->
<p><label>alt address: </label><!-- TMPL_VAR NAME="B_address" --></p>
<p><label>alt city: </label><!-- TMPL_VAR NAME="B_city" --></p>
<p><label>alt zipcode: </label><!-- TMPL_VAR NAME="B_zipcode" --></p>
<!-- /TMPL_UNLESS -->
+ <!-- /TMPL_UNLESS -->
+ <!-- TMPL_IF NAME="I" -->
+ <p><label>Organisation Phone: </label><!-- TMPL_VAR NAME="phonepro" --></p>
+ <p><label>Organisation Email: </label><!-- TMPL_VAR NAME="emailpro" --></p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_UNLESS NAME="I"-->
<p><label>Home Phone: </label><!-- TMPL_VAR NAME="phone" --></p>
<p><label>Cell phone: </label><!-- TMPL_VAR NAME="mobile" --></p>
+ <!-- /TMPL_UNLESS -->
+ <!-- TMPL_IF NAME="P"-->
+ <p><label>Professional Phone: </label><!-- TMPL_VAR NAME="phone" --></p>
+ <p><label>Professionnal Email: </label><!-- TMPL_VAR NAME="mobile" --></p>
+ <!-- /TMPL_IF -->
<p><label>Fax: </label><!-- TMPL_VAR NAME="fax" --></p>
+ <!-- TMPL_UNLESS NAME="I"-->
<p><label>E-mail Address:</label><!-- TMPL_VAR NAME="email" --></p>
- <!-- TMPL_UNLESS name="I" -->
<p><label>Date of Birth:</label><!-- TMPL_VAR NAME="dateofbirth" --></p>
<p><label>Sex:</label><!-- TMPL_VAR NAME="sex" --></p>
<!-- /TMPL_UNLESS -->
+
</fieldset>
<fieldset>
<legend>Library use</legend>
@@ -131,24 +146,26 @@
<p><label>Patron Message:</label><!-- TMPL_VAR NAME="opacnote" --> </p>
</fieldset>
<fieldset>
+
<legend>Alternate contact</legend>
- <!-- TMPL_UNLESS name="I" -->
+
<p><label>Name:</label><!-- TMPL_VAR NAME="contactname" --> </p>
<p><label>Phone: </label><!-- TMPL_VAR NAME="B_phone" --> </p>
<p><label>Relationship:</label><!-- TMPL_VAR NAME="relationship" --> </p>
<p><label>Notes: </label><!-- TMPL_VAR NAME="contactnote" --> </p>
- <!-- /TMPL_UNLESS -->
- <!-- TMPL_UNLESS name="I" -->
+
+
+
<!-- TMPL_IF name="isguarantee" -->
<!-- TMPL_IF NAME="guaranteeloop" -->
- <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> - <!-- TMPL_VAR NAME="cardnumber" --></a></li><!-- /tmpl_loop --></ul></p>
+ <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME=name --> </a></li><!-- /tmpl_loop --></ul></p>
<!-- /TMPL_IF -->
<!-- TMPL_ELSE -->
<!-- TMPL_IF name="guarantorborrowernumber" -->
- <p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorcardnumber" --></a></p>
+ <p><label>Guarantor:</label><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="guarantorborrowernumber" -->"><!-- TMPL_VAR NAME="guarantorsurname" --> <!-- TMPL_VAR NAME="guarantorfirstname" --></a></p>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
- <!-- /TMPL_UNLESS -->
+
</fieldset>
<fieldset>
<legend>Fines & Charges</legend>
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.28.2.11
retrieving revision 1.28.2.12
diff -u -b -r1.28.2.11 -r1.28.2.12
--- members/moremember.pl 27 Nov 2006 17:22:16 -0000 1.28.2.11
+++ members/moremember.pl 1 Dec 2006 16:54:47 -0000 1.28.2.12
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: moremember.pl,v 1.28.2.11 2006/11/27 17:22:16 toins Exp $
+# $Id: moremember.pl,v 1.28.2.12 2006/12/01 16:54:47 btoumi Exp $
=head1 moremember.pl
@@ -106,7 +106,7 @@
if ($data->{'ethnicity'} || $data->{'ethnotes'}) {
$template->param(printethnicityline => 1);
}
-if ($category_type ne 'C'){
+if ($category_type eq 'A'){
$template->param(isguarantee => 1);
# FIXME
# It looks like the $i is only being returned to handle walking through
@@ -123,10 +123,10 @@
($template->param(adultborrower=>1)) if ($category_type eq 'A');
} else {
- my ($guarantorid)=findguarantor($data->{guarantorid});
+ my ($guarantorid)=findguarantor($data->{'borrowernumber'});
($template->param(guarantor=>1)) if (($data->{'guarantorid'} > '0'));
if ($guarantorid->{'borrowernumber'}){
- $template->param(guarantorborrowernumber => $guarantorid->{'borrowernumber'}, guarantorcardnumber => $guarantorid->{'cardnumber'});
+ $template->param(guarantorborrowernumber => $guarantorid->{'borrowernumber'}, guarantorcardnumber => $guarantorid->{'cardnumber'},guarantorfirstname => $guarantorid->{'firstname'},guarantorsurname =>$guarantorid->{'surname'});
}
}
More information about the Koha-cvs
mailing list