don't abort upgrade if a RADIUS server is unreachable

[freeside.git] / FS / FS / Upgrade.pm

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 46c98f5..aabc4e7 100644 (file)
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -7,6 +7,7 @@ use Tie::IxHash;
 use FS::UID qw( dbh driver_name );
 use FS::Conf;
 use FS::Record qw(qsearchs qsearch str2time_sql);
+use FS::upgrade_journal;
 
 use FS::svc_domain;
 $FS::svc_domain::whois_hack = 1;
@@ -47,6 +48,19 @@ sub upgrade_config {
     if $conf->exists('payment_receipt_email')
     || $conf->config('payment_receipt_msgnum');
 
+  $conf->touch('geocode-require_nw_coordinates')
+    if $conf->exists('svc_broadband-require-nw-coordinates');
+
+  unless ( $conf->config('echeck-country') ) {
+    if ( $conf->exists('cust_main-require-bank-branch') ) {
+      $conf->set('echeck-country', 'CA');
+    } elsif ( $conf->exists('echeck-nonus') ) {
+      $conf->set('echeck-country', 'XX');
+    } else {
+      $conf->set('echeck-country', 'US');
+    }
+  }
+
   upgrade_overlimit_groups($conf);
   map { upgrade_overlimit_groups($conf,$_->agentnum) } qsearch('agent', {});
   
@@ -129,6 +143,11 @@ sub upgrade {
 
   }
 
+  local($FS::cust_main::ignore_expired_card) = 1;
+  local($FS::cust_main::ignore_illegal_zip) = 1;
+  local($FS::cust_main::ignore_banned_card) = 1;
+  local($FS::cust_main::skip_fuzzyfiles) = 1;
+
   # decrypt inadvertantly-encrypted payinfo where payby != CARD,DCRD,CHEK,DCHK
   # kind of a weird spot for this, but it's better than duplicating
   # all this code in each class...
@@ -245,6 +264,11 @@ sub upgrade_data {
     'part_svc'         => [],
     'part_export'      => [],
 
+    #insert default tower_sector if not present
+    'tower' => [],
+
+    #routernum/blocknum
+    'svc_broadband' => [],
   ;
 
   \%hash;