spree_backend 4.4.0 → 4.5.0

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

@@ -0,0 +1,53 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t('admin.store.digital_settings.digital_asset_settings') %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="row pb-0">
+      <div class="col-12 col-md-4">
+        <%= f.field_container :digital_asset_authorized_clicks do %>
+          <%= f.label :digital_asset_authorized_clicks, (raw Spree.t('admin.store.digital_settings.digital_asset_authorized_clicks.authorized_clicks') + required_span_tag) %>
+          <%= f.text_field :digital_asset_authorized_clicks, class: 'form-control', required: true %>
+          <%= f.error_message_on :digital_asset_authorized_clicks %>
+        <% end %>
+        <small class="form-text text-muted">
+          <%= Spree.t('admin.store.digital_settings.digital_asset_authorized_clicks.info') %>
+        </small>
+        <%= f.field_container :limit_digital_download_count, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+          <%= f.check_box :limit_digital_download_count, class: 'custom-control-input' %>
+          <%= f.label :limit_digital_download_count, Spree.t('admin.store.digital_settings.limit_digital_download_count'), class: 'custom-control-label' %>
+          <%= f.error_message_on :limit_digital_download_count %>
+        <% end %>
+      </div>
+
+      <div class="col-12 col-md-4">
+        <%= f.field_container :digital_asset_authorized_days do %>
+          <%= f.label :digital_asset_authorized_days, (raw Spree.t('admin.store.digital_settings.digital_asset_authorized_days.authorized_days') + required_span_tag) %>
+          <%= f.text_field :digital_asset_authorized_days, class: 'form-control', required: true %>
+          <%= f.error_message_on :digital_asset_authorized_days %>
+        <% end %>
+        <small class="form-text text-muted">
+          <%= Spree.t('admin.store.digital_settings.digital_asset_authorized_days.info') %>
+        </small>
+        <%= f.field_container :limit_digital_download_days, class: ['custom-control', 'custom-checkbox', 'my-4'] do %>
+          <%= f.check_box :limit_digital_download_days, class: 'custom-control-input' %>
+          <%= f.label :limit_digital_download_days, Spree.t('admin.store.digital_settings.limit_digital_download_days'), class: 'custom-control-label' %>
+          <%= f.error_message_on :limit_digital_download_days %>
+        <% end %>
+      </div>
+
+      <div class="col-12 col-md-4">
+        <%= f.field_container :digital_asset_link_expire_time do %>
+          <%= f.label :digital_asset_link_expire_time, (raw Spree.t('admin.store.digital_settings.digital_asset_link_expire_time.download_link_expire_time') + required_span_tag) %>
+          <%= f.text_field :digital_asset_link_expire_time, class: 'form-control', required: true %>
+          <%= f.error_message_on :digital_asset_link_expire_time %>
+        <% end %>
+        <small class="form-text text-muted">
+          <%= Spree.t('admin.store.digital_settings.digital_asset_link_expire_time.link_expire_time') %>
+        </small>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,37 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t(:email).pluralize %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :mail_from_address do %>
+      <%= f.label :mail_from_address, raw(Spree.t(:mail_from_address)  + required_span_tag) %>
+      <%= f.text_field :mail_from_address, class: 'form-control', required: true %>
+      <%= f.error_message_on :mail_from_address %>
+      <small class="form-text text-muted">
+        <%= Spree.t('admin.store_form.mail_from_address_help') %>
+      </small>
+    <% end %>
+
+    <% if @store.persisted? %>
+      <%= f.field_container :customer_support_email do %>
+        <%= f.label :customer_support_email, Spree.t(:customer_support_email) %>
+        <%= f.text_field :customer_support_email, class: 'form-control' %>
+        <%= f.error_message_on :customer_support_email %>
+        <small class="form-text text-muted">
+          <%= Spree.t('admin.store_form.customer_support_email_help') %>
+        </small>
+      <% end %>
+
+      <%= f.field_container :new_order_notifications_email do %>
+        <%= f.label :new_order_notifications_email, Spree.t(:new_order_notifications_email) %>
+        <%= f.text_field :new_order_notifications_email, class: 'form-control' %>
+        <%= f.error_message_on :new_order_notifications_email %>
+        <small class="form-text text-muted">
+          <%= Spree.t('admin.store_form.new_order_notifications_email_help') %>
+        </small>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,28 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t(:footer) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="alert alert-info">
+      <%= Spree.t('admin.store_form.footer_help') %>
+    </div>
+
+    <%= f.field_container :description do %>
+      <%= f.label :description, Spree.t(:description) %>
+      <%= f.text_area :description, class: 'form-control' %>
+      <%= f.error_message_on :description %>
+    <% end %>
+    <%= f.field_container :address do %>
+      <%= f.label :address, Spree.t(:address) %>
+      <%= f.text_area :address, class: 'form-control' %>
+      <%= f.error_message_on :address %>
+    <% end %>
+    <%= f.field_container :contact_phone do %>
+      <%= f.label :contact_phone, Spree.t(:contact_phone) %>
+      <%= f.text_field :contact_phone, class: 'form-control' %>
+      <%= f.error_message_on :contact_phone %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,55 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t(:internationalization) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :default_currency do %>
+      <%= f.label :default_currency %>
+      <%= f.select :default_currency, currency_options(@store.default_currency), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_currency %>
+    <% end %>
+    <%= f.field_container :supported_currencies do %>
+      <%= f.label :supported_currencies, Spree.t(:supported_currencies) %>
+      <%= f.select :supported_currencies, currency_options(@store.supported_currencies&.split(',')), { prompt: false }, { multiple: true, class: 'select2' } %>
+      <%= f.error_message_on :supported_currencies %>
+      <small class="form-text text-muted">
+        <%= Spree.t('admin.store_form.currencies_help') %>
+      </small>
+    <% end %>
+    <hr />
+    <%= f.field_container :checkout_zone_id do %>
+      <%= f.label :checkout_zone_id, Spree.t(:shipping_zone) %>
+      <%= f.select :checkout_zone_id, options_for_select(@zones), { include_blank: Spree.t(:no_limits_zone) }, { class: 'select2' } %>
+      <small class="form-text text-muted">
+        <%= raw(Spree.t('admin.store_form.checkout_zone_help')) %>
+      </small>
+      <%= f.error_message_on :checkout_zone_id %>
+    <% end %>
+    <%= f.field_container :default_country_id do %>
+      <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
+      <%= f.select :default_country_id, options_for_select(@countries, @store.default_country_id), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_country_id %>
+      <small class="form-text text-muted">
+        <%= Spree.t('admin.store_form.default_country_help') %>
+      </small>
+    <% end %>
+    <hr />
+    <%= f.field_container :default_locale do %>
+      <%= f.label :default_locale %>
+      <%= f.select :default_locale, options_from_collection_for_select(all_locales_options, :last, :first, @store.default_locale || I18n.locale), {}, { class: 'select2' } %>
+      <%= f.error_message_on :default_locale %>
+      <% unless defined?(SpreeI18n) %>
+        <small class="form-text text-muted">
+          <%= raw(Spree.t('admin.store_form.locales_help')) %>
+        </small>
+      <% end %>
+    <% end %>
+    <%= f.field_container :supported_locales do %>
+      <%= f.label :supported_locales, Spree.t(:supported_locales) %>
+      <%= f.select :supported_locales, options_from_collection_for_select(all_locales_options, :last, :first, @store.supported_locales&.split(',')), {}, { multiple: true, class: 'select2' } %>
+      <%= f.error_message_on :supported_locales %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,48 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <div class="card-title mb-0 h6">
+      <%= Spree.t('admin.store_form.look_and_feel ') %>
+    </div>
+  </div>
+  <div class="card-body">
+    <% @store.build_logo unless @store.logo %>
+    <%= f.fields_for :logo do |ff| %>
+      <%= f.field_container :logo do %>
+        <% if @store.logo.attachment&.attached? && @store.logo.attachment&.variable? %>
+          <%= image_tag main_app.cdn_image_url(@store.logo.attachment.variant(resize_to_limit: [244, 104])) %>
+        <% end %>
+        <%= f.field_container :logo do %>
+          <%= f.label :logo, Spree.t(:logo) %><br>
+          <%= ff.file_field :attachment %>
+          <%= f.error_message_on :logo %>
+        <% end %>
+      <% end %>
+    <% end %>
+    <% @store.build_mailer_logo unless @store.mailer_logo %>
+    <%= f.fields_for :mailer_logo do |ff| %>
+      <%= f.field_container :mailer_logo do %>
+        <% if @store.mailer_logo.attachment&.attached? && @store.mailer_logo.attachment&.variable? %>
+          <%= image_tag main_app.cdn_image_url(@store.mailer_logo.attachment.variant(resize_to_limit: [244, 104])) %>
+        <% end %>
+        <%= f.field_container :mailer_logo do %>
+          <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br>
+          <%= ff.file_field :attachment, accept: Spree::StoreMailerLogo::VALID_CONTENT_TYPES.join(',') %>
+          <%= f.error_message_on :mailer_logo %>
+        <% end %>
+      <% end %>
+    <% end %>
+    <% @store.build_favicon_image unless @store.favicon_image %>
+    <%= f.fields_for :favicon_image do |ff| %>
+      <%= f.field_container :favicon_image do %>
+        <% if @store.favicon_image.attachment&.attached? && @store.favicon_image.attachment&.variable? %>
+          <%= image_tag main_app.cdn_image_url(@store.favicon_image.attachment.variant(resize_to_limit: [104, 104])) %>
+        <% end %>
+        <%= f.field_container :logo do %>
+          <%= f.label :favicon_image, "#{Spree.t(:favicon)} (#{Spree.t(:favicon_upload_info)})" %><br>
+          <%= ff.file_field :attachment, accept: Spree::StoreFaviconImage::VALID_CONTENT_TYPES.join(',') %>
+          <%= f.error_message_on :favicon_image %>
+        <% end %>
+      <% end %>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,32 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t(:seo) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <%= f.field_container :seo_title do %>
+      <%= f.label :seo_title, Spree.t(:seo_title) %>
+      <%= f.text_field :seo_title, class: 'form-control' %>
+      <%= f.error_message_on :seo_title %>
+    <% end %>
+    <%= f.field_container :meta_description do %>
+      <%= f.label :meta_description, Spree.t(:meta_description) %>
+      <%= f.text_area :meta_description, class: 'form-control' %>
+      <%= f.error_message_on :meta_description %>
+    <% end %>
+    <%= f.field_container :meta_keywords do %>
+      <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
+      <%= f.text_field :meta_keywords, class: 'form-control' %>
+      <%= f.error_message_on :meta_keywords %>
+    <% end %>
+    <%= f.field_container :seo_robots do %>
+      <%= f.label :seo_robots, Spree.t(:seo_robots) %>
+      <%= f.text_field :seo_robots, class: 'form-control' %>
+      <%= f.error_message_on :seo_robots %>
+      <small class="form-text text-muted">
+        <%= raw(Spree.t('admin.store_form.seo_robots')) %>
+      </small>
+    <% end %>
+  </div>
+</div>

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

