my $svc;
if ( $svc_x eq 'svc_acct' ) {
- my $svc = new FS::svc_acct ( {
+ $svc = new FS::svc_acct ( {
'svcpart' => $svcpart,
map { $_ => $packet->{$_} }
qw( username _password sec_phrase popnum ),
} elsif ( $svc_x eq 'svc_phone' ) {
- my $svc = new FS::svc_phone ( {
+ $svc = new FS::svc_phone ( {
'svcpart' => $svcpart,
map { $_ => $packet->{$_} }
- qw( countrycode phonenum pin ),
+ qw( countrycode phonenum sip_password pin ),
} );
} else {
$error = $placeholder->delete;
return { 'error' => $error } if $error;
- return { error => '' };
+ my %return = ( 'error' => '',
+ 'signup_service' => $svc_x,
+ );
+
+ if ( $svc_x eq 'svc_acct' ) {
+ $return{$_} = $svc->$_() for qw( username _password );
+ } elsif ( $svc_x eq 'svc_phone' ) {
+ $return{$_} = $svc->$_() for qw( countrycode phonenum sip_password pin );
+ } else {
+ die "unknown signup service $svc_x";
+ }
+
+ return \%return;
}
'payname' => $payname,
'invoicing_list' => $invoicing_list,
'referral_custnum' => $referral_custnum,
+ 'agentnum' => $agentnum,
'pkgpart' => $pkgpart,
+
'username' => $username,
'_password' => $password,
'popnum' => $popnum,
- 'agentnum' => $agentnum,
+ #OR
+ 'countrycode' => 1,
+ 'phonenum' => $phonenum,
+ 'pin' => $pin,
}
);
referring customer number
+=item agentnum
+
+Agent number
+
=item pkgpart
pkgpart of initial package
Access number (index, not the literal number)
-=item agentnum
+=item countrycode
-Agent number
+Country code (to be provisioned as a service)
+
+=item phonenum
+
+Phone number (to be provisioned as a service)
+
+=item pin
+
+Voicemail PIN
=back
$cgi->param('invoicing_list' => 'POST' );
}
+ #if ( $svc_x eq 'svc_acct' ) {
if ( $cgi->param('_password') ne $cgi->param('_password2') ) {
$error = $init_data->{msgcat}{passwords_dont_match}; #msgcat
$cgi->param('_password', '');
$error ||= $init_data->{msgcat}{illegal_or_empty_text};
}
+ my $rv = '';
unless ( $error ) {
- my $rv = new_customer( {
+ $rv = new_customer( {
( map { $_ => scalar($cgi->param($_)) }
qw( last first ss company
address1 address2 city county state zip country
payby payinfo paycvv paydate payname paystate paytype
invoicing_list referral_custnum promo_code reg_code
- pkgpart username sec_phrase _password popnum refnum
- agentnum
+ pkgpart refnum agentnum
+ username sec_phrase _password popnum
+ countrycode phonenum sip_password pin
),
grep { /^snarf_/ } $cgi->param
),
} else {
print_okay(
'pkgpart' => scalar($cgi->param('pkgpart')),
+ %$rv,
);
}
my %param = @_;
my $user_agent = new HTTP::BrowserDetect $ENV{HTTP_USER_AGENT};
- $cgi->param('username') =~ /^(.+)$/
- or die "fatal: invalid username got past FS::SelfService::new_customer";
- my $username = $1;
- $cgi->param('_password') =~ /^(.+)$/
- or die "fatal: invalid password got past FS::SelfService::new_customer";
- my $password = $1;
+ my( $username, $password ) = ( '', '' );
+ my( $countrycode, $phonenum, $sip_password, $pin ) = ( '', '', '', '' );
+
+ my $svc_x = $param{signup_service} || 'svc_acct'; #just in case
+ if ( $svc_x eq 'svc_acct' ) {
+
+ $cgi->param('username') =~ /^(.+)$/
+ or die "fatal: invalid username got past FS::SelfService::new_customer";
+ $username = $1;
+ $cgi->param('_password') =~ /^(.+)$/
+ or die "fatal: invalid password got past FS::SelfService::new_customer";
+ $password = $1;
+
+ } elsif ( $svc_x eq 'svc_phone' ) {
+
+ $countrycode = $param{countrycode};
+ $phonenum = $param{phonenum};
+ $sip_password = $param{sip_password};
+ $pin = $param{pin};
+
+ } else {
+ die "unknown signup service $svc_x";
+ }
+
( $cgi->param('first'). ' '. $cgi->param('last') ) =~ /^(.*)$/
or die "fatal: invalid email_name got past FS::SelfService::new_customer";
my $email_name = $1; #global for template
my $pkg = $part_pkg->{'pkg'};
if ( $ieak_template && $user_agent->windows && $user_agent->ie ) {
+
#send an IEAK config
print $cgi->header('application/x-Internet-signup'),
$ieak_template->fill_in();
+
} else { #send a simple confirmation
+
print $cgi->header( '-expires' => 'now' ),
$success_template->fill_in( HASH => {
- username => $username,
- password => $password,
- _password => $password,
- email_name => $email_name,
- ac => $ac,
- exch => $exch,
- loc => $loc,
- pkg => $pkg,
- part_pkg => \$part_pkg,
+
+ email_name => $email_name,
+ pkg => $pkg,
+ part_pkg => \$part_pkg,
+
+ signup_service => $svc_x,
+
+ #for svc_acct
+ username => $username,
+ password => $password,
+ _password => $password,
+ ac => $ac, #for dialup POP
+ exch => $exch, #
+ loc => $loc, #
+
+ #for svc_phone
+ countrycode => $countrycode,
+ phonenum => $phonenum,
+ sip_password => $sip_password,
+ pin => $pin,
+
});
}
+
}
sub success_default { #html to use if you don't specify a success file
%>
<%=
- $OUT = join("\n", map { qq|<input type="hidden" name="$_" />| } qw / promo_code reg_code pkgpart username _password _password2 sec_phrase popnum / );
+ $OUT = join("\n", map { qq|<input type="hidden" name="$_" />| } qw / promo_code reg_code pkgpart username _password _password2 sec_phrase popnum countrycode phonenum sip_password pin / );
%>
Where did you hear about our service? <SELECT NAME="refnum">
// Copy signup details to OneTrueForm
- var signup_elements = new Array ( 'promo_code', 'reg_code',
- 'pkgpart', 'username',
- '_password', '_password2',
- 'sec_phrase', 'popnum' );
+ var signup_elements = new Array (
+ 'promo_code', 'reg_code', 'pkgpart',
+ 'username', '_password', '_password2', 'sec_phrase', 'popnum',
+ 'countrycode', 'phonenum', 'sip_password', 'pin'
+ );
for ( ii = 0 ; ii < signup_elements.length ; ii ++ ) {
copyelement ( document.signup_form.elements[signup_elements[ii]],
-<HTML><HEAD><TITLE>Signup successful</TITLE></HEAD>
-<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Signup successful</FONT><BR><BR>
-Thanks for signing up!
+<HTML>
+
+<HEAD>
+ <TITLE>Signup successful</TITLE>
+</HEAD>
+
+<BODY BGCOLOR="#e8e8e8">
+
+<FONT SIZE=7>Signup successful</FONT><BR><BR>
+
+Thanks for signing up! Save this information for future reference.
<BR><BR>
+
Signup information for <%= $email_name %>:
<BR><BR>
-Username: <%= $username %><BR>
-Password: <%= $password %><BR>
-Access number: (<%= $ac %>) / <%= $exch %> - <%= $local %><BR>
-Package: <%= $pkg %><BR>
-</BODY></HTML>
+
+<%=
+ if ($signup_service eq 'svc_acct' || !$signup_service ) { #just in case
+ $OUT .= <<END
+ Username: $username<BR>
+ Password: $password><BR>
+ Access number: ($ac) / $exch - $local <BR>
+END
+ } elsif ( $signup_service eq 'svc_phone' ) {
+ $OUT .= <<END
+ <!-- Countrycode: $countrycode <BR>-->
+ Phone number: $phonenum<BR>
+ SIP Server: itsp.sip.server.name<BR>
+ SIP Login: $phonenum<BR>
+ SIP Password: $sip_password<BR>
+ Voicemail PIN: $pin<BR>
+END
+ } else {
+ die "unknown signup service $signup_service";
+ }
+%>
+
+ Package: <%= $pkg %><BR>
+
+</BODY>
+</HTML>
projects / freeside.git / commitdiff