eliminate some false laziness in FS::Misc::send_email vs. msg_template/email.pm send_...

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

diff --git a/FS/FS/agent_payment_gateway.pm b/FS/FS/agent_payment_gateway.pm
index 4991c19..16979d8 100644 (file)
--- a/FS/FS/agent_payment_gateway.pm
+++ b/FS/FS/agent_payment_gateway.pm
@@ -1,5 +1,6 @@
 package FS::agent_payment_gateway;
 use base qw(FS::Record);
+use FS::Record qw( qsearch );
 
 use strict;
 
@@ -118,10 +119,10 @@ sub _upgrade_data {
       'table' => 'agent_payment_gateway',
       'extra_sql' => ' WHERE taxclass IS NOT NULL AND taxclass != \'\'',
     });
-  die "Agent cardtype override no longer supported"
+  die "Non ACH (E-check) Agent cardtype override no longer supported"
     if qsearch({
       'table' => 'agent_payment_gateway',
-      'extra_sql' => ' WHERE cardtype IS NOT NULL AND cardtype != \'\'',
+      'extra_sql' => ' WHERE cardtype IS NOT NULL AND cardtype != \'\' AND cardtype != \'ACH\'',
     });
   return '';
 }