spree_storefront 5.0.3 → 5.0.5

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>

data/app/views/themes/default/spree/account/_order.html.erb

@@ -8,16 +8,16 @@
       <% if order.payment_state == 'void' %>
         <% if order.order_refunded? %>
           <span class="badge-refunded">
-            <%= Spree.t("payment_states.refunded").titleize %>
+            <%= Spree.t("payment_states.refunded") %>
           </span>
         <% else %>
           <span class="badge-void">
-            <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+            <%= Spree.t("payment_states.#{order.payment_state}") %>
           </span>
         <% end %>
       <% else %>
         <span class="badge-success">
-          <%= Spree.t("payment_states.#{order.payment_state}").titleize %>
+          <%= Spree.t("payment_states.#{order.payment_state}") %>
         </span>
       <% end %>
     <% end %>
@@ -26,11 +26,11 @@
     <% if order.shipment_state %>
       <% if order.shipment_state == 'shipped' %>
         <span class="badge-success">
-          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+          <%= Spree.t("shipment_states.#{order.shipment_state}") %>
         </span>
       <% else %>
         <span class="badge-<%= order.shipment_state %>">
-          <%= Spree.t("shipment_states.#{order.shipment_state}").titleize %>
+          <%= Spree.t("shipment_states.#{order.shipment_state}") %>
         </span>
       <% end %>
     <% end %>

data/app/views/themes/default/spree/checkout/complete.html.erb

@@ -24,7 +24,7 @@
       <div class="mt-3 border-t pt-3">
         <span class="text-sm"><%= Spree.t(:status) %></span>
         <% if @order.payment_state.present? %>
-          <span class="badge-<%= @order.payment_state %>"><%= Spree.t("payment_states.#{@order.payment_state}").titleize %></span>
+          <span class="badge-<%= @order.payment_state %>"><%= Spree.t("payment_states.#{@order.payment_state}") %></span>
         <% else %>
           <span class="badge-pending"><%= Spree.t(:pending) %></span>
         <% end %>

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

@@ -1,5 +1,5 @@
-<%= turbo_frame_tag dom_id(line_item), data: { controller: 'reveal' } do %>
-  <li class="cart-line-item flex items-top py-6 px-4 w-full" data-reveal-target="item">
+<%= turbo_frame_tag dom_id(line_item) do %>
+  <li class="cart-line-item flex items-top py-6 px-4 w-full">
     <div class="line-item-overlay"></div>
       <div class="cart-product-image flex-shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
         <% image = line_item.variant.default_image %>
@@ -14,7 +14,7 @@
           <%= link_to line_item.name, spree_storefront_resource_url(line_item.product), class: 'font-semibold text-text', data: { 'turbo-frame': '_top' } %>
 
           <%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), method: :delete, data: { controller: 'turbo-stream-form' } do |item_form| %>
-            <%= button_tag type: :submit, class: 'remove-line-item-button h-100', data: { action: "click->reveal#hide click->cart#disableCart" } do %>
+            <%= button_tag type: :submit, class: 'remove-line-item-button h-100', data: { action: "click->cart#disableCart turbo-stream-form:submit-end->cart#enableCart" } do %>
               <%= render 'spree/shared/icons/cross', size: 16 %>
             <% end %>
           <% end %>

data/app/views/themes/default/spree/orders/_line_item_quantity.html.erb

@@ -1,6 +1,6 @@
 <div class="flex items-center">
   <%= form_for line_item, url: spree.line_item_url(line_item, order_token: line_item.order.token), data: { controller: 'turbo-stream-form' } do |item_form| %>
-    <div class="quantity-picker" data-controller="quantity-picker">
+    <div class="quantity-picker" data-controller="quantity-picker" data-quantity-picker-disabled-class="opacity-50 cursor-not-allowed">
       <!-- this is a dummy button to work with turbo frame forms when hitting ENTER -->
       <%= button_tag render('spree/shared/icons/minus'), type: 'submit', class: 'hidden' %>
       <%= quantity_modifier_button_tag render('spree/shared/icons/minus'), type: 'submit', action: 'decrease', class: 'quantity-decrease-button' %>

