#
use strict;
+use vars qw($pid);
use IO::Handle;
use Storable qw(nstore_fd fd_retrieve);
use Tie::RefHash;
use FS::Record qw( qsearch qsearchs );
use FS::cust_main_county;
use FS::cust_main;
-use FS::msgcat qw(gettext);
+use FS::Msgcat qw(gettext);
use vars qw( $opt $Debug );
#causing trouble for some folks
#$SIG{CHLD} = sub { wait() };
+$SIG{HUP} = \&killssh;
+$SIG{INT} = \&killssh;
+$SIG{QUIT} = \&killssh;
+$SIG{TERM} = \&killssh;
+$SIG{PIPE} = \&killssh;
+sub killssh { kill 'TERM', $pid if $pid; exit; };
+
my($fs_signupd)="/usr/local/sbin/fs_signupd";
while (1) {
my($reader,$writer)=(new IO::Handle, new IO::Handle);
#seems to be broken - calling ->flush explicitly# $writer->autoflush(1);
warn "[fs_signup_server] Connecting to $machine...\n" if $Debug;
- sshopen2($machine,$reader,$writer,$fs_signupd);
+ $pid = sshopen2($machine,$reader,$writer,$fs_signupd);
my @pops = qsearch('svc_acct_pop',{} );
my $init_data = {
'part_pkg' =>
[
- map { $_->hashref }
+ #map { $_->hashref }
+ map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
qsearch( 'part_pkg', { 'disabled' => '' } )
],
+ 'agentnum2part_pkg' =>
+ {
+ map {
+ my $href = $_->pkgpart_hashref;
+ $_->agentnum =>
+ [
+ map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
+ grep { $_->svcpart('svc_acct') && $href->{ $_->pkgpart } }
+ qsearch( 'part_pkg', { 'disabled' => '' } )
+ ];
+ } qsearch('agent', {} )
+ },
+
'svc_acct_pop' => [ map { $_->hashref } @pops ],
'security_phrase' => $conf->exists('security_phrase'),
# common that are still here and library them.
my $cust_main = new FS::cust_main ( {
#'custnum' => '',
- 'agentnum' => $agentnum,
+ 'agentnum' => $signup_data->{agentnum} || $agentnum,
'refnum' => $refnum,
map { $_ => $signup_data->{$_} } qw(
or $error ||= "WARNING: unknown pkgpart ". $signup_data->{pkgpart};
my $svcpart = $part_pkg->svcpart unless $error;
- # this should wind up in FS::cust_pkg!
- my $agent = qsearchs( 'agent', { 'agentnum' => $agentnum } );
- #my $pkgpart_href = $agent->pkgpart_hashref;
- $error ||= "WARNING: agent $agentnum can't purchase pkgpart ".
- $signup_data->{pkgpart}
- unless $pkgpart_href->{ $signup_data->{pkgpart} };
-
my $cust_pkg = new FS::cust_pkg ( {
#later#'custnum' => $custnum,
'pkgpart' => $signup_data->{'pkgpart'},
%hash = ( $cust_pkg => [ $svc_acct ] );
$error ||= $cust_main->insert( \%hash, \@invoicing_list ); #msgcat
- warn "[fs_signup_server] Sending results...\n" if $Debug;
- print $writer $error, "\n";
+ if ( ! $error && $conf->exists('signup_server-realtime') ) {
+
+ warn "[fs_signup_server] Billing customer...\n" if $Debug;
- if ( $conf->config('signup_server-realtime') ) {
-
my $bill_error = $cust_main->bill;
warn "[fs_signup_server] error billing new customer: $bill_error"
if $bill_error;
warn "[fs_signup_server] error collecting from new customer: $bill_error"
if $bill_error;
- if ( $cust_main->balance ) {
+ if ( $cust_main->balance > 0 ) {
#should check list for errors...
- $cust_main->suspend;
+ #$cust_main->suspend;
+ $cust_main->cancel;
}
}
- if ( $error && $conf->config('signup_server-email') ) {
+ $error ||= '_decline';
+
+ warn "[fs_signup_server] Sending results...\n" if $Debug;
+ print $writer $error, "\n";
+
+ next if $error;
+
+ if ( $conf->config('signup_server-email') ) {
warn "[fs_signup_server] Sending email...\n" if $Debug;
#false laziness w/FS::cust_bill::send & FS::cust_pay::delete
use Mail::Header;
use Mail::Internet;
+ use Date::Format;
my $from = $conf->config('invoice_from'); #??? as good as any
$ENV{MAILADDRESS} = $from;
my $header = new Mail::Header ( [
'Agent : '. $cust_main->agent->agent. "\n",
"\n",
];
- if ( $cust_main->balance ) {
+ if ( $cust_main->balance > 0 ) {
push @$body,
"This customer has an outstanding balance and has been suspended.\n";
}