old config alert_expiration should have been migrated already by v5

[freeside.git] / FS / bin / freeside-daily

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index ee95c14..f1b7e58 100755 (executable)
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -8,7 +8,7 @@ use FS::Log;
 
 &untaint_argv; #what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:o", \%opt);
+getopts("p:a:d:vl:sy:nmrkg:ox", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -24,6 +24,10 @@ $log->info('start');
 use FS::Cron::nms_report qw(nms_report);
 nms_report(%opt);
 
+#you can skip this by not having any vitelity exports configured
+use FS::Cron::lnp_vitelity qw(lnp_vitelity);
+lnp_vitelity(%opt);
+
 #no way to skip this yet, but should be harmless/quick
 use FS::Cron::expire_banned_pay qw(expire_banned_pay);
 expire_banned_pay(%opt);
@@ -51,14 +55,6 @@ tax_rate_update(%opt);
 use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
 set_lata_have_usage(%opt);
 
-# we used to send alerts about upcoming credit card expiration here
-my $conf = new FS::Conf;
-if($conf->exists('alert_expiration')) {
-  warn "WARNING: the alert_expiration option is obsolete.  If you ran 
-  freeside-upgrade, it should have configured credit card expiration alerts 
-  as billing events.\n";
-}
-
 #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
@@ -87,17 +83,21 @@ export_batch_submit(%opt);
 use FS::Cron::send_subscribed qw(send_subscribed);
 send_subscribed(%opt);
 
+#does nothing unless quotation_disable_after_days is set.
+use FS::Cron::disable_quotation qw(disable_quotation);
+disable_quotation();
+
 #clears out cacti imports & deletes select database cache files
 use FS::Cron::cleanup qw( cleanup cleanup_before_backup );
 cleanup_before_backup();
 
 #backup should be last
-#you can skip this just by not having the config
+#you can skip this just by not having the config (or with the -x option)
 use FS::Cron::backup qw(backup);
-backup();
+backup() unless $opt{'x'};
 
 #except we'd rather not start cleanup jobs until the backup is done
-cleanup();
+cleanup( quiet => !$opt{'v'} );
 
 $log->info('finish');
 
@@ -115,7 +115,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] [ -x ] user [ custnum custnum ... ]\n";
 }
 
 ###
@@ -171,6 +171,8 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -k: skip notify_flat_delay
 
+  -x: skip backup
+
 user: Typically "fs_daily"
 
 custnum: if one or more customer numbers are specified, only bills those