X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2Fbin%2Ffreeside-daily;h=ee95c14dba3a7ba8f0a2e652883ba811688ef6ea;hp=09ae132dfbc1d8f9608d4caebd5fa046ef73e956;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=09f8c585713778224eafa929d2ec3d83a3f8339a diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily index 09ae132df..ee95c14db 100755 --- a/FS/bin/freeside-daily +++ b/FS/bin/freeside-daily @@ -4,18 +4,38 @@ 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:nmrkg:u", \%opt); +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'); + +#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 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); @@ -24,10 +44,20 @@ reconcile_breakage(%opt); use FS::Cron::upload qw(upload); upload(%opt); -# Send alerts about upcoming credit card expiration. -use FS::Cron::alert_expiration qw(alert_expiration); +#this only takes effect if WA sales taxes are enabled +use FS::Cron::tax_rate_update qw(tax_rate_update); +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; -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. @@ -40,24 +70,36 @@ unless ( $opt{k} ) { notify_flat_delay(%opt); } -#debian Pg 8.1+ auto-vaccums, 7.4 w/postgresql-contrib -if ( $opt{u} ) { - 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(pay_batch_submit pay_batch_receive); +pay_batch_submit(%opt); +pay_batch_receive(%opt); + +#does nothing unless there are batch-style exports with batches +use FS::Cron::export_batch qw(export_batch_submit); +export_batch_submit(%opt); + +#does nothing unless there are users with subscribed searches +use FS::Cron::send_subscribed qw(send_subscribed); +send_subscribed(%opt); +#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_scp); -backup_scp(); +use FS::Cron::backup qw(backup); +backup(); -#same -use FS::Cron::rt_tasks qw(rt_escalate); -rt_escalate(%opt); +#except we'd rather not start cleanup jobs until the backup is done +cleanup(); -my $deldir = "$FS::UID::cache_dir/cache.$FS::UID::datasrc/"; -unlink <${deldir}.invoice*>; -unlink <${deldir}.letter*>; -unlink <${deldir}.CGItemp*>; +$log->info('finish'); ### # subroutines @@ -73,7 +115,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"; } ### @@ -86,7 +128,7 @@ freeside-daily - Run daily billing and invoice collection events. =head1 SYNOPSIS - freeside-daily [ -d 'date' ] [ -y days ] [ -p 'payby' ] [ -a agentnum,agentnum,... ] [ -s ] [ -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 @@ -108,7 +150,7 @@ the bill and collect methods of a cust_main object. See L. 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. @@ -117,19 +159,19 @@ the bill and collect methods of a cust_main object. See L. -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 - -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 +user: Typically "fs_daily" custnum: if one or more customer numbers are specified, only bills those customers. Otherwise, bills all customers.