X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fselfservice.cgi;h=40fe98af2398d5c061750b8ee52da21e695e64db;hb=22336a0eeba10b4d1a4a78801f83f7cef56a1a20;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
old mode 100644
new mode 100755
index 5b2d2980c..40fe98af2
--- 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,8 @@ 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
+  adjust_ticket_priority
+  mason_comp port_graph
 );
 
 $template_dir = '.';
@@ -76,6 +78,7 @@ my @actions = ( qw(
   myaccount
   tktcreate
   tktview
+  ticket_priority
   didreport
   invoices
   view_invoice
@@ -110,6 +113,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
@@ -273,11 +278,28 @@ sub tktcreate {
 
 sub tktview {
  get_ticket(	'session_id' => $session_id,
-		'ticket_id' => $cgi->param('ticket_id'),
-		'reply' => $cgi->param('reply'),
+		'ticket_id' => ($cgi->param('ticket_id') || ''),
+                'subject'   => ($cgi->param('subject') || ''),
+		'reply'     => ($cgi->param('reply') || ''),
 	    );
 }
 
+sub ticket_priority {
+  my %values;
+  foreach ( $cgi->param ) {
+    if ( /^ticket(\d+)$/ ) {
+      # a 'ticket1001' param implies the existence of a 'priority1001' param
+      # but if that's empty, we need to send it as empty rather than forget
+      # it.
+      $values{$1} = $cgi->param("priority$1") || '';
+    }
+  }
+  $action = 'myaccount';
+  # this returns an updated customer_info for myaccount
+  adjust_ticket_priority( 'session_id' => $session_id,
+                          'values'     => \%values );
+}
+
 sub customer_order_pkg {
   my $init_data = signup_info( 'customer_session_id' => $session_id );
   return $init_data if ( $init_data->{'error'} );
@@ -454,7 +476,21 @@ sub process_order_recharge {
 }
 
 sub make_payment {
-  payment_info( 'session_id' => $session_id );
+
+  my $payment_info = payment_info( 'session_id' => $session_id );
+
+  my $tr_amount_fee = mason_comp(
+    'session_id' => $session_id,
+    'comp'       => '/elements/tr-amount_fee.html',
+    'args'       => [ 'amount' => $payment_info->{'balance'},
+                    ],
+  );
+
+  $tr_amount_fee = $tr_amount_fee->{'error'} || $tr_amount_fee->{'output'};
+
+  $payment_info->{'tr_amount_fee'} = $tr_amount_fee;
+
+  $payment_info;
 }
 
 sub payment_results {
@@ -471,7 +507,7 @@ sub payment_results {
 
   my $payinfo = $cgi->param('payinfo');
   $payinfo =~ s/[^\dx]//g;
-  $payinfo =~ /^([\dx]{13,16})$/
+  $payinfo =~ /^([\dx]{13,16}|[\dx]{8,9})$/
     #or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
     or die "illegal card"; #!!!
   $payinfo = $1;
@@ -631,12 +667,15 @@ sub make_thirdparty_payment {
 }
 
 sub post_thirdparty_payment {
-  $cgi->param('payby_method') =~ /^(CC|ECHECK)$/
+  $cgi->param('payby_method') =~ /^(CC|ECHECK|PAYPAL)$/
     or die "illegal payby method";
   my $method = $1;
   $cgi->param('amount') =~ /^(\d+(\.\d*)?)$/
     or die "illegal amount";
   my $amount = $1;
+  # realtime_collect() returns the result from FS::cust_main->realtime_collect
+  # which returns realtime_bop()
+  # which returns a hashref of popup_url, collectitems, and reference
   my $result = realtime_collect( 
     'session_id' => $session_id,
     'method' => $method, 
@@ -700,7 +739,7 @@ sub provision_svc {
 
   my $result = part_svc_info(
     'session_id' => $session_id,
-    map { $_ => $cgi->param($_) } qw( pkgnum svcpart ),
+    map { $_ => $cgi->param($_) } qw( pkgnum svcpart svcnum ),
   );
   die $result->{'error'} if exists $result->{'error'} && $result->{'error'};
 
@@ -734,7 +773,7 @@ sub process_svc_phone {
 	    'session_id' => $session_id,
 	    'bulkdid' => [ @bulkdid ],
 	    'countrycode' => '1',
-	     map { $_ => $cgi->param($_) } qw( pkgnum svcpart phonenum )
+	     map { $_ => $cgi->param($_) } qw( pkgnum svcpart phonenum svcnum email forwarddst )
 	);
     }
 
@@ -743,7 +782,7 @@ sub process_svc_phone {
 	return {
 	  $cgi->Vars,
 	  %{ part_svc_info( 'session_id' => $session_id,
-                        map { $_ => $cgi->param($_) } qw( pkgnum svcpart )
+                        map { $_ => $cgi->param($_) } qw( pkgnum svcpart svcnum )
 	      )
 	  },
 	  'error' => $result->{'error'},
@@ -796,18 +835,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 {
@@ -816,6 +876,7 @@ sub view_cdr_details {
     'svcnum'      => $cgi->param('svcnum'),
     'beginning'   => $cgi->param('beginning') || '',
     'ending'      => $cgi->param('ending') || '',
+    'inbound'     => $cgi->param('inbound') || 0,
   );
 }
 
@@ -878,15 +939,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 +957,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,