MAGETWO-42841: Order cannot be placed via payment methods with Vitrual Product only

Author: Yushkin, Dmytro

app/code/Magento/Payment/Gateway/Data/Order/OrderAdapter.php

@@ -69,25 +69,33 @@ public function getCustomerId()
     /**
      * Returns billing address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getBillingAddress()
     {
-        return $this->addressAdapterFactory->create(
-            ['address' => $this->order->getBillingAddress()]
-        );
+        if ($this->order->getBillingAddress()) {
+            return $this->addressAdapterFactory->create(
+                ['address' => $this->order->getBillingAddress()]
+            );
+        }
+
+        return null;
     }
 
     /**
      * Returns shipping address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getShippingAddress()
     {
-        return $this->addressAdapterFactory->create(
-            ['address' => $this->order->getShippingAddress()]
-        );
+        if ($this->order->getShippingAddress()) {
+            return $this->addressAdapterFactory->create(
+                ['address' => $this->order->getShippingAddress()]
+            );
+        }
+
+        return null;
     }
 
     /**

app/code/Magento/Payment/Gateway/Data/OrderAdapterInterface.php

@@ -34,14 +34,14 @@ public function getCustomerId();
     /**
      * Returns billing address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getBillingAddress();
 
     /**
      * Returns shipping address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getShippingAddress();
 

app/code/Magento/Payment/Gateway/Data/Quote/QuoteAdapter.php

@@ -70,25 +70,33 @@ public function getCustomerId()
     /**
      * Returns billing address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getBillingAddress()
     {
-        return $this->addressAdapterFactory->create(
-            ['address' => $this->quote->getBillingAddress()]
-        );
+        if ($this->quote->getBillingAddress()) {
+            return $this->addressAdapterFactory->create(
+                ['address' => $this->quote->getBillingAddress()]
+            );
+        }
+
+        return null;
     }
 
     /**
      * Returns shipping address
      *
-     * @return AddressAdapterInterface
+     * @return AddressAdapterInterface|null
      */
     public function getShippingAddress()
     {
-        return $this->addressAdapterFactory->create(
-            ['address' => $this->quote->getShippingAddress()]
-        );
+        if ($this->quote->getShippingAddress()) {
+            return $this->addressAdapterFactory->create(
+                ['address' => $this->quote->getShippingAddress()]
+            );
+        }
+
+        return null;
     }
 
     /**

app/code/Magento/Payment/Test/Unit/Gateway/Data/Order/OrderAdapterTest.php

@@ -62,6 +62,13 @@ public function testGetCustomerId()
         $this->assertEquals($expected, $this->model->getCustomerId());
     }
 
+    public function testGetBillingAddressIsNull()
+    {
+        $this->orderMock->expects($this->once())->method('getBillingAddress')->willReturn(null);
+
+        $this->assertSame(null, $this->model->getBillingAddress());
+    }
+
     public function testGetBillingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
@@ -74,11 +81,18 @@ public function testGetBillingAddress()
             ->method('create')
             ->with(['address' => $orderAddressMock])
             ->willReturn($addressAdapterMock);
-        $this->orderMock->expects($this->once())->method('getBillingAddress')->willReturn($orderAddressMock);
+        $this->orderMock->expects($this->exactly(2))->method('getBillingAddress')->willReturn($orderAddressMock);
 
         $this->assertSame($addressAdapterMock, $this->model->getBillingAddress());
     }
 
+    public function testGetShippingAddressIsNull()
+    {
+        $this->orderMock->expects($this->once())->method('getShippingAddress')->willReturn(null);
+
+        $this->assertSame(null, $this->model->getShippingAddress());
+    }
+
     public function testGetShippingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
@@ -91,7 +105,7 @@ public function testGetShippingAddress()
             ->method('create')
             ->with(['address' => $orderAddressMock])
             ->willReturn($addressAdapterMock);
-        $this->orderMock->expects($this->once())->method('getShippingAddress')->willReturn($orderAddressMock);
+        $this->orderMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($orderAddressMock);
 
         $this->assertSame($addressAdapterMock, $this->model->getShippingAddress());
     }

app/code/Magento/Payment/Test/Unit/Gateway/Data/Quote/QuoteAdapterTest.php

@@ -68,6 +68,13 @@ public function testGetCustomerId()
         $this->assertEquals($expected, $this->model->getCustomerId());
     }
 
+    public function testGetBillingAddressIsNull()
+    {
+        $this->quoteMock->expects($this->once())->method('getBillingAddress')->willReturn(null);
+
+        $this->assertSame(null, $this->model->getBillingAddress());
+    }
+
     public function testGetBillingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
@@ -80,11 +87,18 @@ public function testGetBillingAddress()
             ->method('create')
             ->with(['address' => $quoteAddressMock])
             ->willReturn($addressAdapterMock);
-        $this->quoteMock->expects($this->once())->method('getBillingAddress')->willReturn($quoteAddressMock);
+        $this->quoteMock->expects($this->exactly(2))->method('getBillingAddress')->willReturn($quoteAddressMock);
 
         $this->assertSame($addressAdapterMock, $this->model->getBillingAddress());
     }
 
+    public function testGetShippingAddressIsNull()
+    {
+        $this->quoteMock->expects($this->once())->method('getShippingAddress')->willReturn(null);
+
+        $this->assertSame(null, $this->model->getShippingAddress());
+    }
+
     public function testGetShippingAddress()
     {
         /** @var AddressAdapterInterface $addressAdapterMock */
@@ -97,7 +111,7 @@ public function testGetShippingAddress()
             ->method('create')
             ->with(['address' => $quoteAddressMock])
             ->willReturn($addressAdapterMock);
-        $this->quoteMock->expects($this->once())->method('getShippingAddress')->willReturn($quoteAddressMock);
+        $this->quoteMock->expects($this->exactly(2))->method('getShippingAddress')->willReturn($quoteAddressMock);
 
         $this->assertSame($addressAdapterMock, $this->model->getShippingAddress());
     }