import torrus 1.0.9

[freeside.git] / FS / FS / Cron / bill.pm

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index 1feba79..7388733 100644 (file)
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -5,7 +5,7 @@ use vars qw( @ISA @EXPORT_OK );
 use Exporter;
 use Date::Parse;
 use DBI 1.33; #The "clone" method was added in DBI 1.33. 
-use FS::UID qw(dbh);
+use FS::UID qw( dbh driver_name );
 use FS::Record qw( qsearch qsearchs );
 use FS::queue;
 use FS::cust_main;
@@ -34,14 +34,21 @@ sub bill {
   $FS::cust_main::DEBUG = $debug;
   #$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
 
+  my $conf = new FS::Conf;
+  if ( $conf->exists('disable_cron_billing') ) {
+    warn "disable_cron_billing set, skipping billing\n" if $debug;
+    return;
+  }
+
   #we're at now now (and later).
   $opt{'time'} = $opt{'d'} ? str2time($opt{'d'}) : $^T;
   $opt{'time'} += $opt{'y'} * 86400 if $opt{'y'};
 
   $opt{'invoice_time'} = $opt{'n'} ? $^T : $opt{'time'};
 
-  my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
-                            : {};
+  #hashref here doesn't work with -m
+  #my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
+  #                          : {};
 
   ###
   # get a list of custnums
@@ -49,14 +56,20 @@ sub bill {
 
   my $cursor_dbh = dbh->clone;
 
-  $cursor_dbh->do(
-    "DECLARE cron_bill_cursor CURSOR FOR ".
-    "  SELECT custnum FROM cust_main WHERE ". bill_where( %opt )
-  ) or die $cursor_dbh->errstr;
+  my $select = 'SELECT custnum FROM cust_main WHERE '. bill_where( %opt );
+
+  unless ( driver_name =~ /^mysql/ ) {
+    $cursor_dbh->do( "DECLARE cron_bill_cursor CURSOR FOR $select" )
+      or die $cursor_dbh->errstr;
+  }
 
   while ( 1 ) {
 
-    my $sth = $cursor_dbh->prepare('FETCH 100 FROM cron_bill_cursor'); #mysql?
+    my $sql = (driver_name =~ /^mysql/)
+      ? $select
+      : 'FETCH 100 FROM cron_bill_cursor';
+
+    my $sth = $cursor_dbh->prepare($sql);
 
     $sth->execute or die $sth->errstr;
 
@@ -78,7 +91,7 @@ sub bill {
                                  #(not, when using -m, freeside-queued)
           'check_freq'   => $check_freq,
           'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
-          'not_pkgpart'  => $not_pkgpart,
+          'not_pkgpart'  => $opt{'g'}, #$not_pkgpart,
       );
 
       if ( $opt{'m'} ) {
@@ -113,6 +126,8 @@ sub bill {
 
     }
 
+    last if driver_name =~ /^mysql/;
+
   }
 
   $cursor_dbh->commit or die $cursor_dbh->errstr;
@@ -154,7 +169,7 @@ sub bill_where {
 
   push @search, "cust_main.payby    = '". $opt{'p'}. "'"
     if $opt{'p'};
-  push @search, "cust_main.agentnum =  ". $opt{'a'}
+  push @search, "cust_main.agentnum IN ( ". $opt{'a'}. " ) "
     if $opt{'a'};
 
   #it would be useful if i recognized $opt{g} / $not_pkgpart...
@@ -187,6 +202,7 @@ sub bill_where {
     )
 END
 
+  #some false laziness w/cust_main::Billing due_cust_event
   my $where_event = join(' OR ', map {
     my $eventtable = $_;
 
@@ -194,13 +210,14 @@ END
     my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
                                                                 'time'=>$time,
                                                               );
+    $where = $where ? "AND $where" : '';
 
     my $are_part_event = 
       "EXISTS ( SELECT 1 FROM part_event $join
                   WHERE check_freq = '$check_freq'
                     AND eventtable = '$eventtable'
                     AND ( disabled = '' OR disabled IS NULL )
-                    AND $where
+                    $where
               )
       ";