spree_backend 4.2.7 → 4.3.0.rc1

data/app/views/spree/admin/shared/linkables/_url.html.erb

@@ -0,0 +1,16 @@
+<%= f.field_container :destination, class: ['form-group'] do %>
+  <%= f.label :destination, Spree.t(:url) %>
+  <%= f.text_field :destination, class: 'form-control' %>
+  <%= f.error_message_on :destination %>
+  <small class="form-text text-muted">
+    <%= raw Spree.t('admin.navigation.url_info') %>
+  </small>
+<% end %>
+
+<%= f.field_container :new_window do %>
+  <div class="custom-control custom-checkbox">
+    <%= f.check_box :new_window, class: 'custom-control-input' %>
+    <%= f.label :new_window, Spree.t('admin.navigation.open_link_in_new_window'), class: 'custom-control-label' %>
+    <%= f.error_message_on :new_window %>
+  </div>
+<% end %>

data/app/views/spree/admin/shared/named_types/_index.html.erb

@@ -25,11 +25,13 @@
           <td class="align-center">
             <%= active_badge(named_type.active, label: Spree.t(named_type.active? ? :active : :inactive)) %>
           </td>
-          <td class="actions actions-1 text-right">
-            <% if named_type.mutable? %>
-              <%= link_to_edit(named_type, no_text: true) if can? :edit, named_type %>
-              <%= link_to_delete(named_type, no_text: true) if can? :delete, named_type %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <% if named_type.mutable? %>
+                <%= link_to_edit(named_type, no_text: true) if can? :edit, named_type %>
+                <%= link_to_delete(named_type, no_text: true) if can? :delete, named_type %>
+              <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb

@@ -6,15 +6,13 @@
   <%= configurations_sidebar_menu_item(Spree.t(:zones), spree.admin_zones_path) if can? :manage, Spree::Zone %>
   <%= configurations_sidebar_menu_item(Spree.t(:countries), spree.admin_countries_path) if can? :manage, Spree::Country %>
 
-  <% if country = Spree::Country.find_by(id: Spree::Config[:default_country_id]) || Spree::Country.first %>
+  <% if country = current_store.default_country %>
     <%= configurations_sidebar_menu_item(Spree.t(:states), spree.admin_country_states_path(country)) if can? :manage, Spree::Country %>
   <% end %>
 
   <%= configurations_sidebar_menu_item(Spree.t(:payment_methods), spree.admin_payment_methods_path) if can? :manage, Spree::PaymentMethod %>
   <%= configurations_sidebar_menu_item(Spree.t(:shipping_methods), spree.admin_shipping_methods_path) if can? :manage, Spree::ShippingMethod %>
   <%= configurations_sidebar_menu_item(Spree.t(:shipping_categories), spree.admin_shipping_categories_path) if can? :manage, Spree::ShippingCategory %>
