spree_admin 5.0.0 → 5.0.2

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

@@ -16,6 +16,7 @@ module Spree
 
       # the per_page_dropdown is used on index pages like orders, products, promotions etc.
       # this method generates the select_tag
+      # @return [String]
       def per_page_dropdown
         per_page_default = if @products
                              Spree::Admin::RuntimeConfig.admin_products_per_page
@@ -48,6 +49,8 @@ module Spree
 
       # helper method to create proper url to apply per page ing
       # fixes https://github.com/spree/spree/issues/6888
+      # @param per_page [Integer] the number of items per page
+      # @return [Hash] the params to apply per page
       def per_page_dropdown_params(per_page)
         args = params.permit!.to_h.clone
         args.delete(:page)
@@ -56,6 +59,12 @@ module Spree
         args
       end
 
+      # render a button link to edit a resource
+      # if the current user doesn't have permission to update the resource, the button will not be rendered
+      # @param resource [Spree::Product, Spree::User, Spree::Order] the resource to edit
+      # @param options [Hash] the options for the link
+      # @option options [String] :url the url to edit the resource (optional)
+      # @return [String] the link to edit the resource
       def link_to_edit(resource, options = {})
         url = options[:url] || edit_object_url(resource)
         options[:data] ||= {}
@@ -64,6 +73,12 @@ module Spree
         link_to_with_icon('pencil', Spree.t(:edit), url, options) if can?(:update, resource)
       end
 
+      # render a button to delete a resource with a confirmation modal
+      # if the current user doesn't have permission to destroy the resource, the button will not be rendered
+      # @param resource [Spree::Product, Spree::User, Spree::Order] the resource to delete
+      # @param options [Hash] the options for the link
+      # @option options [String] :url the url to delete the resource (optional)
+      # @return [String] the link to delete the resource
       def link_to_delete(resource, options = {})
         url = options[:url] || object_url(resource)
         name = options[:name] || Spree.t('actions.destroy')
@@ -81,6 +96,12 @@ module Spree
         end
       end
 
+      # renders a link with an icon
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param text [String] the text of the link
+      # @param url [String] the url of the link
+      # @param options [Hash] the options for the link
+      # @return [String] the link with the icon
       def link_to_with_icon(icon_name, text, url, options = {})
         options[:class] ||= (options[:class].to_s + " with-tip").strip
         options[:title] ||= text if options[:no_text]
@@ -95,6 +116,12 @@ module Spree
         link_to(text.html_safe, url, options)
       end
 
+      # renders an active link with an icon, using the active_link_to method from https://github.com/comfy/active_link_to gem
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param text [String] the text of the link
+      # @param url [String] the url of the link
+      # @param options [Hash] the options for the link
+      # @return [String] the active link with the icon
       def active_link_to_with_icon(icon_name, text, url, options = {})
         options[:class] = (options[:class].to_s + " with-tip").strip
         options[:title] = text if options[:no_text]
@@ -109,7 +136,13 @@ module Spree
         active_link_to(text.html_safe, url, options)
       end
 
+      # renders a button with an icon (optional)
       # Override: Add disable_with option to prevent multiple request on consecutive clicks
+      # @param text [String] the text of the button
+      # @param icon_name [String] the name of the icon, eg: 'pencil', see: https://tabler.io/icons
+      # @param button_type [String] the type of the button, eg: 'submit', 'button'
+      # @param options [Hash] the options for the button
+      # @return [String] the button with the icon
       def button(text, icon_name = nil, button_type = 'submit', options = {})
         if icon_name
           text = "#{icon(icon_name, class: "icon icon-#{icon_name}")} #{text}"
@@ -128,6 +161,8 @@ module Spree
       end
 
       def button_link_to(text, url, html_options = {})
+        Spree::Deprecation.warn("button_link_to is deprecated. Use standard link_to instead.")
+
         if html_options[:method] &&
             !html_options[:method].to_s.casecmp('get').zero? &&
             !html_options[:remote]
@@ -149,6 +184,10 @@ module Spree
         end
       end
 
+      # renders a badge (active/inactive)
+      # @param condition [Boolean] the condition to check
+      # @param options [Hash] the options for the badge
+      # @return [String] the badge with the icon
       def active_badge(condition, options = {})
         label = options[:label]
         label ||= condition ? Spree.t(:say_yes) : Spree.t(:say_no)
@@ -161,6 +200,11 @@ module Spree
         end
       end
 
+      # renders a back button to the previous page
+      # @param default_url [String] the default url to go back to
+      # @param object [Spree::Product, Spree::User, Spree::Order] the object list to go back to
+      # @param label [String] the label of the back button (optional)
+      # @return [String] the back button
       def page_header_back_button(default_url, object = nil, label = nil)
         url = default_url
 
