spree_admin 5.1.3 → 5.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edab2a99241e4db5473957b6cc3294ee86cd82c5d5c09b96c1674b88b74570b8
-  data.tar.gz: 8ae3514c6c648be6fd26e42c0bd8811f0dfd2a38a4cb06448791ad1b45e24db8
+  metadata.gz: 8a44b861bdad4ce0d03b3225344461ced14b8dea71fec7a839beca7d19bac3c9
+  data.tar.gz: 7efaca5c31054109ea94d9f867ba0ce820db0fded92e1cc7ddfa5a52763ba645
 SHA512:
-  metadata.gz: 1ce82d6b487a7a5db6e39c32e2b8da9e66a77331e2f79c22a1b402283ab7bb7b8bb105666c76c74c937e8f3a923d630cda21ddd1cd246b2b6ea89e5368ab12e8
-  data.tar.gz: 63efa374a215c5b3ccc8756e2ce0d0dc3397f4896cb899f47d494d3987b7fddf8792e367e28d814f95b6e9279a6b834258a438986f78cb61714a92fbeb49d1a3
+  metadata.gz: 5022e147047a7c8e1bdb0484420a4d7f9a461763974b0d1a4b517e676201fdc801bba89a65bb1b244688bccf2d0e404f04e1cbef517a0366c10b7dde5d417561
+  data.tar.gz: 8291066c622ef1d32385470823dd9b343e58cda7534e3547d3c26ad32c815d922a21225c700f1c23f920a6b2bfd2c7c5a42bda4f5e1c57a0b74eab2467dfdaa0

data/app/assets/stylesheets/spree/admin/components/_variants_form.scss

