spree_admin 5.2.0.rc2 → 5.2.0.rc3

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

@@ -1,4 +1,4 @@
-<% if @orders.any? %>
+<% if @collection.any? %>
   <div class="table-responsive">
     <table class="table" id="listing_orders">
       <thead>
@@ -18,11 +18,11 @@
         </tr>
       </thead>
       <tbody>
-        <%= render collection: @orders, partial: 'spree/admin/orders/order', cached: !(defined?(current_vendor) && current_vendor) ? spree_base_cache_scope : false %>
+        <%= render collection: @collection, partial: 'spree/admin/orders/order', cached: !(defined?(current_vendor) && current_vendor) ? spree_base_cache_scope : false %>
       </tbody>
     </table>
   </div>
 <% else %>
   <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Order %>
 <% end %>
-<%= render 'spree/admin/shared/index_table_options', collection: @orders if @orders.any? %>
+<%= render 'spree/admin/shared/index_table_options', collection: @collection %>

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

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :page_sidebar do %>
   <% tab_selected ||= :content %>
   <h6 class="sidebar-header">
-    <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id),  data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>
+    <%= link_to spree.edit_admin_theme_path(@theme, page_id: @page&.id),  data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %>
       <%= icon 'chevron-left', class: 'mr-0' %>
     <% end %>
     <%= @page_block.display_name %>
@@ -11,10 +11,10 @@
       <div data-controller="tabs">
         <ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist">
           <li class="nav-item" role="presentation">
-            <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>
+            <button class="nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>
           </li>
           <li class="nav-item" role="presentation">
-            <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>
+            <button class="nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>
           </li>
         </ul>
         <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>>

data/app/views/spree/admin/page_builder/_add_block.html.erb

@@ -6,7 +6,7 @@
       <%= icon("circle-plus") %>
       Add block
     <% end %>
-    <%= dropdown_menu direction: 'top-left' do %>
+    <%= dropdown_menu do %>
     <% section.available_blocks_to_add.each do |block_class| %>
       <a href="#" class="dropdown-item btn-sm"
           data-action="click->block-form#addBlock"

data/app/views/spree/admin/page_builder/_header.html.erb

@@ -2,7 +2,7 @@
   <nav class="navbar navbar-expand-lg">
     <div data-controller="tooltip">
       <% back_url = @page.custom? ? spree.admin_pages_path : spree.admin_themes_path %>
-      <%= link_to back_url, class: 'btn hover-gray px-2' do %>
+      <%= link_to back_url, class: 'btn hover-gray shadow-none px-2' do %>
         <%= icon('x', class: 'mr-0') %>
       <% end %>
       <%= tooltip(Spree.t('admin.back_to_dashboard')) %>

data/app/views/spree/admin/page_builder/_pages_dropdown.html.erb

@@ -1,4 +1,4 @@
-<%= dropdown id: 'pages_dropdown' do %>
+<%= dropdown id: 'pages_dropdown', direction: 'left' do %>
   <%= dropdown_toggle class: 'btn-light' do %>
     <span class="d-flex align-items-center pr-5">
       <%= icon @page.icon_name, class: 'mr-2' %>
@@ -6,7 +6,7 @@
     </span>
     <%= icon 'selector', class: 'mr-0 ml-2 mb-0 text-muted' %>
   <% end %>
-  <%= dropdown_menu direction: 'left', style: 'min-width: 250px' do %>
+  <%= dropdown_menu style: 'min-width: 250px' do %>
     <% @theme.pages.standard.order(name: :asc).find_all(&:customizable?).each do |page| %>
       <%= active_link_to spree.edit_admin_theme_path(@theme, theme_preview_id: @theme_preview.id, page_id: page.id), class: 'dropdown-item', active: @page == page, data: { turbo_prefetch: false } do %>
         <%= icon page.icon_name, class: 'mr-2' %>

data/app/views/spree/admin/page_builder/_sidebar_block.html.erb

@@ -20,7 +20,7 @@
       </div>
       <div class="d-flex align-items-center d-none">
         <% if block.section.can_sort_blocks? %>
-          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block">
+          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 px-1 handle-block shadow-none">
             <%= icon('grip-vertical', class: 'mr-0') %>
           </button>
         <% end %>

data/app/views/spree/admin/page_builder/_sidebar_colors.html.erb

@@ -7,10 +7,10 @@
     <div data-controller="tabs">
       <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">
         <li class="nav-item" role="presentation">
-          <button class="btn nav-link w-100 active" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="true">Color scheme</button>
+          <button class="nav-link w-100 active" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="true">Color scheme</button>
         </li>
         <li class="nav-item" role="presentation">
