X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=86455a4774c5d028aef8d6b84484a54fd533d15f;hp=cf2519ec02926077e58963f18fd4ee151438b230;hb=d220c8a4bfa1aee8f17ed71c2dba655160dd3595;hpb=453f8ffb1b1b54998c208ec49a8284394b2727bf

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index cf2519ec0..86455a477 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -5,16 +5,21 @@
 
 use strict;
 use IO::Handle;
+use Tie::RefHash;
 use FS::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup);
-use FS::Record qw(qsearchs);
+use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
 
-use vars qw( $opt );
+use vars qw( $opt $Debug );
+
+$Debug = 0;
+
+my @payby = qw(CARD PREPAY);
 
 my $user = shift or die &usage;
-adminsuidsetup $user; 
+&adminsuidsetup( $user ); 
 
 my $machine = shift or die &usage;
 
@@ -24,19 +29,23 @@ my $pkgpart = $agent->pkgpart_hashref;
 
 my $refnum = shift or die &usage;
 
-$SIG{CHLD} = sub { wait() };
+#causing trouble for some folks
+#$SIG{CHLD} = sub { wait() };
 
 my($fs_signupd)="/usr/local/sbin/fs_signupd";
 
 while (1) {
   my($reader,$writer)=(new IO::Handle, new IO::Handle);
   $writer->autoflush(1);
-  sshopen2($shellmachine,$reader,$writer,$fs_signupd);
+  warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
+  sshopen2($machine,$reader,$writer,$fs_signupd);
+
+  my $data;
 
-  #send fs_signupd state/county/country
-  @my cust_main_county = qsearch('cust_main_county', {} );
-  print $writer join("\n",
-    scalar(@cust_main_county) || die "no tax rates (cust_main_county records)",
+  warn "[fs_signup_server] Sending locales...\n" if $Debug;
+  my @cust_main_county = qsearch('cust_main_county', {} );
+  print $writer $data = join("\n",
+    ( scalar(@cust_main_county) || die "no tax rates (cust_main_county records)" ),
     map {
       $_->taxnum,
       $_->state,
@@ -44,38 +53,46 @@ while (1) {
       $_->country,
     } @cust_main_county
   ),"\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
-  #send fs_signupd package definitions
+  warn "[fs_signup_server] Sending package definitions...\n" if $Debug;
   my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
     qsearch( 'part_pkg', {} );
-  print $writer join("\n",
-    scalar(@part_pkg) || die "no usable package definitions, agent $agentnum",
+  print $writer $data = join("\n",
+    ( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
     map {
       $_->pkgpart,
       $_->pkg,
     } @part_pkg
   ), "\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
-  #send fs_signupd POPs
+  warn "[fs_signup_server] Sending POPs...\n" if $Debug;
   my @svc_acct_pop = qsearch ('svc_acct_pop',{} );
-  print $writer join("\n",
-    scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)",
+  print $writer $data = join("\n",
+    ( scalar(@svc_acct_pop) || die "No points of presence (svc_acct_pop records)" ),
     map {
       $_->popnum,
       $_->city,
       $_->state,
       $_->ac,
       $_->exch,
+      $_->loc,
     } @svc_acct_pop
   ), "\n";
+  warn "[fs_signup_server] $data\n" if $Debug > 2;
 
+  warn "[fs_signup_server] Entering main loop...\n" if $Debug;
   while (1) {
+    warn "[fs_signup_server] Reading (waiting for) signup data...\n" if $Debug;
     chop( my(
       $first, $last, $ss, $company, $address1, $address2, $city, $county,
       $state, $zip, $country, $daytime, $night, $fax, $payby, $payinfo,
       $paydate, $payname, $invoicing_list, $pkgpart, $username, $password,
       $popnum,
-    ) = <$reader> );
+    ) = map { scalar(<$reader>) } ( 1 .. 23 ) );
+
+    warn "[fs_signup_server] Processing signup...\n" if $Debug;
 
     my $error = '';
 
@@ -105,17 +122,21 @@ while (1) {
       'payname'  => $payname,
     } );
 
+    $error = "Illegal payment type" unless grep { $_ eq $payby } @payby;
+
     my @invoicing_list = split( /\s*\,\s*/, $invoicing_list );
 
     $error ||= $cust_main->check_invoicing_list( \@invoicing_list );
 
     my $part_pkg = qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
-      or die "unknown pkgpart $pkgpart";
-    my $svcpart = $part_pkg->svcpart;
+      or $error ||= "WARNING: unknown pkgpart $pkgpart";
+    my $svcpart = $part_pkg->svcpart unless $error;
 
     # this should wind up in FS::cust_pkg!
-    die "agent $agentnum can't purchase pkgpart $pkgpart"
-      unless $pkgpart->{ $pkgpart };
+    my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
+    my $pkgpart_href = $agent->pkgpart_hashref;
+    $error ||= "WARNING: agent $agentnum can't purchase pkgpart $pkgpart"
+      unless $pkgpart_href->{ $pkgpart };
 
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
@@ -123,7 +144,7 @@ while (1) {
     } );
     $error ||= $cust_pkg->check;
 
-    $svc_acct = new FS::svc_acct ( {
+    my $svc_acct = new FS::svc_acct ( {
       'svcpart'   => $svcpart,
       'username'  => $username,
       '_password' => $password,
@@ -140,17 +161,21 @@ while (1) {
 
     $error ||= $svc_acct->check;
 
-    $error ||= $cust_main->insert;
-    if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
-                                   #be definied, but....
-      $cust_pkg->custnum( $new->custnum );
-      $error ||= $cust_pkg->insert; 
-      warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
-      $svc_acct->pkgnum( $cust_pkg->pkgnum );
-      $error ||= $svc_acct->insert;
-      warn "WARNING: $error on pre-checked svc_acct record!" if $error;
-    }
-
+    use Tie::RefHash;
+    tie my %hash, 'Tie::RefHash';
+    %hash = { $cust_pkg => [ $svc_acct ] };
+    $error ||= $cust_main->insert( \%hash );
+    #if ( $cust_pkg && ! $error ) { #in this case, $cust_pkg should always
+    #                               #be definied, but....
+    #  $cust_pkg->custnum( $cust_main->custnum );
+    #  $error ||= $cust_pkg->insert; 
+    #  warn "WARNING: $error on pre-checked cust_pkg record!" if $error;
+    #  $svc_acct->pkgnum( $cust_pkg->pkgnum );
+    #  $error ||= $svc_acct->insert;
+    #  warn "WARNING: $error on pre-checked svc_acct record!" if $error;
+    #}
+
+    warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
     $cust_main->invoicing_list( \@invoicing_list ) unless $error;
@@ -158,7 +183,7 @@ while (1) {
   }
   close $writer;
   close $reader;
-  warn "connection to $shellmachine lost!  waiting 60 seconds...\n";
+  warn "connection to $machine lost!  waiting 60 seconds...\n";
   sleep 60;
   warn "reconnecting...\n";
 }