MAGETWO-71675: Customer can't see available Payment Method for specific country

omiroshnichenko · omiroshnichenko · commit ee21cf41a961 · 2018-10-04T17:04:13.000-05:00
diff --git a/app/code/Magento/Checkout/Model/ShippingInformationManagement.php b/app/code/Magento/Checkout/Model/ShippingInformationManagement.php
@@ -151,6 +151,10 @@ public function saveAddressInformation(
             $address->setCustomerAddressId(null);
         }
 
+        if (!$billingAddress->getCustomerAddressId()) {
+            $billingAddress->setCustomerAddressId(null);
+        }
+
         if (!$address->getCountryId()) {
             throw new StateException(__('The shipping address is missing. Set the address and try again.'));
         }

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,10 @@ public function saveAddressInformation(`
`151`	`151`	`$address->setCustomerAddressId(null);`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ if (!$billingAddress->getCustomerAddressId()) {`
	`155`	`+ $billingAddress->setCustomerAddressId(null);`
	`156`	`+ }`
	`157`	`+`
`154`	`158`	`if (!$address->getCountryId()) {`
`155`	`159`	`throw new StateException(__('The shipping address is missing. Set the address and try again.'));`
`156`	`160`	`}`