spree_admin 5.0.6 → 5.1.0.beta

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

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

@@ -1,46 +1,11 @@
-<% if available_stores.count > 1 %>
-  <div class="modal fade" id="switch-store-modal" tabindex="-1" role="dialog" aria-labelledby="switchStoreModalLabel" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-      <div class="modal-content">
-        <%= modal_header(icon('switch-horizontal', class: 'mr-2') + Spree.t(:switch_store)) %>
-        <div class="modal-body">
-          <div class="list-group">
-            <% available_stores.each do |store| %>
-              <% if store.id != current_store.id %>
-                <%= link_to spree.admin_dashboard_url(host: store.url), class: 'list-group-item hover-light d-flex text-dark w-100 align-items-center text-primary' do %>
-                  <%= store_admin_icon(current_store, height: 32, width: 32) %>
-                  <span class="ml-3">
-                    <%= store.name %>
-                  </span>
-                <% end %>
-              <% else %>
-                <div class="list-group-item d-flex text-dark w-100 align-items-center cursor-disabled active">
-                  <%= store_admin_icon(current_store, height: 32, width: 32) %>
-                  <span class="ml-3">
-                    <%= store.name %>
-                  </span>
-
-                  <%= icon('check', class: 'ml-auto') %>
-                </div>
-              <% end %>
-            <% end %>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-<% end %>
-
-<div class="border-bottom border-bottom-dashed pb-2 d-flex align-items-center justify-content-between pr-1" id="store-menu" data-turbo-permanent>
+<div class="store-dropdown" id="store-menu" data-turbo-permanent>
   <div class="dropdown">
-    <button type="button" class="btn d-flex align-items-center justify-content-between text-left dropdown-toggle d-flex align-items-center gap-2"
+    <button type="button" class="btn store-dropdown-button dropdown-toggle"
             data-toggle="dropdown" aria-expanded="false">
       <%= store_admin_icon(current_store, height: 32, width: 32) %>
-      <span class="d-none d-lg-block">
-        <%= truncate(current_store.name, length: 10) %>
-      </span>
+      <%= truncate(current_store.name, length: 10) %>
     </button>
-    <div class="dropdown-menu">
+    <div class="dropdown-menu ml-2">
       <%= link_to current_store.formatted_url_or_custom_domain, class: 'dropdown-item', target: '_blank' do %>
         <%= icon 'eye' %>
         <%= Spree.t(:view_store) %>
@@ -52,45 +17,38 @@
 
       <% if available_stores.count > 1 %>
         <div class="dropdown-divider"></div>
-        <%= link_to "#", class: 'dropdown-item mb-0', data: { toggle: 'modal', target: '#switch-store-modal' } do %>
-          <%= icon 'switch-horizontal' %>
+        <h6 class="dropdown-header">
           <%= Spree.t(:switch_store) %>
-        <% end %>
+        </h6>
+        <div class="store-chooser">
+          <% available_stores.each do |store| %>
+            <% if store.id == current_store.id %>
+              <div class="store-chooser-item active">
+                <%= store_admin_icon(store, height: 32, width: 32) %>
+                <span class="d-flex flex-column mr-2">
+                  <%= store.name %>
+                  <small class="text-muted">
+                    <%= store.url_or_custom_domain %>
+                  </small>
+                </span>
+                <%= icon('check', class: 'ml-auto') %>
+              </div>
+            <% else %>
+              <%= link_to spree.admin_dashboard_url(host: store.url), class: 'store-chooser-item' do %>
+                <%= store_admin_icon(store, height: 32, width: 32) %>
+                <span class="d-flex flex-column">
+                  <%= store.name %>
+                  <small class="text-muted">
+                    <%= store.url_or_custom_domain %>
+                  </small>
+                </span>
+              <% end %>
+            <% end %>
+          <% end %>
+        </div>
       <% end %>
     </div>
   </div>
 