data/app/views/themes/default/spree/page_sections/_featured_posts.html.erb

@@ -0,0 +1,56 @@
+<div style='<%= section_styles(section) %>' class='animate-fadeIn'>
+  <div class='page-container'>
+    <% heading_size =
+      case section.preferred_heading_size
+      when "small"
+        "text-base font-medium"
+      when "medium"
+        "text-lg lg:text-xl font-medium"
+      when "large"
+        "text-xl lg:text-2xl font-medium"
+      end %>
+    <% if section.preferred_heading.present? %>
+      <div class='mb-8 flex flex-col'>
+        <h3
+          class='
+            <%= heading_size %> featured-taxon--title font-medium
+            text-<%= section.preferred_heading_alignment %>
+          '
+          data-title="<%= section.preferred_heading.downcase %>"
+          style='<%= section_heading_styles(section) %>'
+        >
+          <%= section.preferred_heading %>
+        </h3>
+
+        <% if section.description.present? %>
+          <div class='pt-4 text-<%= section.preferred_description_alignment %>'>
+            <%= section.description %>
+          </div>
+        <% end %>
+      </div>
+    <% end %>
+    <div class='flex h-full relative'>
+      <div
+        class='
+          swiper-container overflow-hidden flex-1 pr-8 lg:pr-0 -mx-4 lg:mx-0 flex flex-col
+          lg:flex-col-reverse
+        '
+        data-controller='carousel'
+        data-carousel-options-value='{ "slidesPerView": 1, "centeredSlides": false, "spaceBetween": 16, "grabCursor": true, "breakpoints": { "768": { "slidesPerView": 3, "spaceBetween": 24 } }, "navigation": { "nextEl": ".swiper-custom-button-next-<%= section.id %>", "prevEl": ".swiper-custom-button-prev-<%= section.id %>" } }'
+      >
+        <div class='swiper-wrapper px-4 lg:px-0 h-auto'>
+          <%= render partial: "spree/posts/post",
+          collection: section.posts,
+          cached: spree_base_cache_scope,
+          as: :post %>
+        </div>
+        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block top-[100px]", aria: { label: "Previous posts" }, style: "transform: translate(-50%, -50%);" do %>
+          <%= render "spree/shared/icons/chevron" %>
+        <% end %>
+        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block top-[100px]", aria: { label: "Next posts" }, style: "transform: translate(50%, -50%);" do %>
+          <%= render "spree/shared/icons/chevron_right" %>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/themes/default/spree/page_sections/_featured_product.html.erb

@@ -89,7 +89,7 @@
                           <% if presenter.product %>
                             <div class="absolute flex" data-controller="copy-input">
                               <div class="has-float-label flex flex-col max-w-[200px]">
-                                <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %>
+                                <%= text_field_tag "product-#{presenter.product.id}-share-link", spree.product_url(presenter.product, host: current_store.url_or_custom_domain), class: 'text-ellipsis text-input border-r-0 !rounded-r-none !rounded-l-md', readonly: true, type: 'text', onclick: 'this.select()', data: { copy_input_target: 'input' } %>
                                 <%= label_tag "product-#{presenter.product.id}-share-link", Spree.t(:link) %>
                               </div>
                               <button

data/app/views/themes/default/spree/page_sections/_featured_taxon.html.erb

@@ -5,7 +5,7 @@
                       when 'medium' then 'text-lg lg:text-xl font-medium'
                       when 'large' then 'text-xl lg:text-2xl font-medium'
                       end %>
-    <% if section.taxon&.image&.attached? && section.preferred_show_taxon_image %>
+    <% if section.taxon&.page_builder_image&.attached? && section.preferred_show_taxon_image %>
       <% desktop_slides_amount = 2.5 %>
       <% section_with_image = true %>
       <% arrows_on_top = false %>
@@ -47,7 +47,7 @@
           <% if section_with_image %>
             <div class='lg:col-span-5'>
               <%= link_to spree.nested_taxons_path(section.taxon), data: { turbo_frame: "_top" } do %>
