[freeside-commits] branch master updated. 8ea0bfff9308f4c13d170c45cbac6ba7a8a9e488

[Christopher Burger]

The branch, master has been updated
       via  8ea0bfff9308f4c13d170c45cbac6ba7a8a9e488 (commit)
      from  e61149f7135b750b2b6ff6ee94f461460163ddea (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 8ea0bfff9308f4c13d170c45cbac6ba7a8a9e488
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jan 8 10:24:01 2019 -0500

    RT# - updated payment gateway override to not drop ACH overrides on upgrade

diff --git a/FS/FS/agent_payment_gateway.pm b/FS/FS/agent_payment_gateway.pm
index 6a7cc06d1..16979d859 100644
--- a/FS/FS/agent_payment_gateway.pm
+++ b/FS/FS/agent_payment_gateway.pm
@@ -119,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 '';
 }

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

Summary of changes:
 FS/FS/agent_payment_gateway.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)