@@ -0,0 +1,43 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title mb-0 h6">
+      <%= Spree.t(:social) %>
+    </h5>
+  </div>
+  <div class="card-body">
+    <div class="alert alert-info">
+      <%= Spree.t('admin.store_form.social_help') %>
+    </div>
+
+    <%= f.field_container :facebook do %>
+      <%= f.label :facebook, Spree.t(:facebook) %>
+      <div class="input-group mb-3">
+        <div class="input-group-prepend">
+          <span class="input-group-text" id="basic-addon3">https://facebook.com</span>
+        </div>
+        <%= f.text_field :facebook, class: 'form-control' %>
+      </div>
+      <%= f.error_message_on :facebook %>
+    <% end %>
+    <%= f.field_container :twitter do %>
+      <%= f.label :twitter, Spree.t(:twitter) %>
+      <div class="input-group mb-3">
+        <div class="input-group-prepend">
+          <span class="input-group-text" id="basic-addon3">https://twitter.com</span>
+        </div>
+        <%= f.text_field :twitter, class: 'form-control' %>
+      </div>
+      <%= f.error_message_on :twitter %>
+    <% end %>
+    <%= f.field_container :instagram do %>
+      <%= f.label :instagram, Spree.t(:instagram) %>
+      <div class="input-group mb-3">
+        <div class="input-group-prepend">
+          <span class="input-group-text" id="basic-addon3">https://instagram.com</span>
+        </div>
+        <%= f.text_field :instagram, class: 'form-control' %>
+      </div>
+      <%= f.error_message_on :instagram %>
+    <% end %>
+  </div>
+</div>

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

@@ -7,16 +7,16 @@
 <% end %>
 
 <% if @stores.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <th><%= Spree.t(:name) %></th>
       <th><%= Spree.t(:url) %></th>
       <th><%= Spree.t(:supported_currencies) %></th>
       <th><%= Spree.t(:supported_locales) %></th>
       <th><%= Spree.t(:default) %>?</th>
       <th data-hook="admin_stores_index_header_actions" class="actions"></th>
-    <thead>
+    <thead class="text-muted">
     <tbody>
       <% @stores.each do |store| %>
         <tr>
@@ -45,7 +45,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Store)) %>
   </div>
 <% end %>

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

@@ -1,9 +1,8 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:stores), spree.admin_stores_path(@store) %> /
   <%= Spree.t(:add_store) %>
 <% end %>
 
-<%= form_for @store, url: spree.admin_stores_path(@store) do |f| %>
+<%= form_for @store, url: spree.admin_stores_path(@store), data: { turbo: false } do |f| %>
   <fieldset>
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links', locals: { collection_url: spree.admin_stores_path(@store) } %>

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

@@ -7,9 +7,9 @@
 <% end if can? :create, Spree::TaxCategory %>
 
 <% if @tax_categories.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_tax_categories' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="tax_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:tax_code) %></th>
@@ -39,7 +39,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxCategory)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::TaxCategory %>!
   </div>

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

