- my ($time,$time2)=@_;
- $time2=$time unless $time2;
- my $dbh = C4::Context->dbh;
- my $query="Select * from accountlines,borrowers where (accounttype = 'Pay' or accounttype ='W')
- and accountlines.borrowernumber = borrowers.borrowernumber";
- my @bind = ();
- if ($time eq 'today'){
- $query .= " and date = now()";
- } else {
- $query.=" and date>=? and date<=?";
- @bind = ($time,$time2);
- }
- # my $query="Select * from statistics,borrowers
- # where statistics.borrowernumber= borrowers.borrowernumber
- # and (statistics.type='payment' or statistics.type='writeoff') ";
- # if ($time eq 'today'){
- # $query=$query." and datetime = now()";
- # } else {
- # $query.=" and datetime > '$time'";
- # }
- $query.=" order by timestamp";
- # print $query;
- my $sth=$dbh->prepare($query);
- $sth->execute(@bind);
- my @results;
- my $i=0;
- while (my $data=$sth->fetchrow_hashref){
- $results[$i]=$data;
- $i++;
- }
- $sth->finish;
- # print $query;
- return(@results);
-}
-
-# Otherwise, it needs a POD.
-sub getcharges{
- my($borrowerno,$timestamp)=@_;
- my $dbh = C4::Context->dbh;
- my $timestamp2=$timestamp-1;
- my $query="";
- my $sth=$dbh->prepare("Select * from accountlines where borrowernumber=?
- and timestamp = ? and accounttype <> 'Pay' and
- accounttype <> 'W'");
- # print $query,"<br>";
- $sth->execute($borrowerno,$timestamp);
- my $i=0;
- my @results;
- while (my $data=$sth->fetchrow_hashref){
- # if ($data->{'timestamp'} == $timestamp){
- $results[$i]=$data;
- $i++;
- # }
- }
- return(@results);
-}
-
-# Otherwise, this needs a POD.
-sub Getpaidbranch{
- my($date,$borrno)=@_;
- my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("select * from statistics where type='payment' and datetime >? and borrowernumber=?");
- $sth->execute($date,$borrno);
- # print $query;
- my $data=$sth->fetchrow_hashref;
- $sth->finish;
- return($data->{'branch'});
-}
-
-# FIXME - This is only used in reservereport.pl and reservereport.xls,
-# neither of which is used.
-# Otherwise, it needs a POD.
-sub unfilledreserves {
- my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("select *,biblio.title from reserves,reserveconstraints,biblio,borrowers,biblioitems where found <> 'F' and cancellationdate
- is NULL and biblio.biblionumber=reserves.biblionumber and
- reserves.constrainttype='o'
- and (reserves.biblionumber=reserveconstraints.biblionumber
- and reserves.borrowernumber=reserveconstraints.borrowernumber)
- and
- reserves.borrowernumber=borrowers.borrowernumber and
- biblioitems.biblioitemnumber=reserveconstraints.biblioitemnumber order by
- biblio.title,reserves.reservedate");
- $sth->execute;
- my $i=0;
- my @results;
- while (my $data=$sth->fetchrow_hashref){
- $results[$i]=$data;
- $i++;
- }
- $sth->finish;
- $sth=$dbh->prepare("select *,biblio.title from reserves,biblio,borrowers where found <> 'F' and cancellationdate
- is NULL and biblio.biblionumber=reserves.biblionumber and reserves.constrainttype='a' and
- reserves.borrowernumber=borrowers.borrowernumber
- order by
- biblio.title,reserves.reservedate");
- $sth->execute;
- while (my $data=$sth->fetchrow_hashref){
- $results[$i]=$data;
- $i++;
- }
- $sth->finish;
- return($i,\@results);
+ my ( $time, $time2, $spreadsheet ) = @_;
+ $time2 = $time unless $time2;
+ my $dbh = C4::Context->dbh;
+ my $query = "SELECT * FROM statistics
+ LEFT JOIN borrowers ON statistics.borrowernumber= borrowers.borrowernumber
+ WHERE (statistics.type='payment' OR statistics.type='writeoff') ";
+ if ( $time eq 'today' ) {
+ $query = $query . " AND datetime = now()";
+ }
+ else {
+ $query .= " AND datetime > '$time'";
+ }
+ if ( $time2 ne '' ) {
+ $query .= " AND datetime < '$time2'";
+ }
+ if ($spreadsheet) {
+ $query .= " ORDER BY branch, type";
+ }
+ my $sth = $dbh->prepare($query);
+warn $query;
+ $sth->execute();
+ my @results;
+ while ( my $data = $sth->fetchrow_hashref ) {
+ push @results, $data;
+ }
+ $sth->finish;
+ return (@results);