spree_admin 5.0.0 → 5.0.1

data/app/helpers/spree/admin/stores_helper.rb

@@ -1,6 +1,8 @@
 module Spree
   module Admin
     module StoresHelper
+      include Spree::ImagesHelper
+
       def available_stores
         @available_stores ||= Spree::Store.accessible_by(current_ability)
       end
@@ -18,31 +20,9 @@ module Spree
 
         Rails.cache.fetch(["#{store.cache_key_with_version}/admin_icon", opts.to_param]) do
           if store.logo&.attached? && store.logo&.variable?
-            image_tag(
-              main_app.cdn_image_url(
-                store.logo.variant(
-                  spree_image_variant_options(
-                    resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                  )
-                )
-              ),
-              class: opts[:class],
-              width: opts[:width],
-              height: opts[:height]
-            )
+            spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
           elsif store.favicon_image&.attached? && store.favicon_image&.variable?
-            image_tag(
-              main_app.cdn_image_url(
-                store.favicon_image.variant(
-                  spree_image_variant_options(
-                    resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                  )
-                )
-              ),
-              class: opts[:class],
-              width: opts[:width],
-              height: opts[:height]
-            )
+            spree_image_tag(store.favicon_image, class: opts[:class], width: opts[:width], height: opts[:height])
           else
             first_letter_icon(store.name, opts)
           end
@@ -65,16 +45,7 @@ module Spree
         opts.merge!(options)
 
         if store.is_a?(Spree::Store) && store.logo&.attached? && store.logo&.variable?
-          image_tag(
-            main_app.cdn_image_url(
-              store.logo.variant(
-                spree_image_variant_options(
-                  resize_to_fill: [opts[:width] * 2, opts[:height] * 2]
-                )
-              )
-            ),
-            opts
-          )
+          spree_image_tag(store.logo, class: opts[:class], width: opts[:width], height: opts[:height])
         else
           initials = store.name.split.map(&:first).join.upcase
           content_tag(:div, initials, class: "avatar rounded with-tip bg-light",

data/app/javascript/spree/admin/controllers/variants_form_controller.js

@@ -587,6 +587,12 @@ export default class extends CheckboxSelectAll {
     }
 
     keys.forEach((key) => {
+      const idInput = document.createElement('input')
+      idInput.type = 'hidden'
+      idInput.name = `product[variants_attributes][${i}][options][][id]`
+      idInput.value = Object.entries(this.optionsValue).find((option) => option[1].name === key)?.[0]
+      inputs.push(idInput)
+
       const nameInput = document.createElement('input')
       nameInput.type = 'hidden'
       nameInput.name = `product[variants_attributes][${i}][options][][name]`

data/app/views/active_storage/_upload_form.html.erb

@@ -18,14 +18,10 @@
          data-action="click->active-storage-upload#open"
     >
       <% if form.object.send(field_name).attached? && form.object.send(field_name).variable? %>
-        <%= image_tag(
-          main_app.cdn_image_url(
-            form.object.send(field_name).variant(
-              spree_image_variant_options(
-                resize_to_fill: [width, (crop ? height : nil)]
-              )
-            )
-          ),
+        <%= spree_image_tag(
+          form.object.send(field_name),
+          width: width,
+          height: height,
           class: 'img-fluid rounded-lg',
           data: { active_storage_upload_target: 'thumb' },
           loading: :lazy

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

@@ -1,11 +1,6 @@
 <%= turbo_frame_tag :dialog_modal_lg do %>
-  <div class="modal-content" >
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel">
-        <%= Spree.t(:edit) %> <%= Spree.t(:image) %>
-      </h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+  <div class="modal-content">
+    <%= modal_header(Spree.t(:edit) + ' ' + Spree.t(:image)) %>
     <%= form_with model: @asset, url: spree.admin_asset_path(@asset), method: :put, scope: :asset do |f| %>
       <div class="modal-body pb-0" data-turbo-permanent id="asset-<%= @asset.key.parameterize %>">
         <%= render 'active_storage/upload_form', form: f, field_name: :attachment, width: 200, height: 200, can_delete: false %>
@@ -16,7 +11,7 @@
           <%= f.text_area :alt, rows: 4, class: 'form-control' %>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between">
+      <div class="modal-footer">
         <%= turbo_save_button_tag %>
         <%= link_to Spree.t('actions.destroy'), object_url(@asset),
             data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: '_top' },

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

@@ -2,8 +2,8 @@
 
 <div class="row">
   <div class="col-12 col-lg-8">
-    <div class="card-lg p-0">
-      <%= search_form_for [:admin, @promotion, @search], class: "filter-wrap border-bottom" do |f| %>
+    <div class="card-lg">
+      <%= search_form_for [:admin, @promotion, @search], class: "filter-wrap" do |f| %>
         <div class="d-flex flex-column flex-lg-row gap-2">
           <%= render 'spree/admin/shared/filters_search_bar', param: :code_eq %>
 
@@ -54,13 +54,11 @@
             </tbody>
           </table>
         <% 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::CouponCode)) %>
-          </div>
+          <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
         <% end %>
       </div>
 
-      <%= render 'spree/admin/shared/index_table_options', collection: @coupon_codes, simple: true if @coupon_codes.any? %>
+      <%= render 'spree/admin/shared/index_table_options', collection: @coupon_codes if @coupon_codes.any? %>
     </div>
   </div>
 

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

@@ -8,7 +8,7 @@
 
           <% unless entri_enabled? %>
             <th>Default</th>
-            <th class="actions"></th>
+            <th></th>
           <% end %>
         </tr>
       </thead>

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

@@ -5,7 +5,7 @@
   <%= Spree.t(:domains) %>
 <% end %>
 
-<div class="card-lg">
+<div class="card-lg p-4">
   <h5 class="mb-3">Internal URL</h5>
   <div class="row mb-4">
     <div class="col-lg-4">

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

@@ -5,9 +5,9 @@
 <% content_for :page_title do %>
   <%= Spree.t(:customer_returns) %>
 <% end %>
-<div class="card-lg p-0">
 
-  <%= search_form_for [:admin, @search], url: spree.admin_customer_returns_path, 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], url: spree.admin_customer_returns_path, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
     <%= render "spree/admin/shared/filters_search_bar",
     param: :number_cont,
     label: Spree.t(:number) %>
@@ -37,21 +37,8 @@
         </tbody>
       </table>
     </div>
+    <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
   <% 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::CustomerReturn),