-                <%= spree_image_tag(section.taxon.image, height: 500, width: 500, class: 'h-full w-full object-cover object-center', loading: :lazy) %>
+                <%= spree_image_tag(section.taxon.page_builder_image, height: 500, width: 500, class: 'h-full w-full object-cover object-center', loading: :lazy) %>
               <% end %>
             </div>
           <% end %>

data/app/views/themes/default/spree/page_sections/_featured_taxons.html.erb

@@ -12,9 +12,9 @@
     <div class="gap-6 grid-cols-2 sm:grid-cols-4 lg:grid-cols-6 xl:gap-x-8 mb-7 hidden md:grid">
       <% section.links.each do |link| %>
         <%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
-          <% if link.linkable.image&.attached? && link.linkable.image&.variable? %>
+          <% if link.linkable.page_builder_image&.attached? && link.linkable.page_builder_image&.variable? %>
             <div class="flex space-y-2 flex-col">
-              <%= spree_image_tag(link.linkable.image, height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
+              <%= spree_image_tag(link.linkable.page_builder_image, height: 300, width: 300, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
               <span><%= link.label %></span>
             </div>
           <% else %>
@@ -47,10 +47,9 @@
           <% section.links.each do |link| %>
             <div class='swiper-slide w-[200px]'>
               <%= page_builder_link_to link, title: link.label, class: 'group block overflow-hidden', target: link.open_in_new_tab.presence && '_blank' do %>
-                <% if link.linkable.image&.attached? && link.linkable.image&.variable? %>
+                <% if link.linkable.page_builder_image.attached? %>
                   <div class="flex space-y-2 flex-col">
-                    <%= spree_image_tag(link.linkable.image, height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
-                    <span><%= link.label %></span>
+                    <%= spree_image_tag(link.linkable.page_builder_image, height: 200, width: 200, class: 'h-full w-full object-cover object-center group-hover:opacity-75 rounded-md bg-gray-200', loading: :lazy, alt: link.label) %>
                   </div>
                 <% else %>
                   <div class="aspect-1 w-full group-hover:bg-gray-100 bg-gray-200 flex items-center justify-center relative">

data/app/views/themes/default/spree/page_sections/_newsletter.html.erb

@@ -38,7 +38,7 @@
           <div <%= block_attributes(block) %> class="flex justify-center w-full">
             <% if block.image.attached? && block.image.variable? %>
               <% image_style = "aspect-ratio: #{spree_asset_aspect_ratio(block.image)}; --desktop-height: #{block.preferred_height}px; --mobile-height: #{block.preferred_mobile_height}px;" %>
-              <%= image_tag spree_image_url(block.image, width: 1000, height: 1000), height: block.preferred_height, width: block.preferred_width, class: "custom-desktop-height custom-mobile-height", style: image_style %>
+              <%= image_tag spree_image_url(block.image, width: 1000, height: 1000), height: block.preferred_height, class: "custom-desktop-height custom-mobile-height", style: image_style %>
             <% end %>
           </div>
       <% end %>

data/app/views/themes/default/spree/page_sections/_product_grid.html.erb

@@ -37,16 +37,23 @@
     </div>
   </div>
 
-  <% if products %>
-    <div style='<%= section_styles(section) %>'>
-      <div class='page-container'>
-        <div class='grid gap-y-8 gap-x-4 grid-cols-2 lg:grid-cols-4 lg:gap-x-6 lg:gap-y-10 mb-7' id='products'>
+  <div style="<%= section_styles(section) %>">
+    <div class="page-container">
+      <% if products.any? %>
+        <div class="grid gap-y-8 gap-x-4 grid-cols-2 lg:grid-cols-4 lg:gap-x-6 lg:gap-y-10 mb-7" id="products">
           <%= render 'spree/shared/products', products: products %>
         </div>
-      </div>
-      <%= render 'spree/products/show_more_button' %>
-    </div>
 
-    <%= render 'spree/products/json_ld_list', products: products unless turbo_frame_request? %>
-  <% end %>
+        <%= render 'spree/products/show_more_button' %>
+        <%= render('spree/products/json_ld_list', products: products) unless turbo_frame_request? %>
+      <% else %>
+        <div class="grid">
+          <div class="text-center py-10">
+            <h2 class="text-xl font-semibold mb-2"><%= Spree.t(:no_products_found) %></h2>
+            <p class="text-sm"><%= Spree.t(:try_removing_filters) %></p>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
 <% end %>

data/app/views/themes/default/spree/policies/show.html.erb

@@ -1,11 +1,15 @@
 <div class="page-container py-12">
   <h1 class="text-2xl tracking-tight text-center lg:text-left mb-3 uppercase">
-    <%= params[:id].titleize %>
+    <%= Spree.t(params[:id]) %>
   </h1>
-  <p class="mb-8 text-center lg:text-left">
-    Last update: <%= @policy&.updated_at&.strftime('%d/%m/%Y') %>
-  </p>
-  <div class="mb-5">
-    <%= @policy&.to_s %>
-  </div>
+
+  <% if @policy.present? %>
+    <p class="mb-8 text-center lg:text-left">
+      <%= Spree.t("storefront.policies.last_update_at", date: l(@policy.updated_at.to_date)) %>
+    </p>
+
+    <div class="mb-5">
+      <%= @policy&.to_s %>
+    </div>
+  <% end %>
 </div>

data/app/views/themes/default/spree/posts/_post.html.erb

@@ -1,13 +1,22 @@
-<div id="<%= dom_id(post) %>">
-  <%= link_to spree.post_path(post), class: 'block hover:opacity-70 transition-opacity' do %>
-    <div class="h-[200px] w-full bg-gray-100">
-      <% if post.image.attached? && post.image.variable? %>
-        <%= spree_image_tag(post.image, width: 400, height: 200, class: 'h-full w-full object-cover object-center', loading: :lazy, alt: post.title) %>
-      <% end %>
-    </div>
+<div class="swiper-slide w-full">
+  <div id="<%= dom_id(post) %>">
+    <%= link_to spree.post_path(post), class: 'block hover:opacity-70 transition-opacity', data: { turbo_frame: '_top' } do %>
+      <div class="h-[200px] w-full bg-gray-100">
+        <% if post.image.attached? && post.image.variable? %>
+          <%= spree_image_tag(
+            post.image,
+            width: 400,
+            height: 200,
+            class: "h-full w-full object-cover object-center",
+            loading: :lazy,
+            alt: post.title,
+          ) %>
+        <% end %>
+      </div>
 
-    <h1 class="uppercase text-lg font-medium mt-4"><%= post.title %></h1>
-    <div class="mt-2 text-sm"><%= local_time(post.published_at, '%B %e, %Y') %></div>
-    <div class="mt-4"><%= post.shortened_description %></div>
-  <% end %>
+      <h1 class="uppercase text-lg font-medium mt-4"><%= post.title %></h1>
+      <div class="mt-2 text-sm"><%= local_time(post.published_at, "%B %e, %Y") %></div>
+      <div class="mt-4"><%= post.shortened_description %></div>
+    <% end %>
+  </div>
 </div>

data/app/views/themes/default/spree/products/_add_to_cart_button.html.erb

@@ -21,9 +21,9 @@ variant_not_available = selected_variant.nil? ||
                   },
                   disabled: product.price_in(current_currency).zero? do %>
     <% if not_selected_options.size == 1 %>
-      <span><%= Spree.t(:please_select, option: not_selected_options[0].presentation) %></span>
+      <span><%= Spree.t('storefront.variant_picker.please_choose', option_type: not_selected_options[0].presentation) %></span>
     <% elsif not_all_options_selected %>
-      <span><%= Spree.t(:please_select_all_options) %></span>
+      <span><%= Spree.t('storefront.variant_picker.please_choose_all_options') %></span>
     <% elsif variant_not_available %>
       <span><%= Spree.t(:notify_me_when_available) %></span>
       <%= render 'spree/shared/icons/bell' %>
@@ -43,9 +43,9 @@ variant_not_available = selected_variant.nil? ||
                   },
                   disabled: product.price_in(current_currency).zero? do %>
       <% if not_selected_options.size == 1 %>
-        <span><%= Spree.t(:please_select, option: not_selected_options[0].presentation) %></span>
+        <span><%= Spree.t('storefront.variant_picker.please_choose', option_type: not_selected_options[0].presentation) %></span>
       <% elsif not_all_options_selected %>
-        <span><%= Spree.t(:please_select_all_options) %></span>
+        <span><%= Spree.t('storefront.variant_picker.please_choose_all_options') %></span>
       <% elsif variant_not_available %>
         <span><%= Spree.t(:notify_me_when_available) %></span>
         <%= render 'spree/shared/icons/bell' %>

data/app/views/themes/default/spree/products/_add_to_wishlist.html.erb

@@ -6,6 +6,8 @@
     <div class="wished-item-<%= variant.id %> h-full"
       data-controller="wished-item"
       data-wished-item-variant-id-value="<%= variant.id %>"
+      data-wished-item-create-wishlist-path-value="<%= spree.account_wishlist_wished_items_path %>"
+      data-wished-item-destroy-wishlist-path-value="<%= spree.account_wishlist_wished_item_path(variant.id) %>"
     >
       <%= button_tag type: 'submit',
           class: "#{css_classes} disabled:animate-pulse",

data/app/views/themes/default/spree/products/_details.html.erb

@@ -39,7 +39,7 @@
       </div>
     <% end %>
 
-    <% product.product_properties.joins(:property).merge(Spree::Property.available_on_front_end).sort_by_property_position.each do |product_property| %>
+    <% product_properties(product).each do |product_property| %>
       <div class="product-property py-4 border-b border-default">
 
         <%= link_to "#property_#{product_property.id}", class: 'text-sm uppercase tracking-widest inline-flex w-full justify-between !border-b-transparent', data: { action: 'accordion#toggle' } do %>

data/app/views/themes/default/spree/products/_json_ld.html.erb

@@ -4,7 +4,7 @@
     "@context": "https://schema.org/",
     "@type": "Product",
     "name": <%= product.name.to_json.html_safe %>,
-    "url": <%= spree.product_url(product).to_json.html_safe %>,
+    "url": <%= spree.product_url(product, host: current_store.url_or_custom_domain).to_json.html_safe %>,
   <% if product.featured_image %>
     "image": [
       <%= spree_image_url(product.featured_image, width: 630, height: 630).to_json.html_safe %>

data/app/views/themes/default/spree/products/_json_ld_variant.html.erb

@@ -6,5 +6,5 @@
   "availability": "http://schema.org/<%= variant.available? ? 'InStock' : 'OutOfStock' %>",
   "price": <%= variant.amount_in(current_currency).to_json.html_safe %>,
   "priceCurrency": <%= current_currency.to_json.html_safe %>,
-  "url": <%= spree.product_url(product, variant_id: variant.id).to_json.html_safe %>
+  "url": <%= spree.product_url(product, variant_id: variant.id, host: current_store.url_or_custom_domain).to_json.html_safe %>
 }

data/app/views/themes/default/spree/products/_media_gallery.html.erb

@@ -85,8 +85,7 @@
       <div id='pinch-to-zoom' class='fixed top-0 left-0 p-4 bg-background z-50 flex justify-center items-center flex-col'>
         <div class='w-14 h-14'><%= render 'spree/shared/icons/pinch' %></div>
         <div class='text-sm uppercase pt-4 px-5 text-center !leading-tight'>
-          Pinch to <br>
-          zoom
+          <%= Spree.t("storefront.products.pinch_to_zoom_html") %>
         </div>
       </div>
     <% end %>

data/app/views/themes/default/spree/products/filters/_availability.html.erb

@@ -4,7 +4,7 @@
   data-accordion-close-others-value="false">
   <% availability_filter_opened = permitted_products_params.dig(:filter, :purchasable).present? || permitted_products_params.dig(:filter, :out_of_stock).present? %>
   <%= link_to "#availability_filter", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if availability_filter_opened}", data: { action: 'accordion#toggle:prevent' } do %>
