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 for orders export and order-listing filter (#12999)
Jawaria Waris58e4832580c5
diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rbindex 03599c9661..782512de5c 100644--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb@@ -15,7 +15,7 @@ module Spreeif search_params[:created_at_gt].present?search_params[:created_at_gt] = begin# 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)+ search_params[:created_at_gt].to_date&.in_time_zone(current_timezone)&.beginning_of_dayrescue StandardError''end@@ -31,7 +31,7 @@ module Spreeif search_params[:completed_at_gt].present?search_params[:completed_at_gt] = begin- search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)+ search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)&.beginning_of_dayrescue StandardError''enddiff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erbindex 8446888f89..308a94579a 100644--- a/admin/app/views/spree/admin/orders/_filters.html.erb+++ b/admin/app/views/spree/admin/orders/_filters.html.erb@@ -45,6 +45,17 @@<%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %><%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %><%= f.hidden_field :user_id_eq, value: @user.try(:id) %>+ <%= f.hidden_field :shipment_state_eq, value: params.dig(:q, :shipment_state_eq) %>+ <% Array(params.dig(:q, :shipment_state_not_in)).each do |state| %>+ <%= hidden_field_tag 'q[shipment_state_not_in][]', state %>+ <% end %>+ <%= f.hidden_field :state_eq, value: params.dig(:q, :state_eq) %>+ <% Array(params.dig(:q, :state_in)).each do |state| %>+ <%= hidden_field_tag 'q[state_in][]', state %>+ <% end %>+ <%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>+ <%= f.hidden_field :partially_refunded, value: params.dig(:q, :partially_refunded) %>+<% unless @user %><div class="form-group">diff --git a/admin/spec/controllers/spree/admin/exports_controller_spec.rb b/admin/spec/controllers/spree/admin/exports_controller_spec.rbindex cf2fa8cc25..3373c0f435 100644--- a/admin/spec/controllers/spree/admin/exports_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/exports_controller_spec.rb@@ -8,10 +8,10 @@ describe Spree::Admin::ExportsController, type: :controller dolet(:store) { @default_store }describe '#index' do- let!(:export) { create(:product_export, store: store) }-subject { get :index }+ let!(:export) { create(:product_export, store: store) }+it 'renders the index template' dosubjectexpect(response).to render_template(:index)@@ -78,14 +78,14 @@ describe Spree::Admin::ExportsController, type: :controller doenddescribe '#show' do+ subject { get :show, params: { id: export.id } }+let(:export) { create(:product_export, store: store) }before doallow_any_instance_of(Spree::Exports::Products).to receive_message_chain(:attachment, :url).and_return('http://example.com/test.csv')end- subject { get :show, params: { id: export.id } }-it 'downloads the export' dosubjectexpect(response).to have_http_status(:see_other)diff --git a/admin/spec/controllers/spree/admin/orders_controller_spec.rb b/admin/spec/controllers/spree/admin/orders_controller_spec.rbindex 1865b9a5de..1431ee832c 100644--- a/admin/spec/controllers/spree/admin/orders_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/orders_controller_spec.rb@@ -105,7 +105,7 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doexpect(assigns(:orders).to_a).to contain_exactly(cancelled_order)end-+it 'returns all orders with balance due' doget :index, params: { q: { payment_state_eq: :balance_due } }@@ -189,6 +189,15 @@ RSpec.describe Spree::Admin::OrdersController, type: :controller doendendend++ it 'returns orders matching both shipment and payment filters' do+ get :index, params: { q: {+ shipment_state_not_in: %w[shipped canceled],+ payment_state_eq: :balance_due+ } }++ expect(assigns(:orders).to_a).to contain_exactly(order)+ endenddescribe '#edit' dodiff --git a/core/app/models/spree/export.rb b/core/app/models/spree/export.rbindex 13632d08a1..26b3d21ad0 100644--- a/core/app/models/spree/export.rb+++ b/core/app/models/spree/export.rb@@ -42,6 +42,7 @@ module Spree# Callbacks#before_validation :set_default_format, on: :create+ before_validation :normalize_search_params, on: :create, if: -> { search_params.present? }before_create :clear_search_params, if: -> { record_selection == 'all' }after_commit :generate_async, on: :create@@ -127,6 +128,27 @@ module Spreeendend+ # Ensures search params maintain consistent format between UI and exports+ # - Preserves valid JSON unchanged+ # - Converts Ruby hashes to JSON strings+ # - Handles malformed input gracefully+ def normalize_search_params+ return if search_params.blank?++ if search_params.is_a?(Hash)+ self.search_params = search_params.to_json+ return+ end++ begin+ # It's a string, so we parse and re-dump to ensure consistency+ parsed = JSON.parse(search_params.to_s)+ self.search_params = parsed.to_json+ rescue JSON::ParserError+ # Leave as-is if not valid JSON string+ end+ end+def current_ability@current_ability ||= Spree::Dependencies.ability_class.constantize.new(user, { store: store })enddiff --git a/core/spec/models/spree/export_spec.rb b/core/spec/models/spree/export_spec.rbindex 79a5805e73..5a98cef2d7 100644--- a/core/spec/models/spree/export_spec.rb+++ b/core/spec/models/spree/export_spec.rb@@ -1,6 +1,6 @@require 'spec_helper'-RSpec.describe Spree::Export, type: :model, job: true do+RSpec.describe Spree::Export, :job, type: :model dolet(:store) { create(:store, code: 'my-store') }let(:user) { create(:admin_user) }@@ -70,4 +70,63 @@ RSpec.describe Spree::Export, type: :model, job: true doexpect { export.send_export_done_email }.to have_enqueued_job(ActionMailer::MailDeliveryJob)endend++ describe '#normalize_search_params' do+ let(:export) { build(:export) }++ context 'with nil search_params' do+ it 'does nothing' do+ export.search_params = nil+ expect { export.normalize_search_params }.not_to change(export, :search_params)+ end+ end++ context 'with empty search_params' do+ it 'does nothing' do+ export.search_params = ''+ expect { export.normalize_search_params }.not_to change(export, :search_params)+ end+ end++ context 'with valid JSON string' do+ let(:params) { { filters: { date: '2023-01-01' } }.to_json }++ it 'maintains the same content' do+ export.search_params = params+ export.normalize_search_params+ expect(JSON.parse(export.search_params)).to eq(JSON.parse(params))+ end++ it 'ensures valid JSON output' do+ export.search_params = params+ export.normalize_search_params+ expect { JSON.parse(export.search_params) }.not_to raise_error+ end+ end++ context 'with invalid JSON string' do+ it 'preserves the original string' do+ export.search_params = '{invalid: json'+ expect { export.normalize_search_params }.not_to raise_error+ expect(export.search_params).to eq('{invalid: json')+ end+ end++ context 'with Ruby hash input' do+ it 'converts to JSON string' do+ export.search_params = { key: 'value' }+ export.normalize_search_params+ expect(export.search_params).to eq('{"key":"value"}')+ end+ end++ context 'with pre-normalized params' do+ it 'does not double-process' do+ export.search_params = { date: Time.current }.to_json+ original = export.search_params.dup+ export.normalize_search_params+ expect(export.search_params).to eq(original)+ end+ end+ endend