spree_admin 5.0.3 → 5.1.0.beta

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,22 +1,18 @@
 <% 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) %>
       <%= 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') %>
+      <%= render_admin_partials(:store_settings_nav_partials) %>
     <% end %>
 
     <% if can?(:manage, Spree::CustomDomain) %>
@@ -48,7 +44,7 @@
     <% end %>
 
     <% if can?(:manage, Spree::Store) %>
-      <% if enterprise_edition? %>
+      <% if spree.respond_to?(:admin_audits_path) %>
         <%= 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">
@@ -66,11 +62,9 @@
       <%= 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) %>
+    <%= 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">
@@ -106,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">
@@ -140,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) %>
@@ -17,6 +19,8 @@
       <% if can?(:manage, current_store) %>
         <%= nav_item(Spree.t(:settings), spree.edit_admin_storefront_path) %>
       <% end %>
+
+      <%= render_admin_partials(:storefront_nav_partials) %>
     </ul>
   <% end %>
 <% end %>

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>

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

@@ -1,141 +1,14 @@
 <div class="row">
   <div class="col-lg-6">
-    <div class="card mb-4">
-      <div class="card-body">
-        <div class="row">
-          <div class="col-lg-6">
-            <div class="form-group">
-              <%= f.label :name, Spree.t(:name) %>
-              <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-              <%= f.error_message_on :name %>
-            </div>
-
-            <p class="form-text text-muted small mt-2">
-              This will be displayed to customers.
-            </p>
-          </div>
-
-          <div class="col-lg-6">
-            <div class="form-group">
-              <%= f.label :display_on %>
-              <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select' } %>
-              <%= f.error_message_on :display_on %>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:tracking_url) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <div class="form-group">
-          <%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
-          <%= f.error_message_on :tracking_url %>
-        </div>
-
-        <p class="form-text text-muted small mt-2">
-          <code>:tracking</code>
-          <span>will be replaced with the tracking number.</span>
-        </p>
-      </div>
-    </div>
-
-    <div class="card mb-4">
-      <div class="card-header d-flex align-items-center">
-        <h5 class="card-title">
-          <%= Spree.t(:zones) %>
-        </h5>
-
-        <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
-      </div>
-
-      <div class="card-body">
-        <div class="form-group">
-          <% @available_zones.each do |zone| %>
-            <div class="custom-control custom-checkbox mb-2">
-              <%= check_box_tag('shipping_method[zone_ids][]', zone.id, @shipping_method.zone_ids.include?(zone.id), id: "shipping_method_zones_#{zone.id}", class: 'custom-control-input') %>
-              <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label' do %>
-                <span ><%= zone.name.gsub('_',  ' ') %></span>
-                <p class="text-muted small mb-0">
-                  <%= zone.zone_members.map {|zone_member| zone_member.zoneable.name }.join(', ') %>
-                </p>
-              <% end %>
-            </div>
-          <% end %>
-          <%= f.error_message_on :zone_id %>
-        </div>
-      </div>
-    </div>
-
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:shipping_categories) %>
-        </h5>
-      </div>
-
-      <div class="card-body">
-        <div class="form-group">
-          <% @shipping_categories.each do |category| %>
-            <div class="custom-control custom-checkbox mb-2">
-              <%= check_box_tag('shipping_method[shipping_category_ids][]', category.id, @shipping_method.shipping_categories.include?(category), id: "shipping_method_categories_#{category.id}", class: 'custom-control-input') %>
-              <%= label_tag "shipping_method_categories_#{category.id}", class: 'custom-control-label' do %>
-                <%= category.name.gsub('_',  ' ') %>
-              <% end %>
-            </div>
-          <% end %>
-          <%= f.error_message_on :shipping_category_id %>
-        </div>
-      </div>
-    </div>
-
-    <% if can?(:manage, Spree::TaxCategory) %>
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title">
-            <%= Spree.t(:tax_category) %>
-          </h5>
-        </div>
-
-        <div class="card-body">
-          <div class="form-group">
-            <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
-            <%= f.error_message_on :tax_category %>
-          </div>
-        </div>
-      </div>
-    <% end %>
+    <%= render 'spree/admin/shipping_methods/form/display', f: f %>
+    <%= render 'spree/admin/shipping_methods/form/tracking_url', f: f %>
+    <%= render 'spree/admin/shipping_methods/form/zones', f: f %>
+    <%= render 'spree/admin/shipping_methods/form/shipping_categories', f: f %>
+    <%= render 'spree/admin/shipping_methods/form/tax_category', f: f %>
   </div>
   <div class="col-lg-6">
     <%= render partial: 'spree/admin/shared/calculator_fields', locals: { f: f, calculators: @calculators } %>