-          <button class="btn nav-link w-100" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button>
+          <button class="nav-link w-100" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="false">Elements</button>
         </li>
       </ul>
       <div id="pills-tabContent">

data/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb

@@ -6,12 +6,12 @@
   <div data-controller="tabs">
     <ul class="nav nav-pills nav-fill m-3" id="pills-tab" role="tablist">
       <li class="nav-item" role="presentation">
-        <button class="btn nav-link w-100 active" id="pills-standard" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-standard" aria-selected="true">
+        <button class="nav-link w-100 active" id="pills-standard" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-standard" aria-selected="true">
           Standard
         </button>
       </li>
       <li class="nav-item" role="presentation">
-        <button class="btn nav-link w-100" id="pills-custom" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">
+        <button class="nav-link w-100" id="pills-custom" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-custom" aria-selected="false">
           Custom
         </button>
       </li>
@@ -60,7 +60,7 @@
             <div class="alert alert-warning">
               Using custom fonts can slow down your store.
             </div>
-            <%= f.spree_text_area :preferred_custom_font_code, style: 'min-height: 6em' %>
+            <%= f.spree_text_area :preferred_custom_font_code, style: 'min-height: 6em', label: Spree.t(:custom_font_code) %>
           </div>
           <%= f.submit Spree.t('actions.update'), class: 'btn btn-primary' %>
 

data/app/views/spree/admin/page_builder/_sidebar_section.html.erb

@@ -16,7 +16,7 @@
         %>
       </div>
       <div class="d-flex align-items-center d-none">
-        <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-section">
+        <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 handle-section shadow-none">
           <%= icon('grip-vertical', class: 'mr-0') %>
         </button>
       </div>

data/app/views/spree/admin/page_links/_list.html.erb

@@ -12,7 +12,7 @@
             data-sortable-update-url="<%= spree.admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>"
         >
           <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'd-block py-2 px-3 text-dark flex-fill' %>
-          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1">
+          <button class="btn btn-sm pr-0 handle hover-gray-200 h-100 mr-1 px-1 shadow-none">
             <%= icon 'grip-vertical', class: 'mr-0' %>
           </button>
         </li>

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

@@ -12,7 +12,7 @@
 <% else %>
   <%= turbo_frame_tag :page_sidebar do %>
     <h6 class="sidebar-header">
-      <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>
+      <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %>
         <%= icon 'chevron-left', class: 'mr-0' %>
       <% end %>
       <%= @page_link.label %>

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

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :page_sidebar do %>
   <% tab_selected ||= :content %>
   <h6 class="sidebar-header">
-    <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>
+    <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %>
       <%= icon 'chevron-left', class: 'mr-0 back' %>
     <% end %>
     <%= @page_section.display_name %>
@@ -11,10 +11,10 @@
       <div data-controller="tabs">
         <ul class="nav nav-pills nav-fill mb-3" id="pills-tab" role="tablist">
           <li class="nav-item" role="presentation">
-            <button class="btn nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>
+            <button class="nav-link w-100 <%= tab_selected == :content ? 'active' : '' %>" id="pills-home-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-home" aria-selected="<%= tab_selected == :content %>">Content</button>
           </li>
           <li class="nav-item" role="presentation">
-            <button class="btn nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>
+            <button class="nav-link w-100 <%= tab_selected == :design ? 'active' : '' %>" id="pills-profile-tab" data-tabs-target="tab" data-action="click->tabs#select" type="button" role="tab" aria-controls="pills-profile" aria-selected="<%= tab_selected == :design %>">Design</button>
           </li>
         </ul>
         <div data-tabs-target="panel" id="pills-home" role="tabpanel" aria-labelledby="pills-home-tab" class="animate__animated animate__fadeIn" <%= 'hidden' unless tab_selected == :content %>>

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

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag :page_sidebar do %>
   <h6 class="sidebar-header">
-    <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray px-2' do %>
+    <%= link_to collection_url, data: { action: 'click->page-builder#clearActiveOverlays' }, class: 'btn hover-gray shadow-none px-2' do %>
       <%= icon 'chevron-left', class: 'mr-0 back' %>
     <% end %>
     <%= Spree.t(:add_section) %>

data/app/views/spree/admin/pages/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>
-  <th scope="col"><%= sort_link search_collection, :updated_at, Spree.t(:updated_at) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
+  <th scope="col"><%= sort_link @search, :updated_at, Spree.t(:updated_at) %></th>
   <th scope="col"></th>
 </tr>

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

