spree_backend 4.1.1 → 4.5.0

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/_product_tabs.html.erb

@@ -1,48 +1,62 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:products), admin_products_path %> /
+  <%= page_header_back_button spree.admin_products_path %>
   <%= @product.name %>
 <% end %>
 
-<% content_for :sidebar do %>
-  <ul class="nav flex-column nav-pills" data-hook="admin_product_tabs">
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'edit',
-        Spree.t(:details),
-        edit_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :details}" %>
+<% content_for(:page_tabs) do %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'edit.svg',
+      Spree.t(:details),
+      edit_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :details}" %>
 
-    <% end if can?(:admin, Spree::Product) %>
+  <% end if can?(:admin, Spree::Product) %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'picture',
-        Spree.t(:images),
-        spree.admin_product_images_url(@product),
-        class: "nav-link #{'active' if current == :images}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'images.svg',
+      Spree.t(:images),
+      spree.admin_product_images_url(@product),
+      class: "nav-link #{'active' if current == :images}" %>
 
-    <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Image) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'th-large',
-        Spree.t(:variants),
-        spree.admin_product_variants_url(@product),
-        class: "nav-link #{'active' if current == :variants}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'adjust.svg',
+      Spree.t(:variants),
+      spree.admin_product_variants_url(@product),
+      class: "nav-link #{'active' if current == :variants}" %>
 
-    <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::Variant) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'list-alt',
-        Spree.t(:properties),
-        spree.admin_product_product_properties_url(@product),
-        class: "nav-link #{'active' if current == :properties}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'list.svg',
+      Spree.t(:properties),
+      spree.admin_product_product_properties_url(@product),
+      class: "nav-link #{'active' if current == :properties}" %>
 
-    <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
+  <% end if can?(:admin, Spree::ProductProperty) && !@product.deleted? %>
 
-    <%= content_tag :li do %>
-      <%= link_to_with_icon 'home',
-        Spree.t(:stock),
-        stock_admin_product_url(@product),
-        class: "nav-link #{'active' if current == :stock}" %>
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'box-seam.svg',
+      Spree.t(:stock),
+      stock_admin_product_url(@product),
+      class: "nav-link #{'active' if current == :stock}" %>
 
-    <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
-  </ul>
+  <% end if can?(:admin, Spree::StockItem) && !@product.deleted? %>
+
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'currency-exchange.svg',
+      Spree.t(:prices),
+      admin_product_prices_path(@product),
+      class: "nav-link #{'active' if current == :prices}" %>
+
+  <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
+
+  <%= content_tag :li, class: 'nav-item' do %>
+    <%= link_to_with_icon 'download.svg',
+      Spree.t('admin.digitals.digital_assets'),
+      admin_product_digitals_path(@product),
+      class: "nav-link #{'active' if current == :digitals} #{current}" %>
+
+  <% end if can?(:admin, Spree::Digital) && !@product.deleted? %>
 <% end %>

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

@@ -1,32 +1,36 @@
-<table class="table table-condensed table-bordered" id='refunds' data-order-id='<%= @order.number %>'>
-  <thead>
-    <tr data-hook="refunds_header">
-      <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
-      <th><%= Spree.t(:payment_identifier) %></th>
-      <th><%= Spree.t(:amount) %></th>
-      <th><%= Spree.t(:payment_method) %></th>
-      <th><%= Spree.t(:transaction_id) %></th>
-      <th><%= Spree.t(:reason) %></th>
-      <% if show_actions %>
-        <th></th>
-      <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% refunds.each do |refund| %>
-      <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle')%>">
-        <td><%= pretty_time(refund.created_at) %></td>
-        <td><%= refund.payment.number %></td>
-        <td class="amount"><%= refund.display_amount %></td>
-        <td><%= payment_method_name(refund.payment) %></td>
-        <td><%= refund.transaction_id %></td>
-        <td><%= truncate(refund.reason.name, length: 100) %></td>
+<div class="table-responsive border rounded bg-white">
+  <table class="table table-condensed border rounded" id='refunds' data-order-id='<%= @order.number %>'>
+    <thead class="text-muted">
+      <tr data-hook="refunds_header">
+        <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
+        <th><%= Spree.t(:payment_identifier) %></th>
+        <th><%= Spree.t(:amount) %></th>
+        <th><%= Spree.t(:payment_method) %></th>
+        <th><%= Spree.t(:transaction_id) %></th>
+        <th><%= Spree.t(:reason) %></th>
         <% if show_actions %>
