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.

Added support for calendar picker, moved Orders to new table component

Damian Legawiecdce6bca3d177
diff --git a/admin/app/controllers/spree/admin/orders_controller.rb b/admin/app/controllers/spree/admin/orders_controller.rb
index 7e525e9f9e..679b6c5cb7 100644
--- a/admin/app/controllers/spree/admin/orders_controller.rb
+++ b/admin/app/controllers/spree/admin/orders_controller.rb
@@ -4,6 +4,7 @@ module Spree
include Spree::Admin::OrderConcern
include Spree::Admin::OrdersFiltersHelper
include Spree::Admin::OrderBreadcrumbConcern
+ include Spree::Admin::TableConcern
before_action :initialize_order_events
before_action :load_order, only: %i[edit cancel resend destroy]
diff --git a/admin/app/controllers/spree/admin/promotions_controller.rb b/admin/app/controllers/spree/admin/promotions_controller.rb
index 1023d18e70..f75a627c67 100644
--- a/admin/app/controllers/spree/admin/promotions_controller.rb
+++ b/admin/app/controllers/spree/admin/promotions_controller.rb
@@ -5,6 +5,15 @@ module Spree
before_action :load_form_data, except: :index
+ # GET /admin/promotions/select_options
+ def select_options
+ promotions = current_store.promotions.applied
+ promotions = promotions.where('name ILIKE ?', "%#{params[:q]}%") if params[:q].present?
+ promotions = promotions.order(:name).limit(25)
+
+ render json: promotions.pluck(:id, :name).map { |id, name| { id: id, name: name } }
+ end
+
# POST /admin/promotions/:id/clone
def clone
promotion = current_store.promotions.find(params[:id])
diff --git a/admin/app/helpers/spree/admin/orders_filters_helper.rb b/admin/app/helpers/spree/admin/orders_filters_helper.rb
index 7cf4c4bf11..74ca8b0dbd 100644
--- a/admin/app/helpers/spree/admin/orders_filters_helper.rb
+++ b/admin/app/helpers/spree/admin/orders_filters_helper.rb
@@ -63,7 +63,7 @@ module Spree
end
def load_orders
- @search = scope.preload(:user).accessible_by(current_ability, :index).
+ @search = scope.preload(:user, shipments: :stock_location).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
diff --git a/admin/app/helpers/spree/admin/table_helper.rb b/admin/app/helpers/spree/admin/table_helper.rb
index f0523438b9..d43bbb0f5c 100644
--- a/admin/app/helpers/spree/admin/table_helper.rb
+++ b/admin/app/helpers/spree/admin/table_helper.rb
@@ -204,25 +204,83 @@ module Spree
sortable = table.sortable_columns
return '' if sortable.empty?
+ current_field, current_direction = parse_current_sort(current_sort)
current_label = find_sort_label(sortable, current_sort)
+ # Convert params[:q] to a regular hash to avoid unpermitted parameters error
+ current_q = params[:q].respond_to?(:to_unsafe_h) ? params[:q].to_unsafe_h : (params[:q] || {})
+
dropdown(portal: false) do
- toggle = dropdown_toggle(class: 'btn-light btn-sm flex items-center gap-1') do
+ toggle = dropdown_toggle(class: 'btn-light btn-sm h-[2.125rem]') do
safe_join([
- icon('arrows-sort', class: 'w-4 h-4'),
+ current_direction == 'asc' ? icon('sort-ascending') : icon('sort-descending'),
content_tag(:span, current_label),
- icon('chevron-down', class: 'w-3 h-3')
+ icon('chevron-down')
])
end
menu = dropdown_menu(class: 'min-w-[200px]') do
- items = sortable.flat_map do |column|
- [
- sort_dropdown_item(column, 'asc', current_sort),
- sort_dropdown_item(column, 'desc', current_sort)
- ]
+ sections = []
+
+ # Sort by section header
+ sections << content_tag(:div, class: 'dropdown-header') do
+ Spree.t('admin.tables.sort_by')
end
- safe_join(items)
+
+ # Sort field options
+ sortable.each do |column|
+ is_active = current_field == column.ransack_attribute
+ sort_value = "#{column.ransack_attribute} #{current_direction || 'desc'}"
+
+ sections << link_to(
+ url_for(q: current_q.merge(s: sort_value)),
+ class: "dropdown-item flex items-center justify-between #{'active' if is_active}",
+ data: { turbo_action: 'advance' }
+ ) do
+ safe_join([
+ content_tag(:span, column.resolve_label),
+ is_active ? icon('check') : ''
+ ])
+ end
+ end
+
+ # Divider
+ sections << content_tag(:hr, '', class: 'dropdown-divider')
+
+ # Order section header
+ sections << content_tag(:div, class: 'dropdown-header') do
+ Spree.t('admin.tables.order')
+ end
+
+ # Ascending option
+ asc_active = current_direction == 'asc'
+ asc_sort_value = current_field.present? ? "#{current_field} asc" : "#{sortable.first.ransack_attribute} asc"
+ sections << link_to(
+ url_for(q: current_q.merge(s: asc_sort_value)),
+ class: "dropdown-item flex items-center justify-between #{'active' if asc_active}",
+ data: { turbo_action: 'advance' }
+ ) do
+ safe_join([
+ content_tag(:span, Spree.t('admin.tables.ascending')),
+ asc_active ? icon('check') : ''
+ ])
+ end
+
+ # Descending option
+ desc_active = current_direction == 'desc' || current_direction.nil?
+ desc_sort_value = current_field.present? ? "#{current_field} desc" : "#{sortable.first.ransack_attribute} desc"
+ sections << link_to(
+ url_for(q: current_q.merge(s: desc_sort_value)),
+ class: "dropdown-item flex items-center justify-between #{'active' if desc_active}",
+ data: { turbo_action: 'advance' }
+ ) do
+ safe_join([
+ content_tag(:span, Spree.t('admin.tables.descending')),
+ desc_active ? icon('check') : ''
+ ])
+ end
+
+ safe_join(sections)
end
safe_join([toggle, menu])
@@ -356,35 +414,26 @@ module Spree
private
+ def parse_current_sort(current_sort)
+ return [nil, nil] if current_sort.blank?
+
+ parts = current_sort.split(' ')
+ [parts[0], parts[1]]
+ end
+
def find_sort_label(sortable, current_sort)
return Spree.t('admin.tables.sort_by') if current_sort.blank?
- field, direction = current_sort.split(' ')
+ field, _direction = parse_current_sort(current_sort)
column = sortable.find { |c| c.ransack_attribute == field }
if column
- dir_label = direction == 'asc' ? 'ASC' : 'DESC'
- "#{column.resolve_label} (#{dir_label})"
+ column.resolve_label
else
Spree.t('admin.tables.sort_by')
end
end
- def sort_dropdown_item(column, direction, current_sort)
- sort_value = "#{column.ransack_attribute} #{direction}"
- is_active = current_sort == sort_value
- dir_label = direction == 'asc' ? 'ASC' : 'DESC'
- label = "#{column.resolve_label} (#{dir_label})"
-
- # Convert params[:q] to a regular hash to avoid unpermitted parameters error
- current_q = params[:q].respond_to?(:to_unsafe_h) ? params[:q].to_unsafe_h : (params[:q] || {})
-
- link_to label,
- url_for(q: current_q.merge(s: sort_value)),
- class: "dropdown-item #{'active' if is_active}",
- data: { turbo_action: 'advance' }
- end
-
# Recursively count filters in a state object (including nested groups)
# @param state [Hash] the state object
# @return [Integer] count of filters
diff --git a/admin/app/javascript/spree/admin/controllers/query_builder_controller.js b/admin/app/javascript/spree/admin/controllers/query_builder_controller.js
index 5bc6ecdb42..93ddfde0e2 100644
--- a/admin/app/javascript/spree/admin/controllers/query_builder_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/query_builder_controller.js
@@ -279,6 +279,7 @@ export default class extends Controller {
`
break
case "status":
+ case "select":
input = document.createElement("select")
input.className = "form-select text-sm"
input.innerHTML = '<option value="">Select...</option>'
diff --git a/admin/app/models/spree/admin/table.rb b/admin/app/models/spree/admin/table.rb
index 94ee2208fa..828369629c 100644
--- a/admin/app/models/spree/admin/table.rb
+++ b/admin/app/models/spree/admin/table.rb
@@ -2,9 +2,10 @@ module Spree
module Admin
class Table
attr_reader :columns, :bulk_actions, :context, :model_class
- attr_accessor :search_param, :search_placeholder, :row_actions, :row_actions_edit, :row_actions_delete, :new_resource
+ attr_accessor :search_param, :search_placeholder, :row_actions, :row_actions_edit, :row_actions_delete, :new_resource,
+ :date_range_param, :date_range_label
- def initialize(context, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true)
+ def initialize(context, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true, date_range_param: nil, date_range_label: nil)
@context = context
@model_class = model_class
@columns = {}
@@ -15,6 +16,14 @@ module Spree
@row_actions_edit = row_actions_edit
@row_actions_delete = row_actions_delete
@new_resource = new_resource
+ @date_range_param = date_range_param
+ @date_range_label = date_range_label
+ end
+
+ # Check if date range filter is enabled
+ # @return [Boolean]
+ def date_range?
+ @date_range_param.present?
end
# Check if row actions are enabled
@@ -244,7 +253,9 @@ module Spree
row_actions: row_actions,
row_actions_edit: row_actions_edit,
row_actions_delete: row_actions_delete,
- new_resource: new_resource
+ new_resource: new_resource,
+ date_range_param: date_range_param,
+ date_range_label: date_range_label
)
@columns.each do |key, column|
cloned.columns[key] = column.deep_clone
diff --git a/admin/app/models/spree/admin/table/query_builder.rb b/admin/app/models/spree/admin/table/query_builder.rb
index 1ec883bb1e..e6e42f6752 100644
--- a/admin/app/models/spree/admin/table/query_builder.rb
+++ b/admin/app/models/spree/admin/table/query_builder.rb
@@ -95,7 +95,12 @@ module Spree
def format_value_options(options)
return nil if options.blank?
- options.map do |opt|
+ # Resolve Proc/lambda options at runtime
+ resolved_options = options.is_a?(Proc) ? options.call : options
+
+ return nil if resolved_options.blank?
+
+ resolved_options.map do |opt|
if opt.is_a?(Hash)
{ value: opt[:value] || opt['value'], label: opt[:label] || opt['label'] }
else
diff --git a/admin/app/views/spree/admin/orders/index.html.erb b/admin/app/views/spree/admin/orders/index.html.erb
index d4d7ff3714..2eae22d5c9 100644
--- a/admin/app/views/spree/admin/orders/index.html.erb
+++ b/admin/app/views/spree/admin/orders/index.html.erb
@@ -1,30 +1,13 @@
- <% content_for :page_title do %>
- <% if controller_name == 'checkouts' %>
- <%= Spree.t(:draft_orders) %>
- <% else %>
- <%= Spree.t(:orders) %>
- <% end %>
+<% content_for :page_title do %>
+ <%= Spree.t(:orders) %>
<% end %>
<% content_for :page_actions do %>
<%= render_admin_partials(:orders_actions_partials) %>
<%= link_to_export_modal %>
- <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.new_admin_order_path, class: "btn btn-primary" if can?(:create, Spree::Order) %>
+ <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.new_admin_order_path, class: "btn btn-primary" if can?(:create, Spree::Order) %>
<% end %>
<%= render_admin_partials(:orders_header_partials) %>
-<div class="card-lg">
- <% if params[:frame_name].present? %>
- <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
- <%= render 'spree/admin/orders/filters', frame_name: params[:frame_name] %>
- <%= render 'spree/admin/orders/list' %>
- <% end %>
- <% else %>
- <%= turbo_frame_tag "orders", autoscroll: true, data: { autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
- <%= render 'spree/admin/shared/export_modal', export_type: Spree::Exports::Orders %>
- <%= render 'spree/admin/orders/filters' %>
- <%= render 'spree/admin/orders/list' %>
- <% end %>
- <% end %>
-</div>
+<%= render_table @collection, :orders, export_type: Spree::Exports::Orders %>
diff --git a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
index 2eb5c194c1..fb6c85f16e 100644
--- a/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
+++ b/admin/app/views/spree/admin/shared/_calendar_range_picker.html.erb
@@ -1,6 +1,6 @@
<% date_from_input_name ||= :date_from %>
<% date_to_input_name ||= :date_to %>
-<% css_classes ||= "btn btn-light inline-flex items-center dropdown-toggle" %>
+<% css_classes ||= "btn-light inline-flex items-center dropdown-toggle" %>
<% date_from_value ||= params[date_from_input_name] %>
<% date_to_value ||= params[date_to_input_name] %>
diff --git a/admin/app/views/spree/admin/tables/_column_selector.html.erb b/admin/app/views/spree/admin/tables/_column_selector.html.erb
index b0496a09af..821508a2f6 100644
--- a/admin/app/views/spree/admin/tables/_column_selector.html.erb
+++ b/admin/app/views/spree/admin/tables/_column_selector.html.erb
@@ -7,10 +7,10 @@
<%= hidden_field_tag :redirect_url, request.fullpath %>
<%= dropdown(portal: false) do %>
- <%= dropdown_toggle(class: 'btn-light btn-sm flex items-center gap-1') do %>
- <%= icon 'columns-3', class: 'w-4 h-4' %>
+ <%= dropdown_toggle(class: 'btn-light btn-sm h-[2.125rem]') do %>
+ <%= icon 'columns-3' %>
<span><%= Spree.t('admin.tables.columns') %></span>
- <%= icon 'chevron-down', class: 'w-3 h-3' %>
+ <%= icon 'chevron-down' %>
<% end %>
<%= dropdown_menu(class: 'min-w-[250px]') do %>
diff --git a/admin/app/views/spree/admin/tables/_query_builder.html.erb b/admin/app/views/spree/admin/tables/_query_builder.html.erb
index bdecd0fa68..84f741b7bb 100644
--- a/admin/app/views/spree/admin/tables/_query_builder.html.erb
+++ b/admin/app/views/spree/admin/tables/_query_builder.html.erb
@@ -6,12 +6,12 @@
<div data-controller="dialog" class="h-full">
<button type="button"
- class="btn btn-light btn-sm flex items-center gap-1 h-full"
+ class="btn btn-light btn-sm h-[2.125rem]"
data-action="dialog#open">
- <%= icon 'filter', class: 'w-4 h-4' %>
+ <%= icon 'filter' %>
<span><%= Spree.t('admin.tables.filters') %></span>
<% if filter_count > 0 %>
- <span class="badge badge-primary rounded-full text-xs px-1.5 py-0.5 min-w-[1.25rem]"><%= filter_count %></span>
+ <span class="badge badge-light"><%= filter_count %></span>
<% end %>
</button>
diff --git a/admin/app/views/spree/admin/tables/_table.html.erb b/admin/app/views/spree/admin/tables/_table.html.erb
index 3f3a2615f4..f4901ac7c7 100644
--- a/admin/app/views/spree/admin/tables/_table.html.erb
+++ b/admin/app/views/spree/admin/tables/_table.html.erb
@@ -4,6 +4,7 @@
<% current_sort = params.dig(:q, :s) %>
<% search_param = table.respond_to?(:search_param) ? table.search_param : :name_cont %>
<% search_placeholder = (table.respond_to?(:search_placeholder) && table.search_placeholder) || [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
+<% date_range_param = table.date_range_param %>
<% if export_type.present? %>
<%= render 'spree/admin/shared/export_modal', export_type: export_type %>
@@ -25,7 +26,17 @@
<% end %>
</div>
- <div class="flex gap-2 items-center h-full">
+ <div class="flex gap-2 items-center">
+ <% if date_range_param.present? %>
+ <%= form_with url: url_for, method: :get, data: { turbo_frame: frame_name, turbo_action: 'advance' }, class: 'h-full' do %>
+ <%= render "spree/admin/shared/calendar_range_picker",
+ date_from_input_name: "q[#{date_range_param}_gt]",
+ date_to_input_name: "q[#{date_range_param}_lt]",
+ date_from_value: params.dig(:q, :"#{date_range_param}_gt"),
+ date_to_value: params.dig(:q, :"#{date_range_param}_lt"),
+ css_classes: "btn-light btn-sm dropdown-toggle h-[2.125rem]" %>
+ <% end %>
+ <% end %>
<%= render 'spree/admin/tables/query_builder', table: table, table_key: table_key, frame_name: frame_name %>
<%= table_sort_dropdown(table, current_sort) %>
<%= render 'spree/admin/tables/column_selector',
diff --git a/admin/app/views/spree/admin/tables/columns/_order_payment_state.html.erb b/admin/app/views/spree/admin/tables/columns/_order_payment_state.html.erb
new file mode 100644
index 0000000000..6797c57892
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_order_payment_state.html.erb
@@ -0,0 +1,2 @@
+<%# locals: (record:, column:, value:) %>
+<%= order_payment_state(record) %>
diff --git a/admin/app/views/spree/admin/tables/columns/_order_shipment_state.html.erb b/admin/app/views/spree/admin/tables/columns/_order_shipment_state.html.erb
new file mode 100644
index 0000000000..ae715282d1
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_order_shipment_state.html.erb
@@ -0,0 +1,2 @@
+<%# locals: (record:, column:, value:) %>
+<%= order_shipment_state(record) %>
diff --git a/admin/app/views/spree/admin/tables/columns/_order_stock_locations.html.erb b/admin/app/views/spree/admin/tables/columns/_order_stock_locations.html.erb
new file mode 100644
index 0000000000..4e280a5191
--- /dev/null
+++ b/admin/app/views/spree/admin/tables/columns/_order_stock_locations.html.erb
@@ -0,0 +1,4 @@
+<%# locals: (record:, column:, value:) %>
+<% record.shipments.map(&:stock_location).compact.uniq.each_with_index do |stock_location, index| %>
+ <% if index > 0 %>, <% end %><%= stock_location.name %>
+<% end %>
diff --git a/admin/app/views/spree/admin/users/_tabs.html.erb b/admin/app/views/spree/admin/users/_tabs.html.erb
index 36a667c04c..238607a8d8 100644
--- a/admin/app/views/spree/admin/users/_tabs.html.erb
+++ b/admin/app/views/spree/admin/users/_tabs.html.erb
@@ -36,19 +36,15 @@
<% if can?(:read, Spree::Order) %>
<div data-tabs-target="panel" id="pills-orders2" role="tabpanel" aria-labelledby="pills-orders2" class="animate-fade-in" <%= 'hidden' if spree.respond_to?(:admin_user_visits_path) %>>
- <div class="card-lg">
- <%= turbo_frame_tag :orders_list, src: spree.admin_user_orders_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
- <%= render 'spree/admin/shared/spinner' %>
- <% end %>
- </div>
+ <%= turbo_frame_tag :orders, src: spree.admin_user_orders_path(@user), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+ <%= render 'spree/admin/shared/spinner' %>
+ <% end %>
</div>
<div data-tabs-target="panel" id="pills-checkouts" role="tabpanel" aria-labelledby="pills-checkouts" hidden class="animate-fade-in">
- <div class="card-lg">
- <%= turbo_frame_tag :orders_list, src: spree.admin_user_checkouts_path(@user, frame_name: :orders_list), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
- <%= render 'spree/admin/shared/spinner' %>
- <% end %>
- </div>
+ <%= turbo_frame_tag :checkouts, src: spree.admin_user_checkouts_path(@user), loading: :lazy, autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
+ <%= render 'spree/admin/shared/spinner' %>
+ <% end %>
</div>
<% end %>
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index 745aa1eae4..0f97a20210 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -187,63 +187,76 @@ Rails.application.config.after_initialize do
condition: -> { can?(:manage_tags, Spree::Product) }
# Register Orders table
- Spree.admin.tables.register(:orders, model_class: Spree::Order, search_param: :number_or_email_cont)
+ Spree.admin.tables.register(:orders, model_class: Spree::Order, search_param: :multi_search, date_range_param: :completed_at)
Spree.admin.tables.orders.add :number,
- label: :order_number,
+ label: :number,
type: :link,
sortable: true,
filterable: true,
default: true,
position: 10
- Spree.admin.tables.orders.add :state,
- label: :state,
- type: :status,
+ Spree.admin.tables.orders.add :completed_at,
+ label: :completed_at,
+ type: :datetime,
sortable: true,
- filterable: true,
+ filterable: false,
+ default: true,
+ position: 20
+
+ Spree.admin.tables.orders.add :customer,
+ label: :customer,
+ type: :custom,
+ sortable: false,
+ filterable: false,
default: true,
- position: 20,
- value_options: [
- { value: 'cart', label: 'Cart' },
- { value: 'address', label: 'Address' },
- { value: 'delivery', label: 'Delivery' },
- { value: 'payment', label: 'Payment' },
- { value: 'confirm', label: 'Confirm' },
- { value: 'complete', label: 'Complete' },
- { value: 'canceled', label: 'Canceled' }
- ]
+ position: 30,
+ partial: 'spree/admin/orders/customer_summary',
+ partial_locals: ->(record) { { order: record } }
+
+ Spree.admin.tables.orders.add :stock_location,
+ label: :package_from,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 40,
+ partial: 'spree/admin/tables/columns/order_stock_locations'
Spree.admin.tables.orders.add :payment_state,
label: :payment_state,
- type: :status,
+ type: :custom,
+ filter_type: :select,
sortable: true,
filterable: true,
default: true,
- position: 30,
- value_options: [
- { value: 'balance_due', label: 'Balance Due' },
- { value: 'credit_owed', label: 'Credit Owed' },
- { value: 'failed', label: 'Failed' },
- { value: 'paid', label: 'Paid' },
- { value: 'void', label: 'Void' }
- ]
+ position: 50,
+ partial: 'spree/admin/tables/columns/order_payment_state',
+ operators: %i[eq not_eq],
+ value_options: Spree::Order::PAYMENT_STATES.map { |s| { value: s, label: I18n.t("spree.payment_states.#{s}", default: s.humanize) } }
Spree.admin.tables.orders.add :shipment_state,
label: :shipment_state,
- type: :status,
+ type: :custom,
+ filter_type: :select,
sortable: true,
filterable: true,
- default: false,
- position: 35,
- value_options: [
- { value: 'backorder', label: 'Backorder' },
- { value: 'canceled', label: 'Canceled' },
- { value: 'partial', label: 'Partial' },
- { value: 'pending', label: 'Pending' },
- { value: 'ready', label: 'Ready' },
- { value: 'shipped', label: 'Shipped' }
- ]
+ default: true,
+ position: 60,
+ partial: 'spree/admin/tables/columns/order_shipment_state',
+ operators: %i[eq not_eq],
+ value_options: Spree::Order::SHIPMENT_STATES.map { |s| { value: s, label: I18n.t("spree.shipment_states.#{s}", default: s.humanize) } }
+
+ Spree.admin.tables.orders.add :item_count,
+ label: :item_count,
+ type: :number,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 70,
+ align: :right,
+ method: ->(order) { pluralize(order.item_count, 'item') }
Spree.admin.tables.orders.add :total,
label: :total,
@@ -251,32 +264,80 @@ Rails.application.config.after_initialize do
sortable: true,
filterable: true,
default: true,
- position: 40,
+ position: 80,
+ align: :right,
method: ->(order) { order.display_total }
- Spree.admin.tables.orders.add :email,
- label: :email,
- type: :string,
+ Spree.admin.tables.orders.add :state,
+ label: :state,
+ type: :status,
+ filter_type: :select,
sortable: true,
filterable: true,
default: false,
- position: 45
+ position: 90,
+ operators: %i[eq not_eq in not_in],
+ value_options: -> { Spree::Order.state_machine(:state).states.map { |s| { value: s.name.to_s, label: s.name.to_s.humanize } } }
- Spree.admin.tables.orders.add :completed_at,
- label: :completed_at,
- type: :datetime,
+ Spree.admin.tables.orders.add :email,
+ label: :email,
+ type: :string,
sortable: true,
filterable: true,
- default: true,
- position: 50
+ default: false,
+ position: 100
Spree.admin.tables.orders.add :created_at,
label: :created_at,
type: :datetime,
sortable: true,
+ filterable: false,
+ default: false,
+ position: 110
+
+ # Filter-only fields (not displayed as columns)
+ Spree.admin.tables.orders.add :first_name,
+ label: :first_name,
+ type: :string,
+ sortable: false,
+ filterable: true,
+ displayable: false,
+ default: false,
+ position: 120,
+ ransack_attribute: 'bill_address_firstname_i'
+
+ Spree.admin.tables.orders.add :last_name,
+ label: :last_name,
+ type: :string,
+ sortable: false,
+ filterable: true,
+ displayable: false,
+ default: false,
+ position: 130,
+ ransack_attribute: 'bill_address_lastname'
+
+ Spree.admin.tables.orders.add :sku,
+ label: :sku,
+ type: :string,
+ sortable: false,
+ filterable: true,
+ displayable: false,
+ default: false,
+ position: 140,
+ ransack_attribute: 'line_items_variant_sku'
+
+ Spree.admin.tables.orders.add :promotion,
+ label: :promotion,
+ type: :association,
+ filter_type: :autocomplete,
+ sortable: false,
filterable: true,
+ displayable: false,
default: false,
- position: 60
+ position: 150,
+ ransack_attribute: 'promotions_id',
+ operators: %i[in],
+ search_url: '/admin/promotions/select_options.json'
# Register Users table
Spree.admin.tables.register(:users, model_class: Spree.user_class, search_param: :multi_search, row_actions: false)
diff --git a/admin/config/locales/en.yml b/admin/config/locales/en.yml
index fde73bf504..29f492a901 100644
--- a/admin/config/locales/en.yml
+++ b/admin/config/locales/en.yml
@@ -368,4 +368,7 @@ en:
reset_to_default: Reset to Default
select_field: Select field...
sort_by: Sort by
+ order: Order
+ ascending: Ascending
+ descending: Descending
visible_columns: Visible Columns
diff --git a/admin/config/routes.rb b/admin/config/routes.rb
index 34cb8cc675..83bc7a19b7 100644
--- a/admin/config/routes.rb
+++ b/admin/config/routes.rb
@@ -114,6 +114,9 @@ Spree::Core::Engine.add_routes do
# promotions
resources :promotions do
+ collection do
+ get :select_options
+ end
member do
post :clone
end
diff --git a/admin/lib/spree/admin/engine.rb b/admin/lib/spree/admin/engine.rb
index 9b25ce40d5..a21f4802e0 100644
--- a/admin/lib/spree/admin/engine.rb
+++ b/admin/lib/spree/admin/engine.rb
@@ -193,8 +193,10 @@ module Spree
# @param row_actions_edit [Boolean] Whether to show edit button in row actions (default: true)
# @param row_actions_delete [Boolean] Whether to show delete button in row actions (default: false)
# @param new_resource [Boolean] Whether to show "Create new" button in empty state (default: true)
+ # @param date_range_param [Symbol, nil] Ransack parameter base for date range filter (e.g., :completed_at)
+ # @param date_range_label [String, nil] Label for date range filter
# @return [Spree::Admin::Table] The table instance
- def register(name, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true)
+ def register(name, model_class: nil, search_param: :name_cont, search_placeholder: nil, row_actions: false, row_actions_edit: true, row_actions_delete: false, new_resource: true, date_range_param: nil, date_range_label: nil)
name = name.to_sym
@registries[name] ||= Spree::Admin::Table.new(
name,
@@ -204,7 +206,9 @@ module Spree
row_actions: row_actions,
row_actions_edit: row_actions_edit,
row_actions_delete: row_actions_delete,
- new_resource: new_resource
+ new_resource: new_resource,
+ date_range_param: date_range_param,
+ date_range_label: date_range_label
)
end