From fb747f8161b7ec9d3092c5796f373c1b6a373764 Mon Sep 17 00:00:00 2001
From: Christopher Burger <burgerc@freeside.biz>
Date: Mon, 16 Apr 2018 16:44:16 -0400
Subject: [PATCH] RT# 80175 - fixed error in payment gateway where ACH cardtype
 was always selected.

---
 FS/FS/agent.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index bf389deac..810709357 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -294,13 +294,15 @@ sub payment_gateway {
     }
   }
 
-  my $cardtype = '';
-  if ( $options{method} eq 'ECHECK' ) { $cardtype = 'ACH'; }
+  my $cardtype_search = "AND cardtype != 'ACH'";
+  $cardtype_search = "AND cardtype = 'ACH'" if $options{method} eq 'ECHECK';
 
   my $override =
-     qsearchs('agent_payment_gateway', { agentnum => $self->agentnum,
-                                         cardtype => $cardtype,      } )
-  || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum } );
+      qsearchs({
+        "table" => 'agent_payment_gateway',
+        "hashref" => { agentnum => $self->agentnum, },
+        "extra_sql" => $cardtype_search,
+      });
 
   my $payment_gateway = FS::payment_gateway->by_key_or_default(
     gatewaynum => $override ? $override->gatewaynum : '',
-- 
2.11.0