spree_admin 5.4.2 → 5.5.0.rc1

data/app/views/spree/admin/channels/_form.html.erb

@@ -0,0 +1,19 @@
+<div class="card mb-6">
+  <div class="card-body" data-controller="slug-form">
+    <%= f.spree_text_field :name,
+                           autofocus: f.object.new_record?,
+                           required: true,
+                           data: { slug_form_target: :name, action: 'slug-form#updateUrlFromName' } %>
+    <%= f.spree_text_field :code,
+                           required: true,
+                           hint: Spree.t('admin.channels.code_hint'),
+                           data: { slug_form_target: :url } %>
+    <%= f.spree_check_box :active, label: Spree.t(:active) %>
+    <%= f.spree_check_box :default, label: Spree.t('admin.channels.default'), hint: Spree.t('admin.channels.default_hint') %>
+    <%= f.spree_select :preferred_order_routing_strategy,
+        options_for_select(channel_order_routing_strategy_options, f.object.preferred_order_routing_strategy),
+        { label: Spree.t('admin.channels.order_routing_strategy'),
+          help_bubble: Spree.t('admin.channels.order_routing_strategy_hint'),
+          include_blank: Spree.t('admin.channels.order_routing_strategy_inherit') } %>
+  </div>
+</div>

data/app/views/spree/admin/channels/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/edit_resource' %>

data/app/views/spree/admin/channels/index.html.erb

@@ -0,0 +1,12 @@
+<% content_for :page_title do %>
+  <%= Spree.t(:channels) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:channels_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_channel), new_object_url, class: "btn btn-primary" if can? :create, Spree::Channel %>
+<% end %>
+
+<%= render_admin_partials(:channels_header_partials) %>
+
+<%= render_table @collection, :channels %>

data/app/views/spree/admin/channels/new.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/admin/shared/new_resource' %>

data/app/views/spree/admin/gift_cards/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="card mb-6">
   <div class="card-body">
     <% unless f.object.persisted? %>
-      <%= f.spree_text_field :code, required: true, help_bubble: Spree.t('admin.gift_cards.code_help_text'), autofocus: true %>
+      <%= f.spree_text_field :code, help_bubble: Spree.t('admin.gift_cards.code_help_text'), autofocus: true %>
     <% end %>
 
     <%= f.spree_money_field :amount, currency: f.object.currency, required: true %>

data/app/views/spree/admin/integrations/_integration.html.erb

@@ -5,29 +5,27 @@
 
 <div id="integration-<%= integration_class.integration_key %>" class="col mb-6 flex items-stretch">
   <div class="card w-full">
-    <div class="card-header border-b flex flex-col gap-4 items-center justify-between h-auto pr-4 <% if integration.present? %>bg-green-50<% end %>">
+    <div class="card-header border-b flex items-center justify-center h-auto pr-4 <% if integration.present? %>bg-green-50<% end %>">
       <div class="flex items-center py-1">
         <%= image_tag integration_class.icon_path, alt: integration_name, height: 36 if integration_class.icon_path.present? %>
       </div>
-
-      <% if integration.present? %>
-        <span class="badge badge-success small">
-          <%= icon('check', class: 'mr-1') %>
-          <%= Spree.t(:active) %>
-        </span>
-      <% end %>
     </div>
 
     <div class="card-body">
       <p><%= integration_description %></p>
     </div>
 
-    <div class="card-footer flex <% if integration.present? %>items-baseline justify-between<% else %>flex-col<% end %>">
+    <div class="card-footer flex <% if integration.present? %>items-center gap-3<% else %>flex-col<% end %>">
       <% if integration.present? %>
         <%= link_to spree.edit_admin_integration_path(integration), class: 'btn btn-sm btn-light' do %>
           <%= icon 'settings' %>
           <%= Spree.t(:settings) %>
         <% end if can?(:update, integration) %>
+
+        <span class="ml-auto inline-flex items-center text-xs font-medium text-green-700">
+          <span class="w-1.5 h-1.5 rounded-full bg-green-500 mr-1"></span>
+          <%= Spree.t(:active) %>
+        </span>
       <% else %>
         <%= link_to_with_icon 'plus', "#{Spree.t('actions.connect')} #{integration_class.integration_name}", spree.new_admin_integration_path(integration: { type: integration_class.name }), class: 'btn btn-primary truncate w-full' if can?(:create, Spree::Integration) %>
       <% end %>

data/app/views/spree/admin/integrations/edit.html.erb

@@ -5,7 +5,7 @@
 
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @integration } %>
 
-<%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration) do |form| %>
+<%= form_for @integration, as: :integration, url: spree.admin_integration_path(@integration), html: { id: "edit_integration_#{@integration.id}" } do |form| %>
   <div class="grid grid-cols-12 gap-6">
     <div class="col-span-12 lg:col-span-6 lg:col-start-4">
       <%= render "spree/admin/integrations/forms/#{@integration.key}", form: form %>

data/app/views/spree/admin/invitations/expired.html.erb

@@ -0,0 +1,4 @@
+<div class="text-center">
+  <h1 class="text-2xl font-semibold mb-2"><%= Spree.t('invitation_expired.heading') %></h1>
+  <p class="text-gray-500"><%= Spree.t('invitation_expired.body') %></p>
+</div>

data/app/views/spree/admin/orders/_line_item.html.erb

@@ -30,12 +30,12 @@
           <%= dropdown_menu do %>
             <%= link_to_with_icon "edit",
               Spree.t(:edit),
-              spree.edit_admin_order_line_item_path(@order, line_item),
+              spree.edit_admin_order_line_item_path(line_item.order, line_item),
               class: "dropdown-item" %>
             <% if line_item.digital_links.any? %>
               <%= link_to_with_icon "refresh",
               Spree.t("admin.reset_digital_link_download_limits"),
-              spree.reset_digital_links_limit_admin_order_line_item_path(@order, line_item),
+              spree.reset_digital_links_limit_admin_order_line_item_path(line_item.order, line_item),
               data: {
                 turbo_method: :post,
                 turbo_confirm: Spree.t(:are_you_sure),
@@ -46,7 +46,7 @@
 
             <% if can?(:destroy, line_item) %>
               <div class="dropdown-divider"></div>
-              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(@order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %>
+              <%= link_to_with_icon "trash", Spree.t('actions.destroy'), spree.admin_order_line_item_path(line_item.order, line_item), data: { turbo_method: :delete, turbo_frame: '_top', turbo_confirm: Spree.t(:are_you_sure )}, class: 'dropdown-item text-red-600 hover:bg-red-100' %>
             <% end %>
           <% end %>
         <% end %>

data/app/views/spree/admin/orders/_shipment.html.erb

@@ -87,7 +87,7 @@
     <% if can_ship?(shipment) %>
       <div class="card-footer flex justify-end border-t bg-gray-25">
         <% if shipment.tracked? %>
-          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure)} %>
+          <%= link_to_with_icon 'send.svg', Spree.t(:ship), spree.ship_admin_order_shipment_path(order, shipment), class: 'ml-auto btn btn-primary mb-0', data: {turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure), turbo_frame: '_top'} %>
         <% elsif !shipment.digital? %>
           <span class="ship ml-auto btn btn-primary disabled mb-0" data-controller="tooltip" data-tooltip-placement-value="left">
             <%= icon 'send' %>

data/app/views/spree/admin/products/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="grid grid-cols-12 gap-6" data-controller="product-form slug-form seo-form" data-seo-form-editor-value="tinymce">
   <div class="col-span-12 md:col-span-8">
     <%= render 'spree/admin/products/form/base', f: f %>
-    <%= render 'spree/admin/shared/media_form', viewable: @product.master, viewable_type: 'Spree::Variant' %>
+    <%= render 'spree/admin/shared/media_form', viewable: @product, viewable_type: 'Spree::Product' %>
     <%= f.fields_for :master, @product.master do |vf| %>
       <%= render 'spree/admin/variants/form/pricing', f: vf %>
     <% end unless @product.has_variants? %>
@@ -11,6 +11,7 @@
   </div>
   <div class="col-span-12 md:col-span-4">
     <%= render 'spree/admin/products/form/status', f: f %>
+    <%= render 'spree/admin/products/form/publishing', f: f %>
     <%= render 'spree/admin/products/form/categorization', f: f %>
     <%= render 'spree/admin/products/form/shipping', f: f %>
     <%= render 'spree/admin/products/form/tax', f: f %>

data/app/views/spree/admin/products/form/_publishing.html.erb

@@ -0,0 +1,125 @@
+<%#
+  Publishing card — mirrors the SPA's <PublishingCard> in
+  packages/dashboard/src/components/spree/products/publishing-card.tsx.
+
+  All channel attach/detach AND per-channel scheduling submit through the
+  same nested-attributes form (+legacy_product_publications_attributes+). Each row
+  in the Manage panel toggles the +_destroy+ flag on the corresponding
+  publication; unchecked rows for unattached channels send blank attrs that
+  the model's +reject_if+ discards.
+
+  Datetime inputs render values in the store's timezone since datetime-local
+  has no TZ awareness (same pattern as the legacy form/_status partial).
+%>
+
+<%
+  store_timezone = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
+  to_store_local = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
+  tz_help        = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
+  store_channels = current_store.channels.order(:name).to_a
+  publications_by_channel = @product.product_publications.includes(:channel).index_by(&:channel_id)
+
+  # Build one record per store channel: the existing publication when
+  # attached, or a fresh ProductPublication when not. Stable channel-keyed
+  # indices keep the form params deterministic so checkbox toggles always
+  # reference the right slot.
+  channel_rows = store_channels.map do |channel|
+    publication = publications_by_channel[channel.id] ||
+                  @product.product_publications.build(channel: channel)
+    [channel, publication]
+  end
+%>
+
+<div class="card mb-6" data-controller="product-publishing">
+  <div class="card-header d-flex align-items-center justify-content-between">
+    <h6 class="card-title mb-0"><%= Spree.t('admin.publishing.title') %></h6>
+    <% if store_channels.any? %>
+      <button type="button"
+              class="btn btn-sm btn-outline-secondary"
+              data-action="product-publishing#toggleManage">
+        <%= Spree.t('admin.publishing.manage_cta') %>
+      </button>
+    <% end %>
+  </div>
+
+  <div class="card-body">
+    <% if store_channels.empty? %>
+      <p class="text-xs text-muted mb-0"><%= Spree.t('admin.publishing.no_channels') %></p>
+    <% else %>
+      <%# ---- Manage panel (hidden by default) ---- %>
+      <div class="d-none flex flex-col gap-2 mb-3" data-product-publishing-target="manage">
+        <p class="text-xs text-muted mb-1"><%= Spree.t('admin.publishing.manage_description') %></p>
+        <% channel_rows.each_with_index do |(channel, publication), index| %>
+          <%= f.fields_for :legacy_product_publications, publication, child_index: index do |pf| %>
+            <%= pf.hidden_field :id if publication.persisted? %>
+            <%= pf.hidden_field :channel_id, value: channel.id %>
+            <% checked_by_default = publication.persisted? || (@product.new_record? && channel.default?) %>
+            <label class="flex items-center gap-3 rounded border px-3 py-2 cursor-pointer hover:bg-gray-50 text-sm">
+              <%# The +_destroy+ hidden field defaults to 1 (= destroy/skip);
+                  the checkbox flips it to 0 (= keep/upsert) when checked.
+                  +include_hidden: false+ on the checkbox keeps Rails from
+                  emitting its own competing hidden field. %>
+              <%= pf.hidden_field :_destroy, value: '1', id: nil %>
+              <%= pf.check_box :_destroy,
+                               { checked: checked_by_default,
+                                 class: 'form-check-input m-0',
+                                 include_hidden: false },
+                               '0', '1' %>
+              <span class="flex-1"><%= channel.name %></span>
+              <% unless channel.active? %>
+                <span class="text-xs text-muted"><%= Spree.t('admin.publishing.inactive_marker') %></span>
+              <% end %>
+            </label>
+          <% end %>
+        <% end %>
+      </div>
+
+      <%# ---- Per-publication scheduling rows ---- %>
+      <% if publications_by_channel.empty? %>
+        <p class="text-xs text-muted mb-0"><%= Spree.t('admin.publishing.empty') %></p>
+      <% else %>
+        <% channel_rows.each_with_index do |(channel, publication), index| %>
+          <% next unless publication.persisted? %>
+          <%= f.fields_for :legacy_product_publications, publication, child_index: index do |pf| %>
+            <details class="publication-row group rounded -mx-2 px-2 hover:bg-gray-50">
+              <summary class="flex items-start justify-between gap-3 py-2 cursor-pointer" style="list-style: none;">
+                <div class="flex min-w-0 flex-1 flex-col gap-0.5">
+                  <div class="flex items-center gap-2">
+                    <span class="truncate text-sm font-medium"><%= channel.name %></span>
+                    <%= publication_status_badge(@product.status, publication) %>
+                  </div>
+                  <span class="text-xs text-muted">
+                    <%= publication_caption(@product.status, publication, current_store) %>
+                  </span>
+                </div>
+                <span class="shrink-0 mt-1 opacity-0 transition-opacity group-hover:opacity-100 text-muted">
+                  <%= icon('pencil', class: 'h-3.5 w-3.5') %>
+                </span>
+              </summary>
+              <div class="mt-2 ps-2 pb-2 flex flex-col gap-3">
+                <div>
+                  <%= pf.label :published_at,
+                               Spree.t('admin.publishing.published_at_label'),
+                               class: 'form-label text-xs mb-1' %>
+                  <%= pf.datetime_field :published_at,
+                                        value: to_store_local.call(publication.published_at),
+                                        class: 'form-control form-control-sm' %>
+                  <small class="text-muted text-xs"><%= tz_help %></small>
+                </div>
+                <div>
+                  <%= pf.label :unpublished_at,
+                               Spree.t('admin.publishing.unpublished_at_label'),
+                               class: 'form-label text-xs mb-1' %>
+                  <%= pf.datetime_field :unpublished_at,
+                                        value: to_store_local.call(publication.unpublished_at),
+                                        class: 'form-control form-control-sm' %>
+                  <small class="text-muted text-xs"><%= tz_help %></small>
+                </div>
+              </div>
+            </details>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

data/app/views/spree/admin/products/form/_status.html.erb

@@ -1,51 +1,7 @@
-<%# datetime-local inputs have no timezone; render values in the store's timezone so admins see and submit values in the store's local time. %>
-<%
-  store_timezone       = ActiveSupport::TimeZone[current_store.preferred_timezone] || Time.zone
-  to_store_local       = ->(value) { value&.in_time_zone(store_timezone)&.strftime('%Y-%m-%dT%H:%M') }
-  make_active_at_local = to_store_local.call(@product.make_active_at)
-  available_on_local   = to_store_local.call(@product.available_on)
-  discontinue_on_local = to_store_local.call(@product.discontinue_on)
-  tz_help              = Spree.t('admin.datetime_field_timezone_help', zone: store_timezone.name)
-%>
-
 <div class="card mb-6">
   <div class="card-body">
-    <div class="grid grid-cols-12 gap-6 mb-6">
-      <div class="col-span-6">
-        <%= f.spree_select :status,
-                           available_status_options(@product),
-                           { selected: @product.status, help_bubble: show_product_status_help_bubble? ? Spree.t('admin.products.status_form.status') : nil },
-                           { data: {
-                               action: 'change->product-form#switchAvailabilityDatesFields',
-                               'product-form-target': 'status'
-                             }
-                           } %>
-      </div>
-      <div class="col-span-6 <%= 'hidden' if @product.active? %>" data-product-form-target="makeActiveAt">
-        <% if can?(:activate, @product) %>
-          <%= f.spree_datetime_field :make_active_at,
-                                     value: make_active_at_local,
-                                     help: tz_help,
-                                     help_bubble: Spree.t('admin.products.status_form.make_active_at'),
-                                     max: discontinue_on_local %>
-        <% end %>
-      </div>
-    </div>
-    <div class="grid grid-cols-12 gap-6">
-      <div data-product-form-target="availableOn" class="col-span-6">
-        <%= f.spree_datetime_field :available_on,
-                                   value: available_on_local,
-                                   help: tz_help,
-                                   help_bubble: Spree.t('admin.products.status_form.available_on'),
-                                   max: discontinue_on_local %>
-      </div>
-      <div data-product-form-target="discontinueOn" class="col-span-6">
-        <%= f.spree_datetime_field :discontinue_on,
-                                   value: discontinue_on_local,
-                                   help: tz_help,
-                                   help_bubble: Spree.t('admin.products.status_form.discontinue_on'),
-                                   min: make_active_at_local %>
-      </div>
-    </div>
+    <%= f.spree_select :status,
+                       available_status_options(@product),
+                       { selected: @product.status, help_bubble: show_product_status_help_bubble? ? Spree.t('admin.products.status_form.status') : nil } %>
   </div>
 </div>

data/app/views/spree/admin/shared/_media_asset.html.erb

@@ -7,7 +7,7 @@
     <button class="btn btn-light btn-sm px-1"><%= icon('grip-vertical', class: 'mr-0') %></button>
   </div>
 
-  <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'dialog', action: 'dialog#open' } do %>
+  <%= link_to spree.edit_admin_asset_path(asset), data: { turbo_frame: 'drawer', action: 'drawer#open' } do %>
     <%= spree_image_tag(asset.attachment, width: 200, height: 200, alt: asset.alt, class: 'w-full block h-full absolute') %>
   <% end %>
 </div>

data/app/views/spree/admin/variants/edit.html.erb

@@ -10,7 +10,6 @@
       <%= render 'spree/admin/variants/form/basic', f: f %>
       <%= render 'spree/admin/variants/form/pricing', f: f %>
       <%= render 'spree/admin/variants/form/inventory', f: f %>
-      <%= render 'spree/admin/shared/media_form', viewable: @variant, viewable_type: 'Spree::Variant' %>
       <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     </div>
   </div>

data/app/views/spree/admin/zones/_state_members.html.erb

@@ -1,4 +1,4 @@
-<div id="state_members">
+<div id="state_members" data-controller="zone-state-select" data-zone-state-select-url-value="<%= spree.select_options_admin_country_states_path(':country_id') %>">
   <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">
@@ -9,12 +9,22 @@
     <div class="card-body">
       <div class="form-group">
         <%= label_tag :states_country_id, Spree.t(:country) %>
-        <%= tom_select_tag :states_country_id, class: 'w-full', options: Spree::Country.joins(:states).to_tom_select_json, active_option: @selected_country&.id, select_data: {action: "auto-submit#submit"} %>
+        <%= tom_select_tag :states_country_id,
+          class: 'w-full',
+          options: Spree::Country.joins(:states).distinct.to_tom_select_json,
+          active_option: @selected_country&.id,
+          select_data: {action: "change->zone-state-select#countryChanged"}
+        %>
       </div>
 
-      <div class="form-group">
+      <div class="form-group" data-zone-state-select-target="statesSelect">
         <%= zone_form.label :state_ids, Spree.t(:states) %>
-        <%= tom_select_tag 'zone[state_ids]', multiple: true, class: 'w-full', options: @states.to_tom_select_json, active_option: @zone.state_ids %>
+        <%= tom_select_tag 'zone[state_ids]',
+          multiple: true,
+          class: 'w-full',
+          url: @selected_country ? spree.select_options_admin_country_states_path(@selected_country) : nil,
+          active_option: @zone.state_ids
+        %>
       </div>
     </div>
   </div>

data/config/initializers/spree_admin_navigation.rb

@@ -251,6 +251,15 @@ Rails.application.config.after_initialize do
           active: -> { controller_name == 'policies' },
           if: -> { can?(:manage, Spree::Policy) }
 
+  # Channels
+  settings_nav.add :channels,
+          label: :channels,
+          url: :admin_channels_path,
+          icon: 'broadcast',
+          position: 65,
+          active: -> { controller_name == 'channels' },
+          if: -> { can?(:manage, Spree::Channel) }
+
   # Payment Methods
   settings_nav.add :payment_methods,
           label: :payments,

data/config/initializers/spree_admin_tables.rb

@@ -128,6 +128,19 @@ Rails.application.config.after_initialize do
                                         search_url: ->(view_context) { view_context.spree.admin_tags_select_options_path(format: :json, taggable_type: 'Spree::Product') },
                                         method: ->(product) { product.tag_list.to_sentence }
 
