spree_storefront 5.0.4 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2558511bde3c23461f7d59985b314ea15d992912d29ba2566ce9d057b6a8cff2
-  data.tar.gz: 99bff2e39e457da5b2bec3fab6ab64b5953128bae0b2a42945c19e16d2b682f3
+  metadata.gz: 2d758772259f4e6e3ffd355b4252f2422bf78263a988a818c48e48d0c377655b
+  data.tar.gz: 49bbc7a193bdd072668c0de6ffce9586a1cc3b3b0c62be40e89b3c2313720ef4
 SHA512:
-  metadata.gz: 709743a94e95bed8ef6a542231843103f60bf7699c610da106d96cd73178fe8a354eeeed5960d71349319ab77ee2915e11e97ec6efd12642f0af3d5af96175a5
-  data.tar.gz: bf929b7256f749ce99590d6f293326f157e2489700411d25e513a9ec0c4359d1352519fb1e1dea0cedfb6881771085e634af4b25b8f012ee4dbee474bd2e81f5
+  metadata.gz: d129a479969498e9a6106a462ac4db503da5bf9ffae3a721c91ee74d3291bb3353fed199e0ac47bfcc3d96db1ea80fdd2422d32b9c2bb4450a28aaefb08aa8b1
+  data.tar.gz: ed4de551790ba08151199da2500b12f04f2b2d35573baa2c9c141436b04ff80547b551c0e48132994d74569a1cb4b05dffc1a1839853d74c5cd7d38622c655bb

data/app/controllers/concerns/spree/storefront/devise_concern.rb

@@ -0,0 +1,48 @@
+# This concern is used to include the necessary methods and helpers for the Devise controllers
+# It is used to avoid repeating the same code in each controller
+module Spree
+  module Storefront
+    module DeviseConcern
+      extend ActiveSupport::Concern
+
+      included do
+        helper_method :title
+        helper_method :stored_location
+        layout 'spree/storefront'
+
+        include Spree::Core::ControllerHelpers::Auth
+        include Spree::Core::ControllerHelpers::Store
+        include Spree::Core::ControllerHelpers::Order
+        include Spree::Core::ControllerHelpers::StrongParameters
+        include Spree::Core::ControllerHelpers::Locale
+        include Spree::Core::ControllerHelpers::Currency
+        include Spree::Core::ControllerHelpers::Turbo
+        include Spree::LocaleUrls
+        include Spree::ThemeConcern
+        include Spree::IntegrationsHelper if defined?(Spree::IntegrationsHelper)
+
+        helper 'spree/wishlist'
+        helper 'spree/currency'
+        helper 'spree/locale'
+        helper 'spree/storefront_locale'
+        helper 'spree/integrations' if defined?(Spree::IntegrationsHelper)
+      end
+
+      def stored_location
+        return unless defined?(after_sign_in_path_for)
+        return unless defined?(store_location_for)
+        return unless defined?(Devise)
+
+        path = after_sign_in_path_for(Devise.mappings.keys.first)
+
+        store_location_for(Devise.mappings.keys.first, path)
+
+        path
+      end
+
+      def password_path(_resource_or_scope = nil)
+        send("#{Spree.user_class.model_name.singular_route_key}_password_path")
+      end
+    end
+  end
+end

data/app/controllers/spree/line_items_controller.rb

@@ -22,8 +22,6 @@ module Spree
                                           quantity: @quantity,
                                           options: options)
 
-      flash.now[:error] = result.value.errors.full_messages.to_sentence if result.failure?
-
       @line_item = result.value
 
       if result.success?
@@ -45,9 +43,12 @@ module Spree
       quantity = line_item_params[:quantity]&.to_i || 1
       result = cart_set_item_quantity_service.call(order: @order, line_item: @line_item, quantity: quantity)
 
-      @error = result.value.errors.full_messages.to_sentence if result.failure?
-
-      load_line_items if result.success?
+      if result.success?
+        load_line_items
+      else
+        @error = result.value.errors.full_messages.to_sentence
+        flash.now[:error] = @error
+      end
 
       respond_to do |format|
         format.turbo_stream
@@ -57,9 +58,15 @@ module Spree
 
     def destroy
       result = cart_remove_line_item_service.call(order: @order, line_item: @line_item)
