add email address to shellcommands

7 files changed, 27 insertions, 24 deletions

diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index 04e5041c3..3d3e88ea4 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -39,6 +39,9 @@ sub _export_command {
     no strict 'refs';
     ${$_} = $svc_acct->getfield($_) foreach $svc_acct->fields;
   }
+  $email = ( grep { $_ ne 'POST' }
+             $svc_acct->cust_svc->cust_pkg->cust_main->invoicing_list
+             )[0];
   $finger = shell_quote $finger;
   $quoted_password = shell_quote $_password;
   $domain = $svc_acct->domain;
diff --git a/FS/bin/freeside-setup b/FS/bin/freeside-setup
index 133d248b8..78a03385c 100755
--- a/FS/bin/freeside-setup
+++ b/FS/bin/freeside-setup
@@ -547,7 +547,7 @@ sub tables_hash_hack {
         '_date',    @date_type,
         'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
                                          # payment type table.
-        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
+        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
         'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
         'closed',    'char', 'NULL', 1,
       ],
@@ -624,7 +624,7 @@ sub tables_hash_hack {
         'reason',       'varchar',   '',   $char_d,
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
-        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
+        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
         'paybatch',     'varchar',   'NULL', $char_d,
         'closed',    'char', 'NULL', 1,
       ],
@@ -823,12 +823,10 @@ sub tables_hash_hack {
       'columns' => [
         'recnum',    'int',     '',  '',
         'svcnum',    'int',     '',  '',
-        #'reczone',   'varchar', '',  $char_d,
-        'reczone',   'varchar', '',  255,
+        'reczone',   'varchar', '',  $char_d,
         'recaf',     'char',    '',  2,
         'rectype',   'char',    '',  5,
-        #'recdata',   'varchar', '',  $char_d,
-        'recdata',   'varchar', '',  255,
+        'recdata',   'varchar', '',  $char_d,
       ],
       'primary_key' => 'recnum',
       'unique'      => [],
diff --git a/bin/bind.export b/bin/bind.export
index 943aefbb0..63fb0f60c 100755
--- a/bin/bind.export
+++ b/bin/bind.export
@@ -39,7 +39,7 @@ foreach my $export ( @exports ) {
     or die "can't open $prefix/named.conf: $!";
 
   open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!";
+    or die "can't open $prefix/named.conf.HEADER: $!"
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
@@ -139,7 +139,7 @@ foreach my $sexport ( @sexports ) { #false laziness with above
     or die "can't open $prefix/named.conf: $!";
 
   open(CONF_HEADER,"<$prefix/named.conf.HEADER")
-    or die "can't open $prefix/named.conf.HEADER: $!";
+    or die "can't open $prefix/named.conf.HEADER: $!"
   while (<CONF_HEADER>) { print NAMED_CONF $_; }
   close CONF_HEADER;
 
diff --git a/bin/fs-setup b/bin/fs-setup
index 7cfaafa4b..cf85ebb88 100755
--- a/bin/fs-setup
+++ b/bin/fs-setup
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: fs-setup,v 1.96.4.3 2002-11-20 09:07:30 ivan Exp $
+# $Id: fs-setup,v 1.96.4.4 2002-12-14 11:16:04 steve Exp $
 
 #to delay loading dbdef until we're ready
 BEGIN { $FS::Record::setup_hack = 1; }
@@ -545,7 +545,7 @@ sub tables_hash_hack {
         '_date',    @date_type,
         'payby',    'char',   '',     4, # CARD/BILL/COMP, should be index into
                                          # payment type table.
-        'payinfo',  'varchar',   'NULL', $char_d,  #see cust_main above
+        'payinfo',  'varchar',   'NULL', 16,  #see cust_main above
         'paybatch', 'varchar',   'NULL', $char_d, #for auditing purposes.
         'closed',    'char', 'NULL', 1,
       ],
@@ -622,7 +622,7 @@ sub tables_hash_hack {
         'reason',       'varchar',   '',   $char_d,
         'payby',        'char',   '',     4, # CARD/BILL/COMP, should be index
                                              # into payment type table.
-        'payinfo',      'varchar',   'NULL', $char_d,  #see cust_main above
+        'payinfo',      'varchar',   'NULL', 16,  #see cust_main above
         'paybatch',     'varchar',   'NULL', $char_d,
         'closed',    'char', 'NULL', 1,
       ],
@@ -821,12 +821,10 @@ sub tables_hash_hack {
       'columns' => [
         'recnum',    'int',     '',  '',
         'svcnum',    'int',     '',  '',
-        #'reczone',   'varchar', '',  $char_d,
-        'reczone',   'varchar', '',  255,
+        'reczone',   'varchar', '',  $char_d,
         'recaf',     'char',    '',  2,
         'rectype',   'char',    '',  5,
-        #'recdata',   'varchar', '',  $char_d,
-        'recdata',   'varchar', '',  255,
+        'recdata',   'varchar', '',  $char_d,
       ],
       'primary_key' => 'recnum',
       'unique'      => [],
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 9019ea4f8..da9a9fa06 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -22,7 +22,16 @@ $socket =  "/usr/local/freeside/selfservice_socket";
   'login'         => 'MyAccount/login',
   'customer_info' => 'MyAccount/customer_info',
   'invoice'       => 'MyAccount/invoice',
+  'start'         => 'MyAccount/start',
+  'update'        => 'MyAccount/update',
+  'collect'       => 'MyAccount/collect',
+  'cancel'        => 'MyAccount/cancel',
+  'uncancel'      => 'MyAccount/uncancel',
+  'getinfo'       => 'MyAccount/getinfo',
+  'charge'        => 'MyAccount/charge',
+  'new_customer'  => 'MyAccount/new_customer',
 );
+
 @EXPORT_OK = keys %autoload;
 
 $ENV{'PATH'} ='/usr/bin:/usr/ucb:/bin';
diff --git a/fs_selfservice/freeside-selfservice-server b/fs_selfservice/freeside-selfservice-server
index e55ca4984..c167c7a4a 100644
--- a/fs_selfservice/freeside-selfservice-server
+++ b/fs_selfservice/freeside-selfservice-server
@@ -19,6 +19,7 @@ use Net::SSH qw(sshopen2);
 use FS::UID qw(adminsuidsetup forksuidsetup);
 use FS::ClientAPI;
 
+$ENV{SELFSERVICE_SERVER} = 'TRUE';
 $Debug = 2; # >= 2 will log packet contents, including potentially compromising
             # information
 
diff --git a/fs_signup/fs_signup_server b/fs_signup/fs_signup_server
index e0fa9ba5f..27dc4115c 100755
--- a/fs_signup/fs_signup_server
+++ b/fs_signup/fs_signup_server
@@ -18,6 +18,7 @@ use FS::Msgcat qw(gettext);
 
 use vars qw( $opt $Debug );
 
+$ENV{SIGNUP_SERVER} = 'TRUE';
 $Debug = 2;
 
 my $user = shift or die &usage;
@@ -94,11 +95,7 @@ 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',
+    ) }
 
   };
 
@@ -136,7 +133,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
       ),
 
     } );
@@ -144,9 +141,6 @@ 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 '' =~ /^()$/;