spree_admin 5.0.0.rc1 → 5.0.1

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

@@ -3,30 +3,32 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_role), new_object_url, class: "btn-primary", icon: 'plus', id: 'admin_new_role_link' %>
+  <%= link_to_with_icon 'plus', Spree.t(:new_role), new_object_url, class: "btn btn-primary" %>
 <% end if can? :create, Spree::Role %>
 
-<% if @roles.any? %>
-  <div class="table-responsive card-lg p-0">
-    <table class="table">
-      <thead class="text-muted">
-        <tr>
-          <th><%= Spree.t(:role_id) %></th>
-          <th class="actions"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% @roles.each do |role| %>
-          <tr id="<%= spree_dom_id role %>">
-            <td><%= role.name %></td>
-            <td class="actions">
-              <%= link_to_edit(role, no_text: true) if can? :edit, role %>
-            </td>
+<div class="card-lg">
+  <% if @collection.any? %>
+    <div class="table-responsive">
+      <table class="table">
+        <thead class="text-muted">
+          <tr>
+            <th><%= Spree.t(:role_id) %></th>
+            <th></th>
           </tr>
-        <% end %>
-      </tbody>
-    </table>
-  </div>
-<% else %>
-  <%= render 'spree/admin/shared/no_resource_found' %>
-<% end %>
+        </thead>
+        <tbody>
+          <% @collection.each do |role| %>
+            <tr id="<%= spree_dom_id role %>">
+              <td><%= role.name %></td>
+              <td class="actions">
+                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  <% else %>
+    <%= render 'spree/admin/shared/no_resource_found' %>
+  <% end %>
+</div>

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

@@ -2,18 +2,17 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :bulk_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-muted" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
           </div>
         </div>
-        <div class="modal-footer d-flex justify-content-between">
-          <button type="button" class="btn btn-light" data-dismiss="modal"><%= Spree.t(:close) %></button>
-          <button type="button" class="btn btn-primary" disabled="disabled"><%= Spree.t(:save_changes) %></button>
+        <div class="modal-footer">
+          <%= modal_discard_button %>
+          <button type="button" class="btn btn-primary" disabled="disabled">
+            <%= Spree.t('actions.save') %>
+          </button>
         </div>
       </div>
     <% end %>

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

@@ -2,6 +2,6 @@
   <%= Spree.t(:developers) %>
 <% end %>
 <%= content_for :page_tabs do %>
-  <%= nav_pill_list_item(:api_keys, label: Spree.t(:api_keys), url: spree.admin_oauth_applications_path) if can?(:manage, Spree::OauthApplication) %>
-  <%= nav_pill_list_item(:webhooks, label: Spree.t(:webhooks), url: spree.admin_webhooks_subscribers_path) if can?(:manage, Spree::Webhooks::Subscriber) %>
+  <%= nav_item(Spree.t(:api_keys), spree.admin_oauth_applications_path) if can?(:manage, Spree::OauthApplication) %>
+  <%= nav_item(Spree.t(:webhooks), spree.admin_webhooks_subscribers_path) if can?(:manage, Spree::Webhooks::Subscriber) %>
 <% end %>

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

@@ -0,0 +1,6 @@
+<div class="form-actions">
+  <%= turbo_save_button_tag Spree.t(:filter_results) do %>
+    <%= icon("search") %>
+    <%= Spree.t(:filter_results) %>
+  <% end %>
+</div>

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

@@ -49,4 +49,6 @@
   </style>
 <% end %>
 
-<%= render 'spree/shared/google_places_api_loader' %>
+<%= render 'spree/shared/google_places_api_loader' %>
+
+<%= render_admin_partials(:head_partials) %>

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

@@ -2,10 +2,7 @@
   <div class="modal-dialog modal-dialog-centered">
     <%= turbo_frame_tag :dialog_modal do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center">
           <div class="spinner-border text-light mx-auto my-5" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>
@@ -20,10 +17,7 @@
   <div class="modal-dialog modal-dialog-centered modal-lg">
     <%= turbo_frame_tag :dialog_modal_lg do %>
       <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:loading) %>...</h5>
-          <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-        </div>
+        <%= modal_header(Spree.t(:loading)) %>
         <div class="modal-body text-center" style="min-height: 200px">
           <div class="spinner-border text-light" role="status">
             <span class="sr-only"><%= Spree.t(:loading) %>...</span>

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

@@ -1,9 +1,6 @@
 <%= turbo_frame_tag :dialog_modal do %>
   <div class="modal-content" data-controller="search-picker">
-    <div class="modal-header">
-      <h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_products) %></h5>
-      <button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
-    </div>
+    <%= modal_header(Spree.t(:add_products)) %>
     <div class="modal-body border-bottom">
       <%= form_with url: spree.search_admin_products_path, method: :post, data: { controller: 'auto-submit'} do |form| %>
         <%= form.hidden_field :omit_ids, value: parent.product_ids.join(',') %>
@@ -19,6 +16,7 @@
         </div>
       </div>
       <div class="modal-footer border-top">
+        <%= modal_discard_button %>
         <%= turbo_save_button_tag Spree.t(:add_selected_products), class: 'btn btn-primary', disabled: true, data: { search_picker_target: :submit } %>
       </div>
     <% end %>

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

@@ -2,5 +2,5 @@
 
 <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' if can?(:create, model_class) && defined?(new_object_url) %>
+  <%= 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>

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

@@ -3,6 +3,6 @@
 <% end %>
 
 <% content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:posts) if can?(:manage, Spree::Post) %>
-  <%= nav_pill_list_item(:post_categories, label: Spree.t(:categories)) if can?(:manage, Spree::PostCategory) %>
+  <%= nav_item(Spree.t(:posts), spree.admin_posts_path) if can?(:manage, Spree::Post) %>
+  <%= nav_item(Spree.t(:categories), spree.admin_post_categories_path) if can?(:manage, Spree::PostCategory) %>
 <% end %>

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

@@ -5,16 +5,7 @@
 <% if image.present? && image.attached? && image.variable? %>
   <% alt ||= image.alt || object.name %>
   <div class="admin-product-image-container">
-    <%= image_tag(
-          main_app.cdn_image_url(
-            image.variant(
-              spree_image_variant_options(resize_to_fill: [width * 2, height * 2])
-            )
-          ),
-          width: width,
-          height: height,
-          alt: alt
-    ) %>
+    <%= spree_image_tag(image, width: width, height: height, alt: alt) %>
   </div>
 <% else %>
   <%= render 'spree/admin/shared/no_image', width: width, height: height %>

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

@@ -1,4 +1,4 @@
-<div class="table-responsive card-lg p-0">
+<div class="table-responsive card-lg">
   <table class="table table-condensed" id='refunds' data-order-id='<%= @order.number %>'>
     <thead class="text-muted">
       <tr data-hook="refunds_header" class="border-bottom">

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:return_authorization_reasons, url: spree.admin_return_authorization_reasons_path) if can?(:manage, Spree::ReturnAuthorizationReason) %>
-  <%= nav_pill_list_item(:refund_reasons, url: spree.admin_refund_reasons_path) if can?(:manage, Spree::RefundReason) %>
-  <%= nav_pill_list_item(:reimbursement_types, url: spree.admin_reimbursement_types_path) if can?(:manage, Spree::ReimbursementType) %>
+  <%= 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) %>
 <% end %>

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

@@ -1,4 +1,4 @@
 <%= content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:shipping_methods, url: spree.admin_shipping_methods_path, active: controller_name == 'shipping_methods' && action_name == 'index') if can?(:manage, Spree::ShippingMethod) %>
-  <%= nav_pill_list_item(:shipping_categories, url: spree.admin_shipping_categories_path) if can?(:manage, Spree::ShippingCategory) %>
+  <%= 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) %>
 <% end %>

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

@@ -1,4 +1,4 @@
 <ul class="nav mb-0" id="pills-tab" role="tablist">
-  <%= nav_pill_list_item(:stock_items) if can?(:manage, Spree::StockItem) %>
-  <%= nav_pill_list_item(:stock_transfers) if can?(:manage, Spree::StockTransfer) %>
+  <%= 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) %>
 </ul>

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

@@ -1,4 +1,4 @@
 <%= content_for(:page_tabs) do %>
-  <%= nav_pill_list_item(:tax_rates, url: spree.admin_tax_rates_path) if can?(:manage, Spree::TaxRate) %>
-  <%= nav_pill_list_item(:tax_categories, url: spree.admin_tax_categories_path) if can?(:manage, Spree::TaxCategory) %>
+  <%= 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) %>
 <% end %>

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

@@ -1,8 +1,8 @@
 <%= link_to spree.admin_user_path(user), class: 'rounded hover-light p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top} do %>
   <% if user.name.present? %>
-    <%= image_tag(avatar_url_for(user), width: 48, height: 48, class: 'mr-3 rounded-lg') %>
+    <%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>
   <% else %>
-    <div style="width: 48px; height: 48px" class="mr-3 rounded-lg bg-light"></div>
+    <div style="width: 48px; height: 48px" class="mr-3 avatar bg-light"></div>
   <% end %>
   <div class="text-left">
     <% if customer_full_name(user) %>

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

@@ -4,8 +4,8 @@
           class="btn d-flex align-items-center justify-content-between text-left w-100"
           data-toggle="dropdown" aria-expanded="false" id="accountNav">
       <div class="d-flex align-items-center">
-        <%= image_tag(avatar_url_for(try_spree_current_user), width: 34, height: 34, class: 'rounded-circle mr-lg-2') %>
-        <span class="d-none d-lg-inline">
+        <%= 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>
         </span>

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

@@ -1,35 +1,25 @@
 <% orders_active = %[orders checkouts].include?(controller_name) || @order %>
 <% if can?(:manage, Spree::Order) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_orders_path, class: 'nav-link', active: orders_active do %>
-      <%= icon 'inbox' %>
-      <%= Spree.t(:orders) %>
-
+  <% orders_label = Spree.t(:orders) %>
+  <% if ready_to_ship_orders_count&.positive? %>
+    <% orders_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
+  <% end %>
+  
+  <%= 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">
       <% if ready_to_ship_orders_count&.positive? %>
-        <span class="badge ml-auto">
-          <%= ready_to_ship_orders_count %>
-        </span>
+        <% fulfill_label = Spree.t('admin.orders.orders_to_fulfill') %>
+        <% fulfill_label += content_tag(:span, ready_to_ship_orders_count, class: 'badge ml-auto') %>
+        <%= nav_item(fulfill_label.html_safe, spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}), active: params.dig(:q, :shipment_state_not_in).present?) %>
+      <% end %>
+
+      <% if can?(:manage, :checkouts) %>
+        <%= nav_item(Spree.t(:draft_orders), spree.admin_checkouts_path) %>
       <% end %>
-    <% end %>
-    <% if orders_active && (ready_to_ship_orders_count&.positive? || can?(:manage, :checkouts)) %>
-      <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
-        <% if ready_to_ship_orders_count&.positive? %>
-          <li class="nav-item">
-            <%= active_link_to spree.admin_orders_path(q: {shipment_state_not_in: [:shipped, :canceled]}), class: 'nav-link', active: params.dig(:q, :shipment_state_not_in).present? do %>
-              <span><%= Spree.t('admin.orders.orders_to_fulfill') %></span>
-              <span class="badge ml-auto">
-                <%= ready_to_ship_orders_count %>
-              </span>
-            <% end %>
-          </li>
-        <% end %>
 
-        <% if can?(:manage, :checkouts) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:draft_orders), spree.admin_checkouts_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+      <%= render_admin_partials(:store_orders_nav_partials) %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -1,41 +1,22 @@
 <% 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) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_products_path, class: 'nav-link', active: products_active do %>
-      <span class="position-relative">
-      <%= icon 'box-seam' %>
-    </span>
-    <%= Spree.t(:products) %>
-  <% end %>
+  <%= nav_item(Spree.t(:products), spree.admin_products_path, icon: 'box-seam', active: products_active) %>
   <% if products_active %>
     <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
       <% if can?(:manage, Spree::StockItem) || can?(:manage, Spree::StockTransfer) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:stock), spree.admin_stock_items_path, class: 'nav-link', active: %w[stock_items stock_transfers].include?(controller_name) %>
-        </li>
+        <%= 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) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:taxonomies), spree.admin_taxonomies_path, class: 'nav-link' %>
-        </li>
+        <%= nav_item(Spree.t(:taxonomies), spree.admin_taxonomies_path) %>
       <% end %>
       <% if can?(:manage, Spree::OptionType) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:options), spree.admin_option_types_path, class: 'nav-link', active: %w[option_types option_values].include?(controller_name) %>
-        </li>
+        <%= 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) %>
-        <li class="nav-item">
-          <%= active_link_to Spree.t(:properties), spree.admin_properties_path, class: 'nav-link' %>
-        </li>
+        <%= nav_item(Spree.t(:properties), spree.admin_properties_path) %>
       <% end %>
 
-      <% if defined?(Spree::ExternalCategory) && can?(:manage, Spree::ExternalCategory) %>
-        <li class="nav-item">
-          <%= active_link_to 'Category mapper', spree.admin_external_categories_path, class: 'nav-link' %>
-        </li>
-      <% end %>
+      <%= render_admin_partials(:store_products_nav_partials) %>
     </ul>
     <% end %>
-  </li>
 <% end %>

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

@@ -1,20 +1,13 @@
 <% returns_active = %[customer_returns return_authorizations].include?(controller_name) %>
 
 <% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
-  <li class="nav-item">
-    <%= active_link_to spree.admin_customer_returns_path, class: 'nav-link', active: returns_active do %>
-      <%= icon 'receipt-refund' %>
-      <%= Spree.t(:returns) %>
-    <% end %>
+  <%= 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">
-        <% if can?(:manage, Spree::ReturnAuthorization) %>
-          <li class="nav-item">
-            <%= active_link_to Spree.t(:return_authorizations), spree.admin_return_authorizations_path, class: 'nav-link' %>
-          </li>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
+  <% if returns_active %>
+    <ul class="ml-4 pl-1 mb-2 nav-submenu mt-1">
+      <% if can?(:manage, Spree::ReturnAuthorization) %>
+        <%= nav_item(Spree.t(:return_authorizations), spree.admin_return_authorizations_path) %>
+      <% end %>
+    </ul>
+  <% end %>
 <% end %>

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

@@ -1,3 +1,36 @@
+<% 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="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"
@@ -18,15 +51,11 @@
       <% end if current_store.default_theme && can?(:manage, Spree::Theme) %>
 
       <% if available_stores.count > 1 %>
-        <div class="dropdown-header">
+        <div class="dropdown-divider"></div>
+        <%= link_to "#", class: 'dropdown-item mb-0', data: { toggle: 'modal', target: '#switch-store-modal' } do %>
+          <%= icon 'switch-horizontal' %>
           <%= Spree.t(:switch_store) %>
-        </div>
-        <% available_stores.each do |store| %>
-          <% next if store.id == current_store.id %>
-          <%= link_to store.name, spree.admin_dashboard_url(host: store.url), class: 'dropdown-item' %>
         <% end %>
-
-        <div class="dropdown-divider"></div>
       <% end %>
     </div>
   </div>

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

@@ -5,79 +5,51 @@
     </li>
 
     <% if can?(:manage, current_store) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('building-store', Spree.t(:store_details), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
-      </li>
+      <%= 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) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'receipt', Spree.t(:account), main_app.edit_account_path(current_account), class: 'nav-link' %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link rounded-lg ' %>
-      </li>
+      <%= 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') %>
     <% end %>
 
     <% if can?(:manage, current_store) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('send', Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), class: 'nav-link', active: params[:section] == 'emails') %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('list-check', Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), class: 'nav-link', active: params[:section] == 'policies') %>
-      </li>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('shopping-cart', Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), class: 'nav-link', active: params[:section] == 'checkout') %>
-      </li>
+      <%= nav_item(Spree.t(:emails), spree.edit_admin_store_path(section: 'emails'), icon: 'send', active: params[:section] == 'emails') %>
+      <%= nav_item(Spree.t(:policies), spree.edit_admin_store_path(section: 'policies'), icon: 'list-check', active: params[:section] == 'policies') %>
+      <%= nav_item(Spree.t(:checkout), spree.edit_admin_store_path(section: 'checkout'), icon: 'shopping-cart', active: params[:section] == 'checkout') %>
     <% end %>
 
     <% if can?(:manage, Spree::CustomDomain) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('world-www', Spree.t(:domains), spree.admin_custom_domains_path, class: 'nav-link') %>
-      </li>
+      <%= nav_item(Spree.t(:domains), spree.admin_custom_domains_path, icon: 'world-www') %>
     <% end %>
 
     <% if can?(:manage, Spree::PaymentMethod) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('credit-card', Spree.t(:payments), spree.admin_payment_methods_path, class: 'nav-link') %>
