$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
#(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'} ) {
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...
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);
- my $where = "AND $where" if $where;
+ $where = $where ? "AND $where" : '';
my $are_part_event =
"EXISTS ( SELECT 1 FROM part_event $join