Merge branch 'master' of git.freeside.biz:/home/git/freeside

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

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 3ea554e..417b202 100644 (file)
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -4,9 +4,11 @@ use strict;
 use vars qw( @ISA @EXPORT_OK $DEBUG );
 use Exporter;
 use Tie::IxHash;
+use File::Slurp;
 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,9 +49,27 @@ 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', {});
-  
+
+  my $DIST_CONF = '/usr/local/etc/freeside/default_conf/';#DIST_CONF in Makefile
+  $conf->set($_, scalar(read_file( "$DIST_CONF/$_" )) )
+    foreach grep { ! $conf->exists($_) && -s "$DIST_CONF/$_" }
+      qw( quotation_html quotation_latex quotation_latexnotes );
+
 }
 
 sub upgrade_overlimit_groups {
@@ -129,6 +149,31 @@ 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...
+  my @decrypt_tables = qw( cust_main cust_pay_void cust_pay cust_refund cust_pay_pending );
+  foreach my $table ( @decrypt_tables ) {
+      my @objects = qsearch({
+        'table'     => $table,
+        'hashref'   => {},
+        'extra_sql' => "WHERE payby NOT IN ( 'CARD', 'DCRD', 'CHEK', 'DCHK' ) ".
+                       " AND LENGTH(payinfo) > 100",
+      });
+      foreach my $object ( @objects ) {
+          my $payinfo = $object->decrypt($object->payinfo);
+          die "error decrypting payinfo" if $payinfo eq $object->payinfo;
+          $object->payinfo($payinfo);
+          my $error = $object->replace;
+          die $error if $error;
+      }
+  }
+
 }
 
 =item upgrade_data
@@ -225,6 +270,14 @@ sub upgrade_data {
     'part_svc'         => [],
     'part_export'      => [],
 
+    #insert default tower_sector if not present
+    'tower' => [],
+
+    #routernum/blocknum
+    'svc_broadband' => [],
+
+    #set up payment gateways if needed
+    'pay_batch' => [],
   ;
 
   \%hash;
@@ -285,6 +338,8 @@ sub upgrade_schema_data {
 
     #fix classnum character(1)
     'cust_bill_pkg_detail' => [],
+    #add necessary columns to RT schema
+    'TicketSystem' => [],
 
   ;