Merge branch 'master' of github.com:inpsyde/woocommerce-paypal-commerce-gateway

This commit is contained in:
David Remer 2020-04-13 11:53:00 +03:00
commit 0a4d6d61f2

View file

@ -8,7 +8,6 @@ use Inpsyde\PayPalCommerce\ApiClient\Entity\AmountBreakdown;
use Inpsyde\PayPalCommerce\ApiClient\Entity\Item;
use Inpsyde\PayPalCommerce\ApiClient\Entity\Money;
use Inpsyde\PayPalCommerce\ApiClient\Entity\PurchaseUnit;
use Inpsyde\PayPalCommerce\ApiClient\Entity\Shipping;
use Inpsyde\PayPalCommerce\ApiClient\Exception\RuntimeException;
class PurchaseUnitFactory
@ -105,7 +104,9 @@ class PurchaseUnitFactory
$breakdown
);
$shipping = $this->shippingFactory->fromWcOrder($order);
if ($shipping->address()->countryCode() && !$shipping->address()->postalCode()) {
if (empty($shipping->address()->countryCode()) ||
($shipping->address()->countryCode() && !$shipping->address()->postalCode())
) {
$shipping = null;
}