[freeside-commits] freeside/FS/FS/cust_pkg Import.pm,1.2,1.2.2.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/cust_pkg
In directory wavetail.420.am:/tmp/cvs-serv27324

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	Import.pm 
Log Message:
questionable auto-domaining of username at domain usernames on package import, RT#9117

Index: Import.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_pkg/Import.pm,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -w -d -r1.2 -r1.2.2.1
--- Import.pm	9 Aug 2010 19:20:13 -0000	1.2
+++ Import.pm	21 Jan 2011 09:26:33 -0000	1.2.2.1
@@ -12,6 +12,7 @@
 use FS::svc_acct;
 use FS::svc_external;
 use FS::svc_phone;
+use FS::svc_domain;
 
 $DEBUG = 0;
 
@@ -123,12 +124,27 @@
       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;
+
+        #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 if $error;
+          }
+          $svc->username($username);
+          $svc->domsvc($svc_domain->svcnum);
+        }
+
+        my $error = $svc->insert;
         return $error if $error;
       }