X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg%2FImport.pm;h=fe69f82fd1d7c325b20e661e89e92bb3cedcbdf8;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hp=7a4b9d50ccd6e766d77e8e81319fde9f7f56e028;hpb=b1d445f94514a29e5d4753839798b0291d89aee3;p=freeside.git

diff --git a/FS/FS/cust_pkg/Import.pm b/FS/FS/cust_pkg/Import.pm
index 7a4b9d50c..fe69f82fd 100644
--- a/FS/FS/cust_pkg/Import.pm
+++ b/FS/FS/cust_pkg/Import.pm
@@ -12,6 +12,7 @@ use FS::cust_main;
 use FS::svc_acct;
 use FS::svc_external;
 use FS::svc_phone;
+use FS::svc_domain;
 
 $DEBUG = 0;
 
@@ -102,7 +103,7 @@ sub process_batch_import {
 
 my %formatfields = (
   'default'      => [],
-  'svc_acct'     => [qw( username _password )],
+  'svc_acct'     => [qw( username _password domsvc )],
   'svc_phone'    => [qw( countrycode phonenum sip_password pin )],
   'svc_external' => [qw( id title )],
 );
@@ -123,13 +124,28 @@ my %import_options = (
       my $ff = $formatfields->{$svc_x};
 
       if ( grep $param->{"$svc_x.$_"}, @$ff ) {
-        my $svc_x = "FS::$svc_x"->new( {
+        my $svc = "FS::$svc_x"->new( {
           'pkgnum'  => $record->pkgnum,
           'svcpart' => $record->part_pkg->svcpart($svc_x),
           map { $_ => $param->{"$svc_x.$_"} } @$ff
         } );
-        my $error = $svc_x->insert;
-        return $error if $error;
+
+        #this whole thing should be turned into a callback or config to turn on
+        if ( $svc_x eq 'svc_acct' && $svc->username =~ /\@/ ) {
+          my($username, $domain) = split(/\@/, $svc->username);
+          my $svc_domain = qsearchs('svc_domain', { 'domain' => $domain } )
+                         || new FS::svc_domain { 'svcpart' => 1,
+                                                 'domain'  => $domain, };
+          unless ( $svc_domain->svcnum ) {
+            my $error = $svc_domain->insert;
+            return "error auto-inserting domain: $error" if $error;
+          }
+          $svc->username($username);
+          $svc->domsvc($svc_domain->svcnum);
+        }
+
+        my $error = $svc->insert;
+        return "error inserting service: $error" if $error;
       }
 
     }
@@ -154,8 +170,9 @@ sub batch_import {
   my $format = delete $opt->{'format'};
   my @fields = ();
 
-  if ( $format =~ /^(.*)-agent_custid$/ ) {
+  if ( $format =~ /^(.*)-agent_custid(-agent_pkgid)?$/ ) {
     $format = $1;
+    my $agent_pkgid = $2;
     @fields = (
       sub {
         my( $self, $value ) = @_; # $conf, $param
@@ -166,6 +183,7 @@ sub batch_import {
         $self->custnum($cust_main->custnum) if $cust_main;
       },
     );
+    push @fields, 'agent_pkgid' if $agent_pkgid;
   } else {
     @fields = ( 'custnum' );
   }