spree_admin 5.2.6 → 5.3.0.rc1

data/app/helpers/spree/admin/base_helper.rb

@@ -1,8 +1,6 @@
 module Spree
   module Admin
     module BaseHelper
-      include Spree::ImagesHelper
-
       def render_admin_partials(section, options = {})
         Spree.admin.partials.send(section.to_s.gsub('_partials', '').to_sym).map do |partial|
           render partial, options
@@ -39,7 +37,7 @@ module Spree
       end
 
       def settings_active?
-        Spree::Deprecation.warn('settings_active? is deprecated and will be removed in Spree 6.0. Please use settings_area? instead')
+        Spree::Deprecation.warn('settings_active? is deprecated and will be removed in Spree 5.5. Please use settings_area? instead')
         @settings_active || %w[admin_users audits custom_domains exports invitations oauth_applications
                                payment_methods refund_reasons reimbursement_types return_authorization_reasons roles
                                shipping_categories shipping_methods stock_locations store_credit_categories
@@ -51,34 +49,6 @@ module Spree
         @available_countries_iso ||= current_store.countries_available_for_checkout.pluck(:iso)
       end
 
-      # render an avatar for a user
-      # if user doesn't have an avatar, the user's initials will be displayed on a rounded background
-      # @param user [Spree::User] the user to render the avatar for
-      # @param options [Hash] the options for the avatar
-      # @option options [Integer] :width the width of the avatar, default: 128
-      # @option options [Integer] :height the height of the avatar, default: 128
-      # @option options [String] :class the CSS class(es) of the avatar, default: 'avatar'
-      # @return [String] the avatar
-      def render_avatar(user, options = {})
-        return unless user.present?
-
-        options[:width] ||= 128
-        options[:height] ||= 128
-        options[:class] ||= 'avatar'
-
-        if user.respond_to?(:avatar) && user.avatar.attached? && user.avatar.variable?
-          spree_image_tag(
-            user.avatar,
-            width: options[:width],
-            height: options[:height],
-            class: options[:class],
-            style: "width: #{options[:width]}px; height: #{options[:height]}px;"
-          )
-        else
-          content_tag(:div, user.name&.initials, class: options[:class], style: "width: #{options[:width]}px; height: #{options[:height]}px;")
-        end
-      end
-
       # returns the available display on options, eg backend, frontend, both
       # @return [Array<Array<String, String>>] the available display on options
       def display_on_options(model = nil)
@@ -96,7 +66,15 @@ module Spree
       # @return [String] the error message
       def error_message_on(object, method, _options = {})
         object = convert_to_model(object)
-        obj = object.respond_to?(:errors) ? object : instance_variable_get("@#{object}")
+
+        obj = if object.respond_to?(:errors)
+                object
+              else
+                # Handle nested attributes like "variant[prices_attributes][0]"
+                # by extracting the base object name
+                object_name = object.to_s.split('[').first
+                instance_variable_get("@#{object_name}") if object_name.present?
+              end
 
         if obj && obj.errors[method].present?
           errors = safe_join(obj.errors[method], '<br />'.html_safe)
@@ -157,14 +135,16 @@ module Spree
           render 'spree/admin/preferences/password_field', form: form, field: field, options: options
         when :text
           form.text_area(field, preference_field_options(options))
+        when :datetime
+          form.datetime_field(field, preference_field_options(options))
         else
           form.text_field(field, preference_field_options(options))
         end
       end
 
-      # returns the options for a preference field, according to the type of the preference (number, decimal, boolean, string, password, text)
+      # returns the options for a preference field, according to the type of the preference (number, decimal, boolean, string, password, text, datetime)
       # @param options [Hash] the options for the field
-      # @option options [Symbol] :type the type of the preference, eg. :integer, :decimal, :boolean, :string, :password, :text
+      # @option options [Symbol] :type the type of the preference, eg. :integer, :decimal, :boolean, :string, :password, :text, :datetime
       # @option options [Boolean] :disabled whether the field is disabled
       # @return [Hash] the options for the field
       def preference_field_options(options)
@@ -172,12 +152,12 @@ module Spree
                         when :integer
                           {
                             size: 10,
-                            class: 'input_integer form-control'
+                            class: 'input_integer form-input'
                           }
                         when :decimal
                           {
                             size: 10,
-                            class: 'input_decimal form-control',
+                            class: 'input_decimal form-input',
                             step: options[:step] || 0.01
                           }
                         when :boolean
@@ -187,23 +167,27 @@ module Spree
                         when :string
                           {
                             size: 10,
-                            class: 'input_string form-control'
+                            class: 'input_string form-input'
                           }
                         when :password
                           {
                             size: 10,
-                            class: 'password_string form-control'
+                            class: 'password_string form-input'
                           }
                         when :text
                           {
                             rows: 15,
                             cols: 85,
-                            class: 'form-control'
+                            class: 'form-input'
+                          }
+                        when :datetime
+                          {
+                            class: 'form-input'
                           }
                         else
                           {
                             size: 10,
-                            class: 'input_string form-control'
+                            class: 'input_string form-input'
                           }
                         end
 
@@ -234,7 +218,7 @@ module Spree
                       class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
         else
           if object.preference_type(key).to_sym == :boolean
-            content_tag(:div, class: 'form-group custom-control custom-checkbox') do
+            content_tag(:div, class: 'form-group custom-control form-checkbox') do
               preference_field_for(form, "preferred_#{key}", type: object.preference_type(key)) +
                 form.label(
                   "preferred_#{key}",
@@ -264,7 +248,8 @@ module Spree
       # @option options [String] :title the title of the button
       # @return [String] the button
       def clipboard_button(options = {})
-        options[:class] ||= 'btn btn-clipboard'
+        options[:class] ||= 'btn btn-light btn-sm btn-clipboard'
+        options[:icon_class] ||= 'mr-0 text-sm'
         options[:type] ||= 'button'
         options[:data] ||= {}
         options[:data][:action] = 'clipboard#copy'
@@ -273,7 +258,7 @@ module Spree
         options[:aria_label] ||= Spree.t('admin.copy_to_clipboard') # screen-reader label
 
         content_tag(:button, options) do
-          icon('copy', class: 'mr-0 font-size-sm') + tooltip(Spree.t('admin.copy_to_clipboard'))
+          icon('copy', class: options[:icon_class]) + tooltip(Spree.t('admin.copy_to_clipboard'))
         end
       end
 
@@ -283,15 +268,17 @@ module Spree
       # @option options [String] :class the CSS class(es) of the component
       # @option options [Hash] :data the data attributes for the component
       # @option options [String] :title the title of the component
+      # @option options [String] :button_class the CSS class(es) of the button
+      # @option options [String] :icon_class the CSS class(es) of the icon
       # @return [String] the component
       def clipboard_component(text, options = {})
         options[:data] ||= {}
         options[:data][:controller] = 'clipboard'
-        options[:data][:clipboard_success_content_value] ||= raw(icon('check', class: 'mr-0 font-size-sm'))
+        options[:data][:clipboard_success_content_value] ||= raw(icon('check', class: options[:icon_class]))
 
-        content_tag(:span, data: options[:data]) do
+        content_tag(:span, data: options[:data], class: options[:class]) do
           hidden_field_tag(:clipboard_source, text, data: { clipboard_target: 'source' }) +
-            clipboard_button
+            clipboard_button(class: options[:button_class], icon_class: options[:icon_class])
         end
       end
 
@@ -307,7 +294,9 @@ module Spree
         percentage = (value.to_f / max * 100).round
 
         content_tag(:div, class: 'progress') do
-          content_tag(:div, { class: 'progress-bar', role: 'progressbar', style: "width: #{percentage}%", aria: { valuenow: value, valuemin: min, valuemax: max } }) do
+          content_tag(:div,
+                      { class: 'progress-bar', role: 'progressbar', style: "width: #{percentage}%",
+                        aria: { valuenow: value, valuemin: min, valuemax: max } }) do
           end
         end
       end
@@ -337,6 +326,7 @@ module Spree
       # @return [String] the local time ago
       def spree_time_ago(time, options = {})
         return '' if time.blank?
+
         options[:data] ||= {}
         options[:data][:controller] = 'tooltip'
 
@@ -356,6 +346,37 @@ module Spree
           end
         end
       end
+
+      # Formats a preference value for display
+      # Handles special cases like zone_ids, user_ids, country_id that should show names instead of IDs
+      # @param key [Symbol] the preference key
+      # @param value [Object] the preference value
+      # @return [String] the formatted value
+      def format_preference_value(key, value)
+        return Spree.t(:unlimited) if value.blank?
+
+        case key
+        when :zone_ids
+          zone_ids = Array(value).reject(&:blank?).map(&:to_i)
+          return Spree.t(:none) if zone_ids.empty?
+
+          Spree::Zone.where(id: zone_ids).pluck(:name).join(', ')
+        when :user_ids
+          user_ids = Array(value).reject(&:blank?).map(&:to_i)
+          return Spree.t(:none) if user_ids.empty?
+
+          Spree.user_class.where(id: user_ids).map { |u| u.try(:email) || u.id }.join(', ')
+        when :customer_group_ids
+          customer_group_ids = Array(value).reject(&:blank?).map(&:to_i)
+          return Spree.t(:none) if customer_group_ids.empty?
+
+          Spree::CustomerGroup.where(id: customer_group_ids).pluck(:name).join(', ')
+        when :country_id
+          Spree::Country.find_by(id: value)&.name || value
+        else
+          value.is_a?(Array) ? value.reject(&:blank?).join(', ') : value
+        end
+      end
     end
   end
 end

data/app/helpers/spree/admin/bulk_editor_helper.rb

@@ -0,0 +1,41 @@
+module Spree
+  module Admin
+    module BulkEditorHelper
+      # Define the cell actions using Stimulus keyboard event filters
+      # Note: Enter, Escape, Delete, Backspace are handled via keydown->bulk-editor#handleKeydown
+      # since they need special logic for edit mode vs selection mode
+      # @return [String] the cell actions
+      def bulk_editor_cell_actions
+        [
+          'focus->bulk-editor#onCellFocus',
+          'blur->bulk-editor#onCellBlur',
+          'mousedown->bulk-editor#onCellMouseDown',
+          'mouseenter->bulk-editor#onCellMouseEnter',
+          'dblclick->bulk-editor#onCellDoubleClick',
+          'input->bulk-editor#markDirty',
+          'keydown->bulk-editor#handleKeydown',
+          # Copy/Paste/Fill (Ctrl for Windows/Linux, Meta for Mac)
+          'keydown.ctrl+c->bulk-editor#copy',
+          'keydown.meta+c->bulk-editor#copy',
+          'keydown.ctrl+v->bulk-editor#paste',
+          'keydown.meta+v->bulk-editor#paste',
+          'keydown.ctrl+d->bulk-editor#fillDown',
+          'keydown.meta+d->bulk-editor#fillDown',
+          # Navigation (only works in selection mode)
+          'keydown.up->bulk-editor#navigateUp',
+          'keydown.down->bulk-editor#navigateDown',
+          'keydown.left->bulk-editor#navigateLeft',
+          'keydown.right->bulk-editor#navigateRight',
+          # Selection
+          'keydown.shift+up->bulk-editor#selectUp',
+          'keydown.shift+down->bulk-editor#selectDown',
+          'keydown.shift+left->bulk-editor#selectLeft',
+          'keydown.shift+right->bulk-editor#selectRight',
+          # Tab navigation (works in both modes)
+          'keydown.tab->bulk-editor#navigateRight',
+          'keydown.shift+tab->bulk-editor#navigateLeft'
+        ].join(' ')
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/bulk_operations_helper.rb

@@ -4,7 +4,7 @@ module Spree
       # render a checkbox to select all items for bulk operations
       # @return [String]
       def bulk_operations_select_all_checkbox
-        content_tag :div, class: "custom-control custom-checkbox ml-1" do
+        content_tag :div, class: "custom-control form-checkbox ml-1" do
           check_box_tag(
             nil,
             nil,
@@ -21,7 +21,7 @@ module Spree
       # @param object [Spree::Product, Spree::User, Spree::Order]
       # @return [String]
       def bulk_operations_checkbox(object)
-        content_tag :div, class: "custom-control custom-checkbox ml-1" do
+        content_tag :div, class: "custom-control form-checkbox ml-1" do
           check_box_tag(
             "ids[]",
             object.id,

data/app/helpers/spree/admin/code_block_helper.rb

@@ -0,0 +1,18 @@
+module Spree
+  module Admin
+    module CodeBlockHelper
+      def code_block(code, options = {})
+        options[:language] ||= 'json'
+        options[:class] ||= 'm-0 block overflow-auto rounded-lg'
+
+        content_tag :div, data: { controller: 'highlight' } do
+          content_tag(:pre) do
+            content_tag(:code, class: "language-#{options[:language]} #{options[:class]}", style: options[:style], data: { highlight_target: 'code' }) do
+              code
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/helpers/spree/admin/dialog_helper.rb

@@ -1,6 +1,36 @@
 module Spree
   module Admin
     module DialogHelper
+      # Renders a dialog container element
+      # @param id [String, nil] the id of the dialog element
+      # @param controller_name [String] the Stimulus controller name (default: 'dialog')
+      # @param html_options [Hash] additional HTML attributes
+      # @yield the content to render inside the dialog
+      # @return [String] the dialog HTML
+      #
+      # @example Basic usage
+      #   <%= dialog do %>
+      #     <%= dialog_header("Confirm Delete") %>
+      #     <div class="dialog-body">Are you sure?</div>
+      #     <div class="dialog-footer">
+      #       <%= dialog_discard_button %>
+      #       <%= button_tag "Delete", class: "btn btn-danger" %>
+      #     </div>
+      #   <% end %>
+      #
+      # @example With custom id and controller
+      #   <%= dialog(id: 'my-dialog', controller_name: 'custom-dialog') do %>
+      #     ...
+      #   <% end %>
+      def dialog(id: nil, controller_name: 'dialog', **html_options, &block)
+        html_options[:class] = "dialog #{html_options[:class]}".strip
+        html_options[:data] ||= {}
+        html_options[:data]["#{controller_name}-target".to_sym] = 'dialog'
+        html_options[:id] = id if id.present?
+
+        content_tag(:dialog, html_options, &block)
+      end
+
       def dialog_header(title, controller_name = 'dialog')
         content_tag(:div, class: 'dialog-header') do
           content_tag(:h5, title, class: 'dialog-title') + dialog_close_button(controller_name)

data/app/helpers/spree/admin/drawer_helper.rb

@@ -1,6 +1,36 @@
 module Spree
   module Admin
     module DrawerHelper
+      # Renders a drawer container element (slide-out panel)
+      # @param id [String, nil] the id of the drawer element
+      # @param controller_name [String] the Stimulus controller name (default: 'drawer')
+      # @param html_options [Hash] additional HTML attributes
+      # @yield the content to render inside the drawer
+      # @return [String] the drawer HTML
+      #
+      # @example Basic usage
+      #   <%= drawer do %>
+      #     <%= drawer_header("Edit Product") %>
+      #     <div class="drawer-body">Form fields here...</div>
+      #     <div class="drawer-footer">
+      #       <%= drawer_discard_button %>
+      #       <%= button_tag "Save", class: "btn btn-primary" %>
+      #     </div>
+      #   <% end %>
+      #
+      # @example With custom id and controller
+      #   <%= drawer(id: 'filters-drawer', controller_name: 'dialog') do %>
+      #     ...
+      #   <% end %>
+      def drawer(id: nil, controller_name: 'drawer', **html_options, &block)
+        html_options[:class] = "drawer #{html_options[:class]}".strip
+        html_options[:data] ||= {}
+        html_options[:data]["#{controller_name}-target".to_sym] = 'dialog'
+        html_options[:id] = id if id.present?
+
+        content_tag(:dialog, html_options, &block)
+      end
+
       def drawer_header(title, controller_name = 'drawer')
         content_tag(:div, class: 'drawer-header') do
           content_tag(:h5, title, class: 'drawer-title') + drawer_close_button(controller_name)

data/app/helpers/spree/admin/json_preview_helper.rb

@@ -22,13 +22,11 @@ module Spree
       end
 
       def storefront_serializer_exists?(record)
-        serializer_class_name = "Spree::V2::Storefront::#{record.class.name.demodulize}Serializer"
-        serializer_class_name.safe_constantize.present?
+        storefront_serializer_for(record).present?
       end
 
       def platform_serializer_exists?(record)
-        serializer_class_name = "Spree::Api::V2::Platform::#{record.class.name.demodulize}Serializer"
-        serializer_class_name.safe_constantize.present?
+        platform_serializer_for(record).present?
       end
 
       def serialize_to_json(record, api_type: :storefront)
@@ -45,7 +43,7 @@ module Spree
 
         serializable_hash = serializer.new(
           record,
-          params: serializer_params(record)
+          params: serializer_params(record, api_type)
         ).serializable_hash
 
         JSON.pretty_generate(serializable_hash)
@@ -54,17 +52,27 @@ module Spree
       private
 
       def storefront_serializer_for(record)
-        serializer_class_name = "Spree::V2::Storefront::#{record.class.name.demodulize}Serializer"
-        serializer_class_name.safe_constantize
+        serializer_for(record, api_type: :storefront, namespace: 'Spree::V2::Storefront')
       end
 
       def platform_serializer_for(record)
-        serializer_class_name = "Spree::Api::V2::Platform::#{record.class.name.demodulize}Serializer"
-        serializer_class_name.safe_constantize
+        serializer_for(record, api_type: :platform, namespace: 'Spree::Api::V2::Platform')
       end
 
-      def serializer_params(record)
+      def serializer_for(record, api_type:, namespace:)
+        class_name = record.class.name.demodulize
+        method_name = "#{api_type}_#{class_name.underscore}_serializer"
+        if Spree.api.respond_to?(method_name)
+          Spree.api.public_send(method_name)
+        else
+          serializer_class_name = "#{namespace}::#{class_name}Serializer"
+          serializer_class_name.safe_constantize
+        end
+      end
+
+      def serializer_params(record, api_type)
         params = {}
+        params[:api_type] = api_type
         params[:store] = current_store if defined?(current_store) && current_store.present?
         params[:currency] = current_currency if defined?(current_currency) && current_currency.present?
         params[:locale] = current_locale if defined?(current_locale) && current_locale.present?

data/app/helpers/spree/admin/modal_helper.rb

@@ -5,7 +5,7 @@ module Spree
       # @param title [String, Proc] the title of the modal
       # @return [String]
       def modal_header(title)
-        Spree::Deprecation.warn('Bootstrap modals are deprecated and will be removed in Spree 6. Please use native dialogs with `dialog_header` helper.')
+        Spree::Deprecation.warn('Bootstrap modals are deprecated and will be removed in Spree 5.5. Please use native dialogs with `dialog_header` helper.')
 
         title = capture(&title) if block_given?
         content_tag(:div, class: 'modal-header') do

data/app/helpers/spree/admin/navigation_helper.rb

@@ -42,7 +42,7 @@ module Spree
         selected_option = (params[:per_page].try(:to_i) || per_page_default).to_i
         selected_option_label = selected_option.to_s + icon('chevron-down', class: 'ml-1 mr-0 arrow')
 
-        dropdown(id: 'per-page-dropdown') do
+        dropdown(id: 'per-page-dropdown', portal: false) do
           dropdown_toggle(class: 'btn-light btn-sm') do
             raw(selected_option_label)
           end +
@@ -136,7 +136,7 @@ module Spree
 
         button_tag(type: 'button', class: 'btn btn-light', data: { action: 'click->export-dialog#open' }) do
           icon('table-export', class: 'mr-0 mr-lg-2') +
-          content_tag(:span, Spree.t(:export), class: 'd-none d-lg-inline')
+          content_tag(:span, Spree.t(:export), class: 'hidden lg:inline')
         end
       end
 
@@ -189,7 +189,7 @@ module Spree
           options.merge(
             type: button_type,
             class: "btn #{css_classes}",
-            'data-turbo-submits-with' => content_tag(:span, '', class: 'spinner-border spinner-border-sm', role: 'status')
+            'data-turbo-submits-with' => content_tag(:span, '', class: 'inline-block w-4 h-4 border-2 border-current border-r-transparent rounded-full animate-spin', role: 'status')
           )
         )
       end
@@ -247,8 +247,8 @@ module Spree
           url = session[session_key] if session[session_key].present?
         end
 
-        link_to url, class: 'd-flex align-items-center text-decoration-none' do
-          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray shadow-none px-2 d-flex align-items-center shadow-none') +
+        link_to url, class: 'flex items-center no-underline' do
+          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover:bg-gray-100 shadow-none px-2 flex items-center shadow-none') +
             content_tag(:span, label, class: 'font-size-base text-black')
         end
       end
@@ -261,7 +261,7 @@ module Spree
       def external_link_to(label, url, opts = {}, &block)
         opts[:target] ||= :blank
         opts[:rel] ||= :nofollow
-        opts[:class] ||= "d-inline-flex align-items-center text-blue text-decoration-none"
+        opts[:class] ||= "inline-flex items-center text-blue-500 no-underline hover:text-blue-600 hover:bg-blue-50 p-1 rounded"
 
         if block_given?
           link_to url, opts, &block
@@ -299,7 +299,7 @@ module Spree
       # @param css [String] the css class of the help bubble
       # @return [String] the help bubble with the icon
       def help_bubble(text = '', placement = 'top', css: nil)
-        css ||= 'text-xs text-muted cursor-default opacity-75'
+        css ||= 'text-gray-500 cursor-default opacity-75'
         content_tag :span, data: { controller: 'tooltip', tooltip_placement_value: placement } do
           icon('info-square-rounded', class: css) + tooltip(text)
         end

data/app/helpers/spree/admin/onboarding_helper.rb

@@ -4,13 +4,13 @@ module Spree
       def onboarding_check_circle(condition, pending: false)
         if pending
           return icon('exclamation-circle', height: height,
-                                            class: 'rounded-circle d-inline-flex align-items-center bg-warning text-primary p-1').html_safe
+                                            class: 'rounded-full inline-flex items-center bg-warning text-zinc-950 p-1').html_safe
         end
 
         if condition == true
-          icon('check', class: 'rounded-circle d-inline-flex align-items-center bg-success text-success p-1', style: 'border: 3px solid #C6F6D5')
+          icon('check', class: 'rounded-full inline-flex items-center bg-green-200 text-green-600 border-green-200 p-1')
         else
-          icon('check', class: 'rounded-circle d-inline-flex align-items-center border-dashed text-light p-1')
+          icon('check', class: 'rounded-full inline-flex items-center border-dashed text-gray-300 p-1')
         end.html_safe
       end
     end

data/app/helpers/spree/admin/orders_filters_helper.rb

@@ -1,76 +1,39 @@
 module Spree
   module Admin
     module OrdersFiltersHelper
-      def params_to_filters(search_params:, vendor: nil, user: nil)
-        return if search_params.blank?
+      def search_params
+        super
+        return params[:q] if params[:q].blank?
 
-        if search_params.is_a?(String)
-          search_params = JSON.parse(search_params).deep_symbolize_keys
-        end
-
-        search_params.delete(:inventory_units_shipment_id_null) if search_params[:inventory_units_shipment_id_null] == '0'
-
-        if search_params[:number_cont]
-          search_params[:number_cont] = search_params[:number_cont].split('-').first
-        end
-
-        if 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)&.beginning_of_day
-          rescue StandardError
-            ''
-          end
-        end
-
-        if search_params[:created_at_lt].present?
-          search_params[:created_at_lt] = begin
-            search_params[:created_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
+        if params[:q][:completed_at_gt].present?
+          params[:q][:completed_at_gt] = begin
+            params[:q][:completed_at_gt].to_date&.in_time_zone(current_timezone)&.beginning_of_day
           rescue StandardError
             ''
           end
         end
 
-        if search_params[:completed_at_gt].present?
-          search_params[:completed_at_gt] = begin
-            search_params[:completed_at_gt].to_date&.in_time_zone(current_timezone)&.beginning_of_day
+        if params[:q][:completed_at_lt].present?
+          params[:q][:completed_at_lt] = begin
+            params[:q][:completed_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
           rescue StandardError
             ''
           end
         end
 
-        if search_params[:completed_at_lt].present?
-          search_params[:completed_at_lt] = begin
-            search_params[:completed_at_lt].to_date&.in_time_zone(current_timezone)&.end_of_day
-          rescue StandardError
-            ''
-          end
-        end
-
-        search_params[:vendor_orders_vendor_id_eq] = vendor.id if vendor.present?
-        search_params[:user_id_eq] = user.id if user.present?
+        load_user
+        params[:q][:user_id_eq] = @user.id if @user.present?
 
         # Handle refunded and partially_refunded payment state filters
-        if search_params[:payment_state_eq] == 'refunded'
-          search_params[:refunded] = '1'
-          search_params.delete(:payment_state_eq)
-        elsif search_params[:payment_state_eq] == 'partially_refunded'
-          search_params[:partially_refunded] = '1'
-          search_params.delete(:payment_state_eq)
+        if params[:q][:payment_state_eq] == 'refunded'
+          params[:q][:refunded] = '1'
+          params[:q].delete(:payment_state_eq)
+        elsif params[:q][:payment_state_eq] == 'partially_refunded'
+          params[:q][:partially_refunded] = '1'
+          params[:q].delete(:payment_state_eq)
         end
 
-        search_params
-      end
-
-      def load_orders
-        @search = scope.preload(:user).accessible_by(current_ability, :index).
-                  ransack(params_to_filters(search_params: params[:q].clone, vendor: @vendor, user: @user))
-
-        # lazy loading other models here (via includes) may result in an invalid query
-        # e.g. SELECT  DISTINCT DISTINCT "spree_orders".id, "spree_orders"."created_at" AS alias_0 FROM "spree_orders"
-        # see https://github.com/spree/spree/pull/3919
-        @orders = @search.result(distinct: true).page(params[:page]).per(params[:per_page] || Spree::Admin::RuntimeConfig.admin_orders_per_page)
-        @collection = @orders
+        params[:q]
       end
 
       def load_user

data/app/helpers/spree/admin/orders_helper.rb

@@ -3,6 +3,7 @@ module Spree
     module OrdersHelper
       TaxLine = Struct.new(:label, :display_amount, :item, :for_shipment, keyword_init: true) do
         def name
+          Spree::Deprecation.warn("TaxLine is deprecated and will be removed in Spree 5.5")
           item_name = item.name
           item_name += " #{Spree.t(:shipment).downcase}" if for_shipment
 
@@ -11,6 +12,7 @@ module Spree
       end
 
       def order_summary_tax_lines_additional(order)
+        Spree::Deprecation.warn("order_summary_tax_lines_additional is deprecated and will be removed in Spree 5.5")
         line_item_taxes = order.line_item_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment) }
         shipment_taxes = order.shipment_adjustments.tax.map { |tax_adjustment| map_to_tax_line(tax_adjustment, for_shipment: true) }
 
@@ -140,6 +142,8 @@ module Spree
       end
 
       def order_filter_dropdown_value
+        Spree::Deprecation.warn("order_filter_dropdown_value is deprecated and will be removed in Spree 5.5")
+
         if params.dig(:q, :shipment_state_not_in) == ['shipped', 'canceled']
           Spree.t('admin.orders.unfulfilled')
         elsif params.dig(:q, :shipment_state_eq) == 'shipped'