-    <%= Spree.t(:availability) %>
+    <%= Spree.t(:availability).capitalize %>
     <%= render 'spree/shared/icons/chevron_down' %>
   <% end %>
   <div class='st-accordion__content' data-accordion-id='availability_filter'>

data/app/views/themes/default/spree/products/filters/_price.html.erb

@@ -16,15 +16,15 @@
     data-no-ui-slider-range-value="[<%= filter_price_range[:min].floor %>,<%= filter_price_range[:max].ceil %>]">
     <div class="flex justify-between gap-6 px-4 lg:px-10 lg:text-sm">
       <div class="relative w-1/2">
-        <%= f.number_field filter_price_range[:min].floor, class: "pl-16 without-arrows w-full peer focus:border-primary focus:ring-primary", inputmode: "numeric", name: "filter[min_price]", data: { no_ui_slider_target: "minInput" }, id: "price_from", value: params.dig(:filter, :min_price).present? ? min_price_value.to_i : nil, placeholder: filter_price_range[:min].floor %>
+        <%= f.number_field filter_price_range[:min].floor, class: "pl-16 text-right without-arrows w-full peer focus:border-primary focus:ring-primary", inputmode: "numeric", name: "filter[min_price]", data: { no_ui_slider_target: "minInput" }, id: "price_from", value: params.dig(:filter, :min_price).present? ? min_price_value.to_i : nil, placeholder: filter_price_range[:min].floor %>
         <label class="absolute left-0 top-0 flex pl-3 items-center h-full text-input-text peer-placeholder-shown:opacity-50" for="price_from">
