Fixed #1486

Allow addresses to be unset on an order by passing null

CHANGELOG.md

@@ -3,6 +3,7 @@
 ### Unreleased
 
 ### Fixed
+- Fixed a bug where blank addresses were being automatically created on new carts. ([#1486](https://github.com/craftcms/commerce/issues/1486)) 
 - Fixed a SQL error that could occur during order consolidation on PostgreSQL. 
 
 ## 3.1.6 - 2020-06-02

src/elements/Order.php

@@ -2385,16 +2385,18 @@ public function getShippingAddress()
     }
 
     /**
-     * @param Address|array $address
+     * @param Address|array|null $address
      */
     public function setShippingAddress($address)
     {
-        if (!$address instanceof Address) {
-            $address = new Address($address);
+        if ($address === null) {
+            $this->shippingAddressId = null;
+            $this->_shippingAddress = null;
+        } else {
+            $address = is_array($address) ? new Address($address) : $address;
+            $this->shippingAddressId = $address->id;
+            $this->_shippingAddress = $address;
         }
-
-        $this->shippingAddressId = $address->id;
-        $this->_shippingAddress = $address;
     }
 
     /**
@@ -2460,12 +2462,14 @@ public function getBillingAddress()
      */
     public function setBillingAddress($address)
     {
-        if (!$address instanceof Address) {
-            $address = new Address($address);
+        if ($address === null) {
+            $this->billingAddressId = null;
+            $this->_billingAddress = null;
+        } else {
+            $address = is_array($address) ? new Address($address) : $address;
+            $this->billingAddressId = $address->id;
+            $this->_billingAddress = $address;
         }
-
-        $this->billingAddressId = $address->id;
-        $this->_billingAddress = $address;
     }
 
     /**