spree_admin 5.2.0.rc2 → 5.2.0.rc3

data/app/controllers/spree/admin/stock_items_controller.rb

@@ -11,18 +11,15 @@ module Spree
         true
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
+      def scope
+        super.joins(:variant).where(spree_variants: { track_inventory: true }).merge(current_store.variants.eligible).reorder('')
+      end
 
-        @search = super.accessible_by(current_ability, :update).ransack(params[:q])
-        @stock_items = @search.result.
-                       joins(:variant).
-                       where(spree_variants: { track_inventory: true }).
-                       merge(current_store.variants.eligible).
-                       includes(:stock_location, [variant: [product: [variants: [:images], master: [:images]], images: []]]).
-                       page(params[:page]).
-                       per(params[:per_page])
+      def collection_includes
+        {
+          stock_location: [],
+          variant: [option_values: :option_type, product: [variant_images: [], variants: [:images], master: [:images]], images: []]
+        }
       end
 
       def add_breadcrumbs

data/app/controllers/spree/admin/stock_locations_controller.rb

@@ -15,7 +15,7 @@ module Spree
 
       private
 
-      def collection
+      def scope
         super.order_default
       end
 

data/app/controllers/spree/admin/stock_transfers_controller.rb

@@ -15,16 +15,6 @@ module Spree
         spree.admin_stock_transfer_path(@object)
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
-        @search = super.accessible_by(current_ability, :index).ransack(params[:q])
-        @stock_transfers = @search.result.
-                           page(params[:page]).
-                           per(params[:per_page])
-      end
-
       def permitted_resource_params
         params.require(:stock_transfer).permit(permitted_stock_transfer_attributes)
       end

data/app/controllers/spree/admin/store_credits_controller.rb

@@ -2,18 +2,10 @@ module Spree
   module Admin
     class StoreCreditError < StandardError; end
 
-    class StoreCreditsController < Spree::Admin::BaseController
-      before_action :load_user
-      before_action :load_store_credit, only: [:new, :edit, :update, :destroy]
+    class StoreCreditsController < Spree::Admin::ResourceController
+      before_action :set_breadcrumbs
+      before_action :set_user
       before_action :ensure_unused_store_credit, only: [:update]
-      helper_method :collection_url
-
-      def index
-        @store_credits = scope.includes(:created_by).order(created_at: :desc)
-        @store_credits = @store_credits.page(params[:page]).per(params[:per_page])
-
-        @collection = @store_credits
-      end
 
       def show
         @store_credit = scope.find(params[:id])
@@ -21,8 +13,8 @@ module Spree
       end
 
       def create
