spree_admin 5.0.6 → 5.1.0.beta

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>

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

@@ -10,7 +10,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/store_credits/_list.html.erb

@@ -1,7 +1,7 @@
 <% if @store_credits.any? %>
   <div class="table-responsive">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <th><%= Spree.t(:currency) %></th>
         <th><%= Spree.t('store_credit.allocated') %></th>
         <th><%= Spree.t('store_credit.authorized') %></th>

data/app/views/spree/admin/stores/edit_emails.html.erb

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :set_customer_support_email, class: 'w-100' do %>
   <%= form_for current_store, url: spree.admin_store_path, as: :store do |f| %>
     <div class="form-group">
-      <%= f.label :customer_support_email, 'Customer support email' %>
+      <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
       <%= f.email_field :customer_support_email, class: 'form-control', required: true %>
     </div>
     <div class="d-flex justify-content-between">

data/app/views/spree/admin/stores/form/_emails.html.erb

@@ -1,5 +1,5 @@
 <%= content_for(:page_title) do %>
-  Email settings
+  <%= Spree.t(:emails) %>
 <% end %>
 
 <div class="row">

data/app/views/spree/admin/tax_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><%= Spree.t(:tax_code) %></th>

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

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

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

@@ -17,7 +17,7 @@
   <% if @taxonomies.present? %>
     <div class="table-responsive">
       <table class="table" id='listing_taxonomies'>
-        <thead class="text-muted">
+        <thead>
           <tr data-hook="listing_taxonomies_header">
             <th class="no-border handel-head"></th>
             <th><%= Spree.t(:name) %></th>

data/app/views/spree/admin/themes/_theme.html.erb

@@ -1,13 +1,15 @@
 <tr id="<%= spree_dom_id theme %>">
   <td class="w-70 p-0">
     <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3' do %>
-      <%= render 'spree/admin/themes/theme_preview_image', theme: theme %>
+      <div class="w-20">
+        <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'img-thumbnail w-100' %>
+      </div>
 
-      <div class="d-flex flex-column ml-3">
+      <div class="d-flex flex-column ml-3 w-80">
         <strong><%= theme.name %></strong>
         <p class="mb-0 mt-1">
           <span class="text-muted">
-            <%= Spree.t(:updated) %>: 
+            <%= Spree.t(:updated_at) %>: 
             <%= local_time_ago(theme.updated_at, class: 'with-tip') %>
           </span>
         </p>
@@ -38,7 +40,7 @@
         <%= link_to Spree.t('actions.publish'), publish_admin_theme_path(theme), class: 'btn btn-sm btn-light mr-2', data: { turbo_method: :put } unless theme.default? %>
         <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_edit theme, class: 'dropdown-item' %>

data/app/views/spree/admin/themes/_theme_preview_image.html.erb

@@ -1,15 +1,17 @@
 <% width ||= 120 %>
 <% height ||= 72 %>
+<% css_class ||= 'img-thumbnail border-0' %>
 
 <% if theme.screenshot.attached? && theme.screenshot.variable? %>
-  <%= spree_image_tag(theme.screenshot, width: width, height: height, class: 'img-thumbnail', style: "width: #{width}px; height: #{height}px", loading: :lazy) %>
+  <%= image_tag(spree_image_url(theme.screenshot, width: width, height: height), class: css_class, loading: :lazy) %>
 <% elsif theme.class.preview_image_url.present? %>
   <%= image_tag(
   theme.class.preview_image_url,
-  class: 'img-thumbnail',
-  style: "width: #{width}px; height: #{height}px",
+  class: css_class,
   loading: :lazy
 ) %>
 <% else %>
-  <%= render 'spree/admin/shared/no_image', width: width, height: height %>
+  <div class="rounded bg-light text-muted d-flex align-items-center justify-content-center img-fluid" style="height: <%= height %>px">
+    <%= icon('camera-off', class: 'text-muted opacity-50') %>
+  </div>
 <% end %>

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

@@ -29,7 +29,7 @@
 <div class="card-lg">
   <div class="table-responsive rounded-lg">
     <table class="table">
-      <thead class="text-muted">
+      <thead>
         <tr>
           <th class="bg-transparent"><%= Spree.t(:theme) %></th>
           <th class="bg-transparent"><%= Spree.t(:status) %></th>

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

@@ -15,10 +15,10 @@
     <%= turbo_frame_tag :translations_table, class: "table-responsive border rounded bg-white my-3", refresh: "morph" do %>
       <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
       <table class="table">
-        <thead class="text-muted">
+        <thead>
           <tr>
             <th scope="col" class="text-center"><%= Spree.t(:field) %></th>
-            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
+            <th scope="col" class="text-center" style="width: 40%;"><%= Spree.t('i18n.this_file_language', locale: :en) %> (<%= Spree.t(:default) %>)</th>
             <th scope="col" class="text-center"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
           </tr>
         </thead>

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