-          <td class="actions actions-1">
-            <%= link_to_with_icon('edit', 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>
+          <th></th>
         <% end %>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% refunds.each do |refund| %>
+        <tr id="<%= dom_id(refund) %>" data-hook="refunds_row" class="<%= cycle('odd', 'even', name: 'refund_table_cycle') %>">
+          <td><%= pretty_time(refund.created_at) %></td>
+          <td><%= link_to refund.payment.number, spree.admin_order_payment_path(refund.payment.order, refund.payment) %></td>
+          <td class="amount"><%= refund.display_amount %></td>
+          <td><%= payment_method_name(refund.payment) %></td>
+          <td><%= refund.transaction_id %></td>
+          <td><%= truncate(refund.reason.name, length: 100) %></td>
+          <% if show_actions %>
+            <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-light btn-sm") if can?(:edit, refund) %>
+              </span>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

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

@@ -2,16 +2,39 @@
   <div class="form-group date-range-filter">
     <%= label_tag nil, Spree.t(:date_range) %>
     <div class="date-range-filter row">
-      <div class="col-md-6">
-        <%= s.text_field :completed_at_gt, class: 'datepicker datepicker-from form-control', value: datepicker_field_value(params[:q][:completed_at_gt]) %>
+      <div class="col-12 col-md-6 mb-3 mb-md-0">
+        <div class="input-group datePickerFrom"
+             data-wrap="true"
+             data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+             data-max-date="<%= params[:q][:completed_at_lt] %>">
+          <%= s.text_field :completed_at_gt,
+                           class: 'form-control',
+                           placeholder: Spree.t(:starting_from),
+                           value: datepicker_field_value(params[:q][:completed_at_gt]),
+                           'data-input':'' %>
+
+          <%= render partial: 'spree/admin/shared/cal_close' %>
+        </div>
+      </div>
+
+      <div class="col-12 col-md-6 mt-3 mt-md-0">
+        <div class="input-group datePickerTo"
+             data-wrap="true"
+             data-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
+             data-min-date="<%= params[:q][:completed_at_gt] %>">
+
+          <%= s.text_field :completed_at_lt,
+                           class: 'form-control',
+                           placeholder: Spree.t(:ending_at),
+                           value: datepicker_field_value(params[:q][:completed_at_lt]),
+                           'data-input':'' %>
+          <%= render partial: 'spree/admin/shared/cal_close' %>
+        </div>
       </div>
-      <div class="col-md-6">
-        <%= s.text_field :completed_at_lt, class: 'datepicker datepicker-to form-control', value: datepicker_field_value(params[:q][:completed_at_lt]) %>
-    </div>
     </div>
   </div>
 
   <div class="form-actions">
-    <%= button Spree.t(:search), 'search' %>
+    <%= button Spree.t(:search), 'search.svg' %>
   </div>
 <% end %>

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

@@ -1,5 +1,23 @@
+<div class="d-lg-none page-actions__close border-bottom text-right">
+  <button
+    id="contextual-menu-close"
+    class="btn btn-link"
+    type="button"
+    aria-expanded="false"
+    aria-label="Toggle page actions">
+    <%= svg_icon name: "cancel.svg", width: '20', height: '20' %>
+  </button>
+</div>
+<% if content_for?(:page_actions) %>
+  <div class="page-actions d-lg-none col-12 px-0 <% if content_for?(:sidebar) %>pb-3<% end %> text-center" data-hook="toolbar">
+    <div class="d-flex justify-content-center flex-wrap">
+      <%= yield :page_actions %>
+    </div>
+  </div>
+<% end %>
+
 <% if content_for?(:sidebar) %>
-  <aside id="sidebar" class="main-right-sidebar" 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-2" 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: 'py-2 px-4 mt-1 mb-0 dropdown-item', id: 'addNewStoreLink' do %>
+          <%= svg_icon name: "plus-circle", width: '18', height: '18' %> <%= Spree.t(:add_new_store) %>
+        <% end %>
+      <% end %>
+    </div>
+<% end %>

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

@@ -1,19 +1,18 @@
 <% if content_for?(:table_filter) %>
-  <div class="filter-wrap row">
-    <div class="col-12">
-      <div class="input-group index-filter-button">
-        <span class="input-group-btn">
-          <button class="btn js-show-index-filters" type="button">
-            <span class="icon icon-chevron-right"></span>
-            <%= Spree.t(:filter) %>
-          </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) %>
+  <div class="filter-wrap mb-4">
+    <div class="col-12 px-0">
+      <div class="input-group index-filter-button flex-nowrap">
+        <%= form_tag request.fullpath, id: "quick-search", class: 'flex-grow-1 mr-3' do %>
+          <%= text_field_tag :quick_search, nil, class: "form-control js-quick-search", placeholder: Spree.t(:search_by) %>
         <% end %>
