X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=38ad5583f710d8c9bce8441a060d18845810489e;hb=3b84b516aa0e5e56d9fad2d7b0100ef2fd964d12;hp=5dfa0e88f1be0aee2bb9b96daf4c862e3b8623e1;hpb=5d1b7f1ec392d0c4a3c48c8fcd046f72c5d9b9b5;p=freeside.git

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 5dfa0e88f..38ad5583f 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'),
@@ -113,7 +127,7 @@ while (1) {
     # common that are still here and library them.
     my $cust_main = new FS::cust_main ( {
       #'custnum'          => '',
-      'agentnum'         => $signup-data->{agentnum} || $agentnum,
+      'agentnum'         => $signup_data->{agentnum} || $agentnum,
       'refnum'           => $refnum,
 
       map { $_ => $signup_data->{$_} } qw(
@@ -165,8 +179,12 @@ while (1) {
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
-    if ( $conf->config('signup_server-realtime') ) {
-      
+    next if $error;
+
+    if ( $conf->exists('signup_server-realtime') ) {
+
+      warn "[fs_signup_server] Billing customer...\n" if $Debug;
+
       my $bill_error = $cust_main->bill;
       warn "[fs_signup_server] error billing new customer: $bill_error"
         if $bill_error;
@@ -184,12 +202,13 @@ while (1) {
       }
     }
 
-    if ( $error && $conf->config('signup_server-email') ) {
+    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 ( [