Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Improve `Orders::CreateUserAccount` (#12292)

Damian Legawiec248e3c1a2e60
diff --git a/core/app/models/spree/order/checkout.rb b/core/app/models/spree/order/checkout.rb
index c49c3ac4bb..115595efb9 100644
--- a/core/app/models/spree/order/checkout.rb
+++ b/core/app/models/spree/order/checkout.rb
@@ -275,14 +275,7 @@ module Spree
return if user.present?
return unless signup_for_an_account?
- result = Spree::Orders::CreateUserAccount.call(order: self, accepts_email_marketing: accept_marketing?)
-
- if result.success?
- self.user = result.value
- save
-
- user.send_welcome_email if user.respond_to?(:send_welcome_email)
- end
+ Spree::Orders::CreateUserAccount.call(order: self, accepts_email_marketing: accept_marketing?)
end
def persist_user_credit_card
diff --git a/core/app/services/spree/orders/create_user_account.rb b/core/app/services/spree/orders/create_user_account.rb
index 67f2aadaf1..590967fdc1 100644
--- a/core/app/services/spree/orders/create_user_account.rb
+++ b/core/app/services/spree/orders/create_user_account.rb
@@ -16,7 +16,12 @@ module Spree
assign_bill_address(order, user)
# assign newly created user to the order
+ # using update_columns to avoid running validations/callbacks
order.update_columns(user_id: user.id, updated_at: Time.current)
+ order.user = user
+
+ # send welcome email
+ user.send_welcome_email if user.respond_to?(:send_welcome_email)
success(user.reload)
end