X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=fs_signup%2Ffs_signup_server;h=d6eb4a8d554bfcbba64741f35b4b658a42840954;hp=0f83ec31d69951ba80e925637b136868744f4421;hb=eb9668a6f3181ee02cb335272c5ee4616e61fd09;hpb=66c7798152b9abecd00727d4814af5c10bcc84b3

diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index 0f83ec31d..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,7 +151,7 @@ while (1) {
     $error ||= "Illegal payment type"
       unless grep { $_ eq $signup_data->{'payby'} } @payby;
 
-    $cust_main->payinfo = $cust_main->daytime
+    $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'} );
@@ -151,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,