-      ) %>
-    </div>
+    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
   <% end %>
-
-  <%= render partial: "spree/admin/shared/index_table_options",
-  locals: {
-    collection: @collection,
-  } %>
 </div>

data/app/views/spree/admin/dashboard/_setup_progress.html.erb

@@ -2,12 +2,14 @@
   <div class="card-body">
     <div class="mb-3">
       Your overall setup progress
-      <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'light' %>">
+      <span class="float-right badge badge-<%= current_store.setup_completed? ? 'success' : 'info' %>">
         <% if current_store.setup_completed? %>
           <%= icon('check', class: 'text-success') %>
         <% end %>
 
-        <%= current_store.setup_tasks_done %> of <%= current_store.setup_tasks_total %> steps done
+        <span>
+          <strong><%= current_store.setup_tasks_done %></strong> of <%= current_store.setup_tasks_total %> steps done
+        </span>
       </span>
     </div>
     <div class="progress">

data/app/views/spree/admin/dashboard/show.html.erb

@@ -17,7 +17,7 @@
         <%= render 'spree/admin/shared/calendar_range_picker',
           date_from_value: params[:date_from] || 1.month.ago.beginning_of_month,
           date_to_value: params[:date_to] || 1.month.ago.end_of_month,
-          css_classes: "btn btn-sm border hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
+          css_classes: "btn btn-sm border rounded-lg hover-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
       <% end %>
     </div>
     <%= render 'analytics' %>

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

@@ -6,7 +6,7 @@
       <% end %>
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:size) %></th>
-      <th class="actions"></th>
+      <th></th>
     </tr>
   </thead>
   <tbody>

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

@@ -1,20 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for :digital_asset, url: spree.admin_product_digital_asset_path(@product, @digital_asset), method: :put do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= @digital_asset.attachment.filename %></h5>
-        <button
-          type="button"
-          class="btn-close"
-          data-dismiss="modal"
-          aria-label="<%= Spree.t(:close) %>"
-        />
-      </div>
+      <%= modal_header(@digital_asset.attachment.filename) %>
       <div class="modal-body">
         <%= render "spree/admin/digital_assets/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 Spree.t("actions.save"), data: { turbo_frame: :_top } %>
       </div>
     </div>

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

@@ -1,20 +1,12 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <%= form_for :digital_asset, url: spree.admin_product_digital_assets_path(@product) do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_digital_asset) %></h5>
-        <button
-          type="button"
-          class="btn-close"
-          data-dismiss="modal"
-          aria-label="<%= Spree.t(:close) %>"
-        />
-      </div>
+      <%= modal_header(Spree.t(:new_digital_asset)) %>
       <div class="modal-body">
         <%= render "spree/admin/digital_assets/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 Spree.t("actions.save"), data: { turbo_frame: :_top } %>
       </div>
     </div>

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

