spree_backend 4.2.7 → 4.3.0.rc1

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

@@ -22,7 +22,7 @@
   <div id='taxons' data-hook>
     <%= f.field_container :taxon_ids, class: ['form-group'] do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
-      <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2" } %>
+      <%= f.select :taxon_ids, current_store.taxons.pluck(:name, :id), {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 </div>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -10,12 +10,14 @@
       <% @prototypes.each do |prototype| %>
         <tr id="row_<%= prototype.id %>" data-hook="available_row">
           <td><%= prototype.name %></td>
-          <td class="actions actions-1">
-            <%= link_to_with_icon 'save.svg',
-              Spree.t(:select),
-              select_admin_prototype_url(prototype),
-              class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
-              no_text: true %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_with_icon 'save.svg',
+                Spree.t(:select),
+                select_admin_prototype_url(prototype),
+                class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+                no_text: true %>
+            </span>
           </td>
         </tr>
       <% end %>

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

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

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

@@ -25,9 +25,11 @@
           <td>
             <%= reimbursement_type.type.split('::', 3).last %>
           </td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
-            <%= link_to_delete reimbursement_type, no_text: true if can?(:delete, reimbursement_type) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
+              <%= link_to_delete reimbursement_type, no_text: true if can?(:delete, reimbursement_type) %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:reports) %>
+  <%= Spree.t(:reports) %> <%= Spree.t('admin.reports.for', store_name: current_store.unique_name) %>
 <% end %>
 <div class="table-responsive">
   <table class="table">

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= link_to Spree.t(:reports), spree.admin_reports_url %> /
-  <%= Spree.t(:sales_totals) %>
+  <%= Spree.t(:sales_totals) %> <%= Spree.t('admin.reports.for', store_name: current_store.unique_name) %>
 <% end %>
 
 <div class="card bg-light mb-3">

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

@@ -14,8 +14,8 @@
         <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:charged) %></th>
         <th><%= Spree.t(:purchased_quantity) %></th>
-        <th><%= Spree.t(:return_quantity) %></th>
-        <th><%= Spree.t(:pre_tax_refund_amount) %></th>
+        <th style="min-width:130px;"><%= Spree.t(:return_quantity) %></th>
+        <th style="min-width:150px;"><%= Spree.t(:pre_tax_refund_amount) %></th>
         <th><%= Spree.t(:reimbursement_type) %></th>
         <th><%= Spree.t(:exchange_for) %></th>
       </tr>

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

@@ -33,11 +33,13 @@
           </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
-          <td class="actions actions-2">
-            <%= link_to_edit(return_authorization, no_text: true, class: 'edit') if can?(:edit, return_authorization) %>
-            <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
-              <%= link_to_delete return_authorization, no_text: true %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(return_authorization, no_text: true, class: 'edit') if can?(:edit, return_authorization) %>
+              <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
+                <%= link_to_delete return_authorization, no_text: true %>
+              <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -47,8 +47,10 @@
             <% end %>
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>
-          <td class="actions actions-1 text-right">
-            <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true if can?(:edit, customer_return) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true if can?(:edit, customer_return) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -26,7 +26,7 @@
       <div class="row">
         <div class="col-12 col-lg-6">
           <div class="form-group">
-            <%= f.label :number_cont, Spree.t(:number) %>
+            <%= f.label :number_cont, Spree.t(:return_number) %>
             <%= f.text_field :number_cont, class: "form-control js-quick-search-target js-filterable" %>
           </div>
         </div>
@@ -65,8 +65,10 @@
           <td>
             <span class="badge badge-<%= return_authorization.state %> text-uppercase"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
-          <td class="actions actions-1 text-right">
-            <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
+            </span>
           </td>
         </tr>
       <% end %>

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

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

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

@@ -1,8 +1,8 @@
 <% if try_spree_current_user %>
   <div class="btn-group">
 
-    <button id="accountNav" type="button" class="btn text-light" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <%= svg_icon name: "user.svg", width: '24', height: '24' %>
+    <button id="accountNav" type="button" class="btn text-light px-3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <%= svg_icon name: "user.svg", width: '24', height: '24', classes: 'mb-0' %>
     </button>
 
     <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
@@ -37,10 +37,10 @@
 
       <div class="dropdown-divider m-0"></div>
 
-        <%= link_to 'http://guides.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://guides.spreecommerce.org/support', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "info.svg", width: '18', height: '18' %>
           &nbsp;
-          <%= Spree.t(:help_center) %>
+          <%= Spree.t(:support) %>
         <% end %>
 
         <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
