X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fsignup.cgi;h=20016140469f4835e64304ae4e2704cf041a0525;hb=0bebde603df97eb496150e80a58755b2f792f64a;hp=47857f0a7e4e6eec1ef50452b33d33307960a2ff;hpb=533c1a26db76bcd486e36099da3976d7853ea46d;p=freeside.git
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi
index 47857f0a7..200161404 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi
@@ -8,17 +8,20 @@ use vars qw( @payby $cgi $init_data
$ieak_file $ieak_template
$signup_html $signup_template
$success_html $success_template
+ $collect_html $collect_template
$decline_html $decline_template
);
use subs qw( print_form print_okay print_decline
- success_default decline_default
+ success_default collect_default decline_default
);
use CGI;
#use CGI::Carp qw(fatalsToBrowser);
+use Tie::IxHash;
use Text::Template;
use Business::CreditCard;
use HTTP::BrowserDetect;
+use HTML::Widgets::SelectLayers;
use FS::SelfService qw( signup_info new_customer );
#acceptable payment methods
@@ -35,6 +38,9 @@ $signup_html = -e 'signup.html'
$success_html = -e 'success.html'
? 'success.html'
: '/usr/local/freeside/success.html';
+$collect_html = -e 'collect.html'
+ ? 'collect.html'
+ : '/usr/local/freeside/collect.html';
$decline_html = -e 'decline.html'
? 'decline.html'
: '/usr/local/freeside/decline.html';
@@ -97,6 +103,24 @@ if ( -e $success_html ) {
or die $Text::Template::ERROR;
}
+if ( -e $collect_html ) {
+ my $collect_txt = Text::Template::_load_text($collect_html)
+ or die $Text::Template::ERROR;
+ $collect_txt =~ /^(.*)$/s; #untaint the template source - it's trusted
+ $collect_txt = $1;
+ $collect_template = new Text::Template ( TYPE => 'STRING',
+ SOURCE => $collect_txt,
+ DELIMITERS => [ '<%=', '%>' ],
+ )
+ or die $Text::Template::ERROR;
+} else {
+ $collect_template = new Text::Template ( TYPE => 'STRING',
+ SOURCE => &collect_default,
+ DELIMITERS => [ '<%=', '%>' ],
+ )
+ or die $Text::Template::ERROR;
+}
+
if ( -e $decline_html ) {
my $decline_txt = Text::Template::_load_text($decline_html)
or die $Text::Template::ERROR;
@@ -117,14 +141,15 @@ if ( -e $decline_html ) {
$cgi = new CGI;
-$init_data = signup_info( 'agentnum' => $agentnum,
+$init_data = signup_info( 'agentnum' => $agentnum || scalar($cgi->param('agentnum')),
'promo_code' => scalar($cgi->param('promo_code')),
'reg_code' => uc(scalar($cgi->param('reg_code'))),
);
-if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
- || ( defined($cgi->param('action')) && $cgi->param('action') eq 'process_signup' )
- ) {
+my $magic = $cgi->param('magic') || '';
+my $action = $cgi->param('action') || '';
+
+if ( $magic eq 'process' || $action eq 'process_signup' ) {
$error = '';
@@ -206,7 +231,8 @@ if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
invoicing_list referral_custnum promo_code reg_code
pkgpart refnum agentnum
username sec_phrase _password popnum
- countrycode phonenum sip_password pin
+ mac_addr
+ countrycode phonenum sip_password pin prepaid_shortform
),
grep { /^snarf_/ } $cgi->param
),
@@ -218,6 +244,10 @@ if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
if ( $error eq '_decline' ) {
print_decline();
+ } elsif ( $error eq '_collect' ) {
+ map { $cgi->param($_, $rv->{$_}) }
+ qw( popup_url reference amount );
+ print_collect($rv);
} elsif ( $error ) {
#fudge the snarf info
no strict 'refs';
@@ -230,6 +260,16 @@ if ( ( defined($cgi->param('magic')) && $cgi->param('magic') eq 'process' )
);
}
+} elsif ( $magic eq 'success' || $action eq 'success' ) {
+
+ $cgi->param('username', 'username'); #hmmm temp kludge
+ $cgi->param('_password', 'password');
+ print_okay( map { /^([\w ]+)$/ ? ( $_ => $1 ) : () } $cgi->param ); #hmmm
+
+} elsif ( $magic eq 'decline' || $action eq 'decline' ) {
+
+ print_decline();
+
} else {
$error = '';
print_form;
@@ -252,15 +292,47 @@ sub print_form {
#$cgi->delete('init_popstate');
$r->{self_url} = $cgi->self_url;
+ $r->{prepaid_shortform} = $cgi->param('prepaid_shortform');
+
print $cgi->header( '-expires' => 'now' ),
$signup_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
HASH => $r
);
}
+sub print_collect {
+
+ $error = "Error: $error" if $error;
+
+ my $rv = shift || {};
+ my $r = {
+ $cgi->Vars,
+ %{$init_data},
+ %$rv,
+ 'error' => $error,
+ };
+
+ $r->{pkgpart} ||= $r->{default_pkgpart};
+
+ $r->{referral_custnum} = $r->{'ref'};
+ $r->{self_url} = $cgi->self_url;
+
+ print $cgi->header( '-expires' => 'now' ),
+
+ $collect_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
+ HASH => $r
+ );
+}
+
sub print_decline {
+ my $r = {
+ %{$init_data},
+ };
+
print $cgi->header( '-expires' => 'now' ),
- $decline_template->fill_in();
+ $decline_template->fill_in( PACKAGE => 'FS::SelfService::_signupcgi',
+ HASH => $r
+ );
}
sub print_okay {
@@ -328,6 +400,8 @@ sub print_okay {
print $cgi->header( '-expires' => 'now' ),
$success_template->fill_in( HASH => {
+ %{$init_data},
+
email_name => $email_name,
pkg => $pkg,
part_pkg => \$part_pkg,
@@ -369,6 +443,39 @@ Package: <%= $pkg %>
END
}
+sub collect_default { #html to use if there is a collect phase
+ <<'END';
+