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 datetime filter to respect EOD (#13750)
brozek3548616e242c
diff --git a/spree/admin/app/controllers/spree/admin/resource_controller.rb b/spree/admin/app/controllers/spree/admin/resource_controller.rbindex 8d5b7d13b2..34785dcddd 100644--- a/spree/admin/app/controllers/spree/admin/resource_controller.rb+++ b/spree/admin/app/controllers/spree/admin/resource_controller.rb@@ -279,8 +279,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerparams[:q][:s] ||= collection_default_sort if collection_default_sort.present?- date_range_params = %i[created_at_gt created_at_lt updated_at_gt updated_at_lt]- date_range_params.each do |param|+ %i[created_at_gt updated_at_gt].each do |param|if params[:q][param].present?params[:q][param] = beginparams[:q][param].to_date&.in_time_zone(current_timezone)&.beginning_of_day@@ -290,6 +289,16 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseControllerendend+ %i[created_at_lt updated_at_lt].each do |param|+ if params[:q][param].present?+ params[:q][param] = begin+ params[:q][param].to_date&.in_time_zone(current_timezone)&.end_of_day+ rescue StandardError+ ''+ end+ end+ end+params[:q]enddiff --git a/spree/admin/spec/controllers/spree/admin/resource_controller_spec.rb b/spree/admin/spec/controllers/spree/admin/resource_controller_spec.rbindex 4d5056d782..67562007af 100644--- a/spree/admin/spec/controllers/spree/admin/resource_controller_spec.rb+++ b/spree/admin/spec/controllers/spree/admin/resource_controller_spec.rb@@ -58,6 +58,26 @@ describe Spree::Admin::DummyModelsController, type: :controller doendend+ describe '#search_params' do+ before do+ allow(controller).to receive(:current_timezone).and_return('Eastern Time (US & Canada)')+ end++ it 'converts _gt date params to beginning_of_day' do+ get :index, params: { q: { created_at_gt: '2025-03-15' } }, format: :json rescue nil++ expected = '2025-03-15'.to_date.in_time_zone('Eastern Time (US & Canada)').beginning_of_day+ expect(controller.params[:q][:created_at_gt]).to eq(expected)+ end++ it 'converts _lt date params to end_of_day' do+ get :index, params: { q: { created_at_lt: '2025-03-15' } }, format: :json rescue nil++ expected = '2025-03-15'.to_date.in_time_zone('Eastern Time (US & Canada)').end_of_day+ expect(controller.params[:q][:created_at_lt]).to eq(expected)+ end+ end+describe '#destroy' dosubject dodelete :destroy, params: params