@@ -49,7 +49,7 @@
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://github.com/spree-contrib', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'https://guides.spreecommerce.org/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:extensions_directory) %>

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

@@ -5,7 +5,7 @@
       <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
         <%= f.label :country_id, Spree.t(:country) %>
         <div id="<%= s_or_b %>country">
-          <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 w-100' } %>
+          <%= f.collection_select :country_id, all_countries, :id, :name, {}, { class: 'select2 w-100' } %>
         </div>
       <% end %>
     <% elsif field == "state" %>
@@ -37,8 +37,9 @@
 
 <% content_for :head do %>
   <script>
-    $(document).ready(function(){
-      $('#<%= s_or_b %>country select').on('change', function() { update_state('<%= s_or_b %>'); });
-    });
+    document.addEventListener('DOMContentLoaded', function() {
+      updateAddressState('<%= s_or_b %>');
+      $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
+    })
   </script>
 <% end %>

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

@@ -1,7 +1,7 @@
-<div id="contentHeader" class="row mb-3">
+<div id="contentHeader" class="row mb-0 pb-0">
   <% if content_for?(:page_title) || content_for?(:page_actions) %>
     <div class="content-header col <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
-      <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %>">
+      <div id="contentHeaderRow" class="row align-items-center  <%= if content_for?(:page_tabs) then "border-bottom pb-2" else "border-bottom pb-2 mb-3" end %>">
 
         <% if content_for?(:page_title) %>
           <h1 class="contextual-title px-0 mb-0 col">
@@ -33,10 +33,24 @@
       </div>
 
       <% if content_for?(:page_tabs) %>
-        <div class="row">
-          <ul class="nav nav-tabs w-100 mt-4 px-0">
-            <%= yield :page_tabs %>
-          </ul>
+        <div class="row my-2 pb-1 pt-1 align-items-center" data-nav-x-wrapper>
+          <div data-nav-x-container>
+            <ul id="spreePageTabs" class="nav nav-pills flex-nowrap" data-nav-x-content>
+              <%= yield :page_tabs %>
+            </ul>
+          </div>
+
+          <button class="nav-x_Advancer nav-x_Advancer_Left" type="button">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-left" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
+            </svg>
+          </button>
+
+          <button class="nav-x_Advancer nav-x_Advancer_Right" type="button">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
+            </svg>
+          </button>
         </div>
       <% end %>
 

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

@@ -15,13 +15,14 @@
 
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
-<%= render 'spree/shared/paths' %>
+<%= render 'spree/admin/shared/paths' %>
 <%= javascript_include_tag 'spree/backend/all' %>
 <%= render "spree/admin/shared/translations" %>
 
 <script>
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
   <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
+  <%== "var OAUTH_TOKEN = '#{admin_oauth_token}';" if defined?(admin_oauth_token) %>
   <%== "var ADDRESS_FIELDS = #{Spree::Address::ADDRESS_FIELDS}" %>
   <% if Rails.env.test? %>
   jQuery.fx.off = false

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

@@ -1,24 +1,21 @@
 <header class="header logged-in">
-  <nav class="navbar fixed-top navbar-dark align-items-middle">
-    <div class="col-3 col-sm-4 p-0 d-lg-none">
+  <nav class="navbar fixed-top navbar-dark flex-nowrap">
+    <div class="col p-0 d-lg-none">
       <button
         id="sidebar-open"
-        class="navbar-toggler h-100 text-light"
+        class="navbar-toggler h-100 text-light px-3"
         type="button"
         aria-expanded="false"
         aria-label="Toggle navigation">
         <%= svg_icon name: "menu.svg", width: '20', height: '20' %>
       </button>
     </div>
-    <div class="col text-center text-lg-left">
-      <%= link_to(
-        image_tag(Spree::Config[:admin_interface_logo], id: 'logo', alt: current_store.name),
-        spree.admin_path,
-        class: "logo navbar-brand"
-      ) %>
+
+    <div id="storeSwitcherDropdown" class="col-auto text-center text-lg-left px-0 px-lg-2 align-items-center dropdown">
+      <%= render partial: 'spree/admin/shared/store_switcher' %>
     </div>
 
-    <div class="col-3 col-sm-4 text-right p-0">
+    <div class="col text-right p-0">
       <%= render partial: 'spree/admin/shared/account_nav' %>
     </div>
   </nav>

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

