X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main%2FImport.pm;h=1b260274906d3ecfd41e4d53ca6893084fe88dc3;hb=e4a02dc995c0db1994ff26504c28557d1cb617b4;hp=a243b275f735f78b76d84df6e62009960b697a3f;hpb=7516e3da0f17eeecba27219ef96a8b5f46af2083;p=freeside.git

diff --git a/FS/FS/cust_main/Import.pm b/FS/FS/cust_main/Import.pm
index a243b275f..1b2602749 100644
--- a/FS/FS/cust_main/Import.pm
+++ b/FS/FS/cust_main/Import.pm
@@ -9,6 +9,7 @@ use FS::UID qw( dbh );
 use FS::Record qw( qsearchs );
 use FS::cust_main;
 use FS::svc_acct;
+use FS::svc_broadband;
 use FS::svc_external;
 use FS::svc_phone;
 use FS::svc_hardware;
@@ -183,6 +184,18 @@ sub batch_import {
                   customer_options
                 );
     $payby = 'BILL';
+ } elsif ( $format =~ /^svc_broadband/ ) {
+    @fields = qw( agent_custid refnum
+                  last first company address1 address2 city state zip country
+                  daytime night
+                  ship_last ship_first ship_company ship_address1 ship_address2
+                  ship_city ship_state ship_zip ship_country
+                  payinfo paycvv paydate
+                  invoicing_list
+                  cust_pkg.pkgpart cust_pkg.bill
+                );
+    push @fields, map "svc_broadband.$_", qw( ip_addr mac_addr sectornum );
+    $payby = 'BILL';
  } elsif ( $format =~ /^svc_external/ ) {
     @fields = qw( agent_custid refnum
                   last first company address1 address2 city state zip country
@@ -340,6 +353,10 @@ sub batch_import {
 
         $svc_x{$1} = shift @columns;
 
+      } elsif ( $field =~ /^svc_broadband\.(ip_addr|mac_addr|sectornum)$/ ) {
+
+        $svc_x{$1} = shift @columns;
+
       } elsif ( $field =~ /^svc_external\.(id|title)$/ ) {
 
         $svc_x{$1} = shift @columns;
@@ -400,11 +417,23 @@ sub batch_import {
     }
 
     if ( defined $cust_main{'payinfo'} && length $cust_main{'payinfo'} ) {
-      $cust_main{'payby'} = 'CARD';
-      if ($cust_main{'payinfo'} =~ /\s*([AD]?)(.*)\s*$/) {
-        $cust_main{'payby'} = 'DCRD' if $1 eq 'D';
-        $cust_main{'payinfo'} = $2;
+
+      if ( $cust_main{'payinfo'} =~ /^\s*(\d+\@[\d\.]+)\s*$/ ) {
+
+        $cust_main{'payby'}   = 'CHEK';
+        $cust_main{'payinfo'} = $1;
+
+      } else {
+
+        $cust_main{'payby'} = 'CARD';
+
+        if ($cust_main{'payinfo'} =~ /^\s*([AD]?)(.*)\s*$/) {
+          $cust_main{'payby'} = 'DCRD' if $1 eq 'D';
+          $cust_main{'payinfo'} = $2;
+        }
+
       }
+
     }
 
     $cust_main{$_} = parse_datetime($cust_main{$_})
@@ -439,6 +468,8 @@ sub batch_import {
         $svcdb = 'svc_acct';
       } elsif ( $svc_x{'id'} || $svc_x{'title'} ) {
         $svcdb = 'svc_external';
+      } elsif ( $svc_x{ip_addr} || $svc_x{mac_addr} ) {
+        $svcdb = 'svc_broadband';
       }
 
       my $svc_phone = '';