projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
Cron
/
bill.pm
diff --git
a/FS/FS/Cron/bill.pm
b/FS/FS/Cron/bill.pm
index
98ce8fa
..
19baac0
100644
(file)
--- a/
FS/FS/Cron/bill.pm
+++ b/
FS/FS/Cron/bill.pm
@@
-22,7
+22,8
@@
use FS::Log;
# -s: re-charge setup fees
# -v: enable debugging
# -l: debugging level
# -s: re-charge setup fees
# -v: enable debugging
# -l: debugging level
-# -m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+# -m: Multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+# -q: Multi-process mode: queue additional job instead of skipping
# -r: Multi-process mode dry run option
# -g: Don't bill these pkgparts
# -r: Multi-process mode dry run option
# -g: Don't bill these pkgparts
@@
-41,9
+42,10
@@
sub bill {
#$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
my $conf = new FS::Conf;
#$FS::cust_event::DEBUG = $opt{'l'} if $opt{'l'};
my $conf = new FS::Conf;
+ my $disable_bill = 0;
if ( $conf->exists('disable_cron_billing') ) {
warn "disable_cron_billing set, skipping billing\n" if $debug;
if ( $conf->exists('disable_cron_billing') ) {
warn "disable_cron_billing set, skipping billing\n" if $debug;
-
return
;
+
$disable_bill = 1
;
}
#we're at now now (and later).
}
#we're at now now (and later).
@@
-99,6
+101,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'} ) {
@@
-107,12
+110,15
@@
sub bill {
warn "DRY RUN: would add custnum $custnum for queued_bill\n";
} else {
warn "DRY RUN: would add custnum $custnum for queued_bill\n";
} else {
+ my @waiting = qsearch( 'queue', {
+ 'job' => 'FS::cust_main::queued_bill',
+ 'custnum' => $custnum,
+ 'status' => 'new',
+ }
+ );
+
#avoid queuing another job if there's one still waiting to run
#avoid queuing another job if there's one still waiting to run
- next if qsearch( 'queue', { 'job' => 'FS::cust_main::queued_bill',
- 'custnum' => $custnum,
- 'status' => 'new',
- }
- );
+ next if @waiting && ! $opt{'q'};
#add job to queue that calls bill_and_collect with options
my $queue = new FS::queue {
#add job to queue that calls bill_and_collect with options
my $queue = new FS::queue {
@@
-121,13
+127,28
@@
sub bill {
'priority' => 99, #don't get in the way of provisioning jobs
};
my $error = $queue->insert( 'custnum'=>$custnum, %args );
'priority' => 99, #don't get in the way of provisioning jobs
};
my $error = $queue->insert( 'custnum'=>$custnum, %args );
+ die $error if $error;
+
+ #wait until the earler jobs complete
+ foreach my $waiting_queue (@waiting) {
+ $queue->depend_insert($waiting_queue->jobnum);
+ }
}
} else {
my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
}
} else {
my $cust_main = qsearchs( 'cust_main', { 'custnum' => $custnum } );
- $cust_main->bill_and_collect( %args, 'debug' => $debug );
+ if ( $disable_bill ) {
+ $cust_main->collect( %args, 'debug' => $debug );
+ } else {
+ my $error = $cust_main->bill_and_collect( %args, 'fatal' => 'return',
+ 'debug' => $debug, );
+ if ( $error ) {
+ $log->error($error);
+ warn $error; #die $error;
+ }
+ }
}
}
@@
-155,8
+176,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
@@
-184,8
+203,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'};
@@
-204,6
+221,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(
@@
-212,7
+231,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 ) )
@@
-228,7
+247,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,
);