-        @store_credit = @user.store_credits.build(
-          permitted_store_credit_params.merge(
+        @store_credit = parent.store_credits.build(
+          permitted_resource_params.merge(
             created_by: try_spree_current_user,
             action_originator: try_spree_current_user,
             store: current_store
@@ -31,7 +23,7 @@ module Spree
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_created)
-          redirect_to spree.admin_user_path(@user)
+          redirect_to spree.admin_user_path(parent)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_create')
           render :new, status: :unprocessable_entity
@@ -39,11 +31,11 @@ module Spree
       end
 
       def update
-        @store_credit.assign_attributes(permitted_store_credit_params)
+        @store_credit.assign_attributes(permitted_resource_params)
 
         if @store_credit.save
           flash[:success] = flash_message_for(@store_credit, :successfully_updated)
-          redirect_to spree.admin_user_store_credit_path(@user, @store_credit)
+          redirect_to spree.admin_user_store_credit_path(parent, @store_credit)
         else
           flash[:error] = Spree.t('store_credit.errors.unable_to_update')
           render :edit, status: :unprocessable_entity
@@ -59,37 +51,41 @@ module Spree
           flash[:error] = Spree.t('store_credit.errors.unable_to_delete')
         end
 
-        redirect_to spree.admin_user_path(@user)
+        redirect_to spree.admin_user_path(parent)
       end
 
       protected
 
-      def permitted_store_credit_params
-        params.require(:store_credit).permit(permitted_store_credit_attributes)
+      def parent
+        @parent ||= Spree.user_class.find_by(id: params[:user_id])
       end
 
-      private
+      def parent_data
+        {
+          model_name: 'spree/user',
+          model_class: Spree.user_class,
+          find_by: :id
+        }
+      end
 
-      def load_user
-        @user = Spree.user_class.find_by(id: params[:user_id])
+      def permitted_resource_params
+        params.require(:store_credit).permit(permitted_store_credit_attributes)
+      end
 
-        unless @user
-          flash[:error] = Spree.t(:user_not_found)
-          redirect_to spree.admin_path
-        end
+      private
 
-        @breadcrumb_icon = 'users'
-        add_breadcrumb Spree.t(:customers), :admin_users_path
-        add_breadcrumb @user.name, spree.admin_user_path(@user)
+      def set_user
+        @user = parent
       end
 
-      def load_store_credit
-        @store_credit = scope.find_by(id: params[:id]) || scope.new
-        @object = @store_credit
+      def object_url
+        spree.admin_user_store_credit_path(parent, @store_credit)
       end
 
-      def scope
-        current_store.store_credits.where(user: @user)
+      def set_breadcrumbs
+        @breadcrumb_icon = 'users'
+        add_breadcrumb Spree.t(:customers), :admin_users_path
+        add_breadcrumb parent.name, spree.admin_user_path(parent)
       end
 
       def ensure_unused_store_credit
@@ -99,7 +95,11 @@ module Spree
       end
 
       def collection_url
-        spree.admin_user_store_credits_path(@user)
+        spree.admin_user_store_credits_path(parent)
+      end
+
+      def update_turbo_stream_enabled?
+        true
       end
     end
   end

data/app/controllers/spree/admin/taxonomies_controller.rb

@@ -8,16 +8,6 @@ module Spree
 
       private
 
-      def collection
-        return @collection if @collection.present?
-
-        @collection = super
-
-        params[:q] ||= {}
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result.all
-      end
-
       def location_after_save
         spree.admin_taxonomy_path(@taxonomy)
       end

data/app/controllers/spree/admin/themes_controller.rb

@@ -70,8 +70,12 @@ module Spree
         true
       end
 
-      def collection
-        super.without_previews.order(default: :desc).includes(screenshot_attachment: :blob)
+      def scope
+        super.without_previews.order(default: :desc)
+      end
+
+      def collection_includes
+        { screenshot_attachment: :blob }
       end
 
       def permitted_resource_params

data/app/controllers/spree/admin/users_controller.rb

@@ -50,23 +50,13 @@ module Spree
 
       protected
 
-      def collection
-        return @collection if @collection.present?
-
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-        params[:q][:created_at_not_null] ||= 1
-
-        @collection = model_class.accessible_by(current_ability, :index)
-        @search = @collection.ransack(params[:q])
-        @collection = @search.result(distinct: true).
-                      includes(
-                        addresses: [:country, :state],
-                        ship_address: [:country, :state],
-                        bill_address: [:country, :state],
-                        avatar_attachment: :blob
-                      ).
-                      page(params[:page]).per(params[:per_page])
+      def collection_includes
+        {
+          addresses: [:country, :state],
+          ship_address: [:country, :state],
+          bill_address: [:country, :state],
+          avatar_attachment: :blob
+        }
       end
 
       def find_resource

data/app/controllers/spree/admin/webhooks_subscribers_controller.rb

@@ -19,16 +19,6 @@ module Spree
         @resource ||= Spree::Admin::Resource.new 'spree/admin/webhooks/subscribers', 'subscribers', nil
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'created_at desc'
-
-        @search = Webhooks::Subscriber.accessible_by(current_ability).ransack(params[:q])
-        @collection = @search.result.
-                      page(params[:page]).
-                      per(params[:per_page])
-      end
-
       def process_subscriptions
         return if params[:webhooks_subscriber].blank?
 

data/app/controllers/spree/admin/zones_controller.rb

@@ -14,13 +14,6 @@ module Spree
         edit_object_url(@object, states_country_id: @selected_country&.id)
       end
 
-      def collection
-        params[:q] ||= {}
-        params[:q][:s] ||= 'name asc'
-        @search = super.ransack(params[:q])
-        @zones = @search.result.page(params[:page]).per(params[:per_page])
-      end
-
       def load_data
         @selected_country = if params[:states_country_id]
           Spree::Country.find_by(id: params[:states_country_id])

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

@@ -3,7 +3,23 @@ module Spree
     module DropdownHelper
       def dropdown(options = {}, &block)
         options[:class] = ['dropdown'] + Array(options[:class])
-        options[:data] = { controller: 'dropdown' }.merge(options[:data] || {})
+
+        # Extract direction option for backward compatibility and convert to Floating UI placement
+        placement = case options.delete(:direction)
+        when 'left'
+          'bottom-end'
+        when 'top'
+          'top-start'
+        when 'top-left'
+          'top-end'
+        else
+          options[:placement] || 'bottom-start'
+        end
+
+        options[:data] = {
+          controller: 'dropdown',
+          dropdown_placement_value: placement
+        }.merge(options[:data] || {})
         content_tag(:div, options, &block)
       end
 
@@ -19,22 +35,8 @@ module Spree
 
       def dropdown_menu(options = {}, &block)
         options[:class] = ['dropdown-container hidden'] + Array(options[:class])
-
-        # Extract direction option for backward compatibility and convert to Floating UI placement
-        placement = case options.delete(:direction)
-        when 'left'
-          'bottom-end'
-        when 'top'
-          'top-start'
-        when 'top-left'
-          'top-end'
-        else
-          options[:placement] || 'bottom-start'
-        end
-
         options[:data] = {
-          dropdown_target: 'menu',
-          dropdown_placement_value: placement
+          dropdown_target: 'menu'
         }.merge(options[:data] || {})
 
         content_tag(:div, options, &block)

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

@@ -248,7 +248,7 @@ module Spree
         end
 
         link_to url, class: 'd-flex align-items-center text-decoration-none' do
-          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray px-2 d-flex align-items-center') +
+          content_tag(:span, icon('chevron-left', class: 'mr-0'), class: 'btn hover-gray shadow-none px-2 d-flex align-items-center shadow-none') +
             content_tag(:span, label, class: 'font-size-base text-black')
         end
       end

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

@@ -2,6 +2,8 @@ module Spree
   module Admin
     module OrdersFiltersHelper
       def params_to_filters(search_params:, vendor: nil, user: nil)
+        return if search_params.blank?
+
         if search_params.is_a?(String)
           search_params = JSON.parse(search_params).deep_symbolize_keys
         end

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

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

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

@@ -3,7 +3,7 @@
     <table class="table">
       <thead>
         <tr>
-          <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+          <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
           <th scope="col"><%= Spree.t(:active) %>?</th>
           <th scope="col"><%= Spree.t(:default) %>?</th>
           <th scope="col"></th>

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

@@ -4,7 +4,7 @@
       <% if @product.has_variants? %>
         <th scope="col"><%= Spree.t(:variant) %></th>
       <% end %>
-      <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+      <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
       <th scope="col"><%= Spree.t(:size) %></th>
       <th scope="col"></th>
     </tr>

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 <tr>
-  <th scope="col"><%= sort_link search_collection, :name, Spree.t(:name) %></th>
+  <th scope="col"><%= sort_link @search, :name, Spree.t(:name) %></th>
   <th scope="col"><%= Spree.t('admin.oauth_applications.client_id') %></th>
   <th scope="col"><%= Spree.t('admin.oauth_applications.scopes') %></th>
   <th scope="col"><%= Spree.t('admin.oauth_applications.last_used') %></th>

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

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

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

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

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

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