@@ -27,7 +27,8 @@
     &__option {
       display: flex;
       border-bottom: 1px solid $border-color;
-      padding: 1rem 0rem;
+      padding: 0.5rem 0.5rem 1rem 0;
+      margin-bottom: 0.5rem;
 
       .label {
         margin-bottom: 0.5rem;
@@ -57,6 +58,9 @@
 
       &--new {
         padding-left: calc(1.13px + 3.25rem);
+        border-bottom: none;
+        margin-bottom: 0;
+        padding-bottom: 0.5rem;
 
         .values-inputs {
           display: flex;

data/app/assets/stylesheets/spree/admin/shared/_forms.scss

@@ -186,3 +186,7 @@ turbo-frame.blur-busy[busy] {
     pointer-events: none;
   }
 }
+
+.input-group-text {
+  background-color: transparent;
+}

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

@@ -137,6 +137,12 @@ module Spree
 
         'spree/admin'
       end
+
+      def parse_date_param(date_string)
+        return if date_string.blank?
+
+        date_string.to_date&.in_time_zone(current_timezone)
+      end
     end
   end
 end

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

@@ -9,10 +9,6 @@ module Spree
         spree.admin_custom_domains_path
       end
 
-      def create_turbo_stream_enabled?
-        helpers.entri_enabled?
-      end
-
       def location_after_save
         spree.admin_custom_domains_path
       end

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

@@ -63,12 +63,6 @@ module Spree
         attributes[:date_to] = parse_date_param(attributes[:date_to])&.end_of_day if attributes[:date_to].present?
         attributes
       end
-
-      def parse_date_param(date_string)
-        return if date_string.blank?
-
-        date_string.to_date&.in_time_zone(current_timezone)
-      end
     end
   end
 end

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

@@ -31,6 +31,10 @@ module Spree
       def permitted_resource_params
         params.require(:taxonomy).permit(permitted_taxonomy_attributes)
       end
+
+      def update_turbo_stream_enabled?
+        true
+      end
     end
   end
 end

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

@@ -7,10 +7,16 @@ module Spree
       # @param [String, nil] icon Optional icon name to prepend to the label
       # @param [Boolean, nil] active Whether the link should be marked as active
       # @return [SafeBuffer] The navigation item HTML
-      def nav_item(label, url, icon: nil, active: nil)
+      def nav_item(label = nil, url, icon: nil, active: nil, data: {})
         content_tag :li, class: 'nav-item', role: 'presentation' do
-          label = icon(icon) + label if icon.present?
-          active_link_to label, url, class: 'nav-link', active: active
+          if block_given?
+            active_link_to url, class: 'nav-link', active: active, data: data do
+              yield
+            end
+          else
+            label = icon(icon) + label if icon.present? && label.present?
+            active_link_to label, url, class: 'nav-link', active: active, data: data
+          end
         end
       end
 

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

@@ -3,16 +3,22 @@ import { Controller } from '@hotwired/stimulus'
 export default class extends Controller {
   static targets = ['close', 'save']
 
-  close() {
+  close(event) {
+    // https://github.com/hotwired/stimulus/issues/743
+    if (event.type == "keydown" && !(event instanceof KeyboardEvent)) return
+
     if (this.hasCloseTarget) {
       window.Turbo.visit(this.closeTarget.href)
     }
   }
 
   save(event) {
+    // https://github.com/hotwired/stimulus/issues/743
+    if (event.type == "keydown" && !(event instanceof KeyboardEvent)) return
+
     if (this.hasSaveTarget) {
       event.preventDefault()
       this.saveTarget.click()
     }
   }
-}
+}

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

@@ -38,12 +38,6 @@ export default class extends Controller {
     }
   }
 
-  disconnect() {
-    if (this.select) {
-      this.select.destroy()
-    }
-  }
-
   initTomSelect(options = []) {
     const settings = {
       maxOptions: 1500,

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

@@ -1,5 +1,11 @@
 <%= render 'spree/admin/shared/team_nav' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:admin_users_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:admin_users_header_partials) %>
+
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">

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

@@ -1,5 +1,11 @@
 <%= render 'spree/admin/promotions/header' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:coupon_codes_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:coupon_codes_header_partials) %>
+
 <div class="row">
   <div class="col-12 col-lg-8">
     <div class="card-lg">

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

@@ -4,10 +4,8 @@
     <%= active_badge(custom_domain.active?) %>
   </td>
 
-  <% unless entri_enabled? %>
-    <td><%= active_badge(custom_domain.default?) %></td>
-    <td class="actions">
-      <%= link_to_edit(custom_domain, no_text: true, url: spree.edit_admin_custom_domain_path(custom_domain), data: { turbo: false }) %>
-    </td>
-  <% end %>
+  <td><%= active_badge(custom_domain.default?) %></td>
+  <td class="actions">
+    <%= link_to_edit(custom_domain, no_text: true, url: spree.edit_admin_custom_domain_path(custom_domain), data: { turbo: false }) %>
+  </td>
 </tr>

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

@@ -4,12 +4,9 @@
       <thead>
         <tr>
           <th><%= Spree.t(:name) %></th>
-          <th>Active?</th>
-
-          <% unless entri_enabled? %>
-            <th>Default</th>
-            <th></th>
-          <% end %>
+          <th><%= Spree.t(:active) %>?</th>
+          <th><%= Spree.t(:default) %>?</th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -18,7 +15,5 @@
     </table>
   </div>
 <% else %>
-  <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-    You don't have any custom domains set yet.
-  </div>
+  <%= render 'spree/admin/shared/no_resource_found' %>
 <% end %>

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

@@ -1,46 +1,61 @@
-<% content_for :head do %>
-  <script type="text/javascript" src="https://cdn.goentri.com/entri.js"></script>
-<% end %>
 <%= content_for(:page_title) do %>
   <%= Spree.t(:domains) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:custom_domains_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:custom_domains_header_partials) %>
+
 <div class="card-lg p-4">
   <h5 class="mb-3">Internal URL</h5>
   <div class="row mb-4">
     <div class="col-lg-4">
       <p class="text-muted">
-        This is your internal URL.
+        This is your internal Admin URL.
       </p>
     </div>
     <div class="col-lg-7 offset-lg-1">
-      <%= form_for current_store, url: spree.admin_store_path(current_store), data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %>
-        <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border mb-3 <% if current_store.custom_domains.any? %>disabled<% end %>">
-          <%= f.text_field :code, class: 'form-control-plaintext pl-0',  data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
-          <span>.<%= Spree.root_domain %></span>
-        </div>
-        <% unless current_store.custom_domains.any? %>
-          <%= turbo_save_button_tag Spree.t('actions.update') %>
+      <%= form_for current_store, url: spree.admin_store_path, data: { turbo: false, controller: 'enable-button', 'enable-button-disable-when-not-changed-value': true } do |f| %>
+        <% if Spree.root_domain.present? %>
+          <div class="d-flex align-items-center gap-3">
+            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1 <% if current_store.custom_domains.any? %>disabled<% end %>">
+              <span class="text-muted">https://</span>
+              <%= f.text_field :code, class: 'form-control-plaintext pl-0', data: { enable_button_target: 'input' }, required: true, disabled: current_store.custom_domains.any? %>
+              <span>.<%= Spree.root_domain %></span>
+
+              <%= clipboard_component(current_store.formatted_url) %>
+            </div>
+            <% unless current_store.custom_domains.any? %>
+              <%= turbo_save_button_tag %>
+            <% end %>
+          </div>
+        <% else %>
+          <div class="d-flex align-items-center gap-3">
+            <div class="form-control d-flex align-items-center py-0 focus-shadow focus-border pr-2 gap-1">
+              <span class="text-muted">https://</span>
+              <%= f.text_field :url, class: 'form-control-plaintext pl-0', required: true, data: { enable_button_target: 'input' } %>
+              <%= clipboard_component(current_store.formatted_url) %>
+            </div>
+            <%= turbo_save_button_tag %>
+          </div>
         <% end %>
       <% end %>
     </div>
   </div>
   <hr class="my-5" />
-  <h5>Custom domains</h5>
+  <h5><%= Spree.t(:custom_domains) %></h5>
   <div class="row">
     <div class="col-lg-4">
       <p class="text-muted">
-        Connect your domain or subdomain to your store.
+        Connect your domain or subdomain to your storefront.
       </p>
     </div>
     <div class="col-lg-7 offset-lg-1">
-      <% if entri_enabled? %>
-        <%= render 'setup_domain_entri' %>
-      <% else %>
-        <div class="text-right">
-          <%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %>
-        </div>
-      <% end %>
+      <div class="text-right">
+        <%= link_to Spree.t(:new_domain), spree.new_admin_custom_domain_path, class: "btn btn-primary" %>
+      </div>
 
       <%= turbo_frame_tag 'admin_custom_domains_index' do %>
         <%= render 'custom_domains' %>

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

@@ -6,6 +6,12 @@
   <%= Spree.t(:customer_returns) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:customer_returns_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:customer_returns_header_partials) %>
