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.

Do not display User's Orders from different Stores in Admin Panel -> User Orders page

Damian Legawiecc023bc30ea17
diff --git a/backend/app/controllers/spree/admin/users_controller.rb b/backend/app/controllers/spree/admin/users_controller.rb
index 4187d55e16..df007601e4 100644
--- a/backend/app/controllers/spree/admin/users_controller.rb
+++ b/backend/app/controllers/spree/admin/users_controller.rb
@@ -47,13 +47,13 @@ module Spree
def orders
params[:q] ||= {}
- @search = Spree::Order.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
+ @search = current_store.orders.reverse_chronological.ransack(params[:q].merge(user_id_eq: @user.id))
@orders = @search.result.page(params[:page])
end
def items
params[:q] ||= {}
- @search = Spree::Order.includes(
+ @search = current_store.orders.includes(
line_items: {
variant: [:product, { option_values: :option_type }]
}
diff --git a/backend/spec/controllers/spree/admin/users_controller_spec.rb b/backend/spec/controllers/spree/admin/users_controller_spec.rb
index a731df0f84..f992cf0d92 100644
--- a/backend/spec/controllers/spree/admin/users_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/users_controller_spec.rb
@@ -2,6 +2,7 @@ require 'spec_helper'
require 'spree/testing_support/bar_ability'
describe Spree::Admin::UsersController, type: :controller do
+ let(:store) { Spree::Store.default }
let(:user) { create(:user) }
let(:mock_user) { mock_model Spree.user_class }
@@ -138,10 +139,10 @@ describe Spree::Admin::UsersController, type: :controller do
end
describe '#orders' do
- let(:order) { create(:order) }
+ let!(:order) { create(:order, user: user, store: store) }
+ let!(:order_2) { create(:order, user: user, store: create(:store)) }
before do
- user.orders << order
user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
end
@@ -159,10 +160,10 @@ describe Spree::Admin::UsersController, type: :controller do
end
describe '#items' do
- let(:order) { create(:order) }
+ let!(:order) { create(:order, user: user, store: store) }
+ let!(:order_2) { create(:order, user: user, store: create(:store)) }
before do
- user.orders << order
user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
end