@@ -0,0 +1,22 @@
+<% save_to = save_to || 'menu_item_link' %>
+<% linked_type = linked_type || nil %>
+
+<% if linked_type.present? %>
+  <div data-panel-type="<%= linked_type %>" data-panel-id="<%= save_to %>">
+    <%= render "spree/admin/shared/cms/#{spree_class_name_as_path(linked_type)}", resource: resource, save_to: save_to, f: f %>
+  </div>
+<% elsif resource.linked_resource_type.present? %>
+  <div data-panel-type="<%= resource.linked_resource_type %>" data-panel-id="<%= save_to %>">
+    <%= render "spree/admin/shared/linkables/#{spree_class_name_as_path(resource.linked_resource_type)}", resource: resource, f: f %>
+  </div>
+<% end %>
+
+<div class="d-none" data-target-message-pannel="<%= save_to %>">
+  <div class="alert alert-warning mt-3">
+    <% if %w[new create].include? controller.action_name %>
+      <%= raw Spree.t('admin.navigation.click_create_to_load_new_link') %>
+    <% else %>
+      <%= raw Spree.t('admin.navigation.click_update_to_load_new_link') %>
+    <% end %>
+  </div>
+</div>

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

@@ -1,18 +1,21 @@
 <nav>
-  <div class="text-right d-lg-none p-2 border-bottom">
+  <div class="text-right d-lg-none pl-3 py-2 border-bottom d-flex align-items-center">
+    <div class="d-flex flex-grow-1 text-primary">
+      <%= svg_icon name: "spree-logo.svg", width: '70', height: '30' %>
+    </div>
     <button
       id="sidebar-close"
-      class="btn btn-link"
+      class="btn btn-link d-flex"
       type="button"
       aria-expanded="false"
       aria-label="Toggle navigation">
-      <%= svg_icon name: "cancel.svg", width: '20', height: '20' %>
+      <%= svg_icon name: "cancel.svg", width: '20', height: '20', classes: 'p-0 m-0' %>
     </button>
   </div>
 
   <% if can? :admin, Spree::Order %>
     <ul class="nav nav-sidebar border-bottom" id="sidebarOrder">
-      <%= tab *Spree::BackendConfiguration::ORDER_TABS, icon: 'list.svg' %>
+      <%= tab *Spree::BackendConfiguration::ORDER_TABS, url: admin_orders_path, icon: 'list.svg' %>
     </ul>
   <% end %>
 
@@ -28,6 +31,12 @@
     </ul>
   <% end %>
 
+  <% if can?(:admin, Spree::StockLocation) || can?(:admin, Spree::StockTransfer) %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarStock">
+      <%= main_menu_tree Spree.t(:stock), icon: "box.svg", sub_menu: "stock", url: "#sidebar-stock" %>
+    </ul>
+  <% end %>
+
   <% if can? :admin, Spree::Admin::ReportsController %>
     <ul class="nav nav-sidebar border-bottom" id="sidebarReport">
       <%= tab *Spree::BackendConfiguration::REPORT_TABS, icon: 'report.svg' %>
@@ -46,6 +55,12 @@
     </ul>
   <% end %>
 
+  <% if can? :admin, Spree::Menu %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarMenu">
+      <%= main_menu_tree Spree.t('admin.tab.content'), icon: "window-sidebar.svg", sub_menu: "content", url: "#sidebar-content" %>
+    </ul>
+  <% end %>
+
   <% if can? :admin, current_store %>
     <ul class="nav nav-sidebar border-bottom" id="sidebarConfiguration">
       <%= main_menu_tree Spree.t(:configurations), icon: "settings.svg", sub_menu: "configuration", url: "#sidebar-configuration" %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:orders), admin_orders_path %> /
+  <%= link_to Spree.t(:orders), spree.admin_orders_path %> /
   <%= link_to @order.number, spree.edit_admin_order_path(@order) %>
 <% end %>
 
@@ -14,15 +14,6 @@
       </li>
     <% end %>
 