-          from <%= currency_symbol(current_currency) %>
+          <%= Spree.t(:from) %> <%= currency_symbol(current_currency) %>
         </label>
       </div>
       <div class="relative w-1/2">
-        <%= f.number_field filter_price_range[:max].ceil, class: "pl-[2.75rem] without-arrows w-full peer focus:border-primary focus:ring-primary", placeholder: filter_price_range[:max].ceil, inputmode: "numeric", name: "filter[max_price]", data: { no_ui_slider_target: "maxInput" }, id: "price_to", value: params.dig(:filter, :max_price).present? ? max_price_value.to_i : nil %>
+        <%= f.number_field filter_price_range[:max].ceil, class: "pl-[2.75rem] text-right without-arrows w-full peer focus:border-primary focus:ring-primary", placeholder: filter_price_range[:max].ceil, inputmode: "numeric", name: "filter[max_price]", data: { no_ui_slider_target: "maxInput" }, id: "price_to", value: params.dig(:filter, :max_price).present? ? max_price_value.to_i : nil %>
         <label class="absolute left-0 top-0 flex pl-3 items-center h-full text-input-text peer-placeholder-shown:opacity-50" for="price_to">
-          to <%= currency_symbol(current_currency) %>
+          <%= Spree.t(:to) %> <%= currency_symbol(current_currency) %>
         </label>
       </div>
     </div>