@@ -1,30 +1,28 @@
 <%= render 'spree/admin/shared/audit_nav' %>
 
-<% if @collection.present? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:number) %></th>
-          <th class="text-center"><%= Spree.t(:kind) %></th>
-          <th class="text-center"><%= Spree.t(:status) %></th>
-          <th><%= Spree.t(:user) %></th>
-          <th><%= Spree.t(:filename) %></th>
-          <th><%= Spree.t(:date) %></th>
-          <th><%= Spree.t(:size) %></th>
-          <th class="text-center"><%= Spree.t(:download) %></th>
-        </tr>
-      </thead>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:number) %></th>
+            <th class="text-center"><%= Spree.t(:kind) %></th>
+            <th class="text-center"><%= Spree.t(:status) %></th>
+            <th><%= Spree.t(:user) %></th>
+            <th><%= Spree.t(:filename) %></th>
+            <th><%= Spree.t(:date) %></th>
+            <th><%= Spree.t(:size) %></th>
+            <th class="text-center"><%= Spree.t(:download) %></th>
+          </tr>
+        </thead>
         <tbody>
-          <%= render partial: 'export', collection: @exports, cached: true %>
+          <%= render partial: 'export', collection: @collection, cached: true %>
         </tbody>
       </table>
+      <%= render 'spree/admin/shared/index_table_options', collection: @collection %>
     </div>
-  </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(model_class)) %>
-  </div>
-<% end %>
-
-<%= render 'spree/admin/shared/index_table_options', collection: @imports, simple: true if @imports.present? %>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
+  <% end %>
+</div>

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

@@ -3,13 +3,7 @@
     <%= f.hidden_field :type %>
     <%= f.hidden_field :search_params %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel">
-          <%= Spree.t(:export) %>
-          <%= plural_resource_name(@export.model_class) %>
-        </h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-      </div>
+      <%= modal_header(Spree.t(:export) + ' ' + plural_resource_name(@export.model_class)) %>
       <div class="modal-body">
         <%= render 'spree/admin/shared/error_messages', target: @export %>
         <div class="custom-control custom-radio">
@@ -33,8 +27,8 @@
           <% end %>
         </div>
       </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 Spree.t(:export), class: 'btn btn-primary' %>
       </div>
     </div>

data/app/views/spree/admin/line_items/new.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_variant) %></h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(Spree.t(:add_variant)) %>
     <div class="modal-body border-bottom">
       <%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>
         <%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %>
@@ -20,7 +17,7 @@
           </p>
         </div>
       </div>
-      <div class="modal-footer d-flex justify-content-between border-top">
+      <div class="modal-footer border-top">
         <div class="d-flex gap-2 m-0 align-items-center">
           <%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
           <%= form.number_field :quantity, class: "form-control", min: 1 %>

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

@@ -3,7 +3,7 @@
 <%= content_for(:title, Spree.t('admin.oauth_applications.list')) %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-primary", icon: 'plus' %>
+  <%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::OauthApplication %>
 
 <%= content_for :page_alerts do %>
@@ -15,61 +15,60 @@
   </div>
 <% end %>
 
