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.

Display only Store Orders in the Frontend

Damian Legawieca694445a99a4
diff --git a/core/lib/spree/testing_support/factories/order_factory.rb b/core/lib/spree/testing_support/factories/order_factory.rb
index b565368d9e..c5c48d4c78 100644
--- a/core/lib/spree/testing_support/factories/order_factory.rb
+++ b/core/lib/spree/testing_support/factories/order_factory.rb
@@ -4,7 +4,7 @@ FactoryBot.define do
bill_address
store
completed_at { nil }
- email { user.email }
+ email { user&.email }
currency { 'USD' }
transient do
diff --git a/frontend/app/controllers/spree/orders_controller.rb b/frontend/app/controllers/spree/orders_controller.rb
index 9a99ae416b..8cefe71877 100644
--- a/frontend/app/controllers/spree/orders_controller.rb
+++ b/frontend/app/controllers/spree/orders_controller.rb
@@ -10,7 +10,7 @@ module Spree
before_action :assign_order_with_lock, only: :update
def show
- @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
+ @order = current_store.orders.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
end
def update
@@ -33,7 +33,7 @@ module Spree
# Shows the current incomplete order from the session
def edit
- @order = current_order || Order.incomplete.
+ @order = current_order || current_store.orders.incomplete.
includes(line_items: [variant: [:images, :product, option_values: :option_type]]).
find_or_initialize_by(token: cookies.signed[:token])
associate_user
@@ -56,7 +56,7 @@ module Spree
end
def check_authorization
- order = Spree::Order.find_by(number: params[:id]) if params[:id].present?
+ order = current_store.orders.find_by(number: params[:id]) if params[:id].present?
order ||= current_order
if order && action_name.to_sym == :show
diff --git a/frontend/spec/controllers/spree/orders_controller_ability_spec.rb b/frontend/spec/controllers/spree/orders_controller_ability_spec.rb
index 6082cfaeef..a3b95c1b74 100644
--- a/frontend/spec/controllers/spree/orders_controller_ability_spec.rb
+++ b/frontend/spec/controllers/spree/orders_controller_ability_spec.rb
@@ -2,13 +2,14 @@ require 'spec_helper'
module Spree
describe OrdersController, type: :controller do
+ let(:store) { Spree::Store.default }
let(:user) { create(:user) }
let(:guest_user) { create(:user) }
- let(:order) { Spree::Order.create }
+ let(:order) { create(:order, store: store, user: nil) }
context 'when an order exists in the cookies.signed' do
let(:token) { 'some_token' }
- let(:specified_order) { create(:order) }
+ let(:specified_order) { create(:order, store: store) }
let!(:variant) { create(:variant) }
before do
@@ -61,7 +62,7 @@ module Spree
end
context 'when no authenticated user' do
- let(:order) { create(:order, number: 'R123') }
+ let(:order) { create(:order, number: 'R123', store: store) }
context '#show' do
context 'when token correct' do
@@ -81,5 +82,18 @@ module Spree
end
end
end
+
+ context 'order from another store' do
+ let(:store_2) { create(:store) }
+ let(:order) { create(:order, number: 'R123', store: store_2) }
+
+ describe '#show' do
+ before { cookies.signed[:token] = order.token }
+
+ it 'raises ActiveRecord::RecordNotFound' do
+ expect { get :show, params: { id: 'R123' } }.to raise_error(ActiveRecord::RecordNotFound)
+ end
+ end
+ end
end
end
diff --git a/frontend/spec/features/checkout_spec.rb b/frontend/spec/features/checkout_spec.rb
index 610799142b..840442174f 100644
--- a/frontend/spec/features/checkout_spec.rb
+++ b/frontend/spec/features/checkout_spec.rb
@@ -596,7 +596,7 @@ describe 'Checkout', type: :feature, inaccessible: true, js: true do
context 'when order is completed' do
let!(:user) { create(:user) }
- let!(:order) { create(:order) }
+ let!(:order) { create(:order, store: store) }
before do
add_mug_to_cart