X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=0113bf92a0bd1bed154f8f2817e3ddd73b63caa7;hb=2a56c671635687bf2648eb3a7cf4bce228101af3;hp=1c1095e37c630378406fbe0a3c1d1422f3a484a3;hpb=6a509099343ed155525c4304f1ad742cc6e4ce59;p=freeside.git

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 1c1095e37..0113bf92a 100644
--- a/FS/FS/Upgrade.pm
+++ b/FS/FS/Upgrade.pm
@@ -47,6 +47,10 @@ sub upgrade_config {
 
   my $conf = new FS::Conf;
 
+  # to simplify tokenization upgrades
+  die "Conf selfservice-payment_gateway no longer supported"
+    if conf->config('selfservice-payment_gateway');
+
   $conf->touch('payment_receipt')
     if $conf->exists('payment_receipt_email')
     || $conf->config('payment_receipt_msgnum');
@@ -178,14 +182,6 @@ If you need to continue using the old Form 477 report, turn on the
     $conf->set('cust-fields',$cust_fields);
   }
 
-  #repurposed
-  $conf->set('note-classes','Enabled')
-    if $conf->exists('note-classes')
-      and grep {$_ eq $conf->config('note-classes')} ('1','2');
-  $conf->set('note-classes','')
-    if $conf->exists('note-classes')
-      and '0' eq $conf->config('note-classes');
-
   enable_banned_pay_pad() unless length($conf->config('banned_pay-pad'));
 
   # if translate-auto-insert is enabled for a locale, ensure that invoice
@@ -388,11 +384,16 @@ sub upgrade_data {
     # reason / void_reason migration to reasonnum / void_reasonnum
     'cust_credit_void' => [],
     'cust_bill_void' => [],
+    # also fix some tax allocation records
     'cust_bill_pkg_void' => [],
 
     #duplicate history records
     'h_cust_svc'  => [],
 
+    # need before transaction tables, 
+    # blocks tokenization upgrade if deprecated features still in use
+    'agent_payment_gateway' => [],
+
     #populate cust_pay.otaker
     'cust_pay'    => [],