-<% if @oauth_applications.any? %>
-  <div class="table-responsive rounded border mt-4 bg-white">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:name) %></th>
-          <th>Client ID</th>
-          <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
-          <th><%= Spree.t('admin.oauth_applications.last_used') %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @oauth_applications.each do |application| %>
-          <tr id="<%= spree_dom_id application %>">
-            <td class="w-20"><code><%= application.name %></code></td>
-            <td class="w-40">
-              <div class="input-group" data-controller="password-toggle">
-                <%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
-                  <%= icon 'eye', class: 'mr-0' %>
-                <% end %>
-                <%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
-              </div>
-            </td>
-            <td class="w-15">
-              <% if application.scopes.include?('write') %>
-                <span class="badge badge-warning">
-                  <%= icon('pencil', class: 'mr-1') %>
-                  <%= Spree.t('admin.oauth_applications.read_and_write') %>
-                </span>
-              <% else %>
-                <span class="badge badge-light">
-                  <%= icon('eye', class: 'mr-1') %>
-                  <%= Spree.t('admin.oauth_applications.read_only') %>
-                </span>
-              <% end %>
-            </td>
-            <td class="w-15">
-              <% if application.last_used_at %>
-                <%= local_time(application.last_used_at) %>
-              <% else %>
-                <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
-              <% end %>
-            </td>
-            <td class="actions w-10">
-              <%= link_to_edit(application, no_text: true) if can? :edit, application %>
-            </td>
+<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>Client ID</th>
+            <th><%= Spree.t('admin.oauth_applications.scopes') %></th>
+            <th><%= Spree.t('admin.oauth_applications.last_used') %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </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: 'API keys') %>
-    <%= link_to_with_icon('plus', Spree.t(:add_one), new_object_url, class: 'btn btn-link ml-3') if can? :create, Spree::OauthApplication %>
-  </div>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |application| %>
+            <tr id="<%= spree_dom_id application %>">
+              <td class="w-20"><code><%= application.name %></code></td>
+              <td class="w-40">
+                <div class="input-group" data-controller="password-toggle">
+                  <%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
+                    <%= icon 'eye', class: 'mr-0' %>
+                  <% end %>
+                  <%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
+                </div>
+              </td>
+              <td class="w-15">
+                <% if application.scopes.include?('write') %>
+                  <span class="badge badge-warning">
+                    <%= icon('pencil', class: 'mr-1') %>
+                    <%= Spree.t('admin.oauth_applications.read_and_write') %>
+                  </span>
+                <% else %>
+                  <span class="badge badge-light">
+                    <%= icon('eye', class: 'mr-1') %>
+                    <%= Spree.t('admin.oauth_applications.read_only') %>
+                  </span>
+                <% end %>
+              </td>
+              <td class="w-15">
+                <% if application.last_used_at %>
+                  <%= local_time(application.last_used_at) %>
+                <% else %>
+                  <span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
+                <% end %>
+              </td>
+              <td class="actions w-10">
+                <%= link_to_edit(application, no_text: true) if can? :edit, application %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found', resource_name: 'API keys' %>
+  <% end %>
+</div>

data/app/views/spree/admin/option_types/_filter.html.erb

@@ -1,4 +1,4 @@
-<%= search_form_for [:admin, @search], class: "filter-wrap border-bottom", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= 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" %>

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

@@ -3,11 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <span id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type),
-    new_object_url,
-    { class: "btn-primary", icon: "plus", id: "new_option_type_link" } %>
-  </span>
+  <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>
 <% end if can?(:create, Spree::OptionType) %>
 
 <%= content_for(:page_alerts) do %>
@@ -17,12 +13,8 @@
   </div>
 <% end %>
 
-<div id="new_option_type"></div>
-
-<div class="card-lg p-0">
-
+<div class="card-lg">
   <%= render partial: "spree/admin/option_types/filter" %>
-
   <% if @option_types.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_option_types">
@@ -44,7 +36,7 @@
             <th>
               <%= Spree.t(:products) %>
             </th>
-            <th class="actions"></th>
+            <th></th>
           </tr>
         </thead>
         <tbody
@@ -61,3 +53,7 @@
     <%= render "spree/admin/shared/no_resource_found" %>
   <% end %>
 </div>
+
+<p class="documentation-link-container">
+  <%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>
+</p>

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

@@ -2,7 +2,7 @@
 
 <%= search_form_for [:admin, @vendor || @user, @search],
   url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
-  class: "filter-wrap border-bottom",
+  class: "filter-wrap",
   data: {
     controller: "filters reveal",
     reveal_hidden_class: "d-none",
@@ -92,12 +92,7 @@
       <%= render_admin_partials(:orders_filters_partials, f: f) %>
     </div>
 
-    <div class="form-actions">
-      <%= turbo_save_button_tag Spree.t(:filter_results) do %>
-        <%= icon("search") %>
-        <%= Spree.t(:filter_results) %>
-      <% end %>
-    </div>
+    <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 
   <%= render "spree/admin/shared/filter_badge_template" %>

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

@@ -23,8 +23,6 @@
     </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::Order)) %>
-  </div>
+  <%= 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, simple: true if @orders.any? %>
+<%= render 'spree/admin/shared/index_table_options', collection: @orders if @orders.any? %>

data/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb

@@ -1,10 +1,7 @@
 <%= turbo_stream.update :dialog_modal do %>
   <%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
     <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_billing_address) %></h5>
-        <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
-      </div>
+      <%= modal_header(Spree.t(:new_billing_address)) %>
       <div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
         <div>
           <% if @order.shipping_address.present? %>
@@ -26,8 +23,8 @@
         </div>
         <%= render 'form', address: @address, 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 Spree.t('actions.save') %>
       </div>
     </div>