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.

Fixed `Order#associate_user!` with custom `admin_user_class`

Damian Legawiecaaf4780f5481
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index 39a84aee9b..a4e50e3a8c 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -304,7 +304,9 @@ module Spree
def associate_user!(user, override_email = true)
self.user = user
self.email = user.email if override_email
- self.created_by ||= user
+ # we need to check if user is of admin user class to avoid mismatch type error
+ # in a scenario where we have separate classes for admin and regular users
+ self.created_by ||= user if user.is_a?(Spree.admin_user_class)
self.bill_address ||= user.bill_address.try(:clone)
self.ship_address ||= user.ship_address.try(:clone)