projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
future package unsuspend date, #14144
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
62bb321
..
8d1223b
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;
@@
-56,14
+57,20
@@
sub bill {
my $cursor_dbh = dbh->clone;
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;
@@
-86,6
+93,7
@@
sub bill {
'check_freq' => $check_freq,
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
'check_freq' => $check_freq,
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
+ 'one_recur' => $opt{'o'},
);
if ( $opt{'m'} ) {
);
if ( $opt{'m'} ) {
@@
-120,6
+128,8
@@
sub bill {
}
}
+ last if driver_name =~ /^mysql/;
+
}
$cursor_dbh->commit or die $cursor_dbh->errstr;
}
$cursor_dbh->commit or die $cursor_dbh->errstr;
@@
-136,7
+146,7
@@
sub bill {
# (or now, if no -d switch was given).
#
# -n: When used with "-d" and/or "-y", specifies that invoices should be dated
# (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,
ir
regardless 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>)
# the invoices.
#
# -p: Only process customers with the specified payby (I<CARD>, I<DCRD>, I<CHEK>, I<DCHK>, I<BILL>, I<COMP>, I<LECB>)
@@
-147,6
+157,15
@@
sub bill {
#
# -l: debugging level
#
# -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 ) = @_;
sub bill_where {
my( %opt ) = @_;
@@
-176,6
+195,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(
@@
-187,22
+208,27
@@
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 )
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
)
)
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 = $_;
+ # joins and where clauses to test event conditions
my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);
$where = $where ? "AND $where" : '';
my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
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'
my $are_part_event =
"EXISTS ( SELECT 1 FROM part_event $join
WHERE check_freq = '$check_freq'
@@
-215,8
+241,11
@@
END
if ( $eventtable eq 'cust_main' ) {
$are_part_event;
} else {
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
)
";
AND $are_part_event
)
";