From cf634d8d9bbe0c03839ad5aa78feef501343d413 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Wed, 14 Sep 2022 15:22:11 +1000
Subject: [PATCH] Simplify customer association

---
 app/models/spree/order.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index d23e8f71a7..d6c8c1d3b8 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -718,8 +718,6 @@ module Spree
     end
 
     def find_customer
-      return customer if customer.present?
-
       Customer.of(distributor).find_by(email: email_for_customer)
     end
 
@@ -738,7 +736,7 @@ module Spree
     end
 
     def ensure_customer
-      self.customer = find_customer || create_customer
+      self.customer ||= find_customer || create_customer
     end
 
     def update_adjustment!(adjustment)