-  <%= configurations_sidebar_menu_item(Spree.t(:stock_transfers), spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
-  <%= configurations_sidebar_menu_item(Spree.t(:stock_locations), spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
   <%= configurations_sidebar_menu_item(Spree.t(:store_credit_categories), spree.admin_store_credit_categories_path) if can? :manage, Spree::StoreCreditCategory %>
   <%= configurations_sidebar_menu_item(Spree.t(:refund_reasons), spree.admin_refund_reasons_path) if can? :manage, Spree::RefundReason %>
   <%= configurations_sidebar_menu_item(Spree.t(:reimbursement_types), spree.admin_reimbursement_types_path) if can? :manage, Spree::ReimbursementType %>

data/app/views/spree/admin/shared/sub_menu/_content.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-content" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_content">
+  <%= tab :menus, match_path: '/menus', label: Spree.t('admin.tab.navigation') %>
+  <%= tab :cms_pages, match_path: '/cms_pages', label: Spree.t('admin.tab.pages') %>
+</ul>

data/app/views/spree/admin/shared/sub_menu/_stock.html.erb

@@ -0,0 +1,4 @@
+<ul id="sidebar-stock" class="border-top bg-white collapse nav nav-pills nav-stacked" data-hook="admin_stock_sub_tabs">
+  <%= tab(:stock_transfers, spree.admin_stock_transfers_path) if can? :manage, Spree::StockTransfer %>
+  <%= tab(:stock_locations, spree.admin_stock_locations_path) if can? :manage, Spree::StockLocation %>
+</ul>

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

@@ -19,9 +19,11 @@
       <% @shipping_categories.each do |shipping_category| %>
       <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
         <td><%= shipping_category.name %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(shipping_category, no_text: true) if can? :edit, shipping_category %>
-          <%= link_to_delete(shipping_category, no_text: true) if can? :edit, shipping_category %>
+        <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(shipping_category, no_text: true) if can? :edit, shipping_category %>
+            <%= link_to_delete(shipping_category, no_text: true) if can? :edit, shipping_category %>
+          </span>
         </td>
       </tr>
       <% end %>

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

@@ -29,9 +29,11 @@
           </td>
           <td><%= shipping_method.calculator.description %></td>
           <td class="text-center"><%= shipping_method.display_on.blank? ? Spree.t(:none) : Spree.t(shipping_method.display_on) %></td>
-          <td data-hook="admin_shipping_methods_index_row_actions" class="actions actions-2 text-right">
-            <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
-            <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>
+          <td class="actions" data-hook="admin_shipping_methods_index_row_actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(shipping_method, no_text: true) if can? :edit, shipping_method %>
+              <%= link_to_delete(shipping_method, no_text: true) if can? :delete, shipping_method %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/states/_state_list.html.erb

@@ -13,9 +13,11 @@
         <tr id="<%= spree_dom_id state %>" data-hook="states_row">
           <td><%= state.name %></td>
           <td class="text-center"><%= state.abbr %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(state, no_text: true) if can? :edit, state %>
-            <%= link_to_delete(state, no_text: true) if can? :delete, state %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(state, no_text: true) if can? :edit, state %>
+              <%= link_to_delete(state, no_text: true) if can? :delete, state %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -26,9 +26,11 @@
           <td><%= display_name(stock_location) %></td>
           <td><%= link_to Spree.t(:stock_movements), spree.admin_stock_location_stock_movements_path(stock_location.id) %> </td>
           <td><%= active_badge(stock_location.active, label: Spree.t(state(stock_location))) %></td>
-          <td class="actions actions-2 text-center">
-            <%= link_to_edit(stock_location, no_text: true) if can? :create, stock_location %>
-            <%= link_to_delete(stock_location, no_text: true) if can? :create, stock_location %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(stock_location, no_text: true) if can? :create, stock_location %>
+              <%= link_to_delete(stock_location, no_text: true) if can? :create, stock_location %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -9,12 +9,11 @@
 <% content_for :table_filter do %>
   <div data-hook="admin_orders_index_search">
     <%= search_form_for @q, url: admin_stock_transfers_path do |f| %>
-
       <div class="row mb-0">
         <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= f.label :reference_cont, Spree.t(:reference_contains) %>
-            <%= f.text_field :reference_cont, class: 'form-control' %>
+            <%= f.text_field :reference_cont, class: 'form-control js-filterable js-quick-search-target' %>
           </div>
         </div>
 
@@ -73,8 +72,10 @@
             <% end %>
           </td>
           <td><%= stock_transfer.created_at.strftime('%F %T %Z') %></td>
-          <td class="actions actions-1">
-            <%= link_to_with_icon 'show', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-outline-secondary btn-sm', no_text: true, data: {action: 'view'} %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_with_icon 'view.svg', Spree.t(:show), admin_stock_transfer_path(stock_transfer), class: 'btn btn-outline-secondary btn-sm', no_text: true, data: {action: 'view'} %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -8,12 +8,14 @@
     <tr>
       <td>{{name}}</td>
       <td class='text-center'>{{quantity}}</td>
-      <td class='actions actions-1 text-center'>
-        <button class='icon_link btn btn-danger btn-sm transfer_remove_variant' data-variant-id='{{id}}'>
-          <span class='icon icon-delete' data-variant-id='{{id}}'></span>
-        </button>
-        <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
-        <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>
+      <td class='actions'>
+        <span class='d-flex justify-content-center'>
+          <button class='icon_link btn btn-danger btn-sm transfer_remove_variant' data-variant-id='{{id}}'>
+            <span class='icon icon-delete' data-variant-id='{{id}}'></span>
+          </button>
+          <input type='hidden' id='variant[]' name='variant[]' value='{{id}}'>
+          <input type='hidden' id='quantity[]' name='quantity[]' value='{{quantity}}'>
+        </span>
       </td>
     </tr>
   {{/each}}
@@ -76,7 +78,7 @@
             <%= label_tag :transfer_variant_quantity, Spree.t(:quantity) %>
             <div class="input-group">
               <%= number_field_tag :transfer_variant_quantity, 1, class: 'form-control', min: 1 %>
-              <span class="input-group-btn">
+              <span class="input-group-btn ml-2">
                 <%= button Spree.t(:add), 'add.svg', 'submit', class: "transfer_add_variant" %>
               </span>
             </div>

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

@@ -19,9 +19,11 @@
       <% @store_credit_categories.each do |store_credit_category| %>
         <tr id="<%= spree_dom_id store_credit_category %>" data-hook="admin_store_credit_categories_index_rows">
           <td><%= store_credit_category.name %></td>
-          <td class="actions text-right">
-            <%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
-            <%= link_to_delete(store_credit_category, no_text: true) if can? :destroy, store_credit_category %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(store_credit_category, no_text: true) if can? :edit, store_credit_category %>
+              <%= link_to_delete(store_credit_category, no_text: true) if can? :destroy, store_credit_category %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -32,11 +32,13 @@
           <td><%= store_credit.category_name %></td>
           <td><%= store_credit.created_by_email %></td>
           <td><%= l store_credit.created_at.to_date %></td>
-          <td class="actions actions-2 text-center" data-hook="admin_store_credits_index_row_actions">
-            <% if store_credit.amount_used.zero? %>
-              <%= link_to_edit_url spree.edit_admin_user_store_credit_path(@user, store_credit), no_text: true if can?(:edit, store_credit) %>
-              <%= link_to_delete store_credit, no_text: true, url: spree.admin_user_store_credit_path(@user, store_credit) if can?(:destroy, store_credit) %>
-            <% end %>
+          <td class="actions" data-hook="admin_store_credits_index_row_actions">
+            <span class="d-flex justify-content-end">
+              <% if store_credit.amount_used.zero? %>
+                <%= link_to_edit_url spree.edit_admin_user_store_credit_path(@user, store_credit), no_text: true if can?(:edit, store_credit) %>
+                <%= link_to_delete store_credit, no_text: true, url: spree.admin_user_store_credit_path(@user, store_credit) if can?(:destroy, store_credit) %>
+              <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -25,10 +25,20 @@
       <% end %>
       <%= f.field_container :mailer_logo, class: ['form-group'] do %>
         <%= f.label :mailer_logo, Spree.t(:mailer_logo) %><br>
-        <%= f.file_field :mailer_logo, accept: 'image/png, image/jpeg' %>
+        <%= f.file_field :mailer_logo, accept: Spree::Store::MAILER_LOGO_CONTENT_TYPES.join(',') %>
         <%= f.error_message_on :mailer_logo %>
       <% end %>
     <% end %>
+    <%= f.field_container :favicon_image, class: ['form-group'] do %>
+      <% if @store.favicon_image.attached? && @store.favicon_image.variable? %>
+        <%= image_tag main_app.url_for(@store.favicon_image.variant(resize: '104x104')) %>
+      <% end %>
+      <%= f.field_container :favicon_image, class: ['form-group'] do %>
+        <%= f.label :favicon_image, "#{Spree.t(:favicon)} (#{Spree.t(:favicon_upload_info)})" %><br>
+        <%= f.file_field :favicon_image, accept: Spree::Store::FAVICON_CONTENT_TYPES.join(',') %>
+        <%= f.error_message_on :favicon_image %>
+      <% end %>
+    <% end %>
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
       <%= f.text_field :name, class: 'form-control', required: true %>
@@ -166,7 +176,7 @@
     <% end %>
     <%= f.field_container :default_country_id, class: ['form-group'] do %>
       <%= f.label :default_country_id, Spree.t('i18n.default_country') %>
-      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id || Spree::Config[:default_country_id]), {}, { class: 'select2' } %>
+      <%= f.select :default_country_id, options_from_collection_for_select(@countries, :id, :name, @store.default_country_id), {}, { class: 'select2' } %>
       <%= f.error_message_on :default_country_id %>
       <small class="form-text text-muted">
         <%= Spree.t('store_form.default_country_help') %>

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

@@ -25,17 +25,19 @@
           <td><%= store.supported_currencies_list.map(&:iso_code).join(', ') %></td>
           <td><%= store.supported_locales_list.map {|l| locale_presentation(l).first }.join(', ') %></td>
           <td><%= active_badge(store.default) %></td>
-          <td class="actions actions-2 text-right" data-hook="admin_stores_index_row_actions">
-            <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
+          <td class="actions" data-hook="admin_stores_index_row_actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit_url spree.edit_admin_store_path(store), no_text: true if can?(:edit, store) %>
 
-            <% if can?(:edit, store) %>
-              <% btn_url = store.default? ? '#' : spree.set_default_admin_store_path(store) %>
-              <% btn_class = store.default? ? 'outline-secondary disabled' : 'warning' %>
-              <% btn_label = store.default? ? nil : Spree.t(:store_set_default_button) %>
-              <%= link_to_with_icon('save.svg', btn_label, btn_url, no_text: true, method: (store.default? ? nil : :put), class: "btn btn-#{btn_class} btn-sm with-tip", aria: {disabled: store.default?}) %>
-            <% end %>
+              <% if can?(:edit, store) %>
+                <% btn_url = store.default? ? '#' : spree.set_default_admin_store_path(store) %>
+                <% btn_class = store.default? ? 'outline-secondary disabled' : 'warning' %>
+                <% btn_label = store.default? ? nil : Spree.t(:store_set_default_button) %>
+                <%= link_to_with_icon('save.svg', btn_label, btn_url, no_text: true, method: (store.default? ? nil : :put), class: "btn btn-#{btn_class} btn-sm with-tip", aria: {disabled: store.default?}) %>
+              <% end %>
 
-            <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
+              <%= link_to_delete store, no_text: true, url: spree.admin_store_path(store) if can?(:destroy, store) %>
+            </span>
           </td>
         </tr>
       <% end %>
@@ -44,6 +46,6 @@
 </div>
 <% else %>
   <div class="alert alert-info no-objects-found">
-    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::StoreCredit)) %>
+    <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Store)) %>
   </div>
 <% end %>

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