-      load_line_items if result.success?
 
-      track_event('product_removed', { line_item: @line_item })
+      if result.success?
+        load_line_items
+
+        track_event('product_removed', { line_item: @line_item })
+      else
+        @error = result.value.errors.full_messages.to_sentence
+        flash.now[:error] = @error
+      end
 
       respond_to do |format|
         format.turbo_stream

data/app/controllers/spree/products_controller.rb

@@ -23,7 +23,7 @@ module Spree
       load_product
       # An interesting thing is that since we're querying the translations table (in the multi_search),
       # when using not default locale, our related products are different for different locales.
-      @products = current_store.products.active(current_currency).where.not(id: @product.id).
+      @products = storefront_products_scope.where.not(id: @product.id).
                   multi_search(@product.name).includes(storefront_products_includes).
                   limit(@section.preferred_max_products_to_show)
     end

data/app/controllers/spree/search_controller.rb

@@ -13,7 +13,7 @@ module Spree
       @taxons = []
 
       if query.present? && query.length >= Spree::Storefront::Config.search_min_query_length
-        products_scope = current_store.products.active(current_currency).multi_search(query)
+        products_scope = storefront_products_scope.multi_search(query)
         @products = products_scope.includes(storefront_products_includes)
         @taxons = current_store.taxons.search_by_name(query)
       end

data/app/controllers/spree/store_controller.rb

@@ -116,29 +116,31 @@ module Spree
     end
 
     def storefront_products_scope
-      current_store.products.active(current_currency)
+      @storefront_products_scope ||= current_store.products.active(current_currency)
     end
 
     def default_products_finder_params
-      taxon = @taxon || current_taxon
+      @default_products_finder_params ||= begin
+        taxon = @taxon || current_taxon
 
-      filter = permitted_products_params.fetch(:filter, {}).dup
+        filter = permitted_products_params.fetch(:filter, {}).dup
 
-      filter[:taxon_ids] ||= [taxon&.id.to_s].compact
-      filter[:taxons] = filter[:taxon_ids].join(',')
+        filter[:taxon_ids] ||= [taxon&.id.to_s].compact
+        filter[:taxons] = filter[:taxon_ids].join(',')
 
-      if filter.key?(:min_price) || filter.key?(:max_price)
-        min_price = filter[:min_price].presence || 0
-        max_price = filter[:max_price].presence || 'Infinity'
+        if filter.key?(:min_price) || filter.key?(:max_price)
+          min_price = filter[:min_price].presence || 0
+          max_price = filter[:max_price].presence || 'Infinity'
 
-        filter[:price] = [min_price, max_price].compact.join(',')
-      end
+          filter[:price] = [min_price, max_price].compact.join(',')
+        end
 
-      permitted_products_params.merge(
-        store: current_store,
-        filter: filter,
-        currency: current_currency
-      )
+        permitted_products_params.merge(
+          store: current_store,
+          filter: filter,
+          currency: current_currency
+        )
+      end
     end
 
     def storefront_products

data/app/helpers/spree/cart_helper.rb

@@ -22,7 +22,7 @@ module Spree
         class: opts[:class],
         data: {
           'quantity-picker-target': opts[:action],
-          action: "click->quantity-picker##{opts[:action]} click->cart#disableCart"
+          action: "click->quantity-picker##{opts[:action]} click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart"
         }
       )
     end

data/app/helpers/spree/filters_helper.rb

@@ -76,10 +76,14 @@ module Spree
       if filter_selected
         default_storefront_filter_values_scope
       else
-        Spree::OptionValue.for_products(storefront_products_for_filters).distinct
+        all_option_values_scope
       end
     end
 
+    def all_option_values_scope
+      @all_option_values_scope ||= Spree::OptionValue.for_products(storefront_products_scope).distinct
+    end
+
     def filter_values_for_filter(filter)
       selected = single_option_filter_selected?(filter.name)
       if filter.option_values.loaded?

data/app/helpers/spree/products_helper.rb

@@ -157,7 +157,7 @@ module Spree
         {
           '@type' => 'ListItem',
           'position' => index + 1,
-          'url' => spree.product_url(product_slug)
+          'url' => spree.product_url(product_slug, host: current_store.url_or_custom_domain)
         }
       end
     end
