spree_storefront 5.1.8 → 5.2.0.rc1

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

@@ -12,35 +12,11 @@
       <template data-product-form-target="spinnerTemplate">
         <%= render "spree/shared/icons/spinner" %>
       </template>
-      <%= render 'spree/products/breadcrumbs', product: product, taxons: product_breadcrumb_taxons(product) %>
+
       <div id="product-details-page" class="grid grid-cols-1 lg:grid-cols-12 gap-x-14">
-        <div class="lg:hidden">
-          <% if product.brand %>
-            <%= link_to spree.nested_taxons_path(product.brand), title: product.brand_name do %>
-              <h3 class="text-sm lg:mt-0 inline-block mb-1">
-                <%= product.brand_name %>
-              </h3>
-            <% end %>
-          <% end %>
-          <h1 class="text-2xl uppercase tracking-tight mb-4 font-medium">
-            <%= product.name %>
-          </h1>
-          <%= link_to spree.product_path(product), class: "text-2xl uppercase tracking-tight font-medium hidden" do %>
-            <%= product.name %>
-          <% end %>
-          <%=
-            render 'spree/products/price',
-              product: product,
-              use_variant: true,
-              selected_variant: @selected_variant,
-              price_class: "my-4 lg:text-lg lg:font-medium",
-              price_container_class: "w-full"
-          %>
-        </div>
+        <% images = product_media_gallery_images(product, selected_variant: @selected_variant, variant_from_options: @variant_from_options) %>
 
         <div class="lg:col-span-7 relative">
-          <% images = product_media_gallery_images(product, selected_variant: @selected_variant, variant_from_options: @variant_from_options) %>
-
           <div class="lg:hidden mb-6">
             <%= render 'spree/products/media_gallery', images: images, product: product %>
           </div>
@@ -50,53 +26,58 @@
         </div>
 
         <div class="lg:col-span-5 lg:col-start-8">
-          <div data-controller='sticky-button' data-product-form-target="productDetails">
-            <div class="hidden lg:block">
-              <% if product.brand %>
-                <%= link_to spree.nested_taxons_path(product.brand), title: product.brand_name do %>
-                  <h3 class="text-sm mt-3 lg:mt-0 inline-block uppercase">
-                    <%= product.brand_name %>
-                  </h3>
-                <% end %>
-              <% end %>
-              <h1 class="text-2xl uppercase tracking-tight mb-4 mt-2 font-medium">
-                <%= product.name %>
-              </h1>
+          <% show_waitlist_modal = spree.respond_to?(:waitlists_path) && current_variant.present? %>
+          <div
+            <% if show_waitlist_modal %>
+            data-controller="modal"
+            <% end %>
+            data-modal-allow-background-close="true"
+            class="h-full w-full waitlist-modal"
+            data-modal-backdrop-color-value="rgba(0,0,0,0.32)">
+            <%= form_with(url: spree.line_items_path, method: :post, data: { controller: "turbo-stream-form", product_form_target: "form" }) do |f| %>
+              <%= hidden_field_tag :variant_id, current_variant&.id %>
 
