# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id$
use strict;
require Exporter;
use C4::Log; # logaction
use C4::Overdues;
use C4::Reserves;
+use C4::Accounts;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,$debug);
-$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+BEGIN {
+ $VERSION = 3.01;
+ $debug = $ENV{DEBUG} || 0;
+}
=head1 NAME
#Get data
push @EXPORT, qw(
- &SearchBorrower
+ &SearchMember
&GetMemberDetails
&GetMember
&GetGuarantees
- &findguarantor
- &GuarantornameSearch
- &GetBorrowerIssuesAndFines
+ &GetMemberIssuesAndFines
&GetPendingIssues
&GetAllIssues
&GetCities
&GetRoadTypes
&GetRoadTypeDetails
+ &GetSortDetails
+ &GetTitles
- &GetBorrowerAcctRecord
+ &GetMemberAccountRecords
+ &GetBorNotifyAcctRecord
&GetborCatFromCatType
&GetBorrowercategory
- &GetBorNotifyAcctRecord
- &GetMembeReregistration
- &GetSortDetails
- &GetBorrowersTitles
&GetBorrowersWhoHaveNotBorrowedSince
&GetBorrowersWhoHaveNeverBorrowed
&GetBorrowersWithIssuesHistoryOlderThan
- &GetBorrowersFromSurname
&GetExpiryDate
);
#Modify data
push @EXPORT, qw(
&ModMember
- &fixup_cardnumber
&changepassword
);
#Insert data
push @EXPORT, qw(
- &AddMember
+ &AddMember
+ &add_member_orgs
+ &MoveMemberToDeleted
+ &ExtendMemberSubscriptionTo
+);
+
+#Check data
+push @EXPORT, qw(
&checkuniquemember
&checkuserpassword
+ &Check_Userid
&fixEthnicity
ðnicitycategories
- &add_member_orgs
-
- &MoveMemberToDeleted
+ &fixup_cardnumber
+ &checkcardnumber
);
-=item Searchborrower
+=item SearchMember
- ($count, $borrowers) = &SearchBorrower($searchstring, $type);
+ ($count, $borrowers) = &SearchMember($searchstring, $type,$category_type,$filter,$showallbranches);
Looks up patrons (borrowers) by name.
if $type is "simple", search is performed on the first letter of the
surname only.
+$category_type is used to get a specified type of user.
+(mainly adults when creating a child.)
+
C<$searchstring> is a space-separated list of search terms. Each term
must match the beginning a borrower's surname, first name, or other
name.
-C<&SearchBorrower> returns a two-element list. C<$borrowers> is a
+C<$filter> is assumed to be a list of elements to filter results on
+
+C<$showallbranches> is used in IndependantBranches Context to display all branches results.
+
+C<&SearchMember> returns a two-element list. C<$borrowers> is a
reference-to-array; each element is a reference-to-hash, whose keys
are the fields of the C<borrowers> table in the Koha database.
C<$count> is the number of elements in C<$borrowers>.
#'
#used by member enquiries from the intranet
-#called by member.pl
-sub SearchBorrower {
- my ($searchstring, $orderby, $type,$category_type ) = @_;
- my $dbh = C4::Context->dbh;
- my $query = "";
- my $count;
- my @data;
- my @bind = ();
+#called by member.pl and circ/circulation.pl
+sub SearchMember {
+ my ($searchstring, $orderby, $type,$category_type,$filter,$showallbranches ) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = "";
+ my $count;
+ my @data;
+ my @bind = ();
+
+ # this is used by circulation everytime a new borrowers cardnumber is scanned
+ # so we can check an exact match first, if that works return, otherwise do the rest
+ $query = "SELECT * FROM borrowers
+ LEFT JOIN categories ON borrowers.categorycode=categories.categorycode
+ ";
+ my $sth = $dbh->prepare("$query WHERE cardnumber = ?");
+ $sth->execute($searchstring);
+ my $data = $sth->fetchall_arrayref({});
+ if (@$data){
+ return ( scalar(@$data), $data );
+ }
+ $sth->finish;
if ( $type eq "simple" ) # simple search for one letter only
{
- $query =
- "SELECT * FROM borrowers
- LEFT JOIN categories ON borrowers.categorycode=categories.categorycode ".
- ($category_type?" AND category_type = ".$dbh->quote($category_type):"").
- " WHERE surname LIKE ? ORDER BY $orderby";
- @bind = ("$searchstring%");
+ $query .= ($category_type ? " AND category_type = ".$dbh->quote($category_type) : "");
+ $query .= " WHERE (surname LIKE ? OR cardnumber like ?) ";
+ if (C4::Context->preference("IndependantBranches") && !$showallbranches){
+ if (C4::Context->userenv && C4::Context->userenv->{flags}!=1 && C4::Context->userenv->{'branch'}){
+ $query.=" AND borrowers.branchcode =".$dbh->quote(C4::Context->userenv->{'branch'}) unless (C4::Context->userenv->{'branch'} eq "insecure");
+ }
+ }
+ $query.=" ORDER BY $orderby";
+ @bind = ("$searchstring%","$searchstring");
}
else # advanced search looking in surname, firstname and othernames
{
@data = split( ' ', $searchstring );
$count = @data;
- $query = "SELECT * FROM borrowers
- LEFT JOIN categories ON borrowers.categorycode=categories.categorycode
- WHERE ((surname LIKE ? OR surname LIKE ?
- OR firstname LIKE ? OR firstname LIKE ?
- OR othernames LIKE ? OR othernames LIKE ?)
- ".
- ($category_type?" AND category_type = ".$dbh->quote($category_type):"");
- @bind = (
- "$data[0]%", "% $data[0]%", "$data[0]%", "% $data[0]%",
- "$data[0]%", "% $data[0]%"
- );
- for ( my $i = 1 ; $i < $count ; $i++ ) {
- $query = $query . " AND (" . " surname LIKE ? OR surname LIKE ?
- OR firstname LIKE ? OR firstname LIKE ?
- OR othernames LIKE ? OR othernames LIKE ?)";
- push( @bind,
- "$data[$i]%", "% $data[$i]%", "$data[$i]%",
- "% $data[$i]%", "$data[$i]%", "% $data[$i]%" );
-
- # FIXME - .= <<EOT;
- }
- $query = $query . ") OR cardnumber LIKE ?
+ $query .= " WHERE ";
+ if (C4::Context->preference("IndependantBranches") && !$showallbranches){
+ if (C4::Context->userenv && C4::Context->userenv->{flags}!=1 && C4::Context->userenv->{'branch'}){
+ $query.=" borrowers.branchcode =".$dbh->quote(C4::Context->userenv->{'branch'})." AND " unless (C4::Context->userenv->{'branch'} eq "insecure");
+ }
+ }
+ $query.="((surname LIKE ? OR surname LIKE ?
+ OR firstname LIKE ? OR firstname LIKE ?
+ OR othernames LIKE ? OR othernames LIKE ?)
+ " .
+ ($category_type?" AND category_type = ".$dbh->quote($category_type):"");
+ @bind = (
+ "$data[0]%", "% $data[0]%", "$data[0]%", "% $data[0]%",
+ "$data[0]%", "% $data[0]%"
+ );
+ for ( my $i = 1 ; $i < $count ; $i++ ) {
+ $query = $query . " AND (" . " surname LIKE ? OR surname LIKE ?
+ OR firstname LIKE ? OR firstname LIKE ?
+ OR othernames LIKE ? OR othernames LIKE ?)";
+ push( @bind,
+ "$data[$i]%", "% $data[$i]%", "$data[$i]%",
+ "% $data[$i]%", "$data[$i]%", "% $data[$i]%" );
+
+ # FIXME - .= <<EOT;
+ }
+ $query = $query . ") OR cardnumber LIKE ?
order by $orderby";
- push( @bind, $searchstring );
+ push( @bind, $searchstring );
- # FIXME - .= <<EOT;
+ # FIXME - .= <<EOT;
}
- my $sth = $dbh->prepare($query);
+ $sth = $dbh->prepare($query);
- # warn "Q $orderby : $query";
+ $debug and print STDERR "Q $orderby : $query\n";
$sth->execute(@bind);
my @results;
- my $cnt = $sth->rows;
- while ( my $data = $sth->fetchrow_hashref ) {
- push( @results, $data );
- }
+ $data = $sth->fetchall_arrayref({});
- # $sth->execute;
$sth->finish;
- return ( $cnt, \@results );
+ return ( scalar(@$data), $data );
}
=head2 GetMemberDetails
my $query;
my $sth;
if ($borrowernumber) {
- $sth = $dbh->prepare("select * from borrowers where borrowernumber=?");
+ $sth = $dbh->prepare("select borrowers.*,category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where borrowernumber=?");
$sth->execute($borrowernumber);
}
elsif ($cardnumber) {
- $sth = $dbh->prepare("select * from borrowers where cardnumber=?");
+ $sth = $dbh->prepare("select borrowers.*,category_type from borrowers left join categories on borrowers.categorycode=categories.categorycode where cardnumber=?");
$sth->execute($cardnumber);
}
else {
return undef;
}
my $borrower = $sth->fetchrow_hashref;
- my ($amount) = GetBorrowerAcctRecord( $borrowernumber);
+ my ($amount) = GetMemberAccountRecords( $borrowernumber);
$borrower->{'amountoutstanding'} = $amount;
- my $flags = patronflags( $borrower, $dbh );
+ # FIXME - patronflags calls GetMemberAccountRecords... just have patronflags return $amount
+ my $flags = patronflags( $borrower);
my $accessflagshash;
$sth = $dbh->prepare("select bit,flag from userflags");
NOTE!: If you change this function, be sure to update the POD for
&GetMemberDetails.
- $flags = &patronflags($patron, $dbh);
+ $flags = &patronflags($patron);
$flags->{CHARGES}
{message} Message showing patron's credit or debt
{itemlist} ref-to-array: list of available items
=cut
-
+# FIXME rename this function.
sub patronflags {
my %flags;
my ( $patroninformation) = @_;
my $dbh=C4::Context->dbh;
- my ($amount) = GetBorrowerAcctRecord( $patroninformation->{'borrowernumber'});
+ my ($amount) = GetMemberAccountRecords( $patroninformation->{'borrowernumber'});
if ( $amount > 0 ) {
my %flaginfo;
my $noissuescharge = C4::Context->preference("noissuescharge");
$flaginfo{'message'} = sprintf "Patron owes \$%.02f", $amount;
+ $flaginfo{'amount'} = sprintf "%.02f",$amount;
if ( $amount > $noissuescharge ) {
$flaginfo{'noissues'} = 1;
}
}
$flags{'ODUES'} = \%flaginfo;
}
- my $itemswaiting =
- C4::Reserves2::GetWaitingReserves( $patroninformation->{'borrowernumber'} );
- my $nowaiting = scalar @$itemswaiting;
+ my @itemswaiting = C4::Reserves::GetReservesFromBorrowernumber( $patroninformation->{'borrowernumber'},'W' );
+ my $nowaiting = scalar @itemswaiting;
if ( $nowaiting > 0 ) {
my %flaginfo;
$flaginfo{'message'} = "Reserved items available";
- $flaginfo{'itemlist'} = $itemswaiting;
+ $flaginfo{'itemlist'} = \@itemswaiting;
$flags{'WAITING'} = \%flaginfo;
}
return ( \%flags );
my ( $information, $type ) = @_;
my $dbh = C4::Context->dbh;
my $sth;
- if ($type eq 'cardnumber' || $type eq 'firstname'|| $type eq 'userid'|| $type eq 'borrowernumber'){
- $information = uc $information;
- $sth =
- $dbh->prepare(
-"Select borrowers.*,categories.category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where $type=?"
- );
- $sth->execute($information);
- }
- else {
- $sth =
- $dbh->prepare(
-"Select borrowers.*,categories.category_type, categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where borrowernumber=?"
- );
- $sth->execute($information);
- }
+ my $select = "
+SELECT borrowers.*, categories.category_type, categories.description
+FROM borrowers
+LEFT JOIN categories on borrowers.categorycode=categories.categorycode
+";
+ if ($type eq 'cardnumber' || $type eq 'firstname'|| $type eq 'userid'|| $type eq 'borrowernumber'){
+ $information = uc $information;
+ $sth = $dbh->prepare("$select WHERE $type=?");
+ } else {
+ $sth = $dbh->prepare("$select WHERE borrowernumber=?");
+ }
+ $sth->execute($information);
my $data = $sth->fetchrow_hashref;
-
$sth->finish;
- if ($data) {
- return ($data);
- }
- elsif ($type eq 'cardnumber' ||$type eq 'firstname') { # try with firstname
- my $sth =
- $dbh->prepare(
-"Select borrowers.*,categories.category_type,categories.description from borrowers left join categories on borrowers.categorycode=categories.categorycode where firstname like ?"
- );
- $sth->execute($information);
- my $data = $sth->fetchrow_hashref;
- $sth->finish;
- return ($data);
- }
- else {
- return undef;
+ ($data) and return ($data);
+
+ if ($type eq 'cardnumber' || $type eq 'firstname') { # otherwise, try with firstname
+ $sth = $dbh->prepare("$select WHERE firstname like ?");
+ $sth->execute($information);
+ $data = $sth->fetchrow_hashref;
+ $sth->finish;
+ return ($data);
}
+ return undef;
}
-=item GetBorrowerIssuesAndFines
+=item GetMemberIssuesAndFines
- ($borrowed, $due, $fine) = &GetBorrowerIssuesAndFines($borrowernumber);
+ ($borrowed, $due, $fine) = &GetMemberIssuesAndFines($borrowernumber);
Returns aggregate data about items borrowed by the patron with the
given borrowernumber.
-C<&GetBorrowerIssuesAndFines> returns a three-element array. C<$borrowed> is the
+C<&GetMemberIssuesAndFines> returns a three-element array. C<$borrowed> is the
number of books the patron currently has borrowed. C<$due> is the
number of overdue items the patron currently has borrowed. C<$fine> is
the total fine currently due by the borrower.
=cut
#'
-sub GetBorrowerIssuesAndFines {
+sub GetMemberIssuesAndFines {
my ( $borrowernumber ) = @_;
my $dbh = C4::Context->dbh;
my $query =
"Select count(*) from issues where borrowernumber='$borrowernumber' and
returndate is NULL";
- # print $query;
+ $debug and print $query, "\n";
my $sth = $dbh->prepare($query);
$sth->execute;
my $data = $sth->fetchrow_hashref;
=item ModMember
- ($borrowed, $due, $fine) = &ModMember($borrowernumber);
+ &ModMember($borrowernumber);
Modify borrower's data
sub ModMember {
my (%data) = @_;
my $dbh = C4::Context->dbh;
- $data{'dateofbirth'} = format_date_in_iso( $data{'dateofbirth'} );
- $data{'dateexpiry'} = format_date_in_iso( $data{'dateexpiry'} );
- $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'} );
-
- # warn "num user".$data{'borrowernumber'};
- my $query;
+ $data{'dateofbirth'} = format_date_in_iso( $data{'dateofbirth' } ) if ($data{'dateofbirth' } );
+ $data{'dateexpiry'} = format_date_in_iso( $data{ 'dateexpiry' } ) if ($data{ 'dateexpiry' } );
+ $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'} ) if ($data{'dateenrolled'} );
+ my $qborrower=$dbh->prepare("SHOW columns from borrowers");
+ $qborrower->execute;
+ my %hashborrowerfields;
+ while (my ($field)=$qborrower->fetchrow){
+ $hashborrowerfields{$field}=1;
+ }
+ my $query = "UPDATE borrowers SET \n";
my $sth;
- $data{'userid'} = '' if ( $data{'password'} eq '' );
-
- # test to know if u must update or not the borrower password
+ my @parameters;
+
+ # test to know if you must update or not the borrower password
if ( $data{'password'} eq '****' ) {
-
- $query = "UPDATE borrowers SET
- cardnumber = ?,surname = ?,firstname = ?,title = ?,othernames = ?,initials = ?,
- streetnumber = ?,streettype = ?,address = ?,address2 = ?,city = ?,zipcode = ?,
- email = ?,phone = ?,mobile = ?,fax = ?,emailpro = ?,phonepro = ?,B_streetnumber = ?,
- B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email = ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
- categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress = ?,lost = ?,debarred = ?,contactname = ?,
- contactfirstname = ?,contacttitle = ?,guarantorid = ?,borrowernotes = ?,relationship = ?,ethnicity = ?,
- ethnotes = ?,sex = ?,userid = ?,opacnote = ?,contactnote = ?,sort1 = ?,sort2 = ?
- WHERE borrowernumber=$data{'borrowernumber'}";
- $sth = $dbh->prepare($query);
- $sth->execute(
- $data{'cardnumber'}, $data{'surname'},
- $data{'firstname'}, $data{'title'},
- $data{'othernames'}, $data{'initials'},
- $data{'streetnumber'}, $data{'streettype'},
- $data{'address'}, $data{'address2'},
- $data{'city'}, $data{'zipcode'},
- $data{'email'}, $data{'phone'},
- $data{'mobile'}, $data{'fax'},
- $data{'emailpro'}, $data{'phonepro'},
- $data{'B_streetnumber'}, $data{'B_streettype'},
- $data{'B_address'}, $data{'B_city'},
- $data{'B_zipcode'}, $data{'B_email'},
- $data{'B_phone'}, $data{'dateofbirth'},
- $data{'branchcode'}, $data{'categorycode'},
- $data{'dateenrolled'}, $data{'dateexpiry'},
- $data{'gonenoaddress'}, $data{'lost'},
- $data{'debarred'}, $data{'contactname'},
- $data{'contactfirstname'}, $data{'contacttitle'},
- $data{'guarantorid'}, $data{'borrowernotes'},
- $data{'relationship'}, $data{'ethnicity'},
- $data{'ethnotes'}, $data{'sex'},
- $data{'userid'}, $data{'opacnote'},
- $data{'contactnote'}, $data{'sort1'},
- $data{'sort2'}
- );
+ delete $data{'password'};
+ } else {
+ $data{'password'} = md5_base64( $data{'password'} ) if ($data{'password'} ne "");
+ delete $data{'password'} if ($data{password} eq "");
}
- else {
-
- ( $data{'password'} = md5_base64( $data{'password'} ) )
- if ( $data{'password'} ne '' );
- $query = "UPDATE borrowers SET
- cardnumber = ?,surname = ?,firstname = ?,title = ?,othernames = ?,initials = ?,
- streetnumber = ?,streettype = ?,address = ?,address2 = ?,city = ?,zipcode = ?,
- email = ?,phone = ?,mobile = ?,fax = ?,emailpro = ?,phonepro = ?,B_streetnumber = ?,
- B_streettype = ?,B_address = ?,B_city = ?,B_zipcode = ?,B_email = ?,B_phone = ?,dateofbirth = ?,branchcode = ?,
- categorycode = ?,dateenrolled = ?,dateexpiry = ?,gonenoaddress = ?,lost = ?,debarred = ?,contactname = ?,
- contactfirstname = ?,contacttitle = ?,guarantorid = ?,borrowernotes = ?,relationship = ?,ethnicity = ?,
- ethnotes = ?,sex = ?,password = ?,userid = ?,opacnote = ?,contactnote = ?,sort1 = ?,sort2 = ?
- WHERE borrowernumber=$data{'borrowernumber'}";
- $sth = $dbh->prepare($query);
- $sth->execute(
- $data{'cardnumber'}, $data{'surname'},
- $data{'firstname'}, $data{'title'},
- $data{'othernames'}, $data{'initials'},
- $data{'streetnumber'}, $data{'streettype'},
- $data{'address'}, $data{'address2'},
- $data{'city'}, $data{'zipcode'},
- $data{'email'}, $data{'phone'},
- $data{'mobile'}, $data{'fax'},
- $data{'emailpro'}, $data{'phonepro'},
- $data{'B_streetnumber'}, $data{'B_streettype'},
- $data{'B_address'}, $data{'B_city'},
- $data{'B_zipcode'}, $data{'B_email'},
- $data{'B_phone'}, $data{'dateofbirth'},
- $data{'branchcode'}, $data{'categorycode'},
- $data{'dateenrolled'}, $data{'dateexpiry'},
- $data{'gonenoaddress'}, $data{'lost'},
- $data{'debarred'}, $data{'contactname'},
- $data{'contactfirstname'}, $data{'contacttitle'},
- $data{'guarantorid'}, $data{'borrowernotes'},
- $data{'relationship'}, $data{'ethnicity'},
- $data{'ethnotes'}, $data{'sex'},
- $data{'password'}, $data{'userid'},
- $data{'opacnote'}, $data{'contactnote'},
- $data{'sort1'}, $data{'sort2'}
- );
- }
- $sth->finish;
+ foreach (keys %data)
+ { push @parameters,"$_ = ".$dbh->quote($data{$_}) if ($_ ne 'borrowernumber' and $_ ne 'flags' and $hashborrowerfields{$_}); }
+ $query .= join (',',@parameters) . "\n WHERE borrowernumber=? \n";
+ $debug and print STDERR "$query (executed w/ arg: $data{'borrowernumber'})";
+ $sth = $dbh->prepare($query);
+ $sth->execute($data{'borrowernumber'});
+ $sth->finish;
# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
# so when we update information for an adult we should check for guarantees and update the relevant part
# of their records, ie addresses and phone numbers
my $borrowercategory= GetBorrowercategory( $data{'category_type'} );
- if ( $borrowercategory->{'category_type'} eq 'A' ) {
+ if ( $borrowercategory->{'category_type'} eq ('A' || 'S') ) {
# is adult check guarantees;
UpdateGuarantees(%data);
-
}
&logaction(C4::Context->userenv->{'number'},"MEMBERS","MODIFY",$data{'borrowernumber'},"")
if C4::Context->preference("BorrowersLog");
}
+
=head2
=item AddMember
- $borrowernumber = &ModMember(%borrower);
+ $borrowernumber = &AddMember(%borrower);
insert new borrower into table
+Returns the borrowernumber
=cut
my $dbh = C4::Context->dbh;
$data{'userid'} = '' unless $data{'password'};
$data{'password'} = md5_base64( $data{'password'} ) if $data{'password'};
- $data{'dateofbirth'} = format_date_in_iso( $data{'dateofbirth'} );
- $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'} );
- $data{'dateexpiry'} = format_date_in_iso( $data{'dateexpiry'} );
+ $data{'dateofbirth'} = format_date_in_iso( $data{'dateofbirth'} );
+ $data{'dateenrolled'} = format_date_in_iso( $data{'dateenrolled'});
+ $data{'dateexpiry'} = format_date_in_iso( $data{'dateexpiry'} );
+ # This query should be rewritten to use "?" at execute.
my $query =
- "insert into borrowers set cardnumber="
- . $dbh->quote( $data{'cardnumber'} )
- . ",surname="
- . $dbh->quote( $data{'surname'} )
- . ",firstname="
- . $dbh->quote( $data{'firstname'} )
- . ",title="
- . $dbh->quote( $data{'title'} )
- . ",othernames="
- . $dbh->quote( $data{'othernames'} )
- . ",initials="
- . $dbh->quote( $data{'initials'} )
- . ",streetnumber="
- . $dbh->quote( $data{'streetnumber'} )
- . ",streettype="
- . $dbh->quote( $data{'streettype'} )
- . ",address="
- . $dbh->quote( $data{'address'} )
- . ",address2="
- . $dbh->quote( $data{'address2'} )
- . ",zipcode="
- . $dbh->quote( $data{'zipcode'} )
- . ",city="
- . $dbh->quote( $data{'city'} )
- . ",phone="
- . $dbh->quote( $data{'phone'} )
- . ",email="
- . $dbh->quote( $data{'email'} )
- . ",mobile="
- . $dbh->quote( $data{'mobile'} )
- . ",phonepro="
- . $dbh->quote( $data{'phonepro'} )
- . ",opacnote="
- . $dbh->quote( $data{'opacnote'} )
- . ",guarantorid="
- . $dbh->quote( $data{'guarantorid'} )
- . ",dateofbirth="
- . $dbh->quote( $data{'dateofbirth'} )
- . ",branchcode="
- . $dbh->quote( $data{'branchcode'} )
- . ",categorycode="
- . $dbh->quote( $data{'categorycode'} )
- . ",dateenrolled="
- . $dbh->quote( $data{'dateenrolled'} )
- . ",contactname="
- . $dbh->quote( $data{'contactname'} )
- . ",borrowernotes="
- . $dbh->quote( $data{'borrowernotes'} )
- . ",dateexpiry="
- . $dbh->quote( $data{'dateexpiry'} )
- . ",contactnote="
- . $dbh->quote( $data{'contactnote'} )
- . ",B_address="
- . $dbh->quote( $data{'B_address'} )
- . ",B_zipcode="
- . $dbh->quote( $data{'B_zipcode'} )
- . ",B_city="
- . $dbh->quote( $data{'B_city'} )
- . ",B_phone="
- . $dbh->quote( $data{'B_phone'} )
- . ",B_email="
- . $dbh->quote( $data{'B_email'}, )
- . ",password="
- . $dbh->quote( $data{'password'} )
- . ",userid="
- . $dbh->quote( $data{'userid'} )
- . ",sort1="
- . $dbh->quote( $data{'sort1'} )
- . ",sort2="
- . $dbh->quote( $data{'sort2'} )
- . ",contacttitle="
- . $dbh->quote( $data{'contacttitle'} )
- . ",emailpro="
- . $dbh->quote( $data{'emailpro'} )
- . ",contactfirstname="
- . $dbh->quote( $data{'contactfirstname'} ) . ",sex="
- . $dbh->quote( $data{'sex'} ) . ",fax="
- . $dbh->quote( $data{'fax'} )
- . ",relationship="
- . $dbh->quote( $data{'relationship'} )
- . ",B_streetnumber="
- . $dbh->quote( $data{'B_streetnumber'} )
- . ",B_streettype="
- . $dbh->quote( $data{'B_streettype'} )
- . ",gonenoaddress="
- . $dbh->quote( $data{'gonenoaddress'} )
- . ",lost="
- . $dbh->quote( $data{'lost'} )
- . ",debarred="
- . $dbh->quote( $data{'debarred'} )
- . ",ethnicity="
- . $dbh->quote( $data{'ethnicity'} )
- . ",ethnotes="
- . $dbh->quote( $data{'ethnotes'} );
-
+ "insert into borrowers set cardnumber=" . $dbh->quote( $data{'cardnumber'} )
+ . ",surname=" . $dbh->quote( $data{'surname'} )
+ . ",firstname=" . $dbh->quote( $data{'firstname'} )
+ . ",title=" . $dbh->quote( $data{'title'} )
+ . ",othernames=" . $dbh->quote( $data{'othernames'} )
+ . ",initials=" . $dbh->quote( $data{'initials'} )
+ . ",streetnumber=". $dbh->quote( $data{'streetnumber'} )
+ . ",streettype=" . $dbh->quote( $data{'streettype'} )
+ . ",address=" . $dbh->quote( $data{'address'} )
+ . ",address2=" . $dbh->quote( $data{'address2'} )
+ . ",zipcode=" . $dbh->quote( $data{'zipcode'} )
+ . ",city=" . $dbh->quote( $data{'city'} )
+ . ",phone=" . $dbh->quote( $data{'phone'} )
+ . ",email=" . $dbh->quote( $data{'email'} )
+ . ",mobile=" . $dbh->quote( $data{'mobile'} )
+ . ",phonepro=" . $dbh->quote( $data{'phonepro'} )
+ . ",opacnote=" . $dbh->quote( $data{'opacnote'} )
+ . ",guarantorid=" . $dbh->quote( $data{'guarantorid'} )
+ . ",dateofbirth=" . $dbh->quote( $data{'dateofbirth'} )
+ . ",branchcode=" . $dbh->quote( $data{'branchcode'} )
+ . ",categorycode=" . $dbh->quote( $data{'categorycode'} )
+ . ",dateenrolled=" . $dbh->quote( $data{'dateenrolled'} )
+ . ",contactname=" . $dbh->quote( $data{'contactname'} )
+ . ",borrowernotes=" . $dbh->quote( $data{'borrowernotes'} )
+ . ",dateexpiry=" . $dbh->quote( $data{'dateexpiry'} )
+ . ",contactnote=" . $dbh->quote( $data{'contactnote'} )
+ . ",B_address=" . $dbh->quote( $data{'B_address'} )
+ . ",B_zipcode=" . $dbh->quote( $data{'B_zipcode'} )
+ . ",B_city=" . $dbh->quote( $data{'B_city'} )
+ . ",B_phone=" . $dbh->quote( $data{'B_phone'} )
+ . ",B_email=" . $dbh->quote( $data{'B_email'} )
+ . ",password=" . $dbh->quote( $data{'password'} )
+ . ",userid=" . $dbh->quote( $data{'userid'} )
+ . ",sort1=" . $dbh->quote( $data{'sort1'} )
+ . ",sort2=" . $dbh->quote( $data{'sort2'} )
+ . ",contacttitle=" . $dbh->quote( $data{'contacttitle'} )
+ . ",emailpro=" . $dbh->quote( $data{'emailpro'} )
+ . ",contactfirstname=" . $dbh->quote( $data{'contactfirstname'} )
+ . ",sex=" . $dbh->quote( $data{'sex'} )
+ . ",fax=" . $dbh->quote( $data{'fax'} )
+ . ",relationship=" . $dbh->quote( $data{'relationship'} )
+ . ",B_streetnumber=" . $dbh->quote( $data{'B_streetnumber'} )
+ . ",B_streettype=" . $dbh->quote( $data{'B_streettype'} )
+ . ",gonenoaddress=" . $dbh->quote( $data{'gonenoaddress'} )
+ . ",lost=" . $dbh->quote( $data{'lost'} )
+ . ",debarred=" . $dbh->quote( $data{'debarred'} )
+ . ",ethnicity=" . $dbh->quote( $data{'ethnicity'} )
+ . ",ethnotes=" . $dbh->quote( $data{'ethnotes'} );
my $sth = $dbh->prepare($query);
+# print "Executing SQL: $query\n";
$sth->execute;
$sth->finish;
$data{'borrowernumber'} = $dbh->{'mysql_insertid'};
&logaction(C4::Context->userenv->{'number'},"MEMBERS","CREATE",$data{'borrowernumber'},"")
if C4::Context->preference("BorrowersLog");
-
+
+ # check for enrollment fee & add it if needed
+ $sth = $dbh->prepare("SELECT enrolmentfee FROM categories WHERE categorycode=?");
+ $sth->execute($data{'categorycode'});
+ my ($enrolmentfee) = $sth->fetchrow;
+ if ($enrolmentfee) {
+ # insert fee in patron debts
+ manualinvoice($data{'borrowernumber'}, '', '', 'A', $enrolmentfee);
+ }
return $data{'borrowernumber'};
}
+sub Check_Userid {
+ my ($uid,$member) = @_;
+ my $dbh = C4::Context->dbh;
+ # Make sure the userid chosen is unique and not theirs if non-empty. If it is not,
+ # Then we need to tell the user and have them create a new one.
+ my $sth =
+ $dbh->prepare(
+ "SELECT * FROM borrowers WHERE userid=? AND borrowernumber != ?");
+ $sth->execute( $uid, $member );
+ if ( ( $uid ne '' ) && ( my $row = $sth->fetchrow_hashref ) ) {
+ return 0;
+ }
+ else {
+ return 1;
+ }
+}
+
+
sub changepassword {
my ( $uid, $member, $digest ) = @_;
my $dbh = C4::Context->dbh;
#Then we need to tell the user and have them create a new one.
my $sth =
$dbh->prepare(
- "select * from borrowers where userid=? and borrowernumber != ?");
+ "SELECT * FROM borrowers WHERE userid=? AND borrowernumber != ?");
$sth->execute( $uid, $member );
- if ( ( $uid ne '' ) && ( $sth->fetchrow ) ) {
+ if ( ( $uid ne '' ) && ( my $row = $sth->fetchrow_hashref ) ) {
return 0;
}
else {
-
#Everything is good so we can update the information.
$sth =
$dbh->prepare(
}
-sub UpdateGuarantees {
- my (%data) = @_;
- my $dbh = C4::Context->dbh;
- my ( $count, $guarantees ) = GetGuarantees( $data{'borrowernumber'} );
- for ( my $i = 0 ; $i < $count ; $i++ ) {
-
- # FIXME
- # It looks like the $i is only being returned to handle walking through
- # the array, which is probably better done as a foreach loop.
- #
- my $guaquery = qq|UPDATE borrowers
- SET address='$data{'address'}',fax='$data{'fax'}',
- B_city='$data{'B_city'}',mobile='$data{'mobile'}',city='$data{'city'}',phone='$data{'phone'}'
- WHERE borrowernumber='$guarantees->[$i]->{'borrowernumber'}'
- |;
- my $sth3 = $dbh->prepare($guaquery);
- $sth3->execute;
- $sth3->finish;
- }
-}
=item fixup_cardnumber
return ( scalar(@$data), $data );
}
+=head2 UpdateGuarantees
+
+ &UpdateGuarantees($parent_borrno);
+
+
+C<&UpdateGuarantees> borrower data for an adulte and updates all the guarantees
+with the modified information
+
+=cut
+
+#'
+sub UpdateGuarantees {
+ my (%data) = @_;
+ my $dbh = C4::Context->dbh;
+ my ( $count, $guarantees ) = GetGuarantees( $data{'borrowernumber'} );
+ for ( my $i = 0 ; $i < $count ; $i++ ) {
+
+ # FIXME
+ # It looks like the $i is only being returned to handle walking through
+ # the array, which is probably better done as a foreach loop.
+ #
+ my $guaquery = qq|UPDATE borrowers
+ SET address='$data{'address'}',fax='$data{'fax'}',
+ B_city='$data{'B_city'}',mobile='$data{'mobile'}',city='$data{'city'}',phone='$data{'phone'}'
+ WHERE borrowernumber='$guarantees->[$i]->{'borrowernumber'}'
+ |;
+ my $sth3 = $dbh->prepare($guaquery);
+ $sth3->execute;
+ $sth3->finish;
+ }
+}
=head2 GetPendingIssues
($count, $issues) = &GetPendingIssues($borrowernumber);
sub GetPendingIssues {
my ($borrowernumber) = @_;
my $dbh = C4::Context->dbh;
+
my $sth = $dbh->prepare(
- "Select * from issues,biblio,items where borrowernumber=?
- and items.itemnumber=issues.itemnumber
- and items.biblionumber=biblio.biblionumber
- and issues.returndate is NULL order by date_due"
+ "SELECT * FROM issues
+ LEFT JOIN items ON issues.itemnumber=items.itemnumber
+ LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
+ LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
+ WHERE
+ borrowernumber=?
+ AND returndate IS NULL
+ ORDER BY issues.issuedate"
);
$sth->execute($borrowernumber);
my $data = $sth->fetchall_arrayref({});
+ my $today = POSIX::strftime("%Y%m%d", localtime);
+ foreach( @$data ) {
+ my $datedue = $_->{'date_due'};
+ $datedue =~ s/-//g;
+ if ( $datedue < $today ) {
+ $_->{'overdue'} = 1;
+ }
+ }
+ $sth->finish;
return ( scalar(@$data), $data );
}
my $dbh = C4::Context->dbh;
my $count = 0;
my $query =
-"Select *,items.timestamp AS itemstimestamp from issues,biblio,items,biblioitems
- where borrowernumber=? and
- items.biblioitemnumber=biblioitems.biblioitemnumber and
- items.itemnumber=issues.itemnumber and
- items.biblionumber=biblio.biblionumber order by $order";
+ "Select *,items.timestamp AS itemstimestamp from
+ issues
+ LEFT JOIN items on items.itemnumber=issues.itemnumber
+ LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
+ LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
+ where borrowernumber=?
+ order by $order";
if ( $limit != 0 ) {
$query .= " limit $limit";
}
# large chunk of older issues data put into table oldissues
# to speed up db calls for issuing items
if ( C4::Context->preference("ReadingHistory") ) {
- my $query2 = "SELECT * FROM oldissues,biblio,items,biblioitems
+ my $query2 = "SELECT * FROM oldissues
+ LEFT JOIN items ON items.itemnumber=oldissues.itemnumber
+ LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
+ LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
WHERE borrowernumber=?
- AND items.biblioitemnumber=biblioitems.biblioitemnumber
- AND items.itemnumber=oldissues.itemnumber
- AND items.biblionumber=biblio.biblionumber
ORDER BY $order";
if ( $limit != 0 ) {
$limit = $limit - $count;
}
-=head2 GetBorrowerAcctRecord
+=head2 GetMemberAccountRecords
- ($total, $acctlines, $count) = &GetBorrowerAcctRecord($borrowernumber);
+ ($total, $acctlines, $count) = &GetMemberAccountRecords($borrowernumber);
Looks up accounting data for the patron with the given borrowernumber.
-C<&GetBorrowerAcctRecord> returns a three-element array. C<$acctlines> is a
+C<&GetMemberAccountRecords> returns a three-element array. C<$acctlines> is a
reference-to-array, where each element is a reference-to-hash; the
keys are the fields of the C<accountlines> table in the Koha database.
C<$count> is the number of elements in C<$acctlines>. C<$total> is the
=cut
#'
-sub GetBorrowerAcctRecord {
+sub GetMemberAccountRecords {
my ($borrowernumber,$date) = @_;
my $dbh = C4::Context->dbh;
my @acctlines;
my $numlines = 0;
my $strsth = qq(
- Select * from accountlines where
-borrowernumber=? order by date desc,timestamp desc
- );
+ SELECT *
+ FROM accountlines
+ WHERE borrowernumber=?);
my @bind = ($borrowernumber);
if ($date && $date ne ''){
- $strsth.=" AND date < ?";
- push(@bind,$date);
+ $strsth.=" AND date < ? ";
+ push(@bind,$date);
}
-
+ $strsth.=" ORDER BY date desc,timestamp DESC";
my $sth= $dbh->prepare( $strsth );
- $sth->execute( $borrowernumber);
+ $sth->execute( @bind );
my $total = 0;
while ( my $data = $sth->fetchrow_hashref ) {
-
$acctlines[$numlines] = $data;
$numlines++;
$total += $data->{'amountoutstanding'};
=cut
sub GetBorNotifyAcctRecord {
- my ( $params, $notifyid ) = @_;
+ my ( $borrowernumber, $notifyid ) = @_;
my $dbh = C4::Context->dbh;
my @acctlines;
my $numlines = 0;
- my $query = qq| SELECT *
- FROM accountlines
- WHERE borrowernumber=?
- AND notify_id=?
- AND (accounttype='FU' OR accounttype='N' OR accounttype='M'OR accounttype='A'OR accounttype='F'OR accounttype='L' OR accounttype='IP' OR accounttype='CH' OR accounttype='RE' OR accounttype='RL')
- AND amountoutstanding != '0'
- ORDER BY notify_id,accounttype
- |;
- my $sth = $dbh->prepare($query);
-
- $sth->execute( $params->{'borrowernumber'}, $notifyid );
+ my $sth = $dbh->prepare(
+ "SELECT *
+ FROM accountlines
+ WHERE borrowernumber=?
+ AND notify_id=?
+ AND (accounttype='FU' OR accounttype='N' OR accounttype='M'OR accounttype='A'OR accounttype='F'OR accounttype='L' OR accounttype='IP' OR accounttype='CH' OR accounttype='RE' OR accounttype='RL')
+ AND amountoutstanding != '0'
+ ORDER BY notify_id,accounttype
+ ");
+ $sth->execute( $borrowernumber, $notifyid );
my $total = 0;
while ( my $data = $sth->fetchrow_hashref ) {
$acctlines[$numlines] = $data;
$total += $data->{'amountoutstanding'};
}
$sth->finish;
- return ( $numlines, \@acctlines, $total );
+ return ( $total, \@acctlines, $numlines );
}
=head2 checkuniquemember (OUEST-PROVENCE)
}
}
+sub checkcardnumber {
+ my ($cardnumber,$borrowernumber) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = "SELECT * FROM borrowers WHERE cardnumber=?";
+ $query .= " AND borrowernumber <> ?" if ($borrowernumber);
+ my $sth = $dbh->prepare($query);
+ if ($borrowernumber) {
+ $sth->execute($cardnumber,$borrowernumber);
+ } else {
+ $sth->execute($cardnumber);
+ }
+ if (my $data= $sth->fetchrow_hashref()){
+ return 1;
+ }
+ else {
+ return 0;
+ }
+ $sth->finish();
+}
+
+
=head2 getzipnamecity (OUEST-PROVENCE)
take all info from table city for the fields city and zip
my $dbh = C4::Context->dbh;
my $sth =
$dbh->prepare(
-"SELECT description,dateofbirthrequired,upperagelimit,category_type FROM categories WHERE categorycode = ?"
+"SELECT description,dateofbirthrequired,upperagelimit,category_type
+ FROM categories
+ WHERE categorycode = ?"
);
$sth->execute($catcode);
my $data =
} # sub add_member_orgs
-=head2 GetBorrowersFromSurname
-
-=over 4
-
-\@resutlts = GetBorrowersFromSurname($surname)
-this function get the list of borrower names like $surname.
-return :
-the table of results in @results
-
-=back
-
-=cut
-
-sub GetBorrowersFromSurname {
- my ($searchstring) = @_;
- my $dbh = C4::Context->dbh;
- $searchstring =~ s/\'/\\\'/g;
- my @data = split( ' ', $searchstring );
- my $count = @data;
- my $query = qq|
- SELECT surname,firstname
- FROM borrowers
- WHERE (surname like ?)
- ORDER BY surname
- |;
- my $sth = $dbh->prepare($query);
- $sth->execute("$data[0]%");
- my @results;
- $count = 0;
-
- my $data = $sth->fetchall_arrayref({});
- $sth->finish;
- return ( scalar(@$data), $data );
-}
-
=head2 GetCities (OUEST-PROVENCE)
($id_cityarrayref, $city_hashref) = &GetCities();
#my ($type_city) = @_;
my $dbh = C4::Context->dbh;
- my $query = qq|SELECT cityid,city_name
+ my $query = qq|SELECT cityid,city_zipcode,city_name
FROM cities
ORDER BY city_name|;
my $sth = $dbh->prepare($query);
$sth->execute();
my %city;
my @id;
-
# insert empty value to create a empty choice in cgi popup
-
+ push @id, " ";
+ $city{""} = "";
while ( my $data = $sth->fetchrow_hashref ) {
-
- push @id, $data->{'cityid'};
- $city{ $data->{'cityid'} } = $data->{'city_name'};
+ push @id, $data->{'city_zipcode'}."|".$data->{'city_name'};
+ $city{ $data->{'city_zipcode'}."|".$data->{'city_name'} } = $data->{'city_name'};
}
#test to know if the table contain some records if no the function return nothing
my @data = $sth->fetchrow_array;
$sth->finish;
$sth =
- $dbh->prepare( "Insert into deletedborrowers values ("
+ $dbh->prepare( "INSERT INTO deletedborrowers VALUES ("
. ( "?," x ( scalar(@data) - 1 ) )
. "?)" );
$sth->execute(@data);
sub DelMember {
my $dbh = C4::Context->dbh;
my $borrowernumber = shift;
+ warn "in delmember with $borrowernumber";
return unless $borrowernumber; # borrowernumber is mandatory.
my $query = qq|DELETE
FROM borrowers
WHERE borrowernumber = ?
";
- my $sth = $dbh->prepare($query);
+ $sth = $dbh->prepare($query);
+ $sth->execute($borrowernumber);
+ $sth->finish;
&logaction(C4::Context->userenv->{'number'},"MEMBERS","DELETE",$borrowernumber,"")
if C4::Context->preference("BorrowersLog");
return $sth->rows;
my $dbh = C4::Context->dbh;
unless ($date){
$date=POSIX::strftime("%Y-%m-%d",localtime(time));
- my $borrower = GetBorrower($borrowerid,'borrowernumber');
+ my $borrower = GetMember($borrowerid,'borrowernumber');
$date = GetExpiryDate( $borrower->{'categorycode'}, $date );
}
my $sth = $dbh->do(<<EOF);
sub GetRoadTypes {
my $dbh = C4::Context->dbh;
- my $query = qq|SELECT roadtypeid,road_type
- FROM roadtype
- ORDER BY road_type|;
+ my $query = qq|
+SELECT roadtypeid,road_type
+FROM roadtype
+ORDER BY road_type|;
my $sth = $dbh->prepare($query);
$sth->execute();
my %roadtype;
-=head2 GetBorrowersTitles (OUEST-PROVENCE)
+=head2 GetTitles (OUEST-PROVENCE)
- ($borrowertitle)= &GetBorrowersTitles();
+ ($borrowertitle)= &GetTitles();
Looks up the different title . Returns array with all borrowers title
=cut
-sub GetBorrowersTitles {
+sub GetTitles {
my @borrowerTitle = split /,|\|/,C4::Context->preference('BorrowersTitles');
unshift( @borrowerTitle, "" );
return ( \@borrowerTitle);
sub GetRoadTypeDetails {
my ($roadtypeid) = @_;
my $dbh = C4::Context->dbh;
- my $query = qq|SELECT road_type
- FROM roadtype
- WHERE roadtypeid=?|;
+ my $query = qq|
+SELECT road_type
+FROM roadtype
+WHERE roadtypeid=?|;
my $sth = $dbh->prepare($query);
$sth->execute($roadtypeid);
my $roadtype = $sth->fetchrow;
projects / srvgit / blobdiff