@@ -0,0 +1,21 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:change_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }, data: { turbo_frame: :_top, turbo: false }) do |f| %>
+  <%= render partial: 'spree/admin/shared/error_messages', locals: { target: resource } %>
+  <%= f.hidden_field :reset_password_token %>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <% if @minimum_password_length %>
+      <em>(<%= @minimum_password_length %> characters minimum)</em>
+    <% end %>
+    <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password_confirmation, Spree.t(:confirm_password), required: true, class: 'form-label' %>
+    <%= f.password_field :password_confirmation, autocomplete: "new-password", class: 'form-control form-control-lg rounded-sm', min: @minimum_password_length %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,12 @@
+<% content_for(:title, Spree.t(:forgot_password)) %>
+
+<h1 class="mb-3 font-weight-light"><%= Spree.t(:forgot_password) %></h1>
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), data: { turbo_frame: :_top }) do |f| %>
+  <div class="form-group mb-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@apple.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:reset_password), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -0,0 +1,16 @@
+<% content_for(:title, Spree.t(:login)) %>
+
+<h1 class="mb-3 font-weight-light">Welcome back</h1>
+<%= form_for resource, as: resource_name, url: session_path(resource_name), data: { controller: 'enable-button', turbo: false } do |f| %>
+  <div class="form-group mb-3">
+    <%= f.label :email, Spree.t(:email), required: true, class: 'form-label' %>
+    <%= f.email_field :email, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: 'steve@getvendo.com', data: { enable_button_target: :input }, autocomplete: :email, autofocus: true %>
+  </div>
+  <div class="form-group mb-3">
+    <%= f.label :password, Spree.t(:password), required: true, class: 'form-label' %>
+    <%= f.password_field :password, required: true, class: 'form-control form-control-lg rounded-sm', placeholder: '********', autocomplete: 'current-password' %>
+  </div>
+  <%= render 'spree/admin/shared/devise/links', f: f %>
+  <%= turbo_save_button_tag Spree.t(:login), class: 'btn btn-primary btn-lg w-100' %>
+<% end %>
+

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

@@ -22,13 +22,15 @@
   <%= f.label :tag_list, Spree.t(:tags) %>
   <%= tom_select_tag 'user[tag_list]', multiple: true, class: 'w-100', options: user_tags_json_array, active_option: @user.tag_list, value_field: :name, create: true %>
 </div>
-<div class="form-group">
-  <%= f.label :spree_role_ids, Spree.t(:roles) %>
-  <%= f.select :spree_role_ids,
-          options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
-          { prompt: false },
-          { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
-</div>
+<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>
+  <div class="form-group">
+    <%= f.label :spree_role_ids, Spree.t(:roles) %>
+    <%= f.select :spree_role_ids,
+            options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
+            { prompt: false },
+            { multiple: true,  data: { controller: 'autocomplete-select' } } %>          
+  </div>
+<% end %>
 <div class="custom-control custom-checkbox mb-3">
   <%= f.check_box :accepts_email_marketing, class: 'custom-control-input' %>
   <%= f.label :accepts_email_marketing, Spree.t(:accepts_email_marketing), class: 'custom-control-label' %>

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

@@ -2,7 +2,7 @@
   <td class="pr-0 w-5">
     <%= bulk_operations_checkbox(user) %>
   </td>
-  <td class='w-50 no-wrap py-0 pl-1 pr-0'>
+  <td class='w-50 text-nowrap py-0 pl-1 pr-0'>
     <%= render 'spree/admin/shared/user', user: user %>
   </td>
   <td class="cursor-pointer" data-action="click->row-link#openLink">
@@ -12,7 +12,7 @@
     <%= customer_location_flag(user) %>
     <%= customer_location(user) %>
   </td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
-  <td class='w-10 no-wrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.completed_orders_for_store(current_store).count %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= user.display_amount_spent_in(current_currency) %></td>
+  <td class='w-10 text-nowrap cursor-pointer' data-action="click->row-link#openLink"><%= local_time(user.created_at) %></td>
 </tr>

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

@@ -43,7 +43,7 @@
 
         <div class="table-responsive">
           <table class="table" id="listing_users">
-            <thead class="text-muted">
+            <thead>
               <tr data-hook="admin_users_index_headers">
                 <th scope="col" class="pr-0 w-5">
                   <%= bulk_operations_select_all_checkbox %>

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

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= page_header_back_button spree.admin_users_path %>
-  <%= Spree.t(:new_user) %>
+  <%= Spree.t(:new_customer) %>
 <% end %>
 
 <%= form_for [:admin, @user], url: spree.admin_users_path, method: :post do |f| %>

data/app/views/spree/admin/variants/_search_result.html.erb

@@ -1,6 +1,6 @@
 <div class="search-picker__option <% if variant.purchasable? || params[:all] %>cursor-pointer<% else %>opacity-50 disabled<% end %>" data-action="click->search-picker#toggle">
   <%= radio_button_tag "#{params[:param_name]}[variant_id]", variant.id, false, class: "custom-control-input", id: "ids_#{variant.id}", data: { action: 'search-picker#toggle', search_picker_target: "checkbox" }, disabled: !params[:all] && !variant.purchasable? %>
-  <label for="ids_<%= variant.id %>" class="pr-2">
+  <label for="ids_<%= variant.id %>" class="pr-2 <% unless variant.purchasable? %>cursor-not-allowed<% end %>">
     <div class="w-70 d-flex align-items-center">
       <div class="variant-image">
         <%= render 'spree/admin/shared/product_image', object: variant %>