spree_admin 5.1.8 → 5.2.0.rc1

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

@@ -1,23 +1 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button spree.admin_taxonomies_path %>
-  <%= Spree.t(:new_taxonomy) %>
-<% end %>
-
-<div class="row">
-  <div class="col-lg-6 offset-lg-3">
-    <%= form_for [:admin, @taxonomy] do |f| %>
-      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
-      <div class="card mb-4">
-        <div class="card-body">
-          <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @taxonomy } %>
-          <div class="form-group">
-            <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-            <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
-            <%= f.error_message_on :name %>
-          </div>
-        </div>
-      </div>
-      <%= render 'spree/admin/shared/new_resource_links' %>
-    <% end %>
-  </div>
-</div>
+<%= render 'spree/admin/shared/new_resource' %>

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

@@ -2,25 +2,8 @@
   <div class="col-lg-8">
     <div class="card mb-4">
       <div class="card-body pb-0 pt-3">
-        <div class="form-group">
-          <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
-          <%= f.text_field :name,
-                class: 'form-control',
-                required: true,
-                autofocus: @taxon.new_record?,
-                data: {
-                  seo_form_target: 'sourceTitleInput',
-                  slug_form_target: 'name',
-                  action: 'slug-form#updateUrlFromName'
-                } %>
-          <%= f.error_message_on :name %>
-        </div>
-        <div class="form-group">
-          <%= f.label :description, Spree.t(:description) %>
-          <div class="trix-container">
-            <%= f.rich_text_area :description, data: { seo_form_target: 'sourceDescriptionInput' } %>
-          </div>
-        </div>
+        <%= f.spree_text_field :name, required: true, autofocus: @taxon.new_record?, data: { seo_form_target: 'sourceTitleInput', slug_form_target: 'name', action: 'slug-form#updateUrlFromName' } %>
+        <%= f.spree_rich_text_area :description, data: { seo_form_target: 'sourceDescriptionInput' } %>
       </div>
     </div>
 
@@ -71,16 +54,13 @@
           </h5>
 
           <% if @taxon.manual? && can?(:create, Spree::Classification) %>
-            <span data-toggle="modal" data-target="#modal">
-              <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-light btn-sm', data: { turbo_frame: 'dialog_modal' } %>
-            </span>
+            <%= link_to_with_icon 'plus', Spree.t(:add_products), spree.new_admin_taxon_classification_path(@taxon.id), class: 'btn btn-secondary btn-sm', data: { turbo_frame: 'dialog', action: 'dialog#open' } %>
           <% end %>
         </div>
 
-        <div class="card-body border-bottom">
+        <div class="card-body border-bottom pb-0">
           <div class="d-flex align-items-center">
-            <%= f.label :sort_order, class: 'text-nowrap mr-2 mb-0' %>
-            <%= f.select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto',  data: { action: 'change->auto-submit#submit' } } %>n sort order dropdown in admin (#13030))
+            <%= f.spree_select :sort_order, taxon_sort_options_for_select, {}, { class: 'custom-select custom-select-sm w-auto ml-2',  data: { action: 'change->auto-submit#submit' } } %>
           </div>
         </div>
 
@@ -127,11 +107,7 @@
         <% else %>
           <% disabled = @taxon.root? %>
         <% end %>
-        <div class="form-group">
-          <%= f.label :parent_id, Spree.t('admin.navigation.nested_under') %>
-          <%= f.select :parent_id, nested_set_options(@taxonomy.taxons.includes(:parent), @taxon) {|i| i.pretty_name }, { include_blank: false }, { data: { controller: 'autocomplete-select' }, disabled: disabled  } %>
-          <%= f.error_message_on :parent_id %>
-        </div>
+        <%= f.spree_select :parent_id, nested_set_options(@taxonomy.taxons.includes(:parent), @taxon) {|i| i.pretty_name }, { include_blank: false, label: Spree.t('admin.navigation.nested_under'), autocomplete: true }, { disabled: disabled } %>
       </div>
     </div>
 

data/app/views/spree/admin/taxons/_rule_form.html.erb

@@ -15,9 +15,10 @@
     <%= render "spree/admin/taxons/rule_forms/#{rf.object.type.demodulize.underscore}", rule_form: rf %>
   </div>
   <div class="col-lg-1 mb-3 d-flex align-items-center justify-content-center">