+
 <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",

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

@@ -4,6 +4,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:digital_assets_actions_partials) %>
   <% if can?(:create, Spree::Digital.new(variant: @product.default_variant)) %>
     <span data-toggle="modal" data-target="#modal">
       <%= link_to_with_icon "plus",
@@ -17,6 +18,8 @@
   <% end %>
 <% end %>
 
+<%= render_admin_partials(:digital_assets_header_partials) %>
+
 <div class="card p-0">
   <div class="card-body p-0">
     <div class="table-responsive" id="<%= dom_id(@product, :digital_assets) %>">

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

@@ -1,5 +1,11 @@
 <%= render 'spree/admin/shared/audit_nav' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:exports_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:exports_header_partials) %>
+
 <div class="card-lg">
   <% if @collection.any? %>
     <div class="table-responsive">

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

@@ -29,6 +29,8 @@
       <%= f.text_field :batch_prefix_eq, class: "form-control", data: {filters_target: :input} %>
     </div>
 
+    <%= render_admin_partials(:gift_cards_filters_partials, f: f) %>
+
     <div class="form-actions">
       <%= turbo_save_button_tag Spree.t(:filter_results) do %>
         <%= icon("search") %>

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

@@ -4,6 +4,7 @@
   <% end %>
 
   <% content_for :page_actions do %>
