and a slight fix to the CSV import

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index fd66f14..9624180 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4395,7 +4395,7 @@ sub batch_import {
                   cust_pkg.pkgpart
                   svc_acct.username svc_acct._password 
                 );
-    $payby = 'CARD';
+    $payby = 'BILL';
   } else {
     die "unknown format $format";
   }
@@ -4484,6 +4484,8 @@ sub batch_import {
       }
     }
 
+    $cust_main{'payby'} = 'CARD' if length($cust_main{'payinfo'});
+
     my $invoicing_list = $cust_main{'invoicing_list'}
                            ? [ delete $cust_main{'invoicing_list'} ]
                            : [];