-              <%=
-                render 'spree/products/price',
-                  product: product,
-                  use_variant: true,
-                  selected_variant: @selected_variant,
-                  price_class: "my-4 lg:text-lg lg:font-medium"
-              %>
-            </div>
-            <%= render 'spree/products/tags', product: product %>
-            <% show_waitlist_modal = spree.respond_to?(:waitlists_path) && current_variant.present? %>
-            <div
-              <% if show_waitlist_modal %>
-              data-controller="modal"
-              <% end %>
-              data-modal-allow-background-close="true"
-              class="h-full w-full waitlist-modal"
-              data-modal-backdrop-color-value="rgba(0,0,0,0.32)">
-              <%= form_with(url: spree.line_items_path, method: :post, data: { controller: "turbo-stream-form", product_form_target: "form" }) do |f| %>
-                <%= render 'spree/products/variant_picker', product: product, selected_variant: @selected_variant %>
-                <%= render 'spree/products/quantity_selector', product: product, selected_variant: @selected_variant  %>
-                <div class="flex w-full my-5">
-                  <%= render 'spree/products/add_to_cart_button', product: product, selected_variant: @selected_variant, sticky_button_classes: "w-full" %>
-                  <%= render 'spree/products/add_to_wishlist', variant: current_variant, css_classes: 'btn-secondary ml-5 h-12 !py-0 !px-3 border-default', icon_size: 24 %>
-                </div>
+              <div data-product-form-target="productDetails">
+                <% section.blocks.each do |block| %>
+                  <div <%= block_attributes(block) %>>
+                    <% case block.class.name %>
+                    <% when 'Spree::PageBlocks::Products::Title' %>
+                      <h1 class="text-2xl uppercase tracking-tight font-medium">
+                        <%= product.name %>
+                      </h1>
+                    <% when 'Spree::PageBlocks::Products::Brand' %>
+                      <% if product.brand %>
+                        <%= link_to spree.nested_taxons_path(product.brand), title: product.brand_name do %>
+                          <h3 class="text-sm lg:mt-0 inline-block mb-1">
+                            <%= product.brand_name %>
+                          </h3>
+                        <% end %>
+                      <% end %>
+                    <% when 'Spree::PageBlocks::Products::Price' %>
+                      <%= render 'spree/products/price', product: product, use_variant: true, selected_variant: @selected_variant, price_class: "lg:text-lg lg:font-medium", price_container_class: "w-full" %>
+                    <% when 'Spree::PageBlocks::Products::VariantPicker' %>
+                      <%= render 'spree/products/variant_picker', product: product, selected_variant: @selected_variant %>
+                    <% when 'Spree::PageBlocks::Products::QuantitySelector' %>
+                      <%= render 'spree/products/quantity_selector', product: product, selected_variant: @selected_variant %>
+                    <% when 'Spree::PageBlocks::Products::BuyButtons' %>
+                      <div class="flex w-full" data-controller='sticky-button'>
+                        <%= render 'spree/products/add_to_cart_button', product: product, selected_variant: @selected_variant, sticky_button_classes: "w-full" %>
+                        <%= render 'spree/products/add_to_wishlist', variant: current_variant, css_classes: 'btn-secondary ml-5 h-12 !py-0 !px-3 border-default', icon_size: 24 %>
+                      </div>
+                    <% when 'Spree::PageBlocks::Products::Description' %>
+                      <%= render 'spree/products/description', product: product, block: block, section: section %>
+                    <% when 'Spree::PageBlocks::Metafields' %>
+                      <%= render 'spree/products/metafields', product: product, block: block, section: section %>
+                    <% end %>
+                  </div>
               <% end %>
-              <%= render 'spree/products/add_to_waitlist', variant: current_variant if show_waitlist_modal %>
-            </div>
+            <% end %>
 
-            <%= render 'spree/products/details', product: product %>
+            <%= render 'spree/products/add_to_waitlist', variant: current_variant if show_waitlist_modal %>
           </div>
         </div>
       </div>
     </div>
   </div>
-
   <%= render 'spree/products/json_ld', product: product, selected_variant: @selected_variant %>
 </turbo-frame>

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

@@ -1,4 +1,4 @@
-<% cache_unless page_builder_enabled?, spree_base_cache_scope.call(section) do %>
+<% cache_unless page_builder_enabled?, spree_storefront_base_cache_scope.call(section) do %>
   <div style="<%= section_styles(section) %>">
     <div class="page-container rich-text">
       <% section.blocks.each do |block| %>

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

@@ -1,4 +1,4 @@
-<% cache_unless page_builder_enabled?, [*spree_base_cache_scope.call(section), taxon].compact do %>
+<% cache_unless page_builder_enabled?, [*spree_storefront_base_cache_scope.call(section), taxon].compact do %>
   <div
     style="<%= section_styles(section) %>"
     id="taxon-banner-<%= taxon.id %>"

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

@@ -1,4 +1,4 @@
-<% cache_unless page_builder_enabled?, [*spree_base_cache_scope.call(section), @taxons].compact do %>
+<% cache_unless page_builder_enabled?, [*spree_storefront_base_cache_scope.call(section), @taxons].compact do %>
   <div style='<%= section_styles(section) %>'>
     <h1 class='text-xl lg:text-2xl font-medium pb-8 page-container' style='<%= section_heading_styles(section) %>'>
       <%= section.heading %>

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