@@ -28,9 +28,11 @@
           <td><%= tax_category.tax_code %></td>
           <td><%= tax_category.description %></td>
           <td><%= active_badge(tax_category.is_default?) %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
-            <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(tax_category, no_text: true) if can? :edit, tax_category %>
+              <%= link_to_delete(tax_category, no_text: true) if can? :delete, tax_category %>
+            </span>
         </tr>
       <% end %>
     </tbody>

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

@@ -31,9 +31,11 @@
         <td><%= active_badge(tax_rate.included_in_price?) %></td>
         <td><%= active_badge(tax_rate.show_rate_in_label?) %></td>
         <td><%= tax_rate.calculator.to_s %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %>
-          <%= link_to_delete(tax_rate, no_text: true) if can? :delete, tax_rate %>
+        <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(tax_rate, no_text: true) if can? :edit, tax_rate %>
+            <%= link_to_delete(tax_rate, no_text: true) if can? :delete, tax_rate %>
+          </span>
         </td>
       </tr>
       <% end %>

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

@@ -14,9 +14,11 @@
             <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
           </td>
           <td><%= taxonomy.name %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
-            <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit taxonomy.id, no_text: true if can?(:edit, taxonomy) %>
+              <%= link_to_delete taxonomy, no_text: true if can?(:delete, taxonomy) %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -39,7 +39,7 @@
 
   <%= f.field_container :description, class: ['form-group'] do %>
     <%= f.label :description, Spree.t(:description) %>
