spree_backend 4.3.0.rc1 → 4.4.0.rc1

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

@@ -3,7 +3,7 @@
 
     <div class="col-12 col-md-8" data-hook="admin_product_form_left">
       <div data-hook="admin_product_form_name">
-        <%= f.field_container :name, class: ['form-group'] do %>
+        <%= f.field_container :name do %>
           <%= f.label :name, raw(Spree.t(:name) + required_span_tag) %>
           <%= f.text_field :name, class: 'form-control title' %>
           <%= f.error_message_on :name %>
@@ -11,7 +11,7 @@
       </div>
 
       <div data-hook="admin_product_form_slug">
-        <%= f.field_container :slug, class: ['form-group'] do %>
+        <%= f.field_container :slug do %>
           <%= f.label :slug, raw(Spree.t(:slug) + required_span_tag) %>
           <%= f.text_field :slug, class: 'form-control title' %>
           <%= f.error_message_on :slug %>
@@ -19,7 +19,7 @@
       </div>
 
       <div data-hook="admin_product_form_description">
-        <%= f.field_container :description, class: ['form-group'] do %>
+        <%= f.field_container :description do %>
           <%= f.label :description, Spree.t(:description) %>
           <%= f.text_area :description, { rows: "#{unless @product.has_variants? then '29' else '30' end}", class: "form-control #{"spree-rte" if product_wysiwyg_editor_enabled? }" } %>
           <%= f.error_message_on :description %>
@@ -29,7 +29,7 @@
 
     <div class="col-12 col-md-4" data-hook="admin_product_form_right">
       <div data-hook="admin_product_form_price">
-        <%= f.field_container :price, class: ['form-group'] do %>
+        <%= f.field_container :price do %>
           <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
           <div class="input-group">
             <div class="input-group-prepend">
@@ -42,7 +42,7 @@
       </div>
 
       <div>
-        <%= f.field_container :compare_at_price, class: ['form-group'] do %>
+        <%= f.field_container :compare_at_price do %>
           <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
           <div class="input-group">
             <div class="input-group-prepend">
@@ -55,14 +55,14 @@
       </div>
 
       <div data-hook="admin_product_form_cost_price" class="alpha two columns">
-        <%= f.field_container :cost_price, class: ['form-group'] do %>
+        <%= f.field_container :cost_price do %>
           <%= f.label :cost_price, Spree.t(:cost_price) %>
           <%= f.text_field :cost_price, value: number_to_currency(@product.cost_price, unit: ''), class: 'form-control' %>
           <%= f.error_message_on :cost_price %>
         <% end %>
       </div>
       <div data-hook="admin_product_form_cost_currency" class="omega two columns">
-        <%= f.field_container :cost_currency, class: ['form-group'] do %>
+        <%= f.field_container :cost_currency do %>
           <%= f.label :cost_currency, Spree.t(:cost_currency) %>
           <%= f.select :cost_currency, currency_options(@product.cost_currency), {}, { class: 'select2' } %>
           <%= f.error_message_on :cost_currency %>
@@ -70,7 +70,7 @@
       </div>
 
       <div data-hook="admin_product_form_available_on">
-        <%= f.field_container :available_on, class: ['form-group'] do %>
+        <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
@@ -91,7 +91,7 @@
       </div>
 
       <div data-hook="admin_product_form_discontinue_on">
-        <%= f.field_container :discontinue_on, class: ['form-group'] do %>
+        <%= f.field_container :discontinue_on do %>
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
           <%= f.error_message_on :discontinue_on %>
 
@@ -112,7 +112,7 @@
       </div>
 
       <div data-hook="admin_product_form_promotionable">
-        <%= f.field_container :promotionable, class: ['form-group'] do %>
+        <%= f.field_container :promotionable do %>
           <%= f.check_box :promotionable %>
           <%= f.label :promotionable, Spree.t(:promotionable) %>
           <%= f.error_message_on :promotionable %>
@@ -120,7 +120,7 @@
       </div>
 
       <div data-hook="admin_product_form_sku">
-        <%= f.field_container :master_sku, class: ['form-group'] do %>
+        <%= f.field_container :master_sku do %>
           <%= f.label :master_sku, Spree.t(:master_sku) %>
           <%= f.text_field :sku, size: 16, class: 'form-control' %>
         <% end %>
