use strict;
use IO::Handle;
-use FS::SSH qw(sshopen2);
+use Tie::RefHash;
+use Net::SSH qw(sshopen2);
use FS::UID qw(adminsuidsetup);
use FS::Record qw( qsearch qsearchs );
use FS::cust_main_county;
$Debug = 0;
-my @payby = qw(CARD);
+my @payby = qw(CARD PREPAY);
my $user = shift or die &usage;
&adminsuidsetup( $user );
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";
warn "[fs_signup_server] Sending package definitions...\n" if $Debug;
my @part_pkg = grep { $_->svcpart('svc_acct') && $pkgpart->{ $_->pkgpart } }
- qsearch( 'part_pkg', {} );
+ qsearch( 'part_pkg', { 'disabled' => '' } );
print $writer $data = join("\n",
( scalar(@part_pkg) || die "no usable package definitions, agent $agentnum" ),
map {
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,
- ) = map { scalar(<$reader>) } ( 1 .. 23 ) );
+ $paydate, $payname, $invoicing_list, $referral_custnum,
+ $pkgpart, $username, $password, $popnum,
+ ) = map { scalar(<$reader>) } ( 1 .. 24 ) );
warn "[fs_signup_server] Processing signup...\n" if $Debug;
#shares some stuff with htdocs/edit/process/cust_main.cgi... take any
# common that are still here and library them.
my $cust_main = new FS::cust_main ( {
- 'custnum' => '',
- 'agentnum' => $agentnum,
- 'refnum' => $refnum,
- 'last' => $last,
- 'first' => $first,
- 'ss' => $ss,
- 'company' => $company,
- 'address1' => $address1,
- 'address2' => $address2,
- 'city' => $city,
- 'county' => $county,
- 'state' => $state,
- 'zip' => $zip,
- 'country' => $country,
- 'daytime' => $daytime,
- 'night' => $night,
- 'fax' => $fax,
- 'payby' => $payby,
- 'payinfo' => $payinfo,
- 'paydate' => $paydate,
- 'payname' => $payname,
+ 'custnum' => '',
+ 'agentnum' => $agentnum,
+ 'refnum' => $refnum,
+ 'last' => $last,
+ 'first' => $first,
+ 'ss' => $ss,
+ 'company' => $company,
+ 'address1' => $address1,
+ 'address2' => $address2,
+ 'city' => $city,
+ 'county' => $county,
+ 'state' => $state,
+ 'zip' => $zip,
+ 'country' => $country,
+ 'daytime' => $daytime,
+ 'night' => $night,
+ 'fax' => $fax,
+ 'payby' => $payby,
+ 'payinfo' => $payinfo,
+ 'paydate' => $paydate,
+ 'payname' => $payname,
+ 'referral_custnum' => $referral_custnum,
} );
$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 $error ||= "WARNING: unknown pkgpart $pkgpart";
my $svcpart = $part_pkg->svcpart unless $error;
$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( $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;
- }
+ use Tie::RefHash;
+ tie my %hash, 'Tie::RefHash';
+ %hash = ( $cust_pkg => [ $svc_acct ] );
+ $error ||= $cust_main->insert( \%hash, \@invoicing_list );
warn "[fs_signup_server] Sending results...\n" if $Debug;
print $writer $error, "\n";
- $cust_main->invoicing_list( \@invoicing_list ) unless $error;
-
}
close $writer;
close $reader;