X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=7f962e057d8b97dc98ad98ad1e54213a5d00f03f;hp=e8aa6ed64d00538052daf55ca77e86254055a841;hb=3ef62a0570055da710328937e7f65dbb2c027c62;hpb=ad10f79bef069f04afc7ebeffb98b26e7cd46c8f

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e8aa6ed64..7f962e057 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -142,9 +142,12 @@ while (1) {
 
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
 
+    $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
+    my $pkgpart = $1;
+
     my $part_pkg =
-      qsearchs( 'part_pkg', { 'pkgpart' => $signup_data->{'pkgpart'} } )
-        or $error ||= "WARNING: unknown pkgpart ". $signup_data->{pkgpart};
+      qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
+        or $error ||= "WARNING: unknown pkgpart: $pkgpart";
     my $svcpart = $part_pkg->svcpart unless $error;
 
     my $cust_pkg = new FS::cust_pkg ( {
@@ -202,7 +205,7 @@ while (1) {
 
       #false laziness w/FS::cust_bill::send & FS::cust_pay::delete
       use Mail::Header;
-      use Mail::Internet;
+      use Mail::Internet 1.44;
       use Date::Format;
       my $from = $conf->config('invoice_from'); #??? as good as any
       $ENV{MAILADDRESS} = $from;
@@ -218,15 +221,30 @@ while (1) {
         "This is an automatic message from your Freeside installation\n",
         "informing you a customer has signed up via the signup server:\n",
         "\n",
-        'custnum: '. $cust_main->custnum. "\n",
-        'Name   : '. $cust_main->last. ", ". $cust_main->first. "\n",
-        'Agent  : '. $cust_main->agent->agent. "\n",
+        'custnum     : '. $cust_main->custnum. "\n",
+        'Name        : '. $cust_main->last. ", ". $cust_main->first. "\n",
+        'Agent       : '. $cust_main->agent->agent. "\n",
+        'Package     : '. $part_pkg->pkg. ' - '. $part_pkg->comment. "\n",
+        'Signup Date : '. time2str('%C', time). "\n",
+        'Username    : '. $svc_acct->username. "\n",
+        #'Password    : '. # config file to turn this on if noment insists
+        'Day phone   : '. $cust_main->daytime. "\n",
+        'Night phone : '. $cust_main->night. "\n",
+        'Address     : '. $cust_main->address1. "\n",
+        ( $cust_main->address2
+            ? '              '. $cust_main->address2. "\n"
+            : ''                                           ),
+        '              '. $cust_main->city. ', '. $cust_main->state. '  '.
+                          $cust_main->zip. "\n",
+        ( $cust_main->country eq 'US'
+            ? ''
+            : '              '. $cust_main->country. "\n" ),
         "\n",
       ];
-      if ( $cust_main->balance > 0 ) {
-        push @$body,
-          "This customer has an outstanding balance and has been suspended.\n";
-      }
+      #if ( $cust_main->balance > 0 ) {
+      #  push @$body,
+      #    "This customer has an outstanding balance and has been suspended.\n";
+      #}
       my $message = new Mail::Internet ( 'Header' => $header, 'Body' => $body );
       $!=0;
       $message->smtpsend( Host => $smtpmachine )