projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merging RT 4.0.6
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
88fe69b
..
a9df376
100644
(file)
--- a/
FS/FS/Cron/bill.pm
+++ b/
FS/FS/Cron/bill.pm
@@
-93,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'} ) {
@@
-145,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>)
@@
-156,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 ) = @_;
@@
-190,17
+200,18
@@
sub bill_where {
# select * from cust_main where
my $where_pkg = <<"END";
EXISTS(
# 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 )
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 )
)
)
AND ( start_date IS NULL OR start_date = 0
OR ( start_date IS NOT NULL AND start_date <= $^T )
)
)
- OR
bill IS NULL OR bill <= $billtime
+ 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 ( 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
@@
-209,12
+220,15
@@
END
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'
@@
-227,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
)
";