X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=d6eb4a8d554bfcbba64741f35b4b658a42840954;hp=65d530e680efc3aa06ee7d98a97f85de1d2706e5;hb=d2f3aff3c7fc373c9501d5b86d6c8fa8fd2e97ff;hpb=a1e5529209c50a7b281e19c57f903f311e2adeef

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 65d530e68..d6eb4a8d5 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -14,6 +14,8 @@ use FS::Conf;
 use FS::Record qw( qsearch qsearchs );
 use FS::cust_main_county;
 use FS::cust_main;
+use FS::cust_bill;
+use FS::cust_pkg;
 use FS::Msgcat qw(gettext);
 
 use vars qw( $opt $Debug );
@@ -25,6 +27,11 @@ my $user = shift or die &usage;
 
 my $conf = new FS::Conf;
 
+if ($conf->exists('signup_server-quiet')) {
+    $FS::cust_bill::quiet = 1;
+    $FS::cust_pkg::quiet = 1;
+}
+
 #my @payby = qw(CARD PREPAY);
 my @payby = $conf->config('signup_server-payby');
 my $smtpmachine = $conf->config('smtpmachine');
@@ -94,7 +101,11 @@ while (1) {
 
     'msgcat' => { map { $_=>gettext($_) } qw(
       passwords_dont_match invalid_card unknown_card_type not_a
-    ) }
+    ) },
+
+    'statedefault' => $conf->config('statedefault') || 'CA',
+
+    'countrydefault' => $conf->config('countrydefault') || 'US',
 
   };
 
@@ -132,7 +143,7 @@ while (1) {
 
       map { $_ => $signup_data->{$_} } qw(
         last first ss company address1 address2 city county state zip country
-        daytime night fax payby payinfo paydate payname referral_custnum
+        daytime night fax payby payinfo paydate payname referral_custnum comments
       ),
 
     } );
@@ -140,6 +151,9 @@ while (1) {
     $error ||= "Illegal payment type"
       unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
+    $cust_main->payinfo($cust_main->daytime)
+      if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
+
     my @invoicing_list = split( /\s*\,\s*/, $signup_data->{'invoicing_list'} );
 
     $signup_data->{'pkgpart'} =~ /^(\d+)$/ or '' =~ /^()$/;
@@ -148,7 +162,7 @@ while (1) {
     my $part_pkg =
       qsearchs( 'part_pkg', { 'pkgpart' => $pkgpart } )
         or $error ||= "WARNING: unknown pkgpart: $pkgpart";
-    my $svcpart = $part_pkg->svcpart unless $error;
+    my $svcpart = $part_pkg->svcpart('svc_acct') unless $error;
 
     my $cust_pkg = new FS::cust_pkg ( {
       #later#'custnum' => $custnum,
@@ -188,9 +202,15 @@ while (1) {
         if $bill_error;
 
       if ( $cust_main->balance > 0 ) {
+
+        #this makes sense.  credit is "un-doing" the invoice
+        $cust_main->credit( $cust_main->balance, 'signup server decline' );
+        $cust_main->apply_credits;
+
         #should check list for errors...
         #$cust_main->suspend;
         $cust_main->cancel;
+
         $error = '_decline';
       }
     }
@@ -221,15 +241,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 )