X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fview_usage.html;h=fd5426a75251e70351e79e19aaa24477a2b56520;hb=e006b70d3b27db3f607471852bbe13c0281d520e;hp=79d07d4df409eaab8c0486646b6e31ab5d89c6c9;hpb=c648976f0b7975f2328ebd7ba8c711fad0ca4195;p=freeside.git
diff --git a/fs_selfservice/FS-SelfService/cgi/view_usage.html b/fs_selfservice/FS-SelfService/cgi/view_usage.html
index 79d07d4df..fd5426a75 100644
--- a/fs_selfservice/FS-SelfService/cgi/view_usage.html
+++ b/fs_selfservice/FS-SelfService/cgi/view_usage.html
@@ -1,28 +1,36 @@
-
MyAccount
-MyAccount
-<%= $url = "$selfurl?session=$session_id;action="; ''; %>
-<%= include('myaccount_menu') %>
-
-
-Service usage
+<%= $url = "$selfurl?session=$session_id;action=";
+ @svc_acct = grep { $_->{svcdb} eq 'svc_acct' } @svcs;
+ @svc_phone = grep { $_->{svcdb} eq 'svc_phone' } @svcs;
+ @svc_port = grep { $_->{svcdb} eq 'svc_port' } @svcs;
+ '';
+%>
+<%= include('header', 'Account usage') %>
<%= if ( $error ) {
$OUT .= qq!$error
!;
} ''; %>
-
-
- Account |
- Time remaining |
- Upload remaining |
- Download remaining |
- Total remaining |
-
-<%= foreach my $svc ( @svcs ) {
+<%= if ( @svc_acct ) {
+ $OUT.= '
+
+ Account |
+ Time remaining |
+ Upload remaining |
+ Download remaining |
+ Total remaining |
+ ';
+ } else {
+ $OUT .= '';
+ }
+%>
+
+<%= foreach my $svc ( @svc_acct ) {
my $link = "${url}view_usage_details;".
"svcnum=$svc->{'svcnum'};beginning=0;ending=0";
+ my $username = $svc->{'value'};
+ $username =~ s/@.*?$//g if $view_usage_nodomain;
$OUT .= '';
- $OUT .= qq!!. $svc->{'label'}. ': '. $svc->{'value'}.'';
+ $OUT .= qq!!. $svc->{'label'}. ': '. $username .'';
$OUT .= ' | ';
$OUT .= $svc->{'seconds'};
$OUT .= ' | ';
@@ -48,12 +56,89 @@
$OUT .= $svc->{'recharge_totalbytes'} if $svc->{'recharge_totalbytes'};
$OUT .= ' | ';
}
- } %>
+ }
+%>
+
+<%= scalar(@svc_acct) ? '
' : '' %>
+
+<%= if ( @svc_phone ) {
+ $OUT.= 'Call usage
+
+
+ Number | '; #"Account" ?
+ #what else?
+ $OUT .= ' ';
+ } else {
+ $OUT .= '';
+ }
+%>
+
+<%= foreach my $svc_phone ( @svc_phone ) {
+ my $link = "${url}view_cdr_details;".
+ "svcnum=$svc_phone->{'svcnum'};beginning=0;ending=0";
+ $OUT .= '';
+ $OUT .= qq!!. $svc_phone->{'label'}. ': '. $svc_phone->{'value'}.'';
+ $OUT .= ' | ';
+ }
+%>
+
+<%= scalar(@svc_phone) ? '
' : '' %>
+
+<%= if ( @svc_port ) {
+ $OUT.= 'Bandwidth Graphs
+
+
+
+ Service |
+
+ |
+ ';
+ }
+ $OUT .= '';
+%>
+
+<%=
+
+sub preset_range {
+ my($start,$end,$label,$date_format,$prefix) = (shift,shift,shift,shift,shift);
+ $start = Date::Format::time2str($date_format,$start);
+ $end = Date::Format::time2str($date_format,$end);
+ return ''.$label.'';
+}
+
+foreach my $svc_port ( @svc_port ) {
+ $svcnum = $svc_port->{'svcnum'};
+ $default_end = time;
+ $default_start = $default_end-86400;
+
+ $OUT .= ''. $svc_port->{'label'}. ': '. $svc_port->{'value'}.' | ';
+ $OUT .= qq! | ';
+}
+%>
+
+<%= scalar(@svc_port) ? '
' : '' %>
-
-
|
-
-powered by freeside
-
+<%= include('footer') %>