unhide non-realtime payment fields in selfservice, RT#11734
[freeside.git] / FS / FS / ClientAPI / Signup.pm
index 7087b12..50b0b5d 100644 (file)
@@ -317,40 +317,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'} = [];
-      my $gatewaynum = $conf->config('selfservice-payment_gateway');
-      if ( $gatewaynum ) {
-        my $pg = qsearchs('payment_gateway', { gatewaynum => $gatewaynum });
-        die "configured gatewaynum $gatewaynum not found!" if !$pg;
-        my $hide = $pg->gateway_namespace eq 'Business::OnlineThirdPartyPayment';
-        $signup_info->{'hide_payment_fields'} = [
-          map { $hide } @{$signup_info->{'payby'}}
-        ];
-      }
-      else {
-        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;
-            }
-          }
-          push @{$signup_info->{'hide_payment_fields'}}, $hide;
-        } # foreach $payby
-      }
+    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;
+    } # 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;
@@ -509,60 +507,66 @@ sub new_customer {
   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
-
-         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(
+    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
 
-         last first ss company address1 address2
-         city county state zip country
-         daytime night fax stateid stateid_state
+              referral_custnum comments
+            )
+      ),
 
-         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
+  } else {
 
-         referral_custnum comments
-       )
+    $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
+
+        referral_custnum comments
+      )
+
+    } );
   }
 
   my $agent = qsearchs('agent', { 'agentnum' => $agentnum } );
@@ -738,7 +742,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;