projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import torrus 1.0.9
[freeside.git]
/
FS
/
bin
/
freeside-daily
diff --git
a/FS/bin/freeside-daily
b/FS/bin/freeside-daily
index
acf7950
..
6a542c7
100755
(executable)
--- a/
FS/bin/freeside-daily
+++ b/
FS/bin/freeside-daily
@@
-3,20
+3,31
@@
use strict;
use Getopt::Std;
use FS::UID qw(adminsuidsetup);
use strict;
use Getopt::Std;
use FS::UID qw(adminsuidsetup);
+use FS::Conf;
&untaint_argv; #what it sounds like (eww)
use vars qw(%opt);
&untaint_argv; #what it sounds like (eww)
use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrk", \%opt);
+getopts("p:a:d:vl:sy:nmrk
g:u
", \%opt);
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
+#you can skip this by setting the disable_cron_billing config
use FS::Cron::bill qw(bill);
bill(%opt);
use FS::Cron::bill qw(bill);
bill(%opt);
+#you can skip this just by not having the config
+use FS::Cron::breakage qw(reconcile_breakage);
+reconcile_breakage(%opt);
+
+#you can skip this just by not having the config
+use FS::Cron::upload qw(upload);
+upload(%opt);
+
# Send alerts about upcoming credit card expiration.
use FS::Cron::alert_expiration qw(alert_expiration);
# Send alerts about upcoming credit card expiration.
use FS::Cron::alert_expiration qw(alert_expiration);
-alert_expiration(%opt);
+my $conf = new FS::Conf;
+alert_expiration(%opt) if($conf->exists('alert_expiration'));
#what to do about the below when using -m? that is the question.
#what to do about the below when using -m? that is the question.
@@
-25,13
+36,14
@@
use FS::Cron::expire_user_pref qw(expire_user_pref);
expire_user_pref();
unless ( $opt{k} ) {
expire_user_pref();
unless ( $opt{k} ) {
-
use FS::Cron::notify qw(notify_flat_delay);
notify_flat_delay(%opt);
use FS::Cron::notify qw(notify_flat_delay);
notify_flat_delay(%opt);
+}
+#debian Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib
+if ( $opt{u} ) {
use FS::Cron::vacuum qw(vacuum);
vacuum();
use FS::Cron::vacuum qw(vacuum);
vacuum();
-
}
#you can skip this just by not having the config
}
#you can skip this just by not having the config
@@
-52,7
+64,7
@@
sub untaint_argv {
}
sub usage {
}
sub usage {
- die "Usage:\n\n freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
+ die "Usage:\n\n freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum
,agentnum,...
] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
}
###
}
###
@@
-65,7
+77,7
@@
freeside-daily - Run daily billing and invoice collection events.
=head1 SYNOPSIS
=head1 SYNOPSIS
- freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
+ freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum
,agentnum,...
] [ -s ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-87,9
+99,12
@@
the bill and collect methods of a cust_main object. See L<FS::cust_main>.
with today's date, irregardless of the pretend date used to pre-generate
the invoices.
with today's date, irregardless 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>
)
+ -p: Only process customers with the specified payby (
CARD, DCRD, CHEK, DCHK, BILL, COMP, LECB
)
- -a: Only process customers with the specified agentnum
+ -a: Only process customers with the specified agentnum. Multiple agentnums can be specified, separated with commas.
+
+ -g: Don't process the provided pkgpart (or pkgparts, specified as a comma-
+ separated list).
-s: re-charge setup fees
-s: re-charge setup fees
@@
-101,7
+116,9
@@
the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-r: Multi-process mode dry run option
-r: Multi-process mode dry run option
- -k: skip notify_flat_delay and vacuum
+ -k: skip notify_flat_delay
+
+ -u: Do a vacuum (starting with version 1.9, this is not run by default).
user: From the mapsecrets file - see config.html from the base documentation
user: From the mapsecrets file - see config.html from the base documentation