diff options
Diffstat (limited to 'fs_selfservice/FS-SelfService')
5 files changed, 25 insertions, 6 deletions
diff --git a/fs_selfservice/FS-SelfService/cgi/card.html b/fs_selfservice/FS-SelfService/cgi/card.html index c7db2b398..dfe63710c 100644 --- a/fs_selfservice/FS-SelfService/cgi/card.html +++ b/fs_selfservice/FS-SelfService/cgi/card.html @@ -26,7 +26,7 @@ </TD> </TR> <%= - if ( $withcvv ) { + if ( $withcvv || $require_cvv || $onfile_require_cvv ) { $OUT .= qq!<TR>!; $OUT .= qq!<TD ALIGN="right">CVV2 (<A HREF="javascript:myopen('cvv2.html','cvv2','toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=no,resizable=yes,copyhistory=no,width=480,height=288')">help</A>)</TD>!; $OUT .= qq!<TD><INPUT TYPE="text" NAME="paycvv" VALUE="" SIZE=4 MAXLENGTH=4></TD>!; diff --git a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html index 71f507010..4802178d0 100644 --- a/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html +++ b/fs_selfservice/FS-SelfService/cgi/myaccount_menu.html @@ -64,8 +64,14 @@ if ( $balance > 0 ) { #XXXFIXME "enable selfservice prepay features" flag or som } push @menu, - { title=>' ' }, - { title=>'View my usage', url=>'view_usage', size=>'+1', }, + { title=>' ' }; + +unless( $hide_usage ){ + push @menu, + { title=>'View my usage', url=>'view_usage', size=>'+1', } +} + +push @menu, { title=>'Create a ticket', url=>'tktcreate', size=>'+1', }, ; diff --git a/fs_selfservice/FS-SelfService/cgi/provision_list.html b/fs_selfservice/FS-SelfService/cgi/provision_list.html index 24d6ff436..b558337de 100644 --- a/fs_selfservice/FS-SelfService/cgi/provision_list.html +++ b/fs_selfservice/FS-SelfService/cgi/provision_list.html @@ -13,8 +13,8 @@ foreach my $pkg ( my $susp = $pkg->{'susp'} || ''; my @pkg_actions = (); if ( ! $susp ) { - push @pkg_actions, [ 'customer_change_pkg' => 'change' ]; - push @pkg_actions, [ 'process_suspend_pkg' => 'suspend' ] + push @pkg_actions, [ 'customer_change_pkg' => 'change' ] unless $pkg->{'immutable'}; + push @pkg_actions, [ 'process_suspend_pkg' => 'suspend' ] if $self_suspend_reason; } diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi index 2b4bb4302..4e21ad8df 100755 --- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi +++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi @@ -124,7 +124,15 @@ unless ( $nologin_actions{$action} ) { 'email' => $email, 'password' => $password ); - $session_id = $login_rv->{'session_id'}; + + if ( $login_rv->{'error'} ) { + my $ip = $cgi->remote_addr(); + warn("login failure [email $email] [ip $ip] [error $login_rv->{error}]"); + } else { + #successful login + } + + $session_id = $login_rv->{'session_id'}; } else { @@ -306,6 +314,7 @@ sub process_change_pay { 'error' => '<FONT COLOR="#FF0000">Postal or email required.</FONT>', }; } + _process_change_info( 'change_pay', @list ); } diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage.html b/fs_selfservice/FS-SelfService/cgi/view_usage.html index f50f77078..c43f7d3da 100644 --- a/fs_selfservice/FS-SelfService/cgi/view_usage.html +++ b/fs_selfservice/FS-SelfService/cgi/view_usage.html @@ -18,6 +18,8 @@ ''; %> <%= include('header', 'Account usage') %> +<%= if( $hide_usage ){ $OUT .= '<' . '!--' } %> + <%= if ( $error ) { $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">$error</FONT><BR><BR>!; @@ -216,4 +218,6 @@ foreach my $svc_port ( @svc_port ) { </TD></TR></TABLE> +<%= if( $hide_usage ){ $OUT .= '--'. '>' } %> <%= include('footer') %> + |