spree_admin 5.0.0 → 5.0.2

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

@@ -3,41 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-primary", icon: "plus" %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_promotion), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Promotion) %>
 
-<div class="card-lg p-0">
-  <%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
-    <div class="d-flex flex-column flex-lg-row gap-2">
-      <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
+<div class="card-lg">
+  <%= render 'filters' %>
 
-      <div class="d-flex align-items-center justify-content-between">
-        <%= render "spree/admin/promotions/table_filter_dropdown" %>
-
-        <%= render 'spree/admin/shared/filters_button' %>
-      </div>
-    </div>
-    <div data-reveal-target="item" class="d-none" id="table-filter">
-      <div class="row">
-        <div class="col-12 col-lg-6">
-          <div class="form-group">
-            <%= label_tag :q_code_or_coupon_codes_code_eq, Spree.t(:code) %>
-            <%= f.search_field :code_or_coupon_codes_code_eq, class: "form-control", data: { filters_target: :input } %>
-          </div>
-        </div>
-      </div>
-
-      <div class="form-actions">
-        <%= button Spree.t(:filter_results), "search" %>
-      </div>
-    </div>
-
-    <%= render "spree/admin/shared/filter_badge_template" %>
-
-    <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
-  <% end %>
-
-  <% if @promotions.any? %>
+  <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
         <thead class="text-muted">
@@ -47,15 +19,15 @@
             <th><%= Spree.t(:kind) %></th>
             <th><%= Spree.t(:usage_limit) %></th>
             <th><%= Spree.t(:status) %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
-          <%= render collection: @promotions, partial: "spree/admin/promotions/promotion", cached: spree_base_cache_scope %>
+          <%= render collection: @collection, partial: "spree/admin/promotions/promotion", cached: spree_base_cache_scope %>
         </tbody>
       </table>
     </div>
-    <%= render "spree/admin/shared/index_table_options", collection: @promotions, simple: true %>
+    <%= render "spree/admin/shared/index_table_options", collection: @collection %>
   <% else %>
     <%= render "spree/admin/shared/no_resource_found" %>
   <% end %>

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

@@ -9,22 +9,19 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-primary", icon: "plus" } %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Property)  %>
 
-<div class="card-lg p-0">
-
-  <%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<div class="card-lg">
+  <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
-
     <%= render "spree/admin/shared/filter_badge_template" %>
-
     <div data-filters-target="badgesContainer" class="filter-badges-container"></div>
   <% end %>
 
   <% if @properties.present? %>
     <div class="table-responsive">
-      <table class="table" id='listing_properties'>
+      <table class="table">
         <thead class="text-muted">
           <tr>
             <th class="no-border handel-head"></th>
@@ -33,7 +30,7 @@
             <th><%= Spree.t(:kind) %></th>
             <th><%= Spree.t(:products) %></th>
             <th><%= Spree.t(:visibility) %></th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody
@@ -45,9 +42,13 @@
           <%= render partial: "spree/admin/properties/property", collection: @collection, cached: spree_base_cache_scope %>
         </tbody>
       </table>
-      <%= render "spree/admin/shared/index_table_options", collection: @collection, simple: true %>
+      <%= render "spree/admin/shared/index_table_options", collection: @collection %>
     </div>
   <% else %>
     <%= render "spree/admin/shared/no_resource_found" %>
   <% end %>
 </div>
+
+<p class="documentation-link-container">
+  <%= external_link_to "Learn more about properties", "https://spreecommerce.org/docs/user/manage-products/product-properties" %>
+</p>

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

@@ -1,40 +1,42 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_refund_reason), new_object_url, { icon: 'plus', id: 'admin_new_named_type', class: "btn-primary" } %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_refund_reason), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::RefundReason %>
 
 <%= render 'spree/admin/shared/returns_and_refunds_nav' %>
 