+    <%= render_admin_partials(:gift_cards_actions_partials) %>
     <%= link_to spree.admin_gift_cards_path(q: params[:q].to_unsafe_hash, per_page: params[:per_page], format: :csv), id: 'gift-card-batch-export-link', class: 'btn btn-light bg-transparent with-tip', title: 'Export gift cards to a CSV file' do %>
       <%= icon 'table-export', class: 'mr-2' %>
       <%= Spree.t(:export) %>
@@ -28,6 +29,8 @@
   <% end %>
 <% end %>
 
+<%= render_admin_partials(:gift_cards_header_partials) %>
+
 <div class="card-lg p-0">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>

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

@@ -2,6 +2,12 @@
   <%= Spree.t(:integrations) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:integrations_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:integrations_header_partials) %>
+
 <div class="row">
   <div class="col-lg-8 offset-lg-2">
     <div class="alert alert-info mb-4">

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

@@ -1,5 +1,11 @@
 <%= render 'spree/admin/shared/team_nav' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:invitations_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:invitations_header_partials) %>
+
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">

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

@@ -1,4 +1,4 @@
-<div class="d-flex align-items-center gap-2">
+<div class="d-flex align-items-center gap-2 mb-4">
   <div>
     <%= render_avatar(@invitation.inviter, height: 32, width: 32) %>
   </div>
@@ -6,4 +6,4 @@
     <strong><%= @invitation.inviter.name %></strong> has invited you to join <strong><%= @invitation.resource.name %></strong>
   </div>
 </div>
-<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary w-100', data: { turbo_method: :put } %>
+<%= link_to Spree.t(:accept), spree.accept_admin_invitation_path(@invitation), class: 'btn btn-primary mx-auto px-5', data: { turbo_method: :put } %>

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

@@ -3,6 +3,7 @@
 <%= content_for(:title, Spree.t('admin.oauth_applications.list')) %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:oauth_applications_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::OauthApplication %>
 
@@ -15,6 +16,8 @@
   </div>
 <% end %>
 
+<%= render_admin_partials(:oauth_applications_header_partials) %>
+
 <div class="card-lg">
   <% if @collection.any? %>
     <div class="table-responsive">

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

@@ -3,6 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:option_types_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>
 <% end if can?(:create, Spree::OptionType) %>
 
@@ -13,6 +14,8 @@
   </div>
 <% end %>
 
+<%= render_admin_partials(:option_types_header_partials) %>
+
 <div class="card-lg">
   <%= render partial: "spree/admin/option_types/filter" %>
   <% if @option_types.any? %>

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

@@ -7,9 +7,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:orders_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order)  %>
 <% end %>
 
+<%= render_admin_partials(:orders_header_partials) %>
+
 <div class="card-lg">
   <% if params[:frame_name].present? %>
     <%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>

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

@@ -2,9 +2,12 @@
   <%= Spree.t(:pages) %>
 <% end %>
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:pages_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:add_new_page), spree.new_admin_page_path, class: "btn btn-primary" if can?(:create, Spree::Page.new) %>
 <% end %>
 
+<%= render_admin_partials(:pages_header_partials) %>
+
 <div class="card-lg">
   <%= render "spree/admin/pages/filters" %>
   <% if @collection.any? %>

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

@@ -2,6 +2,12 @@
   <%= Spree.t(:payment_methods) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:payment_methods_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:payment_methods_header_partials) %>
+
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">

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

@@ -1,8 +1,11 @@
+<%= render 'spree/admin/shared/posts_tabs' %>
+
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:post_categories_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_post_category), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::PostCategory) %>
 <% end %>
 
-<%= render 'spree/admin/shared/posts_tabs' %>
+<%= render_admin_partials(:post_categories_header_partials) %>
 
 <% if @collection.any? %>
   <div class="card-lg">

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

@@ -26,6 +26,7 @@
         </div>
       </div>
     </div>
