spree_admin 5.2.6 → 5.3.0.rc1

data/app/models/spree/admin/form_builder.rb

@@ -19,7 +19,7 @@ module Spree
       #
       # @param method [Symbol] the field name
       # @param options [Hash] field options including:
-      #   - :class [String] CSS classes (defaults to 'form-control')
+      #   - :class [String] CSS classes (defaults to 'form-input')
       #   - :label [String, Boolean] label text or false to hide label
       #   - :required [Boolean] whether field is required
       #   - :help [String] help text to display below the field
@@ -28,12 +28,20 @@ module Spree
       #   - :append [String] text to append after the input field
       # @return [String] HTML string containing the complete form group
       def spree_text_field(method, options = {})
-        options[:class] ||= 'form-control'
+        options[:class] ||= 'form-input'
         prepend = options.delete(:prepend)
         append = options.delete(:append)
 
+        if prepend.present? || append.present?
+          options[:class] = 'border-0 focus:ring-0 focus:outline-none text-base grow'
+
+          if prepend.present?
+            options[:class] += ' pl-0'
+          end
+        end
+
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             wrap_with_input_group(@template.text_field(@object_name, method, objectify_options(options)), prepend, append) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -45,26 +53,92 @@ module Spree
       # @param options [Hash] field options (see {#spree_text_field} for available options)
       # @return [String] HTML string containing the complete form group
       def spree_number_field(method, options = {})
-        options[:class] ||= 'form-control'
+        options[:class] ||= 'form-input'
         prepend = options.delete(:prepend)
         append = options.delete(:append)
 
+        if prepend.present? || append.present?
+          options[:class] ||= 'border-0 focus:ring-0 focus:outline-none'
+        end
+
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             wrap_with_input_group(@template.number_field(@object_name, method, objectify_options(options)), prepend, append) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
+      # Create a money/currency field with Spree form styling and locale-aware formatting
+      #
+      # This field displays amounts in the user's locale format (e.g., "1.234,56" for German)
+      # and normalizes values to standard decimal format before form submission.
+      #
+      # @param method [Symbol] the field name
+      # @param options [Hash] field options including:
+      #   - :currency [String] the currency code (e.g., 'USD', 'EUR', 'PLN') - used for symbol display
+      #   - :value [BigDecimal, Float, String] the value to display (will be formatted for locale)
+      #   - other options from {#spree_text_field}
+      # @return [String] HTML string containing the complete form group with money field
+      def spree_money_field(method, options = {})
+        currency = options.delete(:currency)
+        prepend = options.delete(:prepend)
+        append = options.delete(:append)
+
+        # Get currency object for formatting
+        currency_obj = currency.present? ? ::Money::Currency.find(currency) : nil
+
+        # Use currency symbol as append if currency is provided and no append specified
+        if currency_obj.present? && append.nil?
+          append = currency_obj.symbol
+        end
+
+        # Get decimal/thousands separators from currency or fall back to I18n locale
+        locale = I18n.locale
+        if currency_obj.present?
+          decimal_separator = currency_obj.decimal_mark
+          thousands_separator = currency_obj.thousands_separator
+        else
+          decimal_separator = I18n.t(:'number.currency.format.separator', default: '.')
+          thousands_separator = I18n.t(:'number.currency.format.delimiter', default: ',')
+        end
+
+        # Format the value for display if present
+        if options[:value].present?
+          options[:value] = format_money_value(options[:value], decimal_separator)
+        elsif @object.respond_to?(method) && @object.send(method).present?
+          options[:value] = format_money_value(@object.send(method), decimal_separator)
+        end
+
+        options[:class] ||= 'form-input'
+        options[:inputmode] = 'decimal'
+        options[:data] ||= {}
+        options[:data][:controller] = 'money-field'
+        options[:data][:money_field_locale_value] = locale
+        options[:data][:money_field_decimal_separator_value] = decimal_separator
+        options[:data][:money_field_thousands_separator_value] = thousands_separator
+        options[:data][:action] = 'blur->money-field#format'
+
+        if prepend.present? || append.present?
+          options[:class] = 'border-0 focus:ring-0 focus:outline-none text-base grow'
+          options[:class] += ' pl-0' if prepend.present?
+        end
+
+        @template.content_tag(:div, class: 'form-group') do
+          spree_label(method, options) +
+            wrap_with_input_group(@template.text_field(@object_name, method, objectify_options(options)), prepend, append) +
+            @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
+        end
+      end
+
       # Create an email field with Spree form styling
       #
       # @param method [Symbol] the field name
       # @param options [Hash] field options (see {#spree_text_field} for available options)
       # @return [String] HTML string containing the complete form group
       def spree_email_field(method, options = {})