@@ -1,4 +1,4 @@
-<% cache_unless page_builder_enabled?, spree_base_cache_scope.call(section) do %>
+<% cache_unless page_builder_enabled?, spree_storefront_base_cache_scope.call(section) do %>
   <% separated_vertically = section.preferred_separated == 'vertically' %>
 
   <div style="<%= section_styles(section) %>">

data/app/views/themes/default/spree/page_sections/nav/_desktop.html.erb

@@ -31,7 +31,7 @@
                 </div>
               <% end %>
               <% if block.try(:featured_taxon) %>
-                <% cache spree_base_cache_scope.call(block.featured_taxon) do %>
+                <% cache spree_storefront_base_cache_scope.call(block.featured_taxon) do %>
                   <% if block.featured_taxon.image.attached? && block.featured_taxon.image.variable? %>
                     <%= link_to spree_storefront_resource_url(block.featured_taxon), class: "flex flex-col col-start-4" do %>
                       <%= spree_image_tag(block.featured_taxon.image, width: 360, height: 360, class: 'w-full h-auto aspect-1', loading: :lazy, alt: block.featured_taxon.name) %>

data/app/views/themes/default/spree/page_sections/nav/_mobile.html.erb

@@ -1,4 +1,4 @@
-<div class="bg-background mt-4 border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden">
+<div class="bg-background border-default border-t overflow-x-hidden h-full w-screen overflow-y-hidden">
   <div class="h-full flex transform has-[.currency-and-locale-modal:not(.hidden)]:transform-none relative transition-transform duration-300" data-controller="mobile-nav">
     <div class="w-screen shrink-0 flex flex-col h-full flex-grow-0">
       <div class="flex-grow overflow-y-scroll">
@@ -21,7 +21,7 @@
                   </button>
                   <div class="p-4 pt-0 w-full gap-2 flex flex-col">
                     <% if block.try(:featured_taxon) %>
-                      <% cache spree_base_cache_scope.call(block.featured_taxon) do %>
+                      <% cache spree_storefront_base_cache_scope.call(block.featured_taxon) do %>
                         <% if block.featured_taxon.image.attached? && block.featured_taxon.image.variable? %>
                           <%= link_to spree_storefront_resource_url(block.featured_taxon), class: "flex w-full pt-4" do %>
                             <%= spree_image_tag(block.featured_taxon.image, width: 140, height: 140, class: 'h-auto aspect-1 w-2/5 max-w-[140px]', loading: :lazy, alt: block.featured_taxon.name) %>
@@ -103,12 +103,7 @@
 
         <% if should_render_currency_dropdown? || should_render_locale_dropdown? %>
           <div class="flex mt-4 justify-end">
-            <div
-                data-controller="modal"
-                data-modal-allow-background-close="true"
-                data-modal-
-                class=""
-                data-modal-backdrop-color-value="rgba(0,0,0,0.32)">
+            <div data-controller="modal" data-modal-disable-backdrop="true">
               <%= button_tag class: 'flex gap-2 items-center', data: {action: 'modal#open'} do %>
                 <% if should_render_currency_dropdown? %>
                   <span>
@@ -123,7 +118,7 @@
                   </span>
                 <% end %>
               <% end %>
-              <%= turbo_frame_tag :settings_modal, src: spree.settings_path, loading: :lazy  %>
+              <%= turbo_frame_tag :settings_modal, src: spree.settings_path, loading: :lazy %>
             </div>
           </div>
         <% end %>

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

@@ -1,15 +1,14 @@
 <div class="page-container py-12">
   <h1 class="text-2xl tracking-tight text-center lg:text-left mb-3 uppercase">
-    <%= Spree.t(params[:id]) %>
+    <%= @policy.name %>
   </h1>
 
-  <% 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>
+  <p class="mb-8 text-center lg:text-left">
+    <%= Spree.t(:updated_at) %>:
+    <%= l(@policy.updated_at.to_date) %>
+  </p>
 
-    <div class="mb-5">
-      <%= @policy&.to_s %>
-    </div>
-  <% end %>
+  <div class="mb-5">
+    <%= @policy.body.to_s %>
+  </div>
 </div>

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

@@ -3,7 +3,7 @@
   data-action="waitlist:created@window->modal#close click->modal#closeBackground keyup@window->modal#closeWithKeyboard"
   class="hidden animate-fadeIn fixed inset-0 overflow-y-auto flex items-end md:items-center justify-center z-[9999] h-dvh w-full"
   style="animation-duration: 150ms;">
