use C4::Overdues;
use C4::Reserves;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+our ($VERSION,@ISA,@EXPORT,@EXPORT_OK);
$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
#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
&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);
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<&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 {
+sub SearchMember {
my ($searchstring, $orderby, $type,$category_type ) = @_;
my $dbh = C4::Context->dbh;
my $query = "";
# warn "Q $orderby : $query";
$sth->execute(@bind);
my @results;
- my $cnt = $sth->rows;
- while ( my $data = $sth->fetchrow_hashref ) {
- push( @results, $data );
- }
+ my $data = $sth->fetchall_arrayref({});
- # $sth->execute;
$sth->finish;
- return ( $cnt, \@results );
+ return ( scalar(@$data), $data );
}
=head2 GetMemberDetails
return undef;
}
my $borrower = $sth->fetchrow_hashref;
- my ($amount) = GetBorrowerAcctRecord( $borrowernumber);
+ my ($amount) = GetMemberAccountRecords( $borrowernumber);
$borrower->{'amountoutstanding'} = $amount;
- my $flags = patronflags( $borrower, $dbh );
+ 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
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");
}
$flags{'ODUES'} = \%flaginfo;
}
- my $itemswaiting =
- C4::Reserves2::GetWaitingReserves( $patroninformation->{'borrowernumber'} );
- my $nowaiting = scalar @$itemswaiting;
+ my @itemswaiting = 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 );
}
}
-=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 =
=item ModMember
- ($borrowed, $due, $fine) = &ModMember($borrowernumber);
+ &ModMember($borrowernumber);
Modify borrower's data
=item AddMember
- $borrowernumber = &ModMember(%borrower);
+ $borrowernumber = &AddMember(%borrower);
insert new borrower into table
+Returns the borrowernumber
=cut
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.date_due"
);
$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 );
}
}
-=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 < ?";
+ $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 $sth = $dbh->prepare($query);
- $sth->execute( $params->{'borrowernumber'}, $notifyid );
+ $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) = @_;
+ my $dbh = C4::Context->dbh;
+ my $query = "SELECT * FROM borrowers WHERE cardnumber=?";
+ my $sth = $dbh->prepare($query);
+ $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 @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 / koha.git / blobdiff