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
Ensure we're always dealing with Orders from the current store
Damian Legawiecb122044f8efb
diff --git a/core/app/models/spree/promotion/rules/first_order.rb b/core/app/models/spree/promotion/rules/first_order.rbindex 6537f1c4df..7cd39fcec0 100644--- a/core/app/models/spree/promotion/rules/first_order.rb+++ b/core/app/models/spree/promotion/rules/first_order.rb@@ -30,6 +30,7 @@ module Spreeenddef orders_by_email+ # FIXME: this will need a change after we associate Promotion with StoreSpree::Order.where(email: email).completeendenddiff --git a/core/app/services/spree/cart/create.rb b/core/app/services/spree/cart/create.rbindex 26aca2c894..827edc06fb 100644--- a/core/app/services/spree/cart/create.rb+++ b/core/app/services/spree/cart/create.rb@@ -8,12 +8,11 @@ module Spreedefault_params = {user: user,- store: store,currency: currency,token: Spree::GenerateToken.new.call(Spree::Order)}- order = Spree::Order.create!(default_params.merge(order_params))+ order = store.orders.create!(default_params.merge(order_params))success(order)endenddiff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rbindex 07380350cc..a0edb1fc79 100644--- a/core/lib/spree/core/controller_helpers/order.rb+++ b/core/lib/spree/core/controller_helpers/order.rb@@ -19,7 +19,7 @@ module Spree@simple_current_order.last_ip_address = ip_addressreturn @simple_current_orderelse- @simple_current_order = Spree::Order.new+ @simple_current_order = current_store.orders.newendend@@ -36,7 +36,7 @@ module Spree@current_order = find_order_by_token_or_user(options, true)if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)- @current_order = Spree::Order.create!(current_order_params)+ @current_order = current_store.orders.create!(current_order_params)@current_order.associate_user! try_spree_current_user if try_spree_current_user@current_order.last_ip_address = ip_addressend@@ -75,7 +75,7 @@ module Spreeenddef current_order_params- { currency: current_currency, token: cookies.signed[:token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }+ { currency: current_currency, token: cookies.signed[:token], user_id: try_spree_current_user.try(:id) }enddef find_order_by_token_or_user(options = {}, with_adjustments = false)@@ -88,7 +88,7 @@ module Spreeend# Find any incomplete orders for the token- incomplete_orders = Spree::Order.incomplete.includes(includes)+ incomplete_orders = current_store.orders.incomplete.includes(includes)token_order_params = current_order_params.except(:user_id)order = if with_adjustmentsdiff --git a/core/lib/spree/testing_support/order_walkthrough.rb b/core/lib/spree/testing_support/order_walkthrough.rbindex fe284bb79e..80eff06067 100644--- a/core/lib/spree/testing_support/order_walkthrough.rb+++ b/core/lib/spree/testing_support/order_walkthrough.rb@@ -28,7 +28,7 @@ class OrderWalkthroughendend- order = Spree::Order.create!(email: '[email protected]')+ order = store.orders.create!(email: '[email protected]')add_line_item!(order)order.next!diff --git a/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/core/spec/lib/spree/core/controller_helpers/order_spec.rbindex 9b1dcb60f6..4efd80b9da 100644--- a/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/order_spec.rb@@ -3,6 +3,8 @@ require 'spec_helper'class FakesController < ApplicationControllerinclude Spree::Core::ControllerHelpers::Storeinclude Spree::Core::ControllerHelpers::Order+ include Spree::Core::ControllerHelpers::Currency+ include Spree::Core::ControllerHelpers::Localeenddescribe Spree::Core::ControllerHelpers::Order, type: :controller do@@ -52,8 +54,8 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller doendcontext 'gets using the token' do- let!(:order) { create :order, user: user }- let!(:guest_order) { create :order, user: nil, email: nil, token: 'token' }+ let!(:order) { create :order, user: user, store: store }+ let!(:guest_order) { create :order, user: nil, email: nil, token: 'token', store: store }before doexpect(controller).to receive(:current_order_params).and_return(