-    <%= f.text_area :description, class: 'form-control', rows: 6 %>
+    <%= f.text_area :description, class: "form-control #{'spree-rte' if taxon_wysiwyg_editor_enabled? }", rows: 20 %>
   <% end %>
 
   <%= f.field_container :meta_title, class: ['form-group'] do %>

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

@@ -8,8 +8,7 @@
       </div>
 
       <div class="card-body">
-        <%= f.fields_for :bill_address, (@user.bill_address || Spree::Address.default(@user, "bill")) do |ba_form| %>
-          <% ba_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+        <%= f.fields_for :bill_address, @user.bill_address || @user.addresses.new(country: current_store.default_country) do |ba_form| %>
           <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
         <% end %>
       </div>
@@ -30,8 +29,7 @@
             <%= check_box_tag 'user[use_billing]', '1', checked, class: 'checkbox' %>
             <%= label_tag :use_billing, Spree.t(:use_billing_address), for: 'user_use_billing', id: 'use_billing', class: 'form-check-label' %>
           </p>
-        <%= f.fields_for :ship_address, (@user.ship_address || Spree::Address.default(@user, "ship")) do |sa_form| %>
-          <% sa_form.object ||= Spree::Address.new(country: Spree::Country.new) %>
+        <%= f.fields_for :ship_address, @user.ship_address || @user.addresses.new(country: current_store.default_country) do |sa_form| %>
           <%= render partial: 'spree/admin/shared/address_form', locals: { f: sa_form, type: "shipping" } %>
         <% end %>
       </div>

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

