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
Fix merged-branch specs: where(user:) on order scope + factory key
Łukasz Adamczyk82151d5867c1
diff --git a/spree/api/app/controllers/spree/api/v3/store/orders/claims_controller.rb b/spree/api/app/controllers/spree/api/v3/store/orders/claims_controller.rbindex c1ff8bdd38..5af6f1eb1b 100644--- a/spree/api/app/controllers/spree/api/v3/store/orders/claims_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/orders/claims_controller.rb@@ -63,7 +63,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/controllers/spree/api/v3/store/orders/returns_controller.rb b/spree/api/app/controllers/spree/api/v3/store/orders/returns_controller.rbindex 5a1a33050c..a0b01cb9df 100644--- a/spree/api/app/controllers/spree/api/v3/store/orders/returns_controller.rb+++ b/spree/api/app/controllers/spree/api/v3/store/orders/returns_controller.rb@@ -70,7 +70,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/core/app/models/spree/gateway/bogus.rb b/spree/core/app/models/spree/gateway/bogus.rbindex bfec73bfbe..6ddcf6a7ec 100644--- a/spree/core/app/models/spree/gateway/bogus.rb+++ b/spree/core/app/models/spree/gateway/bogus.rb@@ -137,7 +137,7 @@ module Spreedef complete_payment_setup_session(setup_session:, params: {})credit_card = CreditCard.create!(- user: setup_session.customer,+ customer: setup_session.customer,payment_method: self,name: 'Bogus Card',last_digits: '4242',diff --git a/spree/core/app/workflows/spree/carts/complete.rb b/spree/core/app/workflows/spree/carts/complete.rbindex b6fb4dd586..4c6c9398ac 100644--- a/spree/core/app/workflows/spree/carts/complete.rb+++ b/spree/core/app/workflows/spree/carts/complete.rb@@ -176,7 +176,7 @@ module Spreelocale: cart.locale,market: cart.market,channel: cart.channel,- user: cart.customer,+ customer: cart.customer,token: cart.token,accept_marketing: cart.accept_marketing,coupon_code: cart.read_attribute(:coupon_code),diff --git a/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rb b/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rbindex 848d4510af..2c8bef2b6b 100644--- a/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rb+++ b/spree/core/spec/models/concerns/spree/purchase/lifecycle_spec.rb@@ -87,7 +87,7 @@ RSpec.describe Spree::Purchase::Lifecycle docontext 'included in Spree::Order' dodef new_record(customer: nil, **attributes)- build(:order, store: @default_store, user: customer, **attributes)+ build(:order, store: @default_store, customer: customer, **attributes)enddef new_record_with_line_items