spree_admin 5.2.6 → 5.3.0.rc1

data/app/views/spree/admin/stores/form/_checkout.html.erb

@@ -2,21 +2,21 @@
 <%= Spree.t(:checkout) %> <%= Spree.t(:settings) %>
 <% end %>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:settings) %></h5>
   </div>
 
   <div class="card-body">
     <%= f.spree_select :checkout_zone_id, options_for_select(@zones, @store.checkout_zone_id), { label: Spree.t(:shipping_zone), autocomplete: true } %>
-    <span class="form-text mb-3">
+    <span class="form-text mb-4">
       <%= Spree.t(:shipping_zone_help) %>
       <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
     </span>
 
     <%= f.spree_select :default_country_iso, Spree::Country.pluck(:name, :iso), { include_blank: false, label: Spree.t(:default_country), autocomplete: true, help: Spree.t(:default_country_help) } %>
 
-    <hr />
+    <hr class="my-6" />
 
     <%= f.spree_check_box :preferred_guest_checkout, label: Spree.t('admin.checkout_settings.guest_checkout.label'), help: Spree.t('admin.checkout_settings.guest_checkout.description') %>
     <%= f.spree_check_box :preferred_company_field_enabled, label: Spree.t('admin.store_form.company_field.label'), help: Spree.t('admin.store_form.company_field.description') %>
@@ -24,7 +24,7 @@
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
   </div>
@@ -34,17 +34,19 @@
   </div>
 </div>
 
-<div class="card mb-4">
-  <div class="card-header">
-    <h5 class="card-title"><%= Spree.t('admin.checkout_settings.checkout_links.label') %></h5>
-  </div>
+<% if current_store.respond_to?(:links) %>
+  <div class="card mb-6">
+    <div class="card-header">
+      <h5 class="card-title"><%= Spree.t('admin.checkout_settings.checkout_links.label') %></h5>
+    </div>
 
-  <div class="card-body">
-    <div class="alert alert-info">
-      <div>
-        <%= Spree.t('admin.checkout_settings.checkout_links.description') %>
+    <div class="card-body">
+      <div class="alert alert-info">
+        <div>
+          <%= Spree.t('admin.checkout_settings.checkout_links.description') %>
+        </div>
       </div>
+      <%= render 'spree/admin/stores/form/checkout_links' %>
     </div>
-    <%= render 'spree/admin/stores/form/checkout_links' %>
   </div>
-</div>
+<% end %>

data/app/views/spree/admin/stores/form/_checkout_links.html.erb

@@ -1,28 +1,28 @@
 <div id="checkout_links">
   <% if current_store.links.any? %>
-    <ul class="list-group mb-3"
+    <ul class="list-group rounded-lg mb-6 border-gray-200"
         data-controller="sortable"
         data-sortable-handle-value=".handle"
         data-sortable-resource-name-value="page_link"
         data-sortable-response-kind-value="turbo-stream">
       <% current_store.links.each do |link| %>
-        <li class="list-group-item p-0 hover-light"
+        <li class="list-group-item p-0 hover:bg-gray-25"
             data-sortable-update-url="<%= spree.admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>"
         >
-          <%= turbo_frame_tag spree_dom_id(link), class: 'd-flex align-items-center w-100 py-2 pl-3 pr-2' do %>
-            <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block text-dark flex-fill' %>
-            <button class="btn btn-sm pr-0 handle shadow-none hover-gray-200 px-1">
+          <%= turbo_frame_tag spree_dom_id(link), class: 'flex items-center w-full py-2 pl-6 pr-2' do %>
+            <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'block text-gray-900 flex-1 no-underline' %>
+            <span class="btn btn-sm handle shadow-none hover:bg-gray-100 px-1 cursor-move ml-4">
               <%= icon 'grip-vertical', class: 'mr-0' %>
-            </button>
+            </span>
           <% end %>
         </li>
       <% end %>
     </ul>
   <% else %>
