spree_admin 5.1.3 → 5.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edab2a99241e4db5473957b6cc3294ee86cd82c5d5c09b96c1674b88b74570b8
-  data.tar.gz: 8ae3514c6c648be6fd26e42c0bd8811f0dfd2a38a4cb06448791ad1b45e24db8
+  metadata.gz: 3970db34e315d777871a1d2e53cf27ac817b0ed7784d0fca0cf74f9ea6b736d4
+  data.tar.gz: 735e2cf7d03a439acb8cbd492f42f6ee7aa3172ff6bbcbaa300ba53ec5d40a4c
 SHA512:
-  metadata.gz: 1ce82d6b487a7a5db6e39c32e2b8da9e66a77331e2f79c22a1b402283ab7bb7b8bb105666c76c74c937e8f3a923d630cda21ddd1cd246b2b6ea89e5368ab12e8
-  data.tar.gz: 63efa374a215c5b3ccc8756e2ce0d0dc3397f4896cb899f47d494d3987b7fddf8792e367e28d814f95b6e9279a6b834258a438986f78cb61714a92fbeb49d1a3
+  metadata.gz: 5f5951292d223e9e8594898d1156cff0ecb0f2b69029dc160fb226340d3723e3203fee617448e8458709fd01776cb5d481f7863b9792ad0abe5d4411d6250945
+  data.tar.gz: b3843f735e552418eaab27b0b24f05388dd8ff256e8aa1cde15d2707e0c1cf4874689ab10d6ae4da248570322dbebca54f7267fc42fd31a06c0f64a9afb005be

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

@@ -1,10 +1,11 @@
-<% 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 %>
+
 <div class="card-lg p-4">
   <h5 class="mb-3">Internal URL</h5>
   <div class="row mb-4">

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

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

@@ -3,9 +3,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:promotions_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_promotion), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Promotion) %>
 
+<%= render_admin_partials(:promotions_header_partials) %>
+
 <div class="card-lg">
   <%= render 'filters' %>
 

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

@@ -9,9 +9,12 @@
 <% end %>
 
 <% content_for :page_actions do %>
+  <%= render_admin_partials(:properties_actions_partials) %>
   <%= link_to_with_icon 'plus', Spree.t(:new_property), new_object_url, class: "btn btn-primary" %>
 <% end if can?(:create, Spree::Property)  %>
 
+<%= render_admin_partials(:properties_header_partials) %>
+
 <div class="card-lg">
   <%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
     <%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,12 @@
   <%= Spree.t(:return_authorizations) %>
 <% end %>
 
+<% content_for :page_actions do %>
+  <%= render_admin_partials(:return_authorizations_actions_partials) %>
+<% end %>
+
+<%= render_admin_partials(:return_authorizations_header_partials) %>
+
 <div class="card-lg">
   <%= render "spree/admin/return_authorizations/filters" %>
   <%= render "spree/admin/return_authorizations/list" %>

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

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-  <%= f.text_field :name, class: 'form-control' %>
+  <%= f.text_field :name, class: 'form-control', required: true %>
   <%= f.error_message_on :name %>
 </div>
 

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

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

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

@@ -3,13 +3,16 @@
   <%= Spree.t(:new_role) %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
-
-<%= form_for [:admin, @role] do |f| %>
-  <div class="card mb-4">
-    <div class="card-body">
-      <%= render 'form', f: f %>
-    </div>
+<div class="row">
+  <div class="col-lg-6 offset-lg-3">
+    <%= form_for [:admin, @role] do |f| %>
+      <div class="card mb-4">
+        <div class="card-body">
+          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
+          <%= render 'form', f: f %>
+        </div>
+      </div>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    <% end %>
   </div>
-  <%= render 'spree/admin/shared/new_resource_links' %>
-<% end %>
+</div>

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

