X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fagent_payment_gateway.pm;h=16979d859de28977cfcc65fea31c40662f8eccbe;hp=4991c19122d2192eba78038c2b11d3f7f51370ce;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hpb=e41cafbe7616c4f046c6161999d4577f1c918311

diff --git a/FS/FS/agent_payment_gateway.pm b/FS/FS/agent_payment_gateway.pm
index 4991c1912..16979d859 100644
--- 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 '';
 }