-    <p class="text-muted text-center p-5">
+    <p class="text-gray-600 text-center p-12">
       <%= Spree.t(:no_resource_found, resource: Spree::PageLink.model_name.human) %>
     </p>
   <% end %>
 
-  <%= link_to_with_icon 'plus', Spree.t(:add_link), spree.admin_store_links_path(current_store), class: 'btn btn-primary w-100', data: { turbo_method: :post } %>
+  <%= link_to_with_icon 'plus', Spree.t(:add_link), spree.admin_store_links_path(current_store), class: 'btn btn-primary w-full', data: { turbo_method: :post } %>
 </div>

data/app/views/spree/admin/stores/form/_emails.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:settings) %></h5>
   </div>
@@ -12,12 +12,12 @@
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title">Email addresses</h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">
+    <p class="text-gray-600">
       Please provide the email address that will be used as the sender of all emails sent from your store.
     </p>
 
@@ -27,12 +27,12 @@
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:logo) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
+    <p class="text-gray-600">This logo is included in all email notifications such as order confirmation</p>
     <%= f.spree_file_field :mailer_logo, width: 204, height: 104 %>
     <p class="form-text mb-0 mt-2">
       We recommend images with a transparent background.

data/app/views/spree/admin/stores/form/_policies.html.erb

@@ -6,48 +6,48 @@
   Policies will be automatically added to footer of your store and will be available to customers during checkout.
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:terms_of_service) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">
+    <p class="text-gray-600">
       Customers will need to accept these terms of service during signup.
     </p>
     <%= f.spree_rich_text_area :customer_terms_of_service, label: Spree.t(:terms_of_service) %>
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:privacy_policy) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">
+    <p class="text-gray-600">
       Customers will need to accept these privacy policy during signup.
     </p>
     <%= f.spree_rich_text_area :customer_privacy_policy, label: Spree.t(:privacy_policy) %>
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:returns_policy) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">
+    <p class="text-gray-600">
       Please provide your customers with a clear and transparent returns policy.
     </p>
     <%= f.spree_rich_text_area :customer_returns_policy, label: Spree.t(:returns_policy) %>
   </div>
 </div>
 
-<div class="card mb-4">
+<div class="card mb-6">
   <div class="card-header">
     <h5 class="card-title"><%= Spree.t(:shipping_policy) %></h5>
   </div>
   <div class="card-body">
-    <p class="text-muted">
+    <p class="text-gray-600">
       Please provide your customers with a clear and transparent shipping policy.
     </p>
     <%= f.spree_rich_text_area :customer_shipping_policy, label: Spree.t(:shipping_policy) %>
@@ -55,12 +55,12 @@
 </div>
 
 <% if current_store.respond_to?(:partners_terms_of_service) %>
-  <div class="card mb-4">
+  <div class="card mb-6">
     <div class="card-header">
       <h5 class="card-title">Vendors <%= Spree.t(:terms_of_service) %></h5>
     </div>
     <div class="card-body">
-      <p class="text-muted">
+      <p class="text-gray-600">
         Vendors you invite will need to accept these terms of service during their onboarding process.
       </p>
       <%= f.spree_rich_text_area :partners_terms_of_service, label: Spree.t(:terms_of_service) %>

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

@@ -1,13 +1,13 @@
 <%= form_for @store, url: spree.admin_stores_path, data: { turbo: false, controller: 'store-form enable-button' } do |f| %>
-  <div class="container pt-5">
-    <h1><%= Spree.t(:new_store) %></h1>
+  <div class="container pt-48">
+    <h1 class="mb-6"><%= Spree.t(:new_store) %></h1>
 
     <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store } %>
-    <div class="row">
-      <div class="col-lg-6">
+    <div class="grid grid-cols-12 gap-16">
+      <div class="col-span-12 lg:col-span-6">
           <div class="form-group">
             <%= f.label :name %>
