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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Migrate first-party code off the user->customer deprecation aliases
Łukasz Adamczyk67d7e0abe2e0
diff --git a/docs/plans/decisions.md b/docs/plans/decisions.mdindex 2313fab966..301df49b10 100644--- a/docs/plans/decisions.md+++ b/docs/plans/decisions.md@@ -214,7 +214,7 @@ storefront customer (not an admin user).- `spree_imports.user_id` — admin who ran the import- `spree_exports.user_id` — admin who ran the export- `spree_reports.user_id` — admin who generated the report-- `spree_state_changes.user_id` — admin who triggered the change+- `spree_state_changes.user_id` — references the order's **customer** (set from `order.customer_id`), not an admin. Kept as `user_id` because it's an internal state-audit log, not customer-facing API surface; the `belongs_to :user` association resolves to `Spree.customer_class`.- `spree_user_identities.user_id` — polymorphic (Customer or AdminUser)Single migration renames all 11 columns. Model associations updated:diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rbindex 8e3f647d9a..64fb1e6e43 100644--- a/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb@@ -16,7 +16,7 @@ module Spreeresult = Spree.order_create_service.call(store: current_store,- user: resolve_user,+ customer: resolve_user,params: order_create_params)@@ -124,7 +124,7 @@ module Spreeenddef collection_includes- [:line_items, :user, :channel, :rich_text_internal_note]+ [:line_items, :customer, :channel, :rich_text_internal_note]endprivatediff --git a/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb b/spree/api/app/controllers/spree/api/v3/store/carts_controller.rbindex 0f0a3065c6..767e7e11f2 100644--- a/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/carts_controller.rb@@ -147,7 +147,7 @@ module Spree# Explicit by-ID lookups (show/update) stay cross-channel so a shared# checkout can load any cart the caller is authorized for.def scope- current_store.carts.where(user: current_user, channel: current_channel).order(updated_at: :desc)+ current_store.carts.where(customer: current_user, channel: current_channel).order(updated_at: :desc)endprivate@@ -185,7 +185,7 @@ module Spree# Find incomplete cart for associate action.# Only finds guest carts (no user) or carts already owned by current user (idempotent).def find_cart_for_association- current_store.carts.where(user: [nil, current_user]).find_by_prefix_id!(params[:id])+ current_store.carts.where(customer: [nil, current_user]).find_by_prefix_id!(params[:id])end# Claiming a cart requires presenting its token, even when the callerdiff --git a/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb b/spree/api/app/controllers/spree/api/v3/store/orders_controller.rbindex c9a86d385a..ab2ec425cb 100644--- a/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/orders_controller.rb@@ -22,7 +22,7 @@ module Spreebase = current_store.orders.completeif current_user.present?- base.where(user: current_user)+ base.where(customer: current_user)elsif order_token.present?base.where(token: order_token)elsediff --git a/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rbindex 279d692f01..b1275210cb 100644--- a/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/address_serializer.rb@@ -11,7 +11,7 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601attribute :customer_id do |address|- address.user&.prefixed_id+ address.customer&.prefixed_idendendenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/credit_card_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/credit_card_serializer.rbindex f1af54272f..060728623c 100644--- a/spree/api/app/serializers/spree/api/v3/admin/credit_card_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/credit_card_serializer.rb@@ -8,7 +8,7 @@ module Spreemetadata: 'Record<string, unknown>'attribute :customer_id do |credit_card|- credit_card.user&.prefixed_id+ credit_card.customer&.prefixed_idendattribute :payment_method_id do |credit_card|diff --git a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rbindex 8e3e9892b5..2c1177da4b 100644--- a/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/customer_serializer.rb@@ -5,10 +5,7 @@ module Spree# Admin API Customer Serializer# Full customer data including admin-only fieldsclass CustomerSerializer < V3::CustomerSerializer- typelize login: [:string, nullable: true],- last_sign_in_at: [:string, nullable: true], current_sign_in_at: [:string, nullable: true],- sign_in_count: :number, failed_attempts: :number,- last_sign_in_ip: [:string, nullable: true], current_sign_in_ip: [:string, nullable: true],+ typelize failed_attempts: :number,tags: [:string, multi: true],internal_note_html: [:string, nullable: true],metadata: 'Record<string, unknown>',@@ -21,26 +18,9 @@ module Spreecustomer_group_ids: [:string, multi: true]# Admin-only attributes- attributes :login, :metadata,- last_sign_in_at: :iso8601, current_sign_in_at: :iso8601,+ attributes :failed_attempts, :metadata,created_at: :iso8601, updated_at: :iso8601- attribute :sign_in_count do |user|- user.sign_in_count- end-- attribute :failed_attempts do |user|- user.failed_attempts- end-- attribute :last_sign_in_ip do |user|- user.last_sign_in_ip- end-- attribute :current_sign_in_ip do |user|- user.current_sign_in_ip- end-attribute :tags do |user|user.tags.map(&:name) # not pluck as we preload tagsenddiff --git a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rbindex ceda1d5a08..122809ce94 100644--- a/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/gift_card_serializer.rb@@ -19,7 +19,7 @@ module Spreeattributes created_at: :iso8601, updated_at: :iso8601attribute :customer_id do |gift_card|- gift_card.user&.prefixed_id+ gift_card.customer&.prefixed_idendattribute :created_by_id do |gift_card|diff --git a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rbindex fd4baeef73..7b9856a333 100644--- a/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/order_serializer.rb@@ -65,7 +65,7 @@ module Spreeendattribute :customer_id do |order|- order.user&.prefixed_id+ order.customer&.prefixed_idend# Override inherited associations to use admin serializersdiff --git a/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb b/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rbindex 27c0edf570..5866ae777a 100644--- a/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/admin/store_credit_serializer.rb@@ -14,7 +14,7 @@ module Spreecreated_at: :iso8601, updated_at: :iso8601attribute :customer_id do |store_credit|- store_credit.user&.prefixed_id+ store_credit.customer&.prefixed_idendattribute :created_by_id do |store_credit|diff --git a/spree/api/app/serializers/spree/api/v3/newsletter_subscriber_serializer.rb b/spree/api/app/serializers/spree/api/v3/newsletter_subscriber_serializer.rbindex 84d315f120..e4014772e9 100644--- a/spree/api/app/serializers/spree/api/v3/newsletter_subscriber_serializer.rb+++ b/spree/api/app/serializers/spree/api/v3/newsletter_subscriber_serializer.rb@@ -19,7 +19,7 @@ module Spreeendattribute :customer_id do |subscriber|- subscriber.user&.prefixed_id+ subscriber.customer&.prefixed_idendendenddiff --git a/spree/core/app/models/spree/address.rb b/spree/core/app/models/spree/address.rbindex e794a80691..3c45c4abe6 100644--- a/spree/core/app/models/spree/address.rb+++ b/spree/core/app/models/spree/address.rb@@ -47,13 +47,13 @@ module Spreehas_many :shipments, inverse_of: :address- after_initialize :set_default_values, if: -> { new_record? && user.present? }+ after_initialize :set_default_values, if: -> { new_record? && customer.present? }before_validation :normalize_countrybefore_validation :normalize_statebefore_validation :clear_invalid_state_entities, if: -> { country.present? }, on: :update- after_create :set_user_attributes, if: -> { user.present? }+ after_create :set_user_attributes, if: -> { customer.present? }after_commit :async_geocode@@ -119,12 +119,12 @@ module Spree# In 6.0 these become real columns on Address, replacing User#bill_address_id / ship_address_id.# For now they delegate to the User FK so the API shape is stable.def is_default_billing?- user.present? && id == user.bill_address_id+ customer.present? && id == customer.bill_address_idendalias_method :is_default_billing, :is_default_billing?def is_default_shipping?- user.present? && id == user.ship_address_id+ customer.present? && id == customer.ship_address_idendalias_method :is_default_shipping, :is_default_shipping?@@ -226,7 +226,7 @@ module Spreedef checkattrs = attributes.except('id', 'updated_at', 'created_at')- the_same_address = user&.addresses&.find_by(attrs)+ the_same_address = customer&.addresses&.find_by(attrs)the_same_address || selfend@@ -258,9 +258,9 @@ module Spreeenddef set_default_values- self.firstname ||= user.first_name- self.lastname ||= user.last_name- self.phone ||= user.phone+ self.firstname ||= customer.first_name+ self.lastname ||= customer.last_name+ self.phone ||= customer.phoneenddef normalize_country@@ -296,13 +296,13 @@ module Spreeenddef set_user_attributes- if user.name.blank?- user.first_name = firstname- user.last_name = lastname+ if customer.name.blank?+ customer.first_name = firstname+ customer.last_name = lastnameend- user.phone = user.phone.presence || phone.presence+ customer.phone = customer.phone.presence || phone.presence- user.save! if user.changed?+ customer.save! if customer.changed?enddef state_validate@@ -351,20 +351,20 @@ module Spreeenddef assign_new_default_address_to_user- return unless user+ return unless customer- user.reload- return if user.bill_address != self && user.ship_address != self+ customer.reload+ return if customer.bill_address != self && customer.ship_address != selflast_address = assign_new_default_address_to_user_scope.find { |address| address.id != id && address.valid? }- user.bill_address = last_address if user.bill_address == self- user.ship_address = last_address if user.ship_address == self- user.save!+ customer.bill_address = last_address if customer.bill_address == self+ customer.ship_address = last_address if customer.ship_address == self+ customer.save!enddef assign_new_default_address_to_user_scope- user.addresses.not_quick_checkout.reorder(created_at: :desc)+ customer.addresses.not_quick_checkout.reorder(created_at: :desc)enddef unassign_from_incomplete_ordersdiff --git a/spree/core/app/models/spree/gateway/custom_payment_source_method.rb b/spree/core/app/models/spree/gateway/custom_payment_source_method.rbindex c548c31360..459e6fc4d4 100644--- a/spree/core/app/models/spree/gateway/custom_payment_source_method.rb+++ b/spree/core/app/models/spree/gateway/custom_payment_source_method.rb@@ -23,15 +23,15 @@ module Spreedef create_profile(payment)return if payment.source.gateway_customer.present?- user = payment.source.user || payment.order.user- return if user.blank?+ customer = payment.source.customer || payment.order.customer+ return if customer.blank?- find_or_create_customer(user)+ find_or_create_customer(customer)end# simulate a 3rd party payment gateway api to fetch/or create a customer- def find_or_create_customer(user)- gateway_customers.find_or_create_by!(customer: user, profile_id: "CUSTOMER-#{user.id}")+ def find_or_create_customer(customer)+ gateway_customers.find_or_create_by!(customer: customer, profile_id: "CUSTOMER-#{customer.id}")endendenddiff --git a/spree/core/app/models/spree/gateway_customer.rb b/spree/core/app/models/spree/gateway_customer.rbindex 666285dd81..b749b81286 100644--- a/spree/core/app/models/spree/gateway_customer.rb+++ b/spree/core/app/models/spree/gateway_customer.rb@@ -7,7 +7,7 @@ module Spreeinclude Spree::DeprecatedCustomerAliasvalidates :payment_method, presence: true- validates :user, presence: true+ validates :customer, presence: truevalidates :profile_id, presence: truevalidates :payment_method_id, uniqueness: { scope: :user_id }diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex 5e808c42da..3310c1217e 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -618,8 +618,8 @@ module Spreeenddef full_name- @full_name ||= if user.present? && user.name.present?- user.full_name+ @full_name ||= if customer.present? && customer.name.present?+ customer.full_nameelsebilling_address&.full_name || emailend@@ -1087,7 +1087,7 @@ module Spreeenddef link_by_email- self.email = user.email if user+ self.email = customer.email if customerend# Determine if email is required (we don't want validation errors before we hit the checkout)diff --git a/spree/core/app/models/spree/order/address_book.rb b/spree/core/app/models/spree/order/address_book.rbindex 577c503624..3fb0aee7df 100644--- a/spree/core/app/models/spree/order/address_book.rb+++ b/spree/core/app/models/spree/order/address_book.rb@@ -3,13 +3,13 @@ module Spreemodule AddressBookdef clone_shipping_addressself.bill_address = ship_address if ship_address- user.bill_address = ship_address if should_assign_user_default_address?(ship_address)+ customer.bill_address = ship_address if should_assign_user_default_address?(ship_address)trueenddef clone_billing_addressself.ship_address = bill_address if bill_address- user.ship_address = bill_address if should_assign_user_default_address?(bill_address)+ customer.ship_address = bill_address if should_assign_user_default_address?(bill_address)trueend@@ -18,7 +18,7 @@ module Spreeaddress = Spree::Address.find_by(id: id)# rubocop:disable Style/ConditionalAssignment- if address && user_id.present? && address.user_id == user_id+ if address && customer_id.present? && address.customer_id == customer_idself['bill_address_id'] = address.idelseself['bill_address_id'] = nil@@ -29,7 +29,7 @@ module Spreedef bill_address_attributes=(attributes)self.bill_address = update_or_create_address(attributes)- user.bill_address = bill_address if should_assign_user_default_address?(bill_address)+ customer.bill_address = bill_address if should_assign_user_default_address?(bill_address)enddef ship_address_id=(id)@@ -37,7 +37,7 @@ module Spreeaddress = Spree::Address.find_by(id: id)# rubocop:disable Style/ConditionalAssignment- if address && user_id.present? && address.user_id == user_id+ if address && customer_id.present? && address.customer_id == customer_idself['ship_address_id'] = address.idelseself['ship_address_id'] = nil@@ -48,7 +48,7 @@ module Spreedef ship_address_attributes=(attributes)self.ship_address = update_or_create_address(attributes)- user.ship_address = ship_address if should_assign_user_default_address?(ship_address)+ customer.ship_address = ship_address if should_assign_user_default_address?(ship_address)self.ship_address = nil if quick_checkout_address?(attributes[:quick_checkout]) && !ship_address.persisted?end@@ -60,7 +60,7 @@ module Spreeattributes.transform_values!(&:presence)attributes = attributes.to_h.symbolize_keys- default_address_scope = user ? user.addresses : ::Spree::Address.where(user_id: nil)+ default_address_scope = customer ? customer.addresses : ::Spree::Address.where(user_id: nil)default_address = default_address_scope.find_by(id: attributes[:id])if default_address&.editable?@@ -70,7 +70,7 @@ module Spreeendattributes = attributes.except(:id, :updated_at, :created_at)- attributes[:user_id] = user&.id+ attributes[:customer_id] = customer&.idexisting_address = find_existing_address(attributes)return existing_address if existing_address@@ -93,7 +93,7 @@ module Spreeenddef should_assign_user_default_address?(address)- user.present? && address.present? && address.valid? && address.user == user && !address.quick_checkout?+ customer.present? && address.present? && address.valid? && address.customer == customer && !address.quick_checkout?endendenddiff --git a/spree/core/app/models/spree/order/checkout.rb b/spree/core/app/models/spree/order/checkout.rbindex 904e80947c..47c88dfe5c 100644--- a/spree/core/app/models/spree/order/checkout.rb+++ b/spree/core/app/models/spree/order/checkout.rb@@ -48,7 +48,7 @@ module Spreeprevious_state: transition.from,next_state: transition.to,name: 'order',- user_id: order.user_id+ user_id: order.customer_id)order.saveend@@ -223,7 +223,7 @@ module Spreeend# Customer-facing checkout step derived from the internal state machine state.- # Maps +'cart'+ to +'address'+ since cart is not a user-facing checkout step.+ # Maps +'cart'+ to +'address'+ since cart is not a customer-facing checkout step.## @return [String] current checkout step name (e.g. +"address"+, +"delivery"+, +"payment"+)def current_checkout_step@@ -266,7 +266,7 @@ module Spreeif existing_card_id.present?credit_card = CreditCard.find existing_card_id- if credit_card.user_id != user_id || credit_card.user_id.blank?+ if credit_card.customer_id != customer_id || credit_card.customer_id.blank?raise Core::GatewayError, Spree.t(:invalid_credit_card)end@@ -290,16 +290,16 @@ module Spreeenddef assign_default_addresses!- if user- self.bill_address = user.bill_address if !bill_address_id && user.bill_address&.valid?+ if customer+ self.bill_address = customer.bill_address if !bill_address_id && customer.bill_address&.valid?# Skip setting ship address if order doesn't have a delivery checkout step# to avoid triggering validations on shipping address- self.ship_address = user.ship_address if !ship_address_id && user.ship_address&.valid? && checkout_steps.include?('delivery')+ self.ship_address = customer.ship_address if !ship_address_id && customer.ship_address&.valid? && checkout_steps.include?('delivery')endenddef create_user_record- return if user.present?+ return if customer.present?return unless signup_for_an_account?Spree::Orders::CreateUserAccount.call(order: self, accepts_email_marketing: accept_marketing?)diff --git a/spree/core/app/models/spree/order/store_credit.rb b/spree/core/app/models/spree/order/store_credit.rbindex 87d8a0137f..6b3d933bcc 100644--- a/spree/core/app/models/spree/order/store_credit.rb+++ b/spree/core/app/models/spree/order/store_credit.rb@@ -10,27 +10,27 @@ module Spreeenddef covered_by_store_credit?- user.present? && total_applied_store_credit.positive? && total_applied_store_credit >= total+ customer.present? && total_applied_store_credit.positive? && total_applied_store_credit >= totalendalias covered_by_store_credit covered_by_store_credit?- # Returns the total amount of store credits available to the user associated with the order.+ # Returns the total amount of store credits available to the customer associated with the order.# Returns only store credit for this store and same currency as order#- # @return [BigDecimal] The total amount of store credits available to the user associated with the order.+ # @return [BigDecimal] The total amount of store credits available to the customer associated with the order.def total_available_store_credit- return 0.0 unless user+ return 0.0 unless customer- user.total_available_store_credit(currency, store)+ customer.total_available_store_credit(currency, store)end- # Returns the available store credits for the user associated with the order.+ # Returns the available store credits for the customer associated with the order.#- # @return [Array<Spree::StoreCredit>] The available store credits for the user associated with the order.+ # @return [Array<Spree::StoreCredit>] The available store credits for the customer associated with the order.def available_store_credits- return Spree::StoreCredit.none if user.nil?+ return Spree::StoreCredit.none if customer.nil?- user.store_credits.for_store(store).where(currency: currency).available.sort_by(&:amount_remaining).reverse+ customer.store_credits.for_store(store).where(currency: currency).available.sort_by(&:amount_remaining).reverseenddef could_use_store_credit?@@ -57,7 +57,7 @@ module Spreeif payment? || confirm? || complete?total_applied_store_creditelse- [total, user.try(:total_available_store_credit) || 0.0].min+ [total, customer.try(:total_available_store_credit) || 0.0].minendenddiff --git a/spree/core/app/models/spree/order_merger.rb b/spree/core/app/models/spree/order_merger.rbindex 9d08ce36e0..01f34e0e7c 100644--- a/spree/core/app/models/spree/order_merger.rb+++ b/spree/core/app/models/spree/order_merger.rb@@ -42,7 +42,7 @@ module Spreeenddef set_user(user = nil)- order.associate_user!(user) if !order.user && !user.blank?+ order.associate_user!(user) if !order.customer && !user.blank?enddef clear_addresses(other_order)diff --git a/spree/core/app/models/spree/payment_session.rb b/spree/core/app/models/spree/payment_session.rbindex cd73f157c8..59a1464138 100644--- a/spree/core/app/models/spree/payment_session.rb+++ b/spree/core/app/models/spree/payment_session.rb@@ -126,7 +126,7 @@ module Spreeself.amount ||= order.total_minus_store_credits if amount.blank? || amount.zero?self.currency ||= order.currency- self.customer ||= order.user+ self.customer ||= order.customerendendenddiff --git a/spree/core/app/models/spree/permission_sets/default_customer.rb b/spree/core/app/models/spree/permission_sets/default_customer.rbindex 40715ad1a2..90091cdb48 100644--- a/spree/core/app/models/spree/permission_sets/default_customer.rb+++ b/spree/core/app/models/spree/permission_sets/default_customer.rb@@ -29,21 +29,21 @@ module Spree# Order management for the user's own orderscan :create, Spree::Ordercan :show, Spree::Order do |order, token|- order.user == user || order.token && token == order.token+ order.customer == user || order.token && token == order.tokenendcan :update, Spree::Order do |order, token|- !order.completed? && (order.user == user || order.token && token == order.token)+ !order.completed? && (order.customer == user || order.token && token == order.token)end# Line item managementcan :create, Spree::LineItem do |line_item, token|- line_item.order.user == user || line_item.order.token && token == line_item.order.token+ line_item.order.customer == user || line_item.order.token && token == line_item.order.tokenendcan :update, Spree::LineItem do |line_item, token|- !line_item.order.completed? && (line_item.order.user == user || line_item.order.token && token == line_item.order.token)+ !line_item.order.completed? && (line_item.order.customer == user || line_item.order.token && token == line_item.order.token)endcan :destroy, Spree::LineItem do |line_item, token|- !line_item.order.completed? && (line_item.order.user == user || line_item.order.token && token == line_item.order.token)+ !line_item.order.completed? && (line_item.order.customer == user || line_item.order.token && token == line_item.order.token)end# User account management - available to all users (including guests for their own record)@@ -65,10 +65,10 @@ module Spree# Wishlist managementcan :manage, Spree::Wishlist, user_id: user.idcan :show, Spree::Wishlist do |wishlist|- wishlist.user == user || wishlist.is_private == false+ wishlist.customer == user || wishlist.is_private == falseendcan [:create, :update, :destroy], Spree::WishedItem do |wished_item|- wished_item.wishlist.user == user+ wished_item.wishlist.customer == userend# Invitation acceptancediff --git a/spree/core/app/models/spree/promotion/rules/first_order.rb b/spree/core/app/models/spree/promotion/rules/first_order.rbindex a0765bf4f7..a8bc00c89e 100644--- a/spree/core/app/models/spree/promotion/rules/first_order.rb+++ b/spree/core/app/models/spree/promotion/rules/first_order.rb@@ -9,7 +9,7 @@ module Spreeenddef eligible?(order, options = {})- @user = order.try(:user) || options[:user]+ @user = order.try(:customer) || options[:user]@email = if options[:email].present?order.email = options[:email]order.emaildiff --git a/spree/core/app/models/spree/reimbursement_type/reimbursement_helpers.rb b/spree/core/app/models/spree/reimbursement_type/reimbursement_helpers.rbindex 06a44d2745..ee51813468 100644--- a/spree/core/app/models/spree/reimbursement_type/reimbursement_helpers.rb+++ b/spree/core/app/models/spree/reimbursement_type/reimbursement_helpers.rb@@ -46,7 +46,7 @@ module Spreedef store_credit_params(category, reimbursement, unpaid_amount){- user: reimbursement.order.user,+ user: reimbursement.order.customer,amount: unpaid_amount,category: category,created_by: reimbursement.order.store.users.first,diff --git a/spree/core/app/models/spree/store_credit.rb b/spree/core/app/models/spree/store_credit.rbindex 214681c87e..d8fe4cc007 100644--- a/spree/core/app/models/spree/store_credit.rb+++ b/spree/core/app/models/spree/store_credit.rb@@ -59,7 +59,7 @@ module Spreeself[:amount] = Spree::LocalizedNumber.parse(amount)end- self.whitelisted_ransackable_attributes = %w[customer_id user_id created_by_id amount currency type_id]+ self.whitelisted_ransackable_attributes = %w[customer_id customer_id created_by_id amount currency type_id]self.whitelisted_ransackable_associations = %w[type customer created_by]def amount_remaining@@ -209,7 +209,7 @@ module Spreedef create_credit_record_params(amount){amount: amount,- user_id: user_id,+ user_id: customer_id,category_id: category_id,created_by_id: created_by_id,currency: currency,@@ -238,7 +238,7 @@ module Spreeevent.update!(amount: action_amount || amount,authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,- user_total_amount: user&.total_available_store_credit || 0,+ user_total_amount: customer&.total_available_store_credit || 0,originator: action_originator)enddiff --git a/spree/core/app/presenters/spree/csv/gift_card_presenter.rb b/spree/core/app/presenters/spree/csv/gift_card_presenter.rbindex d5d7b53c9e..2617f97c9c 100644--- a/spree/core/app/presenters/spree/csv/gift_card_presenter.rb+++ b/spree/core/app/presenters/spree/csv/gift_card_presenter.rb@@ -33,9 +33,9 @@ module Spreegift_card.currency,gift_card.display_state,gift_card.expires_at&.strftime('%Y-%m-%d'),- gift_card.user&.email,- gift_card.user&.first_name,- gift_card.user&.last_name,+ gift_card.customer&.email,+ gift_card.customer&.first_name,+ gift_card.customer&.last_name,gift_card.created_at&.strftime('%Y-%m-%d %H:%M:%S'),gift_card.updated_at&.strftime('%Y-%m-%d %H:%M:%S')]diff --git a/spree/core/app/presenters/spree/csv/newsletter_subscriber_presenter.rb b/spree/core/app/presenters/spree/csv/newsletter_subscriber_presenter.rbindex 5695a0156d..65dec2a2f5 100644--- a/spree/core/app/presenters/spree/csv/newsletter_subscriber_presenter.rb+++ b/spree/core/app/presenters/spree/csv/newsletter_subscriber_presenter.rb@@ -22,8 +22,8 @@ module Spreedef callcsv = [newsletter_subscriber.email,- newsletter_subscriber.user&.full_name,- newsletter_subscriber.user_id,+ newsletter_subscriber.customer&.full_name,+ newsletter_subscriber.customer_id,newsletter_subscriber.verified? ? Spree.t(:say_yes) : Spree.t(:say_no),newsletter_subscriber.verified_at,newsletter_subscriber.created_at,diff --git a/spree/core/app/services/spree/addresses/create.rb b/spree/core/app/services/spree/addresses/create.rbindex 7cf3af3634..0069a9e88b 100644--- a/spree/core/app/services/spree/addresses/create.rb+++ b/spree/core/app/services/spree/addresses/create.rb@@ -14,7 +14,7 @@ module Spreeaddress_params = fill_country_and_state_ids(address_params)address = Spree::Address.new(address_params)- address.user = user if user.present?+ address.customer = user if user.present?ApplicationRecord.transaction doif address.savediff --git a/spree/core/app/services/spree/addresses/update.rb b/spree/core/app/services/spree/addresses/update.rbindex 298ef39275..98cf96627a 100644--- a/spree/core/app/services/spree/addresses/update.rb+++ b/spree/core/app/services/spree/addresses/update.rb@@ -34,7 +34,7 @@ module Spreeaddress_changed = address_changes.any?if !address_changed && defaults_changed?(address, default_billing, default_shipping)assign_to_user_as_default(- user: address.user,+ user: address.customer,address_id: address.id,default_billing: default_billing,default_shipping: default_shipping@@ -46,9 +46,9 @@ module Spreeif address.editable?address.update!(address_params)- if address.user.present?+ if address.customer.present?assign_to_user_as_default(- user: address.user,+ user: address.customer,address_id: address.id,default_billing: default_billing,default_shipping: default_shipping@@ -62,12 +62,12 @@ module Spreeold_address_id = address.idaddress.destroy!- if new_address.user.present?+ if new_address.customer.present?default_billing = address.user_default_billing? || default_billingdefault_shipping = address.user_default_shipping? || default_shippingassign_to_user_as_default(- user: new_address.user,+ user: new_address.customer,address_id: new_address.id,default_billing: default_billing,default_shipping: default_shipping@@ -83,20 +83,20 @@ module Spreeenddef prepare_address_params!(address, address_params)- address_params[:user_id] = address&.user_id+ address_params[:user_id] = address&.customer_idaddress_params[:country_id] ||= address.country_idaddress_params = fill_country_and_state_ids(address_params)address_params.transform_values!(&:presence)enddef reassign_incomplete_orders(old_address_id, new_address)- orders = Spree::Order.incomplete.where(user_id: new_address.user_id)+ orders = Spree::Order.incomplete.where(user_id: new_address.customer_id)orders.where(ship_address_id: old_address_id).update_all(ship_address_id: new_address.id, state: 'address', updated_at: Time.current)orders.where(bill_address_id: old_address_id).update_all(bill_address_id: new_address.id, state: 'address', updated_at: Time.current)enddef defaults_changed?(address, default_billing, default_shipping)- user = address.user+ user = address.customeruser.present? && ((default_billing.present? && user.bill_address != address) ||diff --git a/spree/core/app/services/spree/cart/associate.rb b/spree/core/app/services/spree/cart/associate.rbindex 8b47514e5f..ee496e72ad 100644--- a/spree/core/app/services/spree/cart/associate.rb+++ b/spree/core/app/services/spree/cart/associate.rb@@ -4,9 +4,9 @@ module Spreeprepend Spree::ServiceModule::Basedef call(guest_order:, user:, override_email: true, guest_only: false)- return failure(guest_order, 'Already assigned to a user') if guest_only && guest_order.user.present? && guest_order.user != user+ return failure(guest_order, 'Already assigned to a user') if guest_only && guest_order.customer.present? && guest_order.customer != user- guest_order.user = user+ guest_order.customer = userguest_order.email = user.email if override_emailguest_order.bill_address ||= user.bill_addressguest_order.ship_address ||= user.ship_addressdiff --git a/spree/core/app/services/spree/carts/update.rb b/spree/core/app/services/spree/carts/update.rbindex 6e17c882eb..191addc291 100644--- a/spree/core/app/services/spree/carts/update.rb+++ b/spree/core/app/services/spree/carts/update.rb@@ -81,10 +81,10 @@ module Spreeenddef resolve_address_id(prefixed_id)- return unless cart.user+ return unless cart.customerdecoded = Spree::Address.decode_prefixed_id(prefixed_id)- decoded ? cart.user.addresses.find_by(id: decoded)&.id : nil+ decoded ? cart.customer.addresses.find_by(id: decoded)&.id : nilenddef assign_marketdiff --git a/spree/core/app/services/spree/checkout/add_store_credit.rb b/spree/core/app/services/spree/checkout/add_store_credit.rbindex a1f9d8f300..52a7c78eb2 100644--- a/spree/core/app/services/spree/checkout/add_store_credit.rb+++ b/spree/core/app/services/spree/checkout/add_store_credit.rb@@ -9,7 +9,7 @@ module Spreeremaining_total = amount ? [amount, @order.outstanding_balance].min : @order.outstanding_balance- return failure(nil, Spree.t(:error_user_does_not_have_any_store_credits)) unless @order.user&.store_credits&.any?+ return failure(nil, Spree.t(:error_user_does_not_have_any_store_credits)) unless @order.customer&.store_credits&.any?ApplicationRecord.transaction doexisting = @order.payments.store_credits.where(state: :checkout)@@ -55,7 +55,7 @@ module Spreepayment_method = Spree::PaymentMethod::StoreCredit.available.firstraise 'Store credit payment method could not be found' unless payment_method- @order.user.store_credits.for_store(@order.store).order_by_priority.each do |credit|+ @order.customer.store_credits.for_store(@order.store).order_by_priority.each do |credit|break if remaining_total.zero?next if credit.amount_remaining.zero?diff --git a/spree/core/app/services/spree/gift_cards/apply.rb b/spree/core/app/services/spree/gift_cards/apply.rbindex acfd39b19b..1faea50074 100644--- a/spree/core/app/services/spree/gift_cards/apply.rb+++ b/spree/core/app/services/spree/gift_cards/apply.rb@@ -18,11 +18,11 @@ module Spreereturn failure(:gift_card_mismatched_currency) if gift_card.currency != order.currency# gift card requires logged user- if gift_card.user.present?+ if gift_card.customer.present?# user must be logged in- return failure(:gift_card_customer_not_logged_in) if order.user.blank?+ return failure(:gift_card_customer_not_logged_in) if order.customer.blank?# user must be the same as the gift card user- return failure(:gift_card_mismatched_customer) if gift_card.user != order.user+ return failure(:gift_card_mismatched_customer) if gift_card.customer != order.customerendstore = order.store@@ -37,7 +37,7 @@ module Spreestore_credit = gift_card.store_credits.create!(store: store,- user: order.user,+ user: order.customer,amount: amount,currency: order.currency,originator: gift_card,diff --git a/spree/core/app/services/spree/newsletter/subscribe.rb b/spree/core/app/services/spree/newsletter/subscribe.rbindex f4ea0b0b7f..0ac339beb1 100644--- a/spree/core/app/services/spree/newsletter/subscribe.rb+++ b/spree/core/app/services/spree/newsletter/subscribe.rb@@ -41,7 +41,7 @@ module Spreeverification_token: subscriber.verification_token,unsubscribe_token: subscriber.generate_token_for(:unsubscribe),store_id: current_store.prefixed_id,- customer_id: subscriber.user&.prefixed_id+ customer_id: subscriber.customer&.prefixed_id}payload[:redirect_url] = redirect_url if redirect_url.present?payload@@ -49,7 +49,7 @@ module Spreedef upsert_subscriber@upsert_subscriber ||= Spree::NewsletterSubscriber.find_or_create_by(email: email, store: current_store) do |new_record|- new_record.user = known_user+ new_record.customer = known_userendendalias_method :subscriber, :upsert_subscriberdiff --git a/spree/core/app/services/spree/newsletter/verify.rb b/spree/core/app/services/spree/newsletter/verify.rbindex 14244117c4..5b7306afe9 100644--- a/spree/core/app/services/spree/newsletter/verify.rb+++ b/spree/core/app/services/spree/newsletter/verify.rb@@ -22,9 +22,9 @@ module Spreeenddef set_user_email_marketing_to_true- return if subscriber.user.blank?+ return if subscriber.customer.blank?- subscriber.user.update!(accepts_email_marketing: true)+ subscriber.customer.update!(accepts_email_marketing: true)enddef publish_eventdiff --git a/spree/core/app/services/spree/orders/create.rb b/spree/core/app/services/spree/orders/create.rbindex f4074b9496..c73d008253 100644--- a/spree/core/app/services/spree/orders/create.rb+++ b/spree/core/app/services/spree/orders/create.rb@@ -14,12 +14,12 @@ module Spreeattr_reader :discount_application_errors# @param store [Spree::Store]- # @param user [Object, nil] resolved customer (Spree.customer_class instance)+ # @param customer [Object, nil] resolved customer (Spree.customer_class instance)# @param params [Hash] order params (see admin API docs)# @return [Spree::ServiceModule::Result]- def call(store:, user: nil, params: {})+ def call(store:, customer: nil, params: {})@store = store- @user = user+ @customer = customer@params = params.to_h.deep_symbolize_keys@discount_application_errors = []@@ -47,8 +47,8 @@ module Spreedef build_orderattrs = {- user: @user,- email: @params[:email] || @user&.email,+ customer: @customer,+ email: @params[:email] || @customer&.email,currency: @params[:currency].presence&.upcase || @store.default_currency,locale: @params[:locale] || Spree::Current.locale,customer_note: @params[:customer_note],@@ -79,11 +79,11 @@ module Spreeenddef assign_addresses(order)- if @params[:use_customer_default_address] && @user- @user.association(:bill_address).load_target- @user.association(:ship_address).load_target- order.bill_address = @user.bill_address&.dup- order.ship_address = @user.ship_address&.dup+ if @params[:use_customer_default_address] && @customer+ @customer.association(:bill_address).load_target+ @customer.association(:ship_address).load_target+ order.bill_address = @customer.bill_address&.dup+ order.ship_address = @customer.ship_address&.dupendassign_address(order, :ship_address, @params[:shipping_address_id], @params[:shipping_address])@@ -100,9 +100,9 @@ module Spreeenddef resolve_user_address(address_id)- return unless @user+ return unless @customer- @user.addresses.find_by_param(address_id)+ @customer.addresses.find_by_param(address_id)enddef add_items(order)diff --git a/spree/core/app/services/spree/payments/create.rb b/spree/core/app/services/spree/payments/create.rbindex ccb1a9e655..eec9b489a9 100644--- a/spree/core/app/services/spree/payments/create.rb+++ b/spree/core/app/services/spree/payments/create.rb@@ -30,7 +30,7 @@ module Spreepayment_method = payment_attributes[:payment_method]if payment_method&.source_required?- if order.user.present? && params[:source_id].present?+ if order.customer.present? && params[:source_id].present?source = payment_method.payment_source_class.find_by(id: params[:source_id], customer: order.customer)return failure(nil, :source_not_found) if source.nil?@@ -38,7 +38,7 @@ module Spreeresult = Wallet::CreatePaymentSource.call(payment_method: payment_method,params: params.delete(:source_attributes),- user: order.user+ user: order.customer)return failure(nil, result.error.value) if result.failure?diff --git a/spree/core/config/locales/en.yml b/spree/core/config/locales/en.ymlindex 9a83d76246..745abc490b 100644--- a/spree/core/config/locales/en.yml+++ b/spree/core/config/locales/en.yml@@ -274,6 +274,14 @@ en:base:card_expired: Card has expiredexpiry_invalid: Card expiration is invalid+ spree/customer:+ attributes:+ bill_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed order+ ship_address_id:+ belongs_to_other_user: belongs to other user+ deprecated_in_completed_order: deprecated in completed orderspree/gift_card:attributes:base:@@ -289,14 +297,6 @@ en:content_type: has not allowed content typetype:inclusion: is not included in the list of allowed types- spree/customer:- attributes:- bill_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed order- ship_address_id:- belongs_to_other_user: belongs to other user- deprecated_in_completed_order: deprecated in completed orderspree/legacy_user:attributes:bill_address_id: