spree_admin 5.1.1 → 5.1.3

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

@@ -2,22 +2,22 @@
   <%= Spree.t(:integrations) %>
 <% end %>
 
-<%= content_for(:page_alerts) do %>
-  <div class="alert alert-info">
-    <%= Spree.t('admin.integrations.page_subtitle') %>
-  </div>
-<% end %>
-
-<div class="container px-lg-0 mt-2">
-  <% grouped_available_store_integrations.each do |group, integrations| %>
-    <% if group.present? %>
-      <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
-    <% end %>
+<div class="row">
+  <div class="col-lg-8 offset-lg-2">
+    <div class="alert alert-info mb-4">
+      <%= Spree.t('admin.integrations.page_subtitle') %>
+    </div>
 
-    <div class="row row-cols-1 row-cols-md-2 row-cols-lg-4 mb-4">
-      <% integrations.each do |integration| %>
-        <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+    <% grouped_available_store_integrations.each do |group, integrations| %>
+      <% if group.present? %>
+        <div class="my-2 text-muted font-weight-light text-uppercase"><%= Spree.t(group) %></div>
       <% end %>
-    </div>
-  <% end %>
+
+      <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 mb-4">
+        <% integrations.each do |integration| %>
+          <%= render 'spree/admin/integrations/integration', integration_class: integration %>
+        <% end %>
+      </div>
+    <% end %>
+  </div>
 </div>

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

@@ -19,7 +19,8 @@
           </tr>
         </thead>
         <tbody>
-          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: spree_base_cache_scope %>
+          <% default_theme = current_store.default_theme %>
+          <%= render collection: @collection, partial: "spree/admin/pages/page", cached: ->(page) { [*spree_base_cache_scope.call(page), default_theme] } %>
         </tbody>
       </table>
       <%= render "spree/admin/shared/index_table_options", collection: @collection %>

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

@@ -2,69 +2,62 @@
   <%= render "spree/admin/payment_methods/configuration_guides/#{@object.configuration_guide_partial_name}", f: f %>
 <% end %>
 
+<% if !preference_fields(@object, f).empty? || @object.respond_to?(:custom_form_fields_partial_name) %>
+  <div class="card mb-4">
+    <div class="card-header">
+      <h5 class="card-title"><%= Spree.t(:payment_provider_settings) %></h5>
+    </div>
+    <div class="card-body">
+      <%= preference_fields(@object, f) unless preference_fields(@object, f).empty? %>
 
-<div class="row">
-  <% if !preference_fields(@object, f).empty? || @object.respond_to?(:custom_form_fields_partial_name) %>
-    <div class="col-12 col-md-6">
-      <div class="card mb-4">
-        <div class="card-header">
-          <h5 class="card-title"><%= Spree.t(:payment_provider_settings) %></h5>
-        </div>
-        <div class="card-body">
-          <%= preference_fields(@object, f) unless preference_fields(@object, f).empty? %>
-
-          <% if @object.respond_to?(:custom_form_fields_partial_name) %>
-            <%= render "spree/admin/payment_methods/custom_form_fields/#{@object.custom_form_fields_partial_name}", f: f %>
-          <% end %>
-        </div>
-      </div>
+      <% if @object.respond_to?(:custom_form_fields_partial_name) %>
+        <%= render "spree/admin/payment_methods/custom_form_fields/#{@object.custom_form_fields_partial_name}", f: f %>
+      <% end %>
     </div>
-  <% end %>
+  </div>
+<% end %>
 
-  <div class="col-12 col-md-6">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
-      </div>
-      <div class="card-body">
-        <div class="form-group">
-          <%= label_tag :payment_method_name, Spree.t(:name) %>
-          <%= text_field :payment_method, :name, class: 'form-control' %>
-          <span class="text-muted form-text mt-2">
-            This name will be used to identify the payment method on the storefront
-          </span>
+<div class="card mb-4">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:display_settings) %></h5>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= label_tag :payment_method_name, Spree.t(:name) %>
+      <%= text_field :payment_method, :name, class: 'form-control' %>
+      <span class="text-muted form-text mt-2">
+        This name will be used to identify the payment method on the storefront
+      </span>
 
-          <%= error_message_on :payment_method, :name %>
-        </div>
+      <%= error_message_on :payment_method, :name %>
+    </div>
 
