X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fselfservice.cgi;h=f7fe308cf2948af2be81b8b1db1d8f87228a5e8b;hb=0832972047a36d19ffcf7d1462abc48de7045d3d;hp=58f2d0f1be891bf0529123938a6bce8ad496c83a;hpb=12f4cc4b100b849de3584d5d1a2376cebcd8729f;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 58f2d0f1b..f7fe308cf
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -476,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 {
@@ -493,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;
@@ -722,7 +736,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'};
 
@@ -756,7 +770,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 )
 	);
     }
 
@@ -765,7 +779,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'},
@@ -829,7 +843,7 @@ sub real_port_graph {
 	    'session_id'  => $session_id,
 	    'svcnum'      => $svcnum,
 	    'beginning'	  => str2time($cgi->param('start')." 00:00:00"),
-	    'ending'	=> str2time($cgi->param('end')." 23:59:59"),
+	    'ending'	  => str2time($cgi->param('end')  ." 23:59:59"),
 	    );
     my @usage = @{$res->{'usage'}};
     my $png = $usage[0]->{'png'};
@@ -859,6 +873,7 @@ sub view_cdr_details {
     'svcnum'      => $cgi->param('svcnum'),
     'beginning'   => $cgi->param('beginning') || '',
     'ending'      => $cgi->param('ending') || '',
+    'inbound'     => $cgi->param('inbound') || 0,
   );
 }