[freeside-commits] branch master updated. 22336a0eeba10b4d1a4a78801f83f7cef56a1a20
Ivan
ivan at 420.am
Mon Apr 29 12:31:27 PDT 2013
The branch, master has been updated
via 22336a0eeba10b4d1a4a78801f83f7cef56a1a20 (commit)
via a0b714142b349a36eee41a5de1e511758a382ffb (commit)
via 7266a53154af0f0b2240d3de4f912c52670d67d0 (commit)
from 00755aee33cc3ecdf3634bcc0f50f54814bfc400 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 22336a0eeba10b4d1a4a78801f83f7cef56a1a20
Merge: a0b7141 00755ae
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Apr 29 12:31:20 2013 -0700
Merge branch 'master' of git.freeside.biz:/home/git/freeside
commit a0b714142b349a36eee41a5de1e511758a382ffb
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Apr 29 12:31:06 2013 -0700
add selectable domain option to signup, RT#21557
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 895c582..16d6c8f 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 c93331d..0db5d86 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 1fa67c2..d44f978 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 d5cbcd4..306e497 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;
commit 7266a53154af0f0b2240d3de4f912c52670d67d0
Author: Ivan Kohler <ivan at freeside.biz>
Date: Mon Apr 29 12:18:07 2013 -0700
add selectable domain option to signup, RT#21557
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 1dbb20b..895c582 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 );
+ my @signup_server_scalars = qw( default_pkgpart default_svcpart default_domain );
my @selfservice_textareas = qw( head body_header body_footer );
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 6a19ff4..c93331d 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -2159,11 +2159,18 @@ and customer address. Include units.',
{
'key' => 'signup_server-default_svcpart',
'section' => 'self-service',
- 'description' => 'Default service definition for the signup server - only necessary for services that trigger special provisioning widgets (such as DID provisioning).',
+ 'description' => 'Default service definition for the signup server - only necessary for services that trigger special provisioning widgets (such as DID provisioning or domain selection).',
'type' => 'select-part_svc',
},
{
+ 'key' => 'signup_server-default_domain',
+ 'section' => 'self-service',
+ 'description' => 'If specified, the default domain for signup (useful when domain is set to selectable choice).',
+ 'type' => 'text',
+ },
+
+ {
'key' => 'signup_server-mac_addr_svcparts',
'section' => 'self-service',
'description' => 'Service definitions which can receive mac addresses (current mapped to username for svc_acct).',
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 651a8f5..1fa67c2 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1799,8 +1799,9 @@ 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"><OPTION>(Choose Domain)!;
+ my $text .= qq!<TR><TD ALIGN="right">Domain</TD><TD><SELECT NAME="domsvc" SIZE=1 STYLE="width: 20em">;
+ $text .= '<OPTION>(Choose Domain)' unless $domsvc;
foreach my $domain ( sort { $domains->{$a} cmp $domains->{$b} } keys %$domains ) {
$text .= qq!<OPTION VALUE="!. $domain. '"'.
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index 23d814e..88eab5c 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -231,7 +231,7 @@ if ( $magic eq 'process' || $action eq 'process_signup' ) {
invoicing_list referral_custnum promo_code reg_code
override_ban_warn
pkgpart refnum agentnum
- username sec_phrase _password popnum
+ username sec_phrase _password popnum domsvc
mac_addr
countrycode phonenum sip_password pin prepaid_shortform
),
@@ -500,5 +500,7 @@ END
package FS::SelfService::_signupcgi;
use HTML::Entities;
-use FS::SelfService qw(regionselector expselect popselector didselector);
+use FS::SelfService qw( regionselector expselect popselector domainselector
+ didselector
+ );
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index 16ef7f7..d5cbcd4 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -319,6 +319,12 @@ ENDOUT
<TD ALIGN="right">Username</TD>
<TD><INPUT TYPE="text" NAME="username" VALUE="$username"></TD>
</TR>
+ENDOUT
+
+ $OUT .= domainselector( svcpart=>$default_svcpart, domsvc=>$default_domain )
+ if $default_svcpart;
+
+ $OUT .= <<ENDOUT;
<TR>
<TD ALIGN="right">Password</TD>
<TD><INPUT TYPE="password" NAME="_password" VALUE="$_password"></TD>
-----------------------------------------------------------------------
Summary of changes:
FS/FS/ClientAPI/Signup.pm | 4 ++--
FS/FS/Conf.pm | 9 ++++++++-
fs_selfservice/FS-SelfService/SelfService.pm | 3 ++-
fs_selfservice/FS-SelfService/cgi/signup.cgi | 6 ++++--
fs_selfservice/FS-SelfService/cgi/signup.html | 6 ++++++
5 files changed, 22 insertions(+), 6 deletions(-)
More information about the freeside-commits
mailing list