From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 4 Nov 2015 06:44:52 +0000 (-0600)
Subject: RT#38314: Declined payment shows card as tokenized after first attempt [fixed if... 
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=f8c4741390077c1448d627949d19c9220cc8e610

RT#38314: Declined payment shows card as tokenized after first attempt [fixed if paymask is not passed, take 2]
---

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 0dbd91792..f33c4549a 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -237,7 +237,10 @@ sub _bop_defaults {
     }
   }
 
-  $options->{payinfo} = $self->payinfo unless exists( $options->{payinfo} );
+  unless ( exists( $options->{'payinfo'} ) ) {
+    $options->{'payinfo'} = $self->payinfo;
+    $options->{'paymask'} = $self->paymask;
+  }
 
   # Default invoice number if the customer has exactly one open invoice.
   if( ! $options->{'invnum'} ) {