-        <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
-          <div class="form-group">
-            <%= label_tag :payment_method_stores, Spree.t(:stores) %>
-            <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
-              <div class="custom-control custom-checkbox mb-1">
-                <%= b.check_box(class: 'custom-control-input') %>
-                <%= b.label(class: 'custom-control-label') %>
-              </div>
-            <% end %>
+    <% if can?(:manage, Spree::Store) && available_stores.count > 1 %>
+      <div class="form-group">
+        <%= label_tag :payment_method_stores, Spree.t(:stores) %>
+        <%= f.collection_check_boxes :store_ids, available_stores, :id, :name do |b| %>
+          <div class="custom-control custom-checkbox mb-1">
+            <%= b.check_box(class: 'custom-control-input') %>
+            <%= b.label(class: 'custom-control-label') %>
           </div>
         <% end %>
+      </div>
+    <% end %>
 
-        <div class="form-group">
-          <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-          <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
-        </div>
-        <div class="form-group">
-          <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-          <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
-        </div>
+    <div class="form-group">
+      <%= label_tag :payment_method_display_on, Spree.t(:display) %>
+      <%= f.select :display_on, display_on_options, {}, { class: 'custom-select' } %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
+      <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes).to_s, true], [Spree.t(:say_no).to_s, false]], {}, {class: 'custom-select'}) %>
+    </div>
 
-        <div class="form-group">
-          <label><%= Spree.t(:active) %></label>
-          <div class="custom-control custom-switch">
-            <%= f.check_box :active, class: 'custom-control-input' %>
-            <%= f.label :active, '&nbsp;'.html_safe, class: 'custom-control-label' %>
-          </div>
-        </div>
+    <div class="form-group">
+      <label><%= Spree.t(:active) %></label>
+      <div class="custom-control custom-switch">
+        <%= f.check_box :active, class: 'custom-control-input' %>
+        <%= f.label :active, '&nbsp;'.html_safe, class: 'custom-control-label' %>
       </div>
     </div>
   </div>

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

@@ -2,9 +2,13 @@
   <%= page_header_back_button spree.admin_payment_methods_path %>
   <%= @payment_method.name %>
 <% end %>
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
 
-<%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method) do |f| %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+<%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_method_path(@payment_method), html: { id: "edit_payment_method_#{@payment_method.id}" } do |f| %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+    </div>
+  </div>
 <% end %>

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

@@ -3,10 +3,13 @@
   <%= @payment_method.name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
-
 <%= form_for @payment_method, as: :payment_method, url: spree.admin_payment_methods_path do |f| %>
   <%= f.hidden_field :type %>
-  <%= render 'form', f: f %>
-  <%= render 'spree/admin/shared/new_resource_links' %>
+  <div class="row">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @payment_method } %>
+      <%= render 'form', f: f %>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

data/app/views/spree/admin/products/_bulk_operations.html.erb

@@ -1,5 +1,7 @@
 <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
   <div class="bulk-panel-container">
