FS RT #30363 - Hide Account usage template output in an HTML comment when $hide_usage...

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 86e4b89..bcfe35c 100644 (file)
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -398,11 +398,12 @@ sub access_info {
 
   $info->{'timeout'} = $conf->config('selfservice-timeout') || 3600;
 
 
   $info->{'timeout'} = $conf->config('selfservice-timeout') || 3600;
 

+  $info->{'hide_usage'} = $conf->exists('selfservice_hide-usage');
+

   return { %$info,
            'custnum'       => $custnum,
            'access_pkgnum' => $session->{'pkgnum'},
            'access_svcnum' => $session->{'svcnum'},
   return { %$info,
            'custnum'       => $custnum,
            'access_pkgnum' => $session->{'pkgnum'},
            'access_svcnum' => $session->{'svcnum'},

-          'hide_usage'    => $conf->exists('selfservice_hide-usage'),

          };
 }
 
          };
 }
 

diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage.html b/fs_selfservice/FS-SelfService/cgi/view_usage.html
index f50f770..c43f7d3 100644 (file)
--- 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') %>
     '';
 %>
 <%= include('header', 'Account usage') %>

+<%= if( $hide_usage ){ $OUT .= '<' . '!--' } %>
+

 
 <%= if ( $error ) {
   $OUT .= qq!<FONT SIZE="+1" COLOR="#ff0000">$error</FONT><BR><BR>!;
 
 <%= 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>
 
 
 </TD></TR></TABLE>

+<%= if( $hide_usage ){ $OUT .= '--'. '>' } %>

 <%= include('footer') %>
 <%= include('footer') %>

+