spree_admin 5.0.3 → 5.1.0.beta

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:status) %></th>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:type) %></th>

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

@@ -22,7 +22,7 @@ locals: {
     </div>
     <div class="card-body p-0">
       <table class="table table-condensed reimbursement-return-items-table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:product) %></th>
             <th><%= Spree.t(:preferred_reimbursement_type) %></th>
@@ -117,7 +117,7 @@ locals: {
   </div>
 <% end %>
 
-<div class="form-actions fixed-form-actions">
+<div class="form-actions">
   <% if !@reimbursement.reimbursed? %>
     <%= button_to [:perform, :admin, @order, @reimbursement], { class: 'btn btn-primary', method: 'post' } do %>
       <%= icon "money" %>

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

@@ -21,7 +21,7 @@ locals: {
   </div>
   <div class="card-body p-0">
     <table class="table reimbursement-reimbursement-items-table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:product) %></th>
           <th><%= Spree.t(:preferred_reimbursement_type) %></th>

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

@@ -1,7 +1,7 @@
 <div class="card-lg">
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <% @report.line_item_class.headers.each do |header| %>
             <th><%= header[:label] %></th>

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

@@ -8,7 +8,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:status) %></th>

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

@@ -2,9 +2,9 @@
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render "spree/admin/shared/filters_search_bar", param: :number_cont %>
 
-    <div class="dropdown h-100 mr-2">
+    <div class="dropdown">
       <button
-        class="btn btn-light h-100 dropdown-toggle"
+        class="btn btn-light dropdown-toggle"
         type="button"
         data-toggle="dropdown"
         aria-expanded="false"

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

@@ -1,7 +1,7 @@
 <% if @collection.any? %>
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th><%= Spree.t(:number) %></th>
           <th><%= Spree.t(:created_at) %></th>

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

@@ -6,8 +6,10 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @role } %>
 
 <%= form_for [:admin, @role] do |f| %>
-  <fieldset>
-    <%= render 'form', f: f %>
-    <%= render 'spree/admin/shared/edit_resource_links', f: f %>
-  </fieldset>
+  <div class="card mb-4">
+    <div class="card-body">
+      <%= render 'form', f: f %>
+    </div>
+  </div>
+  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

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

@@ -1,6 +1,4 @@
-<% content_for :page_title do %>
-  <%= Spree.t(:roles) %>
-<% end %>
+<%= 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" %>
@@ -10,18 +8,24 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
-            <th><%= Spree.t(:role_id) %></th>
+            <th><%= Spree.t(:name) %></th>
+            <th><%= Spree.t(:permissions) %></th>
             <th></th>
           </tr>
         </thead>
         <tbody>
           <% @collection.each do |role| %>
             <tr id="<%= spree_dom_id role %>">
-              <td><%= role.name %></td>
+              <td class="w-20">
+                <code><%= role.name %></code>
+              </td>
+              <td class="w-80">
+                <%= Spree.t(:all) %>
+              </td>
               <td class="actions">
-                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+                <%= link_to_edit(role) %>
               </td>
             </tr>
           <% end %>

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

@@ -5,7 +5,7 @@
         <div
           data-controller="notification"
           data-notification-delay-value="5000"
-          class="animate__animated animate__fadeInDown animate__faster hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
+          class="animate__animated animate__fadeInDown animate__faster hidden alert pr-2 d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
           <div class="d-flex align-items-center justify-content-between w-100">
             <div class="d-flex align-items-center justify-content-between">
               <span><%= text %></span>

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

@@ -0,0 +1,13 @@
+<nav aria-label="breadcrumb">
+  <ol class="breadcrumb">
+    <%= render_breadcrumb_icon %>
+    <% if settings_active? %>
+      <li>
+        <%= active_link_to Spree.t(:settings), spree.edit_admin_store_path %>
+      </li>
+      <%= icon('slash', class: 'text-muted font-size-sm') %>
+    <% end %>
+
+    <%= render_breadcrumbs tag: :li, separator: icon('slash', class: 'text-muted font-size-sm') %>
+  </ol>
+</nav>

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

@@ -1,6 +1,6 @@
 <% date_from_input_name ||= :date_from %>
 <% date_to_input_name ||= :date_to %>
-<% css_classes ||= "btn btn-light d-inline-flex align-items-center h-100 dropdown-toggle" %>
+<% css_classes ||= "btn btn-light d-inline-flex align-items-center dropdown-toggle" %>
 
 <% date_from_value ||= params[date_from_input_name] %>
 <% date_to_value ||= params[date_to_input_name] %>

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

@@ -11,7 +11,7 @@
     <h3 class="page-header-title mb-0 d-flex align-items-center gap-3">
       <%= yield :page_title %>
     </h3>
-    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-2">
+    <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-3">
       <% if action_name == 'index' && defined?(model_class) && model_class && Spree::Export.available_models.include?(model_class) && can?(:create, Spree::Export) %>
         <span data-toggle="modal" data-target="#modal">
           <%= link_to spree.new_admin_export_path(export: { search_params: params[:q]&.to_json, type: Spree::Export.type_for_model(model_class) }), class: 'btn btn-light bg-transparent with-tip', title: 'Download records as CSV file', data: { turbo_frame: :dialog_modal } do %>
@@ -30,7 +30,7 @@
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>
         <div class="dropdown h-100" id="page_actions_dropdown">
           <%= link_to '#', class: 'btn btn-light bg-transparent h-100 p-2', data: { toggle: 'dropdown' }, id: 'more-actions-link' do %>
-            <%= icon 'dots', class: 'mr-0' %>
+            <%= icon 'dots-vertical', class: 'mr-0' %>
           <% end %>
           <div class="dropdown-menu dropdown-menu-right">
             <%= yield :page_actions_dropdown if content_for(:page_actions_dropdown) %>
@@ -67,7 +67,7 @@
 
 <% if content_for?(:page_tabs) %>
   <div class="container">
-    <ul class="nav nav-pills flex-nowrap overflow-auto w-100 mb-3">
+    <ul class="nav nav-pills flex-nowrap w-100 mb-3">
       <%= yield :page_tabs %>
     </ul>
   </div>

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

@@ -1,5 +1,5 @@
 <button
-  class="btn btn-light h-100 py-2"
+  class="btn btn-light"
   type="button"
   data-action="reveal#toggle"
 >

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

@@ -2,7 +2,7 @@
 <% badge_name ||= label %>
 <% placeholder ||= [Spree.t(:search), controller_name.humanize.downcase].join(' ') %>
 
-<div class="form-control d-flex align-items-center py-0 focus-shadow focus-border flex-grow-1 mb-3 mb-lg-0 w-auto">
+<div class="form-control d-flex align-items-center py-0 focus-shadow focus-border flex-grow-1 mb-3 mb-lg-0" id="filters-search-bar">
   <%= icon "search", class: "mr-3 text-muted" %>
   <%= search_field_tag "q[#{param}]",
   params.dig(:q, param),

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

@@ -39,6 +39,10 @@
 
 <%= javascript_importmap_tags 'application-spree-admin', importmap: Rails.application.config.spree_admin.importmap %>
 
+<% if Rails.application.importmap.packages["application"].present? %>
+  <%= javascript_import_module_tag "application" %>
+<% end %>
+
 <%= yield :head %>
 
 <% if Rails.env.test? %>
@@ -51,4 +55,9 @@
 
 <%= render 'spree/shared/google_places_api_loader' %>
 
-<%= render_admin_partials(:head_partials) %>
+<%= render_admin_partials(:head_partials) %>
+
+<script>
+  window.Spree = window.Spree || {}
+  Spree.adminPath = '<%= spree.admin_path %>'
+</script>

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

@@ -2,27 +2,36 @@
 
 <%= render 'spree/admin/shared/offcanvas_nav' %>
 
-<header id="header" data-turbo-permanent>
-  <nav class="navbar navbar-expand-lg py-2 px-lg-5 d-lg-none">
-    <button type="button" class="btn d-flex align-items-center p-0 h-100 pull-bs-canvas-left d-lg-none text-white text-decoration-none">
-      <%= icon('menu-2', height: 32, class: 'm-0 h-100') %>
-    </button>
-
-    <div class="navbar-collapse d-none d-lg-flex">
-      <%= form_with url: spree.admin_search_admin_path, method: :post, class: 'd-none' do |form| %>
-        <div class="w-50 d-lg-flex align-items-center pr-2">
-          <%= icon('search', class: 'text-muted') %>
-          <%= text_field_tag :search, params[:search], class: 'px-3 py-2 bg-transparent w-100 outline-none border-0', placeholder: 'Search...', oninput: "this.form.requestSubmit()" %>
-        </div>
-      <% end if spree.respond_to?(:admin_search_admin_path) && defined?(current_store) && current_store %>
+<header id="header" class="sticky-top py-0">
+  <nav class="navbar navbar-expand-lg p-0 d-flex align-items-center pr-3">
+    <div class="d-lg-none pr-3 border-right">
+      <button type="button" class="btn btn-light pull-bs-canvas-left px-2 ml-3 text-decoration-none">
+        <%= icon('menu-2', class: 'mr-0') %>
+      </button>
     </div>
 
-    <%= link_to spree.admin_dashboard_path, class: 'navbar-brand d-flex d-lg-none h-100 align-items-center mx-0 text-white' do %>
-      <%= current_store.name %>
+    <% if settings_active? %>
+      <div class="store-dropdown pr-2">
+        <%= active_link_to_with_icon('arrow-back-up', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mr-1') %>
+      </div>
+    <% else %>
+      <% if defined?(current_vendor) && current_vendor.present? %>
+        <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>
+      <% else %>
+        <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
+      <% end %>
     <% end %>
 
-    <div class="text-right d-flex justify-content-end p-0" id="header-user-account" data-turbo-permanent>
+    <div class="d-none d-lg-block">
+      <%= render 'spree/admin/shared/breadcrumbs' %>
+    </div>
+
+    <div class="ml-auto d-flex align-items-center">
       <%= render 'spree/admin/shared/user_dropdown' %>
     </div>
   </nav>
-</header>
+</header>
+
+<div class="d-lg-none py-3 border-bottom">
+  <%= render 'spree/admin/shared/breadcrumbs' %>
+</div>

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

@@ -5,7 +5,7 @@
   <% args[:action] = per_page_action %>
 <% end %>
 
-<% if collection.any? && collection.total_pages > 1 %>
+<% if collection.any? %>
   <div class="py-2 border-top">
     <div class="index-pagination-row d-flex align-items-center">
       <div class="col-6 col-lg-3">

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

@@ -15,7 +15,7 @@
           </p>
         </div>
       </div>
-      <div class="modal-footer border-top">
+      <div class="modal-footer">
         <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
       </div>

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

@@ -0,0 +1,32 @@
+<div class="dropdown">
+  <button type="button" class="btn btn-sm btn-light shadow-xs px-1" data-toggle="dropdown" aria-expanded="false">
+    <%= icon 'plus', class: 'mr-0' %>
+  </button>
+  <div class="dropdown-menu">
+    <%= link_to_with_icon 'shopping-bag-plus', Spree.t(:new_order), spree.admin_orders_path, class: "dropdown-item", data: { turbo_method: :post } if can?(:manage, Spree::Order)  %>
+
+    <%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %>
+      <%= icon 'cube-plus' %>
+      <%= Spree.t(:new_product) %>
+    <% end if can?(:create, Spree::Product) %>
+    <%= link_to spree.new_admin_user_path, class: 'dropdown-item' do %>
+      <%= icon 'user-plus' %>
+      <%= Spree.t(:new_customer) %>
+    <% end if can?(:manage, Spree.user_class) %>
+
+    <%= link_to spree.new_admin_promotion_path, class: 'dropdown-item' do %>
+      <%= icon 'discount' %>
+      <%= Spree.t(:new_promotion) %>
+    <% end if can?(:create, Spree::Promotion) %>
+
+    <%= invite_vendor_button(class: 'dropdown-item') if defined?(invite_vendor_button) %>
+
+    <% if can?(:create, Spree::Store) %>
+      <div class="dropdown-divider"></div>
+
+      <span data-toggle="modal" data-target="#modal-lg">
+        <%= link_to_with_icon 'building-store', Spree.t(:new_store), spree.new_admin_store_path, class: 'dropdown-item', data: { turbo_frame: 'dialog_modal_lg' } %>
+      </span>
+    <% end %>
+  </div>
+</div>

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

@@ -1,6 +1,9 @@
 <% resource_name ||= model_class.name.demodulize.underscore.humanize %>
 
-<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center">
-  <%= Spree.t(:no_resource_found, resource: resource_name) %>
-  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-light ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %>
+<div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
+  <%= icon 'map-search', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>
+  <p>
+    <%= Spree.t(:no_resource_found, resource: resource_name) %>
+  </p>
+  <%= link_to_with_icon 'plus', Spree.t(:add_one), new_object_url, class: 'btn btn-link btn-sm ml-3', data: { 'turbo-frame': '_top' } if can?(:create, model_class) && defined?(new_object_url) && new_object_url.present? %>
 </div>

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

@@ -1,19 +1,6 @@
 <!-- Left off-canvas sidebar -->
-<div class="bs-canvas bs-canvas-left position-fixed bg-black h-100">
+<div class="bs-canvas bs-canvas-left position-fixed h-100 bg-light border-right">
   <div class="bs-canvas-content px-2">
-    <div class="d-flex align-items-center font-weight-bold py-3 bg-black text-white border-bottom border-black sticky-top justify-content-between">
-      <div class="d-flex align-items-center">
-        <% if defined?(current_store) && current_store&.present? %>
-          <%= store_admin_icon(current_store, width: 36, height: 36) %>
-          <span class="ml-3 font-size-lg">
-            <%= truncate(current_store.name, length: 15) %>
-          </span>
-        <% end %>
-      </div>
-      <button class="btn py-0 bs-canvas-close text-white">
-        <%= icon('x', height: 18, class: 'mr-0') %>
-      </button>
-    </div>
     <% if try_spree_current_user.present? %>
       <% if defined?(current_vendor) && current_vendor.present? %>
         <%= render 'spree/admin/shared/sidebar/vendor_nav' %>

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

@@ -1,6 +1,6 @@
 <div class="table-responsive card-lg">
   <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
-    <thead class="text-muted">
+    <thead>
       <tr data-hook="refunds_header" class="border-bottom">
         <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
         <th><%= Spree.t(:amount) %></th>

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

@@ -1,15 +1,7 @@
 <aside id="main-sidebar">
   <% if defined?(current_vendor) && current_vendor.present? %>
-    <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>
     <%= render 'spree/admin/shared/sidebar/vendor_nav' %>
   <% else %>
     <%= render 'spree/admin/shared/sidebar/store_nav' %>
   <% end %>
-
-  <% unless settings_active? %>
-    <section class="position-sticky d-none d-lg-block w-100 z-index-1000 mt-auto bottom-0">
-      <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
-      <%= render 'spree/admin/shared/user_dropdown' %>
-    </section>
-  <% end %>
 </aside>

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

@@ -1,4 +1,5 @@
 <%= content_for(:page_tabs) do %>
   <%= nav_item(Spree.t(:tax_rates), spree.admin_tax_rates_path) if can?(:manage, Spree::TaxRate) %>
   <%= nav_item(Spree.t(:tax_categories), spree.admin_tax_categories_path) if can?(:manage, Spree::TaxCategory) %>
+  <%= render_admin_partials(:tax_nav_partials) %>
 <% end %>

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

@@ -0,0 +1,13 @@
+<% content_for :page_title, Spree.t(:users) %>
+
+<%= content_for(:page_tabs) do %>
+  <%= 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) %>
+<% end %>
+
+<% content_for :page_actions do %>
+  <span data-toggle="modal" data-target="#modal">
+    <%= link_to_with_icon 'send', Spree.t('actions.send_invitation'), spree.new_admin_invitation_path, class: "btn btn-primary", data: { turbo_frame: 'dialog_modal' } %>
+  </span>
+<% end if can? :create, Spree::Invitation %>

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

@@ -1,38 +1,43 @@
 <% if try_spree_current_user.present? %>
-  <div class="dropdown py-2 bg-gray-25 border-top" id="<%= dom_id(try_spree_current_user, 'account-dropdown') %>" data-turbo-permanent>
+  <div class="dropdown" id="<%= dom_id(try_spree_current_user, 'account-dropdown') %>" data-turbo-permanent>
     <button type="button"
-          class="btn d-flex align-items-center justify-content-between text-left w-100"
+          class="btn d-flex align-items-center justify-content-between text-left w-100 pr-0"
           data-toggle="dropdown" aria-expanded="false" id="accountNav">
-      <div class="d-flex align-items-center">
+      <%= render_avatar(try_spree_current_user, width: 32, height: 32) %>
+    </button>
+    <div class="dropdown-menu dropdown-menu-right" style="min-width: 250px;">
+      <div class="d-flex align-items-center p-2 bg-gray-25 rounded-lg">
         <%= render_avatar(try_spree_current_user, width: 34, height: 34) %>
         <span class="d-none d-lg-inline ml-lg-2">
-          <%= try_spree_current_user.name&.full&.truncate(15)&.presence || try_spree_current_user.email.truncate(15) %><br />
-          <span class="text-muted small"><%= try_spree_current_user.email.truncate(22) %></span>
+          <% if try_spree_current_user.name.present? %>
+            <%= try_spree_current_user.name&.full %><br />
+            <span class="small text-muted"><%= try_spree_current_user.email %></span>
+          <% else %>
+            <%= try_spree_current_user.email %><br />
+          <% end %>
         </span>
       </div>
-    </button>
-    <div class="dropdown-menu dropdown-menu-right w-100 mb-1 mt-1 mt-lg-0">
+
+      <%= render_admin_partials(:user_dropdown_partials) %>
+
       <% if can?(:update, try_spree_current_user) %>
+        <h6 class="dropdown-header mt-2">
+          <%= Spree.t(:account) %>
+        </h6>
         <%= link_to_with_icon 'user-scan', Spree.t('admin.edit_profile'), spree.edit_admin_profile_path, class: 'dropdown-item' %>
       <% end %>
 
-      <% if enterprise_edition? && try_spree_current_user.respond_to?(:accounts) && try_spree_current_user.accounts.count > 1 %>
-        <div data-toggle="modal" data-target="#modal">
-          <%= link_to_with_icon 'switch-3', Spree.t(:switch_team), main_app.accounts_path, class: 'dropdown-item', data: { turbo_frame: 'dialog_modal' } %>
-        </div>
+      <% if can?(:manage, current_store) %>
+        <h6 class="dropdown-header mt-2">
+          <%= Spree.t(:support) %>
+        </h6>
+        <%= external_link_to Spree.t(:help_center), 'https://spreecommerce.org/docs/user', class: 'dropdown-item justify-content-between', target: '_blank' %>
+        <%= external_link_to Spree.t(:contact_us), 'https://spreecommerce.org/contact/', class: 'dropdown-item justify-content-between', target: '_blank' %>
       <% end %>
 
-      <% if enterprise_edition? && defined?(app_domain) && defined?(Vendo::Account) && can?(:create, Vendo::Account) %>
-        <%= link_to_with_icon 'plus', Spree.t(:create_new_team), main_app.new_account_url(host: app_domain), class: 'dropdown-item', data: { turbo: false } %>
-      <% end %>
-
-      <div class="dropdown-divider"></div>
-
-      <%= link_to_with_icon 'book', 'Help center', 'https://spreecommerce.org/docs/user', class: 'dropdown-item', target: '_blank' %>
-      <%= link_to_with_icon 'message-circle', 'Contact us', 'https://spreecommerce.org/contact/', class: 'dropdown-item', target: '_blank' %>
       <div class="dropdown-divider"></div>
 
-      <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0', method: :delete do %>
+      <%= button_to spree_admin_logout_path, class: 'dropdown-item mb-0 btn-danger', method: :delete do %>
         <%= icon('logout', class: "icon icon-logout")  %>
         <%= Spree.t(:logout) %>
       <% end if defined?(spree_admin_logout_path) %>

data/app/views/spree/admin/shared/devise/_links.html.erb

@@ -0,0 +1,18 @@
+<div class="mb-2 d-flex justify-content-between">
+  <div>
+    <% if defined?(devise_mapping) && devise_mapping.rememberable? && controller_name == 'user_sessions' %>
+      <div class="custom-control custom-checkbox">
+        <%= f.check_box :remember_me, class: "custom-control-input" %>
+        <%= f.label :remember_me, Spree.t(:remember_me), class: "custom-control-label" %>
+      </div>
+    <% end %>
+  </div>
+  <div class="d-flex align-items-center gap-2">
+    <% if controller_name != 'user_sessions' %>
+      <p><%= link_to Spree.t(:log_in), new_session_path(resource_name) %></p>
+    <% end %>
+    <% if defined?(devise_mapping) && devise_mapping.recoverable? && controller_name != 'user_passwords' && controller_name != 'user_registrations' %>
+      <p><%= link_to Spree.t(:forgot_password), new_password_path(resource_name) %></p>
+    <% end %>
+  </div>
+</div>

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

@@ -1,10 +1,12 @@
 <% if can?(:manage, current_store) && !enterprise_edition? %>
   <% unless session[:spree_enterprise_edition_notice_dismissed] %>
-    <div id="enterprise-edition-notice">
-      <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, method: :patch, class: 'btn-close' %>
-      <p class="mb-1">You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>
+    <section class="d-none d-lg-block">
+      <div id="enterprise-edition-notice">
+        <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, method: :patch, class: 'btn-close' %>
+        <p>You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>
 
-      <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-link btn-sm shadow-xs' %>
-    </div>
+        <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-link btn-sm shadow-xs' %>
+      </div>
+    </section>
   <% end %>
 <% end %>

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

@@ -1,7 +1,5 @@
-<li class="nav-item">
-  <span class="nav-link d-flex align-items-center pr-1 cursor-default with-tip" title="Connect your store to third-party services to automate your business processes.">
-    <%= icon 'plug' %>
-    <span><%= Spree.t(:integrations) %></span>
-    <span class="badge ml-auto rounded-pill">Coming soon!</span>
-  </span>
-</li>
+<% if can?(:manage, Spree::Integration) %>
+  <li class="nav-item">
+    <%= nav_item(Spree.t(:integrations), spree.admin_integrations_path, icon: 'plug-connected') %>
+  </li>
+<% end %>

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

@@ -8,7 +8,7 @@
   <%= nav_item(orders_label.html_safe, spree.admin_orders_path, icon: 'inbox', active: orders_active) %>
   
   <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
-    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+    <ul class="nav-submenu">
       <% if ready_to_ship_orders_count&.positive? %>
         <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>
         <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
@@ -16,7 +16,7 @@
       <% end %>
 
       <% if can?(:manage, :checkouts) %>
-        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path, active: controller_name == 'checkouts' || (@order.present? && !@order.completed?)) %>
       <% end %>
 
       <%= render_admin_partials(:store_orders_nav_partials) %>

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

@@ -1,8 +1,8 @@
 <% 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: 'box-seam', active: products_active) %>
+  <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'package', active: products_active) %>
   <% if products_active %>
-    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+    <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 %>

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

@@ -0,0 +1,17 @@
+<% 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>
+<% end %>

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

@@ -4,7 +4,7 @@
   <%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>
 
   <% if returns_active %>
-    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+    <ul class="nav-submenu">
       <% if can?(:manage, Spree::ReturnAuthorization) %>
         <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
       <% end %>