projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7266a53
)
add selectable domain option to signup, RT#21557
author
Ivan Kohler
<ivan@freeside.biz>
Mon, 29 Apr 2013 19:31:06 +0000
(12:31 -0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Mon, 29 Apr 2013 19:31:06 +0000
(12:31 -0700)
FS/FS/ClientAPI/Signup.pm
patch
|
blob
|
history
FS/FS/Conf.pm
patch
|
blob
|
history
fs_selfservice/FS-SelfService/SelfService.pm
patch
|
blob
|
history
fs_selfservice/FS-SelfService/cgi/signup.html
patch
|
blob
|
history
diff --git
a/FS/FS/ClientAPI/Signup.pm
b/FS/FS/ClientAPI/Signup.pm
index
895c582
..
16d6c8f
100644
(file)
--- 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_bools = qw( no_company recommend_daytime recommend_email );
- my @signup_server_scalars = qw( default_pkgpart default_svcpart default_dom
ain
);
+ my @signup_server_scalars = qw( default_pkgpart default_svcpart default_dom
svc
);
my @selfservice_textareas = qw( head body_header body_footer );
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->{$_} }
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;
};
my @acct_snarf;
diff --git
a/FS/FS/Conf.pm
b/FS/FS/Conf.pm
index
c93331d
..
0db5d86
100644
(file)
--- a/
FS/FS/Conf.pm
+++ b/
FS/FS/Conf.pm
@@
-2164,9
+2164,9
@@
and customer address. Include units.',
},
{
},
{
- 'key' => 'signup_server-default_dom
ain
',
+ 'key' => 'signup_server-default_dom
svc
',
'section' => 'self-service',
'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',
},
'type' => 'text',
},
diff --git
a/fs_selfservice/FS-SelfService/SelfService.pm
b/fs_selfservice/FS-SelfService/SelfService.pm
index
1fa67c2
..
d44f978
100644
(file)
--- 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>'
}
'<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;
$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
(executable)
--- a/
fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/
fs_selfservice/FS-SelfService/cgi/signup.html
@@
-321,7
+321,7
@@
ENDOUT
</TR>
ENDOUT
</TR>
ENDOUT
- $OUT .= domainselector( svcpart=>$default_svcpart, domsvc=>$default_dom
ain
)
+ $OUT .= domainselector( svcpart=>$default_svcpart, domsvc=>$default_dom
svc
)
if $default_svcpart;
$OUT .= <<ENDOUT;
if $default_svcpart;
$OUT .= <<ENDOUT;