@@ -42,4 +42,8 @@
       </tbody>
     </table>
   </div>
-<% end %>
+<% end %>
+
+<p class="text-muted text-center my-5">
+  Find more payment methods in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>
+</p>

data/app/views/spree/admin/policies/_filters.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, search_collection], class: "filter-wrap", data: { controller: "filters" } do |f| %>
+<%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters" } do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %>
   </div>

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

@@ -18,11 +18,11 @@
       url: spree.bulk_status_update_admin_products_path(status: :draft)
     ) %>
 
-    <%= dropdown do %>
+    <%= dropdown direction: 'top' do %>
       <%= dropdown_toggle do %>
         <%= icon('dots-vertical', class: "mr-0") %>
       <% end %>
-      <%= dropdown_menu direction: 'top', class: 'mb-2' do %>
+      <%= dropdown_menu class: 'mb-2' do %>
         <%= bulk_action_link(
           Spree.t("admin.bulk_ops.products.title.set_status", status: :archived),
           spree.bulk_modal_admin_products_path(kind: :set_status, status: :archived),

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

@@ -8,8 +8,6 @@
 
   <%= render_admin_partials(:product_dropdown_partials, product: @product) %>
 
-  <div class="dropdown-divider"></div>
-
   <%= external_page_preview_link(@product) %>
 
   <% if can?(:clone, @product) %>

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

@@ -1,7 +1,4 @@
 <div class="card mb-4">
-  <div class="card-header">
-    <h5 class="card-title"><%= Spree.t(:status) %></h5>
-  </div>
   <div class="card-body">
     <div class="row mb-3">
       <div class="col-6">

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

@@ -162,7 +162,7 @@
           <%= render 'spree/admin/products/form/variants/variant_template', default_stock_location: default_stock_location_for_product(@product) %>
           <div class="variants-table__body" data-variants-form-target="variantsContainer" data-test-id="product-variants-table">
           </div>
-          <div class="variants-table__footer">
+          <div class="variants-table__footer font-size-sm">
             <%= Spree.t('admin.variants_form.total_inventory_html', stock_location: current_store.default_stock_location.name, count: raw("<span data-variants-form-target='stockItemsCount'>#{@product.total_on_hand}</span>") )%>
           </div>
         </div>

data/app/views/spree/admin/promotions/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:code) %></th>
   <th scope="col"><%= Spree.t(:kind) %></th>
   <th scope="col"><%= Spree.t(:usage_limit) %></th>

data/app/views/spree/admin/promotions/form/_kind.html.erb

@@ -9,7 +9,7 @@
           <%= f.radio_button :multi_codes, false, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_false, class: 'custom-control-label' do %>
             One code for all customers
-            <span class="form-text font-weight-normal mr-1">
+            <span class="form-text font-weight-normal mr-1 mt-2">
               You can limit the number of times this code can be used.
             </span>
           <% end %>
@@ -22,7 +22,7 @@
           <%= f.radio_button :multi_codes, true, data: { action: 'change->reveal#toggle' }, class: 'custom-control-input' %>
           <%= f.label :multi_codes_true, class: 'custom-control-label' do %>
             Generate unique codes
-            <span class="form-text font-weight-normal mr-1">
+            <span class="form-text font-weight-normal mr-1 mt-2">
               These codes are generated automatically and can be downloaded as a CSV file. Codes are unique and can only be used once.
             </span>
           <% end %>
@@ -30,7 +30,7 @@
         <div data-reveal-target="item" class="ml-3 mt-2 row <% unless @promotion.multi_codes? %>hidden<% end %>">
           <div class="col-6">
             <%= f.text_field :code_prefix, class: 'form-control text-uppercase', placeholder: 'Coupon Prefix (optional)' %>
-            <span class="form-text">
+            <span class="form-text mt-2">
               eg. <strong>ABC</strong>
             </span>
           </div>
@@ -38,7 +38,7 @@
             <% minimum_number_of_codes = @promotion.persisted? && @promotion.coupon_codes.count.positive? ? @promotion.coupon_codes.count : 1 %>
             <% maximum_number_of_codes = ENV.fetch('PROMOTION_MAX_NUMBER_OF_CODES', 5000) %>
             <%= f.number_field :number_of_codes, class: 'form-control', placeholder: 'Number of codes', min: minimum_number_of_codes, max: maximum_number_of_codes, step: 1 %>
-            <span class="form-text">
+            <span class="form-text mt-2">
               How many codes you want to generate.
               <% if @promotion.persisted? %>
                 To add more codes just increase this number

