Merge branch 'master' of git.freeside.biz:/home/git/freeside

diff --combined FS/FS/cust_main/Billing_Realtime.pm
index 0b6b099,09e2dfa..7718f7a
--- 1/FS/FS/cust_main/Billing_Realtime.pm
--- 2/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@@ -376,14 -376,18 +376,18 @@@ sub _bop_content 
  }
  
  sub _tokenize_card {
-   my ($self,$transaction,$cust_payby,$log,%opt) = @_;
+   my ($self,$transaction,$options,$log,%opt) = @_;
+   # options is for entire process, so we can update payinfo
+   # opt is just for this call, only key is replace
  
+   my $cust_payby = $options->{'cust_payby'};
    if ( $cust_payby
         and $transaction->can('card_token') 
         and $transaction->card_token 
-        and $cust_payby->payinfo !~ /^99\d{14}$/ #not already tokenized
+        and !$cust_payby->tokenized #not already tokenized
    ) {
  
+     $options->{'payinfo'} = $transaction->card_token;
      $cust_payby->payinfo($transaction->card_token);
  
      my $error;
@@@ -400,6 -404,18 +404,18 @@@
  
  }
  
+ # only store payinfo in cust_pay/cust_pay_pending
+ # if it's a tokenized card or if processor requires card for void
+ sub _cust_pay_opts {
+   my ($self,$payby,$payinfo,$transaction) = @_;
+   ( (($payby eq 'CARD') && $self->tokenized($payinfo))
+     || (($payby eq 'CARD') && $transaction->info('CC_void_requires_card'))
+     || (($payby eq 'CHEK') && $transaction->info('ECHECK_void_requires_account'))
+   )
+     ? ('payinfo' => $payinfo)
+     : ();
+ }
+ 
  my %bop_method2payby = (
    'CC'     => 'CARD',
    'ECHECK' => 'CHEK',
@@@ -665,12 -681,15 +681,15 @@@ sub realtime_bop 
  
    #okay, good to go, if we're a duplicate, cust_pay_pending will kick us out
  
+   my $transaction = new $namespace( $payment_gateway->gateway_module,
+                                     $self->_bop_options(\%options),
+                                   );
+ 
    my $cust_pay_pending = new FS::cust_pay_pending {
      'custnum'           => $self->custnum,
      'paid'              => $options{amount},
      '_date'             => '',
      'payby'             => $bop_method2payby{$options{method}},
-     'payinfo'           => $options{payinfo},
      'paymask'           => $options{paymask},
      'paydate'           => $paydate,
      'recurring_billing' => $content{recurring_billing},
@@@ -679,6 -698,7 +698,7 @@@
      'gatewaynum'        => $payment_gateway->gatewaynum || '',
      'session_id'        => $options{session_id} || '',
      'jobnum'            => $options{depend_jobnum} || '',
+     $self->_cust_pay_opts($options{payinfo},$transaction),
    };
    $cust_pay_pending->payunique( $options{payunique} )
      if defined($options{payunique}) && length($options{payunique});
@@@ -695,10 -715,6 +715,6 @@@
    my( $action1, $action2 ) =
      split( /\s*\,\s*/, $payment_gateway->gateway_action );
  
-   my $transaction = new $namespace( $payment_gateway->gateway_module,
-                                     $self->_bop_options(\%options),
-                                   );
- 
    $transaction->content(
      'type'           => $options{method},
      $self->_bop_auth(\%options),          
@@@ -811,7 -827,7 +827,7 @@@
    # Tokenize
    ###
  
-   my $error = $self->_tokenize_card($transaction,$options{'cust_payby'},$log,'replace' => 1);
+   my $error = $self->_tokenize_card($transaction,\%options,$log,'replace' => 1);
    return $error if $error;
  
    ###
@@@ -849,9 -865,7 +865,7 @@@ sub fake_bop 
       'paid'     => $options{amount},
       '_date'    => '',
       'payby'    => $bop_method2payby{$options{method}},
-      #'payinfo'  => $payinfo,
       'payinfo'  => '4111111111111111',
-      #'paydate'  => $paydate,
       'paydate'  => '2012-05-01',
       'processor'      => 'FakeProcessor',
       'auth'           => '54',
@@@ -925,7 -939,6 +939,6 @@@ sub _realtime_bop_result 
         'paid'     => $cust_pay_pending->paid,
         '_date'    => '',
         'payby'    => $cust_pay_pending->payby,
-        'payinfo'  => $options{'payinfo'},
         'paymask'  => $options{'paymask'} || $cust_pay_pending->paymask,
         'paydate'  => $cust_pay_pending->paydate,
         'pkgnum'   => $cust_pay_pending->pkgnum,
@@@ -935,6 -948,7 +948,7 @@@
         'auth'           => $transaction->authorization,
         'order_number'   => $order_number || '',
         'no_auto_apply'  => $options{'no_auto_apply'} ? 'Y' : '',
+        $self->_cust_pay_opts($options{payinfo},$transaction),
      } );
      #doesn't hurt to know, even though the dup check is in cust_pay_pending now
      $cust_pay->payunique( $options{payunique} )
@@@ -1840,7 -1854,9 +1854,9 @@@ sub realtime_verify_bop 
    ###
  
    my $error;
-   my $transaction; #need this back so we can do _tokenize_card
+   my $transaction = new $namespace( $payment_gateway->gateway_module,
+                                     $self->_bop_options(\%options),
+                                   ); #need this back so we can do _tokenize_card
  
    # don't mutex the customer here, because they might be uncommitted. and
    # this is only verification. it doesn't matter if they have other
@@@ -1851,13 -1867,13 +1867,13 @@@
      'paid'              => '1.00',
      '_date'             => '',
      'payby'             => $bop_method2payby{'CC'},
-     'payinfo'           => $options{payinfo},
      'paymask'           => $options{paymask},
      'paydate'           => $paydate,
      'pkgnum'            => $options{'pkgnum'},
      'status'            => 'new',
      'gatewaynum'        => $payment_gateway->gatewaynum || '',
      'session_id'        => $options{session_id} || '',
+     $self->_cust_pay_opts($options{payinfo},$transaction),
    };
    $cust_pay_pending->payunique( $options{payunique} )
      if defined($options{payunique}) && length($options{payunique});