-    <button type="button" data-action="nested-form#remove" class="btn btn-sm btn-danger px-2 with-tip" title="Remove condition">
+    <button type="button" data-action="nested-form#remove" class="btn btn-sm btn-danger px-2" data-controller="tooltip" aria-label="<%= Spree.t(:remove_condition) %>">
       <%= icon('x', class: 'mr-0') %>
       <span class="d-lg-none"><%= Spree.t(:remove_condition) %></span>
+      <%= tooltip(Spree.t(:remove_condition)) %>
     </button>
     <%= rf.hidden_field :_destroy if rf.object.persisted? %>
   </div>

data/app/views/spree/admin/taxons/_rules_form.html.erb

@@ -26,7 +26,7 @@
     <!-- Inserted elements will be injected before that target. -->
     <div data-nested-form-target="target" class="mb-2"></div>
 
-    <button type="button" class="btn btn-link w-100 py-3" data-action="nested-form#add">
+    <button type="button" class="btn btn-secondary w-100 py-3" data-action="nested-form#add">
       <%= icon('plus', class: 'mr-2') %>
       <%= Spree.t(:add_one)%>
     </button>

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

@@ -4,7 +4,6 @@
 <% end %>
 
 <% content_for :page_actions_dropdown do %>
-  <%= link_to_edit_translations(@taxon) %>
   <%= external_page_preview_link(@taxon, name: Spree.t(:taxonomy)) %>
 <% end %>
 

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

@@ -1,6 +1,6 @@
 <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 %>
+    <%= link_to theme.ready? ? spree.edit_admin_theme_path(theme) : '#', class: 'd-flex align-items-top p-3', data: { turbo_prefetch: false } do %>
       <div class="w-20">
         <%= render 'spree/admin/themes/theme_preview_image', theme: theme, css_class: 'img-thumbnail w-100' %>
       </div>
@@ -10,7 +10,7 @@
         <p class="mb-0 mt-1">
           <span class="text-muted">
             <%= Spree.t(:updated_at) %>: 
-            <%= local_time_ago(theme.updated_at, class: 'with-tip') %>
+            <%= spree_time_ago(theme.updated_at) %>
           </span>
         </p>
       </div>
@@ -38,17 +38,18 @@
     <% if theme.ready? %>
       <div class="d-flex justify-content-end w-100">
         <%= 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">
+        <%= dropdown do %>
+          <%= dropdown_toggle class: 'btn-light btn-sm' do %>
             <%= icon('dots-vertical', class: 'mr-0') %>
-          </button>
-          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton">
-            <%= link_to_edit theme, class: 'dropdown-item' %>
+          <% end %>
+          <%= dropdown_menu do %>
+            <%= link_to_edit theme, class: 'dropdown-item', data: { turbo_prefetch: false } %>
             <%= link_to_with_icon 'copy', Spree.t(:clone), spree.clone_admin_theme_path(theme), class: 'dropdown-item', data: { turbo_method: :post } %>
             <% unless theme.default? %>
             <%= link_to_delete(theme, icon: 'trash', class: 'dropdown-item btn-danger shadow-none') if can?(:delete, theme) %>
           <% end %>
-        </div>
+          <% end %>
+        <% end %>
       </div>
     <% end %>
   </td>

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

@@ -4,7 +4,7 @@
 
 <%= content_for :page_actions do %>
   <%= render_admin_partials(:themes_actions_partials) %>
-  <%= link_to_with_icon 'eye', Spree.t(:view_your_store), current_store.formatted_url_or_custom_domain, class: 'btn btn-light bg-transparent', target: '_blank' %>
+  <%= link_to_with_icon 'eye', Spree.t(:view_your_store), current_store.formatted_url_or_custom_domain, class: 'btn btn-light', target: '_blank' %>
 <% end %>
 
 <%= content_for :page_alerts do %>
@@ -21,7 +21,7 @@
         <span>
           You don't have domain connected to your store
         </span>
-        <%= link_to 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-link ml-3' %>
+        <%= link_to 'Connect your own domain', spree.admin_custom_domains_path, class: 'btn btn-secondary ml-3' %>
       </div>
     </div>
   <% end %>
@@ -30,20 +30,18 @@
 <%= render_admin_partials(:themes_header_partials) %>
 
 <div class="card-lg">
