From c540df7c42e28bc2919141419757041532cb1b67 Mon Sep 17 00:00:00 2001 From: Christopher Burger Date: Thu, 12 Apr 2018 14:08:26 -0400 Subject: RT# 80175 - readded the ability for payment gateway overrides to have an option to be for just ACH Conflicts: FS/FS/agent.pm --- FS/FS/agent.pm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'FS/FS') diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm index 8aff96a8d..bf389deac 100644 --- a/FS/FS/agent.pm +++ b/FS/FS/agent.pm @@ -294,15 +294,13 @@ sub payment_gateway { } } - my $cardtype_search = "AND ( cardtype IS NULL OR cardtype <> 'ACH')"; - $cardtype_search = "AND ( cardtype IS NULL OR cardtype = 'ACH' )" if $options{method} eq 'ECHECK'; + my $cardtype = ''; + if ( $options{method} eq 'ECHECK' ) { $cardtype = 'ACH'; } my $override = - qsearchs({ - "table" => 'agent_payment_gateway', - "hashref" => { agentnum => $self->agentnum, }, - "extra_sql" => $cardtype_search, - }); + qsearchs('agent_payment_gateway', { agentnum => $self->agentnum, + cardtype => $cardtype, } ) + || qsearchs('agent_payment_gateway', { agentnum => $self->agentnum } ); my $payment_gateway = FS::payment_gateway->by_key_or_default( gatewaynum => $override ? $override->gatewaynum : '', -- cgit v1.2.1