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.

Fix datepicker handling (#12933)

brozek0bcc570ec52f
diff --git a/admin/app/controllers/spree/admin/reports_controller.rb b/admin/app/controllers/spree/admin/reports_controller.rb
index 4fdfe16da5..5982bcdce8 100644
--- a/admin/app/controllers/spree/admin/reports_controller.rb
+++ b/admin/app/controllers/spree/admin/reports_controller.rb
@@ -31,7 +31,10 @@ module Spree
end
def build_resource
- model_class.new(store: current_store, date_from: params[:date_from], date_to: params[:date_to], currency: params[:currency])
+ model_class.new(store: current_store,
+ date_from: parse_date_param(params[:date_from]),
+ date_to: parse_date_param(params[:date_to])&.end_of_day,
+ currency: params[:currency])
end
def model_class
@@ -55,7 +58,16 @@ module Spree
end
def permitted_resource_params
- params.require(:report).permit(permitted_report_attributes)
+ attributes = params.require(:report).permit(permitted_report_attributes)
+ attributes[:date_from] = parse_date_param(attributes[:date_from]) if attributes[:date_from].present?
+ attributes[:date_to] = parse_date_param(attributes[:date_to])&.end_of_day if attributes[:date_to].present?
+ attributes
+ end
+
+ def parse_date_param(date_string)
+ return if date_string.blank?
+
+ date_string.to_date&.in_time_zone(current_timezone)
end
end
end
diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rb
index 00e82650d8..6cc3168de7 100644
--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb
+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb
@@ -14,7 +14,8 @@ module Spree
if search_params[:created_at_gt].present?
search_params[:created_at_gt] = begin
- Time.zone.parse(search_params[:created_at_gt]).beginning_of_day
+ # Firstly we parse to date to avoid issues with timezones because frontend sends time in local timezone
+ search_params[:created_at_gt].to_date&.in_time_zone(current_timezone)
rescue StandardError
''
end
@@ -22,7 +23,7 @@ module Spree
if search_params[:created_at_lt].present?
search_params[:created_at_lt] = begin
- Time.zone.parse(search_params[:created_at_lt]).end_of_day
+ search_params[:created_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
rescue StandardError
''
end
@@ -30,7 +31,7 @@ module Spree
if search_params[:completed_at_gt].present?
search_params[:completed_at_gt] = begin
- Time.zone.parse(search_params[:completed_at_gt]).beginning_of_day
+ search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)
rescue StandardError
''
end
@@ -38,7 +39,7 @@ module Spree
if search_params[:completed_at_lt].present?
search_params[:completed_at_lt] = begin
- Time.zone.parse(search_params[:completed_at_lt]).end_of_day
+ search_params[:completed_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
rescue StandardError
''
end
diff --git a/admin/app/views/spree/admin/dashboard/show.html.erb b/admin/app/views/spree/admin/dashboard/show.html.erb
index 328688c250..2c032980cd 100644
--- a/admin/app/views/spree/admin/dashboard/show.html.erb
+++ b/admin/app/views/spree/admin/dashboard/show.html.erb
@@ -15,8 +15,8 @@
<%= form_tag spree.admin_dashboard_analytics_path, method: :get, data: { turbo_frame: :analytics } do %>
<%= hidden_field_tag :vendor_id, @vendor.id if @vendor.present? %>
<%= render 'spree/admin/shared/calendar_range_picker',
- date_from_value: params[:date_from] || 1.month.ago.beginning_of_month,
- date_to_value: params[:date_to] || 1.month.ago.end_of_month,
+ date_from_value: params[:date_from] || 1.month.ago.end_of_day,
+ date_to_value: params[:date_to] || Time.zone.now.beginning_of_day,
css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
<% end %>
</div>
diff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rb
index a6176ba237..596c59c30c 100644
--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb
@@ -115,6 +115,23 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller do
expect(assigns(:orders).to_a).to contain_exactly(order1, order2)
end
end
+
+ context 'filtering in different timezones' do
+ let(:date_from) { 'Tue Jul 08 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+ let(:date_to) { 'Tue Jul 09 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+
+ let(:q) { { completed_at_gt: date_from, completed_at_lt: date_to } }
+
+ before do
+ order1.update(completed_at: date_from.to_date.in_time_zone(store.preferred_timezone) + 1.minute)
+ order2.update(completed_at: date_to.to_date.in_time_zone(store.preferred_timezone).end_of_day - 1.minute)
+ end
+
+ it 'filters by orders completed_at in the store timezone' do
+ subject
+ expect(assigns(:orders).to_a).to contain_exactly(order1, order2)
+ end
+ end
end
end
diff --git a/admin/spec/controllers/spree/admin/reports_controller_spec.rb b/admin/spec/controllers/spree/admin/reports_controller_spec.rb
index 77e4c2d9c1..5807f90802 100644
--- a/admin/spec/controllers/spree/admin/reports_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/reports_controller_spec.rb
@@ -40,6 +40,33 @@ describe Spree::Admin::ReportsController, type: :controller do
expect { subject }.to raise_error('Unknown report type')
end
end
+
+ context 'when dates are provided' do
+ subject { get :new, params: { type: 'sales_total', date_from: date_from, date_to: date_to } }
+
+ let(:date_from) { 'Tue Jul 08 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+ let(:date_to) { 'Tue Jul 09 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+
+ it 'sets the dates in the store timezone' do
+ subject
+ expect(assigns(:object).date_from).to eq(date_from.to_date.in_time_zone(store.preferred_timezone))
+ expect(assigns(:object).date_to.change(usec: 0)).to eq(date_to.to_date.in_time_zone(store.preferred_timezone).end_of_day.change(usec: 0))
+ end
+ end
+
+ context 'when no dates are provided' do
+ subject { get :new, params: { type: 'sales_total' } }
+
+ before { Timecop.freeze(Time.current) }
+
+ after { Timecop.return }
+
+ it 'sets default values' do
+ subject
+ expect(assigns(:object).date_from).to eq(1.month.ago.in_time_zone(store.preferred_timezone).beginning_of_day)
+ expect(assigns(:object).date_to.change(usec: 0)).to eq(Time.current.in_time_zone(store.preferred_timezone).end_of_day.change(usec: 0))
+ end
+ end
end
describe '#create' do
@@ -72,5 +99,39 @@ describe Spree::Admin::ReportsController, type: :controller do
subject
expect(flash[:success]).to eq Spree.t('admin.report_created')
end
+
+ context 'when dates with different timezones are provided' do
+ let(:date_from) { 'Tue Jul 08 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+ let(:date_to) { 'Tue Jul 09 2025 00:00:00 GMT+0200 (czas środkowoeuropejski letni)' }
+
+ let(:report_params) do
+ {
+ type: 'sales_total',
+ date_from: date_from,
+ date_to: date_to,
+ currency: 'USD'
+ }
+ end
+
+ it 'sets the dates in the store timezone' do
+ subject
+ expect(assigns(:object).date_from).to eq(date_from.to_date.in_time_zone(store.preferred_timezone))
+ expect(assigns(:object).date_to.change(usec: 0)).to eq(date_to.to_date.in_time_zone(store.preferred_timezone).end_of_day.change(usec: 0))
+ end
+ end
+
+ context 'when no dates are provided' do
+ let(:report_params) { { type: 'sales_total', currency: 'USD' } }
+
+ before { Timecop.freeze(Time.current) }
+
+ after { Timecop.return }
+
+ it 'sets default values' do
+ subject
+ expect(assigns(:object).date_from).to eq(1.month.ago.in_time_zone(store.preferred_timezone).beginning_of_day)
+ expect(assigns(:object).date_to.change(usec: 0)).to eq(Time.current.in_time_zone(store.preferred_timezone).end_of_day.change(usec: 0))
+ end
+ end
end
end