use DBI 1.33; #The "clone" method was added in DBI 1.33.
use FS::UID qw( dbh driver_name );
use FS::Record qw( qsearch qsearchs );
+use FS::Misc::DateTime qw( day_end );
use FS::queue;
use FS::cust_main;
use FS::part_event;
use FS::part_event_condition;
+use FS::Log;
+
@ISA = qw( Exporter );
@EXPORT_OK = qw ( bill bill_where );
sub bill {
my %opt = @_;
+ my $log = FS::Log->new('Cron::bill');
+ $log->info('start');
+
my $check_freq = $opt{'check_freq'} || '1d';
my $debug = 0;
#$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
my $conf = new FS::Conf;
+ my $disable_bill = 0;
if ( $conf->exists('disable_cron_billing') ) {
warn "disable_cron_billing set, skipping billing\n" if $debug;
- return;
+ $disable_bill = 1;
}
#we're at now now (and later).
'check_freq' => $check_freq,
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
+ 'one_recur' => $opt{'o'},
+ 'no_prepaid' => 1,
);
if ( $opt{'m'} ) {
} else {
my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
- $cust_main->bill_and_collect( %args, 'debug' => $debug );
+ if ( $disable_bill ) {
+ $cust_main->collect( %args, 'debug' => $debug );
+ } else {
+ $cust_main->bill_and_collect( %args, 'debug' => $debug );
+ }
}
$cursor_dbh->commit or die $cursor_dbh->errstr;
+ $log->info('finish');
}
# freeside-daily %opt:
# (or now, if no -d switch was given).
#
# -n: When used with "-d" and/or "-y", specifies that invoices should be dated
-# with today's date, irregardless of the pretend date used to pre-generate
+# with today's date, regardless of the pretend date used to pre-generate
# the invoices.
#
-# -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
-#
# -a: Only process customers with the specified agentnum
#
# -v: enable debugging
#
# -l: debugging level
+=item bill_where
+
+Internal function. Returns a WHERE clause to select the set of customers who
+have actionable packages (no setup date, or bill date in the past, or expire
+or adjourn dates in the past) or events (does a complete where_conditions_sql
+scan).
+
+=cut
+
sub bill_where {
my( %opt ) = @_;
push @search, "( cust_main.archived != 'Y' OR archived IS NULL )"; #disable?
- push @search, "cust_main.payby = '". $opt{'p'}. "'"
- if $opt{'p'};
push @search, "cust_main.agentnum IN ( ". $opt{'a'}. " ) "
if $opt{'a'};
# generate where_pkg/where_event search clause
###
+ my $conf = new FS::Conf;
+ my $billtime = $conf->exists('next-bill-ignore-time') ? day_end($time) : $time;
+
+ # corresponds to perl checks in FS::cust_main::Billing sub bill
+ # ("bill setup" and "bill recurring fee")
# select * from cust_main where
my $where_pkg = <<"END";
EXISTS(
- SELECT 1 FROM cust_pkg
+ SELECT 1 FROM cust_pkg LEFT JOIN part_pkg USING ( pkgpart )
WHERE cust_main.custnum = cust_pkg.custnum
AND ( cancel IS NULL OR cancel = 0 )
- AND ( ( ( setup IS NULL OR setup = 0 )
+ AND ( ( ( cust_pkg.setup IS NULL OR cust_pkg.setup = 0 )
AND ( start_date IS NULL OR start_date = 0
- OR ( start_date IS NOT NULL AND start_date <= $^T )
+ OR ( start_date IS NOT NULL AND start_date <= $billtime )
)
)
- OR bill IS NULL OR bill <= $time
+ OR ( freq != '0' AND ( bill IS NULL OR bill <= $billtime ) )
OR ( expire IS NOT NULL AND expire <= $^T )
OR ( adjourn IS NOT NULL AND adjourn <= $^T )
+ OR ( resume IS NOT NULL AND resume <= $^T )
)
)
END
my $where_event = join(' OR ', map {
my $eventtable = $_;
- my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
+ # joins and where clauses to test event conditions
+ my $join = FS::part_event_condition->join_conditions_sql( $eventtable,
+ 'time'=>$time );
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);
$where = $where ? "AND $where" : '';
+ # test to return all applicable part_events (defined on this eventtable,
+ # not disabled, check_freq correct, and all event conditions true)
my $are_part_event =
"EXISTS ( SELECT 1 FROM part_event $join
WHERE check_freq = '$check_freq'
if ( $eventtable eq 'cust_main' ) {
$are_part_event;
} else {
- "EXISTS ( SELECT 1 FROM $eventtable
- WHERE cust_main.custnum = $eventtable.custnum
+ my $cust_join = FS::part_event->eventtables_cust_join->{$eventtable}
+ || '';
+ my $custnum = FS::part_event->eventtables_custnum->{$eventtable};
+ "EXISTS ( SELECT 1 FROM $eventtable $cust_join
+ WHERE cust_main.custnum = $custnum
AND $are_part_event
)
";