X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FSignup.pm;h=595f4fb405031a8e511c03391a8b353d256343a6;hb=0e7c29b192fff137d3b9167b29633a94f94b995f;hp=7087b12a2fa0a438edb63818f707ba3d3ec4fddb;hpb=0bebde603df97eb496150e80a58755b2f792f64a;p=freeside.git diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm index 7087b12a2..595f4fb40 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]'; @@ -317,40 +318,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 +508,67 @@ 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 - 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 } ); @@ -582,7 +588,8 @@ 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 }); @@ -738,7 +745,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; @@ -802,6 +809,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, @@ -899,8 +918,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 }; }