data/app/views/themes/default/spree/shared/_cart_icon.html.erb

@@ -1,4 +1,6 @@
-<%= turbo_frame_tag "cart-icon-#{current_order&.item_count}", target: '_top' do %>
+<% item_count ||= current_order&.item_count %>
+
+<%= turbo_frame_tag "cart-icon-#{item_count}", target: '_top' do %>
   <%= link_to spree.cart_path,
     class: 'relative block w-6',
     id: "cart-pane-link",
@@ -6,7 +8,7 @@
     onclick: 'event.preventDefault()' do %>
     <%= render 'spree/shared/icons/cart' %>
     <span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>
-      <%= current_order.item_count if current_order&.item_count&.positive? %>
+      <%= item_count if item_count&.positive? %>
     </span>
     <span class='sr-only'><%= Spree.t('storefront.cart.items_in_cart') %>, <%= Spree.t('storefront.cart.view_bag') %></span>
   <% end %>

data/app/views/themes/default/spree/shared/_cart_pane.html.erb

@@ -1,3 +1,6 @@
+<% order ||= current_order %>
+<% item_count ||= order&.item_count %>
+
 <!-- begin sidebar/slideover -->
 <div
   id="cart-pane"
@@ -25,13 +28,13 @@
       <span class='relative block w-6'>
         <%= render 'spree/shared/icons/cart' %>
         <span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>