-
-    <div class="card mb-4 tax_categories">
-      <div class="card-header">
-        <h5 class="card-title">
-          <%= Spree.t(:estimated_transit_business_days) %>
-        </h5>
-      </div>
-      <div class="card-body">
-        <div class="alert alert-info">
-          This is the estimated number of business days it will take for the package to arrive at the customer's address.
-          It will be displayed on the checkout page.
-        </div>
-        <div class="row">
-          <div class="col">
-            <%= f.label :estimated_transit_business_days_min, Spree.t(:min) %>
-            <%= f.number_field :estimated_transit_business_days_min, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:min), min: 1 %>
-          </div>
-          <div class="col">
-            <%= f.label :estimated_transit_business_days_max, Spree.t(:max) %>
-            <%= f.number_field :estimated_transit_business_days_max, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:max), min: 1 %>
-          </div>
-        </div>
-      </div>
-    </div>
+    <%= render 'spree/admin/shipping_methods/form/estimated_transit_business_days', f: f %>
+    <%= render_admin_partials(:shipping_method_form_partials, f: f, shipping_method: @shipping_method) %>
   </div>
 </div>

data/app/views/spree/admin/shipping_methods/form/_display.html.erb

@@ -0,0 +1,25 @@
+<div class="card mb-4">
+  <div class="card-body">
+    <div class="row">
+      <div class="col-lg-6">
+        <div class="form-group">
+          <%= f.label :name, Spree.t(:name) %>
+          <%= f.text_field :name, class: 'form-control', required: true, autofocus: f.object.new_record? %>
+          <%= f.error_message_on :name %>
+        </div>
+
+        <p class="form-text text-muted small mt-2">
+          This will be displayed to customers.
+        </p>
+      </div>
+
+      <div class="col-lg-6">
+        <div class="form-group">
+          <%= f.label :display_on %>
+          <%= f.select :display_on, display_on_options, {}, { class: 'custom-select custom-select' } %>
+          <%= f.error_message_on :display_on %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shipping_methods/form/_estimated_transit_business_days.html.erb

@@ -0,0 +1,23 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:estimated_transit_business_days) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="alert alert-info">
+      This is the estimated number of business days it will take for the package to arrive at the customer's address.
+      It will be displayed on the checkout page.
+    </div>
+    <div class="row">
+      <div class="col">
+        <%= f.label :estimated_transit_business_days_min, Spree.t(:min) %>
+        <%= f.number_field :estimated_transit_business_days_min, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:min), min: 1 %>
+      </div>
+      <div class="col">
+        <%= f.label :estimated_transit_business_days_max, Spree.t(:max) %>
+        <%= f.number_field :estimated_transit_business_days_max, class: 'form-control w-auto', size: 2, placeholder: Spree.t(:max), min: 1 %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shipping_methods/form/_shipping_categories.html.erb

@@ -0,0 +1,21 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:shipping_categories) %>
+    </h5>
+  </div>
+
+  <div class="card-body">
+    <div class="form-group">
+      <% @shipping_categories.each do |category| %>
+        <div class="custom-control custom-checkbox mb-2">
+          <%= check_box_tag('shipping_method[shipping_category_ids][]', category.id, @shipping_method.shipping_categories.include?(category), id: "shipping_method_categories_#{category.id}", class: 'custom-control-input') %>
+          <%= label_tag "shipping_method_categories_#{category.id}", class: 'custom-control-label' do %>
+            <%= category.name.gsub('_',  ' ') %>
+          <% end %>
+        </div>
+      <% end %>
+      <%= f.error_message_on :shipping_category_id %>
+    </div>
+  </div>
+</div>