@@ -6,4 +6,5 @@
   <%= nav_item(Spree.t(:return_authorization_reasons), spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
   <%= nav_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
   <%= nav_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
+  <%= render_admin_partials(:returns_and_refunds_nav_partials) %>
 <% end %>

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

@@ -1,4 +1,5 @@
 <%= content_for(:page_tabs) do %>
   <%= nav_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
   <%= nav_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
+  <%= render_admin_partials(:shipping_nav_partials) %>
 <% end %>

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

@@ -1,2 +1,3 @@
 <%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
 <%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>
+<%= render_admin_partials(:stock_nav_partials) %>

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

@@ -4,6 +4,7 @@
   <%= nav_item(Spree.t(:users), spree.admin_admin_users_path) if can?(:manage, Spree.admin_user_class) %>
   <%= nav_item(Spree.t(:invitations), spree.admin_invitations_path) if can?(:manage, Spree::Invitation) %>
   <%= nav_item(Spree.t(:roles), spree.admin_roles_path) if can?(:manage, Spree::Role) %>
+  <%= render_admin_partials(:team_nav_partials) %>
 <% end %>
 
 <% content_for :page_actions do %>

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

@@ -1,5 +1,3 @@
 <% if can?(:manage, Spree::Integration) %>
-  <li class="nav-item">
-    <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
-  </li>
+  <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
 <% end %>

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

@@ -1,22 +1,21 @@
 <% products_active =  %w[products external_categories taxons taxonomies option_types option_values properties stock_items stock_transfers].include?(controller_name) || request.path.include?('products') %>
 <% if can?(:manage, Spree::Product) %>
   <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>
-  <% if products_active %>
-    <ul class="nav-submenu">
-      <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
-        <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
-      <% end %>
-      <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
-        <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
-      <% end %>
-      <% if can?(:manage, Spree::OptionType) %>
-        <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
-      <% end %>
-      <% if can?(:manage, Spree::Property) %>
-        <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
-      <% end %>
 
-      <%= render_admin_partials(:store_products_nav_partials) %>
-    </ul>
+  <ul class="nav-submenu <% unless products_active %>d-none<% end %>">
+    <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
+      <%= nav_item(Spree.t(:stock), spree.admin_stock_items_path, active: %w[stock_items stock_transfers].include?(controller_name)) %>
     <% end %>
+    <% if can?(:manage, Spree::Taxonomy) && can?(:manage, Spree::Taxon) %>
+      <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
+    <% end %>
+    <% if can?(:manage, Spree::OptionType) %>
+      <%= nav_item(Spree.t(:options), spree.admin_option_types_path, active: %w[option_types option_values].include?(controller_name)) %>
+    <% end %>
+    <% if can?(:manage, Spree::Property) %>
+      <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
+    <% end %>
+
+    <%= render_admin_partials(:store_products_nav_partials) %>
+  </ul>
 <% end %>

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

@@ -1,17 +1,7 @@
 <% if can?(:manage, Spree::Promotion) %>
   <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) && @user.nil? %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_promotions_path, class: 'nav-link', active: discounts_active do %>
-      <%= icon 'discount' %>
-      <%= Spree.t(:promotions) %>
-    <% end %>
-
-    <% if discounts_active && defined?(Spree::GiftCard) && spree.respond_to?(:admin_gift_cards_path) && can?(:manage, Spree::GiftCard) %>
-      <ul class="nav-submenu">
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:gift_cards), spree.admin_gift_cards_path, class: 'nav-link', active: %w[gift_cards gift_card_batches].include?(controller_name) %>
-        </li>
-      </ul>
-    <% end %>
-  </li>
+  <%= nav_item(Spree.t(:promotions), spree.admin_promotions_path, icon: 'discount', active: discounts_active) %>
+  <ul class="nav-submenu <% unless discounts_active %>d-none<% end %>">
+    <%= nav_item(Spree.t(:gift_cards), spree.admin_gift_cards_path, active: %w[gift_cards gift_card_batches].include?(controller_name)) %>
+  </ul>
 <% end %>

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

@@ -8,6 +8,7 @@
       <% if can?(:manage, Spree::ReturnAuthorization) %>
         <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
       <% end %>
+      <%= render_admin_partials(:returns_nav_partials) %>
     </ul>
   <% end %>
 <% end %>