X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCron%2Fbill.pm;h=ad6498c7405acc392479098759f8872dcfb6c419;hb=44b5d849d7fb3af5ea1e2812097126633add0fd4;hp=e4ba118a798dcf60802e95e09db850bebcd7dce0;hpb=c26c4fa9449ef6b91620c3b994db8d5242b3d4ad;p=freeside.git

diff --git a/FS/FS/Cron/bill.pm b/FS/FS/Cron/bill.pm
index e4ba118a7..ad6498c74 100644
--- a/FS/FS/Cron/bill.pm
+++ b/FS/FS/Cron/bill.pm
@@ -4,7 +4,8 @@ use strict;
 use vars qw( @ISA @EXPORT_OK );
 use Exporter;
 use Date::Parse;
-use FS::Record qw(qsearch qsearchs);
+use FS::UID qw(dbh);
+use FS::Record qw(qsearchs);
 use FS::cust_main;
 use FS::part_event;
 use FS::part_event_condition;
@@ -25,10 +26,23 @@ sub bill {
   $FS::cust_main::DEBUG = $debug;
   #$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
 
-  my %search = ();
-  $search{'payby'}    = $opt{'p'} if $opt{'p'};
-  $search{'agentnum'} = $opt{'a'} if $opt{'a'};
-  
+  my @search = ();
+
+  push @search, "cust_main.payby    = '". $opt{'p'}. "'"
+    if $opt{'p'};
+  push @search, "cust_main.agentnum =  ". $opt{'a'}
+    if $opt{'a'};
+
+  if ( @ARGV ) {
+    push @search, "( ".
+      join(' OR ', map "cust_main.custnum = $_", @ARGV ).
+    " )";
+  }
+
+  ###
+  # generate where_pkg/where_event search clause
+  ###
+
   #we're at now now (and later).
   my($time)= $opt{'d'} ? str2time($opt{'d'}) : $^T;
   $time += $opt{'y'} * 86400 if $opt{'y'};
@@ -77,53 +91,53 @@ END
 
   } FS::part_event->eventtables);
 
-  my $extra_sql = ( scalar(%search) ? ' AND ' : ' WHERE ' ).
-                  "( $where_pkg OR $where_event )";
+  push @search, "( $where_pkg OR $where_event )";
 
-  my @cust_main;
-  if ( @ARGV ) {
-    @cust_main = map { qsearchs('cust_main', { custnum => $_, %search } ) } @ARGV
-  } else {
+  ###
+  # get a list of custnums
+  ###
 
-    warn "searching for customers:\n".
-         join("\n", map "  $_ => ".$search{$_}, keys %search). "\n".
-         "  $extra_sql\n"
-      if $opt{'v'} || $opt{'l'};
+  warn "searching for customers:\n". join("\n", @search). "\n"
+    if $opt{'v'} || $opt{'l'};
 
-    @cust_main = qsearch({
-      'table'     => 'cust_main',
-      'hashref'   => \%search,
-      'extra_sql' => $extra_sql,
-    });
+  my $sth = dbh->prepare(
+    "SELECT custnum FROM cust_main".
+    " WHERE ". join(' AND ', @search)
+  ) or die dbh->errstr;
 
-  }
-  
-  foreach my $cust_main ( @cust_main ) {
+  $sth->execute or die $sth->errstr;
 
-    if ( $opt{'m'} ) {
+  my @custnums = map { $_->[0] } @{ $sth->fetchall_arrayref };
 
-      #add job to queue that calls bill_and_collect with options
-        my $queue = new FS::queue {
-          'job'    => 'FS::cust_main::queued_bill',
-          'secure' => 'Y',
-        };
-        my $error = $queue->insert(
-        'custnum'      => $cust_main->custnum,
+  ###
+  # for each custnum, queue or make one customer object and bill
+  # (one at a time, to reduce memory footprint with large #s of customers)
+  ###
+  
+  foreach my $custnum ( @custnums ) {
+  
+    my %args = (
         'time'         => $time,
         'invoice_time' => $invoice_time,
+        'actual_time'  => $^T, #when freeside-bill was started
+                               #(not, when using -m, freeside-queued)
         'check_freq'   => $check_freq,
-        'resetup'      => $opt{'s'} ? $opt{'s'} : 0,
-      );
+        'resetup'      => ( $opt{'s'} ? $opt{'s'} : 0 ),
+    );
+
+    if ( $opt{'m'} ) {
+
+      #add job to queue that calls bill_and_collect with options
+      my $queue = new FS::queue {
+        'job'    => 'FS::cust_main::queued_bill',
+        'secure' => 'Y',
+      };
+      my $error = $queue->insert( 'custnum'=>$custnum, %args );
 
     } else {
 
-      $cust_main->bill_and_collect(
-        'time'         => $time,
-        'invoice_time' => $invoice_time,
-        'check_freq'   => $check_freq,
-        'resetup'      => $opt{'s'},
-        'debug'        => $debug,
-      );
+      my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
+      $cust_main->bill_and_collect( %args, 'debug' => $debug );
 
     }