X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_selfservice%2FFS-SelfService%2Fcgi%2Fagent.cgi;h=0af94cd9e8916f3224cfcf8bd218abc4b6043b9b;hb=9db30264ee0ce0f05632c1ed0b3e8dbdd03f7bc2;hp=b887098621ac78c5be59729043c028ddd9c8cbae;hpb=0cbeb01df08457b056a7ae775b4924c266b4228b;p=freeside.git

diff --git a/fs_selfservice/FS-SelfService/cgi/agent.cgi b/fs_selfservice/FS-SelfService/cgi/agent.cgi
old mode 100644
new mode 100755
index b88709862..0af94cd9e
--- a/fs_selfservice/FS-SelfService/cgi/agent.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/agent.cgi
@@ -1,3 +1,4 @@
+#!/usr/bin/perl -T
 #!/usr/bin/perl -Tw
 
 #some false laziness w/selfservice.cgi
@@ -14,7 +15,8 @@ use FS::SelfService qw( agent_login agent_logout agent_info
                         agent_list_customers
                         signup_info new_customer
                         customer_info list_pkgs order_pkg
-                        part_svc_info provision_acct unprovision_svc
+                        part_svc_info provision_acct provision_external
+                        unprovision_svc
                       );
 
 $DEBUG = 0;
@@ -67,7 +69,7 @@ $session_id = $cgi->param('session');
 
 warn "$me checking action\n" if $DEBUG;
 $cgi->param('action') =~
-   /^(agent_main|signup|process_signup|list_customers|view_customer|agent_provision|provision_svc|process_svc_acct|delete_svc|agent_order_pkg|process_order_pkg|logout)$/
+   /^(agent_main|signup|process_signup|list_customers|view_customer|agent_provision|provision_svc|process_svc_acct|process_svc_external|delete_svc|agent_order_pkg|process_order_pkg|logout)$/
   or die "unknown action ". $cgi->param('action');
 my $action = $1;
 
@@ -112,7 +114,7 @@ sub process_signup {
 
   my $error = '';
 
-  #some false laziness w/signup.cgi
+  #false laziness w/signup.cgi, identical except for agentnum vs session_id
   my $payby = $cgi->param('payby');
   if ( $payby eq 'CHEK' || $payby eq 'DCHK' ) {
     #$payinfo = join('@', map { $cgi->param( $payby. "_payinfo$_" ) } (1,2) );
@@ -148,7 +150,7 @@ sub process_signup {
     my $payinfo = $cgi->param('payinfo');
     $payinfo =~ s/\D//g;
 
-    $payinfo =~ /^(\d{13,16})$/
+    $payinfo =~ /^(\d{13,16}|\d{8,9})$/
       or $error ||= $init_data->{msgcat}{invalid_card}; #. $self->payinfo;
     $payinfo = $1;
     validate($payinfo)
@@ -160,17 +162,25 @@ sub process_signup {
   unless ( $error ) {
     my $rv = new_customer ( {
       'session_id'       => $session_id,
-      map { $_ => $cgi->param($_) }
+      map { $_ => scalar($cgi->param($_)) }
         qw( last first ss company
             address1 address2 city county state zip country
             daytime night fax
+
+            ship_last ship_first ship_company
+            ship_address1 ship_address2 ship_city ship_county ship_state
+              ship_zip ship_country
+            ship_daytime ship_night ship_fax
+
             payby payinfo paycvv paydate payname invoicing_list
+            referral_custnum promo_code reg_code
             pkgpart username sec_phrase _password popnum refnum
           ),
         grep { /^snarf_/ } $cgi->param
     } );
     $error = $rv->{'error'};
   }
+  #eslaf
 
   if ( $error ) { 
     $action = 'signup';
@@ -184,7 +194,7 @@ sub process_signup {
   } else {
     $action = 'agent_main';
     my $agent_info = agent_info( 'session_id' => $session_id );
-    $agent_info->{'message'} = 'Signup sucessful';
+    $agent_info->{'message'} = 'Signup successful';
     $agent_info;
   }
 
@@ -315,12 +325,32 @@ sub process_svc_acct {
     $action = 'agent_provision';
     return {
       %{agent_provision()},
-      'message' => $result->{'svc'}. ' setup sucessfully.',
+      'message' => $result->{'svc'}. ' setup successfully.',
     };
   }
 
 }
 
+sub process_svc_external {
+
+  my $result = provision_external (
+    'agent_session_id' => $session_id,
+    map { $_ => $cgi->param($_) } qw( custnum pkgnum svcpart )
+  );
+
+  #warn "$result $result->{'error'}"; 
+  $action = 'agent_provision';
+  return {
+    %{agent_provision()},
+    'message' => $result->{'error'}
+                   ? '<FONT COLOR="#FF0000">'. $result->{'error'}. '</FONT>'
+                   : $result->{'svc'}. ' setup successfully'.
+                     ': serial number '.
+                     sprintf('%010d', $result->{'id'}). '-'. $result->{'title'}
+  };
+
+}
+
 sub delete_svc {
   my $result = unprovision_svc(
     'agent_session_id' => $session_id,
@@ -374,7 +404,7 @@ sub process_order_pkg {
     #$cgi->delete( grep { $_ ne 'custnum' } $cgi->param );
     return {
       %{view_customer()},
-      'message' => 'Package order sucessful.',
+      'message' => 'Package order successful.',
     };
   }
 
@@ -388,7 +418,8 @@ sub do_template {
   #warn join(' / ', map { "$_=>".$fill_in->{$_} } keys %$fill_in). "\n";
 
   $cgi->delete_all();
-  $fill_in->{'selfurl'} = $cgi->self_url;
+  $fill_in->{'selfurl'} = $cgi->self_url; #OLD
+  $fill_in->{'self_url'} = $cgi->self_url;
   $fill_in->{'cgi'} = \$cgi;
 
   my $template = new Text::Template( TYPE    => 'FILE',