lib/active_merchant/billing/gateways/barclaycard_smartpay.rb in activemerchant-1.69.0 vs lib/active_merchant/billing/gateways/barclaycard_smartpay.rb in activemerchant-1.70.0

@@ -224,15 +224,15 @@
       end
 
       def address_hash(address)
         full_address = "#{address[:address1]} #{address[:address2]}" if address
         street = address[:street] if address[:street]
-        house = address[:houseNumberOrName] if address[:houseNumberOrName]
+        house = address[:houseNumberOrName] ? address[:houseNumberOrName] : full_address.split(/\s+/).keep_if { |x| x =~ /\d/ }.join(' ')
 
         hash = {}
         hash[:city]              = address[:city] if address[:city]
         hash[:street]            = street || full_address.split(/\s+/).keep_if { |x| x !~ /\d/ }.join(' ')
-        hash[:houseNumberOrName] = house || full_address.split(/\s+/).keep_if { |x| x =~ /\d/ }.join(' ')
+        hash[:houseNumberOrName] = house.empty? ? "Not Provided" : house
         hash[:postalCode]        = address[:zip] if address[:zip]
         hash[:stateOrProvince]   = address[:state] if address[:state]
         hash[:country]           = address[:country] if address[:country]
         hash
       end