X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=e7b372a4e0813e8ab3ad1777feefd61bd4c2127f;hb=1f93febd8c42aa344867d9f46601075ecf949ec4;hp=69a07f9c7a4d9bd128a1844bf886ed0306027948;hpb=6565b17f2bc8bff541854ad80578c502fd52134a;p=freeside.git

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 69a07f9c7..e7b372a4e 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -67,11 +67,25 @@ while (1) {
       
     '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'),
@@ -133,13 +147,6 @@ while (1) {
         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'},
@@ -162,11 +169,10 @@ while (1) {
     %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;
@@ -178,18 +184,27 @@ while (1) {
       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 ( [
@@ -209,7 +224,7 @@ while (1) {
         '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";
       }