-  <div class="table-responsive rounded-lg">
-    <table class="table">
-      <thead>
-        <tr>
-          <th class="bg-transparent"><%= Spree.t(:theme) %></th>
-          <th class="bg-transparent"><%= Spree.t(:status) %></th>
-          <th class="bg-transparent"></th>
-        </tr>
-      </thead>
-      <tbody>
-        <%= render partial: 'spree/admin/themes/theme', collection: @themes, cached: spree_base_cache_scope %>
-      </tbody>
-    </table>
-  </div>
+  <table class="table">
+    <thead>
+      <tr>
+        <th><%= Spree.t(:theme) %></th>
+        <th><%= Spree.t(:status) %></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%= render partial: 'spree/admin/themes/theme', collection: @themes, cached: spree_base_cache_scope %>
+    </tbody>
+  </table>
 </div>
 
 <% if available_themes.any? %>

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

@@ -1,55 +1,40 @@
-<% content_for :page_title do %>
-  <%= page_header_back_button @back_path %>
-  <span class="mr-3"><%= Spree.t(:translations_for, resource_name: @resource.try(:name)) %></span>
-<% end %>
-<% if @locales.any?%>
-  <% if @locales.many? %>
-    <%= form_with url: spree.edit_admin_translation_path(@resource, resource_type: @resource.class.to_s), class: "w-100 d-flex justify-content-end mb-3", data: { controller: 'auto-submit', turbo_frame: 'translations_table'}, method: :get do |f| %>
-      <div class="form-inline gap-2">
-        <%= f.label :translation_locale, Spree.t(:language) %>
-        <%= f.select :translation_locale, options_for_select(@locales.map { |locale| [Spree.t('i18n.this_file_language', locale: locale), locale] }, @selected_translation_locale), {}, { class: 'custom-select', data: { action: 'change->auto-submit#submit' } } %>
+<%= turbo_frame_tag :drawer do %>
+  <%= drawer_header(Spree.t(:translations)) %>
+  <% if @locales.any? %>
+    <%= form_for @object, url: spree.admin_translation_path(@object.id, resource_type: model_class.to_s), method: :put do |f| %>
+      <div class="drawer-body">
+        <ul class="nav nav-pills mb-3">
+          <% @locales.each do |locale| %>
+            <% normalized = normalized_locale(locale) %>
+            <%= nav_item(
+                 Spree.t('i18n.this_file_language', locale: locale),
+                 spree.edit_admin_translation_path(@object, resource_type: model_class.to_s, translation_locale: locale),
+                 active: (normalized == @selected_translation_locale)
+      
+                ) %>
+          <% end %>
+        </ul>
+
+        <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
+        <% options = { f: f, resource: @object, locale: @selected_translation_locale } %>
+
+        <%= render "spree/admin/translations/#{model_class.name.demodulize.underscore.pluralize}/form", options %>
+      </div>
+      <div class="drawer-footer">
+        <%= turbo_save_button_tag %>
+        <%= drawer_discard_button %>
       </div>
     <% end %>
-  <% end %>
-  <%= form_with model: @resource, url: spree.admin_translation_path(@resource, resource_type: @resource.class.to_s), method: :put, class: 'form-horizontal' do |f| %>
-    <div class="card mb-4">
-      <div class="card-body p-0">
-        <%= turbo_frame_tag :translations_table, refresh: "morph" do %>
-          <%= hidden_field_tag :translation_locale, @selected_translation_locale %>
-          <table class="table">
-            <thead>
-              <tr>
-                <th scope="col" class="w-10"><%= Spree.t(:field) %></th>
-                <th scope="col" class="w-40"><%= Spree.t('i18n.this_file_language', locale: @default_locale) %> (<%= Spree.t(:default) %>)</th>
-                <th scope="col" class="w-50"><%= Spree.t('i18n.this_file_language', locale: @selected_translation_locale) %></th>
-              </tr>
-            </thead>
-            <tbody>
-              <% options = { f: f, resource: @resource, locale: @selected_translation_locale } %>
-              <% case @resource.class.name %>
-              <% when 'Spree::OptionType' %>
-                <%= render 'spree/admin/translations/option_types/form', options %>
-              <% when 'Spree::Product' %>
-                <%= render 'spree/admin/translations/products/form', options %>
-              <% when 'Spree::Property' %>
-                <%= render 'spree/admin/translations/properties/form', options %>
-              <% when 'Spree::Store' %>
-                <%= render 'spree/admin/translations/stores/form', options %>
-              <% when 'Spree::Taxon' %>
-                <%= render 'spree/admin/translations/taxons/form', options %>
-              <% when 'Spree::Taxonomy' %>
-                <%= render 'spree/admin/translations/taxonomies/form', options %>
-              <% end %>
-            </tbody>
-          </table>
+  <% else %>
+    <div class="drawer-body">
+      <div class="text-muted p-5 d-flex align-items-center w-100 justify-content-center flex-column">
+        <%= icon 'language', class: 'mb-3 opacity-50', style: 'font-size: 2rem;' %>
+        <p class="text-center"><%= Spree.t('admin.translations.no_translations_configured') %></p>
+
+        <% if can?(:edit, current_store) %>
+          <%= link_to_with_icon 'settings', Spree.t('admin.translations.configure_store'), spree.edit_admin_store_path(section: 'general-settings'), class: 'btn btn-primary', data: { 'turbo-frame': '_top' } %>
         <% end %>
       </div>
     </div>