-    <% if ((can?(:update, @order) && can?(:read, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
-      <li data-hook='admin_order_tabs_store_details'>
-        <%= link_to_with_icon 'store.svg',
-          Spree.t(:store),
-          store_admin_order_url(@order),
-          class: "#{'active' if current == :store} nav-link" %>
-      </li>
-    <% end %>
-
     <% if can? :update, @order %>
       <li data-hook='admin_order_tabs_channel_details'>
         <%= link_to_with_icon 'split.svg',

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

@@ -0,0 +1,8 @@
+<script>
+  SpreePaths = <%==
+  {
+    mounted_at: Rails.application.routes.url_helpers.spree_path(trailing_slash: true),
+    admin: Spree.admin_path.gsub(/\A(\/)?(.*[^\/])(\/)?\z/, '\\2/')
+  }.to_json
+  %>
+</script>

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

@@ -23,8 +23,10 @@
           <td><%= refund.transaction_id %></td>
           <td><%= truncate(refund.reason.name, length: 100) %></td>
           <% if show_actions %>
-            <td class="actions actions-1">
-              <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
+            <td class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_with_icon('edit.svg', Spree.t(:edit), edit_admin_order_payment_refund_path(refund.payment.order, refund.payment, refund), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:edit, refund) %>
+              </span>
             </td>
           <% end %>
         </tr>

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

@@ -17,7 +17,7 @@
 <% end %>
 
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" class="main-right-sidebar px-2" data-hook>
+  <aside id="sidebar" class="main-right-sidebar px-0 pl-lg-2" data-hook>
     <%= yield :sidebar %>
   </aside>
 <% end %>

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

@@ -0,0 +1,23 @@
+<% if can?(:admin, current_store) %>
+    <span class="d-none d-lg-inline text-light">
+      <%= svg_icon name: "spree-icon.svg", width: '35', height: '35' %>
+    </span>
+
+    <a class="px-0 py-1 btn text-light" id="storeSelectorDropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+     <span class="d-sm-none"><%= svg_icon name: "store.svg", width: '18', height: '18' %></span>
+     <span class="d-none d-sm-inline"><%= current_store.name %></span> (<%= current_store.code %>) <%= svg_icon name: "chevron-down.svg", width: '12', height: '12', classes: 'ml-1 mb-0' %>
+    </a>
+
+    <div class="dropdown-menu dropdown-menu-left overflow-hidden ml-lg-2 mt-2 py-0" aria-labelledby="storeSelectorDropdown">
+      <% @stores.each do |store| %>
+        <%= store_switcher_link(store) %>
+      <% end %>
+
+      <% if can?(:create, Spree::Store) %>
+        <div class="dropdown-divider m-0"></div>
+        <%= link_to spree.new_admin_store_path, class: 'text-dark p-3 dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "add.svg", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <% end %>
+      <% end %>
+    </div>
+<% end %>

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

@@ -1,15 +1,15 @@
 <% if content_for?(:table_filter) %>
-  <div class="filter-wrap row mb-4">
-    <div class="col-12">
-      <div class="input-group index-filter-button">
+  <div class="filter-wrap pb-1">
+    <div class="col-12 px-0">
+      <div class="input-group index-filter-button flex-nowrap">
         <span class="input-group-btn">
           <button class="btn js-show-index-filters m-0" type="button">
-              <%= svg_icon name: "chevron-right.svg", width: '12', height: '12' %>
-            <%= Spree.t(:filter) %>
+            <%= svg_icon name: "chevron-right.svg", width: '12', height: '12' %>
+            <span class="d-none d-sm-inline"><%= Spree.t(:filter) %></span>
           </button>
         </span>
         <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1' do %>
-          <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:quick_search) %>
+          <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:search_by) %>
         <% end %>
       </div>
       <% unless defined?(simple) %>

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

@@ -18,6 +18,7 @@
     month_names:              I18n.t(:month_names, scope: :date).instance_eval {|o|
                                      o.try(:reject, &:blank?) || o},
     more:                     Spree.t(:more),
+    move_could_not_be_saved:  Spree.t('admin.navigation.move_could_not_be_saved'),
     name:                     Spree.t(:name),
     new_taxon:                Spree.t(:new_taxon),
     next:                     Spree.t(:next),
@@ -28,6 +29,7 @@
     remove:                   Spree.t(:remove),
     rename:                   Spree.t(:rename),
     save:                     Spree.t(:save,    scope: :actions),
+    search:                   Spree.t(:search),
     searching:                Spree.t(:searching),
     server_error:             Spree.t(:server_error),
     select_an_option:         Spree.t(:select_an_option),

data/app/views/spree/admin/shared/cms/_spree_product.html.erb

@@ -0,0 +1,14 @@
+<%= f.field_container save_to, class: ['form-group'] do %>
+  <%= f.label save_to, Spree.t('admin.cms.link_to_product') %>
+  <%= f.select save_to,
+       options_from_collection_for_select([resource],
+                                       save_to, save_to, resource.send(save_to) || nil),
+       { include_blank: true },
+       class: 'select2autocomplete',
+       data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+               autocomplete_clear_value: true,
+               autocomplete_url_value: 'products_api_v2',
+               autocomplete_return_attr_value: 'name',
+               autocomplete_custom_return_id_value: 'slug' } %>
+  <%= f.error_message_on :save_to %>
+<% end %>