@@ -1,9 +1,9 @@
 <div data-hook="admin_tax_rate_form_fields">
   <div class="card mb-3" data-hook="tax_rates">
     <div class="card-header">
-      <h1 class="card-title mb-0 h5">
+      <h5 class="card-title mb-0 h6">
         <%= Spree.t(:general_settings) %>
-      </h1>
+      </h5>
     </div>
 
     <div class="card-body">

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

@@ -7,9 +7,9 @@
 <% end if can? :create, Spree::TaxRate %>
 
 <% if @tax_rates.any? %>
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="rate_header">
         <th><%= Spree.t(:zone) %></th>
         <th><%= Spree.t(:name) %></th>
@@ -43,7 +43,7 @@
   </table>
 </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::TaxRate)) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::TaxRate %>!
   </div>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_inside_taxonomy_form" class="form-group">
   <%= f.field_container :name do %>
-    <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
+    <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
     <%= f.text_field :name, class: 'form-control', required: true %>
     <%= f.error_message_on :name, class: 'error-message' %>
   <% end %>

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

@@ -1,6 +1,6 @@
-<div class="table-responsive">
+<div class="table-responsive border rounded bg-white">
   <table class="table sortable" id='listing_taxonomies' data-hook data-sortable-link="<%= update_positions_admin_taxonomies_url %>">
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="taxonomies_header">
         <th class="no-border handel-head"></th>
         <th><%= Spree.t(:name) %></th>
@@ -11,7 +11,7 @@
       <% @taxonomies.each do |taxonomy| %>
         <tr id="<%= spree_dom_id taxonomy %>" data-hook="taxonomies_row">
           <td class="move-handle">
-            <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
           </td>
           <td><%= taxonomy.name %></td>
           <td class="actions">

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

