X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=5de5c57dba395a9b35100e14ab3d756f741d60ed;hb=a816e075c54631250faed653d4ec7b69f727e93a;hp=04073d47e756aa3c43513a84f8db3376f41248bb;hpb=29347e1d34d5468994af6e219f00582e525688ae;p=freeside.git

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 04073d47e..5de5c57db 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -7,11 +7,16 @@ use FS::Conf;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:", \%opt);
+getopts("p:a:d:vl:sy:nmrkg:u", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
 
+#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);
 
@@ -23,6 +28,9 @@ reconcile_breakage(%opt);
 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;
@@ -35,19 +43,24 @@ 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);
+}
 
-  #Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib
-  #use FS::Cron::vacuum qw(vacuum);
-  #vacuum();
-
+#debian Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib
+if ( $opt{u} ) {
+  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);
+backup();
+
+my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
+unlink <${deldir}.invoice*>;
+unlink <${deldir}.letter*>;
+unlink <${deldir}.CGItemp*>;
 
 ###
 # subroutines
@@ -63,7 +76,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";
 }
 
 ###
@@ -76,7 +89,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 ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -98,9 +111,9 @@ 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
+  -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).
@@ -115,7 +128,9 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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