spree_frontend 4.4.0 → 4.6.0

data/app/assets/javascripts/spree/frontend/views/spree/home/product_carousels.js

@@ -26,7 +26,7 @@ Spree.loadsCarouselElements = function () {
   $('div[data-product-carousel-taxon-id]').each(function (_index, element) { Spree.loadCarousel(element, this) })
 }
 
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   var carouselPresent = $('div[data-product-carousel-taxon-id]')
 
   if (carouselPresent.length) {

data/app/assets/javascripts/spree/frontend/views/spree/product/related.js

@@ -9,7 +9,7 @@ Spree.fetchRelatedProducts = function (id, htmlContainer) {
   })
 }
 
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   var productDetailsPage = $('body#product-details')
 
   if (productDetailsPage.length) {

data/app/assets/javascripts/spree/frontend/views/spree/products/cart_form.js

@@ -1,4 +1,4 @@
-//= require spree/api/storefront/cart
+//= require spree/frontend/api/storefront/cart
 //= require ../shared/product_added_modal
 //= require ../shared/variant_select
 
@@ -89,7 +89,7 @@ function CartForm($, $cartForm) {
     this.selectedOptionValueIds.splice(
       optionTypeIndex,
       this.selectedOptionValueIds.length,
-      parseInt($optionValue.val())
+      $optionValue.val().toString()
     )
   }
 
@@ -104,7 +104,7 @@ function CartForm($, $cartForm) {
         .find(OPTION_VALUE_SELECTOR)
         .each(function(_index, ov) {
           var $ov = $(ov)
-          var id = parseInt($ov.val())
+          var id = $ov.val().toString()
 
           $ov.prop('checked', false)
           $ov.prop('disabled', !availableOptionValueIds.includes(id))
@@ -121,7 +121,7 @@ function CartForm($, $cartForm) {
 
     return this.variants.reduce(function(acc, variant) {
       var optionValues = variant.option_values.map(function(ov) {
-        return ov.id
+        return ov.id.toString()
       })
 
       var isPossibleVariantFound = selectedOptionValueIds.every(function(ov) {
@@ -180,7 +180,7 @@ function CartForm($, $cartForm) {
 
     if (!this.withOptionValues) {
       return this.variants.find(function(variant) {
-        return variant.id === parseInt(self.$variantIdInput.val())
+        return variant.id && self.$variantIdInput.val() && variant.id.toString() === self.$variantIdInput.val().toString()
       })
     }
 
@@ -190,7 +190,7 @@ function CartForm($, $cartForm) {
 
     return this.variants.find(function(variant) {
       var optionValueIds = variant.option_values.map(function(ov) {
-        return ov.id
+        return ov.id.toString()
       })
 
       return self.areArraysEqual(optionValueIds, self.selectedOptionValueIds)
@@ -298,7 +298,7 @@ Spree.ready(function($) {
         quantity,
         options, // options hash - you can pass additional parameters here, your backend
         // needs to be aware of those, see API docs:
-        // https://github.com/spree/spree/blob/master/api/docs/v2/storefront/index.yaml#L42
+        // https://github.com/spree/spree/blob/d894358e49b8c3a7f6944e838de7cd92510e31d0/api/docs/v2/storefront/index.yaml#L442
         function(response) {
           $addToCart.prop('disabled', false)
           Spree.fetchCart()
@@ -331,7 +331,7 @@ Spree.ready(function($) {
     CartForm($, $cartForm)
   })
 
-  document.addEventListener('turbolinks:request-start', function () {
+  document.addEventListener('turbo:request-start', function () {
     Spree.hideProductAddedModal()
   })
 })

data/app/assets/javascripts/spree/frontend/views/spree/products/description.js

@@ -1,4 +1,4 @@
-document.addEventListener('turbolinks:load', function () {
+document.addEventListener('turbo:load', function () {
   $('#product-description-arrow').click(function () {
     document.getElementById('product-description-long').classList.remove('d-none')
     document.getElementById('product-description-short').classList.add('d-none')

data/app/assets/javascripts/spree/frontend/views/spree/products/index.js

@@ -35,7 +35,7 @@ Spree.ready(function ($) {
         '?' +
         customEncodeURI(decodeURIComponent(searchParams.toString()))
     );
-    Turbolinks.visit(location);
+    Turbo.visit(location);
   }
 
   function updateFilters(event, $this, removeValue) {

data/app/assets/javascripts/spree/frontend/views/spree/shared/mobile_navigation.js

@@ -21,7 +21,7 @@ Spree.ready(function($) {
       this.closeAllCategories = this.closeAllCategories.bind(this);
 
       window.addEventListener('resize', this.onResize);
-      window.addEventListener('turbolinks:request-start', this.onCloseClick);
+      window.addEventListener('turbo:request-start', this.onCloseClick);
 
       this.burgerButton.addEventListener('click', this.onBurgerClick, false);
       this.closeButton.addEventListener('click', this.onCloseClick, false);
@@ -77,7 +77,7 @@ Spree.ready(function($) {
 
   MobileNavigationManager.prototype.openCategory = function(category) {
     this.openedCategories.push(category);
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     if (subList) {
       this.mobileNavigationList.classList.add('mobile-navigation-list-subcategory-shown');
       this.mobileNavigationList.scrollTop = 0
@@ -89,7 +89,7 @@ Spree.ready(function($) {
 
   MobileNavigationManager.prototype.closeCurrentCategory = function() {
     var category = this.openedCategories.pop();
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     if (subList) {
       subList.classList.remove('shown');
     }
@@ -101,7 +101,7 @@ Spree.ready(function($) {
   }
 
   MobileNavigationManager.prototype.closeCategory = function(category) {
-    var subList = document.querySelector('ul[data-category=' + category + ']');
+    var subList = document.querySelector('ul[data-category="' + category + '"]');
     subList.style.transition = 'none';
     subList.classList.remove('shown');
     setTimeout(function(){ subList.style.transition = ''; }, 500);

data/app/assets/javascripts/spree/frontend/views/spree/shared/variant_select.js

@@ -8,7 +8,7 @@ this.initializeQueryParamsCheck = function () {
 
 function verifyVariantIdMatch() {
   this.variants.forEach(function(variant) {
-    if (parseInt(variant.id) === parseInt(variantIdFromUrl)) this.urlQueryMatchFound = true
+    if (variant.id.toString() === variantIdFromUrl.toString()) this.urlQueryMatchFound = true
   })
 }
 
@@ -23,7 +23,7 @@ this.setSelectedVariantFromUrl = function () {
 
 this.getVariantOptionsById = function(variantIdFromUrl) {
   this.variants.forEach(function(variant) {
-    if (parseInt(variant.id) === parseInt(variantIdFromUrl)) this.sortOptionValues(variant.option_values)
+    if (variant.id.toString() === variantIdFromUrl.toString()) this.sortOptionValues(variant.option_values)
   })
 }
 
@@ -36,7 +36,7 @@ function buildArray(item) {
   var target = container.querySelectorAll('.product-variants-variant-values-radio')
 
   target.forEach(function(inputTag) {
-    if (parseInt(inputTag.value) === item.id && inputTag.dataset.presentation === item.presentation) {
+    if (inputTag.value.toString() === item.id.toString() && inputTag.dataset.presentation === item.presentation) {
       this.selectedOptions.push(inputTag)
     }
   })

data/app/assets/javascripts/spree/frontend.js

@@ -4,14 +4,13 @@
 //= require bootstrap
 //= require jquery.payment
 //= require cleave
-//= require spree
+//= require spree/frontend/main
 //= require polyfill.min
 //= require fetch.umd
-//= require spree/api/main
+//= require spree/frontend/api/main
 //= require ./lazysizes.config
 //= require lazysizes.min
 //= require accounting.min
-//= require turbolinks
 //= require spree/frontend/account
 //= require spree/frontend/api_tokens
 //= require spree/frontend/carousel-noconflict
@@ -40,31 +39,25 @@
 //= require spree/frontend/views/spree/shared/nav_bar
 //= require spree/frontend/views/spree/shared/product_added_modal
 //= require spree/frontend/views/spree/shared/quantity_select
-//= require spree/frontend/turbolinks_scroll_fix
+//= require spree/frontend/turbo_scroll_fix
 //= require spree/frontend/main_nav_bar
 //= require spree/frontend/login
 
-Spree.routes.api_tokens = Spree.pathFor('api_tokens')
-Spree.routes.ensure_cart = Spree.pathFor('ensure_cart')
+Spree.routes.api_tokens = Spree.localizedPathFor('api_tokens')
+Spree.routes.ensure_cart = Spree.localizedPathFor('ensure_cart')
 Spree.routes.api_v2_storefront_cart_apply_coupon_code = Spree.localizedPathFor('api/v2/storefront/cart/apply_coupon_code')
 Spree.routes.api_v2_storefront_cart_remove_coupon_code = function(couponCode) { return Spree.localizedPathFor('api/v2/storefront/cart/remove_coupon_code/' + couponCode) }
 Spree.routes.api_v2_storefront_destroy_credit_card = function(id) { return Spree.localizedPathFor('api/v2/storefront/account/credit_cards/' + id) }
 Spree.routes.product = function(id) { return Spree.localizedPathFor('products/' + id) }
 Spree.routes.product_related = function(id) { return Spree.localizedPathFor('products/' + id + '/related') }
 Spree.routes.product_carousel = function (taxonId) { return Spree.localizedPathFor('product_carousel/' + taxonId) }
-Spree.routes.set_locale = function(locale) { return Spree.pathFor('locale/set?switch_to_locale=' + locale) }
-Spree.routes.set_currency = function(currency) { return Spree.pathFor('currency/set?switch_to_currency=' + currency) }
-
-Spree.showProgressBar = function () {
-  if (!Turbolinks.supported) { return }
-  Turbolinks.controller.adapter.progressBar.setValue(0)
-  Turbolinks.controller.adapter.progressBar.show()
-}
+Spree.routes.set_locale = function(locale) { return Spree.localizedPathFor('locale/set?switch_to_locale=' + locale) }
+Spree.routes.set_currency = function(currency) { return Spree.localizedPathFor('currency/set?switch_to_currency=' + currency) }
 
 Spree.clearCache = function () {
-  if (!Turbolinks.supported) { return }
+  if (!window.Turbo) { return }
 
-  Turbolinks.clearCache()
+  Turbo.clearCache()
 }
 
 Spree.setCurrency = function (currency) {
@@ -81,5 +74,5 @@ Spree.setCurrency = function (currency) {
 
   SPREE_CURRENCY = currency
 
-  Turbolinks.visit(window.location.pathname + queryString, { action: 'replace' })
+  Turbo.visit(window.location.pathname + queryString, { action: 'replace' })
 }

data/app/controllers/spree/addresses_controller.rb

@@ -10,7 +10,7 @@ module Spree
         flash[:notice] = I18n.t(:successfully_created, scope: :address_book)
         redirect_to spree.account_path
       else
-        render action: 'new'
+        render action: 'new', status: :unprocessable_entity
       end
     end
 
@@ -27,7 +27,7 @@ module Spree
         flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
         redirect_back_or_default(addresses_path)
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 

data/app/controllers/spree/checkout_controller.rb

@@ -46,7 +46,7 @@ module Spree
           redirect_to spree.checkout_state_path(@order.state)
         end
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -190,7 +190,7 @@ module Spree
     def rescue_from_spree_gateway_error(exception)
       flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
       @order.errors.add(:base, exception.message)
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
 
     def check_authorization

data/app/controllers/spree/locale_controller.rb

@@ -10,6 +10,11 @@ module Spree
       new_locale = (params[:switch_to_locale] || params[:locale]).to_s
 
       if new_locale.present? && supported_locale?(new_locale)
+
+        if try_spree_current_user && try_spree_current_user.selected_locale != new_locale
+          try_spree_current_user.update!(selected_locale: new_locale)
+        end
+
         if should_build_new_url?
           redirect_to BuildLocalizedRedirectUrl.call(
             url: request.env['HTTP_REFERER'],
@@ -27,10 +32,11 @@ module Spree
     private
 
     def should_build_new_url?
+      return false if request.env['HTTP_REFERER'].blank?
       if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)
         false
       else
-        request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+        request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
       end
     end
   end

data/app/controllers/spree/orders_controller.rb

@@ -25,7 +25,7 @@ module Spree
           end
         end
       else
-        respond_with(@order)
+        respond_with(@order, status: :unprocessable_entity)
       end
     end
 

data/app/controllers/spree/products_controller.rb

@@ -52,7 +52,7 @@ module Spree
     end
 
     def load_product
-      @product = current_store.products.for_user(try_spree_current_user).friendly.find(params[:id])
+      @product = find_with_fallback_default_locale { current_store.products.for_user(try_spree_current_user).friendly.find(params[:id]) }
     end
 
     def load_taxon

data/app/controllers/spree/taxons_controller.rb

@@ -30,7 +30,7 @@ module Spree
     end
 
     def load_taxon
-      @taxon = current_store.taxons.friendly.find(params[:id])
+      @taxon = find_with_fallback_default_locale { current_store.taxons.friendly.find(params[:id]) }
     end
 
     def load_products

data/app/helpers/spree/frontend_helper.rb

@@ -9,12 +9,18 @@ module Spree
     end
 
     def logo(image_path = nil, options = {})
-      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
-                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
-                     elsif current_store.logo.attached? && current_store.logo.image?
-                       main_app.url_for(current_store.logo)
+      logo_attachment = if defined?(Spree::StoreLogo) && current_store.logo.is_a?(Spree::StoreLogo)
+                          current_store.logo.attachment # Spree v5
+                        else
+                          current_store.logo # Spree 4.x
+                        end
+
+      image_path ||= if logo_attachment&.attached? && logo_attachment&.variable?
+                       main_app.cdn_image_url(logo_attachment.variant(resize: '244x104>'))
+                     elsif logo_attachment&.attached? && logo_attachment&.image?
+                       main_app.cdn_image_url(current_store.logo)
                      else
-                      'logo/spree_50.png'
+                       asset_path('logo/spree_50.png')
                      end
 
       path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
@@ -165,7 +171,7 @@ module Spree
       image = default_image_for_product_or_variant(product)
 
       image_url = if image.present?
-                    main_app.url_for(image.url('plp'))
+                    main_app.cdn_image_url(image.url('plp'))
                   else
                     asset_path('noimage/plp.svg')
                   end
@@ -200,7 +206,7 @@ module Spree
       widths = { lg: 1200, md: 992, sm: 768, xs: 576 }
       set = []
       widths.each do |key, value|
-        file = main_app.url_for(image.url("plp_and_carousel_#{key}"))
+        file = main_app.cdn_image_url(image.url("plp_and_carousel_#{key}"))
 
         set << "#{file} #{value}w"
       end
@@ -352,7 +358,7 @@ module Spree
     def spree_social_link(service)
       return '' if current_store.send(service).blank?
 
-      link_to "https://#{service}.com/#{current_store.send(service)}", target: :blank, rel: 'nofollow noopener', 'aria-label': service do
+      link_to "https://#{service}.com/#{current_store.send(service)}", target: '_blank', rel: 'nofollow noopener', 'aria-label': service do
         content_tag :figure, id: service, class: 'px-2' do
           icon(name: service, width: 22, height: 22)
         end

data/app/helpers/spree/navigation_helper.rb

@@ -67,7 +67,7 @@ module Spree
                         "/#{I18n.locale}"
                       end
 
-      if Spree::MenuItem::DYNAMIC_RESOURCE_TYPE.include? item.linked_resource_type
+      if ['Spree::Product', 'Spree::Taxon', 'Spree::CmsPage'].include?(item.linked_resource_type)
         output_locale.to_s + item.link
       elsif item.linked_resource_type == 'Home Page'
         "/#{locale_param}"

data/app/helpers/spree/products_filters_helper.rb

@@ -67,7 +67,7 @@ module Spree
             }
           end
         else
-          filter_content_tag(option_value.name, opts.merge(is_selected: is_selected))
+          filter_content_tag(option_value.presentation, opts.merge(is_selected: is_selected))
         end
       end
     end

data/app/services/spree/build_localized_redirect_url.rb

@@ -4,9 +4,12 @@ module Spree
   class BuildLocalizedRedirectUrl
     prepend Spree::ServiceModule::Base
 
-    LOCALE_REGEX = /^\/[A-Za-z]{2}\/|^\/[A-Za-z]{2}-[A-Za-z]{2}\/|^\/[A-Za-z]{2}$|^\/[A-Za-z]{2}-[A-Za-z]{2}$/.freeze
+    LOCALE_REGEX = /^\/([A-Za-z]{2})\/|^\/([A-Za-z]{2}-[A-Za-z]{2})\/|^\/([A-Za-z]{2})$|^\/([A-Za-z]{2}-[A-Za-z]{2})$/.freeze
 
-    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages)/.freeze
+    SUPPORTED_PATHS_REGEX = /\/(products|t\/|cart|checkout|addresses|content|pages|login|account|logout|signup|users)/.freeze
+
+    PRODUCT_PATH_REGEX = /\/products\/(\S+)/.freeze
+    TAXON_PATH_REGEX = /\/t\/(\S+)/.freeze
 
     # rubocop:disable Lint/UnusedMethodArgument
     def call(url:, locale:, default_locale: nil)
@@ -23,11 +26,12 @@ module Spree
       success(
         url: URI(url),
         locale: locale,
+        default_locale: default_locale,
         default_locale_supplied: default_locale_supplied?(locale, default_locale)
       )
     end
 
-    def generate_new_path(url:, locale:, default_locale_supplied:)
+    def generate_new_path(url:, locale:, default_locale:, default_locale_supplied:)
       unless supported_path?(url.path)
         return success(
           url: url,
@@ -38,11 +42,20 @@ module Spree
         )
       end
 
-      new_path = if default_locale_supplied
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
-                 else
-                   maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
-                 end
+
+      locale_url_match = url.path.match(LOCALE_REGEX)
+      previous_locale = locale_url_match ? locale_url_match[1] || default_locale : default_locale
+
+      product_path_match = url.path.match(PRODUCT_PATH_REGEX)
+      taxon_path_match = url.path.match(TAXON_PATH_REGEX)
+
+      if product_path_match
+        new_path = generate_product_path(product_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      elsif url.path.match(TAXON_PATH_REGEX)
+        new_path = generate_taxon_path(taxon_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      else
+        new_path = generate_regular_page_path(default_locale_supplied, url, locale)
+      end
 
       success(
         url: url,
@@ -97,5 +110,32 @@ module Spree
     def builder_class(url)
       url.scheme == 'http' ? URI::HTTP : URI::HTTPS
     end
+
+    def generate_product_path(product_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      product = begin
+        Mobility.with_locale(previous_locale) { Spree::Product.friendly.find(product_path_match[1]) }
+      rescue ActiveRecord::RecordNotFound
+        Mobility.with_locale(default_locale) { Spree::Product.friendly.find(product_path_match[1]) }
+      end
+
+      new_slug = Mobility.with_locale(locale) { product.slug(fallbacks: default_locale) }
+      new_path_slug = "/products/#{new_slug}"
+      default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
+    end
+
+    def generate_taxon_path(taxon_path_match, previous_locale, locale, default_locale, default_locale_supplied)
+      taxon = Mobility.with_locale(previous_locale) { Spree::Taxon.friendly.find(taxon_path_match[1]) }
+      new_slug = Mobility.with_locale(locale) { taxon.permalink(fallbacks: default_locale) }
+      new_path_slug = "/t/#{new_slug}"
+      default_locale_supplied ? new_path_slug : "/#{locale}/#{new_path_slug}"
+    end
+
+    def generate_regular_page_path(default_locale_supplied, url, locale)
+      if default_locale_supplied
+        maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, '/') : url.path
+      else
+        maches_locale_regex?(url.path) ? url.path.gsub(LOCALE_REGEX, "/#{locale}/") : "/#{locale}#{url.path}"
+      end
+    end
   end
 end

data/app/views/spree/addresses/new.html.erb

@@ -1,7 +1,7 @@
 <%= render 'spree/shared/error_messages', target: @address %>
 <div class="col-lg-6 offset-lg-3">
   <h3 class="spree-header spree-mb-large spree-mt-large"><%= Spree.t(:new_address, scope: :address_book) %></h3>
-  <%= form_for @address, html: { id: 'checkout_form_address' } do |f| %>
+  <%= form_for @address, url: spree.addresses_path, html: { id: 'checkout_form_address' } do |f| %>
   <div class="form-group checkout-content-inner-field mb-5 has-float-label">
     <%= f.text_field :label, class: 'spree-flat-input', placeholder: Spree.t(:address_name_placeholder, scope: :address_book) %>
     <%= f.label :address_name, Spree.t(:label, scope: :address_book) %>

data/app/views/spree/checkout/edit.html.erb

@@ -33,7 +33,7 @@ end
   </div>
 
   <div class="row checkout-content" data-hook="checkout_content">
-    <%= form_for @order, url: spree.update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}", class: "w-100 d-lg-flex align-items-lg-baseline  flex-wrap position-relative" } do |form| %>
+    <%= form_for @order, url: spree.update_checkout_path(@order.state), html: { id: "checkout_form_#{@order.state}", class: "w-100 d-lg-flex align-items-lg-baseline  flex-wrap position-relative", data: { turbo: false } } do |form| %>
       <div class="<%= if @order.state != 'confirm' then 'col-lg-6' else 'col-md-12' end %>" data-hook="checkout_form_wrapper">
         <%= form.hidden_field :state_lock_version %>
         <%= render @order.state, form: form %>

data/app/views/spree/checkout/registration.html.erb

@@ -15,7 +15,7 @@
           </div>
           <% path = spree.respond_to?(:update_checkout_registration_path) ? spree.update_checkout_registration_path : spree_signup_path %>
 
-          <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration' } do |f| %>
+          <%= form_for @order, url: path, method: :put, html: { id: 'checkout_form_registration', data: { turbo: false } } do |f| %>
             <div class="form-group">
               <p class="form-group checkout-content-inner-field">
                 <%= f.email_field :email, class: 'spree-flat-input', placeholder: Spree.t(:email) %>

data/app/views/spree/orders/_line_item.html.erb

@@ -16,7 +16,7 @@
         <% variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
           <li class="item-details">
             <% # TODO: rework option values so options_text method can be used here %>
-            <%= "#{ov.option_type.presentation}: #{ov.name.titleize}" %>
+            <%= "#{ov.option_type.presentation}: #{ov.presentation}" %>
           </li>
         <% end %>
       </ul>

data/app/views/spree/orders/_line_item_data.html.erb

@@ -22,7 +22,7 @@
 <% end %>
 
 <div class="shopping-cart-item-delete <%= additional_classes %>" data-hook="cart_item_delete">
-  <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbolinks: false, id: dom_id(line_item), variant_sku: line_item.sku, variant_name: line_item.name, variant_price: line_item.price, variant_options: line_item.options_text }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
+  <%= link_to '#', class: 'delete', id: "delete_#{dom_id(line_item)}", data: { turbo: false, id: dom_id(line_item), variant_sku: line_item.sku, variant_name: line_item.name, variant_price: line_item.price, variant_options: line_item.options_text }, aria: { label: Spree.t('cart_page.remove_from_cart') } do %>
     <%= icon(name: 'garbage',
              classes: 'shopping-cart-item-delete-icon',
              width: 18.9,

data/app/views/spree/products/_color_option_type.html.erb

@@ -9,14 +9,14 @@
         <li>
           <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
             class: "m-1 m-sm-2 m-md-1 color-select-label",
-            title: option_value[:name]&.humanize,
+            title: option_value[:presentation],
             data: { toggle: "tooltip", placement: "bottom" } do %>
 
             <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",
               option_value[:id],
               option_value[:is_default] && index == 0,
               class: "product-variants-variant-values-radio",
-              aria: { label: option_value[:name] },
+              aria: { label: option_value[:presentation] },
               data: {
                 "option-type-index" => index,
                 "presentation" => option_value[:presentation],

data/app/views/spree/products/_filters_desktop.html.erb

@@ -9,7 +9,7 @@
           <% option_type_name = ot_filter_param.titleize %>
           <% collapsed = params[ot_filter_param].blank? %>
 
-          <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= option_type_name %>" data-toggle="collapse" data-target="#collapseFilter<%= option_type_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= option_type_name %>" role="heading" aria-level="2">
+          <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= ot_filter_param %>" data-toggle="collapse" data-target="#collapseFilter<%= ot_filter_param %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= ot_filter_param %>" role="heading" aria-level="2">
             <%= option_type.presentation %>
             <%= icon(name: 'plus',
                     classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
@@ -20,7 +20,7 @@
                     width: 16,
                     height: 16) %>
           </button>
-          <div id="collapseFilter<%= option_type_name %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= option_type_name %>">
+          <div id="collapseFilter<%= ot_filter_param %>" class="collapse <%= 'show' unless collapsed %>" aria-labelledby="filters<%= ot_filter_param %>">
             <div class="card-body px-0 pt-1">
               <%= render 'spree/shared/option_values',
                 option_type: option_type,
@@ -36,7 +36,7 @@
             <% property_name = property.name %>
             <% collapsed = params.dig(:properties, property.filter_param).blank? %>
             <button class="card-header <%= 'collapsed' if collapsed %> px-1 plp-filters-card-header" id="filters<%= property_name %>" data-toggle="collapse" data-target="#collapseFilter<%= property_name %>" aria-expanded="<%= !collapsed %>" aria-controls="collapseFilter<%= property_name %>" role="heading" aria-level="2">
-              <%= property.presentation.titleize %>
+              <%= property.presentation %>
               <%= icon(name: 'plus',
                       classes: 'mt-1 float-right arrow plp-filters-card-header-arrow--plus',
                       width: 16,

data/app/views/spree/products/_filters_mobile.html.erb

@@ -16,7 +16,7 @@
 
           <div class="card plp-overlay-card">
             <div class="card-header text-uppercase <%= 'collapsed' if params[ot_downcase_name].blank? %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= option_type_name %>" data-target="#collapseFilterMobile<%= option_type_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= option_type_name %>" role="heading" aria-level="3">
-              <%= option_type_name %>
+              <%= option_type.presentation %>
               <%= icon(name: 'arrow-right',
                       classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
                       width: 16,
@@ -36,7 +36,7 @@
             <% collapsed = params.dig(:properties, property.filter_param).blank? %>
             <div class="card plp-overlay-card">
               <div class="card-header text-uppercase <%= 'collapsed' if collapsed %> plp-overlay-card-header" data-toggle="collapse" id="filtersMobile<%= property_name %>" data-target="#collapseFilterMobile<%= property_name %>" aria-expanded="true" aria-controls="collapseFilterMobile<%= property_name %>" role="heading" aria-level="3">
-                <%= property_name %>
+                <%= property.presentation %>
                 <%= icon(name: 'arrow-right',
                          classes: 'spree-icon-arrow spree-icon-arrow-right mt-1 float-right arrow plp-overlay-card-header-arrow',
                          width: 16,

data/app/views/spree/products/_thumbnails.html.erb

@@ -3,7 +3,7 @@
   <ul id="product-thumbnails" class="thumbnails d-flex w-100 pl-0 my-4" data-hook>
     <% @product.images.each do |i| %>
       <li class='tmb-all mr-2 tmb-<%= i.viewable.id %>'>
-        <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "img-thumbnail d-inline-block"), main_app.url_for(i.url(:product))) %>
+        <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail d-inline-block"), main_app.cdn_image_url(i.url(:product))) %>
       </li>
     <% end %>
 
@@ -11,7 +11,7 @@
       <% @product.variant_images.each do |i| %>
         <% next if @product.images.include?(i) %>
         <li class='vtmb mr-2 tmb-<%= i.viewable.id %>'>
-          <%= link_to(image_tag(main_app.url_for(i.url(:mini)), class: "img-thumbnail"), main_app.url_for(i.url(:product))) %>
+          <%= link_to(image_tag(main_app.cdn_image_url(i.url(:mini)), class: "img-thumbnail"), main_app.cdn_image_url(i.url(:product))) %>
         </li>
       <% end %>
     <% end %>

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

@@ -5,9 +5,10 @@
 <%== meta_robots %>
 <%= canonical_tag(current_store.url) %>
 <%= favicon_link_tag(spree_favicon_path) %>
-<%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', 'data-turbolinks-track': 'reload' %>
+<%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', data: { turbo_track: 'reload' } %>
 <%= csrf_meta_tags %>
 <%= render 'spree/shared/paths' %>
 <%= render 'spree/shared/locale_and_currency' %>
-<%= javascript_include_tag 'spree/frontend/all', defer: true, 'data-turbolinks-track': 'reload' %>
+<%= javascript_include_tag "application", defer: true, data: { turbo_track: 'reload' } %>
+<%= javascript_include_tag 'spree/frontend/all', defer: true, data: { turbo_track: 'reload' } %>
 <%= yield :head %>