-  <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 ">
+  <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 border border-default">
     <button
       type="button"
       data-waitlist-close-button
@@ -21,8 +21,8 @@
     </div>
     <%= form_for :waitlist, url: spree.waitlists_path, method: :post, class: "flex w-full gap-4 flex-col", data: { product_form_target: 'addToWaitlistForm', controller: 'turbo-stream-form enable-button' } do |f| %>
       <div class="w-full">
-        <%= f.hidden_field :variant_id, value: variant.id %>
-        <%= f.email_field :email, value: try_spree_current_user&.email, class: 'w-full', required: true, placeholder: Spree.t(:email), data: { enable_button_target: 'input' } %>
+        <%= f.hidden_field :variant_id, value: variant&.id %>
+        <%= f.email_field :email, value: try_spree_current_user&.email, class: 'w-full', required: true, placeholder: Spree.t(:email), data: { enable_button_target: 'input' }, autofocus: true %>
       </div>
       <div class="flex flex-col gap-2">
         <label class="flex items-center gap-2 cursor-pointer group text-sm">

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

@@ -1,6 +1,6 @@
 <nav id="breadcrumbs" aria-label="breadcrumbs">
   <!-- desktop -->
-  <ul class="hidden md:inline-flex space-x-3 mb-4 lg:mb-5 text-sm">
+  <ul class="hidden md:inline-flex gap-3 mb-4 lg:mb-5 text-sm">
     <% taxons.each_with_index do |taxon, index| %>
       <li class="opacity-50"><%= link_to taxon.name, spree.nested_taxons_path(taxon), title: taxon.name %></li>
       <div class="breadcrumb-square opacity-50"></div>

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

@@ -2,7 +2,7 @@
 <% variants_with_color = product.variants.find_all { |variant| variant.option_values.find { |ov| ov.option_type_id == color_option.id } } if color_option.present? %>
 
 <% if color_option.present? && variants_with_color.length > 0 %>
-  <% cache spree_base_cache_scope.call(variants_with_color) do %>
+  <% cache spree_storefront_base_cache_scope.call(variants_with_color) do %>
     <% color_values = product.option_values.find_all { |ov| ov.option_type_id == color_option.id }.uniq %>
     <%= raw(Spree::ColorsPreviewStylesPresenter.new(color_values.map { |o| { name: o.presentation, filter_name: o.name } }).to_s) %>
 
@@ -11,7 +11,7 @@
         <% selected_variant = variants_with_color.find { |variant| variant.option_values.include?(color_value) } %>
         <% next if selected_variant.blank? %>
 
-        <% cache spree_base_cache_scope.call(selected_variant) do %>
+        <% cache spree_storefront_base_cache_scope.call(selected_variant) do %>
           <div
             data-variant-id="<%= selected_variant.id %>"
             class="[&:nth-of-type(n+4)]:hidden [&:nth-of-type(n+4)]:md:block [&:nth-of-type(n+8)]:md:hidden cursor-pointer"

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

@@ -0,0 +1,11 @@
+<% if product.storefront_description.present? %>
+  <% description_text = strip_tags(product.storefront_description) %>
+  <div data-controller="read-more" class="flex flex-col gap-4" data-read-more-more-text-value="<%= Spree.t(:read_more) %>" data-read-more-less-text-value="Read less">
+    <div class="prose product-description text-sm <%= 'product-description-truncated' if description_text.size > 250 %>" data-read-more-target="content">
+      <%= raw(product.storefront_description) %>
+    </div>
+    <% if description_text.size > 250 %>
+      <%= button_tag Spree.t(:read_more), type: 'button', data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>
+    <% end %>
+  </div>
+<% end %>

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

@@ -1,4 +1,4 @@
-<% cache spree_base_cache_scope.call(product) do %>
+<% cache spree_storefront_base_cache_scope.call(product) do %>
   <% if product.storefront_description.present? %>
     <% description_text = strip_tags(product.storefront_description) %>
     <div data-controller="read-more" class="py-4 flex flex-col gap-4" data-read-more-more-text-value="<%= Spree.t(:read_more) %>" data-read-more-less-text-value="Read less">
@@ -6,7 +6,7 @@
         <%= raw(product.storefront_description) %>
       </div>
       <% if description_text.size > 250 %>
