per-agent agent-ship_address config, #6678

[freeside.git] / FS / FS / ClientAPI / Signup.pm

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index b18f21f..f17752a 100644 (file)
--- 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,8 +185,6 @@ 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'),
     };
@@ -374,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");
@@ -402,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);
 
     }
@@ -562,6 +569,7 @@ sub new_customer {
         payinfo paycvv paydate payname paystate paytype
         paystart_month paystart_year payissue
         payip
+        override_ban_warn
 
         referral_custnum comments
       )
@@ -570,7 +578,9 @@ sub new_customer {
   }
 
   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$_") )
@@ -807,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,
@@ -904,8 +926,8 @@ 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 };
   }