data/app/views/spree/admin/shipping_methods/form/_tax_category.html.erb

@@ -0,0 +1,16 @@
+<% if can?(:manage, Spree::TaxCategory) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title">
+        <%= Spree.t(:tax_category) %>
+      </h5>
+    </div>
+
+    <div class="card-body">
+      <div class="form-group">
+        <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'custom-select' }) %>
+        <%= f.error_message_on :tax_category %>
+      </div>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/shipping_methods/form/_tracking_url.html.erb

@@ -0,0 +1,18 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title">
+      <%= Spree.t(:tracking_url) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.url_field :tracking_url, class: 'form-control', placeholder: Spree.t(:tracking_url_placeholder) %>
+      <%= f.error_message_on :tracking_url %>
+    </div>
+
+    <p class="form-text text-muted small mt-2">
+      <code>:tracking</code>
+      <span>will be replaced with the tracking number.</span>
+    </p>
+  </div>
+</div>

data/app/views/spree/admin/shipping_methods/form/_zones.html.erb

@@ -0,0 +1,26 @@
+<div class="card mb-4">
+  <div class="card-header d-flex align-items-center">
+    <h5 class="card-title">
+      <%= Spree.t(:zones) %>
+    </h5>
+
+    <%= link_to_with_icon('adjustments', Spree.t('admin.manage_zones'), spree.admin_zones_path, class: 'btn btn-sm btn-light ml-auto h-100') if can?(:manage, Spree::Zone) %>
+  </div>
+
+  <div class="card-body">
+    <div class="form-group">
+      <% @available_zones.each do |zone| %>
+        <div class="custom-control custom-checkbox mb-2">
+          <%= check_box_tag('shipping_method[zone_ids][]', zone.id, @shipping_method.zone_ids.include?(zone.id), id: "shipping_method_zones_#{zone.id}", class: 'custom-control-input') %>
+          <%= label_tag "shipping_method_zones_#{zone.id}", class: 'custom-control-label' do %>
+            <span ><%= zone.name.gsub('_',  ' ') %></span>
+            <p class="text-muted small mb-0">
+              <%= zone.zone_members.map {|zone_member| zone_member.zoneable.name }.join(', ') %>
+            </p>
+          <% end %>
+        </div>
+      <% end %>
+      <%= f.error_message_on :zone_ids %>
+    </div>
+  </div>
+</div>

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

@@ -15,7 +15,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(:zone) %></th>

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

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

data/app/views/spree/admin/stock_locations/_stock_location.html.erb

@@ -7,16 +7,18 @@
   <td data-action="click->row-link#openLink">
     <%= active_badge(stock_location.active?) %>
   </td>
-  <td data-action="click->row-link#openLink"><%= active_badge(stock_location.default?) %></td>
+  <% if can?(:mark_as_default, Spree::StockLocation) %>
+    <td data-action="click->row-link#openLink"><%= active_badge(stock_location.default?) %></td>
+  <% end %>
   <td class="actions">
     <% if can? :edit, stock_location %>
       <div class="d-flex justify-content-end align-items-center">
         <div><%= link_to_edit stock_location, data: { row_link_target: 'link' } %></div>
 
-        <% unless stock_location.default? %>
+        <% if !stock_location.default? && can?(:mark_as_default, Spree::StockLocation) %>
           <div class="dropdown">
             <button class="btn btn-sm btn-light h-100" type="button" id="dropdownMenuButton" 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">
               <%= link_to_with_icon 'check',

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

@@ -9,12 +9,14 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th><%= Spree.t(:name) %></th>
             <th><%= Spree.t(:country) %></th>
             <th><%= Spree.t(:active) %>?</th>
-            <th><%= Spree.t(:default) %>?</th>
+            <% if can?(:mark_as_default, Spree::StockLocation) %>
+              <th><%= Spree.t(:default) %>?</th>
+            <% end %>
             <th></th>
           </tr>
         </thead>

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

@@ -15,7 +15,7 @@
   <% if @collection.any? %>
     <div class="table-responsive">
       <table class="table" id="listing_products">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th scope="col"><%= Spree.t(:number) %></th>
             <th scope="col"><%= Spree.t(:reference) %></th>