fix DBI connection, RT#39250

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

diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index 65e3ebd..6a2daf9 100755 (executable)
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -12,6 +12,11 @@ getopts("p:a:d:vl:sy:nmrkg:o", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
+
+die "The -p option has been removed in version 4 -- customers no longer have ".
+    "a single, specific payment type\n"
+  if $opt{'p'};
+
 my $log = FS::Log->new('daily');
 $log->info('start');
 
@@ -27,6 +32,10 @@ expire_banned_pay(%opt);
 use FS::Cron::bill qw(bill);
 bill(%opt);
 
+#you can skip this by not setting enable_taxproducts to 'billsoft'
+use FS::Cron::tax_batch qw(process_tax_batch);
+process_tax_batch(%opt);
+
 #you can skip this just by not having the config
 use FS::Cron::breakage qw(reconcile_breakage);
 reconcile_breakage(%opt);
@@ -38,10 +47,13 @@ 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);
+# we used to send alerts about upcoming credit card expiration here
 my $conf = new FS::Conf;
-alert_expiration(%opt) if($conf->exists('alert_expiration'));
+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.
 
@@ -59,24 +71,26 @@ 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);
+use FS::Cron::pay_batch qw(pay_batch_submit pay_batch_receive);
+pay_batch_submit(%opt);
+pay_batch_receive(%opt);
 
-#you can skip this by not having the config
-use FS::Cron::agent_email qw(agent_email);
-agent_email(%opt);
+#does nothing unless there are batch-style exports with batches
+use FS::Cron::export_batch qw(export_batch_submit);
+export_batch_submit(%opt);
 
-my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/";
-unlink <${deldir}.invoice*>;
-unlink <${deldir}.letter*>;
-unlink <${deldir}.CGItemp*>;
+#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
 use FS::Cron::backup qw(backup);
 backup();
 
+#except we'd rather not start cleanup jobs until the backup is done
+cleanup();
+
 $log->info('finish');
 
 ###
@@ -93,7 +107,7 @@ sub untaint_argv {
 }
 
 sub usage {
-  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";
+  die "Usage:\n\n  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -v ] [ -l level ] [ -m ] [ -k ] user [ custnum custnum ... ]\n";
 }
 
 ###
@@ -106,7 +120,7 @@ freeside-daily - Run daily billing and invoice collection events.
 
 =head1 SYNOPSIS
 
-  freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum,agentnum,... ] [ -s ] [ -o ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
+  freeside-daily [ -d 'date' ] [ -y days ] [ -a agentnum,agentnum,... ] [ -s ] [ -o ] [ -v ] [ -l level ] [ -m ] [ -r ] [ -k ] user [ custnum custnum ... ]
 
 =head1 DESCRIPTION
 
@@ -128,7 +142,7 @@ 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 (CARD, DCRD, CHEK, DCHK, BILL, COMP, LECB)
+  -p: Deprecated, will produce a fatal error (formerly was: 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.
 
@@ -143,13 +157,13 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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
 
-user: From the mapsecrets file - see config.html from the base documentation
+user: Typically "fs_daily"
 
 custnum: if one or more customer numbers are specified, only bills those
 customers.  Otherwise, bills all customers.