-  <div class="dropdown">
-    <button type="button" class="btn btn-sm btn-light shadow-xs" data-toggle="dropdown" aria-expanded="false">
-      <%= icon 'plus', class: 'mr-0' %>
-    </button>
-    <div class="dropdown-menu">
-      <%= link_to_with_icon 'shopping-cart', Spree.t(:new_order), spree.admin_orders_path, class: "dropdown-item", data: { turbo_method: :post } if can?(:create, Spree::Order)  %>
-
-      <%= link_to spree.new_admin_product_path, class: 'dropdown-item' do %>
-        <%= icon 'box' %>
-        <%= Spree.t(:new_product) %>
-      <% end if can?(:create, Spree::Product) %>
-      <%= link_to spree.new_admin_user_path, class: 'dropdown-item' do %>
-        <%= icon 'user' %>
-        <%= Spree.t(:new_user) %>
-      <% end if can?(:create, 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>
+  <%= render 'spree/admin/shared/new_item_dropdown' %>
 </div>
-

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

@@ -1,16 +1,11 @@
 <% if settings_active? %>
   <ul class="nav flex-column">
-    <li class="nav-item mb-1 py-2 border-bottom border-bottom-dashed">
-      <%= active_link_to_with_icon('chevron-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'nav-link') %>
-    </li>
-
     <% if can?(:manage, current_store) %>
       <%= nav_item(Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), icon: 'building-store', active: params[:section] == 'general-settings') %>
     <% end %>
 
-    <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
-      <%= nav_item(Spree.t(:account), main_app.edit_account_path(current_account), icon: 'receipt') %>
-      <%= nav_item(Spree.t(:account_members), main_app.account_members_path(current_account), icon: 'users') %>
+    <% if can?(:manage, Spree.admin_user_class) %>
+      <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users', active: %w[admin_users invitations roles].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, current_store) %>
@@ -70,8 +65,6 @@
     <%= render_admin_partials(:settings_nav_partials) %>
   </ul>
 <% else %>
-  <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
-
   <ul class="nav flex-column">
     <% unless current_store.setup_completed? %>
       <li class="nav-item">
@@ -107,23 +100,7 @@
       </li>
     <% end %>
 
-    <% if can?(:manage, Spree::Promotion) %>
-      <% discounts_active = %w[promotions gift_cards gift_card_batches coupon_codes].include?(controller_name) %>
-      <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="ml-4 pl-1 mb-2 nav-submenu mt-1">
-            <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 %>
+    <%= render 'spree/admin/shared/sidebar/promotions_nav' %>
 
     <% if can?(:manage, Spree::Report) %>
       <li class="nav-item">
@@ -141,13 +118,16 @@
     <li class="nav-item border-top border-top-dashed my-1"></li>
     <%= render 'spree/admin/shared/sidebar/storefront_nav' %>
     <%= render 'spree/admin/shared/sidebar/integrations_nav' %>
-
-    <% if can?(:manage, current_store) %>
-      <li class="nav-item border-top border-top-dashed my-1"></li>
-      <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>
-    <% end %>
-    <% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
-      <%= nav_item(Spree.t(:account_members), main_app.account_members_path(current_account), icon: 'users') %>
-    <% end %>
   </ul>
+
+  <div class="mt-auto d-flex flex-column">
+    <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>
+
+    <ul class="nav flex-column mb-2">
+      <% if can?(:manage, current_store) %>
+        <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>
+        <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>
+      <% end %>
+    </ul>
+  </div>
 <% end %>

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

@@ -3,8 +3,10 @@
   <%= nav_item(Spree.t('admin.storefront'), spree.admin_themes_path, icon: 'building-store', active: storefront_active) %>
 
   <% if storefront_active %>
-    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-      <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+    <ul class="nav-submenu">
+      <% if can?(:manage, Spree::Theme) %>
+        <%= nav_item(Spree.t(:themes), spree.admin_themes_path) %>
+      <% end %>
       
       <% if can?(:manage, Spree::Page) %>
         <%= nav_item(Spree.t(:pages), spree.admin_pages_path) %>

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

@@ -1,8 +1,10 @@
-<li class="nav-item">
-  <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
-    <%= icon 'heart-handshake' %>
-    <%= Spree.t(:vendors) %>
+<% if can?(:manage, current_store) %>
+  <li class="nav-item">
+    <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
+      <%= icon 'heart-handshake' %>
+      <%= Spree.t(:vendors) %>
 
-    <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
-  <% end %>
-</li>
+      <span class="badge ml-auto with-tip rounded-pill" title="This feature is part of the Enterprise Edition.">Enterprise</span>
+    <% end %>
+  </li>
+<% end%>

data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb

@@ -31,7 +31,7 @@
 
     <div class="dropdown ml-2 h-100">
       <button class="btn btn-light btn-sm px-1 h-100" type="button" id="dropdownMenuButton-<%= taxon.id %>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <%= icon('dots', class: 'mr-0') %>
+        <%= icon('dots-vertical', class: 'mr-0') %>
       </button>
       <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<%= taxon.id %>">
         <% if can?(:create, Spree::Taxon) %>

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

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