-    <div class="form-actions d-flex justify-content-between">
-      <%= turbo_save_button_tag Spree.t('actions.update') %>
-      <%= link_to Spree.t('actions.discard'), @back_path, class: 'btn btn-light', data: { turbo_frame: '_top' } %>
-    </div>
   <% end %>
-<% else %>
-  <%= render partial: 'spree/admin/translations/translations_unavailable' %>
-<% end %>
+<% end %>

data/app/views/spree/admin/translations/policies/_form.html.erb

@@ -0,0 +1,12 @@
+<%# locals: (f:, resource:, locale:) %>
+
+<% resource.class.translatable_fields.each do |field| %>
+  <% case field %>
+  <% when :name %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+  <% when :body %>
+    <%= render "spree/admin/translations/translation_rows/rich_textarea_row", f: f, field: field, locale: locale %>
+  <% else %>
+    <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
+  <% end %>
+<% end %>

data/app/views/spree/admin/translations/products/_form.html.erb

@@ -10,3 +10,5 @@
     <%= render "spree/admin/translations/translation_rows/text_field_row", f: f, field: field, locale: locale %>
   <% end %>
 <% end %>
+
+<div class="pb-5"></div>

data/app/views/spree/admin/translations/translation_rows/_permalink_field_row.html.erb

@@ -10,24 +10,15 @@
   translated_value = f.object.send("#{field}_#{locale}")&.delete_prefix(base_permalink_translated)
 %>
 
-<tr>
-  <td><%= Spree.t(field) %></td>
-  <td>
-    <code>
-      <%= f.object.permalink %>
-    </code>
-  </td>
-  <td>
-    <div class="form-group">
-      <div class="input-group">
-        <% if base_permalink_translated.present? %>
-          <div class="input-group-prepend">
-            <span class="input-group-text"><%= base_permalink_translated %></span>
-          </div>
-        <% end %>
-
-        <%= f.text_field "#{field}_#{locale}", value: translated_value, class: 'form-control' %>
+<div class="form-group">
+  <%= f.label field, Spree.t(field) %>
+  <div class="input-group">
+    <% if base_permalink_translated.present? %>
+      <div class="input-group-prepend">
+        <span class="input-group-text"><%= base_permalink_translated %></span>
       </div>
-    </div>
-  </td>
-</tr>
+    <% end %>
+
+    <%= f.text_field "#{field}_#{locale}", value: translated_value, class: 'form-control' %>
+  </div>
+</div>

data/app/views/spree/admin/translations/translation_rows/_rich_textarea_row.html.erb

@@ -1,13 +1,3 @@
 <%# locals: (f:, field:, locale:) %>
 
-<tr>
-  <td><%= Spree.t(field) %></td>
-  <td class="text-wrap">
-    <%= @resource.send(field)%>
-  </td>
-  <td>
-    <div class="trix-container mb-0">
-      <%= f.rich_text_area "#{field}_#{locale}" %>
-    </div>
-  </td>
-</tr>
+<%= f.spree_rich_text_area "#{field}_#{locale}", label: Spree.t(field) %>

data/app/views/spree/admin/translations/translation_rows/_text_field_row.html.erb

@@ -1,7 +1,3 @@
 <%# locals: (f:, field:, locale:) %>
 
-<tr>
-  <td><%= Spree.t(field) %></td>
-  <td><%= @resource.send(field) %></td>
-  <td><%= f.text_field "#{field}_#{locale}", class: 'form-control' %></td>
-</tr>
+<%= f.spree_text_field "#{field}_#{locale}", label: Spree.t(field) %>

data/app/views/spree/admin/translations/translation_rows/_textarea_row.html.erb

@@ -1,11 +1,4 @@
 <%# locals: (f:, field:, locale:) %>
 
-<tr>
-  <td><%= Spree.t(field) %></td>
-  <td>
-    <%= @resource.send(field) %>
-  </td>
-  <td>
-    <%= f.text_area "#{field}_#{locale}", rows: 5, class: "form-control", data: { controller: 'textarea-autogrow'} %>
-  </td>
-</tr>
+
+<%= f.spree_text_area "#{field}_#{locale}", label: Spree.t(field) %>

data/app/views/spree/admin/translations/translation_rows/_tinymce_row.html.erb

@@ -1,13 +1,6 @@
 <%# locals: (f:, field:, locale:) %>
 
-<tr>
-  <td><%= Spree.t(field) %></td>
-  <td>
-    <%= @resource.send(field) %>
-  </td>
-  <td>
-    <div class="trix-container">
-      <%= f.text_area "#{field}_#{locale}", rows: 10, class: "form-control spree-rte" %>
-    </div>
-  </td>
-</tr>
+<%= f.label field, Spree.t(field) %>
+<div class="trix-container">
+  <%= f.text_area "#{field}_#{locale}", class: "spree-rte" %>
+</div>

data/app/views/spree/admin/translations/update.turbo_stream.erb

@@ -0,0 +1 @@
+<%= turbo_render_alerts :drawer_alerts %>

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

@@ -1,75 +1,59 @@
-<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
+<%= search_form_for [:admin, @search], url: spree.admin_users_url, class: "filter-wrap", data: {controller: "filters dropdown"} do |f| %>
   <div class="d-flex flex-column flex-lg-row gap-2">
     <%= render 'spree/admin/shared/filters_search_bar', param: :multi_search, placeholder: Spree.t('admin.users.filters.search_placeholder') %>
 
     <%= render 'spree/admin/shared/filters_button' %>
   </div>
-  <div data-reveal-target="item" class="d-none" id="table-filter">
-    <div class="row">
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
-          <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
-        </div>
-      </div>
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :bill_address_lastname_eq, Spree.t(:last_name) %>
-          <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>
-        </div>
-      </div>
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
-          <%= tom_select_tag "q[addresses_country_name_eq]",
-          active_option: params[:q][:addresses_country_name_eq],
-          options: Spree::Country.all.to_tom_select_json,
-          value_field: :name,
-          select_class: "w-100",
-          select_data: {
-            filters_target: "input",
-          } %>
-        </div>
-      </div>
-      <div class="col-12 col-lg-6">
-        <div class="form-group">
-          <%= f.label :tags_name_in, Spree.t(:tags) %>
-          <%= tom_select_tag "q[tags_name_in]",
-          active_option: params[:q][:tags_name_in],
-          options: user_tags_json_array,
-          multiple: true,
-          value_field: :name,
-          select_class: "w-100",
-          select_data: {
-            filters_target: "input",
-          } %>
-        </div>
-      </div>
+  <div data-dropdown-target="menu" id="table-filter" class="hidden">
+    <div class="form-group">
+      <%= f.label :bill_address_firstname_i_cont_any, Spree.t(:first_name) %>
+      <%= f.text_field :bill_address_firstname_i_cont_any, class: "form-control", data: { filters_target: :input } %>
     </div>
-    <div class="row">
-      <div class="col-lg-3">
-        <div class="form-group">
-          <%= f.label :accepts_email_marketing_eq, "Accepts email marketing" %>
-          <%= f.select :accepts_email_marketing_eq,
-                   options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),
-                   { include_blank: true },
-                   { class: "custom-select", data: { filters_target: :input } } %>
-        </div>
-      </div>
-      <div class="col-lg-3">
-        <div class="form-group">
-          <%= f.label :spree_roles_name_in, Spree.t(:roles) %>
-          <%= tom_select_tag "q[spree_roles_name_in]",
-          active_option: params.dig(:q, :spree_roles_name_in),
-          options: user_roles_json_array,
-          multiple: true,
-          value_field: :name,
-          select_class: "w-100",
-          select_data: {
-            filters_target: "input",
-          } %>
-        </div>  
-      </div>
+    <div class="form-group">
+      <%= f.label :bill_address_lastname_eq, Spree.t(:last_name) %>
+      <%= f.text_field :bill_address_lastname_eq, class: "form-control", data: { filters_target: :input } %>
+    </div>
+    <div class="form-group">
+      <%= f.label :addresses_country_name_eq, Spree.t(:location) %>
+      <%= tom_select_tag "q[addresses_country_name_eq]",
+      active_option: params[:q][:addresses_country_name_eq],
+      options: Spree::Country.all.to_tom_select_json,
+      value_field: :name,
+      select_class: "w-100",
+      select_data: {
+        filters_target: "input",
+      } %>
+    </div>
+    <div class="form-group">
+      <%= f.label :tags_name_in, Spree.t(:tags) %>
+      <%= tom_select_tag "q[tags_name_in]",
+      active_option: params[:q][:tags_name_in],
+      options: user_tags_json_array,
+      multiple: true,
+      value_field: :name,
+      select_class: "w-100",
+      select_data: {
+        filters_target: "input",
+      } %>
+    </div>
+    <div class="form-group">
+      <%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %>
+      <%= f.select :accepts_email_marketing_eq,
+                options_for_select([["Yes", true], ["No", false]], params[:q][:accepts_email_marketing_eq]),
+                { include_blank: true },
+                { class: "custom-select", data: { filters_target: :input } } %>
+    </div>
+    <div class="form-group">
+      <%= f.label :spree_roles_name_in, Spree.t(:roles) %>
+      <%= tom_select_tag "q[spree_roles_name_in]",
+      active_option: params.dig(:q, :spree_roles_name_in),
+      options: user_roles_json_array,
+      multiple: true,
+      value_field: :name,
+      select_class: "w-100",
+      select_data: {
+        filters_target: "input",
+      } %>
     </div>
     <%= render_admin_partials(:users_filters_partials, f: f) %>
     <%= render 'spree/admin/shared/filter_submit' %>

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

@@ -1,38 +1,5 @@
-<div class="form-group">
-  <%= f.label :email, raw(Spree.t(:email) + required_span_tag) %>
-  <%= f.email_field :email, class: 'form-control', required: true, autofocus: f.object.new_record? %>
-  <%= f.error_message_on :email %>
-</div>
-<div class="form-group">
-  <%= f.label :first_name, raw(Spree.t(:first_name) + required_span_tag) %>
-  <%= f.text_field :first_name, class: 'form-control', required: true %>
-  <%= f.error_message_on :first_name %>
-</div>
-<div class="form-group">
-  <%= f.label :last_name, raw(Spree.t(:last_name) + required_span_tag) %>
-  <%= f.text_field :last_name, class: 'form-control', required: true %>
-  <%= f.error_message_on :last_name %>
-</div>
-<div class="form-group">
-  <%= f.label :phone, Spree.t(:phone) %>
-  <%= f.text_field :phone, class: 'form-control' %>
-  <%= f.error_message_on :phone %>
-</div>
-<div class="form-group">
-  <%= 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>
-<% 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 class="card mb-4">
+  <div class="card-body">
+    <%= render 'spree/admin/users/form_fields', f: f %>  
   </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' %>
-  <%= f.error_message_on :accepts_email_marketing %>
 </div>

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

@@ -0,0 +1,15 @@
+<%= f.spree_email_field :email, required: true, autofocus: f.object.new_record? %>
+<%= f.spree_text_field :first_name, required: true %>
+<%= f.spree_text_field :last_name, required: true %>
+<%= f.spree_text_field :phone %>
+<div class="form-group">
+  <%= 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>
+<% if @user.class == Spree.admin_user_class && can?(:manage, Spree::Role) %>
+  <%= f.spree_select :spree_role_ids,
+          options_from_collection_for_select(Spree::Role.all, 'id', 'name', @user.spree_roles.pluck(:id)),
+          { prompt: false, label: Spree.t(:roles), autocomplete: true },
+          { multiple: true } %>
+<% end %>
+<%= f.spree_check_box :accepts_email_marketing %>

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

@@ -16,8 +16,9 @@
                   <%= order_payment_state(@last_order, class: 'ml-2') %>
                   <%= order_shipment_state(@last_order, class: 'ml-2') %>
                 </p>
-                <span class="text-muted">
-                  <%= local_time_ago(@last_order.completed_at, class: 'with-tip') %>
+                <span class="text-muted" data-controller="tooltip">
+                  <%= spree_time_ago(@last_order.completed_at) %>
+                  <%= tooltip(spree_time(@last_order.completed_at)) %>
                 </span>
               </div>
               <div class="col-lg-3 text-lg-right font-weight-bold">