@@ -201,5 +201,9 @@ module Spree
 
       Spree::ColorsPreviewStylesPresenter.new(option_type.option_values.map { |ov| { name: ov.name, filter_name: ov.name } }).to_s
     end
+
+    def product_properties(product)
+      product.product_properties.joins(:property).merge(Spree::Property.available_on_front_end).sort_by_property_position
+    end
   end
 end

data/app/helpers/spree/storefront_helper.rb

@@ -52,8 +52,16 @@ module Spree
     end
 
     def svg_country_icon(country_code)
-      country_code = :us if country_code.to_s.downcase == 'en'
-      tag.span(class: "fi fi-#{country_code.downcase}")
+      language_to_country = {
+        'en' => 'us',
+        'ja' => 'jp',
+        'uk' => 'ua'
+      }
+
+      normalized_code = country_code.to_s.downcase
+      final_country_code = language_to_country.fetch(normalized_code, normalized_code)
+
+      tag.span(class: "fi fi-#{final_country_code}")
     end
 
     def show_account_pane?

data/app/javascript/spree/storefront/controllers/card_validation_controller.js

@@ -56,6 +56,8 @@ export default class extends Controller {
   }
 
   updateCardIcon(cardType) {
+    cardType = (cardType === "mastercard" ? "master" : cardType)
+
     const iconElement = document.getElementById(`credit-card-icon-${cardType}`)
     if (iconElement) {
       this.typeContainerTarget.innerHTML = iconElement.innerHTML

data/app/javascript/spree/storefront/controllers/cart_controller.js

@@ -7,4 +7,9 @@ export default class extends Controller {
     this.containerTarget.classList.add('pointer-events-none', 'opacity-50')
     this.spinnerTarget.classList.remove('hidden')
   }
+
+  enableCart() {
+    this.containerTarget.classList.remove('pointer-events-none', 'opacity-50')
+    this.spinnerTarget.classList.add('hidden')
+  }
 }

data/app/views/devise/passwords/edit.html.erb

@@ -6,7 +6,7 @@
     <div class="flex flex-col mb-4">
       <%= f.label :password, Spree.t(:password) %>
       <% if @minimum_password_length %>
-        <em>(<%= @minimum_password_length %> characters minimum)</em>
+        <em><%= Spree.t(:minimum_password_length, count: @minimum_password_length) %></em>
       <% end %>
       <%= f.password_field :password, autofocus: true, autocomplete: "new-password", class: 'text-input', required: true %>
     </div>

data/app/views/devise/registrations/new.html.erb

@@ -10,7 +10,7 @@
       <div class="flex flex-col mb-4">
         <%= f.label :password, Spree.t(:password) %>
         <% if @minimum_password_length %>
-          <em>(<%= @minimum_password_length %> characters minimum)</em>
+          <em><%= Spree.t(:minimum_password_length, count: @minimum_password_length) %></em>
         <% end %>
         <%= f.password_field :password, autocomplete: "new-password", class: 'text-input', required: true %>
       </div>

data/app/views/devise/shared/_links.html.erb

@@ -9,14 +9,14 @@
     <%= link_to Spree.t(:forgot_password), new_password_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.confirmable? && controller_name != 'user_confirmations' %>
-    <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+    <%= link_to Spree.t(:didn_t_receive_confirmation_instructions), new_confirmation_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'user_unlocks' %>
-    <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+    <%= link_to Spree.t(:didn_t_receive_unlock_instructions), new_unlock_path(resource_name) %>
   <% end %>
   <%- if devise_mapping.omniauthable? %>
     <%- resource_class.omniauth_providers.each do |provider| %>
-      <%= button_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
+      <%= button_to Spree.t(:sign_in_with_provider, provider: OmniAuth::Utils.camelize(provider)), omniauth_authorize_path(resource_name, provider), data: { turbo: false } %>
     <% end %>
   <% end %>
 </div>

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

@@ -38,13 +38,13 @@
             <%= check_box_tag "default_shipping", "true", @address.user_default_shipping?,
               class: 'input-checkbox input-address-default',
               disabled: @address.user_default_shipping? %>
-            Set as default delivery address
+            <%= Spree.t("address_book.set_as_default_delivery_address") %>
           <% end %>
           <%= label_tag "default_billing", class: "flex items-center gap-2 text-sm mb-4" do %>
             <%= check_box_tag "default_billing", "true", @address.user_default_billing?,
               class: 'input-checkbox input-address-default',
               disabled: @address.user_default_billing? %>
-            Set as default billing address
+            <%= Spree.t("address_book.set_as_default_billing_address") %>
           <% end %>
         </div>
         <div class="border-t border-default -mx-4 lg:mx-0 px-4 flex justify-end items-center gap-4 py-6 lg:px-8">

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

@@ -49,7 +49,7 @@
                     <% end %>
                   </div>
                 </label>
-              </label>
+              </div>
             </li>
           </ul>
         </div>
@@ -115,8 +115,7 @@
       <% unless try_spree_current_user %>
         <% if already_have_an_account? %>
           <div class="py-2 text-sm">
-            It seems you already have an account with us. Please
-            <%= link_to Spree.t(:login), spree_login_path, class: 'text-primary font-semibold' %> to continue.
+            <%= Spree.t("storefront.checkout.it_seems_you_already_have_an_account_html", link: link_to(Spree.t(:login), spree_login_path, class: 'text-primary font-semibold')) %>
           </div>
         <% end %>
       <% end %>
@@ -132,7 +131,7 @@
                 address_name: address_name,
                 address_form: address_form,
                 address_type: address_type,
-                address: Spree::Address.new(country: current_store.default_country, user: try_spree_current_user),
+                address: address_form.object.persisted? ? address_form.object : Spree::Address.new(country: current_store.default_country, user: try_spree_current_user),
                 form: form
               } %>
             </div>

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