-        options[:class] ||= 'form-control'
+        options[:class] ||= 'form-input'
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.email_field(@object_name, method, objectify_options(options)) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -76,9 +150,9 @@ module Spree
       # @param options [Hash] field options (see {#spree_text_field} for available options)
       # @return [String] HTML string containing the complete form group
       def spree_date_field(method, options = {})
-        options[:class] ||= 'form-control'
+        options[:class] ||= 'form-input'
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.date_field(@object_name, method, objectify_options(options)) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -90,9 +164,9 @@ module Spree
       # @param options [Hash] field options (see {#spree_text_field} for available options)
       # @return [String] HTML string containing the complete form group
       def spree_datetime_field(method, options = {})
-        options[:class] ||= 'form-control'
+        options[:class] ||= 'form-input'
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.datetime_field(@object_name, method, objectify_options(options)) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -102,18 +176,18 @@ module Spree
       #
       # @param method [Symbol] the field name
       # @param options [Hash] field options including:
-      #   - :class [String] CSS classes (defaults to 'form-control')
+      #   - :class [String] CSS classes (defaults to 'form-input')
       #   - :rows [Integer] number of rows (defaults to 5)
       #   - :data [Hash] data attributes (defaults to textarea-autogrow controller)
       #   - other options from {#spree_text_field}
       # @return [String] HTML string containing the complete form group
       def spree_text_area(method, options = {})
         @template.content_tag(:div, class: 'form-group') do
-          options[:class] ||= 'form-control'
+          options[:class] ||= 'form-input'
           options[:rows] ||= 5
           options[:data] ||= { controller: 'textarea-autogrow' }
 
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.text_area(@object_name, method, objectify_options(options)) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -126,7 +200,7 @@ module Spree
       # @return [String] HTML string containing the complete form group with Trix editor
       def spree_rich_text_area(method, options = {})
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.content_tag(:div, class: 'trix-container') do
               @template.rich_text_area(@object_name, method, objectify_options(options))
             end +
@@ -149,11 +223,11 @@ module Spree
           html_options[:data] ||= {}
           html_options[:data][:controller] ||= 'autocomplete-select'
         else
-          html_options[:class] ||= 'custom-select'
+          html_options[:class] ||= 'form-select'
         end
 
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.select(@object_name, method, choices, objectify_options(options), html_options, &block) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -175,11 +249,11 @@ module Spree
           html_options[:data] ||= {}
           html_options[:data][:controller] ||= 'autocomplete-select'
         else
-          html_options[:class] ||= 'custom-select'
+          html_options[:class] ||= 'form-select'
         end
 
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
+          spree_label(method, options) +
             @template.collection_select(@object_name, method, collection, value_method, text_method, objectify_options(options), html_options) +
             @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
@@ -192,10 +266,11 @@ module Spree
       # @return [String] HTML string containing the complete form group with custom checkbox
       def spree_check_box(method, options = {})
         @template.content_tag(:div, class: 'form-group') do
-          @template.content_tag(:div, class: 'custom-control custom-checkbox') do
-            @template.check_box(@object_name, method, objectify_options(options.merge(class: 'custom-control-input'))) +
-            @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label')
-          end + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge!(class: 'form-text mt-2 ml-4'))
+          @template.content_tag(:div, class: 'form-checkbox') do
+            checkbox = @template.check_box(@object_name, method, objectify_options(options.merge(class: 'custom-control-input')))
+            label = options[:label] == false ? ''.html_safe : @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label')
+            checkbox + label
+          end + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge!(class: 'form-text mt-2 ml-6 pl-1'))
         end
       end
 
