projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
omit due date option, RT#73002
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
d046930
..
2c9468b
100644
(file)
--- a/
FS/FS/Cron/bill.pm
+++ b/
FS/FS/Cron/bill.pm
@@
-100,6
+100,7
@@
sub bill {
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
'one_recur' => $opt{'o'},
'resetup' => ( $opt{'s'} ? $opt{'s'} : 0 ),
'not_pkgpart' => $opt{'g'}, #$not_pkgpart,
'one_recur' => $opt{'o'},
+ 'no_prepaid' => 1,
);
if ( $opt{'m'} ) {
);
if ( $opt{'m'} ) {
@@
-160,8
+161,6
@@
sub bill {
# with today's date, regardless of the pretend date used to pre-generate
# the invoices.
#
# 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
# -a: Only process customers with the specified agentnum
#
# -v: enable debugging
@@
-189,8
+188,6
@@
sub bill_where {
push @search, "( cust_main.archived != 'Y' OR archived IS NULL )"; #disable?
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'};
push @search, "cust_main.agentnum IN ( ". $opt{'a'}. " ) "
if $opt{'a'};
@@
-209,6
+206,8
@@
sub bill_where {
my $conf = new FS::Conf;
my $billtime = $conf->exists('next-bill-ignore-time') ? day_end($time) : $time;
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 * from cust_main where
my $where_pkg = <<"END";
EXISTS(
@@
-217,7
+216,7
@@
sub bill_where {
AND ( cancel IS NULL OR cancel = 0 )
AND ( ( ( cust_pkg.setup IS NULL OR cust_pkg.setup = 0 )
AND ( start_date IS NULL OR start_date = 0
AND ( cancel IS NULL OR cancel = 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 ( freq != '0' AND ( bill IS NULL OR bill <= $billtime ) )
)
)
OR ( freq != '0' AND ( bill IS NULL OR bill <= $billtime ) )
@@
-233,7
+232,8
@@
END
my $eventtable = $_;
# joins and where clauses to test event conditions
my $eventtable = $_;
# joins and where clauses to test event conditions
- my $join = FS::part_event_condition->join_conditions_sql( $eventtable );
+ my $join = FS::part_event_condition->join_conditions_sql( $eventtable,
+ 'time'=>$time );
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);
my $where = FS::part_event_condition->where_conditions_sql( $eventtable,
'time'=>$time,
);