@@ -175,10 +219,15 @@ module Spree
         end
       end
 
+      # renders an external link with an icon (eg. spree documentation website)
+      # @param label [String] the label of the link
+      # @param url [String] the url of the link
+      # @param opts [Hash] the options for the link
+      # @return [String] the external link with the icon
       def external_link_to(label, url, opts = {}, &block)
         opts[:target] ||= :blank
         opts[:rel] ||= :nofollow
-        opts[:class] ||= "d-inline-flex align-items-center text-blue"
+        opts[:class] ||= "d-inline-flex align-items-center text-blue text-decoration-none"
 
         if block_given?
           link_to url, opts, &block
@@ -189,6 +238,32 @@ module Spree
         end
       end
 
+      # renders a link to preview a resource on the storefront using the spree_storefront_resource_url helper
+      # @param resource [Spree::Product, Spree::Post] the resource to preview
+      # @param options [Hash] the options for the link
+      # @return [String] the link to preview the resource
+      def external_page_preview_link(resource, options = {})
+        resource_name = options[:name] || resource.class.name.demodulize
+
+        url = if [Spree::Product, Spree::Post].include?(resource.class)
+                spree_storefront_resource_url(resource, preview_id: resource.id)
+              else
+                spree_storefront_resource_url(resource)
+              end
+
+        link_to_with_icon(
+          'eye',
+          Spree.t('admin.utilities.preview', name: resource_name),
+          url,
+          class: 'text-left dropdown-item', id: "adminPreview#{resource_name}", target: :blank, data: { turbo: false }
+        )
+      end
+
+      # renders a help bubble with an icon
+      # @param text [String] the text of the help bubble
+      # @param placement [String] the placement of the help bubble
+      # @param css [String] the css class of the help bubble
+      # @return [String] the help bubble with the icon
       def help_bubble(text = '', placement = 'bottom', css: nil)
         css ||= 'text-muted'
         content_tag :small, icon('info-square-rounded', class: css), data: { placement: placement }, class: "with-tip #{css}", title: text

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

@@ -69,25 +69,6 @@ module Spree
         end
       end
 
-      # Renders all the extension partials that may have been specified in the extensions
-      def event_links(order, events)
-        links = []
-        events.each do |event|
-          next unless order.send("can_#{event}?")
-
-          label = Spree.t(event, scope: 'admin.order.events', default: Spree.t(event))
-          links << button_link_to(
-            label.capitalize,
-            [event.to_sym, :admin, order],
-            method: :put,
-            icon: event.to_s + '.svg',
-            data: { turbo_confirm: Spree.t(:order_sure_want_to, event: label) },
-            class: 'btn-light'
-          )
-        end
-        safe_join(links, ''.html_safe)
-      end
-
       def line_item_shipment_price(line_item, quantity)
         Spree::Money.new(line_item.price * quantity, currency: line_item.currency)
       end

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/slug_form_controller.js

@@ -10,8 +10,5 @@ export default class extends Controller {
     const name = this.nameTarget.value
     const url = name.toLowerCase().replace(/[^a-z0-9]+/g, '-').replace(/(^-|-$)+/g, '')
     this.urlTarget.value = url
-
-    // TODO: do ajax call and check if url is available
-    // if not, append a number to the end to make it unique
   }
 }

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/javascript/spree/admin/helpers/bootstrap.js

@@ -4,11 +4,11 @@ import { lockScroll, unlockScroll } from 'spree/core/helpers/scroll_lock'
 
 
 const initTooltips = () => {
-  $('.with-tip').each(function() {
+  $('.with-tip, .trix-button').each(function() {
     $(this).tooltip()
   })
 
-  $('.with-tip').on('show.bs.tooltip', function(event) {
+  $('.with-tip, .trix-button').on('show.bs.tooltip', function(event) {
     if (('ontouchstart' in window)) {
       event.preventDefault()
     }
@@ -16,7 +16,7 @@ const initTooltips = () => {
 }
 
 const removeTooltips = () => {
-  $('.with-tip').each(function() {
+  $('.with-tip, .trix-button').each(function() {
     $(this).tooltip('dispose')
   })
 }

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

@@ -0,0 +1,13 @@
+<%= content_for :title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<%= content_for :page_title do %>
+  <%= Spree.t(:forbidden) %>
+<% end %>
+
+<p class="text-danger">
+  <%= Spree.t(:forbidden_message) %>
+</p>
+
+<%= link_to Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn btn-primary' %>

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 %>