@@ -210,8 +285,9 @@ module Spree
       def spree_radio_button(method, tag_value, options = {})
         @template.content_tag(:div, class: 'form-group') do
           @template.content_tag(:div, class: 'custom-control custom-radio') do
-            @template.radio_button(@object_name, method, tag_value, objectify_options(options.merge(class: 'custom-control-input'))) +
-              @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label', for: options[:id])
+            radio = @template.radio_button(@object_name, method, tag_value, objectify_options(options.merge(class: 'custom-control-input form-radio')))
+            label = options[:label] == false ? ''.html_safe : @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label', value: tag_value)
+            radio + label
           end + @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
@@ -230,9 +306,9 @@ module Spree
       # @return [String] HTML string containing the complete form group with direct file upload field
       def spree_file_field(method, options = {})
         @template.content_tag(:div, class: 'form-group') do
-          @template.label(@object_name, method, get_label(method, options)) +
-          @template.render('active_storage/upload_form', form: self, field_name: method, **options) +
-          @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
+          spree_label(method, options) +
+            @template.render('active_storage/upload_form', form: self, field_name: method, **options) +
+            @template.error_message_on(@object_name, method) + spree_field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -249,17 +325,29 @@ module Spree
         @template.content_tag(:span, options[:help], class: options[:class])
       end
 
-      # Generate the label for a field with required indicator and help bubble
+      # Generate the label element for a field with required indicator and help bubble
       #
       # @param method [Symbol] the field name
       # @param options [Hash] field options
       # @option options [String, Boolean] :label label text or false to hide label
       # @option options [Boolean] :required whether field is required
       # @option options [String] :help_bubble help bubble text
-      # @return [String] HTML string containing the complete label
-      def get_label(method, options)
-        return '' if options[:label] == false
+      # @return [String] HTML string containing the complete label element or empty string
+      def spree_label(method, options)
+        return ''.html_safe if options[:label] == false
+
+        @template.label(@object_name, method, get_label(method, options))
+      end
 
+      # Generate the label content for a field with required indicator and help bubble
+      #
+      # @param method [Symbol] the field name
+      # @param options [Hash] field options
+      # @option options [String, Boolean] :label label text
+      # @option options [Boolean] :required whether field is required
+      # @option options [String] :help_bubble help bubble text
+      # @return [String] HTML string containing the label content
+      def get_label(method, options)
         translated_label = if options[:label]
                               options[:label]
                             elsif I18n.exists?("spree.#{method}")
@@ -275,6 +363,18 @@ module Spree
         @template.raw(translated_label + required_label + help_bubble)
       end
 
+      # Format a money value for display using the given decimal separator
+      #
+      # @param value [BigDecimal, Float, String, nil] the value to format
+      # @param decimal_separator [String] the decimal separator to use (e.g., '.' or ',')
+      # @return [String] the formatted value
+      def format_money_value(value, decimal_separator = '.')
+        return '' if value.blank?
+
+        number = value.to_d
+        format('%<amount>.2f', amount: number).tr('.', decimal_separator)
+      end
+
       # Wrap a field with an input group if prepend or append is specified
       #
       # @param field_html [String] the HTML for the field
@@ -286,17 +386,13 @@ module Spree
 
         @template.content_tag(:div, class: 'input-group') do
           prepend_html = if prepend.present?
-                           @template.content_tag(:div, class: 'input-group-prepend') do
-                             @template.content_tag(:span, prepend, class: 'input-group-text')
-                           end
+                           @template.content_tag(:div, prepend, class: 'pl-3 text-gray-400')
                          else
                            ''.html_safe
                          end
 
           append_html = if append.present?
-                          @template.content_tag(:div, class: 'input-group-append') do
-                            @template.content_tag(:span, append, class: 'input-group-text')
-                          end
+                          @template.content_tag(:div, append, class: 'px-3')
                         else
                           ''.html_safe
                         end

data/app/models/spree/admin/table/builder.rb

