X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FSignup.pm;h=df9ee88e56fd40f6eb24d61b26dee8c9e3024ce1;hb=9e0d1dacd8db275dff7f5827bc65b3f1531f8882;hp=8272b20850afe79a40269da0e18463d33ca2791a;hpb=e6cf968df114ffc735b1daf74f6259a81859c3f9;p=freeside.git

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 8272b2085..df9ee88e5 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -26,6 +26,7 @@ use FS::reg_code;
 use FS::payby;
 use FS::banned_pay;
 use FS::part_tag;
+use FS::cust_payby;
 
 $DEBUG = 1;
 $me = '[FS::ClientAPI::Signup]';
@@ -175,7 +176,7 @@ sub signup_info {
       'nomadix'            => $conf->exists('signup_server-nomadix'),
       'payby'              => [ $conf->config('signup_server-payby') ],
       'card_types'         => card_types(),
-      'paytypes'           => [ @FS::cust_main::paytypes ],
+      'paytypes'           => [ FS::cust_payby->paytypes ],
       'cvv_enabled'        => 1,
       'require_cvv'        => $conf->exists('signup-require_cvv'),
       'stateid_enabled'    => $conf->exists('show_stateid'),
@@ -533,18 +534,27 @@ sub new_customer {
     ( map { $_ => $packet->{$_} } qw(
             salesnum
             ss stateid stateid_state
-
-            payby
-            payinfo paycvv paydate payname paystate paytype
-            paystart_month paystart_year payissue
-            payip
-
+            locale
             referral_custnum comments
           )
     ),
 
   );
 
+  my %insert_options = ();
+  if ( $packet->{payby} =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
+    $insert_options{cust_payby} = [
+      new FS::cust_payby {
+        map { $_ => $packet->{$_} } qw(
+          payby
+          payinfo paycvv paydate payname paystate paytype
+          paystart_month paystart_year payissue
+          payip
+        ),
+      }
+    ];
+  }
+
   my $template_custnum = $conf->config('signup_server-prepaid-template-custnum');
   my $cust_main;
   if ( $template_custnum && $packet->{prepaid_shortform} ) {
@@ -635,15 +645,10 @@ sub new_customer {
     && ! $cust_main->paycvv
     && $conf->exists('signup-require_cvv');
 
-  $cust_main->payinfo($cust_main->daytime)
-    if $cust_main->payby eq 'LECB' && ! $cust_main->payinfo;
-
   my @invoicing_list = $packet->{'invoicing_list'}
                          ? split( /\s*\,\s*/, $packet->{'invoicing_list'} )
                          : ();
 
-  my %insert_options = ();
-
   my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
   my @tax_exempt = grep { $packet->{"tax_$_"} eq 'Y' } @exempt_groups;
   $insert_options{'tax_exemption'} = {
@@ -686,6 +691,9 @@ sub new_customer {
         map { $_ => $packet->{$_} }
           qw( username _password sec_phrase popnum domsvc ),
       };
+      
+      my $error = $svc->is_password_allowed($packet->{_password});
+      return { error => $error } if $error;
 
       my @acct_snarf;
       my $snarfnum = 1;
@@ -781,7 +789,11 @@ sub new_customer {
 
     #warn "$me Billing customer...\n" if $Debug;
 
-    my $bill_error = $cust_main->bill( 'depend_jobnum'=>$placeholder->jobnum );
+    my @cust_bill;
+    my $bill_error = $cust_main->bill(
+      'depend_jobnum' => $placeholder->jobnum,
+      'return_bill'   => \@cust_bill,
+    );
     #warn "$me error billing new customer: $bill_error"
     #  if $bill_error;
 
@@ -816,11 +828,11 @@ sub new_customer {
 
     if ( $cust_main->balance > 0 ) {
 
-      #this makes sense.  credit is "un-doing" the invoice
-      $cust_main->credit( $cust_main->balance, 'signup server decline',
-                          'reason_type' => $conf->config('signup_credit_type'),
-                        );
-      $cust_main->apply_credits;
+      #this used to apply a credit, but now we can void invoices...
+      foreach my $cust_bill (@cust_bill) {
+        my $voiderror = $cust_bill->void('automatic payment failed');
+        warn "Error voiding cust bill after decline: $voiderror" if $voiderror;
+      }
 
       #should check list for errors...
       #$cust_main->suspend;
@@ -942,14 +954,25 @@ sub new_customer_minimal {
         last first company daytime night fax mobile
         ss stateid stateid_state
 
-        payby
-        payinfo paycvv paydate payname paystate paytype
-        paystart_month paystart_year payissue
-        payip
+        locale
       ),
 
   } );
 
+  my %opt = ();
+  if ( $packet->{payby} =~ /^(CARD|DCRD|CHEK|DCHK)$/ ) {
+    $opt{cust_payby} = [
+      new FS::cust_payby {
+        map { $_ => $packet->{$_} } qw(
+          payby
+          payinfo paycvv paydate payname paystate paytype
+          paystart_month paystart_year payissue
+          payip
+        ),
+      }
+    ];
+  }
+
   if ( grep length($packet->{$_}), FS::cust_main->location_fields ) {
     my $bill_hash;
     foreach my $f (FS::cust_main->location_fields) {
@@ -1033,7 +1056,6 @@ sub new_customer_minimal {
 
   }
 
-  my %opt = ();
   if ( $invoicing_list[0] && $packet->{'_password'} ) {
     $opt{'contact'} = [
       new FS::contact { 'first'        => $cust_main->first,