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
Remove ability to change the store an order belongs to, in the interest of simplicity it is better to ensure the admin creates the order for the appropriate store from the start.
Matthew Kennedy041814ec3333
diff --git a/backend/app/controllers/spree/admin/orders_controller.rb b/backend/app/controllers/spree/admin/orders_controller.rbindex 6c5612c18c..f841662638 100644--- a/backend/app/controllers/spree/admin/orders_controller.rb+++ b/backend/app/controllers/spree/admin/orders_controller.rb@@ -82,8 +82,6 @@ module Spreeendend- def store; end-def updateif @order.update(params[:order]) && @order.line_items.present?@order.update_with_updater!diff --git a/backend/app/views/spree/admin/orders/_store_form.html.erb b/backend/app/views/spree/admin/orders/_store_form.html.erbdeleted file mode 100644index 44d15aee8a..0000000000--- a/backend/app/views/spree/admin/orders/_store_form.html.erb+++ /dev/null@@ -1,30 +0,0 @@-<div data-hook="store-form-container col-12">- <% if @order.completed? %>- <div class="alert alert-warning no-objects-found mt-4">- <%= Spree.t('admin.order.once_an_order_is_complete_you_can_not_change_store') %>- </div>- <% else %>- <%= form_for [:admin, order], method: :put, url: set_store_admin_order_url do |f| %>- <fieldset>- <div data-hook="admin_order_store_field" class="row">- <%= f.field_container :store_id, class: ['form-group col-12 col-md-6'] do %>- <%= f.label :store_id, Spree.t(:store) %>- <%= f.collection_select(:store_id, @stores, :id, :unique_name, { include_blank: false }, { class: "select2" }) %>- <%= f.error_message_on :store_id %>- <% end %>-- <div class="col-12 col-md-6">- <div class="alert alert-warning no-objects-found mt-4">- <%= Spree.t('admin.order.changing_store_warning') %>- </div>- </div>- </div>- <div class="form-actions" data-hook="buttons">- <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>- <span class="or"><%= Spree.t(:or) %></span>- <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'cancel.svg' %>- </div>- <fieldset>- <% end %>- <% end %>-</div>diff --git a/backend/app/views/spree/admin/shared/_order_tabs.html.erb b/backend/app/views/spree/admin/shared/_order_tabs.html.erbindex c0275fa4f5..c89be75730 100644--- a/backend/app/views/spree/admin/shared/_order_tabs.html.erb+++ b/backend/app/views/spree/admin/shared/_order_tabs.html.erb@@ -5,15 +5,6 @@<% content_for :sidebar do %><ul class="nav flex-column nav-pills" data-hook="admin_order_tabs">- <% if ((can?(:update, @order) && can?(:read, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) && [email protected]? %>- <li data-hook='admin_order_tabs_store_details'>- <%= link_to_with_icon 'store.svg',- Spree.t(:store),- store_admin_order_url(@order),- class: "#{'active' if current == :store} nav-link" %>- </li>- <% end %>-<% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %><li data-hook='admin_order_tabs_cart_details'><%= link_to_with_icon 'cart.svg',diff --git a/backend/config/routes.rb b/backend/config/routes.rbindex 6e35c36502..eaf31288be 100644--- a/backend/config/routes.rb+++ b/backend/config/routes.rb@@ -84,8 +84,6 @@ Spree::Core::Engine.add_routes doput :approveput :cancelput :resume- get :store- put :set_storeget :channelput :set_channelenddiff --git a/backend/spec/controllers/spree/admin/orders_controller_spec.rb b/backend/spec/controllers/spree/admin/orders_controller_spec.rbindex 5179141e3e..f7f0a3da8c 100644--- a/backend/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/backend/spec/controllers/spree/admin/orders_controller_spec.rb@@ -101,18 +101,6 @@ describe Spree::Admin::OrdersController, type: :controller doendend- describe '#store' do- subject do- get :store, params: { id: cart_order.number }- end-- let(:cart_order) { create(:order_with_line_items) }-- it 'displays a page with stores select tag' do- expect(subject).to render_template :store- end- end-# Test for #3346context '#new' doit 'a new order has the current user assigned as a creator' dodiff --git a/backend/spec/features/admin/orders/order_details_spec.rb b/backend/spec/features/admin/orders/order_details_spec.rbindex 413b345a01..0f0f45e99f 100644--- a/backend/spec/features/admin/orders/order_details_spec.rb+++ b/backend/spec/features/admin/orders/order_details_spec.rb@@ -17,26 +17,6 @@ describe 'Order Details', type: :feature, js: true docontext 'as Admin' dostub_authorization!- context 'store edit page' do- let!(:new_store) { create(:store) }-- before do- product.master.stock_items.first.update_column(:count_on_hand, 100)- visit spree.store_admin_order_path(fresh_order)- end-- it 'displays select with current order store name' do- expect(page).to have_content(store.name)- end-- it 'after selecting a store assings a new store to order' do- select2 new_store.name, from: 'Store', match: :first- find('[name=button]').click-- expect(page).to have_content(new_store.name)- end- end-context 'cart edit page' dobefore doproduct.master.stock_items.first.update_column(:count_on_hand, 100)diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 2bad1bac41..3f3dd5480a 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -130,8 +130,6 @@ module Spreebefore_create :link_by_emailbefore_update :homogenize_line_item_currencies, if: :currency_changed?- before_save :handle_store_change-with_options presence: true do# we want to have this case_sentive: true as changing it to false causes all SQL to use LOWER(slug)# which is very costly and slow on large set of records@@ -674,20 +672,6 @@ module Spreeprivate- def handle_store_change- return if new_record?-- if store_id_changed? && completed?- errors.add(:base, Spree.t('errors.messages.once_an_order_is_complete_you_can_not_change_store'))- throw(:abort)- elsif store_id_changed? && !completed?- # TODO: Implement better handeling of store change than- # just resetting the order using empty!-- empty!- end- end-def link_by_emailself.email = user.email if userenddiff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 5558e3f768..cd0b56c49c 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -347,36 +347,6 @@ describe Spree::Order, type: :model doendend- context '#handle_store_change' do- let(:other_store) { create(:store) }-- context 'completed order' do- let(:order) { create(:completed_order_with_totals) }-- it 'raises ActiveRecord::RecordNotSaved' do- expect { order.update!(store: store) }.to raise_error(ActiveRecord::RecordNotSaved, 'Failed to save the record')- end- end-- context 'uncompleted order' do- let(:order) { create(:order_with_line_items) }-- before do- order.update!(store: store)- end-- it 'clears out line items, adjustments and update totals using .empty!' do- expect(order.line_items.count).to be_zero- expect(order.adjustments.count).to be_zero- expect(order.shipments.count).to be_zero- expect(order.order_promotions.count).to be_zero- expect(order.promo_total).to be_zero- expect(order.item_total).to be_zero- expect(order.empty!).to eq(order)- end- end- end-context '#display_outstanding_balance' doit 'returns the value as a spree money' doallow(order).to receive(:outstanding_balance).and_return(10.55)