From 052eb9b8d16c4e81c0b6c609674e9ab768cb817d Mon Sep 17 00:00:00 2001
From: Jonathan Prykop <jonathan@freeside.biz>
Date: Wed, 4 Nov 2015 00:44:52 -0600
Subject: [PATCH] RT#38314: Declined payment shows card as tokenized after
 first attempt [fixed if paymask is not passed, take 2]

---
 FS/FS/cust_main/Billing_Realtime.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index 9112607d2..c5039ff47 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -266,7 +266,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'} ) {
-- 
2.11.0