@@@ -1888,10 -1904,6 +1904,6 @@@
        if $DEBUG > 1;
      warn Dumper($cust_pay_pending) if $DEBUG > 2;
  
-     $transaction = new $namespace( $payment_gateway->gateway_module,
-                                    $self->_bop_options(\%options),
-                                     );
- 
      $transaction->content(
        'type'           => 'CC',
        $self->_bop_auth(\%options),          
@@@ -2115,7 -2127,7 +2127,7 @@@
  
    #important that we not pass replace option here,
    #because cust_payby->replace uses realtime_verify_bop!
-   $self->_tokenize_card($transaction,$options{'cust_payby'},$log);
+   $self->_tokenize_card($transaction,\%options,$log);
  
    ###
    # result handling
@@@ -2162,7 -2174,7 +2174,7 @@@ sub realtime_tokenize 
    return "No cust_payby" unless $options{'cust_payby'};
    $self->_bop_cust_payby_options(\%options);
    return '' unless $options{method} eq 'CC';
-   return '' if $options{payinfo} =~ /^99\d{14}$/; #already tokenized
+   return '' if $self->tokenized($options{payinfo}); #already tokenized
  
    ###
    # select a gateway
@@@ -2187,8 -2199,7 +2199,8 @@@
                                    );
  
    my %supported_actions = $transaction->info('supported_actions');
 -  return '' unless $supported_actions{'CC'} and grep(/^Tokenize$/,@{$supported_actions{'CC'}});
 +  return '' unless $supported_actions{'CC'}
 +                && grep /^Tokenize$/, @{$supported_actions{'CC'}};
  
    ###
    # check for banned credit card/ACH
@@@ -2254,7 -2265,7 +2266,7 @@@
  
      #important that we not pass replace option here, 
      #because cust_payby->replace uses realtime_tokenize!
-     $self->_tokenize_card($transaction,$options{'cust_payby'},$log);
+     $self->_tokenize_card($transaction,\%options,$log);
  
    } else {
  
@@@ -2266,6 -2277,12 +2278,12 @@@
  
  }
  
+ sub tokenized {
+   my $this = shift;
+   my $payinfo = shift;
+   $payinfo =~ /^99\d{14}$/;
+ }
+ 
  =back
  
  =head1 BUGS