X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=ac93aaf2f50c6ae70ac7f1de049e44b2bfbaff7d;hb=a72a10f754f7465121d6137bb3dcee0a21ea6443;hp=271c436c6a71988ffcccd1934b3ed32ed7b37b30;hpb=45a4c5ad153a132ab392d71ca7cffbd08ff3c9c2;p=freeside.git

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 271c436c6..ac93aaf2f 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -4,17 +4,40 @@ use strict;
 use Getopt::Std;
 use FS::UID qw(adminsuidsetup);
 use FS::Conf;
+use FS::Log;
 
 &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:nmrkg:o", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
+my $log = FS::Log->new('daily');
+$log->info('start');
 
+#you can skip this by not having a NetworkMonitoringSystem configured
+use FS::Cron::nms_report qw(nms_report);
+nms_report(%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);
+
+#you can skip this by setting the disable_cron_billing config
 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);
+
+use FS::Cron::set_lata_have_usage qw(set_lata_have_usage);
+set_lata_have_usage(%opt);
+
 # Send alerts about upcoming credit card expiration.
 use FS::Cron::alert_expiration qw(alert_expiration);
 my $conf = new FS::Conf;
@@ -27,18 +50,34 @@ use FS::Cron::expire_user_pref qw(expire_user_pref);
 expire_user_pref();
 
 unless ( $opt{k} ) {
-
   use FS::Cron::notify qw(notify_flat_delay);
   notify_flat_delay(%opt);
+}
 
-  use FS::Cron::vacuum qw(vacuum);
-  vacuum();
+#same
+use FS::Cron::rt_tasks qw(rt_daily);
+rt_daily(%opt);
 
-}
+#does nothing unless batch-gateway-* configs are set
+use FS::Cron::pay_batch qw(batch_submit batch_receive);
+batch_submit(%opt);
+batch_receive(%opt);
+
+#you can skip this by not having the config
+use FS::Cron::agent_email qw(agent_email);
+agent_email(%opt);
+
+my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
+unlink <${deldir}.invoice*>;
+unlink <${deldir}.letter*>;
+unlink <${deldir}.CGItemp*>;
 
+#backup should be last
 #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);
+backup();
+
+$log->info('finish');
 
 ###
 # subroutines
@@ -54,7 +93,7 @@ sub untaint_argv {
 }
 
 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";
 }
 
 ###
@@ -67,7 +106,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =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 ] [ -o ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -89,21 +128,26 @@ 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.
 
-  -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.  Multiple agentnums can be specified, separated with commas.
 
-  -a: Only process customers with the specified agentnum
+  -g: Don't process the provided pkgpart (or pkgparts, specified as a comma-
+      separated list).
 
   -s: re-charge setup fees
 
+  -o: For packages which are more than one billing period behind, only charge for one billing period rather than catching up.
+
   -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.
 
   -r: Multi-process mode dry run option
 
-  -k: skip notify_flat_delay and vacuum
+  -k: skip notify_flat_delay
 
 user: From the mapsecrets file - see config.html from the base documentation