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
Fix filtering orders, fix removing customer from the order (#12307)
Łukasz Adamczykfef7ae1b66bd
diff --git a/admin/app/controllers/spree/admin/orders/user_controller.rb b/admin/app/controllers/spree/admin/orders/user_controller.rbindex d13052842a..6d9e0788f0 100644--- a/admin/app/controllers/spree/admin/orders/user_controller.rb+++ b/admin/app/controllers/spree/admin/orders/user_controller.rb@@ -70,7 +70,11 @@ module Spreeenddef destroy- @order.update(user_id: nil)+ @order.assign_attributes(user_id: nil, ship_address: nil, bill_address: nil)+ @order.email = nil unless @order.email_required?+ @order.save++ flash[:error] = @order.errors.full_messages.to_sentence if @order.invalid?redirect_to spree.edit_admin_order_path(@order)enddiff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rbindex 587b90081b..04eb46d265 100644--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb@@ -36,9 +36,9 @@ module Spreeendend- if search_params[:created_at_lt].present?- search_params[:created_at_lt] = begin- Time.zone.parse(search_params[:created_at_lt]).end_of_day+ if search_params[:completed_at_lt].present?+ search_params[:completed_at_lt] = begin+ Time.zone.parse(search_params[:completed_at_lt]).end_of_dayrescue StandardError''enddiff --git a/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rbindex 16e8bd4672..6fa860d21c 100644--- a/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders/user_controller_spec.rb@@ -59,14 +59,32 @@ RSpec.describe Spree::Admin::Orders::UserController, type: :controller doenddescribe '#destroy' do+ subject { delete :destroy, params: { order_id: order.number }, as: :turbo_stream }+let!(:existing_user) { create(:user, email: user_params[:email]) }- it 'removes user association from order' do- order.update(user: existing_user)+ before { order.associate_user!(existing_user) }- delete :destroy, params: { order_id: order.number }, as: :turbo_stream+ it 'removes user association from order' do+ subjectexpect(order.reload.user).to be_nil+ expect(order.email).to be_nil+ expect(order.ship_address).to be_nil+ expect(order.bill_address).to be_nil+ end++ context 'for an order in payment state' do+ before { order.update(state: 'payment') }++ it 'removes user association but leaves the email address' do+ subject++ expect(order.reload.user).to be_nil+ expect(order.email).to eq(user_params[:email])+ expect(order.ship_address).to be_nil+ expect(order.bill_address).to be_nil+ endendendenddiff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex 7aa15c9507..c7d16c0048 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -70,21 +70,51 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doendcontext 'filtering by date' do- let(:order1) { create(:completed_order_with_totals) }- let(:order2) { create(:completed_order_with_totals) }+ subject { get :index, params: { q: q } }++ let(:q) do+ {+ completed_at_gt: 4.months.ago,+ completed_at_lt: 1.month.from_now+ }+ end++ let!(:order1) { create(:completed_order_with_totals) }+ let!(:order2) { create(:completed_order_with_totals) }context 'for All Orders' dobefore do- order2order1.update(completed_at: 5.month.ago)- get :index, params: { q: { completed_at_gt: 4.months.ago, completed_at_lt: 1.month.from_now } }endit 'uses completed_at column' do+ subject+expect(assigns(:orders).to_a).to include(order2)expect(assigns(:orders).to_a).not_to include(order1)endend++ context 'filtering by "yesterday"' do+ let!(:order2) { create(:completed_order_with_totals, completed_at: Date.today) }++ before do+ order1.update(completed_at: Date.yesterday + 3.hours)+ order2.update(completed_at: Date.yesterday + 16.hours)+ end++ let(:q) do+ {+ completed_at_gt: Date.yesterday,+ completed_at_lt: Date.yesterday+ }+ end++ it 'filters by orders completed yesterday' do+ subject+ expect(assigns(:orders).to_a).to contain_exactly(order1, order2)+ end+ endendenddiff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 5392cf123d..14aa56c143 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -272,6 +272,10 @@ module Spreeconfirm?end+ def email_required?+ require_email+ end+def backordered?shipments.any?(&:backordered?)end