From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 25 Aug 2017 17:40:26 +0000 (-0700)
Subject: fix 4.x cust_payby vs legacy customer import, RT#77221
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=df2d2eb21e229b59bb3fbff9b41b7e6e051135de

fix 4.x cust_payby vs legacy customer import, RT#77221
---

diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index f9b167c82..9624529fa 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -410,6 +410,8 @@ sub batch_import {
 
       if ( $cust_main{'payinfo'} =~ /^\s*(\d+\@[\d\.]+)\s*$/ ) {
 
+        delete $cust_main{'payinfo'};
+
         $cust_payby = new FS::cust_payby {
           'payby'   => 'CHEK',
           'payinfo' => $1,
@@ -417,9 +419,14 @@ sub batch_import {
 
       } elsif ($cust_main{'payinfo'} =~ /^\s*([AD]?)(.*)\s*$/) {
 
+        delete $cust_main{'payinfo'};
+
         $cust_payby = new FS::cust_payby {
           'payby'   => ($1 eq 'D') ? 'DCRD' : 'CARD',
           'payinfo' => $2,
+          'paycvv'  => delete $cust_main{'paycvv'},
+          'paydate' => delete $cust_main{'paydate'},
+          'payname' => $cust_main{'first'}. ' '. $cust_main{'last'},
         };
 
       }
@@ -504,7 +511,7 @@ sub batch_import {
     }
 
     my %options = ('invoicing_list' => $invoicing_list);
-    $options{'cust_payby'} = $cust_payby if $cust_payby;
+    $options{'cust_payby'} = [ $cust_payby ] if $cust_payby;
 
     my $error = $cust_main->insert( \%hash, %options );