spree_admin 5.2.0.rc2 → 5.2.0

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

@@ -1,19 +1,7 @@
 <div class="card mb-3">
   <div class="card-body">
-    <div class="form-group">
-      <%= f.label :url, Spree.t(:domain) %>
-      <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border">
-        <span class="text-muted">https://</span>
-        <%= f.text_field :url, class: 'form-control-plaintext pr-0 pl-1', autofocus: f.object.new_record?, required: true %>
-      </div>
-      <%= f.error_message_on :url %>
-    </div>
+    <%= f.spree_text_field :url, label: Spree.t(:domain), prepend: 'https://', autofocus: f.object.new_record?, required: true %>
 
-    <div class="custom-control custom-checkbox">
-      <%= f.check_box :default, class: 'custom-control-input' %>
-      <%= f.label :default, class: 'custom-control-label font-weight-semibold' %>
-      <p class="form-text mb-0">We will use this domain in emails to customers.</p>
-      <%= f.error_message_on :default %>
-    </div>
+    <%= f.spree_check_box :default, help: 'We will use this domain in emails to customers.' %>
   </div>
 </div>

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

@@ -5,17 +5,23 @@
   url: filter_form_url,
   class: "filter-wrap",
   data: {
-    controller: "filters dropdown",
+    controller: "filters dialog",
     filters_url_value: request.url
   } do |f| %>
-  <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+    <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
-    <%= render "table_filter_dropdown" %>
-    <%= render "spree/admin/shared/filters_button" %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :code_i_cont, label: Spree.t(:code) %>
+      <%= render "table_filter_dropdown" %>
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
+
+  <dialog class="drawer" data-dialog-target="dialog" id="gift-card-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <% if params[:user_id].blank? %>
       <div class="form-group">
         <%= f.label :users_email_eq, Spree.t(:email) %>
@@ -29,16 +35,19 @@
     </div>
 
     <%= render_admin_partials(:gift_cards_filters_partials, f: f) %>
-
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
     </div>
-  </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <div class="form-actions">
+        <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+          <%= icon("search") %>
+          <%= Spree.t(:filter_results) %>
+        <% end %>
+      </div>
+    </div>
+  </dialog>
 
-   <%= render "spree/admin/shared/filter_badge_template" %>
+  <%= render "spree/admin/shared/filter_badge_template" %>
 
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
 <% end %>

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

@@ -12,7 +12,7 @@
         <%= icon 'plus' %>
         <%= Spree.t(:new_gift_card) %>
       <% end %>
-      <%= dropdown_menu class: 'dropdown-menu-right' do %>
+      <%= dropdown_menu do %>
         <%= link_to spree.new_admin_gift_card_path,
               class: 'text-left dropdown-item'  do %>
           <%= icon 'add' %>

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

@@ -4,11 +4,11 @@
       <%= Spree.t(:customer) %>
     </h5>
     <% if can?(:update_customer, @order) || can?(:update_addresses, @order) %>
-      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto' do %>
+      <%= dropdown id: 'customer-edit-dropdown', class: 'ml-auto', portal: false 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 %>
+        <%= dropdown_menu do %>
           <% if can?(:update_customer, @order) && !@order.user.present? %>
             <%= link_to Spree.t('admin.edit_contact_information'), spree.edit_admin_order_contact_information_path(@order), class: 'dropdown-item', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
           <% end %>

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

@@ -14,34 +14,38 @@
   url: search_form_path,
   class: "filter-wrap",
   data: {
-    controller: "filters dropdown",
+    controller: "filters dialog",
     filters_url_value: request.url
   } do |f| %>
-  <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
+    <%= hidden_field_tag :frame_name, frame_name if frame_name.present? %>
 
-  <div class="d-flex flex-column flex-lg-row gap-2">
-    <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
+    <div class="d-flex flex-column flex-lg-row gap-2">
+      <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search %>
 
-    <% if controller_name == 'checkouts' %>
-      <%= render "spree/admin/shared/calendar_range_picker",
-      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" %>
-    <% 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" %>
-    <% end %>
+      <% if controller_name == 'checkouts' %>
+        <%= render "spree/admin/shared/calendar_range_picker",
+        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) %>
+      <% 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) %>
+      <% end %>
+
+      <%= render "spree/admin/orders/table_filter_dropdown" %>
+      <%= button_tag type: 'button', class: 'btn btn-light d-flex align-items-center', data: { action: 'dialog#open' } do %>
+        <%= icon "adjustments", class: "mr-1" %>
+        <%= Spree.t("admin.filters") %>
+      <% end %>
+    </div>
 
-    <%= render "spree/admin/orders/table_filter_dropdown" %>
-    <%= render 'spree/admin/shared/filters_button' %>
-  </div>
-  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+  <dialog class="drawer" data-dialog-target="dialog" id="order-filters-drawer">
+    <%= drawer_header(Spree.t(:filter), 'dialog') %>
+    <div class="drawer-body">
     <%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %>
     <%= f.hidden_field :state_not_eq, value: params.dig(:q, :state_not_eq) %>
     <%= f.hidden_field :user_id_eq, value: @user.try(:id) %>