+    <%= bulk_operations_counter %>
+
     <% if can?(:activate, Spree::Product) %>
       <%= bulk_action_link(
         Spree.t("admin.bulk_ops.products.title.set_status", status: :active),
@@ -20,7 +22,7 @@
       <button
         type="button"
         data-display="static"
-        class="btn btn-light px-2 h-100"
+        class="btn btn-light"
         data-placement="bottom"
         data-toggle="dropdown"
         aria-expanded="false"
@@ -81,7 +83,6 @@
       </div>
     </div>
 
-    <%= bulk_operations_counter %>
     <%= bulk_operations_close_button %>
   </div>
 </div>

data/app/views/spree/admin/products/form/_variants.html.erb

@@ -56,7 +56,7 @@
                 <label class="label" for="new_option_name"><%= Spree.t(:option_name) %></label>
                 <%= tom_select_tag :new_option_name,
                   multiple: false,
-                  create: true,
+                  create: can?(:create, Spree::OptionType),
                   preloaded_options: option_types_for_select,
                   include_blank: true,
                   select_data: {

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

@@ -2,10 +2,14 @@
   <%= Spree.t('admin.edit_profile') %>
 <% end %>
 
+<%= content_for :page_actions do %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: 'edit_user' %>
+<% end %>
+
 <%= form_for @user, url: spree.admin_profile_path, method: :put, as: :user do |f| %>
   <div class="row">
-    <div class="col-lg-6 mb-4">
-      <div class="card">
+    <div class="col-lg-6 offset-lg-3">
+      <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title"><%= Spree.t('admin.personal_details') %></h5>
         </div>
@@ -30,9 +34,7 @@
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="col-lg-6 mb-4">
       <div class="card">
         <div class="card-header">
           <h5 class="card-title"><%= Spree.t('admin.notifications') %></h5>
@@ -72,8 +74,4 @@
       </div>
     </div>
   </div>
-
-  <div class="form-actions">
-    <%= turbo_save_button_tag Spree.t('actions.update') %>
-  </div>
 <% end %>

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

@@ -3,9 +3,55 @@
   <%= Spree.t(:new_promotion) %>
 <% end %>
 <%= form_for :promotion, url: collection_url do |f| %>
-  <%= render 'form', f: f %>
-  <p class="alert alert-info text-center mt-3">
-    In the next step you will be able to add actions and rules to your promotion
-  </p>
-  <%= render 'spree/admin/shared/new_resource_links' %>
+
+  <div class="row">
+    <div class="col-12 col-lg-6 offset-lg-3">
+      <%= render 'spree/admin/shared/error_messages', target: @promotion %>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:details) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <div class="form-group">
+            <%= f.label :name %>
+            <%= f.text_field :name, class: 'form-control', required: true, autofocus: true %>
+            <%= f.error_message_on :name %>
+            <span class="form-text text-muted mt-2">
+              Customers will see this in their cart and at checkout.
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:kind) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <%= render 'spree/admin/promotions/form/kind', f: f %>
+        </div>
+      </div>
+
+      <div class="card mb-4">
+        <div class="card-header">
+          <h5 class="card-title">
+            <%= Spree.t(:settings) %>
+          </h5>
+        </div>
+        <div class="card-body">
+          <%= render 'spree/admin/promotions/form/settings', f: f %>
+        </div>
+      </div>
+
+      <p class="alert alert-info text-center">
+        In the next step you will be able to add actions and rules to your promotion
+      </p>
+      <%= render 'spree/admin/shared/new_resource_links' %>
+    </div>
+  </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% record = @object || @customer_return || @order || @product || @vendor || @user || @taxon || @store_credit %>
+<% record = @object || @customer_return || @order || @product || @vendor || @user || @admin_user || @taxon || @store_credit %>
 <% record = nil if @user&.is_a?(Spree.admin_user_class) %>
 
 <% show_record_subtitle = record && record.persisted? && record.has_attribute?(:updated_at) %>
@@ -24,7 +24,8 @@
       <%= yield :page_actions if content_for?(:page_actions) %>
 
       <% if action_name == 'edit' && @object %>
-        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{@object.class.name.demodulize.underscore}_#{@object.id}" %>
+        <% class_name = defined?(model_class) ? model_class.to_s : @object.class.name %>
+        <%= turbo_save_button_tag Spree.t('actions.update'), class: 'btn btn-primary', form: "edit_#{class_name.demodulize.underscore}_#{@object.id}", data: { admin_target: 'save' } %>
       <% end %>
 
       <% if show_record_subtitle || content_for(:page_actions_dropdown) %>
@@ -38,7 +39,7 @@
               <% if record.respond_to?(:audits) && spree.respond_to?(:admin_audits_path) && defined?(Audited) && can?(:read, Audited.audit_class) %>
                 <a href="<%= spree.admin_audits_path(q: { auditable_id_eq: record.id, auditable_type_eq: record.class.to_s }) %>" target="_blank" class="dropdown-item">
                   <%= icon 'history' %>
-                  <%= Spree.t(:audit_log) %>
+                  <%= Spree.t('admin.audit_log') %>
                 </a>
               <% end %>
               <% if record.respond_to?(:number) %>
@@ -71,8 +72,8 @@
 <% end %>
 
 <% if content_for?(:page_tabs) %>
-  <div class="container">
-    <ul class="nav nav-pills flex-nowrap w-100 mb-3">
+  <div class="container-fluid" id="page-tabs">
+    <ul class="nav">
       <%= yield :page_tabs %>
     </ul>
   </div>

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

@@ -1,7 +1,7 @@
 <% destroy_url = defined?(destroy_url) && destroy_url ? destroy_url : object_url(f.object) %>
 
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.update') %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), data: { admin_target: 'save' } %>
   <% if f.object.can_be_deleted? && can?(:delete, f.object) %>
     <%= link_to Spree.t('actions.destroy'), destroy_url, data: { turbo_method: :delete, turbo_confirm: Spree.t(:are_you_sure_delete), turbo_frame: defined?(turbo_frame) ? turbo_frame : '_top' }, class: 'btn btn-danger ml-auto' %>
   <% end %>

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

@@ -11,9 +11,10 @@
     </div>
 
     <% if settings_active? %>
