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.

Moved Checkouts/Draft Orders to table component

Damian Legawiec68acb6d58084
diff --git a/admin/app/controllers/spree/admin/checkouts_controller.rb b/admin/app/controllers/spree/admin/checkouts_controller.rb
index 6c211d8ff4..7de78b8385 100644
--- a/admin/app/controllers/spree/admin/checkouts_controller.rb
+++ b/admin/app/controllers/spree/admin/checkouts_controller.rb
@@ -2,6 +2,7 @@ module Spree
module Admin
class CheckoutsController < ResourceController
include Spree::Admin::OrdersFiltersHelper
+ include Spree::Admin::TableConcern
before_action :load_user, only: [:index]
@@ -10,8 +11,10 @@ module Spree
add_breadcrumb_icon 'inbox'
def index
+ params[:q] ||= {}
+ params[:q][:s] ||= 'created_at desc'
+
load_orders
- render template: 'spree/admin/orders/index'
end
private
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 93ddfde0e2..2176de5e8c 100644
--- a/admin/app/javascript/spree/admin/controllers/query_builder_controller.js
+++ b/admin/app/javascript/spree/admin/controllers/query_builder_controller.js
@@ -101,7 +101,7 @@ export default class extends Controller {
const fieldConfig = this.fieldsValue.find(f => f.key === filterData.field)
if (fieldConfig) {
this.updateOperatorOptions(row, fieldConfig.operators, filterData.operator)
- this.updateValueInput(row, fieldConfig, filterData.value)
+ this.updateValueInput(row, fieldConfig, filterData.value, filterData.operator)
}
}
@@ -190,7 +190,8 @@ export default class extends Controller {
if (fieldConfig) {
this.updateOperatorOptions(filterRow, fieldConfig.operators)
- this.updateValueInput(filterRow, fieldConfig)
+ const operator = filterRow.querySelector("[data-operator-select]")?.value
+ this.updateValueInput(filterRow, fieldConfig, null, operator)
}
this.updateHiddenInput()
@@ -206,6 +207,12 @@ export default class extends Controller {
valueContainer.style.display = "none"
} else {
valueContainer.style.display = ""
+ // Rebuild value input when switching between single/multi operators
+ const field = filterRow.querySelector("[data-field-select]")?.value
+ const fieldConfig = this.fieldsValue.find(f => f.key === field)
+ if (fieldConfig && (fieldConfig.type === "select" || fieldConfig.type === "status")) {
+ this.updateValueInput(filterRow, fieldConfig, null, operator)
+ }
}
this.updateHiddenInput()
@@ -247,10 +254,13 @@ export default class extends Controller {
})
}
- updateValueInput(filterRow, fieldConfig, existingValue = null) {
+ updateValueInput(filterRow, fieldConfig, existingValue = null, operator = null) {
const valueContainer = filterRow.querySelector("[data-value-container]")
valueContainer.innerHTML = ""
+ // Check if operator requires multi-select
+ const isMultiOperator = ["in", "not_in"].includes(operator)
+
let input
switch (fieldConfig.type) {
case "date":
@@ -280,16 +290,60 @@ 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>'
- if (fieldConfig.value_options) {
- fieldConfig.value_options.forEach(opt => {
- const option = document.createElement("option")
- option.value = opt.value || opt
- option.textContent = opt.label || opt
- input.appendChild(option)
- })
+ // For in/not_in operators, use multi-select with tom-select
+ if (isMultiOperator) {
+ const wrapper = document.createElement("div")
+ wrapper.className = "w-full"
+ wrapper.dataset.controller = "select"
+ wrapper.dataset.selectMultipleValue = "true"
+
+ // Build options array for tom-select
+ const selectOptions = []
+ if (fieldConfig.value_options) {
+ fieldConfig.value_options.forEach(opt => {
+ selectOptions.push({
+ id: opt.value || opt,
+ name: opt.label || opt
+ })
+ })
+ }
+ wrapper.dataset.selectOptionsValue = JSON.stringify(selectOptions)
+
+ input = document.createElement("select")
+ input.className = "form-select text-sm"
+ input.multiple = true
+ input.dataset.selectTarget = "input"
+ input.dataset.valueInput = ""
+
+ // Restore existing values for multi-select
+ if (existingValue !== null && existingValue !== undefined && Array.isArray(existingValue)) {
+ const selectedIds = existingValue.map(item => {
+ if (typeof item === 'object') {
+ return item.id
+ } else {
+ return item
+ }
+ })
+ wrapper.dataset.selectActiveOptionValue = JSON.stringify(selectedIds)
+ }
+
+ input.dataset.action = "change->query-builder#onValueChange"
+ wrapper.appendChild(input)
+ valueContainer.appendChild(wrapper)
+ return // Early return since we already appended
+ } else {
+ // Single select for eq/not_eq operators
+ input = document.createElement("select")
+ input.className = "form-select text-sm"
+ input.innerHTML = '<option value="">Select...</option>'
+ if (fieldConfig.value_options) {
+ fieldConfig.value_options.forEach(opt => {
+ const option = document.createElement("option")
+ option.value = opt.value || opt
+ option.textContent = opt.label || opt
+ input.appendChild(option)
+ })
+ }
}
break
case "autocomplete":
diff --git a/admin/app/views/spree/admin/checkouts/index.html.erb b/admin/app/views/spree/admin/checkouts/index.html.erb
new file mode 100644
index 0000000000..7464048990
--- /dev/null
+++ b/admin/app/views/spree/admin/checkouts/index.html.erb
@@ -0,0 +1,9 @@
+<% content_for :page_title do %>
+ <%= Spree.t(:draft_orders) %>
+<% end %>
+
+<% content_for :page_actions do %>
+ <%= 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_table @collection, :checkouts, edit_object_url: nil %>
diff --git a/admin/config/initializers/spree_admin_navigation.rb b/admin/config/initializers/spree_admin_navigation.rb
index 47813e1b63..7240bf376a 100644
--- a/admin/config/initializers/spree_admin_navigation.rb
+++ b/admin/config/initializers/spree_admin_navigation.rb
@@ -40,7 +40,20 @@ Rails.application.config.after_initialize do
# Orders to Fulfill submenu
orders.add :orders_to_fulfill,
label: 'admin.orders.orders_to_fulfill',
- url: -> { spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}) },
+ url: -> {
+ query_state = {
+ id: 'root',
+ combinator: 'and',
+ filters: [
+ { id: 'f1', field: 'shipment_state', operator: 'not_in', value: [
+ { id: 'shipped', name: I18n.t('spree.shipment_states.shipped', default: 'Shipped') },
+ { id: 'canceled', name: I18n.t('spree.shipment_states.canceled', default: 'Canceled') }
+ ] }
+ ],
+ groups: []
+ }.to_json
+ spree.admin_orders_path(q: { shipment_state_not_in: ['shipped', 'canceled'] }, query_state: query_state)
+ },
position: 10,
active: -> { controller_name == 'orders' && params.dig(:q, :shipment_state_not_in).present? },
if: -> {
diff --git a/admin/config/initializers/spree_admin_tables.rb b/admin/config/initializers/spree_admin_tables.rb
index 0f97a20210..9291f4dee9 100644
--- a/admin/config/initializers/spree_admin_tables.rb
+++ b/admin/config/initializers/spree_admin_tables.rb
@@ -233,8 +233,8 @@ Rails.application.config.after_initialize do
default: true,
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) } }
+ operators: %i[eq not_eq in not_in],
+ 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,
@@ -245,8 +245,8 @@ Rails.application.config.after_initialize do
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) } }
+ operators: %i[eq not_eq in not_in],
+ 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,
@@ -339,6 +339,74 @@ Rails.application.config.after_initialize do
operators: %i[in],
search_url: '/admin/promotions/select_options.json'
+ # Register Checkouts table (draft orders)
+ Spree.admin.tables.register(:checkouts, model_class: Spree::Order, search_param: :multi_search, date_range_param: :created_at, new_resource: false)
+
+ Spree.admin.tables.checkouts.add :number,
+ label: :number,
+ type: :link,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 10
+
+ Spree.admin.tables.checkouts.add :created_at,
+ label: :created_at,
+ type: :datetime,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 20
+
+ Spree.admin.tables.checkouts.add :customer,
+ label: :customer,
+ type: :custom,
+ sortable: false,
+ filterable: false,
+ default: true,
+ position: 30,
+ partial: 'spree/admin/orders/customer_summary',
+ partial_locals: ->(record) { { order: record } }
+
+ Spree.admin.tables.checkouts.add :state,
+ label: :state,
+ type: :status,
+ filter_type: :select,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 40,
+ 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.checkouts.add :item_count,
+ label: :item_count,
+ type: :number,
+ sortable: true,
+ filterable: false,
+ default: true,
+ position: 50,
+ align: :right,
+ method: ->(order) { pluralize(order.item_count, 'item') }
+
+ Spree.admin.tables.checkouts.add :total,
+ label: :total,
+ type: :currency,
+ sortable: true,
+ filterable: true,
+ default: true,
+ position: 60,
+ align: :right,
+ method: ->(order) { order.display_total }
+
+ Spree.admin.tables.checkouts.add :email,
+ label: :email,
+ type: :string,
+ sortable: true,
+ filterable: true,
+ default: false,
+ position: 70
+
# Register Users table
Spree.admin.tables.register(:users, model_class: Spree.user_class, search_param: :multi_search, row_actions: false)