-<% if @collection.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:mutable) %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-      <% @collection.each do |refund_reason| %>
-        <tr id="<%= spree_dom_id refund_reason %>" data-controller="row-link" class="cursor-pointer">
-          <td class="w-40 align-center" data-action="click->row-link#openLink">
-            <%= refund_reason.name %>
-          </td>
-          <td class="w-20 align-center" data-action="click->row-link#openLink">
-            <%= active_badge(refund_reason.active, label: Spree.t(refund_reason.active? ? :active : :inactive)) %>
-          </td>
-          <td class="w-10 align-center" data-action="click->row-link#openLink">
-            <%= active_badge(refund_reason.mutable) %>
-          </td>
-          <td class="actions w-10" data-action="click->row-link#openLink">
-            <%= link_to_edit(refund_reason, no_text: true, data: { row_link_target: :link }) if can? :edit, refund_reason %>
-          </td>
-        </tr>
-      <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:status) %></th>
+            <th><%= Spree.t(:mutable) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+        <% @collection.each do |refund_reason| %>
+          <tr id="<%= spree_dom_id refund_reason %>" data-controller="row-link" class="cursor-pointer">
+            <td class="w-40 align-center" data-action="click->row-link#openLink">
+              <%= refund_reason.name %>
+            </td>
+            <td class="w-20 align-center" data-action="click->row-link#openLink">
+              <%= active_badge(refund_reason.active, label: Spree.t(refund_reason.active? ? :active : :inactive)) %>
+            </td>
+            <td class="w-10 align-center" data-action="click->row-link#openLink">
+              <%= active_badge(refund_reason.mutable) %>
+            </td>
+            <td class="actions w-10" data-action="click->row-link#openLink">
+              <%= link_to_edit(refund_reason, no_text: true, data: { row_link_target: :link }) if can? :edit, refund_reason %>
+            </td>
+          </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -1,18 +1,13 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for [:admin, @refund.payment.order, @refund.payment, @refund], data: { turbo_frame: '_top' } do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">
-          <%= Spree.t(:edit_refund) %>
-        </h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <%= modal_header(Spree.t(:edit_refund)) %>
       <div class="modal-body">
         <%= render 'spree/admin/shared/error_messages', target: @refund %>
         <%= render 'spree/admin/refunds/form', f: f %>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
-        <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t('actions.discard') %></button>
+      <div class="modal-footer">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag %>
       </div>
     </div>

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

@@ -1,44 +1,46 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-primary", :icon => 'plus', :id => 'admin_new_reimbursement_type' } %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_reimbursement_type), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
-<%= render partial: 'spree/admin/shared/returns_and_refunds_nav' %>
+<%= render 'spree/admin/shared/returns_and_refunds_nav' %>
 
-<% if @reimbursement_types.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table" id='listing_reimbursement_types'>
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th><%= Spree.t(:type) %></th>
-          <th><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:mutable) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-      <% @reimbursement_types.each do |reimbursement_type| %>
-        <tr id="<%= spree_dom_id reimbursement_type %>" data-controller="row-link">
-          <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= reimbursement_type.name.humanize %>
-          </td>
-          <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
-            <code><%= reimbursement_type.type.demodulize %></code>
-          </td>
-          <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= active_badge(reimbursement_type.active, label: Spree.t(reimbursement_type.active? ? :active : :inactive)) %>
-          </td>
-          <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
-            <%= active_badge(reimbursement_type.mutable) %>
-          </td>
-          <td class="actions w-10">
-            <%= link_to_edit reimbursement_type, no_text: true, data: { row_link_target: :link } if can?(:edit, reimbursement_type) %>
-          </td>
-        </tr>
-      <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:type) %></th>
+            <th><%= Spree.t(:status) %></th>
+            <th><%= Spree.t(:mutable) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @collection.each do |reimbursement_type| %>
+            <tr id="<%= spree_dom_id reimbursement_type %>" data-controller="row-link">
+              <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= reimbursement_type.name.humanize %>
+              </td>
+              <td class="w-30 cursor-pointer" data-action="click->row-link#openLink">
+                <code><%= reimbursement_type.type.demodulize %></code>
+              </td>
+              <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(reimbursement_type.active, label: Spree.t(reimbursement_type.active? ? :active : :inactive)) %>
+              </td>
+              <td class="w-10 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(reimbursement_type.mutable) %>
+              </td>
+              <td class="actions w-10">
+                <%= link_to_edit reimbursement_type, no_text: true, data: { row_link_target: :link } if can?(:edit, reimbursement_type) %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

