Processing error

From ca16e6099d6b0b979badb1bca5d2b7413aa70206 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 24 Oct 2009 02:04:41 +0000 Subject: [PATCH] remove an inadvertant debugging call left in, allow an agentnum to be specfied for non-logged in situations, RT#6166 --- FS/FS/ClientAPI/MyAccount.pm | 8 ++++---- fs_selfservice/FS-SelfService/cgi/decline.html | 15 ++++++++++++--- fs_selfservice/FS-SelfService/cgi/login.html | 1 + fs_selfservice/FS-SelfService/cgi/selfservice.cgi | 4 ++-- fs_selfservice/FS-SelfService/cgi/signup.cgi | 12 ++++++++++-- fs_selfservice/FS-SelfService/cgi/signup.html | 1 + fs_selfservice/FS-SelfService/cgi/success.html | 15 +++++++-------- 7 files changed, 37 insertions(+), 19 deletions(-) diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index a651a8322..1e029ed25 100644 --- a/FS/FS/ClientAPI/MyAccount.pm +++ b/FS/FS/ClientAPI/MyAccount.pm @@ -74,8 +74,10 @@ sub skin_info { $agentnum = $sth->fetchrow_arrayref->[0] or die "no agentnum for custnum $custnum"; + #} elsif ( $context eq 'agent' ) { + } elsif ( $p->{'agentnum'} =~ /^(\d+)$/ ) { + $agentnum = $1; } - # elsif ( $context eq 'agent' ) { my $conf = new FS::Conf; @@ -94,6 +96,7 @@ sub skin_info { if $DEBUG > 1; $skin_info_cache_agent = { + 'agentnum' => $agentnum, ( map { $_ => scalar( $conf->config($_, $agentnum) ) } qw( company_name ) ), ( map { $_ => scalar( $conf->config("selfservice-$_", $agentnum ) ) } @@ -106,9 +109,6 @@ sub skin_info { } - use Data::Dumper; - warn Dumper($skin_info_cache_agent); - #{ %$skin_info_cache_agent }; $skin_info_cache_agent; diff --git a/fs_selfservice/FS-SelfService/cgi/decline.html b/fs_selfservice/FS-SelfService/cgi/decline.html index a37ba3ab6..c50081e38 100644 --- a/fs_selfservice/FS-SelfService/cgi/decline.html +++ b/fs_selfservice/FS-SelfService/cgi/decline.html @@ -1,5 +1,14 @@ -Processing error -Processing error

+ + + Processing error + <%= $head %> + + + <%= $body_header %> + + +Processing error

There has been an error processing your account. Please contact customer support. - + +<%= $body_footer %> diff --git a/fs_selfservice/FS-SelfService/cgi/login.html b/fs_selfservice/FS-SelfService/cgi/login.html index eef412da3..f7473b1d5 100644 --- a/fs_selfservice/FS-SelfService/cgi/login.html +++ b/fs_selfservice/FS-SelfService/cgi/login.html @@ -11,6 +11,7 @@

+ diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi index ec8d6d867..734563be7 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 da595437c..7d1679b5c 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 9ee0cab34..375137b3c 100755 --- a/fs_selfservice/FS-SelfService/cgi/signup.html +++ b/fs_selfservice/FS-SelfService/cgi/signup.html @@ -30,6 +30,7 @@ + diff --git a/fs_selfservice/FS-SelfService/cgi/success.html b/fs_selfservice/FS-SelfService/cgi/success.html index 8105e41d9..ccbcc62b9 100644 --- a/fs_selfservice/FS-SelfService/cgi/success.html +++ b/fs_selfservice/FS-SelfService/cgi/success.html @@ -1,10 +1,10 @@ - - - Signup successful - - - + + Signup successful + <%= $head %> + + + <%= $body_header %> Signup successful

@@ -37,5 +37,4 @@ END Package: <%= $pkg %>
- - +<%= $body_footer %> -- 2.11.0