@@ -59,9 +59,11 @@
         <% @users.each do |user| %>
           <tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
             <td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
-            <td data-hook="admin_users_index_row_actions" class="actions actions-2 text-right">
-              <%= link_to_edit user, no_text: true if can?(:edit, user) %>
-              <%= link_to_delete user, no_text: true if can?(:delete, user) %>
+            <td data-hook="admin_users_index_row_actions" class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit user, no_text: true if can?(:edit, user) %>
+                <%= link_to_delete user, no_text: true if can?(:delete, user) %>
+              </span>
             </td>
           </tr>
         <% end %>

data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb

@@ -21,10 +21,12 @@
             <td class="text-center">
               <input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
             </td>
-            <td class="actions actions-1 text-center">
-              <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                 <%= svg_icon name: "add.svg", width: '16', height: '16' %>
-              </button>
+            <td class="actions">
+              <span class="d-flex justify-content-center">
+                <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                   <%= svg_icon name: "add.svg", width: '16', height: '16' %>
+                </button>
+              </span>
             </td>
           {{else}}
             {{#if variant.is_backorderable}}
@@ -35,10 +37,12 @@
               <td class="text-center">
                 <input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
               </td>
-              <td class="actions actions-1 text-center">
-                <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                   <%= svg_icon name: "add.svg", width: '16', height: '16' %>
-                </button>
+              <td class="actions">
+                <span class="d-flex justify-content-center">
+                  <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                     <%= svg_icon name: "add.svg", width: '16', height: '16' %>
+                  </button>
+                </span>
               </td>
             {{else}}
               <td class="text-center"><%= Spree.t(:out_of_stock) %></td>
@@ -51,10 +55,12 @@
           <td class="text-center">
             <input class="quantity form-control" id="variant_quantity" data-variant-id="{{variant.id}}" type="number" min="1" value="1">
           </td>
-          <td class="actions actions-1 text-center">
-            <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
-              <%= svg_icon name: "add.svg", width: '16', height: '16' %>
-            </button>
+          <td class="actions">
+            <span class="d-flex justify-content-center">
+              <button class="btn btn-sm btn-success add_variant with-tip" data-variant-id="{{variant.id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                <%= svg_icon name: "add.svg", width: '16', height: '16' %>
+              </button>
+            </span>
           </td>
         {{/if}}
       </tr>

data/app/views/spree/admin/variants/_autocomplete_stock.js.erb

@@ -17,10 +17,12 @@
             <td>
               <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
             </td>
-            <td class="actions actions-1">
-              <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                <%= svg_icon name: "add", width: '16', height: '16' %>
-              </button>
+            <td class="actions">
+              <span class="d-flex justify-content-center">
+                <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                  <%= svg_icon name: "add", width: '16', height: '16' %>
+                </button>
+              </span>
             </td>
           {{else}}
             {{#if this.available}}
@@ -31,10 +33,12 @@
               <td>
                 <input class="quantity form-control input-sm" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
               </td>
-              <td class="actions actions-1">
-                <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
-                  <%= svg_icon name: "add", width: '16', height: '16' %>
-                </button>
+              <td class="actions">
+                <span class="d-flex justify-content-center">
+                  <button class="btn btn-sm btn-success add_variant with-tip" data-stock-location-id="{{this.stock_location_id}}" title="<%= Spree.t(:add) %>" data-action="add">
+                    <%= svg_icon name: "add", width: '16', height: '16' %>
+                  </button>
+                </span>
               </td>
             {{else}}
               <td><%= Spree.t(:out_of_stock) %></td>

data/app/views/spree/admin/variants/_split.js.erb

@@ -21,13 +21,15 @@
     <td>
       <input class="quantity form-control" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
     </td>
-    <td class='actions text-center'>
-      <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
-        <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
-      </a>
-      <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
-        <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
-      </a>
+    <td class='actions'>
+      <span class='d-flex justify-content-center'>
+        <a href='#' class='cancel-split with-tip btn btn-sm btn-outline-secondary' title='Cancel'>
+          <%= svg_icon name: "cancel", classes: 'icon-cancel', width: '16', height: '16' %>
+        </a>
+        <a href='#' class='icon-save-split save-split with-tip btn btn-sm btn-success' title='Save'>
+          <%= svg_icon name: "split", classes: 'icon-save', width: '16', height: '16' %>
+        </a>
+      </span>
     </td>
   </tr>
 </script>

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

@@ -10,7 +10,7 @@
       <tr>
         <th colspan="2"><%= Spree.t(:options) %></th>
         <th><%= Spree.t(:price) %></th>
-        <th><%= Spree.t(:sku) %></th>
+        <th><%= sort_link @search, :sku, Spree.t(:sku) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -25,9 +25,11 @@
         <td><%= variant.options_text %></td>
         <td><%= display_price(variant) %></td>
         <td><%= variant.sku %></td>
-        <td class="actions actions-2 text-right">
-          <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
-          <%= link_to_delete(variant, no_text: true) if can?(:destroy, variant) && !variant.deleted? %>
+        <td class="actions">
+          <span class="d-flex justify-content-end">
+            <%= link_to_edit(variant, no_text: true) if can?(:edit, variant) && !variant.deleted? %>
+            <%= link_to_delete(variant, no_text: true) if can?(:destroy, variant) && !variant.deleted? %>
+          </span>
         </td>
       </tr>
       <% end %>
@@ -63,6 +65,7 @@
   <% content_for :page_actions do %>
     <%= product_preview_link(@product) %>
     <%= button_link_to(Spree.t(:new_variant), spree.new_admin_product_variant_url(@product), { icon: 'add.svg', :'data-update' => 'new_variant', class: 'btn-success', id: 'new_var_link' }) if can? :create, Spree::Variant %>
-    <%= button_link_to (@deleted.blank? ? Spree.t(:show_deleted) : Spree.t(:show_active)), spree.admin_product_variants_url(@product, deleted: @deleted.blank? ? "on" : "off"), { class: 'btn-outline-secondary', icon: 'filter.svg' } %>
+    <%= button_link_to (@deleted == '1' ? Spree.t(:show_active) : Spree.t(:show_deleted)), spree.admin_product_variants_url(@product, { q: { deleted_at_null: @deleted == '1' ? "0" : "1" } }), { class: 'btn-outline-secondary', icon: 'filter.svg' } %>
   <% end %>
 <% end %>
+<%= render partial: 'spree/admin/shared/index_table_options', locals: { collection: @collection } %>

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

@@ -25,9 +25,11 @@
           <td><%= zone.name %></td>
           <td><%= zone.description %></td>
           <td><%= active_badge(zone.default_tax?) %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
-            <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(zone, no_text: true) if can? :edit, zone %>
+              <%= link_to_delete(zone, no_text: true) if can? :delete, zone %>
+            </span>
           </td>
         </tr>
       <% end %>