-      <div class="store-dropdown px-2">
-        <%= active_link_to_with_icon('arrow-left', Spree.t('admin.back_to_dashboard'), spree.admin_dashboard_path, class: 'btn store-dropdown-button w-100 justify-content-start mx-1 py-2') %>
-      </div>
+      <%= link_to spree.admin_path, class: 'store-dropdown text-decoration-none px-2 justify-content-start with-tip', title: Spree.t('admin.back_to_dashboard'), data: { admin_target: 'close' } do %>
+        <%= icon 'x', class: 'mx-2' %>
+        <kbd>ESC</kbd>
+      <% end %>
     <% else %>
       <% if defined?(current_vendor) && current_vendor.present? %>
         <%= render 'spree/admin/shared/sidebar/vendor_dropdown' %>

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

@@ -1,3 +1,3 @@
 <div class="form-actions">
-  <%= turbo_save_button_tag Spree.t('actions.create') %>
+  <%= turbo_save_button_tag Spree.t('actions.create'), data: { admin_target: 'save' } %>
 </div>

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

@@ -1,4 +1,2 @@
-<ul class="nav mb-0" id="pills-tab" role="tablist">
-  <%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
-  <%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>
-</ul>
+<%= nav_item(Spree.t(:stock_items), spree.admin_stock_items_path) if can?(:manage, Spree::StockItem) %>
+<%= nav_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can?(:manage, Spree::StockTransfer) %>

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

@@ -2,7 +2,7 @@
   <% unless session[:spree_enterprise_edition_notice_dismissed] %>
     <section class="d-none d-lg-block">
       <div id="enterprise-edition-notice">
-        <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, method: :patch, class: 'btn-close' %>
+        <%= link_to '', spree.admin_dismiss_enterprise_edition_notice_path, data: { turbo_method: :patch }, class: 'btn-close' %>
         <p>You're using Spree Community Edition. To get access to all features, please upgrade to Enterprise Edition.</p>
 
         <%= external_link_to 'Upgrade', 'https://spreecommerce.org/pricing', target: '_blank', class: 'btn btn-link btn-sm shadow-xs' %>

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

@@ -6,15 +6,19 @@
   <%= Spree.t(:settings) %>
 <% end %>
 
-<%= content_for(:page_actions) do %>
+<%= content_for(:page_actions_dropdown) do %>
   <%= link_to_edit_translations(@store) %>
 <% end %>
 
+<%= content_for(:page_actions) do %>
+  <%= turbo_save_button_tag Spree.t('actions.update'), form: "edit_store_#{@store.id}" %>
+<% end %>
+
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @store }, class: 'mb-5 pb-5' %>
 
 <%= form_for @store, url: spree.admin_storefront_path, method: :patch do |f| %>
   <div class="row">
-    <div class="col-lg-6">
+    <div class="col-lg-6 offset-lg-3">
       <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title">
@@ -85,9 +89,7 @@
           </div>
         </div>
       </div>
-    </div>
 
-    <div class="col-lg-6">
       <div class="card mb-4">
         <div class="card-header">
           <h5 class="card-title">
@@ -139,6 +141,4 @@
       </div>
     </div>
   </div>
-
-  <%= render 'spree/admin/stores/form/buttons' %>
 <% end %>

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

@@ -9,5 +9,4 @@
   <%= render partial: 'spree/admin/stores/form/emails', locals: { f: f } if params[:section] == 'emails' %>
   <%= render partial: 'spree/admin/stores/form/checkout', locals: { f: f } if params[:section] == 'checkout' %>
   <%= render partial: 'spree/admin/stores/form/policies', locals: { f: f } if params[:section] == 'policies' %>
-  <%= render 'spree/admin/stores/form/buttons' %>
 <% end %>

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

@@ -2,33 +2,14 @@
   <%= Spree.t(:checkout) %> <%= Spree.t(:settings) %>
 <% end %>
 
-<%= content_for :page_alerts do %>
-  <div class="alert alert-info mb-3">
-    <p>
-      <%= Spree.t('admin.checkout_settings.policy_copy', policies_link: link_to(Spree.t(:policies), spree.edit_admin_store_path + '?section=policies', class: 'alert-link')).html_safe %>
-    </p>
-  </div>
-<% end %>
-
 <div class="row">
-  <div class="col-lg-7">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
-      </div>
-
-      <div class="card-body">
-        <p class="text-muted">
-          <%= Spree.t('admin.checkout_settings.checkout_message_description') %>
-        </p>
-        <div class="trix-container">
-          <%= f.rich_text_area :checkout_message, class: 'overflow-auto', style: 'height: 300px' %>
-        </div>
-      </div>
+  <div class="col-lg-6 offset-lg-3">
+    <div class="alert alert-info mb-3">
+      <p>
+        <%= Spree.t('admin.checkout_settings.policy_copy', policies_link: link_to(Spree.t(:policies), spree.edit_admin_store_path + '?section=policies', class: 'alert-link')).html_safe %>
+      </p>
     </div>
