Fix checkout address for guest order (OpenMage#969)

* fix checkout address for guest * refactoring
digitalpianism · Sep 1, 2020 · 5e0a74f · 5e0a74f
2 parents a985746 + 2b785cb
commit 5e0a74f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Billing.php b/app/code/core/Mage/Checkout/Block/Onepage/Billing.php
@@ -117,7 +117,7 @@ public function getAddress()
                     $this->_address->setLastname($this->getQuote()->getCustomer()->getLastname());
                 }
             } else {
-                $this->_address = Mage::getModel('sales/quote_address');
+                $this->_address = $this->getQuote()->getBillingAddress();
             }
         }
 

diff --git a/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php b/app/code/core/Mage/Checkout/Block/Onepage/Shipping.php
@@ -69,11 +69,7 @@ public function getMethod()
     public function getAddress()
     {
         if (is_null($this->_address)) {
-            if ($this->isCustomerLoggedIn()) {
-                $this->_address = $this->getQuote()->getShippingAddress();
-            } else {
-                $this->_address = Mage::getModel('sales/quote_address');
-            }
+            $this->_address = $this->getQuote()->getShippingAddress();
         }
 
         return $this->_address;