@@ -10,7 +10,7 @@
         <div class="card-header">
           <div class="row pb-0">
             <div class="col d-flex my-1">
-              <%= button_link_to Spree.t('admin.taxonomies.edit_root_taxonomy', name: @taxonomy.root.name ), spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), icon: 'edit.svg', class: 'no-wrap btn-outline-secondary align-self-center' %>
+              <%= button_link_to Spree.t('admin.taxonomies.edit_root_taxonomy', name: @taxonomy.root.name ), spree.edit_admin_taxonomy_taxon_path(@taxonomy, @taxonomy.root.id), icon: 'edit.svg', class: 'no-wrap btn-light align-self-center' %>
             </div>
             <div class="col d-flex my-1 justify-content-end">
               <%= button_link_to Spree.t('admin.taxonomies.add_new_taxon'), spree.new_admin_taxonomy_taxon_path(@taxonomy.id), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
@@ -27,7 +27,7 @@
                   <%= build_sortable_tree(@taxonomy, root_children) %>
                 <% end %>
               <% else %>
-                <div class="alert alert-info no-objects-found m-5">
+                <div class="text-center no-objects-found m-5 m-5">
                   <%= raw Spree.t('admin.taxonomies.no_taxons', taxonomy: @taxonomy.root.name ) %>
                 </div>
               <% end %>

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

@@ -11,7 +11,7 @@
     <%= render 'list' %>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Taxonomy)) %>,
     <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::Taxonomy) %>!
   </div>

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

@@ -0,0 +1,8 @@
+<%= f.field_container :icon do %>
+  <%= f.label :icon, Spree.t(:header_banner), class: 'mb-3' %>
+  <%= image_tag(main_app.cdn_image_url(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
+  <%= f.file_field :icon, class: 'mt-3' %>
+  <% if @taxon.icon.present? %>
+    <%= link_to Spree.t(:remove_image), remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id), method: :delete %>
+  <% end %>
+<% end %>

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

@@ -64,14 +64,7 @@
     </div>
 
     <div class="col-12 col-md-4">
-      <%= f.field_container :icon do %>
-        <%= f.label :icon, Spree.t(:header_banner), class: 'mb-3' %>
-        <%= image_tag(main_app.url_for(@taxon.icon.try(:attachment)), class: 'w-100') if @taxon.icon %>
-        <%= f.file_field :icon, class: 'mt-3' %>
-        <% if @taxon.icon.present? %>
-          <%= link_to Spree.t(:remove_image), remove_icon_admin_taxonomy_taxon_url(@taxonomy.id, @taxon.id), method: :delete %>
-        <% end %>
-      <% end %>
+      <%= render 'assets_form', f: f %>
     </div>
   </div>
 

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

@@ -1,6 +1,6 @@
-<div class="table-responsive">
-  <table class="table table-condensed table-bordered">
-    <thead>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded">
+    <thead class="text-muted">
       <tr data-hook="taxons_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:path) %></th>

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

@@ -2,9 +2,9 @@
   <div data-hook="bill_address_wrapper" class="col-12 col-lg-6">
     <div class="card mb-3">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5">
+        <h5 class="card-title mb-0 h6">
           <%= Spree.t(:billing_address) %>
-        </h1>
+        </h5>
       </div>
 
       <div class="card-body">
@@ -18,9 +18,9 @@
   <div data-hook="ship_address_wrapper" class="col-12 col-lg-6">
     <div class="card mb-3">
       <div class="card-header">
-        <h1 class="card-title mb-0 h5">
+        <h5 class="card-title mb-0 h6">
           <%= Spree.t(:shipping_address) %>
-        </h1>
+        </h5>
       </div>
 
       <div class="card-body">

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

@@ -1,10 +1,11 @@
+<%= content_for(:sidebar) do %>
 <div data-hook="admin_user_lifetime_stats" class="card mb-3">
   <div class="card-header">
-    <h1 class="card-title mb-0 h5">
+    <h5 class="card-title mb-0 h6">
       <%= Spree.t(:lifetime_stats) %>
-    </h1>
+    </h5>
   </div>
-  <div class="table-responsive">
+  <div class="table-responsive border-0 rounded bg-white">
     <table class="table" id="user-lifetime-stats" data-hook>
       <tr>
         <td width="30%"><%= Spree.t(:total_sales) %>:</td>
@@ -41,3 +42,4 @@
     </table>
   </div>
 </div>
+<% end %>

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

@@ -0,0 +1,37 @@
+<% content_for :page_title do %>
+  <%= page_header_back_button spree.admin_users_path %>
+  <%= @user.email %>
+<% end %>
+
+<% content_for :page_tabs do %>
+  <li class="nav-item">
+    <%= link_to_with_icon 'person.svg',
+      Spree.t(:"admin.user.account"),
+      spree.edit_admin_user_path(@user),
+      class: "nav-link #{'active' if current == :account}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'pin-map.svg',
+      Spree.t(:"admin.user.addresses"),
+      spree.addresses_admin_user_path(@user),
+      class: "nav-link #{'active' if current == :address}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'inbox.svg',
+      Spree.t(:"admin.user.orders"),
+      spree.orders_admin_user_path(@user),
+      class: "nav-link #{'active' if current == :orders}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'tag.svg',
+      Spree.t(:"admin.user.items"),
+      spree.items_admin_user_path(@user),
+      class: "nav-link #{'active' if current == :items}" %>
+  </li>
+  <li class="nav-item">
+    <%= link_to_with_icon 'gift.svg',
+      Spree.t(:"admin.user.store_credits"),
+      spree.admin_user_store_credits_path(@user),
+      class: "nav-link #{'active' if current == :store_credits}" %>
+  </li>
+<% end %>

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

@@ -1,11 +1,6 @@
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :address } %>
+<%= render partial: 'spree/admin/users/tabs', locals: { current: :address } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<% content_for :page_title do %>
-  <%= link_to @user.email, spree.edit_admin_user_url(@user) %> /
-  <%= Spree.t(:addresses) %>
-<% end %>
-
 <div data-hook="admin_user_addresses" id="admin_user_edit_addresses">
   <div data-hook="admin_user_edit_form_header">
     <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @user } %>

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