-      </li>
+      <%= nav_item(Spree.t(:payments), spree.admin_payment_methods_path, icon: 'credit-card') %>
     <% end %>
 
     <% if can?(:manage, Spree::Zone) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('world', Spree.t(:zones), spree.admin_zones_path, { active: %w[zones countries states].include?(controller_name), class: 'nav-link' }) %>
-      </li>
+      <%= nav_item(Spree.t(:zones), spree.admin_zones_path, icon: 'world', active: %w[zones countries states].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::ShippingMethod) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('truck', Spree.t(:shipping), spree.admin_shipping_methods_path, { active: %w[shipping_methods shipping_categories].include?(controller_name), class: 'nav-link' }) %>
-      </li>
+      <%= nav_item(Spree.t(:shipping), spree.admin_shipping_methods_path, icon: 'truck', active: %w[shipping_methods shipping_categories].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::TaxRate) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('receipt-tax', Spree.t(:tax), spree.admin_tax_rates_path, active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name), class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:tax), spree.admin_tax_rates_path, icon: 'receipt-tax', active: %w[tax_rates tax_categories stripe_tax_registrations].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::ReturnAuthorizationReason) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('receipt-refund', Spree.t(:returns), spree.admin_return_authorization_reasons_path, active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name), class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:returns), spree.admin_return_authorization_reasons_path, icon: 'receipt-refund', active: %w[refund_reasons reimbursement_types return_authorization_reasons].include?(controller_name)) %>
     <% end %>
 
     <% if can?(:manage, Spree::StockLocation) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('map-pin', Spree.t(:stock_locations), spree.admin_stock_locations_path, class: 'nav-link')  %>
-      </li>
+      <%= nav_item(Spree.t(:stock_locations), spree.admin_stock_locations_path, icon: 'map-pin') %>
     <% end %>
 
     <% if can?(:manage, Spree::Store) %>
       <% if enterprise_edition? %>
-        <li class="nav-item">
-          <%= active_link_to_with_icon('history', Spree.t('admin.audit_log'), spree.admin_audits_path, class: 'nav-link w-auto', active: %w[audits exports imports].include?(controller_name)) %>
-        </li>
+        <%= nav_item(Spree.t('admin.audit_log'), spree.admin_audits_path, icon: 'history', active: %w[audits exports imports].include?(controller_name)) %>
       <% else %>
         <li class="nav-item">
           <%= external_link_to nil, 'https://spreecommerce.org/pricing', class: 'nav-link d-flex align-items-center w-100' do %>
@@ -91,10 +63,10 @@
     <% end %>
 
     <% if can?(:manage, Spree::OauthApplication) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon('terminal', Spree.t(:developers), spree.admin_oauth_applications_path, class: 'nav-link', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
-      </li>
+      <%= nav_item(Spree.t(:developers), spree.admin_oauth_applications_path, icon: 'terminal', active: %w[oauth_applications webhooks_subscribers].include?(controller_name)) %>
     <% end %>
+
+    <%= render_admin_partials(:store_settings_nav_partials) %>
   </ul>
 <% else %>
   <%= render 'spree/admin/shared/sidebar/store_dropdown' %>
@@ -105,6 +77,10 @@
         <%= active_link_to spree.admin_getting_started_path, class: 'nav-link'  do %>
           <%= icon 'map' %>
           <%= Spree.t('admin.getting_started') %>
+
+          <span class="badge ml-auto badge-info">
+            <%= current_store.setup_tasks_done %><span class="opacity-50">/<%= current_store.setup_tasks_total %></span>
+          </span>
         <% end %>
       </li>
     <% end %>
@@ -159,18 +135,18 @@
 
     <%= render 'spree/admin/shared/sidebar/custom_nav' %>
 
+    <%= render_admin_partials(:store_nav_partials) %>
+
     <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' %>
 
-    <li class="nav-item border-top border-top-dashed my-1"></li>
-    <li class="nav-item">
-      <%= active_link_to_with_icon('settings', Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
-    </li>
+    <% 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) %>
-      <li class="nav-item">
-        <%= active_link_to_with_icon 'users', Spree.t(:account_members), main_app.account_members_path(current_account), class: 'nav-link' %>
-      </li>
+      <%= nav_item(Spree.t(:account_members), main_app.account_members_path(current_account), icon: 'users') %>
     <% end %>
   </ul>
 <% end %>