+
+        <button class="btn btn-light js-show-index-filters m-0 rounded-sm" type="button">
+          <%= svg_icon name: "filter.svg", width: '16', height: '16' %>
+          <span class="d-none d-sm-inline"><%= Spree.t('admin.filters') %></span>
+        </button>
       </div>
       <% unless defined?(simple) %>
-        <div id="table-filter" data-hook class="card bg-light filter-well">
+        <div id="table-filter" data-hook class="card filter-well mt-4">
           <div class="card-body">
             <%= yield :table_filter %>
           </div>

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

@@ -10,16 +10,15 @@
     confirm_delete:           Spree.t(:confirm_delete),
     currency_separator:       I18n.t('number.currency.format.separator'),
     cut:                      Spree.t(:cut),
-    date_picker:              Spree.t(:js_format, scope: 'date_picker', default: 'yy/mm/dd'),
     destroy:                  Spree.t(:destroy, scope: :actions),
     edit:                     Spree.t(:edit,    scope: :actions),
-    first_day:                Spree.t(:first_day, scope: 'date_picker', default: 0).to_i,
     find_a_taxon:             Spree.t(:find_a_taxon),
     item_stock_placeholder:   Spree.t(:choose_location),
     loading:                  Spree.t(:loading),
     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),
@@ -30,8 +29,10 @@
     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),
     sku:                      Spree.t(:sku),
     type_to_search:           Spree.t(:type_to_search),
     taxon_placeholder:        Spree.t(:taxon_placeholder),
@@ -39,11 +40,15 @@
     tags_placeholder:         Spree.t(:tags_placeholder),
     tracking:                 Spree.t(:tracking),
     variant_placeholder:      Spree.t(:variant_placeholder),
-    value:                    Spree.t(:value)
+    value:                    Spree.t(:value),
+
+                              # Substitute - for _ converting zh-tw to zh_tw
+                              # Flatpickr not making things easy here.
+    flatpickr_locale:         "#{flatpickr_local_fallback.sub("-", "_")}"
+
   }.to_json
 %>
 </script>
 
-<% if I18n.locale != :en %>
-  <%= javascript_include_tag "select2_locale_#{I18n.locale}" %>
-<% end %>
+<%= javascript_include_tag "select2_locale_#{select2_local_fallback}" %>
+<%= javascript_include_tag "flatpickr/l10n/#{flatpickr_local_fallback}" %>

data/app/views/spree/admin/shared/_update_order_state.js.erb

@@ -1,7 +1,11 @@
-$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
-$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
+$('#order_tab_summary #order_status').html('<%= j Spree.t(@order.state, scope: :order_state) %>');
+$('#order_tab_summary #order_total').html('<%= j @order.display_total.to_html %>');
 
 <% if @order.completed? %>