@@ -181,7 +181,7 @@
       <% end %>
 
       <div data-hook="admin_product_form_shipping_categories">
-        <%= f.field_container :shipping_category, class: ['form-group'] do %>
+        <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_category) %>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :shipping_category %>
@@ -189,7 +189,7 @@
       </div>
 
       <div data-hook="admin_product_form_tax_category">
-        <%= f.field_container :tax_category, class: ['form-group'] do %>
+        <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree.t(:tax_category) %>
           <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
           <%= f.error_message_on :tax_category %>
@@ -200,11 +200,16 @@
   </div>
 
   <div data-hook="admin_product_form_taxons">
-    <%= f.field_container :taxons, class: ['form-group'] do %>
+    <%= f.field_container :taxons do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids),
+                                  { include_hidden: true },
+                                    multiple: true,
+                                    data: { autocomplete_url_value: 'taxons_api_v2',
+                                            autocomplete_return_attr_value: 'pretty_name',
+                                            autocomplete_multiple_value: true } %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>
@@ -219,11 +224,17 @@
   </div>
 
   <div data-hook="admin_product_form_option_types">
-    <%= f.field_container :option_types, class: ['form-group'] do %>
+    <%= f.field_container :option_types do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
-        <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+      <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids),
+                                      { include_hidden: true },
+                                        multiple: true,
+                                        class: 'select2-hidden-accessible',
+                                        data: { autocomplete_url_value: 'option_types_api_v2',
+                                                autocomplete_return_attr_value: 'name',
+                                                autocomplete_multiple_value: true } %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">
           <% @product.option_types.each do |type| %>
@@ -239,7 +250,7 @@
 
   <% if @stores.count > 1 %>
     <div data-hook="admin_product_form_stores">