data/app/views/spree/admin/refund_reasons/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"><%= Spree.t(:mutable) %></th>
   <th scope="col"></th>

data/app/views/spree/admin/reimbursement_types/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:type) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"><%= Spree.t(:mutable) %></th>

data/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:status) %></th>
   <th scope="col"></th>
 </tr>

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

@@ -13,7 +13,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
             <th scope="col"><%= Spree.t(:permissions) %></th>
             <th scope="col"></th>
           </tr>

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

@@ -7,7 +7,7 @@
 
 <% dropdown_direction ||= 'left' %>
 
-<%= dropdown data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100' do %>
+<%= dropdown direction: dropdown_direction, data: { controller: 'dropdown calendar-range', action: 'click->calendar-range#open' }, class: 'h-100' do %>
   <%= dropdown_toggle class: css_classes do %>
     <%= icon('calendar', class: 'mr-2') %>
     <div data-calendar-range-target="label">
@@ -18,7 +18,7 @@
       <% end %>
     </div>
   <% end %>
-  <%= dropdown_menu direction: dropdown_direction, class: "pt-2 px-2 pb-1" do %>
+  <%= dropdown_menu class: "pt-2 px-2 pb-1" do %>
     <div data-calendar-range-target="picker" class="d-none"></div>
   <% end %>
 

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

@@ -27,7 +27,10 @@
             <%= icon 'dots-vertical', class: 'mr-0' %>
           <% end %>
           <%= dropdown_menu id: 'page_actions_dropdown_menu' do %>
-            <%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %>
+            <% if content_for?(:page_actions_dropdown) %>
+              <%= yield :page_actions_dropdown %>
+              <div class="dropdown-divider"></div>
+            <% end %>
             <% if record && record.persisted? %>
               <%= link_to_edit_metafields(record) %>
               <%= link_to_edit_translations(record) %>

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

@@ -1,13 +1,14 @@
 <% sortable = local_assigns[:sortable] %>
+<% frame_name = local_assigns[:frame_name] || controller_name %>
 
-<%= turbo_frame_tag controller_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
+<%= turbo_frame_tag frame_name, autoscroll: true, data: { autoscroll_block: :start, autoscroll_behavior: :smooth, turbo_action: 'advance' } do %>
   <%= render 'spree/admin/shared/export_modal', export_type: export_type if local_assigns[:export_type] %>
   <div class="card-lg">
     <% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>
       <%= render 'filters' %>
     <% end %>
 
-    <% if paginated_collection.any? %>
+    <% if @collection.any? %>
       <div class="<% if lookup_context.template_exists?('filters', lookup_context.prefixes, true) %>with-filters<% end %>" id="listing_<%= controller_name %>">
         <table class="table">
           <thead>
@@ -21,12 +22,12 @@
               data-sortable-response-kind-value="turbo-stream"
             <% end %>
           >
-            <%= render partial: 'table_row', collection: paginated_collection, as: controller_name.singularize %>
+            <%= render partial: 'table_row', collection: @collection, as: controller_name.singularize %>
           </tbody>
         </table>
       </div>
 
-      <%= render 'spree/admin/shared/index_table_options', collection: paginated_collection %>
+      <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
     <% else %>
       <%= render 'spree/admin/shared/no_resource_found', new_object_url: (new_object_url if can?(:create, model_class)) %>
     <% end %>

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

@@ -12,7 +12,7 @@
       <div class="d-none d-lg-block text-center text-muted">
         <%= page_entries_info(collection, entry_name: entry_name) %>
       </div>
-      <div class="text-right pr-lg-2">
+      <div class="text-right">
         <%= paginate collection, theme: 'admin-twitter-bootstrap-4' %>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
   <%= dropdown_toggle class: 'btn-light btn-sm px-1' do %>
     <%= icon 'plus', class: 'mr-0' %>
   <% end %>
-  <%= dropdown_menu direction: 'left' do %>
+  <%= dropdown_menu do %>
     <%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.new_admin_order_path, class: "dropdown-item" if can?(:manage, Spree::Order)  %>
 
     <%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %>

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

@@ -1,6 +1,6 @@
 <% if try_spree_current_user.present? %>
   <%= dropdown id: dom_id(try_spree_current_user, 'account-dropdown') do %>
-    <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0' do %>
+    <%= dropdown_toggle class: 'd-flex align-items-center justify-content-between text-left w-100 pr-0 shadow-none' do %>
       <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
     <% end %>
     <%= dropdown_menu class: 'dropdown-menu-right', style: 'min-width: 250px;' do %>
@@ -29,8 +29,9 @@
         <h6 class="dropdown-header mt-2">
           <%= Spree.t(:support) %>
         </h6>
-        <%= external_link_to Spree.t(:help_center), 'https://spreecommerce.org/docs/user', class: 'dropdown-item justify-content-between', target: '_blank' %>
-        <%= external_link_to Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item justify-content-between', target: '_blank' %>
+        <%= link_to_with_icon 'book',  Spree.t('admin.documentation'), 'https://spreecommerce.org/docs', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'brand-slack', Spree.t('admin.slack'), 'https://slack.spreecommerce.org/', class: 'dropdown-item', target: '_blank' %>
+        <%= link_to_with_icon 'message', Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item', target: '_blank' %>
       <% end %>
 
       <div class="dropdown-divider"></div>

data/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb

@@ -4,7 +4,7 @@
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
       <%= truncate(current_store.name, length: 10) %>
     <% end %>
-    <%= dropdown_menu class: 'ml-2', direction: 'left' do %>
+    <%= dropdown_menu class: 'ml-2' do %>
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>

data/app/views/spree/admin/shipping_categories/_table_header.html.erb

@@ -1,4 +1,4 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"></th>
 </tr>

data/app/views/spree/admin/shipping_methods/_table_header.html.erb

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
   <th scope="col"><%= Spree.t(:estimated_delivery_time) %></th>
   <th scope="col"><%= Spree.t(:amount) %></th>

data/app/views/spree/admin/stock_locations/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :country, Spree.t(:country) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :country, Spree.t(:country) %></th>
   <th scope="col"><%= Spree.t(:active) %>?</th>
   <% if can?(:mark_as_default, Spree::StockLocation) %>
     <th scope="col"><%= Spree.t(:default) %>?</th>

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

@@ -15,7 +15,7 @@
       <table class="table">
         <thead>
           <tr>
-            <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+            <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
             <th scope="col"></th>
           </tr>
         </thead>

data/app/views/spree/admin/store_credits/_list.html.erb

@@ -1,4 +1,4 @@
-<% if @store_credits.any? %>
+<% if @collection.any? %>
   <div class="table-responsive">
     <table class="table">
       <thead>
@@ -11,11 +11,11 @@
         <th scope="col"><%= Spree.t(:issued_on) %></th>
       </thead>
       <tbody>
-        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @store_credits, as: :store_credit, cached: spree_base_cache_scope %>
+        <%= render partial: 'spree/admin/store_credits/store_credit', collection: @collection, as: :store_credit, cached: spree_base_cache_scope %>
       </tbody>
     </table>
   </div>
-  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @store_credits } %>
+  <%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>
 <% else %>
   <%= render 'spree/admin/shared/no_resource_found', model_class: Spree::StoreCredit, new_object_url: spree.new_admin_user_store_credit_path(@user) %>
 <% end %>

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

@@ -9,10 +9,10 @@
 
   <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 } %>
-    <small class="form-text mb-3">
+    <span class="form-text mb-3">
       <%= Spree.t(:shipping_zone_help) %>
       <%= link_to Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'text-blue' %>
-    </small>
+    </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) } %>
 

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

@@ -11,7 +11,7 @@
         >
           <%= 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 hover-gray h-100 px-1">
+            <button class="btn btn-sm pr-0 handle shadow-none hover-gray-200 px-1">
               <%= icon 'grip-vertical', class: 'mr-0' %>
             </button>
           <% end %>

data/app/views/spree/admin/tax_categories/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
-  <th scope="col"><%= sort_link search_collection, :tax_code, Spree.t(:tax_code) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :tax_code, Spree.t(:tax_code) %></th>
   <th scope="col"><%= Spree.t(:description) %></th>
   <th scope="col"><%= Spree.t(:default) %></th>
   <th scope="col"></th>

data/app/views/spree/admin/tax_rates/_table_header.html.erb

@@ -1,8 +1,8 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:tax_category) %></th>
   <th scope="col"><%= Spree.t(:zone) %></th>
-  <th scope="col"><%= sort_link search_collection, :amount, Spree.t(:amount) %></th>
+  <th scope="col"><%= sort_link @search, :amount, Spree.t(:amount) %></th>
   <th scope="col"><%= Spree.t(:included_in_price) %></th>
   <th scope="col"><%= Spree.t(:show_rate_in_label) %></th>
   <th scope="col"></th>

data/app/views/spree/admin/taxonomies/_table_header.html.erb

@@ -1,6 +1,6 @@
 <tr data-hook="listing_taxonomies_header">
   <th class="no-border handel-head"></th>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t(:taxons) %></th>
   <th scope="col"></th>
 </tr>