projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add expiration alerts to freeside-daily routine
[freeside.git]
/
FS
/
bin
/
freeside-daily
diff --git
a/FS/bin/freeside-daily
b/FS/bin/freeside-daily
index
13079b4
..
271c436
100755
(executable)
--- a/
FS/bin/freeside-daily
+++ b/
FS/bin/freeside-daily
@@
-3,10
+3,11
@@
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:nm", \%opt);
+getopts("p:a:d:vl:sy:nm
rk
", \%opt);
my $user = shift or die &usage;
adminsuidsetup $user;
my $user = shift or die &usage;
adminsuidsetup $user;
@@
-14,17
+15,28
@@
adminsuidsetup $user;
use FS::Cron::bill qw(bill);
bill(%opt);
use FS::Cron::bill qw(bill);
bill(%opt);
-#what to do about the below when using -m? that is the question.
+# Send alerts about upcoming credit card expiration.
+use FS::Cron::alert_expiration qw(alert_expiration);
+my $conf = new FS::Conf;
+alert_expiration(%opt) if($conf->exists('alert_expiration'));
-use FS::Cron::notify qw(notify_flat_delay);
-notify_flat_delay(%opt);
+#what to do about the below when using -m? that is the question.
+#you don't want to skip this, besides, it should be cheap
use FS::Cron::expire_user_pref qw(expire_user_pref);
expire_user_pref();
use FS::Cron::expire_user_pref qw(expire_user_pref);
expire_user_pref();
-use FS::Cron::vacuum qw(vacuum);
-vacuum();
+unless ( $opt{k} ) {
+
+ use FS::Cron::notify qw(notify_flat_delay);
+ notify_flat_delay(%opt);
+
+ use FS::Cron::vacuum qw(vacuum);
+ vacuum();
+}
+
+#you can skip this just by not having the config
use FS::Cron::backup qw(backup_scp);
backup_scp();
use FS::Cron::backup qw(backup_scp);
backup_scp();
@@
-42,7
+54,7
@@
sub untaint_argv {
}
sub usage {
}
sub usage {
- die "Usage:\n\n freeside-daily [ -d 'date' ] user [ custnum custnum ... ]\n";
+ die "Usage:\n\n freeside-daily [ -d 'date' ]
[ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ]
user [ custnum custnum ... ]\n";
}
###
}
###
@@
-55,7
+67,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 ] user [ custnum custnum ... ]
+ freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum ] [ -s ] [ -v ] [ -l level ] [ -m ]
[ -r ] [ -k ]
user [ custnum custnum ... ]
=head1 DESCRIPTION
=head1 DESCRIPTION
@@
-89,6
+101,10
@@
the bill and collect methods of a cust_main object. See L<FS::cust_main>.
-m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
-m: Experimental multi-process mode uses the job queue for multi-process and/or multi-machine billing.
+ -r: Multi-process mode dry run option
+
+ -k: skip notify_flat_delay and vacuum
+
user: From the mapsecrets file - see config.html from the base documentation
custnum: if one or more customer numbers are specified, only bills those
user: From the mapsecrets file - see config.html from the base documentation
custnum: if one or more customer numbers are specified, only bills those