X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=41349a59aeb8646492e52221301b536440ebd06e;hp=3faf47e247e0e0958e9353e63541ebbb413140e9;hb=51f97ec141f77064ca020634e7eccd85d9ead753;hpb=5f563d5ac7e6e1e93cca382baa42ee106f3db5a0

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index 3faf47e24..41349a59a 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');
@@ -355,7 +359,14 @@ sub upgrade_data {
     #remap log levels
 	'log' => [],
 
-    #cust_main (remove paycvv from history, locations, cust_payby, etc)
+    #fix whitespace - before cust_main
+    'cust_location' => [],
+
+    # need before cust_main tokenization upgrade,
+    # blocks tokenization upgrade if deprecated features still in use
+    'agent_payment_gateway' => [],
+
+    #cust_main (tokenizes cards, remove paycvv from history, locations, cust_payby, etc)
     'cust_main' => [],
 
     #contact -> cust_contact / prospect_contact
@@ -377,6 +388,7 @@ 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
@@ -484,9 +496,6 @@ sub upgrade_data {
     #mark certain taxes as system-maintained,
     # and fix whitespace
     'cust_main_county' => [],
-
-    #fix whitespace
-    'cust_location' => [],
   ;
 
   \%hash;