From 761d6ec32eab8432c9bd4991ffe096bb68a04852 Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Thu, 14 Feb 2019 12:24:53 -0800
Subject: [PATCH] restore fallback to customer billing address for CC
 transactions, RT#77641, RT#71513

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

diff --git a/FS/FS/cust_main/Billing_Realtime.pm b/FS/FS/cust_main/Billing_Realtime.pm
index d190c2e20..3284ee20c 100644
--- a/FS/FS/cust_main/Billing_Realtime.pm
+++ b/FS/FS/cust_main/Billing_Realtime.pm
@@ -330,6 +330,8 @@ sub _bop_cust_payby_options {
 
 # can be called as class method,
 # but can't load default name/phone fields as class method
+# (why was this added?  ah, it might get called from realtime_tokenize in this
+#  fashion "to tokenize old records on upgrade")
 sub _bop_content {
   my ($self, $options) = @_;
   my %content = ();
@@ -361,7 +363,7 @@ sub _bop_content {
 
   $content{name} = $payname if $payname;
 
-  if ( exists($options->{'address1'}) ) {
+  if ( exists($options->{'address1'}) && length($options->{'address1'}) ) {
 
     $content{address} = $options->{'address1'};
     my $address2 = $options->{'address2'};
-- 
2.11.0