data/app/views/spree/admin/reports/_report.html.erb

@@ -1,4 +1,4 @@
-<div class="card-lg p-0">
+<div class="card-lg">
   <div class="table-responsive">
     <table class="table">
       <thead class="text-muted">

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

@@ -1,45 +1,45 @@
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_rma_reason),
-  new_object_url,
-  { icon: "plus", id: "admin_new_named_type", class: "btn-primary" } %>
-  <% end if can? :create, Spree::RefundReason %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_rma_reason), new_object_url, class: "btn btn-primary" %>
+<% end if can? :create, Spree::ReturnAuthorizationReason %>
 
-    <%= render partial: "spree/admin/shared/returns_and_refunds_nav" %>
+<%= render"spree/admin/shared/returns_and_refunds_nav" %>
 
-    <% if @collection.any? %>
-      <div class="table-responsive card-lg p-0">
-        <table class="table" id='listing_named_types'>
-          <thead class="text-muted">
-            <tr>
-              <th><%= Spree.t(:name) %></th>
-              <th><%= Spree.t(:status) %></th>
-              <th></th>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:status) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody id="<%= plural_resource_name(Spree::ReturnAuthorizationReason).to_s.parameterize.underscore %>">
+          <% @collection.each do |return_authorization_reason| %>
+            <tr id="<%= spree_dom_id return_authorization_reason %>" data-controller="row-link">
+              <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= return_authorization_reason.name %>
+              </td>
+              <td class="w-20 align-center cursor-pointer" data-action="click->row-link#openLink">
+                <%= active_badge(
+                  return_authorization_reason.active,
+                  label: Spree.t(return_authorization_reason.active? ? :active : :inactive),
+                ) %>
+              </td>
+              <td class="actions w-10">
+                <% if return_authorization_reason.mutable? %>
+                  <%= if can? :edit, return_authorization_reason
+                    link_to_edit(return_authorization_reason, no_text: true, data: { row_link_target: :link })
+                  end %>
+                <% end %>
+              </td>
             </tr>
-          </thead>
-          <tbody id="<%= plural_resource_name(Spree::ReturnAuthorizationReason).to_s.parameterize.underscore %>">
-            <% @collection.each do |return_authorization_reason| %>
-              <tr id="<%= spree_dom_id return_authorization_reason %>" data-controller="row-link">
-                <td class="w-40 align-center cursor-pointer" data-action="click->row-link#openLink">
-                  <%= return_authorization_reason.name %>
-                </td>
-                <td class="w-20 align-center cursor-pointer" data-action="click->row-link#openLink">
-                  <%= active_badge(
-                    return_authorization_reason.active,
-                    label: Spree.t(return_authorization_reason.active? ? :active : :inactive),
-                  ) %>
-                </td>
-                <td class="actions w-10">
-                  <% if return_authorization_reason.mutable? %>
-                    <%= if can? :edit, return_authorization_reason
-                      link_to_edit(return_authorization_reason, no_text: true, data: { row_link_target: :link })
-                    end %>
-                  <% end %>
-                </td>
-              </tr>
-            <% end %>
-          </tbody>
-        </table>
-      </div>
-    <% else %>
-      <%= render "spree/admin/shared/no_resource_found" %>
-    <% end %>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render "spree/admin/shared/no_resource_found" %>
+  <% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_return_authorizations_path, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
 

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

@@ -17,14 +17,5 @@
     </table>
   </div>
 <% else %>
