X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fselfservice.cgi;h=0e8b990daac467b0207f71d2d19e76b76a9bfc39;hb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;hp=5b2d2980c1d9de8409131c3ac9096d38567887a2;hpb=7353f670ef61e617a9dfb6c258907eb70e0345f6;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 5b2d2980c..0e8b990da 100644
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -8,6 +8,7 @@ use CGI::Carp qw(fatalsToBrowser);
 use Text::Template;
 use HTML::Entities;
 use Date::Format;
+use Date::Parse 'str2time';
 use Number::Format 1.50;
 use FS::SelfService qw(
   access_info login_info login customer_info edit_info invoice
@@ -17,7 +18,7 @@ use FS::SelfService qw(
   unprovision_svc change_pkg suspend_pkg domainselector
   list_svcs list_svc_usage list_cdr_usage list_support_usage
   myaccount_passwd list_invoices create_ticket get_ticket did_report
-  mason_comp
+  mason_comp port_graph
 );
 
 $template_dir = '.';
@@ -110,6 +111,8 @@ my @actions = ( qw(
   view_usage_details
   view_cdr_details
   view_support_details
+  view_port_graph
+  real_port_graph
   change_password
   process_change_password
   customer_suspend_pkg
@@ -796,18 +799,39 @@ sub delete_svc {
 sub view_usage {
   list_svcs(
     'session_id'  => $session_id,
-    'svcdb'       => [ 'svc_acct', 'svc_phone' ],
+    'svcdb'       => [ 'svc_acct', 'svc_phone', 'svc_port', ],
     'ncancelled'  => 1,
   );
 }
 
+sub real_port_graph {
+    my $svcnum = $cgi->param('svcnum');
+    my $res = port_graph(
+	    'session_id'  => $session_id,
+	    'svcnum'      => $svcnum,
+	    'beginning'	  => str2time($cgi->param('start')." 00:00:00"),
+	    'ending'	=> str2time($cgi->param('end')." 23:59:59"),
+	    );
+    my @usage = @{$res->{'usage'}};
+    my $png = $usage[0]->{'png'};
+    { 'content' => $png, 'format' => 'png' };
+}
+
+sub view_port_graph {
+    my $svcnum = $cgi->param('svcnum');
+    { 'svcnum' => $svcnum,
+      'start' => $cgi->param($svcnum.'_start'),
+      'end' => $cgi->param($svcnum.'_end'),
+    }
+}
+
 sub view_usage_details {
-  list_svc_usage(
-    'session_id'  => $session_id,
-    'svcnum'      => $cgi->param('svcnum'),
-    'beginning'   => $cgi->param('beginning') || '',
-    'ending'      => $cgi->param('ending') || '',
-  );
+      list_svc_usage(
+	'session_id'  => $session_id,
+	'svcnum'      => $cgi->param('svcnum'),
+	'beginning'   => $cgi->param('beginning') || '',
+	'ending'      => $cgi->param('ending') || '',
+      );
 }
 
 sub view_cdr_details {
@@ -878,15 +902,7 @@ sub do_template {
                       : {};
   $fill_in->{$_} = $access_info->{$_} foreach keys %$access_info;
 
-  my $source = "$template_dir/$name.html";
-  #warn "creating template for $source\n";
-  my $template = new Text::Template( TYPE       => 'FILE',
-                                     SOURCE     => $source,
-                                     DELIMITERS => [ '<%=', '%>' ],
-                                     UNTAINT    => 1,
-                                   )
-    or die $Text::Template::ERROR;
-
+  
     if($result && ref($result) && $result->{'format'} && $result->{'content'}
 	&& $result->{'format'} eq 'csv') {
     	print $cgi->header('-expires' => 'now',
@@ -904,7 +920,22 @@ sub do_template {
 		    ),
 		    $result->{'content'};
     }
+    elsif($result && ref($result) && $result->{'format'} && $result->{'content'}
+    	 && $result->{'format'} eq 'png') {
+	print $cgi->header('-expires' => 'now',
+		    '-Content-Type' => 'image/png',
+		    ),
+		    $result->{'content'};
+    }
     else {
+	my $source = "$template_dir/$name.html";
+        my $template = new Text::Template( TYPE       => 'FILE',
+					 SOURCE     => $source,
+					 DELIMITERS => [ '<%=', '%>' ],
+					 UNTAINT    => 1,
+				       )
+	or die $Text::Template::ERROR;
+
 	my $data = $template->fill_in( 
 	    PACKAGE => 'FS::SelfService::_selfservicecgi',
 	    HASH    => $fill_in,