@@ -8,7 +8,7 @@
                                                   aria: { label: Spree.t('cart_page.add_promo_code') },
                                                   data: { 'enable-button-target': 'input' },
                                                   required: true %>
-        <%= button_tag 'Apply', class: 'min-h-full ml-3 btn-primary !px-4 !py-3', data: { 'enable-button-target': 'button' }, disabled: true %>
+        <%= button_tag Spree.t(:apply), class: 'min-h-full ml-3 btn-primary !px-4 !py-3', data: { 'enable-button-target': 'button' }, disabled: true %>
       </div>
     <% end %>
   <% elsif promotion.present? %>

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

@@ -6,7 +6,7 @@
     <div id="shipping-method">
       <% if @order.backordered_variants.any? %>
         <div class="alert rounded border border-default text-sm p-5 mb-6">
-          Some products in your cart will be dispatched a bit later than the rest of your order:
+          <%= Spree.t("storefront.checkout.backorder_notice") %>
           <ul class="list-disc list-inside flex-col flex space-y-1 mt-2">
             <% @order.backordered_variants.each do |variant| %>
               <li><%= variant.name %></li>
@@ -67,4 +67,3 @@
     </div>
   </div>
 <% end %>
-

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

@@ -7,8 +7,8 @@
           <p class="mb-4"><%= Spree.t('errors.messages.no_shipping_methods_available') %> </p>
 
           <div class="flex justify-end items-center flex-wrap mt-6">
-            <%= link_to 'Return to cart', spree.cart_path, class: 'mx-4 py-4', target: :_top %>
-            <%= link_to 'Close', checkout_state_path(@order.token, @order.state), class: 'btn-primary font-semibold checkout-content-save-continue-button my-5 ml-4 !py-4', target: :_top %>
+            <%= link_to Spree.t("storefront.checkout.return_to_cart"), spree.cart_path, class: 'mx-4 py-4', target: :_top %>
+            <%= link_to Spree.t(:close), checkout_state_path(@order.token, @order.state), class: 'btn-primary font-semibold checkout-content-save-continue-button my-5 ml-4 !py-4', target: :_top %>
           </div>
         </div>
       </div>

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

@@ -66,7 +66,7 @@
             class="btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4"
     >
       <%= render 'button_processing', is_hidden: true %>
-      <%= Spree.t(:pay).titleize %>
+      <%= Spree.t(:pay) %>
     </button>
   </div>
 <% end %>

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

