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.

Admin UI: only show Orders from the current store WIP

Damian Legawiec90319d98f035
diff --git a/backend/app/controllers/concerns/spree/admin/order_concern.rb b/backend/app/controllers/concerns/spree/admin/order_concern.rb
new file mode 100644
index 0000000000..da44a7a94c
--- /dev/null
+++ b/backend/app/controllers/concerns/spree/admin/order_concern.rb
@@ -0,0 +1,24 @@
+module Spree
+ module Admin
+ module OrderConcern
+ extend ActiveSupport::Concern
+
+ included do
+ rescue_from ActiveRecord::RecordNotFound, with: :resource_not_found
+ end
+
+ protected
+
+ def load_order
+ @order = current_store.orders.find_by!(number: params[:order_id])
+ authorize! action, @order
+ @order
+ end
+
+ def resource_not_found
+ flash[:error] = flash_message_for(model_class.new, :not_found)
+ redirect_to spree.admin_orders_path
+ end
+ end
+ end
+end
diff --git a/backend/app/controllers/spree/admin/base_controller.rb b/backend/app/controllers/spree/admin/base_controller.rb
index 79f60f38b9..773f83adc2 100644
--- a/backend/app/controllers/spree/admin/base_controller.rb
+++ b/backend/app/controllers/spree/admin/base_controller.rb
@@ -38,7 +38,7 @@ module Spree
def flash_message_for(object, event_sym)
resource_desc = object.class.model_name.human
- resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
+ resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present? && !object.is_a?(Spree::Order)
Spree.t(event_sym, resource: resource_desc)
end
diff --git a/backend/app/controllers/spree/admin/log_entries_controller.rb b/backend/app/controllers/spree/admin/log_entries_controller.rb
index 728f5c3b5e..ffdd7457e3 100644
--- a/backend/app/controllers/spree/admin/log_entries_controller.rb
+++ b/backend/app/controllers/spree/admin/log_entries_controller.rb
@@ -1,7 +1,9 @@
module Spree
module Admin
class LogEntriesController < Spree::Admin::BaseController
- before_action :find_order_and_payment
+ include Spree::Admin::OrderConcern
+ before_action :load_order
+ before_action :load_payment
def index
@log_entries = @payment.log_entries
@@ -9,8 +11,7 @@ module Spree
private
- def find_order_and_payment
- @order = Spree::Order.find_by!(number: params[:order_id])
+ def load_payment
@payment = @order.payments.find_by!(number: params[:payment_id])
end
end
diff --git a/backend/app/controllers/spree/admin/orders/customer_details_controller.rb b/backend/app/controllers/spree/admin/orders/customer_details_controller.rb
index 02a5dbc479..b1d1abdc41 100644
--- a/backend/app/controllers/spree/admin/orders/customer_details_controller.rb
+++ b/backend/app/controllers/spree/admin/orders/customer_details_controller.rb
@@ -2,6 +2,8 @@ module Spree
module Admin
module Orders
class CustomerDetailsController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
before_action :load_order
before_action :load_user, only: :update, unless: :guest_checkout?
@@ -42,10 +44,6 @@ module Spree
)
end
- def load_order
- @order = Order.includes(:adjustments).find_by!(number: params[:order_id])
- end
-
def model_class
Spree::Order
end
diff --git a/backend/app/controllers/spree/admin/orders_controller.rb b/backend/app/controllers/spree/admin/orders_controller.rb
index f841662638..3a717265b6 100644
--- a/backend/app/controllers/spree/admin/orders_controller.rb
+++ b/backend/app/controllers/spree/admin/orders_controller.rb
@@ -1,6 +1,8 @@
module Spree
module Admin
class OrdersController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
before_action :initialize_order_events
before_action :load_order, only: %i[
edit update cancel resume approve resend open_adjustments
@@ -45,11 +47,7 @@ module Spree
params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
end
- @search = if params[:q][:all_stores] == '1'
- Spree::Order.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
- else
- Spree::Order.preload(:user).where(store_id: current_store.id).accessible_by(current_ability, :index).ransack(params[:q])
- end
+ @search = scope.preload(:user).accessible_by(current_ability, :index).ransack(params[:q])
# lazy loading other models here (via includes) may result in an invalid query
# e.g. SELECT DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
@@ -160,7 +158,7 @@ module Spree
private
def scope
- current_store.orders
+ current_store.orders.accessible_by(current_ability, :index)
end
def order_params
@@ -169,7 +167,7 @@ module Spree
end
def load_order
- @order = Spree::Order.includes(:adjustments).find_by!(number: params[:id])
+ @order = scope.includes(:adjustments).find_by!(number: params[:id])
authorize! action, @order
end
diff --git a/backend/app/controllers/spree/admin/payments_controller.rb b/backend/app/controllers/spree/admin/payments_controller.rb
index c7430e92bd..7075abf40c 100644
--- a/backend/app/controllers/spree/admin/payments_controller.rb
+++ b/backend/app/controllers/spree/admin/payments_controller.rb
@@ -2,8 +2,9 @@ module Spree
module Admin
class PaymentsController < Spree::Admin::BaseController
include Spree::Backend::Callbacks
+ include Spree::Admin::OrderConcern
- before_action :load_order, only: [:create, :new, :index, :fire]
+ before_action :load_order
before_action :load_payment, except: [:create, :new, :index]
before_action :load_data
before_action :can_not_transition_without_customer_info
@@ -99,14 +100,8 @@ module Spree
end
end
- def load_order
- @order = Order.find_by!(number: params[:order_id])
- authorize! action, @order
- @order
- end
-
def load_payment
- @payment = Payment.find_by!(number: params[:id])
+ @payment = @order.payments.find_by!(number: params[:id])
end
def model_class
diff --git a/backend/app/controllers/spree/admin/state_changes_controller.rb b/backend/app/controllers/spree/admin/state_changes_controller.rb
index f5a0ce8dcb..dcd3ed0851 100644
--- a/backend/app/controllers/spree/admin/state_changes_controller.rb
+++ b/backend/app/controllers/spree/admin/state_changes_controller.rb
@@ -1,18 +1,13 @@
module Spree
module Admin
class StateChangesController < Spree::Admin::BaseController
+ include Spree::Admin::OrderConcern
+
before_action :load_order, only: [:index]
def index
@state_changes = @order.state_changes.includes(:user).order(created_at: :desc)
end
-
- private
-
- def load_order
- @order = Order.find_by!(number: params[:order_id])
- authorize! action, @order
- end
end
end
end
diff --git a/backend/app/views/spree/admin/orders/index.html.erb b/backend/app/views/spree/admin/orders/index.html.erb
index 3417493db8..e6f3ab2f59 100644
--- a/backend/app/views/spree/admin/orders/index.html.erb
+++ b/backend/app/views/spree/admin/orders/index.html.erb
@@ -136,13 +136,6 @@
</div>
<div class="col-12">
- <%= f.field_container :all_stores do %>
- <div class="custom-control custom-checkbox">
- <%= f.check_box :all_stores, {checked: params[:q][:all_stores] == '1', class: 'custom-control-input'}, '1', '0' %>
- <%= f.label :all_stores, Spree.t('admin.show_orders_for_all_stores'), class: 'custom-control-label' %>
- </div>
- <% end %>
-
<%= f.field_container :completed_at_not_null do %>
<div class="custom-control custom-checkbox">
<%= f.check_box :completed_at_not_null, {checked: @show_only_completed, class: 'custom-control-input'}, '1', '0' %>
diff --git a/backend/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb b/backend/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
index b25318cc93..7f09f75248 100644
--- a/backend/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
@@ -6,7 +6,8 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
context 'with authorization' do
stub_authorization!
- let(:user) { mock_model(Spree.user_class) }
+ let(:store) { Spree::Store.default }
+ let(:user) { create(:user) }
let(:order) do
mock_model(
@@ -15,10 +16,7 @@ describe Spree::Admin::Orders::CustomerDetailsController, type: :controller do
number: 'R123456789',
billing_address: mock_model(Spree::Address)
)
- end
-
- before do
- allow(Spree::Order).to receive_message_chain(:includes, find_by!: order)
+ create(:order, total: 100, number: 'R123456789', store: store)
end
describe '#update' do
diff --git a/backend/spec/controllers/spree/admin/orders_controller_spec.rb b/backend/spec/controllers/spree/admin/orders_controller_spec.rb
index f7f0a3da8c..57e46f0ac5 100644
--- a/backend/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/backend/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -12,64 +12,67 @@ class OrderSpecificAbility
end
describe Spree::Admin::OrdersController, type: :controller do
- context 'with authorization' do
- stub_authorization!
+ let(:store) { Spree::Store.default }
+
+ shared_examples 'refreshes shipping rates conditionally' do |action_name|
+ let(:shipments) { order.reload.shipments }
+
+ before do
+ order.shipments.each { |s| s.shipping_rates.destroy_all }
+ get action_name, params: { id: order.number }
+ end
- let(:order) do
- mock_model(
- Spree::Order,
- completed?: true,
- total: 100,
- number: 'R123456789',
- all_adjustments: adjustments,
- billing_address: mock_model(Spree::Address)
- )
+ context 'when order is not completed' do
+ it { expect(shipments.map(&:shipping_rates).flatten).not_to be_empty }
+ it { expect(shipments.first.selected_shipping_rate.shipping_method.available_to_display?(display_value)).to be_truthy }
end
- let(:pos_order) do
- mock_model(
- Spree::Order,
- completed?: true,
- total: 100,
- number: 'R123456789',
- all_adjustments: adjustments,
- billing_address: mock_model(Spree::Address),
- channel: 'POS'
- )
+ context 'when order is complete' do
+ let(:order) { create(:order_ready_to_ship, store: store) }
+
+ it { expect(shipments.map(&:shipping_rates).flatten).to be_empty }
end
+ end
- let(:adjustments) { double('adjustments') }
+ context 'with authorization' do
+ stub_authorization!
+
+ let(:order) { create(:order_with_line_items, number: 'R123456789', store: store) }
+ let(:adjustments) { order.all_adjustments.reload }
+ let(:admin_user) { create(:admin_user) }
let(:display_value) { Spree::ShippingMethod::DISPLAY_ON_BACK_END }
before do
- request.env['HTTP_REFERER'] = 'http://localhost:3000'
- # ensure no respond_overrides are in effect
- allow(Spree::Order).to receive_message_chain(:includes, find_by!: order)
+ allow(controller).to receive(:try_spree_current_user).and_return(admin_user)
end
- context '#approve' do
+ describe '#approve' do
it 'approves an order' do
- expect(order).to receive(:approved_by).with(controller.try_spree_current_user)
put :approve, params: { id: order.number }
expect(flash[:success]).to eq Spree.t(:order_approved)
+ order.reload
+ expect(order.approved?).to eq true
+ expect(order.approver).to eq admin_user
end
end
- context '#cancel' do
+ describe '#cancel' do
+ let(:order) { create(:order_ready_to_ship, store: store) }
+
it 'cancels an order' do
- expect(order).to receive(:canceled_by).with(controller.try_spree_current_user)
put :cancel, params: { id: order.number }
expect(flash[:success]).to eq Spree.t(:order_canceled)
+ order.reload
+ expect(order.canceled?).to eq true
+ expect(order.canceler).to eq admin_user
end
end
describe '#channel' do
subject do
- get :channel, params: { id: cart_order.number }
+ get :channel, params: { id: order.number }
end
- let(:cart_order) { create(:order_with_line_items) }
-
it 'displays a page with channel input' do
expect(subject).to render_template :channel
end
@@ -77,18 +80,20 @@ describe Spree::Admin::OrdersController, type: :controller do
context '#set_channel' do
it 'sets channel on an order' do
- expect(order).to receive(:update).and_return(pos_order)
-
put :set_channel, params: { id: order.number, channel: 'POS' }
+ expect(order.reload.channel).to eq 'POS'
expect(flash[:success]).to eq Spree.t(:successfully_updated, resource: 'Order')
end
end
- context '#resume' do
+ describe '#resume' do
+ let(:order) { create(:order, state: 'canceled', store: store) }
+
it 'resumes an order' do
- expect(order).to receive(:resume!)
put :resume, params: { id: order.number }
+ order.reload
+ expect(order.resumed?).to eq(true)
expect(flash[:success]).to eq Spree.t(:order_resumed)
end
end
@@ -102,151 +107,26 @@ describe Spree::Admin::OrdersController, type: :controller do
end
# Test for #3346
- context '#new' do
- it 'a new order has the current user assigned as a creator' do
+ describe '#new' do
+ it 'a new order has the current user assigned as a creator and proper store' do
get :new
- expect(assigns[:order].created_by).to eq(controller.try_spree_current_user)
+ expect(assigns[:order].created_by).to eq(admin_user)
+ expect(assigns[:order].store).to eq(store)
end
end
# Regression test for #3684
describe '#edit' do
- before do
- allow(controller).to receive(:can_not_transition_without_customer_info)
- end
-
- after do
- get :edit, params: { id: order.number }
- end
-
- it { expect(controller).to receive(:can_not_transition_without_customer_info) }
-
- context 'when order is not completed' do
- before do
- allow(order).to receive(:completed?).and_return(false)
- allow(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true)
- end
-
- it { expect(order).to receive(:completed?).and_return(false) }
- it { expect(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true) }
- end
-
- context 'when order is completed' do
- before do
- allow(order).to receive(:completed?).and_return(true)
- end
-
- it { expect(order).to receive(:completed?).and_return(true) }
- end
+ it_behaves_like 'refreshes shipping rates conditionally', :edit
end
describe '#cart' do
- def send_request
- get :cart, params: { id: order.number }
- end
-
- context 'when order is not completed' do
- before do
- allow(order).to receive(:completed?).and_return(false)
- allow(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true)
- end
-
- context 'when order has shipped shipments' do
- before do
- allow(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true)
- allow(controller).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(order).to receive(:completed?).and_return(false) }
- it { expect(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true) }
- it { expect(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true) }
- end
-
- describe 'response' do
- before { send_request }
-
- it { expect(response).to be_redirect }
- it { expect(response).to redirect_to(edit_admin_order_url(order)) }
- end
- end
-
- context 'when order has no shipped shipments' do
- before do
- allow(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(false)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(order).to receive(:completed?).and_return(false) }
- it { expect(order).to receive(:refresh_shipment_rates).with(display_value).and_return(true) }
- it { expect(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(false) }
- end
-
- describe 'response' do
- before { send_request }
-
- it { expect(response).to render_template :cart }
- end
- end
- end
-
- context 'when order is completed' do
- before do
- allow(order).to receive(:completed?).and_return(true)
- end
-
- context 'when order has shipped shipments' do
- before do
- allow(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true)
- allow(controller).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(true) }
- end
-
- describe 'response' do
- before { send_request }
-
- it { expect(response).to be_redirect }
- it { expect(response).to redirect_to(edit_admin_order_url(order)) }
- end
- end
-
- context 'when order has no shipped shipments' do
- before do
- allow(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(false)
- end
-
- describe 'expects to receive' do
- after { send_request }
-
- it { expect(order).to receive_message_chain(:shipments, :shipped, :exists?).and_return(false) }
- end
-
- describe 'response' do
- before { send_request }
-
- it { expect(response).to render_template :cart }
- end
- end
- end
+ it_behaves_like 'refreshes shipping rates conditionally', :cart
end
# Test for #3919
context 'search' do
- let(:user) { create(:user) }
-
before do
- allow(controller).to receive_messages spree_current_user: user
- user.spree_roles << Spree::Role.find_or_create_by(name: 'admin')
-
create(:completed_order_with_totals)
expect(Spree::Order.count).to eq 1
end
@@ -254,9 +134,9 @@ describe Spree::Admin::OrdersController, type: :controller do
def send_request
get :index, params: {
q: {
- line_items_variant_id_in: Spree::Order.first.variants.map(&:id)
- }
+ line_items_variant_id_in: Spree::Order.first.variant_ids
}
+ }
end
it 'does not display duplicate results' do
@@ -265,23 +145,29 @@ describe Spree::Admin::OrdersController, type: :controller do
end
it 'preloads users' do
- expect(Spree::Order).to receive(:preload).with(:user).and_return(Spree::Order.all)
+ allow(Spree::Order).to receive(:preload).with(:user).and_return(Spree::Order.all)
send_request
end
end
- context '#open_adjustments' do
- let(:closed) { double('closed_adjustments') }
+ describe '#open_adjustments' do
+ let(:order) { create(:order_ready_to_ship, store: store) }
+ let(:shipment) { order.shipments.first }
before do
- allow(adjustments).to receive(:finalized).and_return(closed)
- allow(closed).to receive(:update_all)
+ shipment.adjustments.create!(
+ order: order,
+ label: 'Additional',
+ amount: 5,
+ included: false,
+ state: 'closed'
+ )
+ shipment.update_amounts
end
it 'changes all the closed adjustments to open' do
- expect(adjustments).to receive(:finalized).and_return(closed)
- expect(closed).to receive(:update_all).with(state: 'open')
post :open_adjustments, params: { id: order.number }
+ expect(adjustments.map(&:state)).to eq(['open'])
end
it 'sets the flash success message' do
@@ -312,18 +198,24 @@ describe Spree::Admin::OrdersController, type: :controller do
end
end
- context '#close_adjustments' do
- let(:open) { double('open_adjustments') }
+ describe '#close_adjustments' do
+ let(:order) { create(:order_ready_to_ship, store: store) }
+ let(:shipment) { order.shipments.first }
before do
- allow(adjustments).to receive(:not_finalized).and_return(open)
- allow(open).to receive(:update_all)
+ shipment.adjustments.create!(
+ order: order,
+ label: 'Additional',
+ amount: 5,
+ included: false,
+ state: 'open'
+ )
+ shipment.update_amounts
end
it 'changes all the open adjustments to closed' do
- expect(adjustments).to receive(:not_finalized).and_return(open)
- expect(open).to receive(:update_all).with(state: 'closed')
post :close_adjustments, params: { id: order.number }
+ expect(adjustments.map(&:state)).to eq(['closed'])
end
it 'sets the flash success message' do
@@ -355,7 +247,7 @@ describe Spree::Admin::OrdersController, type: :controller do
end
end
- context '#authorize_admin' do
+ describe '#authorize_admin' do
let(:user) { create(:user) }
let(:order) { create(:completed_order_with_totals, number: 'R987654321') }
@@ -426,13 +318,25 @@ describe Spree::Admin::OrdersController, type: :controller do
end
end
- context 'order number not given' do
+ context 'wrong order number' do
stub_authorization!
- it 'raise active record not found' do
- expect do
- get :edit, params: { id: 99_999_999 }
- end.to raise_error ActiveRecord::RecordNotFound
+ it 'redirects to orders list' do
+ get :edit, params: { id: 99_999_999 }
+
+ expect(response).to redirect_to(spree.admin_orders_path)
+ end
+ end
+
+ context 'order from another store' do
+ stub_authorization!
+
+ let(:order) { create(:order_with_line_items, store: create(:store)) }
+
+ it 'redirects to orders list' do
+ get :edit, params: { id: order.number }
+
+ expect(response).to redirect_to(spree.admin_orders_path)
end
end
end
diff --git a/backend/spec/features/admin/orders/adjustments_spec.rb b/backend/spec/features/admin/orders/adjustments_spec.rb
index ecc4b6012c..23929cc04a 100644
--- a/backend/spec/features/admin/orders/adjustments_spec.rb
+++ b/backend/spec/features/admin/orders/adjustments_spec.rb
@@ -3,7 +3,8 @@ require 'spec_helper'
describe 'Adjustments', type: :feature do
stub_authorization!
- let!(:order) { create(:completed_order_with_totals, line_items_count: 5) }
+ let(:store) { Spree::Store.default }
+ let!(:order) { create(:completed_order_with_totals, line_items_count: 5, store: store) }
let!(:line_item) do
line_item = order.line_items.first
# so we can be sure of a determinate price in our assertions
diff --git a/backend/spec/features/admin/orders/customer_details_spec.rb b/backend/spec/features/admin/orders/customer_details_spec.rb
index f5826411e0..1816649c9b 100644
--- a/backend/spec/features/admin/orders/customer_details_spec.rb
+++ b/backend/spec/features/admin/orders/customer_details_spec.rb
@@ -6,7 +6,7 @@ describe 'Customer Details', type: :feature, js: true do
let(:store) { Spree::Store.default }
let!(:country) { store.default_country }
let!(:state) { create(:state, name: 'Alabama', country: country, abbr: 'AL') }
- let!(:order) { create(:order, state: 'complete', completed_at: '2011-02-01 12:36:15') }
+ let!(:order) { create(:order, state: 'complete', completed_at: '2011-02-01 12:36:15', store: store) }
let!(:product) { create(:product_in_stock, stores: [store]) }
# We need a unique name that will appear for the customer dropdown
let!(:ship_address) { create(:address, country: country, state: state, first_name: 'Rumpelstiltskin') }
diff --git a/backend/spec/features/admin/orders/line_items_spec.rb b/backend/spec/features/admin/orders/line_items_spec.rb
index c317b9daab..1989c439cf 100644
--- a/backend/spec/features/admin/orders/line_items_spec.rb
+++ b/backend/spec/features/admin/orders/line_items_spec.rb
@@ -10,8 +10,10 @@ describe 'Order Line Items', type: :feature, js: true do
allow(Spree::Order).to receive_messages checkout_step_names: [:address, :payment, :confirm, :complete]
end
+ let(:store) { Spree::Store.default }
+
let!(:order) do
- order = create(:order_with_line_items, line_items_count: 1)
+ order = create(:order_with_line_items, line_items_count: 1, store: store)
order.shipments.destroy_all
order
end
diff --git a/backend/spec/features/admin/orders/listing_spec.rb b/backend/spec/features/admin/orders/listing_spec.rb
index 2da5a5b886..e9f692b971 100644
--- a/backend/spec/features/admin/orders/listing_spec.rb
+++ b/backend/spec/features/admin/orders/listing_spec.rb
@@ -3,8 +3,7 @@ require 'spec_helper'
describe 'Orders Listing', type: :feature do
stub_authorization!
- let(:other_store_a) { create(:store) }
- let(:other_store_b) { create(:store) }
+ let(:other_store) { create(:store, url: 'another-store.lvh.me') }
let(:order1) do
create :order_with_line_items,
@@ -23,7 +22,7 @@ describe 'Orders Listing', type: :feature do
let(:order3) do
create :order,
- store: other_store_a,
+ store: other_store,
created_at: 1.day.ago,
completed_at: 1.day.ago,
number: 'R300'
@@ -31,7 +30,7 @@ describe 'Orders Listing', type: :feature do
let(:order4) do
create :order,
- store: other_store_b,
+ store: other_store,
created_at: 1.day.ago,
completed_at: 1.day.ago,
number: 'R400'
@@ -85,6 +84,23 @@ describe 'Orders Listing', type: :feature do
end
end
+ describe 'switching store' do
+ before do
+ Capybara.app_host = 'http://another-store.lvh.me'
+ visit spree.admin_orders_path
+ end
+
+ after { Capybara.app_host = nil }
+
+ it 'shows orders from the current store only' do
+ expect(page).to have_content('R300')
+ expect(page).to have_content('R400')
+
+ expect(page).not_to have_content('R100')
+ expect(page).not_to have_content('R200')
+ end
+ end
+
describe 'searching orders' do
it 'is able to search orders' do
fill_in 'q_number_cont', with: 'R200'
@@ -122,15 +138,6 @@ describe 'Orders Listing', type: :feature do
expect(page).not_to have_content('R200')
end
- it 'is able to show orders from all stores' do
- check 'q_all_stores'
- click_on 'Filter Results'
-
- expect(page).to have_checked_field(id: 'q_all_stores')
- expect(page).to have_content('R300')
- expect(page).to have_content('R400')
- end
-
it 'is able to filter on variant_sku' do
click_on 'Filter'
fill_in 'q_line_items_variant_sku_eq', with: order1.line_items.first.variant.sku
diff --git a/backend/spec/features/admin/orders/log_entries_spec.rb b/backend/spec/features/admin/orders/log_entries_spec.rb
index e7d2125c30..039a738dbb 100644
--- a/backend/spec/features/admin/orders/log_entries_spec.rb
+++ b/backend/spec/features/admin/orders/log_entries_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
describe 'Log entries', type: :feature do
stub_authorization!
- let!(:payment) { create(:payment) }
+ let(:store) { Spree::Store.default }
+ let(:order) { create(:order, store: store) }
+ let!(:payment) { create(:payment, order: order) }
context 'with a successful log entry' do
before do
@@ -20,7 +22,7 @@ describe 'Log entries', type: :feature do
end
it 'shows a successful attempt' do
- visit spree.admin_order_payments_path(payment.order)
+ visit spree.admin_order_payments_path(order)
find("#payment_#{payment.id} a", text: payment.number).click
within find('#contentHeader') do
click_link 'Logs'
@@ -47,12 +49,12 @@ describe 'Log entries', type: :feature do
end
it 'shows a failed attempt' do
- visit spree.admin_order_payments_path(payment.order)
+ visit spree.admin_order_payments_path(order)
find("#payment_#{payment.id} a", text: payment.number).click
within find('#contentHeader') do
click_link 'Logs'
end
-
+
within('#listing_log_entries') do
expect(page).to have_content('Transaction failed')
end
diff --git a/backend/spec/features/admin/orders/order_details_spec.rb b/backend/spec/features/admin/orders/order_details_spec.rb
index 0f0f45e99f..71cd053381 100644
--- a/backend/spec/features/admin/orders/order_details_spec.rb
+++ b/backend/spec/features/admin/orders/order_details_spec.rb
@@ -1,11 +1,11 @@
require 'spec_helper'
describe 'Order Details', type: :feature, js: true do
+ let(:store) { Spree::Store.default }
let!(:stock_location) { create(:stock_location_with_items) }
- let!(:product) { create(:product, name: 'spree t-shirt', price: 20.00) }
- let!(:store) { create(:store) }
- let(:order) { create(:order, state: 'complete', completed_at: '2011-02-01 12:36:15', number: 'R100', store_id: store.id) }
- let(:fresh_order) { create(:order) }
+ let!(:product) { create(:product, name: 'spree t-shirt', price: 20.00, stores: [store]) }
+ let(:order) { create(:order, state: 'complete', completed_at: '2011-02-01 12:36:15', number: 'R100', store: store) }
+ let(:fresh_order) { create(:order, store: store) }
let(:state) { create(:state) }
before do
diff --git a/backend/spec/features/admin/orders/risk_analysis_spec.rb b/backend/spec/features/admin/orders/risk_analysis_spec.rb
index b1a072fdb1..da477ffb98 100644
--- a/backend/spec/features/admin/orders/risk_analysis_spec.rb
+++ b/backend/spec/features/admin/orders/risk_analysis_spec.rb
@@ -3,8 +3,9 @@ require 'spec_helper'
describe 'Order Risk Analysis', type: :feature do
stub_authorization!
+ let(:store) { Spree::Store.default }
let!(:order) do
- create(:completed_order_with_pending_payment)
+ create(:completed_order_with_pending_payment, store: store)
end
def visit_order
@@ -32,7 +33,7 @@ describe 'Order Risk Analysis', type: :feature do
within find('#contentHeader') do
click_button('Approve')
end
-
+
expect(page).to have_content 'Approver'
expect(page).to have_content 'Approved at'
expect(page).to have_content 'Status: complete'
diff --git a/backend/spec/features/admin/orders/shipments_spec.rb b/backend/spec/features/admin/orders/shipments_spec.rb
index 707f4ee3fd..f1b3dc859a 100644
--- a/backend/spec/features/admin/orders/shipments_spec.rb
+++ b/backend/spec/features/admin/orders/shipments_spec.rb
@@ -3,7 +3,8 @@ require 'spec_helper'
describe 'Shipments', type: :feature do
stub_authorization!
- let!(:order) { create(:order_ready_to_ship, number: 'R100', state: 'complete', line_items_count: 5) }
+ let(:store) { Spree::Store.default }
+ let!(:order) { create(:order_ready_to_ship, number: 'R100', state: 'complete', line_items_count: 5, store: store) }
# Regression test for #4025
context 'a shipment without a shipping method' do
diff --git a/backend/spec/features/admin/orders/state_changes_spec.rb b/backend/spec/features/admin/orders/state_changes_spec.rb
index 9de531ef25..d23b7e3e85 100644
--- a/backend/spec/features/admin/orders/state_changes_spec.rb
+++ b/backend/spec/features/admin/orders/state_changes_spec.rb
@@ -3,7 +3,8 @@ require 'spec_helper'
describe 'Order - State Changes', type: :feature do
stub_authorization!
- let!(:order) { create(:order_with_line_items) }
+ let(:store) { Spree::Store.default }
+ let!(:order) { create(:order_with_line_items, store: store) }
context 'for completed order' do
before do
diff --git a/backend/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb b/backend/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
index 2a64ae607e..63be258abf 100644
--- a/backend/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
+++ b/backend/spec/features/admin/return_authorization_reasons/return_authorization_reasons_spec.rb
@@ -3,7 +3,8 @@ require 'spec_helper'
describe 'ReturnAuthorizationReason', type: :feature, js: true do
stub_authorization!
- let!(:order) { create(:shipped_order) }
+ let(:store) { Spree::Store.default }
+ let!(:order) { create(:shipped_order, store: store) }
let!(:stock_location) { create(:stock_location) }
let!(:rma_reason) { create(:return_authorization_reason, name: 'Defect #1', mutable: true) }
let!(:rma_reason2) { create(:return_authorization_reason, name: 'Defect #2', mutable: true) }
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 86a49e2b34..a8e6c9f5d9 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -549,7 +549,6 @@ en:
adjustment_total: Adjustment Total
adjustments: Adjustments
admin:
- show_orders_for_all_stores: Show Orders for all stores
show_products_for_all_stores: Show Products for all stores
show_payment_methods_for_all_stores: Show Payment Methods for all stores
tab: