X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FSignup.pm;h=3dbf5b887a1d02c0480a7775181d9ebb76515c78;hb=0f7643c1af2d909e0c3172e5bec0c01855fca1b9;hp=757dd47f1b2e0933b2ab6deb5ebf9b05d9a66cdc;hpb=d6741df87df9e3352d7ae47a02d0e3f46154fef9;p=freeside.git

diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 757dd47f1..3dbf5b887 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -187,7 +187,7 @@ sub signup_info {
       '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);
@@ -506,31 +506,70 @@ 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(
+              ss stateid stateid_state
+
+              payby
+              payinfo paycvv paydate payname paystate paytype
+              paystart_month paystart_year payissue
+              payip
 
-    map { $_ => $packet->{$_} } qw(
+              referral_custnum comments
+            )
+      ),
 
-      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
+  } else {
 
-      payby
-      payinfo paycvv paydate payname paystate paytype
-      paystart_month paystart_year payissue
-      payip
+    $cust_main = new FS::cust_main ( {
+      #'custnum'          => '',
+      'agentnum'      => $agentnum,
+      'refnum'        => $packet->{refnum}
+                         || $conf->config('signup_server-default_refnum'),
 
-      referral_custnum comments
-    )
+      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
+
+        referral_custnum comments
+      )
+
+    } );
+  }
 
   my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
   if ( $conf->exists('agent_ship_address') && $agent->agent_custnum ) {
@@ -556,9 +595,17 @@ sub new_customer {
     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';
@@ -697,7 +744,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;