-      <%= f.field_container :stores, class: ['form-group'] do %>
+      <%= f.field_container :stores do %>
         <%= f.label :product_stores, Spree.t(:stores) %>
         <%= collection_select(:product, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
       <% end %>
@@ -248,21 +259,21 @@
 
   <div data-hook="admin_product_form_meta">
     <div data-hook="admin_product_form_meta_title">
-      <%= f.field_container :meta_title, class: ['form-group'] do %>
+      <%= f.field_container :meta_title do %>
         <%= f.label :meta_title, Spree.t(:meta_title) %>
         <%= f.text_field :meta_title, class: 'form-control' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_keywords">
-      <%= f.field_container :meta_keywords, class: ['form-group'] do %>
+      <%= f.field_container :meta_keywords do %>
         <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
         <%= f.text_field :meta_keywords, class: 'form-control' %>
       <% end %>
     </div>
 
     <div data-hook="admin_product_form_meta_description">
-      <%= f.field_container :meta_description, class: ['form-group'] do %>
+      <%= f.field_container :meta_description do %>
         <%= f.label :meta_description, Spree.t(:meta_description) %>
         <%= f.text_area :meta_description, class: 'form-control' %>
       <% end %>

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

@@ -55,6 +55,7 @@
       <tr data-hook="admin_products_index_headers">
         <th scope="col" colspan="2"><%= sort_link @search,:name, Spree.t(:name), { default_order: "desc" }, {title: 'admin_products_listing_name_title'} %></th>
         <th scope="col"><%= Spree.t(:sku) %></th>
+        <th scope="col"><%= Spree.t('admin.digitals.digital') %></th>
         <th scope="col"><%= Spree.t(:status) %></th>
         <th scope="col" class="text-center">
           <%= sort_link @search, :master_default_price_amount, Spree.t(:master_price), {}, {title: 'admin_products_listing_price_title'} %>
@@ -68,11 +69,12 @@
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td scope="row" class="image">
               <%= link_to edit_admin_product_path(product) do %>
-                <%= mini_image product %>
+                <%= small_image product %>
               <% end %>
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="sku"><%= product.sku rescue '' %></td>
+            <td class="text-center"><%= active_badge(product.digitals.any?) %></td>
             <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
 

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

@@ -7,7 +7,7 @@
 
 <%= form_for [:admin, @product], html: { multipart: true } do |f| %>
   <fieldset data-hook="new_product">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: 'form-control title', required: :required %>
       <%= f.error_message_on :name %>
@@ -16,7 +16,7 @@
     <div data-hook="new_product_attrs" class="row">
       <% unless @product.has_variants? %>
         <div data-hook="new_product_sku" class="col-12 col-md-4">
-          <%= f.field_container :sku, class: ['form-group'] do %>
+          <%= f.field_container :sku do %>
             <%= f.label :sku, Spree.t(:sku) %>
             <%= f.text_field :sku, size: 16, class: 'form-control' %>
             <%= f.error_message_on :sku %>
@@ -25,14 +25,14 @@
       <% end %>
 
       <div data-hook="new_product_prototype" class="col-12 col-md-4">
-        <%= f.field_container :prototype, class: ['form-group'] do %>
+        <%= f.field_container :prototype do %>
           <%= f.label :prototype_id, Spree.t(:prototype) %>
           <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, { include_blank: true }, { class: 'select2-clear w-100' } %>
         <% end %>
       </div>
 
       <div data-hook="new_product_price" class="col-12 col-md-4">
-        <%= f.field_container :price, class: ['form-group'] do %>
+        <%= f.field_container :price do %>
         <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
         <div class="input-group">
           <div class="input-group-prepend">
@@ -45,7 +45,7 @@
       </div>
 
       <div data-hook="new_product_available_on" class="col-12 col-md-4">
-        <%= f.field_container :available_on, class: ['form-group'] do %>
+        <%= f.field_container :available_on do %>
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
@@ -64,7 +64,7 @@
       </div>
 
       <div data-hook="new_product_shipping_category" class="col-12 col-md-4">
-        <%= f.field_container :shipping_category, class: ['form-group'] do %>
+        <%= f.field_container :shipping_category do %>
           <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span>
           <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
           <%= f.error_message_on :shipping_category_id %>

data/app/views/spree/admin/promotion_actions/create.js.erb

@@ -1,6 +1,6 @@
 $('#actions').append('<%= escape_javascript( render(partial: 'spree/admin/promotions/promotion_action', object: @promotion_action) ) %>');
 $('#actions .no-objects-found').hide();
-$(document).ready(function(){
+$(document).ready(function() {
   $(".variant_autocomplete").variantAutocomplete();
   //enable select2 functions for recently added box
   $('.type-select.select2').last().select2();

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

@@ -1,11 +1,11 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion_category } %>
 
-<%= f.field_container :name, class: ['form-group'] do %>
+<%= f.field_container :name do %>
   <%= f.label :name %>
   <%= f.text_field :name, class: 'form-control' %>
   <%= f.error_message_on :name %>
 <% end %>
-<%= f.field_container :code, class: ['form-group'] do %>
+<%= f.field_container :code do %>
   <%= f.label :code %>
   <%= f.text_field :code, class: 'form-control' %>
 <% end %>

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

@@ -2,7 +2,7 @@
 
 <div class="row" id="general_fields">
   <div class="col-12 col-lg-4">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name %>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
@@ -22,7 +22,7 @@
       <% end %>
     </div>
 
-    <%= f.field_container :path, class: ['form-group'] do %>
+    <%= f.field_container :path do %>
       <%= f.label :path %>
       <%= f.text_field :path, class: 'form-control' %>
     <% end %>
@@ -36,18 +36,18 @@
   </div>
 
   <div class="col-12 col-lg-4">
-    <%= f.field_container :description, class: ['form-group'] do %>
+    <%= f.field_container :description do %>
       <%= f.label :description %>
       <%= f.text_area :description, rows: 7, class: 'form-control' %>
     <% end %>
 
-    <%= f.field_container :category, class: ['form-group'] do %>
+    <%= f.field_container :category do %>
       <%= f.label :promotion_category %>
       <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
     <% end %>
 
     <% if @stores.count > 1 %>
-      <%= f.field_container :stores, class: ['form-group'] do %>
+      <%= f.field_container :stores do %>
         <%= f.label :promotion_stores, Spree.t(:stores) %>
         <%= collection_select(:promotion, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
       <% end %>

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

@@ -1,20 +1,20 @@
 <div data-hook="admin_property_form" class="row">
   <div class="col-12 col-md-6">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: 'form-control' %>
       <%= f.error_message_on :name %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :presentation, class: ['form-group'] do %>
+    <%= f.field_container :presentation do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
       <%= f.text_field :presentation, class: 'form-control' %>
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
   <div class="col-12 col-md-6">
-    <%= f.field_container :filterable, class: ['form-group'] do %>
+    <%= f.field_container :filterable do %>
       <%= f.label :filterable, Spree.t(:filterable) %>
       <%= f.check_box :filterable %>
     <% end %>

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

@@ -28,6 +28,16 @@
         </div>
       </div>
 
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= label_tag :q_filterable_eq, Spree.t(:filterable_status) %>
+            <%= f.select :filterable_eq, options_for_select([[Spree.t(:filterable), true], [Spree.t(:non_filterable), false]]), { include_blank: true }, class: 'select2-clear js-filterable' %>
+          </div>
+        </div>
+      </div>
+    </div>
+
       <div class="form-actions" data-hook="admin_pproperties_index_search_buttons">
         <%= button Spree.t(:search), 'search.svg' %>
       </div>

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

@@ -1,26 +1,26 @@
 <div data-hook="admin_prototype_form_fields">
-  <%= f.field_container :name, class: ['form-group'] do %>
+  <%= f.field_container :name do %>
     <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br>
     <%= f.text_field :name, class: 'form-control' %>
     <%= f.error_message_on :name %>
   <% end %>
 
   <div id='properties' data-hook>
-    <%= f.field_container :property_ids, class: ['form-group'] do %>
+    <%= f.field_container :property_ids do %>
       <%= f.label :property_ids, Spree.t(:properties) %><br>
       <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id="option_types" data-hook>
-    <%= f.field_container :option_type_ids, class: ['form-group'] do %>
+    <%= f.field_container :option_type_ids do %>
       <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
       <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 
   <div id='taxons' data-hook>
-    <%= f.field_container :taxon_ids, class: ['form-group'] do %>
+    <%= f.field_container :taxon_ids do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
       <%= f.select :taxon_ids, current_store.taxons.pluck(:name, :id), {}, { multiple: true, class: "select2" } %>
     <% end %>

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

@@ -18,12 +18,12 @@
         <%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br>
         <%= @refund.payment.credit_allowed %>
       </div>
-      <%= f.field_container :amount, class: ['form-group'] do %>
+      <%= f.field_container :amount do %>
         <%= f.label :amount, Spree.t(:amount) %>
         <%= f.text_field :amount, class: 'form-control' %>
         <%= f.error_message_on :amount %>
       <% end %>
-      <%= f.field_container :reason, class: ['form-group'] do %>
+      <%= f.field_container :reason do %>
         <%= f.label :refund_reason_id, Spree.t(:reason) %>
         <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2-clear'}) %>
         <%= f.error_message_on :reason %>

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

@@ -1,6 +1,6 @@
 <div data-hook="admin_reimbursement_type_form_fields" class="row">
   <div class="col-12 col-md-8">
-    <%= f.field_container :name, class: ['form-group'] do %>
+    <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %>
       <%= f.text_field :name, class:'form-control' %>
       <%= f.error_message_on :name %>
@@ -8,7 +8,7 @@
   </div>
   <%- if @reimbursement_type.new_record? %>
     <div class="col-12 col-md-8">
-      <%= f.field_container :type, class: ['form-group'] do %>
+      <%= f.field_container :type do %>
         <%= f.label :type, Spree.t(:type) %>
         <%= f.select :type, options_for_select(Spree::ReimbursementType::KINDS), {:include_blank => false}, { :class => 'select2' } %>
         <%= f.error_message_on :type %>

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

@@ -82,19 +82,19 @@
     <%= Spree.t(:total_pre_tax_refund) %>: <span id="total_pre_tax_refund">0.00</span>
   <% end %>
 
-  <%= f.field_container :stock_location, class: ['form-group'] do %>
+  <%= f.field_container :stock_location do %>
     <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
     <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
     <%= f.error_message_on :stock_location %>
   <% end %>
 
-  <%= f.field_container :reason, class: ['form-group'] do %>
+  <%= f.field_container :reason do %>
     <%= f.label :reason, Spree.t(:reason) %> <span class="required">*</span>
     <%= f.select :return_authorization_reason_id, @reasons.collect{|r|[r.name, r.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_return_authorization_reason)} %>
     <%= f.error_message_on :reason %>
   <% end %>
 
-  <%= f.field_container :memo, class: ['form-group'] do %>
+  <%= f.field_container :memo do %>
     <%= f.label :memo, Spree.t(:memo) %>
     <%= f.text_area :memo, class: 'form-control' %>
     <%= f.error_message_on :memo %>

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

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

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

@@ -12,7 +12,7 @@
       <div class="dropdown-divider m-0"></div>
 
       <% if spree.respond_to? :root_path %>
-          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+          <%= link_to spree.root_path, target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item', data: { turbo: false } do %>
             <%= svg_icon name: "store.svg", width: '18', height: '18' %>
             &nbsp;
             <%= Spree.t(:back_to_store) %>
@@ -37,7 +37,7 @@
 
       <div class="dropdown-divider m-0"></div>
 
-        <%= link_to 'http://guides.spreecommerce.org/support', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://spreecommerce.org/contact', 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(:support) %>
@@ -49,7 +49,7 @@
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://guides.spreecommerce.org/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'https://dev-docs.spreecommerce.org/extensions/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

@@ -2,14 +2,14 @@
 <div id="<%= type %>" data-hook="address_fields">
   <% Spree::Address::ADDRESS_FIELDS.each do |field| %>
     <% if field == "country" %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
         <%= f.label :country_id, Spree.t(:country) %>
         <div id="<%= s_or_b %>country">
           <%= f.collection_select :country_id, all_countries, :id, :name, {}, { class: 'select2 w-100' } %>
         </div>
       <% end %>
     <% elsif field == "state" %>
-      <%= field_container (s_or_b + '_' + field), :state, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), :state, class: ["#{type}-row"] do %>
         <%= f.label :state_id, Spree.t(:state) %>
         <div id="<%= s_or_b %>state">
           <% if f.object.country.try(:states) %>
@@ -26,7 +26,7 @@
         <%= error_message_on f.object, :state_id %>
       <% end %>
     <% else %>
-      <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
+      <%= field_container (s_or_b + '_' + field), nil, class: ["#{type}-row"] do %>
         <%= f.label field, Spree.t(field) %>
         <%= f.text_field field, class: 'form-control' %>
         <%= error_message_on f.object, field %>
@@ -37,7 +37,7 @@
 
 <% content_for :head do %>
   <script>
-    document.addEventListener('DOMContentLoaded', function() {
+    document.addEventListener("spree:load", function() {
       updateAddressState('<%= s_or_b %>');
       $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
     })

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

@@ -15,18 +15,14 @@
 
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
-<%= 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
-  <% end %>
 </script>
+<%= render 'spree/admin/shared/paths' %>
+<%= javascript_include_tag "spree-dashboard", defer: true, data: { turbo_track: "reload" } %>
+<%= javascript_include_tag 'spree/backend/all', data: { turbo_track: "reload" } %>
+<%= render "spree/admin/shared/translations" %>
 
 <%= yield :head %>

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

@@ -61,6 +61,18 @@
     </ul>
   <% end %>
 
+  <% if can? :admin, Spree::Webhooks::Subscriber %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarIntegrations">
+      <%= main_menu_tree Spree.t('admin.tab.integrations'), icon: "enter.svg", sub_menu: "integrations", url: "#sidebar-integrations" %>
+    </ul>
+  <% end %>
+
+  <% if can? :admin, Spree::OauthApplication %>
+    <ul class="nav nav-sidebar border-bottom" id="sidebarApps">
+      <%= main_menu_tree Spree.t('admin.tab.apps'), icon: "extensions.svg", sub_menu: "apps", url: "#sidebar-apps" %>
+    </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/_new_resource_links.html.erb

@@ -1,5 +1,5 @@
 <div class="form-actions" data-hook="buttons">
   <%= button Spree.t('actions.create'), 'save.svg', 'submit', {class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, icon: 'cancel.svg', data: { turbo: false } %>
 </div>

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

@@ -52,5 +52,13 @@
         class: "nav-link #{'active' if current == :prices}" %>
 
     <% end if can?(:admin, Spree::Price) && !@product.deleted? %>
+
+    <%= content_tag :li do %>
+      <%= link_to_with_icon 'hdd.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? %>
   </ul>
 <% end %>

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

@@ -1,4 +1,4 @@
-<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
+<% if can?(:admin, current_store) && Spree::Backend::Config[:admin_show_version] %>
   <small
     class="spree-version font-weight-bold ml-3 my-3 text-muted"
     aria-label="Spree Commerce version">