+  Spree.admin.tables.products.add :channels,
+                                        label: :channels,
+                                        type: :association,
+                                        filter_type: :select,
+                                        sortable: false,
+                                        filterable: true,
+                                        default: false,
+                                        position: 90,
+                                        ransack_attribute: 'channels_id',
+                                        operators: %i[in not_in],
+                                        value_options: -> { Spree::Current.store&.channels&.order(:name)&.pluck(:name, :id)&.map { |name, id| { value: id, label: name } } || [] },
+                                        method: ->(product) { product.channels.pluck(:name).to_sentence }
+
   # Products bulk actions
   Spree.admin.tables.products.add_bulk_action :set_active,
                                                     label: 'admin.bulk_ops.products.title.set_active',
@@ -135,7 +148,7 @@ Rails.application.config.after_initialize do
                                                     action_path: ->(view_context) { view_context.spree.bulk_status_update_admin_products_path(status: 'active') },
                                                     body: 'admin.bulk_ops.products.body.set_active',
                                                     position: 10,
-                                                    condition: -> { can?(:activate, Spree::Product) }
+                                                    condition: -> { can?(:bulk_activate, Spree::Product) }
 
   Spree.admin.tables.products.add_bulk_action :set_draft,
                                                     label: 'admin.bulk_ops.products.title.set_draft',
@@ -350,6 +363,19 @@ Rails.application.config.after_initialize do
                                       operators: %i[in],
                                       search_url: ->(view_context) { view_context.spree.select_options_admin_promotions_path(format: :json) }
 
+  Spree.admin.tables.orders.add :channel,
+                                      label: :channel,
+                                      type: :association,
+                                      filter_type: :select,
+                                      sortable: true,
+                                      filterable: true,
+                                      default: true,
+                                      position: 35,
+                                      ransack_attribute: 'channel_id',
+                                      operators: %i[eq not_eq in not_in],
+                                      value_options: -> { Spree::Current.store&.channels&.order(:name)&.pluck(:name, :id)&.map { |name, id| { value: id, label: name } } || [] },
+                                      method: ->(order) { order.channel&.name }
+
   # Register Checkouts table (draft orders)
   Spree.admin.tables.register(:checkouts, model_class: Spree::Order, search_param: :search, date_range_param: :created_at, new_resource: false)
 
@@ -462,7 +488,7 @@ Rails.application.config.after_initialize do
                                      position: 30,
                                      ransack_attribute: 'addresses_country_name',
                                      operators: %i[eq],
-                                     search_url: ->(view_context) { view_context.spree.admin_countries_select_options_path(format: :json) },
+                                     search_url: ->(view_context) { view_context.spree.select_options_admin_countries_path(format: :json) },
                                      partial: 'spree/admin/tables/columns/user_location'
 
   # Number of orders
@@ -1744,6 +1770,40 @@ Rails.application.config.after_initialize do
                                              default: true,
                                              position: 10
 
+  # ==========================================
+  # Register Channels table
+  # ==========================================
+  Spree.admin.tables.register(:channels, model_class: Spree::Channel, search_param: :name_cont)
+
+  Spree.admin.tables.channels.add :name,
+                                  label: :name,
+                                  type: :link,
+                                  sortable: true,
+                                  filterable: true,
+                                  default: true,
+                                  position: 10
+
+  Spree.admin.tables.channels.add :code,
+                                  label: :code,
+                                  sortable: true,
+                                  default: true,
+                                  position: 20
+
+  Spree.admin.tables.channels.add :active,
+                                  label: :status,
+                                  type: :status,
+                                  sortable: false,
+                                  default: true,
+                                  position: 30,
+                                  method: ->(c) { c.active? ? 'active' : 'inactive' }
+
+  Spree.admin.tables.channels.add :default,
+                                  label: :default,
+                                  type: :boolean,
+                                  sortable: true,
+                                  default: true,
+                                  position: 40
+
   # ==========================================
   # Register Refund Reasons table
   # ==========================================

data/config/locales/en.yml

@@ -26,6 +26,8 @@ en:
         revoked: API key has been revoked
         revoked_at: Revoked at
         revoked_by: Revoked by
+        scopes: Scopes
+        scopes_description: Required for secret keys. Pick the narrowest set of scopes your integration needs.
         secret_key_hidden: This secret key cannot be revealed. If you've lost it, revoke this key and create a new one.
         statuses:
           active: Active
@@ -73,6 +75,13 @@ en:
           title:
             add_tags: Add tags
             remove_tags: Remove tags
