update address standardization for cust_location changes

6 files changed, 19 insertions, 24 deletions

diff --git a/FS/bin/freeside-cdrd b/FS/bin/freeside-cdrd
index 2cf75f31c..b21bd5b07 100644
--- a/FS/bin/freeside-cdrd
+++ b/FS/bin/freeside-cdrd
@@ -108,7 +108,7 @@ while (1) {
   }
 
   myexit() if sigterm() || sigint();
-  sleep 1 unless $found;
+  sleep 5 unless $found;
 
 }
 
diff --git a/FS/bin/freeside-check b/FS/bin/freeside-check
index 9930aae6c..fdfc66af0 100644
--- a/FS/bin/freeside-check
+++ b/FS/bin/freeside-check
@@ -5,7 +5,6 @@ use strict;
 use FS::UID qw( adminsuidsetup );
 use FS::Cron::check qw(
   check_queued check_selfservice check_apache check_bop_failures
-  check_sg check_sg_login check_sgng
   alert error_msg
 );
 
@@ -21,11 +20,5 @@ check_queued       or alert('Queue daemon not running', @emails);
 check_selfservice  or alert(error_msg(), @emails);
 check_apache       or alert('Apache not running: '. error_msg(), @emails);
 
-#no-ops unless you are sg
-my $sg = 'FS::ClientAPI::SG';
-check_sg           or alert("$sg not responding: ".     error_msg(), @emails);
-check_sg_login     or alert("$sg login errort: ".       error_msg(), @emails);
-check_sgng         or alert("${sg}NG not responding: ". error_msg(), @emails);
-
 check_bop_failures or alert(error_msg(), @emails);
 
diff --git a/FS/bin/freeside-daily b/FS/bin/freeside-daily
index b73d0b112..8e8ae4ff9 100755
--- a/FS/bin/freeside-daily
+++ b/FS/bin/freeside-daily
@@ -7,7 +7,7 @@ use FS::Conf;
 
 &untaint_argv;	#what it sounds like  (eww)
 use vars qw(%opt);
-getopts("p:a:d:vl:sy:nmrkg:uo", \%opt);
+getopts("p:a:d:vl:sy:nmrkg:o", \%opt);
 
 my $user = shift or die &usage;
 adminsuidsetup $user;
@@ -51,25 +51,29 @@ 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();
-}
-
-#you can skip this just by not having the config
-use FS::Cron::backup qw(backup);
-backup();
-
 #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);
+backup();
+
 ###
 # subroutines
 ###
@@ -140,8 +144,6 @@ the bill and collect methods of a cust_main object.  See L<FS::cust_main>.
 
   -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
 
 custnum: if one or more customer numbers are specified, only bills those
diff --git a/FS/bin/freeside-eftca-upload b/FS/bin/freeside-eftca-upload
index 45a358b23..b66765af3 100755
--- a/FS/bin/freeside-eftca-upload
+++ b/FS/bin/freeside-eftca-upload
@@ -46,7 +46,7 @@ foreach my $pay_batch (@batches) {
   my $batchnum = $pay_batch->batchnum;
   my $filename = time2str('%Y%m%d', time) . '-' . sprintf('%06d.csv',$batchnum);
   print STDERR "Exporting batch $batchnum to $filename...\n" if $opt_v;
-  my $text = $pay_batch->export_batch('eft_canada');
+  my $text = $pay_batch->export_batch(format => 'eft_canada');
   open OUT, ">$tmpdir/$filename";
   print OUT $text;
   close OUT;
diff --git a/FS/bin/freeside-paymentech-upload b/FS/bin/freeside-paymentech-upload
index 3f8abc047..609019eb2 100755
--- a/FS/bin/freeside-paymentech-upload
+++ b/FS/bin/freeside-paymentech-upload
@@ -59,7 +59,7 @@ foreach my $pay_batch (@batches) {
   my $batchnum = $pay_batch->batchnum;
   my $filename = sprintf('%06d',$batchnum) . '-' .time2str('%Y%m%d%H%M%S', time);
   print STDERR "Exporting batch $batchnum to $filename...\n" if $opt_v;
-  my $text = $pay_batch->export_batch('paymentech');
+  my $text = $pay_batch->export_batch(format => 'paymentech');
   $text =~ s!<fileID>FILEID</fileID>!<fileID>$filename</fileID>! 
     or die "couldn't find FILEID tag\n";
   open OUT, ">$tmpdir/$filename.xml";
diff --git a/FS/bin/freeside-prepaidd b/FS/bin/freeside-prepaidd
index 05b068b02..c095ceee4 100644
--- a/FS/bin/freeside-prepaidd
+++ b/FS/bin/freeside-prepaidd
@@ -85,7 +85,7 @@ while (1) {
   }
 
   die "exiting" if sigterm() || sigint();
-  sleep 5;
+  sleep 60;
 
 }