-  <div
-    class="
-      text-muted p-5 d-flex align-items-center w-100 justify-content-center
-    "
-  >
-    <%= Spree.t(
-      :no_resource_found,
-      resource: plural_resource_name(Spree::ReturnAuthorization),
-    ) %>.
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
 <% end %>

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

@@ -2,7 +2,7 @@
   <%= Spree.t(:return_authorizations) %>
 <% end %>
 
-<div class="card-lg p-0">
+<div class="card-lg">
   <%= render "spree/admin/return_authorizations/filters" %>
   <%= render "spree/admin/return_authorizations/list" %>
 

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

@@ -2,5 +2,5 @@
   <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
-<% end %>
+</div>
 

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

@@ -3,30 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_role_link' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_role), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::Role %>
 
-<% if @roles.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:role_id) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @roles.each do |role| %>
-          <tr id="<%= spree_dom_id role %>">
-            <td><%= role.name %></td>
-            <td class="actions">
-              <%= link_to_edit(role, no_text: true) if can? :edit, role %>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:role_id) %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |role| %>
+            <tr id="<%= spree_dom_id role %>">
+              <td><%= role.name %></td>
+              <td class="actions">
+                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -2,18 +2,17 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :bulk_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-muted" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
           </div>
         </div>
-        <div class="modal-footer d-flex justify-content-between">
-          <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t(:close) %></button>
-          <button type="button" class="btn btn-primary" disabled="disabled"><%= Spree.t(:save_changes) %></button>
+        <div class="modal-footer">
+          <%= modal_discard_button %>
+          <button type="button" class="btn btn-primary" disabled="disabled">
+            <%= Spree.t('actions.save') %>
+          </button>
         </div>
       </div>
     <% end %>

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

@@ -0,0 +1,6 @@
+<div class="form-actions">
+  <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+    <%= icon("search") %>
+    <%= Spree.t(:filter_results) %>
+  <% end %>
+</div>

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

@@ -2,10 +2,7 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :dialog_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-light mx-auto my-5" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
@@ -20,10 +17,7 @@
   <div class="modal-dialog modal-dialog-centered modal-lg">
     <%= turbo_frame_tag :dialog_modal_lg do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center" style="min-height: 200px">
           <div class="spinner-border text-light" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>

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

@@ -1,9 +1,6 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <div class="modal-content" data-controller="search-picker">
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(Spree.t(:add_products)) %>
     <div class="modal-body border-bottom">
       <%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %>
         <%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %>
@@ -19,6 +16,7 @@
         </div>
       </div>
       <div class="modal-footer border-top">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
       </div>
     <% end %>

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

@@ -2,5 +2,5 @@
 
 <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
   <%= Spree.t(:no_resource_found, resource: resource_name) %>
-  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-light ml-3' if can?(:create, model_class) && defined?(new_object_url) %>
+  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-light ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %>
 </div>

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

@@ -5,16 +5,7 @@
 <% if image.present? && image.attached? && image.variable? %>
   <% alt ||= image.alt || object.name %>
   <div class="admin-product-image-container">
-    <%= image_tag(
-          main_app.cdn_image_url(
-            image.variant(
-              spree_image_variant_options(resize_to_fill: [width * 2, height * 2])
-            )
-          ),
-          width: width,
-          height: height,
-          alt: alt
-    ) %>
+    <%= spree_image_tag(image, width: width, height: height, alt: alt) %>
   </div>
 <% else %>
   <%= render 'spree/admin/shared/no_image', width: width, height: height %>

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

@@ -1,4 +1,4 @@
-<div class="table-responsive card-lg p-0">
+<div class="table-responsive card-lg">
   <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
     <thead class="text-muted">
       <tr data-hook="refunds_header" class="border-bottom">

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

@@ -16,7 +16,7 @@
       <% end %>
 
       <% if can?(:manage, :checkouts) %>
-        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path, active: params[:controller] == 'checkouts') %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
       <% end %>
 
       <%= render_admin_partials(:store_orders_nav_partials) %>