projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DSL status pulling, RT#13656
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
61b4735
..
88fe69b
100644
(file)
--- a/
FS/FS/Cron/bill.pm
+++ b/
FS/FS/Cron/bill.pm
@@
-5,8
+5,9
@@
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 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::Record qw( qsearch qsearchs );
+use FS::Misc::DateTime qw( day_end );
use FS::queue;
use FS::cust_main;
use FS::part_event;
use FS::queue;
use FS::cust_main;
use FS::part_event;
@@
-21,6
+22,7
@@
use FS::part_event_condition;
# -l: debugging level
# -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
# -r: Multi-process mode dry run option
# -l: debugging level
# -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
# -r: Multi-process mode dry run option
+# -g: Don't bill these pkgparts
sub bill {
my %opt = @_;
sub bill {
my %opt = @_;
@@
-33,26
+35,42
@@
sub bill {
$FS::cust_main::DEBUG = $debug;
#$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
$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'};
#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'};
+ #hashref here doesn't work with -m
+ #my $not_pkgpart = $opt{g} ? { map { $_=>1 } split(/,\s*/, $opt{g}) }
+ # : {};
+
###
# get a list of custnums
###
my $cursor_dbh = dbh->clone;
###
# get a list of custnums
###
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 ) {
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;
$sth->execute or die $sth->errstr;
@@
-74,6
+92,7
@@
sub bill {
#(not, when using -m, freeside-queued)
'check_freq' => $check_freq,
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
#(not, when using -m, freeside-queued)
'check_freq' => $check_freq,
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
+ 'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
);
if ( $opt{'m'} ) {
);
if ( $opt{'m'} ) {
@@
-108,6
+127,8
@@
sub bill {
}
}
+ last if driver_name =~ /^mysql/;
+
}
$cursor_dbh->commit or die $cursor_dbh->errstr;
}
$cursor_dbh->commit or die $cursor_dbh->errstr;
@@
-149,9
+170,11
@@
sub bill_where {
push @search, "cust_main.payby = '". $opt{'p'}. "'"
if $opt{'p'};
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'};
if $opt{'a'};
+ #it would be useful if i recognized $opt{g} / $not_pkgpart...
+
if ( @ARGV ) {
push @search, "( ".
join(' OR ', map "cust_main.custnum = $_", @ARGV ).
if ( @ARGV ) {
push @search, "( ".
join(' OR ', map "cust_main.custnum = $_", @ARGV ).
@@
-162,6
+185,8
@@
sub bill_where {
# generate where_pkg/where_event search clause
###
# generate where_pkg/where_event search clause
###
+ my $billtime = day_end($time);
+
# select * from cust_main where
my $where_pkg = <<"END";
EXISTS(
# select * from cust_main where
my $where_pkg = <<"END";
EXISTS(
@@
-173,13
+198,14
@@
sub bill_where {
OR ( start_date IS NOT NULL AND start_date <= $^T )
)
)
OR ( start_date IS NOT NULL AND start_date <= $^T )
)
)
- OR bill IS NULL OR bill <= $time
+ OR bill IS NULL OR bill <= $
bill
time
OR ( expire IS NOT NULL AND expire <= $^T )
OR ( adjourn IS NOT NULL AND adjourn <= $^T )
)
)
END
OR ( expire IS NOT NULL AND expire <= $^T )
OR ( adjourn IS NOT NULL AND adjourn <= $^T )
)
)
END
+ #some false laziness w/cust_main::Billing due_cust_event
my $where_event = join(' OR ', map {
my $eventtable = $_;
my $where_event = join(' OR ', map {
my $eventtable = $_;
@@
-187,13
+213,14
@@
END
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);
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 )
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
)
";
)
";