@@ -47,70 +47,71 @@
                   <span>
                     <%= Spree::Money.new(adjustments.sum(&:amount), currency: order.currency).to_html %>
                   </span>
-                <% end %>
+                </div>
               <% end %>
             <% end %>
-          <% elsif order.state == 'address' %>
-            <div class="flex justify-between items-center mb-2">
-              <span><%= Spree.t(:shipping) %>:</span>
-              <span class="text-xs text-gray-500"><%= Spree.t('storefront.checkout.calculated_at_next_step') %></span>
-            </div>
           <% end %>
+        <% elsif order.state == 'address' %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:shipping) %>:</span>
+            <span class="text-xs text-gray-500"><%= Spree.t('storefront.checkout.calculated_at_next_step') %></span>
+          </div>
+        <% end %>
 
-          <% if order.payment? || order.completed? %>
-            <% cache spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version) do %>
-              <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
-                <div class="flex justify-between items-center mb-2">
-                  <span><%= label %></span>
+        <% if order.payment? || order.completed? %>
+          <% cache spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version) do %>
+            <% order.all_adjustments.nonzero.tax.eligible.group_by(&:label).each do |label, adjustments| %>
+              <div class="flex justify-between items-center mb-2">
+                <span><%= label %></span>
 
-                  <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
-                  <span><%= tax_total.to_html %></span>
-                </div>
-              <% end %>
+                <% tax_total = Spree::Money.new(adjustments.sum(&:amount), currency: order.currency) %>
+                <span><%= tax_total.to_html %></span>
+              </div>
             <% end %>
           <% end %>
+        <% end %>
 
-          <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
-            <% order.adjustments.nonzero.non_tax.eligible.each do |adjustment| %>
-              <div class="flex justify-between items-center mb-2">
+        <% if order.adjustments.nonzero.non_tax.eligible.exists? %>
+          <% order.adjustments.nonzero.non_tax.eligible.each do |adjustment| %>
+            <div class="flex justify-between items-center mb-2">
                 <span>
                   <%= adjustment.label %>:
                 </span>
-                <span>
+              <span>
                   <%= adjustment.display_amount.to_html %>
                 </span>
-              </div>
-            <% end %>
-          <% end %>
-
-          <% if order.respond_to?(:gift_card) && order.gift_card.present? %>
-            <div class="flex justify-between items-center mb-2">
-              <span><%= Spree.t(:gift_card) %>:</span>
-              <span>-<%= order.display_gift_card_total %></span>
-            </div>
-          <% elsif order.using_store_credit? %>
-            <div class="flex justify-between items-center mb-2">
-              <span>Store credit:</span>
-              <span><%= order.display_total_applied_store_credit %></span>
             </div>
           <% end %>
+        <% end %>
 
-          <div>
-            <div class="flex justify-between items-center">
-              <span class="font-bold text-lg"><%= Spree.t(:total) %></span>
-              <div class="">
-                <span class="text-xs mr-1"><%= order.currency.upcase %></span>
-                <span class="font-semibold text-lg inline" id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
+        <% if order.respond_to?(:gift_card) && order.gift_card.present? %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:gift_card) %>:</span>
+            <span>-<%= order.display_gift_card_total %></span>
+          </div>
+        <% elsif order.using_store_credit? %>
+          <div class="flex justify-between items-center mb-2">
+            <span><%= Spree.t(:store_credit_name) %>:</span>
+            <span><%= order.display_total_applied_store_credit %></span>
+          </div>
+        <% end %>
+
+        <div>
+          <div class="flex justify-between items-center">
+            <span class="font-bold text-lg"><%= Spree.t(:total) %></span>
+            <div class="">
+              <span class="text-xs mr-1"><%= order.currency.upcase %></span>
+              <span class="font-semibold text-lg inline" id='summary-order-total' data-currency="<%= Money::Currency.find(order.currency).symbol %>">
                   <%= order.display_total_minus_store_credits.to_html %>
                 </span>
-              </div>
             </div>
           </div>
         </div>
-      <% end %>
-
-      <div id="checkout-message" class="mt-8">
-        <%= current_store.checkout_message if current_store.checkout_message.present? %>
       </div>
+    <% end %>
+
+    <div id="checkout-message" class="mt-8">
+      <%= current_store.checkout_message if current_store.checkout_message.present? %>
     </div>
-  <% end %>
+  </div>
+<% end %>

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -11,7 +11,7 @@
     <div class="form-group mb-3 relative">
       <% options_hash = Rails.env.production? ? {autocomplete: 'off'} : {} %>
       <label for="card_number" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:card_number) %></label>
-      <%= text_field_tag "#{param_prefix}[number]", '', 
+      <%= text_field_tag "#{param_prefix}[number]", '',
           options_hash.merge(
             id: 'card_number',
             data: { card_validation_target: "number" },
@@ -23,7 +23,7 @@
             required: true
           )
       %>
-      <div class="absolute right-2 top-7" 
+      <div class="absolute right-2 top-7"
            data-card-validation-target="typeContainer"
            id="credit-card-type-container">
       </div>
@@ -32,37 +32,37 @@
     <div class="flex gap-3">
       <div class="form-group">
         <label for="card_expiry" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:expiration_date) %></label>
-        <%= text_field_tag "#{param_prefix}[expiry]", '', 
-            id: 'card_expiry', 
+        <%= text_field_tag "#{param_prefix}[expiry]", '',
+            id: 'card_expiry',
             class: 'text-input',
             data: {
               card_validation_target: "expiry"
             },
-            placeholder: "MM/YYYY",
+            placeholder: Spree.t(:card_expiration_placeholder),
             required: true
         %>
       </div>
       <div class="form-group">
         <label for="card_code" class="block text-xs text-neutral-600 mb-1"><%= Spree.t(:cvv) %></label>
-        <%= text_field_tag "#{param_prefix}[verification_value]", '', 
+        <%= text_field_tag "#{param_prefix}[verification_value]", '',
             options_hash.merge(
-              id: 'card_code', 
-              class: 'text-input', 
+              id: 'card_code',
+              class: 'text-input',
               data: { card_validation_target: "cvv" },
               size: 4,
               maxlength: 4,
               pattern: '[0-9]*',
               inputmode: 'numeric',
-              placeholder: Spree.t(:cvv), 
+              placeholder: Spree.t(:cvv),
               required: true
-            ) 
+            )
         %>
       </div>
     </div>
 
-    <%= hidden_field_tag "#{param_prefix}[cc_type]", '', 
+    <%= hidden_field_tag "#{param_prefix}[cc_type]", '',
         id: "cc_type",
-        data: { card_validation_target: "ccType" } 
+        data: { card_validation_target: "ccType" }
     %>
 
     <% PaymentIcon.credit_cards.each do |card| %>

data/app/views/spree/line_items/destroy.turbo_stream.erb

@@ -1,11 +1,17 @@
-<%= turbo_stream.replace_all '.cart-contents' do %>
-  <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
-    <% if @order.line_items.empty? %>
-      <%= render 'spree/orders/empty' %>
-    <% else %>
-      <%= render 'spree/orders/cart' %>
+<% if flash[:error] %>
+  <%= spree_turbo_update_flashes %>
+<% else %>
+  <%= turbo_stream.replace_all '.cart-contents' do %>
+    <%= turbo_frame_tag cart_id(@order), class: 'cart-contents' do %>
+      <% if @order.line_items.empty? %>
+        <%= render 'spree/orders/empty' %>
+      <% else %>
+        <%= render 'spree/orders/cart' %>
+      <% end %>
+
+      <%= render_storefront_partials(:remove_from_cart_partials) %>
     <% end %>
   <% end %>
-<% end %>
 
-<%= spree_turbo_update_cart(@order) %>
+  <%= spree_turbo_update_cart(@order) %>
+<% end %>

data/app/views/spree/seo/sitemap.xml.erb

@@ -12,8 +12,8 @@
     <% end %>
   <% end %>
 
-  <% cache [current_store.products, current_currency] do %>
-    <% current_store.products.active(current_currency).find_each do |product| %>
+  <% cache [storefront_products_scope, current_currency] do %>
+    <% storefront_products_scope.find_each do |product| %>
       <url>
         <loc><%= spree_storefront_resource_url(product) %></loc>
         <lastmod><%= product.updated_at.strftime('%Y-%m-%d') %></lastmod>