From a0b714142b349a36eee41a5de1e511758a382ffb Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Mon, 29 Apr 2013 12:31:06 -0700
Subject: [PATCH] add selectable domain option to signup, RT#21557

---
 FS/FS/ClientAPI/Signup.pm                     | 4 ++--
 FS/FS/Conf.pm                                 | 4 ++--
 fs_selfservice/FS-SelfService/SelfService.pm  | 2 +-
 fs_selfservice/FS-SelfService/cgi/signup.html | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 895c5823e..16d6c8f3a 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -98,7 +98,7 @@ sub signup_info {
 
     my @signup_bools = qw( no_company recommend_daytime recommend_email );
 
-    my @signup_server_scalars = qw( default_pkgpart default_svcpart default_domain );
+    my @signup_server_scalars = qw( default_pkgpart default_svcpart default_domsvc );
 
     my @selfservice_textareas = qw( head body_header body_footer );
 
@@ -670,7 +670,7 @@ sub new_customer {
     my $svc = new FS::svc_acct {
       'svcpart'   => $svcpart,
       map { $_ => $packet->{$_} }
-        qw( username _password sec_phrase popnum ),
+        qw( username _password sec_phrase popnum domsvc ),
     };
 
     my @acct_snarf;
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index c93331d24..0db5d86cc 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2164,9 +2164,9 @@ and customer address. Include units.',
   },
 
   {
-    'key'         => 'signup_server-default_domain',
+    'key'         => 'signup_server-default_domsvc',
     'section'     => 'self-service',
-    'description' => 'If specified, the default domain for signup (useful when domain is set to selectable choice).',
+    'description' => 'If specified, the default domain svcpart for signup (useful when domain is set to selectable choice).',
     'type'        => 'text',
   },
 
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 1fa67c2ad..d44f978a5 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1799,7 +1799,7 @@ sub domainselector {
            '<INPUT TYPE="hidden" NAME="domsvc" VALUE="'. $key. '"></TD></TR>'
   }
 
-  my $text .= qq!<TR><TD ALIGN="right">Domain</TD><TD><SELECT NAME="domsvc" SIZE=1 STYLE="width: 20em">;
+  my $text .= qq!<TR><TD ALIGN="right">Domain</TD><TD><SELECT NAME="domsvc" SIZE=1 STYLE="width: 20em">!;
 
   $text .= '<OPTION>(Choose Domain)' unless $domsvc;
 
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index d5cbcd4c5..306e49749 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -321,7 +321,7 @@ ENDOUT
 </TR>
 ENDOUT
 
-  $OUT .= domainselector( svcpart=>$default_svcpart, domsvc=>$default_domain )
+  $OUT .= domainselector( svcpart=>$default_svcpart, domsvc=>$default_domsvc )
     if $default_svcpart;
 
     $OUT .= <<ENDOUT;
-- 
2.11.0