-            <%= f.text_field :name, class: 'form-control',
+            <%= f.text_field :name, class: 'form-input',
                                   placeholder: Spree.t(:store_name),
                                   required: true,
                                   autofocus: true,
@@ -53,35 +53,35 @@
             </div>
           <% end %>
         </div>
-        <div class="col-lg-5 offset-lg-1">
+        <div class="col-span-12 lg:col-span-5 lg:col-start-8">
           <h5>What will be shared with this new store:</h5>
-          <ul class="list-unstyled">
+          <ul class="list-none p-0">
             <li>
-              <%= icon('check', class: 'text-success') %>
+              <%= icon('check', class: 'text-green-700') %>
               <%= Spree.t(:products) %>, <%= Spree.t(:stock_locations) %> & <%= Spree.t(:inventory) %><br />
-              <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
+              <em class="ml-24 text-gray-600 text-sm">you can select which ones will be available for this store</em>
             </li>
             <li>
-              <%= icon('check', class: 'text-success') %>
+              <%= icon('check', class: 'text-green-700') %>
               <%= Spree.t(:customers) %>
             </li>
             <li>
-              <%= icon('check', class: 'text-success') %>
+              <%= icon('check', class: 'text-green-700') %>
               Shipping methods, rates and markets
             </li>
             <li>
-              <%= icon('check', class: 'text-success') %>
+              <%= icon('check', class: 'text-green-700') %>
               <%= Spree.t(:payment_methods) %><br />
-              <em class="ml-4 text-muted font-size-sm">you can select which ones will be available for this store</em>
+              <em class="ml-24 text-gray-600 text-sm">you can select which ones will be available for this store</em>
             </li>
             <li>
-              <%= icon('check', class: 'text-success') %>
+              <%= icon('check', class: 'text-green-700') %>
               Admin user privileges
             </li>
           </ul>
 
           <h5>What will not be shared with this new store:</h5>
-          <ul class="list-unstyled">
+          <ul class="list-none p-0">
             <li>
               <%= icon('x', class: 'text-danger') %>
               <%= Spree.t(:orders) %>
@@ -122,7 +122,7 @@
       </div>
     </div>
   </div>
-  <footer id="footer" class="d-flex justify-content-end">
+  <footer id="footer" class="fixed bottom-0 left-0 w-full border-t border-gray-200 px-6 py-4 bg-gray-25 flex items-center justify-end gap-4 z-[1000]">
     <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
   </footer>
 <% end %>

data/app/views/spree/admin/tables/_column_selector.html.erb

@@ -0,0 +1,52 @@
+<%# locals: (table:, table_key:, selected_columns:, frame_name:) %>
+<div data-controller="column-selector">
+  <%= form_with url: spree.admin_table_columns_path,
+                method: :post,
+                data: { turbo_frame: frame_name } do |f| %>
+    <%= hidden_field_tag :table_key, table_key %>
+    <%= hidden_field_tag :redirect_url, request.fullpath %>
+
+    <%= dropdown(portal: false) do %>
+      <%= dropdown_toggle(class: 'btn-light btn-sm h-[2.125rem]') do %>
+        <%= icon 'columns-3' %>
+        <span><%= Spree.t('admin.tables.columns') %></span>
+        <%= icon 'chevron-down' %>
+      <% end %>
+
+      <%= dropdown_menu(class: 'min-w-[250px]') do %>
+        <h6 class="font-semibold text-gray-700 text-sm p-3">
+          <%= Spree.t('admin.tables.visible_columns') %>
+        </h6>
+
+        <div class="space-y-2 max-h-[300px] overflow-y-auto mb-4">
+          <% table.available_columns.each do |column| %>
+            <% next unless column.visible?(self) %>
+            <% is_selected = selected_columns.nil? ? column.default? : selected_columns.include?(column.key) %>
+            <label class="flex items-center gap-2 cursor-pointer hover:bg-gray-50 p-1.5 rounded">
+              <%= check_box_tag 'columns[]',
+                                column.key,
+                                is_selected,
+                                id: "column_#{column.key}",
+                                data: {
+                                  column_selector_target: 'checkbox',
+                                  default: column.default?
+                                },
+                                class: 'form-checkbox rounded' %>
+              <span class="text-sm text-gray-700"><%= column.resolve_label %></span>
+            </label>
+          <% end %>
+        </div>
+
+        <div class="flex gap-2 p-2 pt-3 border-t border-gray-200">
+          <button type="button"
+                  class="btn btn-sm btn-light flex-1"
+                  data-action="column-selector#reset">
+            <%= Spree.t('admin.tables.reset_to_default') %>
+          </button>
+          <%= f.submit Spree.t('admin.tables.apply'),
+                       class: 'btn btn-sm btn-primary flex-1 cursor-pointer' %>
+        </div>
+      <% end %>
+    <% end %>
+  <% end %>
+</div>

data/app/views/spree/admin/tables/_filter_group.html.erb

@@ -0,0 +1,33 @@
+<%# Template for a nested OR filter group - populated by JavaScript %>
+<div class="p-4 border-2 border-dashed border-gray-300 rounded-lg bg-white"
+     data-group-id=""
+     data-combinator="or">
+  <div class="flex items-center justify-between mb-3">
+    <div class="flex items-center gap-2">
+      <span class="text-sm text-gray-600"><%= Spree.t('admin.tables.match') %></span>
+      <button type="button"
+              class="btn btn-sm btn-outline-secondary px-2 py-1"
+              data-action="query-builder#toggleGroupCombinator">
+        <span data-group-combinator-label>OR</span>
+      </button>
+      <span class="text-sm text-gray-600"><%= Spree.t('admin.tables.of_the_following') %></span>
+    </div>
+    <button type="button"
+            class="btn btn-sm btn-light text-red-600 hover:text-red-700 hover:bg-red-50 p-1.5"
+            data-action="query-builder#removeGroup"
+            title="<%= Spree.t(:remove) %>">
+      <%= icon 'x', class: 'w-4 h-4' %>
+    </button>
+  </div>
+
+  <div data-group-filters-container class="space-y-3 mb-3">
+    <%# Filter rows within this group will be added here %>
+  </div>
+
+  <button type="button"
+          class="btn btn-sm btn-light flex items-center gap-1"
+          data-action="query-builder#addFilterToGroup">
+    <%= icon 'plus', class: 'w-4 h-4' %>
+    <%= Spree.t('admin.tables.add_filter') %>
+  </button>
+</div>

data/app/views/spree/admin/tables/_filter_row.html.erb

@@ -0,0 +1,29 @@
+<%# Template for a single filter row - populated by JavaScript %>
+<div class="flex items-center gap-2 p-3 bg-gray-50 rounded-lg" data-filter-id="">
+  <select class="form-select flex-1 text-sm"
+          data-field-select
+          data-action="change->query-builder#onFieldChange">
+    <option value=""><%= Spree.t('admin.tables.select_field') %></option>
+  </select>
+
+  <select class="form-select flex-shrink-0 w-[160px] text-sm"
+          data-operator-select
+          data-action="change->query-builder#onOperatorChange">
+    <option value="eq"><%= Spree.t('admin.tables.operators.equals') %></option>
+  </select>
+
+  <div data-value-container class="flex-1">
+    <input type="text"
+           class="form-input text-sm"
+           placeholder="<%= Spree.t('admin.tables.enter_value') %>"
+           data-value-input
+           data-action="input->query-builder#onValueChange">
+  </div>
+
+  <button type="button"
+          class="btn btn-sm btn-light text-red-600 hover:text-red-700 hover:bg-red-50 p-1.5"
+          data-action="query-builder#removeFilter"
+          title="<%= Spree.t(:remove) %>">
+    <%= icon 'x', class: 'w-4 h-4' %>
+  </button>
+</div>

data/app/views/spree/admin/tables/_query_builder.html.erb

@@ -0,0 +1,95 @@
+<%# locals: (table:, table_key:, frame_name:) %>
+<% fields_json = query_builder_fields_json(table) %>
+<% operators_json = query_builder_operators_json %>
+<% current_state = params[:query_state] || '{}' %>
+<% filter_count = count_applied_filters(current_state) %>
+
+<div data-controller="dialog" class="h-full">
+  <button type="button"
+          class="btn btn-light btn-sm h-[2.125rem]"
+          data-action="dialog#open">
+    <%= icon 'filter' %>
+    <span><%= Spree.t('admin.tables.filters') %></span>
+    <% if filter_count > 0 %>
+      <span class="badge badge-light"><%= filter_count %></span>
+    <% end %>
+  </button>
+
+  <%= drawer(id: "query-builder-drawer-#{table_key}", controller_name: 'dialog') do %>
+    <%= drawer_header(Spree.t('admin.tables.filter_builder'), 'dialog') %>
+
+    <div data-controller="query-builder"
+         data-query-builder-fields-value="<%= fields_json %>"
+         data-query-builder-operators-value="<%= operators_json %>"
+         class="grow flex flex-col justify-between">
+
+      <%= form_with url: url_for, method: :get, html: { class: 'grow flex flex-col justify-between' },data: { turbo_frame: '_top', query_builder_target: 'form', action: 'submit->query-builder#submitForm' } do |f| %>
+        <div class="drawer-body">
+          <div class="mb-4 flex items-center gap-2 flex-wrap">
+            <span class="text-sm text-gray-600">
+              <%= Spree.t('admin.tables.match') %>
+            </span>
+            <button type="button"
+                    class="btn btn-sm btn-outline-secondary px-2 py-1"
+                    data-action="query-builder#toggleCombinator"
+                    data-query-builder-target="combinatorButton">
+              <span data-query-builder-target="combinatorLabel">AND</span>
+            </button>
+            <span class="text-sm text-gray-600">
+              <%= Spree.t('admin.tables.of_the_following') %>
+            </span>
+          </div>
+
+          <div data-query-builder-target="filtersContainer" class="space-y-3 mb-4">
+            <%# Filter rows will be added here dynamically %>
+          </div>
+
+          <div data-query-builder-target="groupsContainer" class="space-y-3 mb-4">
+            <%# Nested groups will be added here %>
+          </div>
+
+          <div class="flex gap-2">
+            <button type="button"
+                    class="btn btn-sm btn-light flex items-center gap-1"
+                    data-action="query-builder#addFilter">
+              <%= icon 'plus', class: 'w-4 h-4' %>
+              <%= Spree.t('admin.tables.add_filter') %>
+            </button>
+            <button type="button"
+                    class="btn btn-sm btn-light flex items-center gap-1"
+                    data-action="query-builder#addOrGroup">
+              <%= icon 'brackets', class: 'w-4 h-4' %>
+              <%= Spree.t('admin.tables.add_or_group') %>
+            </button>
+          </div>
+
+          <input type="hidden"
+                 name="query_state"
+                 data-query-builder-target="hiddenInput"
+                 value="<%= h current_state %>">
+        </div>
+
+        <div class="drawer-footer">
+          <%= drawer_discard_button('dialog') %>
+          <button type="button"
+                  class="btn btn-light"
+                  data-action="query-builder#clear">
+            <%= Spree.t('admin.tables.clear_all') %>
+          </button>
+          <%= f.submit Spree.t('admin.tables.apply_filters'),
+                       class: 'btn btn-primary cursor-pointer' %>
+        </div>
+      <% end %>
+
+      <%# Filter row template %>
+      <template data-query-builder-target="filterTemplate">
+        <%= render 'spree/admin/tables/filter_row' %>
+      </template>
+
+      <%# Filter group template %>
+      <template data-query-builder-target="groupTemplate">
+        <%= render 'spree/admin/tables/filter_group' %>
+      </template>
+    </div>
+  <% end %>
+</div>

data/app/views/spree/admin/tables/_row_actions.html.erb

@@ -0,0 +1,15 @@
+<%# locals: (record:, table:) %>
+<div class="flex items-center justify-end gap-1">
+  <% if table.row_actions_edit? && respond_to?(:edit_object_url) && can?(:update, record) %>
+    <%= link_to edit_object_url(record),
+                class: 'btn btn-sm btn-light',
+                title: Spree.t(:edit),
+                data: { 'turbo-frame': '_top' } do %>
+      <%= icon 'pencil', class: 'w-4 h-4' %>
+    <% end %>
+  <% end %>
+
+  <% if table.row_actions_delete? && can?(:destroy, record) %>
+    <%= link_to_delete(record, no_text: true, class: 'btn btn-sm btn-light text-danger') %>
+  <% end %>
+</div>

data/app/views/spree/admin/tables/_table.html.erb

@@ -0,0 +1,69 @@
+<%# locals: (collection:, table:, container_class: 'card-lg', table_key:, selected_columns: nil, frame_name: nil, bulk_operations: false, sortable: false, export_type: nil, edit_object_url: :default) %>
+<% frame_name ||= controller_name %>
+<% columns = table.visible_columns(selected_columns, self) %>
+<% 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 %>
+<% end %>
+
+<%= turbo_frame_tag frame_name, data: { turbo_action: 'advance' } do %>
+  <div class="<%= local_assigns[:container_class] || 'card-lg' %>" data-controller="table" data-table-url-value="<%= request.path %>">
+    <div class="p-3 border-b border-gray-200">
+      <div class="flex flex-col lg:flex-row gap-3 items-start lg:items-center justify-between">
+        <div class="flex gap-2 items-center flex-wrap">
+          <%= search_form_for @search, url: url_for, html: { data: { turbo_frame: frame_name, turbo_action: 'advance', controller: 'auto-submit search-clear', auto_submit_delay_value: 300 } } do |f| %>
+            <div class="form-input flex items-center py-0 pr-1 focus-within:outline-2 focus-within:outline-offset-2 focus-within:outline-blue-500 lg:w-[300px] mr-auto h-[2.125rem] transition-all duration-100 ease-in-out">
+              <%= icon "search", class: "mr-4 text-gray-600 shrink-0" %>
+              <%= search_field_tag "q[#{search_param}]",
+                                   params.dig(:q, search_param),
+                                   class: "outline-none border-0 h-full focus:border-0 focus:ring-0 p-0 text-base w-full",
+                                   placeholder: search_placeholder,
+                                   data: { action: 'input->auto-submit#submit input->search-clear#toggleClearButton search->auto-submit#submit', search_clear_target: 'input' } %>
+              <button type="button" class="<%= 'hidden' if params.dig(:q, search_param).blank? %> p-1 text-gray-400 hover:text-gray-600 shrink-0" data-search-clear-target="clear" data-action="search-clear#clear">
+                <%= icon 'x', class: 'w-4 h-4' %>
+              </button>
+            </div>
+          <% end %>
+        </div>
+
+        <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',
+                     table: table,
+                     table_key: table_key,
+                     selected_columns: selected_columns,
+                     frame_name: frame_name %>
+        </div>
+      </div>
+    </div>
+
+    <% if collection.any? %>
+      <%= render 'spree/admin/tables/table_body',
+                 collection: collection,
+                 columns: columns,
+                 table: table,
+                 bulk_operations: bulk_operations,
+                 sortable: sortable %>
+
+      <%= render 'spree/admin/shared/index_table_options', collection: collection %>
+    <% else %>
+      <%= render 'spree/admin/shared/no_resource_found',
+                 new_object_url: (new_object_url if table.new_resource && respond_to?(:new_object_url) && can?(:create, table.model_class)) %>
+    <% end %>
+  </div>
+<% end %>