+      channels:
+        code_hint: A short, stable identifier (e.g. "online", "pos", "wholesale"). Used by API clients via the X-Spree-Channel header and for order attribution.
+        default: Default channel
+        default_hint: Exactly one channel per store is the default. Used as the fallback when no channel is selected and as the auto-publish target for new products.
+        order_routing_strategy: Order routing strategy
+        order_routing_strategy_hint: Overrides the store-level routing strategy for orders attributed to this channel.
+        order_routing_strategy_inherit: Inherit from store
       checkout_settings:
         checkout_links:
           description: Links to these pages will be displayed in the checkout footer.
@@ -278,14 +287,34 @@ en:
         seo:
           placeholder: Add a title and description to see how this product might appear in a search engine listing
         status_form:
-          available_on: Marks when the product will be released, put a future date to indicate that this is a pre-order
-          discontinue_on: Marks when the product should be automatically taken off from your site
-          make_active_at: Marks when the product should be automatically promoted to "active" state
           status: Draft products aren't available for purchase. Active products are live.
+        status_options:
+          active: Active
+          archived: Archived
+          draft: Draft
         stores:
           choose_stores: Choose which stores this product should be available in
         variants:
           option_types_link: To add more option types please go to <a href="%{link}">Option Types</a>
+      publishing:
+        caption_hidden_after: Comes down %{date}
+        caption_live: Visible to customers now
+        caption_not_available: Hidden — product is %{product_status}
+        caption_scheduled: Goes live %{date}
+        caption_unpublished: Was hidden on %{date}
+        caption_window: Live %{start} → %{end}
+        empty: Not listed on any sales channel yet.
+        inactive_marker: Inactive
+        manage_cta: Manage
+        manage_description: Pick which sales channels list this product. Toggle a channel off to unlist it everywhere.
+        no_channels: No sales channels available. Create one in Settings → Sales channels.
+        published_at_label: Publish from
+        status_hidden: Hidden
+        status_live: Live
+        status_not_available: Not available
+        status_scheduled: Scheduled
+        title: Publishing
+        unpublished_at_label: Unpublish on
       recommended_size: Recommended size
       report_created: Your report is being generated. You will receive an email with a download link when it is ready!
       reset_digital_link_download_limits: Reset download limits

data/config/routes.rb

@@ -62,9 +62,18 @@ Spree::Core::Engine.add_routes do
     end
     get '/taxons/select_options' => 'taxons#select_options', as: :taxons_select_options, defaults: { format: :json }
     get '/tags/select_options' => 'tags#select_options', as: :tags_select_options, defaults: { format: :json }
-    get '/countries/select_options' => 'countries#select_options', as: :countries_select_options, defaults: { format: :json }
     get '/users/select_options' => 'users#select_options', as: :users_select_options, defaults: { format: :json }
     get '/stock_locations/select_options' => 'stock_locations#select_options', as: :stock_locations_select_options, defaults: { format: :json }
+    resources :countries, only: [] do
+      collection do
+        get :select_options, defaults: { format: :json }
+      end
+      resources :states, only: [] do
+        collection do
+          get :select_options, defaults: { format: :json }
+        end
+      end
+    end
 
     # media library
     resources :assets, only: [:create, :edit, :update, :destroy] do
@@ -217,6 +226,7 @@ Spree::Core::Engine.add_routes do
     resources :payment_methods, except: :show
     resources :shipping_methods, except: :show
     resources :shipping_categories, except: :show
+    resources :channels, except: :show
     resources :store_credit_categories
     resources :tax_rates, except: :show
     resources :tax_categories, except: :show

data/lib/spree/admin/engine.rb

@@ -9,6 +9,8 @@ module Spree
         :admin_users_header_partials,
         :body_end_partials,
         :body_start_partials,
+        :channels_actions_partials,
+        :channels_header_partials,
         :classifications_actions_partials,
         :classifications_header_partials,
         :coupon_codes_actions_partials,

data/lib/spree/admin/tailwind_helper.rb

@@ -43,7 +43,7 @@ module Spree
 
         def spree_engines
           Rails::Engine.subclasses.select do |engine|
-            engine.name&.start_with?("Spree::")
+            engine.name&.start_with?("Spree")
           end
         end