projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-1' of https://github.com/gjones2/Freeside
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
7388733
..
6e110e8
100644
(file)
--- a/
FS/FS/Cron/bill.pm
+++ b/
FS/FS/Cron/bill.pm
@@
-7,11
+7,14
@@
use Date::Parse;
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 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::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 );
@ISA = qw( Exporter );
@EXPORT_OK = qw ( bill bill_where );
@@
-26,6
+29,9
@@
use FS::part_event_condition;
sub bill {
my %opt = @_;
sub bill {
my %opt = @_;
+ my $log = FS::Log->new('Cron::bill');
+ $log->info('start');
+
my $check_freq = $opt{'check_freq'} || '1d';
my $debug = 0;
my $check_freq = $opt{'check_freq'} || '1d';
my $debug = 0;
@@
-92,6
+98,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'} ) {
@@
-132,6
+139,7
@@
sub bill {
$cursor_dbh->commit or die $cursor_dbh->errstr;
$cursor_dbh->commit or die $cursor_dbh->errstr;
+ $log->info('finish');
}
# freeside-daily %opt:
}
# freeside-daily %opt:
@@
-144,7
+152,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>)
@@
-155,6
+163,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 ) = @_;
@@
-184,20
+201,23
@@
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(
- 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 <= $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 ( 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
@@
-206,12
+226,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'
@@
-224,8
+247,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
)
";