-        <%= button_tag Spree.t(:read_more), data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>
+        <%= button_tag Spree.t(:read_more), type: 'button', data: { action: "read-more#toggle" }, class: "font-bold underline text-sm" %>
       <% end %>
     </div>
   <% end %>

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

@@ -1,27 +1,21 @@
 <% with_cover_image ||= true %>
 <% object ||= product %>
-
 <% if object.default_image.present? && object.default_image.attached? %>
   <% height ||= theme_setting('product_listing_image_height') %>
   <% width ||= theme_setting('product_listing_image_width') %>
-
   <figure class="group <%= 'aspect-1' if height == width %> card-product-featured-images-container bg-transparent h-full">
     <% if with_cover_image %>
       <% object_class = 'object-cover object-center' %>
     <% else %>
       <% object_class = 'object-contain object-top' %>
     <% end %>
-
     <% image_hover_class = object.secondary_image.present? && object.secondary_image.attached? ? 
          "w-full group-hover:opacity-0 transition-opacity duration-500 z-10 relative h-full bg-background product-card !max-h-full #{object_class}" :
          "w-full h-full !max-h-full #{object_class}" %>
-
-    <%= spree_image_tag(object.default_image, width: width, height: height, loading: :lazy, alt: object.default_image.alt, class: image_hover_class) %>
-
+    <%= spree_image_tag(object.default_image, width: width, height: height, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.primary_image', default: 'primary image')}", class: image_hover_class) %>
     <% if object.secondary_image.present? && object.secondary_image.attached? %>
       <% secondary_image_class = "w-full absolute top-0 left-0 opacity-100 h-full !max-h-full #{object_class}" %>
-
-      <%= spree_image_tag(object.secondary_image, width: width, height: height, loading: :lazy, alt: object.secondary_image.alt, class: secondary_image_class) %>
+      <%= spree_image_tag(object.secondary_image, width: width, height: height, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.secondary_image', default: 'secondary image')}", class: secondary_image_class) %>
     <% end %>
   </figure>
 <% else %>

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

@@ -1,6 +1,6 @@
 <% desktop ||= false %>
 
-<% cache [*spree_base_cache_scope.call(product), images, desktop].compact do %>
+<% cache [*spree_storefront_base_cache_scope.call(product), images, desktop].compact do %>
   <% if desktop == true %>
     <div
       class="media-gallery w-full h-full media-gallery-desktop"

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

@@ -0,0 +1,18 @@
+<div class="st-accordion" data-controller="accordion">
+  <% metafields_by_definition = @product.metafields.index_by { |m| m.metafield_definition.id.to_s } %>
+  <% block.preferred_metafield_definition_ids.each do |definition_id| %>
+    <% metafield = metafields_by_definition[definition_id.to_s] %>
+    <% next unless metafield %>
+    <% next unless metafield.metafield_definition.available_on_front_end? %>
+    
+    <details class="product-metafield border-b border-default group" id="metafield_<%= metafield.id %>">
+      <summary class="text-sm uppercase tracking-widest inline-flex w-full justify-between items-center py-4 cursor-pointer focus:outline-none">
+        <span><%= metafield.name %></span>
+        <span class="ml-2 transition-transform group-open:rotate-180">
+          <%= render 'spree/shared/icons/chevron_down' %>
+        </span>
+      </summary>
+      <%= render "spree/metafields/#{metafield.type.demodulize.underscore}", metafield: metafield %>
+    </details>
+  <% end %>
+</div>

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

@@ -1,5 +1,5 @@
 <% selected_variant ||= nil %>
-<p class="quantity-selector-label text-sm tracking-widest uppercase py-2"><%= Spree.t(:quantity) %></p>
+<p class="quantity-selector-label text-sm tracking-widest uppercase pb-2"><%= Spree.t(:quantity) %></p>
 <div class="inline-block">
   <div class="quantity-picker" data-controller="quantity-picker">
     <%= button_tag class: 'decrease-quantity',
@@ -22,7 +22,6 @@
     <% end %>
   </div>
 </div>
-<%= hidden_field_tag :variant_id, selected_variant&.id %>
 <% if selected_variant && !selected_variant.backorderable? %>
   <% if selected_variant.total_on_hand.between?(1, 4) %>
     <p class="text-red-500 text-center text-sm mt-1" style="width: 117px">

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

@@ -2,9 +2,9 @@
   <div
     data-modal-target="container"
     data-action="click->modal#closeBackground keyup@window->modal#closeWithKeyboard"
-    class="currency-and-locale-modal hidden animate-fadeIn fixed inset-0 overflow-y-auto flex items-end md:items-center justify-center z-[9999] h-dvh w-full"
+    class="currency-and-locale-modal hidden fixed inset-0 overflow-y-auto flex items-end md:items-start justify-center z-[9999] h-dvh w-full"
     style="animation-duration: 150ms;">
-    <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 ">
+    <div class="w-full lg:w-[600px] relative h-auto lg:max-h-screen flex justify-center flex-col gap-4 bg-background p-5 border border-default mt-12">
       <button
       type="button"
       data-action="modal#close"

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

@@ -1,4 +1,4 @@
-<% cache [*spree_base_cache_scope.call(address), address.user] do %>
+<% cache [*spree_storefront_base_cache_scope.call(address), address.user] do %>
   <div class="text-sm">
     <div class="mb-1"><%= address.full_name %></div>
     <% unless address.company.blank? %>

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

@@ -1,4 +1,4 @@
-<% cache_unless page_builder_enabled?, spree_base_cache_scope.call(current_theme) do %>
+<% cache_unless page_builder_enabled?, spree_storefront_base_cache_scope.call(current_theme) do %>
   <style data-turbo-track="reload">
     <%= theme_setting(:custom_font_css_import) if theme_setting(:custom_font_css_import).present? %>
 

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

@@ -1,4 +1,4 @@
-<% cache spree_base_cache_scope.call(current_store) do %>
+<% cache spree_storefront_base_cache_scope.call(current_store) do %>
   <script type="application/ld+json">
     {
       "@context": "https://schema.org",

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

@@ -1,13 +1,10 @@
 <% logo ||= current_store.logo %>
 <% height ||= 64 %>
 <% logo_css ||= '' %>
-
 <%= link_to spree.root_path, id: 'site-logo' do %>
-  <span class='sr-only'><%= current_store.name %></span>
   <% if logo.present? && logo.attached? && logo.variable? %>
     <% aspect_ratio = spree_asset_aspect_ratio(logo) %>
     <% logo_style = "aspect-ratio: #{aspect_ratio};" %>
-
     <% if aspect_ratio.to_f > 10 %>
       <% mobile_class = "h-[16px]" %>
       <% desktop_class = "md:h-[32px]" %>
@@ -20,7 +17,6 @@
     <% else %>
       <% mobile_class = "h-[32px]" %>
     <% end %>
-
     <% if defined?(height) && height > 0 %>
       <% logo_style += "--desktop-height: #{height}px;" %>
       <% cdn_height = height %>
@@ -30,13 +26,10 @@
     <% else %>
       <% cdn_height = 32 %>
     <% end %>
-
     <% img_class = "w-auto #{mobile_class} #{desktop_class} #{logo_css}" %>
-
     <% variant_options = spree_image_variant_options(resize_to_fit: [nil, cdn_height * 3]) %>
-
-    <%= image_tag main_app.cdn_image_url(logo.variant(variant_options)), class: img_class, alt: current_store.name, style: logo_style, height: cdn_height %>
+    <%= image_tag main_app.cdn_image_url(logo.variant(variant_options)), class: img_class, alt: current_store.name + " logo", style: logo_style, height: cdn_height %>
   <% else %>
-    <h1 class='text-lg uppercase text-center'><%= current_store.name %></h1>
+    <h1 class='text-lg text-center uppercase'><%= current_store.name %></h1>
   <% end %>
 <% end %>

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

@@ -32,8 +32,12 @@
   <meta property="twitter:image" content="<%= image_url %>" />
 <% end %>
 
-<% if @product.present? && @product.price_in(current_currency).present? %>
-  <meta property="og:price:amount" content="<%= @product.price_in(current_currency).amount.to_s %>">
+<% if @product.present? %>
+  <% cache [@product, current_currency] do %>
+    <% if @product.price_in(current_currency).present? %>
+      <meta property="og:price:amount" content="<%= @product.price_in(current_currency).amount.to_s %>">
+    <% end %>
+  <% end %>
   <meta property="og:price:currency" content="<%= current_currency %>">
 <% end %>
 

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

@@ -21,7 +21,7 @@
 <%== color_options_style_for_line_items(shipments.flat_map(&:line_items)) %>
 
 <ul>
-  <%= render partial: 'spree/shared/order_shipment', collection: shipments, as: :shipment, cached: spree_base_cache_scope %>
+  <%= render partial: 'spree/shared/order_shipment', collection: shipments, as: :shipment, cached: spree_storefront_base_cache_scope %>
 </ul>
 
 <% if order.special_instructions.present? %>
@@ -55,7 +55,7 @@
           <%= Spree.t(:payment_information) %>
         </div>
         <div class="!leading-[1.375rem] text-neutral-800">
-          <%= render collection: order.payments.valid, partial: 'spree/shared/payment', cached: spree_base_cache_scope %>
+          <%= render collection: order.payments.valid, partial: 'spree/shared/payment', cached: spree_storefront_base_cache_scope %>
         </div>
       </div>
     <% end %>

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

@@ -66,6 +66,6 @@
     <%= render partial: "spree/shared/order_line_item",
     collection: shipment.inventory_units,
     as: :inventory_unit,
-    cached: spree_base_cache_scope %>
+    cached: spree_storefront_base_cache_scope %>
   </div>
 </li>

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

@@ -8,7 +8,7 @@
     </h1>
     <% if @wished_items.any? %>
       <div class="grid lg:grid-cols-3 gap-x-6 gap-y-10 lg:mb-24">
-        <%= render collection: @wished_items, partial: 'spree/wishlists/wished_item', cached: ->(wished_item) { [*spree_base_cache_scope.call(wished_item), wished_item.variant, current_currency] } %>
+        <%= render collection: @wished_items, partial: 'spree/wishlists/wished_item', cached: ->(wished_item) { [*spree_storefront_base_cache_scope.call(wished_item), wished_item.variant, current_currency] } %>
       </div>
     <% else %>
       <%= render 'no_wished_items' %>

data/config/initializers/assets.rb

@@ -1 +1,3 @@
-Rails.application.config.assets.precompile << 'spree_storefront_manifest.js'
+if Rails.application.config.respond_to?(:assets)
+  Rails.application.config.assets.precompile << 'spree_storefront_manifest.js'
+end

data/config/locales/en.yml

@@ -50,15 +50,18 @@ en:
         message_not_sent: Unfortunately we weren't able to send the email at this time. Please try again later
         message_sent: Message sent!
       newsletter_subscribers:
+        already_subscribed: You are already subscribed to our newsletter
         success: Thank you for subscribing to our newsletter!
+        verification_failed: Verification failed
+        verified: Your email has been verified!
       newsletter_subscription:
         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
+        primary_image: primary image
+        secondary_image: secondary image
       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.

data/config/routes.rb

@@ -75,7 +75,9 @@ Spree::Core::Engine.add_routes do
     resource :settings, only: [:update, :show]
 
     # Newsletter
-    resources :newsletter_subscribers, only: [:create]
+    resources :newsletter_subscribers, only: [:create] do
+      get :verify, on: :collection
+    end
 
     # Contact form
     resources :contacts, only: [:new, :create]
@@ -87,6 +89,12 @@ Spree::Core::Engine.add_routes do
     root to: 'home#index'
   end
 
+  get '/forbidden', to: 'errors#show', code: 403, as: :forbidden
+  if Rails.env.test?
+    get '/errors', to: 'errors#show'
+    get '/errors/:path', to: 'errors#show', as: :pathed_errors
+  end
+
   get 'robots.txt' => 'seo#robots'
   get 'sitemap' => 'seo#sitemap'
   get 'sitemap.xml.gz' => 'seo#sitemap'

data/lib/generators/spree/storefront/install/install_generator.rb

@@ -15,7 +15,8 @@ module Spree
         end
 
         def install
-          template 'application.tailwind.css', 'app/assets/stylesheets/application.tailwind.css'
+          empty_directory Rails.root.join('app/assets/tailwind') if Rails.root && !Rails.root.join('app/assets/tailwind').exist?
+          template 'application.css', 'app/assets/tailwind/application.css'
           template 'tailwind.config.js', 'config/tailwind.config.js'
 
           if Rails.root && Rails.root.join("Procfile.dev").exist?