@@ -100,8 +104,12 @@
     </div>
 
     <%= render_admin_partials(:orders_filters_partials, f: f) %>
-    <%= render 'spree/admin/shared/filter_submit' %>
-  </div>
+    </div>
+    <div class="drawer-footer">
+      <%= drawer_discard_button('dialog') %>
+      <%= render 'spree/admin/shared/filter_submit' %>
+    </div>
+  </dialog>
 
   <%= render "spree/admin/shared/filter_badge_template" %>
   <div data-filters-target="badgesContainer" class="filter-badges-container"></div>

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/orders/_table_filter_dropdown.html.erb

@@ -6,7 +6,7 @@
       </span>
       <%= order_filter_dropdown_value %>
     <% end %>
-    <%= dropdown_menu class: 'dropdown-menu-right w-100', style: 'min-width: 200px' do %>
+    <%= dropdown_menu do %>
       <%= active_link_to Spree.t('admin.orders.all_orders'), params.to_unsafe_h.deep_merge({q: {shipment_state_eq: '', shipment_state_not_in: '', state_eq: '', state_in: '', refunded: '', partially_refunded: '' }}), class: 'dropdown-item', active: (params[:q] || {}).values_at(*%w[payment_state_not_eq shipment_state_not_in shipment_state_eq state_eq state_in refunded partially_refunded] ).all?(&:blank?) %>
       <%= link_to params.to_unsafe_h.deep_merge({q: {shipment_state_not_in: [:shipped, :canceled], shipment_state_eq: '', state_eq: '', state_in: '', refunded: '', partially_refunded: ''}}),
                   class: "dropdown-item d-flex align-items-center justify-content-between #{'active' if params[:q][:shipment_state_not_in] == ['shipped', 'canceled']}" do %>

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_blocks/forms/_image.html.erb

@@ -1,8 +1,5 @@
-<%= render 'active_storage/upload_form', form: f, field_name: :asset, width: 512, height: 512, auto_submit: true %>
-<div class="mt-2 form-group">
-  <%= f.label :preferred_image_alt, Spree.t(:alt_text) %>
-  <%= f.text_field :preferred_image_alt, data: { action: 'auto-submit#submit' }, class: 'form-control' %>
-</div>
+<%= f.spree_file_field :asset, width: 512, height: 512, auto_submit: true %>
+<%= f.spree_text_field :preferred_image_alt, label: Spree.t(:alt_text), data: { action: 'auto-submit#submit' } %>
 <% content_for(:design_tab) do %>
   <%= render 'spree/admin/page_builder/labeled_range_input',
     f: f, field: :preferred_height, min: 1, max: 1024, unit: 'px', _label: 'Max image height on desktop'

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

@@ -1,19 +1,10 @@
 <% data_action = (@page_link.persisted? && !@page_link.parent.is_a?(Spree::Store) ? { action: 'blur->auto-submit#submit' } : {}) %>
 
-<div class="form-group">
-  <%= f.label :linkable_type, 'Link' %>
-  <%= f.select :linkable_type, @page_link.parent.allowed_linkable_types, { include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>
-  <%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>
-</div>
+<%= f.spree_select :linkable_type, @page_link.parent.allowed_linkable_types, { label: 'Link', include_blank: false }, { class: 'custom-select mb-3', data: { action: 'auto-submit#submit' } } %>
+<%= render 'spree/admin/page_links/linkable_type_dropdown', page_link: @page_link, form_name: 'page_link' %>
 
 <hr class="my-4" />
 
-<div class="form-group">
-  <%= f.label :label, Spree.t(:name) %>
-  <%= f.text_field :label, class: 'form-control', data: data_action, required: true %>
-</div>
+<%= f.spree_text_field :label, label: Spree.t(:name), data: data_action, required: true %>
 
-<div class="custom-control custom-checkbox">
-  <%= f.check_box :open_in_new_tab, class: 'custom-control-input', data: data_action %>
-  <%= f.label :open_in_new_tab, class: 'custom-control-label' %>
-</div>
+<%= f.spree_check_box :open_in_new_tab, data: data_action %>

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/forms/_header.html.erb

@@ -1,5 +1,3 @@
-<label>Logo image</label>
-
 <%= render 'spree/admin/shared/page_section_logo', f: f %>
 
 <p class="text-muted small mt-2">

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/payments/_payment.html.erb

@@ -46,6 +46,13 @@
     <% end %>
   </div>
   <div class="card-body">
+    <% if payment.gateway_processing_error_messages.any? %>
+      <div class="alert alert-danger inline-block">
+        <strong><%= Spree.t(:payments_gateway_processing_errors, payment_method_name: payment.payment_method&.name) %>:</strong>
+        <%= payment.gateway_processing_error_messages.join(', ') %>
+      </div>
+    <% end %>
+
     <div class="d-flex">
       <div class="w-50">
         <p class="mb-1"><%= Spree.t(:amount) %>:</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>