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.

Fixed admin order customer edit module (#13875)

Damian Legawiec7047aec57012
diff --git a/spree/admin/app/controllers/concerns/spree/admin/order_concern.rb b/spree/admin/app/controllers/concerns/spree/admin/order_concern.rb
index 2799125624..6066cc3e34 100644
--- a/spree/admin/app/controllers/concerns/spree/admin/order_concern.rb
+++ b/spree/admin/app/controllers/concerns/spree/admin/order_concern.rb
@@ -30,7 +30,7 @@ module Spree
end
def resource_not_found
- flash[:error] = flash_message_for(model_class.new, :not_found)
+ flash[:error] = flash_message_for(Spree::Order.new, :not_found)
redirect_to spree.admin_orders_path
end
end
diff --git a/spree/admin/app/controllers/spree/admin/orders/user_controller.rb b/spree/admin/app/controllers/spree/admin/orders/user_controller.rb
index 39060479cb..655a23a9c5 100644
--- a/spree/admin/app/controllers/spree/admin/orders/user_controller.rb
+++ b/spree/admin/app/controllers/spree/admin/orders/user_controller.rb
@@ -53,7 +53,7 @@ module Spree
end
def update
- user = Spree.user_class.find_by_prefix_id!(params[:user_id])
+ user = Spree.user_class.find_by_param!(params[:user_id])
@order.associate_user!(user)
if [email protected]? && @order.line_items.any?
diff --git a/spree/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
index 9d29c198f7..687cdf72a0 100644
--- a/spree/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
+++ b/spree/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb
@@ -14,6 +14,21 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
}
end
+ describe '#new' do
+ subject { get :new, params: { order_id: order.to_param } }
+
+ it 'returns a success response' do
+ subject
+ expect(response).to be_successful
+ expect(response).to render_template(:new)
+ end
+
+ it 'builds a new user for the order' do
+ subject
+ expect(assigns(:user)).to be_a_new(Spree.user_class)
+ end
+ end
+
describe '#create' do
context 'when user exists' do
let!(:existing_user) { create(:user, email: user_params[:email]) }
@@ -29,6 +44,21 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
expect(existing_user.email).to eq(user_params[:email])
expect(existing_user.tag_list).to match_array(user_params[:tag_list])
end
+
+ context 'when user update fails' do
+ before do
+ allow_any_instance_of(Spree.user_class).to receive(:update).and_return(false)
+ allow_any_instance_of(Spree.user_class).to receive_message_chain(:errors, :full_messages, :to_sentence)
+ .and_return('Email is invalid')
+ end
+
+ it 'responds with error' do
+ post :create, params: { user: user_params, order_id: order.to_param }, as: :turbo_stream
+
+ expect(flash[:error]).to be_present
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+ end
end
context 'when user does not exist' do
@@ -45,18 +75,49 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
expect(new_user.email).to eq(user_params[:email])
expect(new_user.tag_list).to match_array(user_params[:tag_list])
end
+
+ context 'when user save fails' do
+ it 'responds with error' do
+ post :create, params: { user: { email: '' }, order_id: order.to_param }, as: :turbo_stream
+
+ expect(flash[:error]).to be_present
+ expect(response).to have_http_status(:unprocessable_content)
+ end
+ end
end
end
describe '#update' do
let!(:existing_user) { create(:user, email: user_params[:email]) }
- it 'associates new user with order' do
+ it 'associates new user with order using prefixed ID' do
put :update, params: { user_id: existing_user.to_param, order_id: order.to_param }, as: :turbo_stream
expect(order.reload.user).to eq(existing_user)
expect(order.email).to eq(existing_user.email)
end
+
+ it 'associates new user with order using raw ID' do
+ put :update, params: { user_id: existing_user.id, order_id: order.to_param }, as: :turbo_stream
+
+ expect(order.reload.user).to eq(existing_user)
+ expect(order.email).to eq(existing_user.email)
+ end
+
+ it 'sets success flash and redirects to order edit' do
+ put :update, params: { user_id: existing_user.to_param, order_id: order.to_param }, as: :turbo_stream
+
+ expect(flash[:success]).to be_present
+ expect(response).to redirect_to(spree.edit_admin_order_path(order))
+ end
+
+ context 'with an invalid user_id' do
+ it 'redirects to orders index' do
+ put :update, params: { user_id: 'invalid_prefix_id', order_id: order.to_param }, as: :turbo_stream
+
+ expect(response).to redirect_to(spree.admin_orders_path)
+ end
+ end
end
describe '#destroy' do
@@ -75,6 +136,12 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
expect(order.bill_address).to be_nil
end
+ it 'redirects to order edit' do
+ subject
+
+ expect(response).to redirect_to(spree.edit_admin_order_path(order))
+ end
+
context 'for an order in payment state' do
before { order.update(state: 'payment') }
@@ -88,4 +155,12 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller do
end
end
end
+
+ describe 'order not found' do
+ it 'redirects to orders index' do
+ put :update, params: { user_id: 'usr_abc123', order_id: 'or_nonexistent' }, as: :turbo_stream
+
+ expect(response).to redirect_to(spree.admin_orders_path)
+ end
+ end
end