-          <%= current_order.item_count if current_order.present? && current_order.item_count.to_i > 0 %>
+          <%= item_count if item_count&.positive? %>
         </span>
         <span class='sr-only'><%= Spree.t('storefront.cart.items_in_cart') %>, <%= Spree.t('storefront.cart.view_bag') %></span>
       </span>
     </div>
     <div class='flex-1 h-0 overflow-y-auto'>
-      <%= turbo_frame_tag cart_id(current_order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %>
+      <%= turbo_frame_tag cart_id(order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %>
     </div>
   </div>
 </div>

data/app/views/themes/default/spree/shared/_meta_tags.html.erb

@@ -32,9 +32,9 @@
   <meta property="twitter:image" content="<%= image_url %>" />
 <% end %>
 
-<% if @product && @product.price_in(current_currency).present? %>
+<% if @product.present? && @product.price_in(current_currency).present? %>
   <meta property="og:price:amount" content="<%= @product.price_in(current_currency).amount.to_s %>">
-  <meta property="og:price:currency" content="<%= current_order&.currency || current_store.default_currency %>">
+  <meta property="og:price:currency" content="<%= current_currency %>">
 <% end %>
 
 <% if current_store.twitter.present? %>

data/config/locales/en.yml

@@ -20,6 +20,7 @@ en:
       checkout:
         all_transactions_are_secure_and_encrypted: All transactions are secure and encrypted
         already_have_an_account: Already have an account?
+        backorder_notice: 'Some products in your cart will be dispatched a bit later than the rest of your order:'
         by_placing_this_order_you_agree_to: By placing this order you agree to
         calculated_at_next_step: Calculated at next step
         continue_to_cart: Continue to cart
@@ -30,11 +31,13 @@ en:
             one: This item will be removed from your cart because there are no delivery methods available for your address.
             other: These %{count} items will be removed from your cart because there are no delivery methods available for your address.
         gift_card_amount_applied: Gift card %{code} applied %{amount} to your order.
+        it_seems_you_already_have_an_account_html: It seems you already have an account with us. Please %{link} to continue.
         or_continue_below: or continue below
         order_already_paid: You don't need to pay anything, just click Place now button to confirm the order.
         order_success: Your order is confirmed!
         order_success_message: When your order is ready, you will receive an email confirmation.
         payment_processing_message: You will receive an email confirmation when your payment is processed.
+        return_to_cart: Return to cart
         shipping_not_available: Shipping not available
         signup_for_an_account: Create an account for faster future purchases, order tracking, and more.
         store_credits_amount_applied: You applied a %{amount} store credit to your order.
@@ -50,6 +53,10 @@ en:
         description: Take control of your settings and tailor your experience according to your preferences. Customize your notifications to suit your needs.
         join: Email me about new products, sales, and more. You can unsubscribe at any time.
         status: You are currently %{status} to the newsletters.
+      policies:
+        last_update_at: Last update %{date}
+      products:
+        pinch_to_zoom_html: Pinch to<br>zoom
       refund_action_not_required_message:
         order_canceled:
           fully: This order has been canceled. No further action is required. You will receive a refund within couple business days.
@@ -66,6 +73,7 @@ en:
           partially: This order has been partially refunded. The amount paid by the selected payment method will be refunded within couple business days. Please reach out to %{customer_support_email} to receive new voucher.
       variant_picker:
         please_choose: Please choose %{option_type}
+        please_choose_all_options: Please choose all options
       wished_items:
         add: Add to wishlist
         no_wished_items: