spree_admin 5.2.0.rc1 → 5.2.0.rc3

data/app/models/spree/admin/form_builder.rb

@@ -30,7 +30,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.text_field(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -44,7 +44,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.number_field(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -58,7 +58,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.email_field(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -72,7 +72,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.date_field(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -86,7 +86,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.datetime_field(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -107,7 +107,7 @@ module Spree
 
           @template.label(@object_name, method, get_label(method, options)) +
             @template.text_area(@object_name, method, objectify_options(options)) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -122,7 +122,7 @@ module Spree
             @template.content_tag(:div, class: 'trix-container') do
               @template.rich_text_area(@object_name, method, objectify_options(options))
             end +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -147,7 +147,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.select(@object_name, method, choices, objectify_options(options), html_options, &block) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -173,7 +173,7 @@ module Spree
         @template.content_tag(:div, class: 'form-group') do
           @template.label(@object_name, method, get_label(method, options)) +
             @template.collection_select(@object_name, method, collection, value_method, text_method, objectify_options(options), html_options) +
-            @template.error_message_on(@object_name, method) + field_help(method, options)
+            @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -187,7 +187,7 @@ module Spree
           @template.content_tag(:div, class: 'custom-control custom-checkbox') do
             @template.check_box(@object_name, method, objectify_options(options.merge(class: 'custom-control-input'))) +
             @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label')
-          end + @template.error_message_on(@object_name, method) + field_help(method, options)
+          end + @template.error_message_on(@object_name, method) + field_help(method, options.merge!(class: 'form-text mt-2 ml-4'))
         end
       end
 
@@ -204,7 +204,7 @@ module Spree
           @template.content_tag(:div, class: 'custom-control custom-radio') do
             @template.radio_button(@object_name, method, tag_value, objectify_options(options.merge(class: 'custom-control-input'))) +
               @template.label(@object_name, method, get_label(method, options), class: 'custom-control-label', for: options[:id])
-          end + @template.error_message_on(@object_name, method) + field_help(method, options)
+          end + @template.error_message_on(@object_name, method) + field_help(method, options.merge(class: 'form-text mt-2'))
         end
       end
 
@@ -215,7 +215,8 @@ module Spree
       # @option options [String] :help help text to display
       # @return [String] HTML string containing the help text or empty string
       def field_help(_method, options = {})
-        @template.content_tag(:span, options[:help], class: 'form-text mt-2')
+        options[:class] ||= 'form-text mt-2'
+        @template.content_tag(:span, options[:help], class: options[:class])
       end
 
       private

data/app/models/spree/admin/updater.rb

@@ -37,8 +37,8 @@ module Spree
 
           JSON.parse(response.body)
         end
-      rescue Net::OpenTimeout, Net::ReadTimeout, SocketError, Errno::ECONNREFUSED, JSON::ParserError => e
-        Rails.logger.error("Failed to fetch Spree updates: #{e.message}")
+      rescue StandardError => e
+        Rails.error.report(e)
         {}
       end
     end

data/app/views/spree/admin/custom_domains/_custom_domains.html.erb

@@ -3,7 +3,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(:active) %>?</th>
           <th scope="col"><%= Spree.t(:default) %>?</th>
           <th scope="col"></th>

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

@@ -4,7 +4,7 @@
       <% if @product.has_variants? %>
         <th scope="col"><%= Spree.t(:variant) %></th>
       <% end %>
-      <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(:size) %></th>
       <th scope="col"></th>
     </tr>

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

@@ -6,7 +6,8 @@
   class: "filter-wrap",
   data: {
     controller: "filters dropdown",
-    filters_url_value: request.url
+    filters_url_value: request.url,
+    dropdown_placement_value: "bottom-end"
   } do |f| %>
   <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 

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

@@ -14,16 +14,28 @@
       <%= Spree.t('admin.integrations.page_subtitle') %>
     </div>
 
-    <% grouped_available_store_integrations.each do |group, integrations| %>
-      <% if group.present? %>
-        <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
+    <% if grouped_available_store_integrations.any? %>
+      <% grouped_available_store_integrations.each do |group, integrations| %>
+        <% if group.present? %>
+          <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
+        <% end %>
+
+        <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
+          <% integrations.each do |integration| %>
+            <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+          <% end %>
+        </div>
       <% end %>
 
-      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
-        <% integrations.each do |integration| %>
-          <%= render 'spree/admin/integrations/integration', integration_class: integration %>
-        <% end %>
-      </div>
+      <p class="text-muted text-center my-5">
+        Find more integrations in <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>
+      </p>
+    <% else %>
+      <p class="text-muted text-center my-5">
+        No integrations installed yet. Find integrations in 
+
+        <%= external_link_to 'Integrations Directory', 'https://spreecommerce.org/docs/integrations/integrations', class: 'text-decoration-none font-weight-bold', target: '_blank' %>
+      </p>
     <% end %>
   </div>
 </div>

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

@@ -12,7 +12,8 @@
       <%= f.spree_date_field :expires_at, required: true, data: { 'enable-button-target': 'input' } %>
     </div>
     <div class="dialog-footer">
-      <%= turbo_save_button_tag nil, class: 'btn btn-primary', data: { 'enable-button-target': 'button' } do %>
+      <%= dialog_discard_button %>
+      <%= turbo_save_button_tag do %>
         <%= icon 'send' %>
         <%= Spree.t('actions.send_invitation') %>
       <% end %>

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

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

data/app/views/spree/admin/newsletter_subscribers/_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: :email_cont, label: Spree.t(:email) %>
 

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

@@ -1,8 +1,8 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :email, Spree.t(:email) %></th>
+  <th scope="col"><%= sort_link @search, :email, Spree.t(:email) %></th>
   <th scope="col"><%= Spree.t(:customer) %></th>
   <th scope="col"><%= Spree.t(:verified) %>?</th>
   <th scope="col"><%= Spree.t(:verified_at) %></th>
-  <th scope="col"><%= sort_link search_collection, :created_at, Spree.t(:created_at) %></th>
+  <th scope="col"><%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
   <th scope="col"></th>
 </tr>

data/app/views/spree/admin/oauth_applications/_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('admin.oauth_applications.client_id') %></th>
   <th scope="col"><%= Spree.t('admin.oauth_applications.scopes') %></th>
   <th scope="col"><%= Spree.t('admin.oauth_applications.last_used') %></th>

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

@@ -6,7 +6,7 @@
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
       <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>
         <%= dropdown_toggle class: 'btn-light btn-sm px-1', data: { test_id: 'dropdown-toggle' } do %>
-          <%= icon 'dots-vertical' %>
+          <%= icon 'dots-vertical', class: 'mr-0' %>
         <% end %>
         <%= dropdown_menu class: 'dropdown-menu-right' do %>
           <% if can?(:update_customer, @order) && !@order.user.present? %>

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

@@ -15,7 +15,8 @@
   class: "filter-wrap",
   data: {
     controller: "filters dropdown",
-    filters_url_value: request.url
+    filters_url_value: request.url,
+    dropdown_placement_value: "bottom-end"
   } do |f| %>
   <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
@@ -27,15 +28,13 @@
       date_from_input_name: "q[created_at_gt]",
       date_to_input_name: "q[created_at_lt]",
       date_from_value: params.dig(:q, :created_at_gt),
-      date_to_value: params.dig(:q, :created_at_lt),
-      dropdown_direction: "right" %>
+      date_to_value: params.dig(:q, :created_at_lt) %>
     <% else %>
       <%= render "spree/admin/shared/calendar_range_picker",
       date_from_input_name: "q[completed_at_gt]",
       date_to_input_name: "q[completed_at_lt]",
       date_from_value: params.dig(:q, :completed_at_gt),
-      date_to_value: params.dig(:q, :completed_at_lt),
-      dropdown_direction: "right" %>
+      date_to_value: params.dig(:q, :completed_at_lt) %>
     <% end %>
 
     <%= render "spree/admin/orders/table_filter_dropdown" %>

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

@@ -41,8 +41,6 @@
       can?(:create, Spree::CustomerReturn) && @order.return_authorizations.exists? %>
 
     <% if can_create_ra || can_create_cr %>
-      <div class="dropdown-divider"></div>
-
       <% if can_create_ra %>
         <%= link_to_with_icon "plus", Spree.t(:new_return_authorization),
         spree.new_admin_order_return_authorization_path(@order),
@@ -54,8 +52,6 @@
         spree.new_admin_order_customer_return_path(@order),
         class: "btn dropdown-item" %>
       <% end %>
-
-      <div class="dropdown-divider"></div>
     <% end %>
   <% end %>
 
@@ -69,6 +65,5 @@
       <%= icon "cancel" %>
       <%= Spree.t(:cancel_order) %>
     <% end %>
-    <div class="dropdown-divider"></div>
   <% end %>
 <% end %>

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/posts/_form.html.erb

@@ -13,12 +13,10 @@
 
         <%= f.spree_rich_text_area :content,
               help_bubble: 'Add a summary of the post',
-              style: 'height: 300px',
               data: { seo_form_target: 'sourceDescriptionInput' } %>
 
         <%= f.spree_rich_text_area :excerpt,
               help_bubble: 'Add a summary of the post',
-              style: 'height: 100px',
               data: { seo_form_target: 'sourceExcerptInput' } %>
       </div>
     </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>