data/app/views/spree/admin/shared/cms/_spree_taxon.html.erb

@@ -0,0 +1,14 @@
+<%= f.field_container save_to, class: ['form-group'] do %>
+  <%= f.label save_to, Spree.t('admin.cms.link_to_taxon') %>
+  <%= f.select save_to,
+       options_from_collection_for_select([resource],
+                                       save_to, save_to, resource.send(save_to) || nil),
+       { include_blank: true },
+       class: 'select2autocomplete',
+       data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+               autocomplete_clear_value: true,
+               autocomplete_url_value: 'taxons_api_v2',
+               autocomplete_return_attr_value: 'permalink',
+               autocomplete_custom_return_id_value: 'permalink' } %>
+  <%= f.error_message_on :save_to %>
+<% end %>

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

@@ -0,0 +1,3 @@
+<div class="alert alert-info mt-3">
+  <%= Spree.t('admin.navigation.this_link_takes_you_to_your_stores_home_page') %>
+</div>

data/app/views/spree/admin/shared/linkables/_spree_cms_page.erb

@@ -0,0 +1,28 @@
+<% if resource.linked_resource %>
+   <% resorce_holder = [resource.linked_resource] %>
+   <% id_holder = :id %>
+   <% name_holder = :title %>
+   <% active_id_holder = resource.linked_resource.id %>
+ <% end %>
+ <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+    <%= f.label :linked_resource_id, Spree.t('page') %>
+    <%= f.select :linked_resource_id,
+         options_from_collection_for_select(resorce_holder || [],
+                                            id_holder, name_holder, active_id_holder || nil),
+         { include_blank: true },
+         class: 'select2autocomplete',
+         data: { autocomplete_placeholder_value: Spree.t('admin.linkable.seach_for_a_page'),
+                 autocomplete_clear_value: true,
+                 autocomplete_url_value: 'pages_api_v2',
+                 autocomplete_return_attr_value: 'title',
+                 autocomplete_search_query_value: 'title_i_cont',
+
+                 # Hard coded additional filter to filter out homepages from
+                 # the results. Homepages don't have a slug, and we already have
+                 # a dedicated Home Page link_to type.
+                 autocomplete_additional_query_value: 'type_not_eq',
+                 autocomplete_additional_term_value: 'Spree::Cms::Pages::Homepage' } %>
+
+   <%= f.error_message_on :linked_resource_id %>
+   <small class="form-text text-muted"><%= resource.link %></small>
+<% end %>

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

@@ -0,0 +1,20 @@
+<% if resource.linked_resource %>
+   <% resorce_holder = [resource.linked_resource] %>
+   <% id_holder = :id %>
+   <% name_holder = :name %>
+   <% active_id_holder = resource.linked_resource.id %>
+ <% end %>
+ <%= f.field_container :linked_resource_id, class: ['form-group'] do %>
+    <%= f.label :linked_resource_id, Spree.t('product') %>
+    <%= f.select :linked_resource_id,
+         options_from_collection_for_select(resorce_holder || [],
+                                            id_holder, name_holder, active_id_holder || nil),
+         { include_blank: true },
+         class: 'select2autocomplete',
+         data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_product'),
+                 autocomplete_clear_value: true,
+                 autocomplete_url_value: 'products_api_v2' } %>
+
+   <%= f.error_message_on :linked_resource_id %>
+   <small class="form-text text-muted"><%= resource.link %></small>
+<% end %>

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

@@ -0,0 +1,22 @@
+<% if resource.linked_resource %>
+   <% resource_holder = [resource.linked_resource] %>
+   <% id_holder = :id %>
+   <% name_holder = :pretty_name %>
+   <% active_id_holder = resource.linked_resource.id %>
+ <% end %>
+
+ <%= f.field_container :linked_resource_field, class: ['form-group'] do %>
+   <%= f.label :linked_resource_id, Spree.t('taxon') %>
+   <%= f.select :linked_resource_id,
+        options_from_collection_for_select(resource_holder || [],
+                                           id_holder, name_holder, active_id_holder || nil),
+        { include_blank: true },
+        class: 'select2autocomplete',
+        data: { autocomplete_placeholder_value: Spree.t('admin.navigation.seach_for_a_taxon'),
+                autocomplete_clear_value: true,
+                autocomplete_url_value: 'taxons_api_v2',
+                autocomplete_return_attr_value: 'pretty_name' } %>
+
+   <%= f.error_message_on :linked_resource_id %>
+   <small class="form-text text-muted"><%= resource.link %></small>
+ <% end %>