[freeside-commits] branch FREESIDE_4_BRANCH updated. a6a98f6d0c3f67fb05905967fd801e463e8cd6ac

Christopher Burger burgerc at freeside.biz
Fri Jun 15 14:53:36 PDT 2018


The branch, FREESIDE_4_BRANCH has been updated
       via  a6a98f6d0c3f67fb05905967fd801e463e8cd6ac (commit)
       via  372afb81d62472875ee69b0a8913d68e7ce95cbe (commit)
       via  65dbca228f4e21b3b3686859d816f1322965501b (commit)
      from  32f42da513a6aec0cfbdaa2941bb1e97437a2822 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a6a98f6d0c3f67fb05905967fd801e463e8cd6ac
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jun 15 16:52:39 2018 -0400

    RT# 80175 - fixed error with ACH gateway not being selected.

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index 810709357..e1d9ccf1d 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -294,7 +294,7 @@ sub payment_gateway {
     }
   }
 
-  my $cardtype_search = "AND cardtype != 'ACH'";
+  my $cardtype_search = "AND ( cardtype IS NULL OR cardtype <> 'ACH')";
   $cardtype_search = "AND cardtype = 'ACH'" if $options{method} eq 'ECHECK';
 
   my $override =

commit 372afb81d62472875ee69b0a8913d68e7ce95cbe
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Mon Apr 16 16:44:16 2018 -0400

    RT# 80175 - fixed error in payment gateway where ACH cardtype was always selected.

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 : '',

commit 65dbca228f4e21b3b3686859d816f1322965501b
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Thu Apr 12 14:08:26 2018 -0400

    RT# 80175 - readded the ability for payment gateway overrides to have an option to be for just ACH

diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm
index e70b9716a..bf389deac 100644
--- a/FS/FS/agent.pm
+++ b/FS/FS/agent.pm
@@ -294,7 +294,13 @@ sub payment_gateway {
     }
   }
 
-  my $override = qsearchs('agent_payment_gateway', { agentnum => $self->agentnum } );
+  my $cardtype = '';
+  if ( $options{method} eq 'ECHECK' ) { $cardtype = 'ACH'; }
+
+  my $override =
+     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 : '',

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/agent.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)




More information about the freeside-commits mailing list