@@ -0,0 +1,55 @@
+module Spree
+  module Admin
+    class Table
+      class Builder
+        attr_reader :registry, :parent_column
+
+        def initialize(registry, parent_column = nil)
+          @registry = registry
+          @parent_column = parent_column
+        end
+
+        # Add a column
+        # @param key [Symbol] column key
+        # @param options [Hash] column options
+        # @return [Column]
+        def add(key, **options, &block)
+          @registry.add(key, **options, &block)
+        end
+
+        # Remove a column
+        # @param key [Symbol] column key
+        # @return [Column, nil]
+        def remove(key)
+          @registry.remove(key)
+        end
+
+        # Update a column
+        # @param key [Symbol] column key
+        # @param options [Hash] attributes to update
+        # @return [Column, nil]
+        def update(key, **options)
+          @registry.update(key, **options)
+        end
+
+        # Insert before another column
+        # @param target_key [Symbol] existing column key
+        # @param new_key [Symbol] new column key
+        # @param options [Hash] column options
+        # @return [Column, nil]
+        def insert_before(target_key, new_key, **options)
+          @registry.insert_before(target_key, new_key, **options)
+        end
+
+        # Insert after another column
+        # @param target_key [Symbol] existing column key
+        # @param new_key [Symbol] new column key
+        # @param options [Hash] column options
+        # @return [Column, nil]
+        def insert_after(target_key, new_key, **options)
+          @registry.insert_after(target_key, new_key, **options)
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/table/bulk_action.rb

@@ -0,0 +1,95 @@
+module Spree
+  module Admin
+    class Table
+      class BulkAction
+        include ActiveModel::Model
+        include ActiveModel::Attributes
+        include Visibility
+
+        METHODS = %i[get post put patch delete].freeze
+
+        attribute :key
+        attribute :label
+        attribute :icon, :string
+        attribute :action_path
+        attribute :position, :integer, default: 999
+        attribute :condition
+        attribute :confirm
+        attribute :method, default: :put
+
+        # Modal content attributes - used by generic bulk_modal action
+        attribute :title
+        attribute :body
+        attribute :form_partial, :string
+        attribute :form_partial_locals, default: -> { {} }
+        attribute :button_text
+        attribute :button_class, :string, default: 'btn-primary'
+
+        validates :key, presence: true
+        validates :method, presence: true, inclusion: { in: METHODS }
+
+        def initialize(attributes = {})
+          # Handle :if as alias for :condition
+          attributes[:condition] = attributes.delete(:if) if attributes.key?(:if)
+          super
+          self.key = key.to_sym if key.is_a?(String)
+          self.method = self.method.to_sym if self.method.is_a?(String)
+        end
+
+        # Resolve label (handles i18n keys)
+        # @return [String]
+        def resolve_label
+          resolve_i18n_attribute(label || key, key.to_s) || key.to_s.humanize
+        end
+
+        # Resolve title for modal dialog (handles i18n keys)
+        # Falls back to label if title is not set
+        # @return [String]
+        def resolve_title
+          resolve_i18n_attribute(title, "#{key}.title") ||
+            resolve_i18n_attribute(label, key.to_s)
+        end
+
+        # Resolve body for modal dialog (handles i18n keys)
+        # @return [String]
+        def resolve_body
+          resolve_i18n_attribute(body, "#{key}.body")
+        end
+
+        # Resolve button text for modal dialog (handles i18n keys)
+        # Falls back to 'Confirm' if not set
+        # @return [String]
+        def resolve_button_text
+          resolve_i18n_attribute(button_text, "#{key}.button") || Spree.t(:confirm)
+        end
+
+        # Deep clone the action
+        # @return [BulkAction]
+        def deep_clone
+          self.class.new(**attributes.symbolize_keys.merge(condition: condition))
+        end
+
+        def inspect
+          "#<Spree::Admin::Table::BulkAction key=#{key}>"
+        end
+
+        private
+
+        def resolve_i18n_attribute(value, default_key)
+          return nil if value.blank?
+
+          case value
+          when Symbol
+            Spree.t(value)
+          when /\Aadmin\./
+            Spree.t(value, default: default_key.to_s.humanize)
+          when String
+            value
+          else
+            Spree.t(default_key, scope: 'admin.bulk_ops', default: default_key.to_s.humanize)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/admin/table/column.rb