@@ -1,15 +1,11 @@
-<%= render partial: 'spree/admin/users/sidebar', locals: { current: :account } %>
+<%= render partial: 'spree/admin/users/tabs', locals: { current: :account } %>
 <%= render partial: 'spree/admin/users/user_page_actions' %>
 
-<% content_for :page_title do %>
-  <%= @user.email %>
-<% end %>
-
 <div data-hook="admin_user_edit_general_settings" class="card mb-3">
   <div class="card-header">
-    <h1 class="card-title mb-0 h5">
+    <h5 class="card-title mb-0 h6">
       <%= Spree.t(:general_settings) %>
-    </h1>
+    </h5>
   </div>
 
   <div class="card-body">

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

@@ -15,7 +15,7 @@
     <%= search_form_for [:admin, @search], url: spree.admin_users_url do |f| %>
       <div class="form-group">
         <%= f.label :email_cont, Spree.t(:email) %>
-        <%= f.text_field :email_cont, class: "form-control js-quick-search-target js-filterable" %>
+        <%= f.email_field :email_cont, class: "form-control js-quick-search-target js-filterable" %>
       </div>
       <div class="row">
         <div class="col-12 col-lg-6">
@@ -45,9 +45,9 @@
 <% end %>
 
 <% if @users.any? %>
-  <div class="table-responsive">
+  <div class="table-responsive border rounded bg-white">
     <table class="table" id="listing_users" data-hook>
-      <thead>
+      <thead class="text-muted">
         <tr data-hook="admin_users_index_headers">
           <th>
             <%= sort_link @search,:email, Spree.t(:user), {}, {title: 'users_email_title'} %>
@@ -71,7 +71,7 @@
     </table>
   </div>
 <% else %>
-  <div class="alert alert-info no-objects-found">
+  <div class="text-center no-objects-found m-5">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree.user_class)) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>