diff options
| author | ivan <ivan> | 2009-10-24 02:04:41 +0000 |
|---|---|---|
| committer | ivan <ivan> | 2009-10-24 02:04:41 +0000 |
| commit | ca16e6099d6b0b979badb1bca5d2b7413aa70206 (patch) | |
| tree | 3f5fdc5a5acc779d0eaedbe1458b75846ff28320 /fs_selfservice | |
| parent | 5fe84df65a55868bbc730bbcd8a8dbb4de7a7593 (diff) | |
remove an inadvertant debugging call left in, allow an agentnum to be specfied for non-logged in situations, RT#6166
Diffstat (limited to 'fs_selfservice')
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/decline.html | 15 | ||||
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/login.html | 1 | ||||
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 4 | ||||
| -rwxr-xr-x | fs_selfservice/FS-SelfService/cgi/signup.cgi | 12 | ||||
| -rwxr-xr-x | fs_selfservice/FS-SelfService/cgi/signup.html | 1 | ||||
| -rw-r--r-- | fs_selfservice/FS-SelfService/cgi/success.html | 15 |
6 files changed, 33 insertions, 15 deletions
diff --git a/fs_selfservice/FS-SelfService/cgi/decline.html b/fs_selfservice/FS-SelfService/cgi/decline.html index a37ba3a..c50081e 100644 --- a/fs_selfservice/FS-SelfService/cgi/decline.html +++ b/fs_selfservice/FS-SelfService/cgi/decline.html @@ -1,5 +1,14 @@ -<HTML><HEAD><TITLE>Processing error</TITLE></HEAD> -<BODY BGCOLOR="#e8e8e8"><FONT SIZE=7>Processing error</FONT><BR><BR> +<HTML> + <HEAD> + <TITLE>Processing error</TITLE> + <%= $head %> + </HEAD> + <BODY BGCOLOR="<%= $body_bgcolor || '#eeeeee' %>"> + <%= $body_header %> + + +<FONT SIZE=7>Processing error</FONT><BR><BR> There has been an error processing your account. Please contact customer support. -</BODY></HTML> + +<%= $body_footer %> diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html index eef412d..f7473b1 100644 --- a/fs_selfservice/FS-SelfService/cgi/login.html +++ b/fs_selfservice/FS-SelfService/cgi/login.html @@ -11,6 +11,7 @@ <FORM ACTION="<%= $self_url %>" METHOD=POST> <INPUT TYPE="hidden" NAME="session" VALUE="login"> +<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>"> <TABLE BGCOLOR="<%= $box_bgcolor || '#c0c0c0' %>" BORDER=0 CELLSPACING=2 CELLPADDING=0> diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi index ec8d6d8..734563b 100644 --- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi +++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi @@ -29,7 +29,7 @@ $form_max = 255; $cgi = new CGI; unless ( defined $cgi->param('session') ) { - my $login_info = login_info(); + my $login_info = login_info( 'agentnum' => scalar($cgi->param('agentnum')) ); do_template('login', $login_info ); exit; @@ -55,7 +55,7 @@ if ( $cgi->param('session') eq 'login' ) { 'password' => $password, ); if ( $rv->{error} ) { - my $login_info = login_info(); + my $login_info = login_info( 'agentnum' => $cgi->param('agentnum') ); do_template('login', { 'error' => $rv->{error}, 'username' => $username, diff --git a/fs_selfservice/FS-SelfService/cgi/signup.cgi b/fs_selfservice/FS-SelfService/cgi/signup.cgi index da59543..7d1679b 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.cgi +++ b/fs_selfservice/FS-SelfService/cgi/signup.cgi @@ -141,7 +141,7 @@ 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'))), ); @@ -320,8 +320,14 @@ sub print_collect { } 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 { @@ -389,6 +395,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, diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html index 9ee0cab..375137b 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.html +++ b/fs_selfservice/FS-SelfService/cgi/signup.html @@ -30,6 +30,7 @@ <FORM NAME="OneTrueForm" ACTION="<%= $self_url %>" METHOD=POST onSubmit="document.OneTrueForm.signup.disabled=true"> <INPUT TYPE="hidden" NAME="session" VALUE="<%= $session_id %>"> <INPUT TYPE="hidden" NAME="action" VALUE="process_signup"> +<INPUT TYPE="hidden" NAME="agentnum" VALUE="<%= $agentnum %>"> <INPUT TYPE="hidden" NAME="referral_custnum" VALUE="<%= $referral_custnum %>"> <INPUT TYPE="hidden" NAME="ss" VALUE=""> <input type="hidden" name="payby"> diff --git a/fs_selfservice/FS-SelfService/cgi/success.html b/fs_selfservice/FS-SelfService/cgi/success.html index 8105e41..ccbcc62 100644 --- a/fs_selfservice/FS-SelfService/cgi/success.html +++ b/fs_selfservice/FS-SelfService/cgi/success.html @@ -1,10 +1,10 @@ <HTML> - -<HEAD> - <TITLE>Signup successful</TITLE> -</HEAD> - -<BODY BGCOLOR="#e8e8e8"> + <HEAD> + <TITLE>Signup successful</TITLE> + <%= $head %> + </HEAD> + <BODY BGCOLOR="<%= $body_bgcolor || '#eeeeee' %>"> + <%= $body_header %> <FONT SIZE=7>Signup successful</FONT><BR><BR> @@ -37,5 +37,4 @@ END Package: <%= $pkg %><BR> -</BODY> -</HTML> +<%= $body_footer %> |