@@ -0,0 +1,111 @@
+module Spree
+  module Admin
+    class Table
+      class Column
+        include ActiveModel::Model
+        include ActiveModel::Attributes
+        include Visibility
+
+        TYPES = %w[string number date datetime money status link boolean image custom association].freeze
+        FILTER_TYPES = %w[string number date datetime money status boolean autocomplete select].freeze
+
+        DEFAULT_OPERATORS = {
+          'string' => %i[eq not_eq cont not_cont start end in not_in null not_null],
+          'number' => %i[eq not_eq gt gteq lt lteq in not_in null not_null],
+          'money' => %i[eq not_eq gt gteq lt lteq in not_in null not_null],
+          'date' => %i[eq not_eq gt gteq lt lteq null not_null],
+          'datetime' => %i[eq not_eq gt gteq lt lteq null not_null],
+          'boolean' => %i[eq],
+          'status' => %i[eq not_eq in not_in],
+          'select' => %i[eq not_eq in not_in],
+          'association' => %i[in not_in],
+          'tags' => %i[in not_in],
+          'autocomplete' => %i[in not_in]
+        }.freeze
+
+        attribute :key, :string
+        attribute :label
+        attribute :type, :string, default: 'string'
+        attribute :filter_type, :string
+        attribute :sortable, :boolean, default: true
+        attribute :filterable, :boolean, default: true
+        attribute :displayable, :boolean, default: true
+        attribute :default, :boolean, default: false
+        attribute :position, :integer, default: 999
+        attribute :partial, :string
+        attribute :partial_locals, default: -> { {} }
+        attribute :method
+        attribute :width, :string
+        attribute :align, :string, default: 'left'
+        attribute :format, :string
+        attribute :condition
+        attribute :ransack_attribute, :string
+        attribute :operators, default: -> { [] }
+        attribute :value_options
+        attribute :search_url, :string
+        attribute :sort_scope_asc
+        attribute :sort_scope_desc
+
+        alias_method :sortable?, :sortable
+        alias_method :filterable?, :filterable
+        alias_method :displayable?, :displayable
+        alias_method :default?, :default
+
+        validates :key, presence: true
+        validates :label, presence: true
+        validates :type, presence: true, inclusion: { in: TYPES }
+        validates :filter_type, inclusion: { in: FILTER_TYPES }, allow_blank: true
+
+        def initialize(attributes = {})
+          super
+          set_defaults
+        end
+
+        # Check if column uses custom sort scopes instead of ransack
+        def custom_sort?
+          sort_scope_asc.present? || sort_scope_desc.present?
+        end
+
+        # Resolve label (handles i18n keys)
+        def resolve_label
+          return I18n.t(label, default: label.split('.').last.humanize) if label.is_a?(String) && label.include?('.')
+          return label if label.is_a?(String) && label.present?
+
+          key_to_translate = label || key
+          Spree.t(key_to_translate, default: key_to_translate.to_s.humanize)
+        end
+
+        # Resolve value from record
+        def resolve_value(record, context = nil)
+          if self.method.respond_to?(:call)
+            context&.respond_to?(:instance_exec) ? context.instance_exec(record, &self.method) : self.method.call(record)
+          elsif record.respond_to?(self.method)
+            record.send(self.method)
+          end
+        end
+
+        # Deep clone the column
+        def deep_clone
+          self.class.new(**attributes.symbolize_keys)
+        end
+
+        def inspect
+          "#<Spree::Admin::Table::Column key=#{key} type=#{type} default=#{self.default}>"
+        end
+
+        private
+
+        def set_defaults
+          self.method ||= key
+          self.ransack_attribute ||= key.to_s
+          self.filter_type ||= FILTER_TYPES.include?(type) ? type : nil
+          self.operators = default_operators_for_type if operators.empty?
+        end
+
+        def default_operators_for_type
+          DEFAULT_OPERATORS[filter_type] || %i[eq not_eq cont null not_null]
+        end
+      end
+    end
+  end
+end