-  $('#order_tab_summary h5#payment_status').html('<%= j Spree.t(:payment) %>: <%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
-  $('#order_tab_summary h5#shipment_status').html('<%= j Spree.t(:shipment) %>: <%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% if @order.payment_state.present? %>
+    $('#order_tab_summary #payment_status').html('<%= j Spree.t(@order.payment_state, scope: :payment_states, default: [:missing, "none"]) %>');
+  <% end %>
+  <% if @order.shipment_state.present? %>
+    $('#order_tab_summary #shipment_status').html('<%= j Spree.t(@order.shipment_state, scope: :shipment_state, default: [:missing, "none"]) %>');
+  <% end %>
 <% end %>

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

@@ -1,7 +1,9 @@
-<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
-  <small
-    class="spree-version <%= 'd-md-block' if cookies['sidebar-minimized'] == 'false' %> d-none font-weight-bold ml-3 my-3 text-muted"
+<% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
+  <p
+    class="spree-version ml-3 my-3"
     aria-label="Spree Commerce version">
+    <span class="badge badge-pill badge-info">
     <%= Spree.version %>
-  </small>
+    </span>
+  </p>
 <% end %>

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

@@ -0,0 +1,27 @@
+<%= f.field_container save_to 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 },
+                          id: "cms_section_#{save_to}",
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_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 %>
+
+<% if resource.link_one.present? %>
+  <script>
+    populateSelectOptionsFromApi({
+      targetElement: "#cms_section_<%= save_to %>",
+      apiUrl: Spree.routes.products_api_v2 + "?filter[slug_matches]=<%= resource.send(save_to) %>",
+      returnValueFromAttributes: 'slug',
+      returnOptionText: 'name',
+
+      <% if resource.send(save_to) %>
+        selectedOption: "<%= resource.send(save_to) %>"
+      <% end %>
+    })
+  </script>
+<% end %>

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

@@ -0,0 +1,27 @@
+<%= f.field_container save_to 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 },
+                          id: "cms_section_#{save_to}",
+                          data: { autocomplete_placeholder_value: Spree.t('admin.navigation.search_for_a_taxon'),
+                                  autocomplete_clear_value: true,
+                                  autocomplete_url_value: 'taxons_api_v2',
+                                  autocomplete_return_attr_value: 'pretty_name',
+                                  autocomplete_custom_return_id_value: 'permalink' } %>
+
+  <%= f.error_message_on :save_to %>
+<% end %>
+
+<% if resource.link_one.present? %>
+  <script>
+    populateSelectOptionsFromApi({
+      targetElement: "#cms_section_<%= save_to %>",
+      apiUrl: Spree.routes.taxons_api_v2 + "?filter[permalink_matches]=<%= resource.send(save_to) %>",
+      returnValueFromAttributes: 'permalink',
+      returnOptionText: 'pretty_name',
+
+      <% if resource.send(save_to) %>
+        selectedOption: "<%= resource.send(save_to) %>"
+      <% end %>
+    })
+  </script>
+<% end %>

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

@@ -0,0 +1,23 @@
+<% 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 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.search_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',
+                 autocomplete_additional_url_params_value: 'filter[type_not_eq]=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_linkable_homepage.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_linkable_uri.html.erb

@@ -0,0 +1,16 @@
+<%= f.field_container :destination 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/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 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.search_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 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.search_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 %>

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

@@ -0,0 +1,18 @@
+<!-- When using rails 7 compatible version of Spree this view is replaced by _spree_linkable_uri.html.erb -->
+
+<%= f.field_container :destination 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/_form.html.erb

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

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

@@ -3,12 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to new_button_text, new_object_url, { icon: 'add', id: 'admin_new_named_type', class: "btn-success" } %>
+  <%= button_link_to new_button_text, new_object_url, { icon: 'add.svg', id: 'admin_new_named_type', class: "btn-success" } %>
 <% end if can? :create, resource %>
 
 <% if @collection.any? %>
+<div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_named_types' data-hook>
-    <thead>
+    <thead class="text-muted">
       <tr data-hook="named_types_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:status) %></th>
@@ -22,20 +23,23 @@
             <%= named_type.name %>
           </td>
           <td class="align-center">
-            <%= Spree.t(named_type.active? ? :active : :inactive) %>
+            <%= 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 %>
     </tbody>
   </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: resource_name) %>,
     <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, resource %>!
   </div>