- add init file installation to Makefile, add unified init file

[freeside.git] / fs_signup / fs_signup_server

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 0583887..1618cf1 100755 (executable)
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -67,7 +67,8 @@ while (1) {
       
     'part_pkg' =>
       [
-        map { $_->hashref }
+        #map { $_->hashref }
+        map { { 'payby' => [ $_->payby ], %{$_->hashref} } }
           grep { $_->svcpart('svc_acct') && $pkgpart_href->{ $_->pkgpart } }
             qsearch( 'part_pkg', { 'disabled' => '' } )
       ],
@@ -165,8 +166,12 @@ while (1) {
     warn "[fs_signup_server] Sending results...\n" if $Debug;
     print $writer $error, "\n";
 
+    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,7 +189,7 @@ 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