[PS-768] Fix Bold payments for guest customers (#37)

bold-commerce · Feb 6, 2024 · 5ee65fd · 5ee65fd
1 parent ccc5ee9
commit 5ee65fd
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Checkout/Service/Extractor/Quote.php b/Checkout/Service/Extractor/Quote.php
@@ -83,13 +83,17 @@ private static function extractQuote(Mage_Sales_Model_Quote $quote)
     private static function extractCustomer(Mage_Sales_Model_Quote $quote)
     {
         $customer = $quote->getCustomer();
-        if ($quote->getCustomerIsGuest()) {
+        if ($quote->getCustomerIsGuest() || $customer->getId() == null) {
             return [
-                'email' => $customer->getEmail(),
-                'firstname' => $customer->getFirstname(),
-                'lastname' => $customer->getLastname(),
+                'email' => $customer->getEmail() 
+                    ?: $quote->getBillingAddress()->getEmail(),
+                'firstname' => $customer->getFirstname()
+                    ?: $quote->getBillingAddress()->getFirstname(),
+                'lastname' => $customer->getLastname()
+                    ?: $quote->getBillingAddress()->getLastname(),
             ];
         }
+
         return current(Bold_Checkout_Service_Extractor_Customer::extract([$customer]));
     }
 }