X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FSignup.pm;h=f17752a4560fe63d9e4545ac44866f2768caba9b;hb=0924aec8b98b4056357bfdd19f45686a3e9008e2;hp=1bce9654f0dd7b9d6acb976d4cfd06ab29779cba;hpb=314565233e336063494acdcbf22077043ce54d88;p=freeside.git

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 1bce9654f..f17752a45 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -22,6 +22,7 @@ use FS::acct_snarf;
 use FS::queue;
 use FS::reg_code;
 use FS::payby;
+use FS::banned_pay;
 
 $DEBUG = 0;
 $me = '[FS::ClientAPI::Signup]';
@@ -184,10 +185,8 @@ sub signup_info {
       'signup_service'     => $svc_x,
       'company_name'       => scalar($conf->config('company_name')),
       #per-agent?
-      'agent_ship_address' => scalar($conf->exists('agent-ship_address')),
-      'require_phone'      => scalar($conf->exists('cust_main-require_phone')),
       'logo'               => scalar($conf->config_binary('logo.png')),
-
+      'prepaid_template_custnum' => $conf->exists('signup_server-prepaid-template-custnum'),
     };
 
     $cache->set('signup_info_cache', $signup_info_cache);
@@ -317,29 +316,38 @@ sub signup_info {
   if ( $agentnum ) {
 
     warn "$me setting agent-specific payment flag\n" if $DEBUG > 1;
-    my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
+    my $agent = qsearchs('agent', { 'agentnum' => $agentnum } )
+      or return { 'error' => "Self-service agent #$agentnum does not exist" };
     warn "$me has agent $agent\n" if $DEBUG > 1;
-    if ( $agent ) { #else complain loudly?
-      $signup_info->{'hide_payment_fields'} = [];
-      foreach my $payby (@{$signup_info->{payby}}) {
-        warn "$me checking $payby payment fields\n" if $DEBUG > 1;
-        my $hide = 0;
-        if ( FS::payby->realtime($payby) ) {
-          my $payment_gateway =
-            $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
-                                     'nofatal' => 1,
-                                   );
-          if ( $payment_gateway
-                 && $payment_gateway->gateway_namespace
-                      eq 'Business::OnlineThirdPartyPayment'
-             ) {
-            warn "$me hiding $payby payment fields\n" if $DEBUG > 1;
-            $hide = 1;
-          }
+    my @paybys = @{ $signup_info->{'payby'} };
+    $signup_info->{'hide_payment_fields'} = [];
+
+    my $gatewaynum = $conf->config('selfservice-payment_gateway');
+    my $force_gateway;
+    if ( $gatewaynum ) {
+      $force_gateway = qsearchs('payment_gateway', { gatewaynum => $gatewaynum });
+      warn "using forced gateway #$gatewaynum - " .
+        $force_gateway->gateway_username . '@' . $force_gateway->gateway_module
+        if $DEBUG > 1;
+      die "configured gatewaynum $gatewaynum not found!" if !$force_gateway;
+    }
+    foreach my $payby (@paybys) {
+      warn "$me checking $payby payment fields\n" if $DEBUG > 1;
+      my $hide = 0;
+      if ( FS::payby->realtime($payby) ) {
+        my $gateway = $force_gateway || 
+          $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
+                                   'nofatal' => 1,
+                                 );
+        if ( $gateway && $gateway->gateway_namespace
+                    eq 'Business::OnlineThirdPartyPayment'
+           ) {
+          warn "$me hiding $payby payment fields\n" if $DEBUG > 1;
+          $hide = 1;
         }
-        push @{$signup_info->{'hide_payment_fields'}}, $hide;
       }
-    }
+      push @{$signup_info->{'hide_payment_fields'}}, $hide;
+    } # foreach $payby
     warn "$me done setting agent-specific payment flag\n" if $DEBUG > 1;
 
     warn "$me setting agent-specific package list\n" if $DEBUG > 1;
@@ -365,13 +373,6 @@ sub signup_info {
 
     $signup_info->{'company_name'} = $conf->config('company_name', $agentnum);
 
-    if ( $signup_info->{'agent_ship_address'} && $agent->agent_custnum ) {
-      my $cust_main = $agent->agent_cust_main;
-      my $prefix = length($cust_main->ship_last) ? 'ship_' : '';
-      $signup_info->{"ship_$_"} = $cust_main->get("$prefix$_")
-        foreach qw( address1 city county state zip country );
-    }
-
     #some of the above could probably be cached, too
 
     my $signup_info_cache_agent = $cache->get("signup_info_cache_agent$agentnum");
@@ -393,8 +394,23 @@ sub signup_info {
           qw( body_bgcolor box_bgcolor menu_bgcolor ) ),
         ( map { $_ => join("\n", $conf->config("selfservice-$_", $agentnum ) ) }
           qw( head body_header body_footer ) ),
+        ( map { $_ => join("\n", $conf->config("signup_server-$_", $agentnum ) ) }
+          qw( terms_of_service ) ),
+
+        ( map { $_ => scalar($conf->exists($_, $agentnum)) } 
+          qw(cust_main-require_phone agent-ship_address) ),
       };
 
+      if ( $signup_info_cache_agent->{'agent-ship_address'} 
+           && $agent->agent_cust_main ) {
+
+        my $cust_main = $agent->agent_cust_main;
+        my $prefix = length($cust_main->ship_last) ? 'ship_' : '';
+        $signup_info_cache_agent->{"ship_$_"} = $cust_main->get("$prefix$_")
+          foreach qw( address1 city county state zip country );
+
+      }
+
       $cache->set("signup_info_cache_agent$agentnum", $signup_info_cache_agent);
 
     }
@@ -495,34 +511,76 @@ sub new_customer {
 
   #shares some stuff with htdocs/edit/process/cust_main.cgi... take any
   # common that are still here and library them.
-  my $cust_main = new FS::cust_main ( {
-    #'custnum'          => '',
-    'agentnum'      => $agentnum,
-    'refnum'        => $packet->{refnum}
-                       || $conf->config('signup_server-default_refnum'),
+  my $template_custnum = $conf->config('signup_server-prepaid-template-custnum');
+  my $cust_main;
+  if ( $template_custnum && $packet->{prepaid_shortform} ) {
+
+    my $template_cust = qsearchs('cust_main', { 'custnum' => $template_custnum } );
+    return { 'error' => 'Configuration error' } unless $template_cust;
+    $cust_main = new FS::cust_main ( {
+      'agentnum'      => $agentnum,
+      'refnum'        => $packet->{refnum}
+                         || $conf->config('signup_server-default_refnum'),
+
+      ( map { $_ => $template_cust->$_ } qw( 
+              last first company address1 address2 
+              city county state zip country
+              daytime night fax 
+
+              ship_last ship_first ship_company ship_address1 ship_address2
+              ship_city ship_county ship_state ship_zip ship_country
+              ship_daytime ship_night ship_fax
+            )
+      ),
 
-    map { $_ => $packet->{$_} } qw(
+      ( map { $_ => $packet->{$_} } qw(
+              ss stateid stateid_state
 
-      last first ss company address1 address2
-      city county state zip country
-      daytime night fax stateid stateid_state
+              payby
+              payinfo paycvv paydate payname paystate paytype
+              paystart_month paystart_year payissue
+              payip
 
-      ship_last ship_first ship_ss ship_company ship_address1 ship_address2
-      ship_city ship_county ship_state ship_zip ship_country
-      ship_daytime ship_night ship_fax
+              referral_custnum comments
+            )
+      ),
 
-      payby
-      payinfo paycvv paydate payname paystate paytype
-      paystart_month paystart_year payissue
-      payip
+    } );
 
-      referral_custnum comments
-    )
+  } else {
 
-  } );
+    $cust_main = new FS::cust_main ( {
+      #'custnum'          => '',
+      'agentnum'      => $agentnum,
+      'refnum'        => $packet->{refnum}
+                         || $conf->config('signup_server-default_refnum'),
+
+      map { $_ => $packet->{$_} } qw(
+
+        last first ss company address1 address2
+        city county state zip country
+        daytime night fax stateid stateid_state
+
+        ship_last ship_first ship_ss ship_company ship_address1 ship_address2
+        ship_city ship_county ship_state ship_zip ship_country
+        ship_daytime ship_night ship_fax
+
+        payby
+        payinfo paycvv paydate payname paystate paytype
+        paystart_month paystart_year payissue
+        payip
+        override_ban_warn
+
+        referral_custnum comments
+      )
+
+    } );
+  }
 
   my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
-  if ( $conf->exists('agent_ship_address') && $agent->agent_custnum ) {
+  if ( $conf->exists('agent-ship_address', $agentnum) 
+    && $agent->agent_custnum ) {
+
     my $agent_cust_main = $agent->agent_cust_main;
     my $prefix = length($agent_cust_main->ship_last) ? 'ship_' : '';
     $cust_main->set("ship_$_", $agent_cust_main->get("$prefix$_") )
@@ -538,16 +596,25 @@ sub new_customer {
     unless grep { $_ eq $packet->{'payby'} }
                 $conf->config('signup_server-payby');
 
-  if (FS::payby->realtime($packet->{payby})) {
+  if (FS::payby->realtime($packet->{payby})
+    and not $conf->exists('signup_server-third_party_as_card')) {
     my $payby = $packet->{payby};
 
     my $agent = qsearchs('agent', { 'agentnum' => $agentnum });
     return { 'error' => "Unknown reseller" }
       unless $agent;
 
-    my $gw = $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
-                                      'nofatal' => 1,
+    my $gw;
+    my $gatewaynum = $conf->config('selfservice-payment_gateway');
+    if ( $gatewaynum ) {
+      $gw = qsearchs('payment_gateway', { gatewaynum => $gatewaynum });
+      die "configured gatewaynum $gatewaynum not found!" if !$gw;
+    }
+    else {
+      $gw = $agent->payment_gateway( 'method'  => FS::payby->payby2bop($payby),
+                                     'nofatal' => 1,
                                     );
+    }
 
     $cust_main->payby('BILL')   # MCRD better?
       if $gw && $gw->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
@@ -609,7 +676,7 @@ sub new_customer {
       push @acct_snarf, $acct_snarf;
     }
     $svc->child_objects( \@acct_snarf );
-
+    push @svc, $svc;
 
   } elsif ( $svc_x eq 'svc_phone' ) {
 
@@ -686,7 +753,7 @@ sub new_customer {
 
     #warn "$me Billing customer...\n" if $Debug;
 
-    my $bill_error = $cust_main->bill;
+    my $bill_error = $cust_main->bill( 'depend_jobnum'=>$placeholder->jobnum );
     #warn "$me error billing new customer: $bill_error"
     #  if $bill_error;
 
@@ -698,6 +765,7 @@ sub new_customer {
     $bill_error = $cust_main->realtime_collect(
        method        => FS::payby->payby2bop( $packet->{payby} ),
        depend_jobnum => $placeholder->jobnum,
+       selfservice   => 1,
     );
     #warn "$me error collecting from new customer: $bill_error"
     #  if $bill_error;
@@ -749,6 +817,18 @@ sub new_customer {
   $error = $placeholder->delete;
   return { 'error' => $error } if $error;
 
+  if ( $conf->exists('signup-duplicate_cc-warn_hours') ) {
+    my $hours = $conf->config('signup-duplicate_cc-warn_hours');
+    my $ban = new FS::banned_pay $cust_main->_new_banned_pay_hashref;
+    $ban->end_date( int( time + $hours*3600 ) );
+    $ban->bantype('warn');
+    $ban->reason('signup-duplicate_cc-warn_hours');
+    $error = $ban->insert;
+    warn "WARNING: error inserting temporary banned_pay for ".
+         " signup-duplicate_cc-warn_hours (proceeding anyway): $error"
+      if $error;
+  }
+
   my %return = ( 'error'          => '',
                  'signup_service' => $svc_x,
                  'custnum'        => $cust_main->custnum,
@@ -787,29 +867,36 @@ sub capture_payment {
 
   my $conf = new FS::Conf;
 
-  my $url = $packet->{url};
-  my $payment_gateway =
-    qsearchs('payment_gateway', { 'gateway_callback_url' => popurl(0, $url) } );
-
-  unless ($payment_gateway) {
-
-    my ( $processor, $login, $password, $action, @bop_options ) =
-      $conf->config('business-onlinepayment');
-    $action ||= 'normal authorization';
-    pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
-    die "No real-time processor is enabled - ".
-        "did you set the business-onlinepayment configuration value?\n"
-      unless $processor;
-
-    $payment_gateway = new FS::payment_gateway( {
-      gateway_namespace => $conf->config('business-onlinepayment-namespace'),
-      gateway_module    => $processor,
-      gateway_username  => $login,
-      gateway_password  => $password,
-      gateway_action    => $action,
-      options   => [ ( @bop_options ) ],
-    });
-
+  my $payment_gateway;
+  if ( my $gwnum = $conf->config('selfservice-payment_gateway') ) {
+    $payment_gateway = qsearchs('payment_gateway', { 'gatewaynum' => $gwnum })
+      or die "configured gatewaynum $gwnum not found!";
+  }
+  else {
+    my $url = $packet->{url};
+
+    $payment_gateway = qsearchs('payment_gateway', 
+        { 'gateway_callback_url' => popurl(0, $url) } 
+      );
+    if (!$payment_gateway) { 
+
+      my ( $processor, $login, $password, $action, @bop_options ) =
+        $conf->config('business-onlinepayment');
+      $action ||= 'normal authorization';
+      pop @bop_options if scalar(@bop_options) % 2 && $bop_options[-1] =~ /^\s*$/;
+      die "No real-time processor is enabled - ".
+          "did you set the business-onlinepayment configuration value?\n"
+        unless $processor;
+
+      $payment_gateway = new FS::payment_gateway( {
+        gateway_namespace => $conf->config('business-onlinepayment-namespace'),
+        gateway_module    => $processor,
+        gateway_username  => $login,
+        gateway_password  => $password,
+        gateway_action    => $action,
+        options   => [ ( @bop_options ) ],
+      });
+    }
   }
  
   die "No real-time third party processor is enabled - ".
@@ -839,15 +926,18 @@ sub capture_payment {
     return { error => '_decline', bill_error => $bill_error };
   }
 
-  if ($cust_pay_pending->status ne 'pending') {
-    my $bill_error = "Payment with id $paypendingnum is not pending, but ".
+  if ($cust_pay_pending->status ne 'thirdparty') {
+    my $bill_error = "Payment with id $paypendingnum is not thirdparty, but ".
                      $cust_pay_pending->status.  "; Transaction aborted.";
     return { error => '_decline', bill_error => $bill_error };
   }
 
   my $cust_main = $cust_pay_pending->cust_main;
   my $bill_error =
-    $cust_main->realtime_botpp_capture( $cust_pay_pending, %{$packet->{data}} );
+    $cust_main->realtime_botpp_capture( $cust_pay_pending, 
+      %{$packet->{data}},
+      apply => 1,
+  );
 
   return { 'error'      => ( $bill_error->{bill_error} ? '_decline' : '' ),
            %$bill_error,