X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUpgrade.pm;h=0113bf92a0bd1bed154f8f2817e3ddd73b63caa7;hp=fce46335b7d963024d2f481ff81bc90bce4c6b54;hb=e41cafbe7616c4f046c6161999d4577f1c918311;hpb=2dff574c971b18e3b3c74653e7e1376b7b57c3bb

diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm
index fce46335b..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');
@@ -386,6 +390,10 @@ sub upgrade_data {
     #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'    => [],