-  </div>
 
-  <div class="col-lg-5">
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title"><%= Spree.t(:settings) %></h5>
@@ -66,5 +47,20 @@
         </div>
       </div>
     </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
+      </div>
+
+      <div class="card-body">
+        <p class="text-muted">
+          <%= Spree.t('admin.checkout_settings.checkout_message_description') %>
+        </p>
+        <div class="trix-container">
+          <%= f.rich_text_area :checkout_message, class: 'overflow-auto', style: 'height: 300px' %>
+        </div>
+      </div>
+    </div>
   </div>
 </div>

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

@@ -3,24 +3,7 @@
 <% end %>
 
 <div class="row">
-  <div class="col-lg-6">
-    <div class="card mb-4">
-      <div class="card-header">
-        <h5 class="card-title">Logo for emails</h5>
-      </div>
-      <div class="card-body">
-        <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
-        <%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>
-        <p class="form-text text-muted mb-0 mt-2">
-          We recommend images with a transparent background.
-          <br />
-          Only JPEG and PNG formats are supported.
-        </p>
-      </div>
-    </div>
-  </div>
-
-  <div class="col-lg-6">
+  <div class="col-lg-6 offset-lg-3">
     <div class="card mb-4">
       <div class="card-header">
         <h5 class="card-title">Email addresses</h5>
@@ -55,5 +38,20 @@
         </div>
       </div>
     </div>
+
+    <div class="card mb-4">
+      <div class="card-header">
+        <h5 class="card-title">Logo for emails</h5>
+      </div>
+      <div class="card-body">
+        <p class="text-muted">This logo is included in all email notifications such as order confirmation</p>
+        <%= render 'active_storage/upload_form', form: f, field_name: :mailer_logo, width: 204, height: 104 %>
+        <p class="form-text text-muted mb-0 mt-2">
+          We recommend images with a transparent background.
+          <br />
+          Only JPEG and PNG formats are supported.
+        </p>
+      </div>
+    </div>
   </div>
 </div>

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

@@ -22,6 +22,8 @@
         <%= render 'spree/admin/shared/bulk_modal' %>
         <div id="bulk-panel" class="d-none" data-bulk-operation-target="panel">
           <div class="bulk-panel-container">
+            <%= bulk_operations_counter %>
+
             <% if can?(:manage_tags, Spree.user_class) %>
               <%= bulk_action_link(
                 Spree.t("admin.bulk_ops.users.title.add_tags"),
@@ -36,7 +38,6 @@
                 url: spree.bulk_remove_tags_admin_users_path
               ) %>
             <% end %>
-            <%= bulk_operations_counter %>
             <%= bulk_operations_close_button %>
           </div>
         </div>

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

@@ -3,18 +3,15 @@
   <%= @variant.human_name %>
 <% end %>
 
-<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
-
 <%= form_for [:admin, @product, @variant] do |f| %>
   <div class="row">
-    <div class="col-lg-6">
+    <div class="col-lg-6 offset-lg-3">
+      <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @variant } %>
       <%= render 'spree/admin/variants/form/basic', f: f %>
       <%= render 'spree/admin/variants/form/pricing', f: f %>
       <%= render 'spree/admin/variants/form/inventory', f: f %>
-    </div>
-    <div class="col-lg-6">
       <%= render 'spree/admin/variants/form/media', viewable: @variant %>
+      <%= render 'spree/admin/shared/edit_resource_links', f: f %>
     </div>
   </div>
-  <%= render 'spree/admin/shared/edit_resource_links', f: f %>
 <% end %>

data/config/routes.rb

@@ -249,7 +249,8 @@ Spree::Core::Engine.add_routes do
     resource :dashboard, controller: 'dashboard'
     get '/dashboard/analytics', to: 'dashboard#analytics', as: :dashboard_analytics
     get '/getting-started', to: 'dashboard#getting_started', as: :getting_started
-    get '/dismiss_enterprise_edition_notice', to: 'dashboard#dismiss_enterprise_edition_notice', as: :dismiss_enterprise_edition_notice
+    patch '/dismiss_enterprise_edition_notice', to: 'dashboard#dismiss_enterprise_edition_notice', as: :dismiss_enterprise_edition_notice
+    patch '/dismiss_updater_notice', to: 'dashboard#dismiss_updater_notice', as: :dismiss_updater_notice
 
     root to: 'dashboard#show'
   end