+    <%= render_admin_partials(:posts_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 

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

@@ -1,10 +1,11 @@
-<% content_for :page_actions do %>
-  <%= render 'extra_actions' %>
+<%= render 'spree/admin/shared/posts_tabs' %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:posts_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_post), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Post) %>
 <% end %>
 
-<%= render 'spree/admin/shared/posts_tabs' %>
+<%= render_admin_partials(:posts_header_partials) %>
 
 <div class="card-lg">
   <%= render "spree/admin/posts/filters" %>

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

@@ -15,10 +15,10 @@
                   <%= sort_link @search,
                   :name,
                   Spree.t(:name),
-                  { 
-                    default_order: "desc", 
-                    title: "admin_products_listing_name_title" 
-                  } 
+                  {
+                    default_order: "desc",
+                    title: "admin_products_listing_name_title"
+                  }
                   %>
                 </th>
                 <th scope="col" class="text-center">
@@ -30,6 +30,8 @@
                   <th scope="col" class="d-vendor"><%= Spree.t(:vendor) %></th>
                 <% end %>
                 <th scope="col"><%= Spree.t(:price) %></th>
+
+                <%= render_admin_partials(:products_table_header_partials) %>
               </tr>
             </thead>
             <tbody>

data/app/views/spree/admin/products/_product.html.erb

@@ -24,4 +24,6 @@
   <td class="w-10 cursor-pointer" data-action="click->row-link#openLink">
     <%= display_admin_price(product) %>
   </td>
+
+  <%= render_admin_partials(:products_table_row_partials, product: product) %>
 </tr>

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

@@ -33,6 +33,7 @@ locals: {
 
 <% content_for :page_title do %>
   <%= render "spree/admin/products/edit_page_title" %>
+  <%= render_admin_partials(:product_page_title_partials, product: @product) %>
 <% end %>
 
 <%= form_for [:admin, @product] do |f| %>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -35,7 +35,7 @@
                   </button>
                 <% end%>
                 <div class="w-100">
-                  <div class="d-flex justify-content-between">
+                  <div class="d-flex justify-content-between align-items-center">
                     <h6 data-slot="optionName"><%= option_type.presentation %></h6>
                     <% if can?(:manage_option_types, @product) %>
                       <button class="btn btn-light btn-sm" type="button" data-action="variants-form#editOption" data-variants-form-option-id-param="<%= option_type.id %>"><%= Spree.t(:edit) %></button>

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

@@ -1,4 +1,13 @@
-<%= render 'index_header' %>
+<% content_for :page_title do %>
+  <%= Spree.t(:products) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:products_actions_partials) %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_product), new_object_url, class: 'btn btn-primary' if can?(:create, Spree::Product) %>
+<% end %>
+
+<%= render_admin_partials(:products_header_partials) %>
 
 <div class="card-lg">
   <% if params[:frame_name].present? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <%= content_for :page_actions do %>
-  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user' %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user', data: { admin_target: 'save' } %>
 <% end %>
 
 <%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>

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

@@ -13,7 +13,7 @@
         </div>
       </div>
     </div>
-
+    <%= render_admin_partials(:promotions_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>
   </div>
 

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

@@ -5,10 +5,6 @@
 <% end %>
 
 <% content_for :page_tabs do %>
-  <li class="nav-item">
-    <%= active_link_to Spree.t(:settings), spree.admin_promotion_path(@promotion), class: "nav-link", active: controller_name == 'promotions' %>
-  </li>
-  <li class="nav-item">
-    <%= active_link_to Spree.t(:coupon_codes), spree.admin_promotion_coupon_codes_path(@promotion), class: "nav-link" %>
-  </li>
+  <%= nav_item(Spree.t(:settings), spree.admin_promotion_path(@promotion), active: controller_name == 'promotions') %>
+  <%= nav_item(Spree.t(:coupon_codes), spree.admin_promotion_coupon_codes_path(@promotion)) %>
 <% end if @promotion.multi_codes? %>