spree_storefront 5.1.8 → 5.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 337793895fe097335658b9ae76e98990502e1855d07dbda8d61d606b2f1e4a46
-  data.tar.gz: 6667eed5b01c42ae7e282379565bcf58ddccc19695d6ba1701f7a6a6bdc983aa
+  metadata.gz: 71287481dfb84dcfac62b0ea895963b668c6c83d01fbc885ee60bb5eb45fb246
+  data.tar.gz: 477e4b5aeacaaed2c4d2005530b5497544130d38da3e5e7f051115dc81a5bd65
 SHA512:
-  metadata.gz: a833b9d290ab4f7041f72b3d556886475f58f32a218d852e27e77e0b356629b7f61d2392168f0f346ba863a588d25657ba3adc93274c8d44ed12774341286dde
-  data.tar.gz: 32cbd6c6a59e411a5bc8e1a06e7f09c1808a8432459415d09e2f17350047887070491b87319d5c3a039897211c882f9b611925ff74c3edb94a36bef6465f2385
+  metadata.gz: 37a4b4d6a5e37ea78850ebcf07e2d7f37b1a6637b6f87c5d7759d9104d5ae9ce6476acdd1052009d5670255134baf7d3ed7b427edd084b25f07ab7faba9375ec
+  data.tar.gz: aa5c9fd3881d86d4acfeaa1c0c09a6184c6c11e3d2fcda18cc73f5738d036a077d4c915f23a264ab27950e7b71973a41bd684cc3babba930170abb35d7837906

data/app/controllers/spree/account/newsletter_controller.rb

@@ -14,8 +14,10 @@ module Spree
         }
 
         if try_spree_current_user.accepts_email_marketing?
+          Spree::NewsletterSubscriber.subscribe(email: try_spree_current_user.email, user: try_spree_current_user)
           track_event('subscribed_to_newsletter', event_properties)
         else
+          Spree::NewsletterSubscriber.find_by(email: try_spree_current_user.email)&.destroy
           track_event('unsubscribed_from_newsletter', event_properties)
         end
       end

data/app/controllers/spree/errors_controller.rb

@@ -0,0 +1,21 @@
+module Spree
+  class ErrorsController < StoreController
+    def show
+      render "spree/errors/#{status_code}", status: status_code
+    end
+
+    private
+
+    def status_code
+      # Extract a 3‑digit code from params or path, default to “500”
+      code_str = params[:code].presence ||
+                  request.path.match(%r{/(\d{3})$})&.[](1) ||
+                   '500'
+      code = code_str.to_i
+
+      # Only allow valid 4xx/5xx error codes, fallback to 500
+      valid_errors = Rack::Utils::HTTP_STATUS_CODES.keys.select { |c| c >= 400 }
+      valid_errors.include?(code) ? code : 500
+    end
+  end
+end

data/app/controllers/spree/newsletter_subscribers_controller.rb

@@ -2,24 +2,19 @@ module Spree
   class NewsletterSubscribersController < StoreController
     skip_before_action :redirect_to_password
     before_action :load_newsletter_section, only: :create
+    rescue_from ActiveRecord::RecordNotFound, with: :subscriber_not_found
 
     # POST /newsletter_subscribers
     def create
-      user = Spree.user_class.find_or_initialize_by(email: newsletter_params[:email])
+      subscriber = Spree::NewsletterSubscriber.subscribe(email: newsletter_params[:email], user: try_spree_current_user)
 
-      if user.new_record? && user.respond_to?(:password) && user.respond_to?(:password_confirmation)
-        user.password ||= SecureRandom.hex(16) # we need to set a password to pass validation
-        user.password_confirmation ||= user.password
-      end
-
-      user.accepts_email_marketing = true if user.new_record? || try_spree_current_user == user
-
-      if user.save
-        track_event('subscribed_to_newsletter', { email: user.email, user: user })
-
-        flash[:success] = Spree.t('storefront.newsletter_subscribers.success')
+      if subscriber.errors.any?
+        flash[:error] = subscriber.errors.full_messages.to_sentence.presence || Spree.t('something_went_wrong')
+      elsif subscriber.verified? && subscriber.previous_changes.blank?
+        flash[:notice] = Spree.t('storefront.newsletter_subscribers.already_subscribed')
       else
-        flash[:error] = user.errors.full_messages.to_sentence.presence || Spree.t('something_went_wrong')
+        track_event('subscribed_to_newsletter', { email: subscriber.email, user: try_spree_current_user })
+        flash[:success] = Spree.t('storefront.newsletter_subscribers.success')
       end
 
       respond_to do |format|
@@ -28,8 +23,27 @@ module Spree
       end
     end
 
+    # GET /newsletter_subscribers/verify?token=VERIFICATION_TOKEN
+    def verify
+      raise ActiveRecord::RecordNotFound if params[:token].blank?
+
+      subscriber = ActiveRecord::Base.connected_to(role: :writing) do
+        Spree::NewsletterSubscriber.verify(token: params[:token])
+      end
+
+      if subscriber.verified?
+        redirect_to spree.root_path, notice: Spree.t('storefront.newsletter_subscribers.verified')
+      else
+        redirect_to spree.root_path, alert: Spree.t('storefront.newsletter_subscribers.verification_failed')
+      end
+    end
+
     private
 
+    def subscriber_not_found
+      redirect_to spree.root_path, alert: Spree.t('storefront.newsletter_subscribers.verification_failed')
+    end
+
     def newsletter_params
       params.require(:newsletter).permit(:email)
     end

data/app/controllers/spree/policies_controller.rb

@@ -1,26 +1,8 @@
 module Spree
   class PoliciesController < StoreController
+    # GET /policies/<policy_slug>
     def show
-      if params[:id].in?(supported_policies)
-        @policy = case params[:id]
-                  when 'privacy_policy'
-                    current_store.customer_privacy_policy
-                  when 'terms_of_service'
-                    current_store.customer_terms_of_service
-                  when 'returns_policy'
-                    current_store.customer_returns_policy
-                  when 'shipping_policy'
-                    current_store.customer_shipping_policy
-                  end
-      else
-        raise ActiveRecord::RecordNotFound
-      end
-    end
-
-    private
-
-    def supported_policies
-      %w[privacy_policy terms_of_service returns_policy shipping_policy]
+      @policy = current_store.policies.friendly.find(params[:id])
     end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -40,7 +40,7 @@ module Spree
     def render_404_if_store_not_exists
       return if current_store.present?
 
-      render 'errors/404', layout: 'application', status: :not_found
+      render 'spree/errors/404', layout: 'application', status: :not_found
     end
 
     def current_taxon
@@ -115,7 +115,7 @@ module Spree
     end
 
     def default_title
-      @default_title ||= current_store.name
+      @default_title ||= current_store.seo_title.presence || current_store.name
     end
 
     # this is a hook for subclasses to provide title

data/app/helpers/spree/page_helper.rb

@@ -12,7 +12,7 @@ module Spree
       page ||= current_page
 
       sections = current_page_preview.present? ? current_page_preview.sections : page.sections
-      sections_html = sections.includes(:links, :rich_text_text, :rich_text_description, { asset_attachment: :blob }, { blocks: [:rich_text_text, :links] }).map do |section|
+      sections_html = sections.includes(section_includes).map do |section|
         render_section(section, variables)
       end.join.html_safe
 
@@ -52,7 +52,7 @@ module Spree
 
         path = section.lazy_path(variables)
 
-        turbo_frame_tag(css_id, src: path, loading: 'eager', class: css_class) do
+        turbo_frame_tag(css_id, src: path, loading: :lazy, class: css_class, data: { controller: 'prefetch-lazy', turbo_permanent: true }) do
           render('/' + section.to_partial_path, **variables)
         end
       else
@@ -68,6 +68,42 @@ module Spree
       ''
     end
 
+    # Returns the layout sections of the page with current theme or theme preview.
+    #
+    # @return [Array] the layout sections of the page
+    def layout_sections
+      @layout_sections ||= current_theme_or_preview.sections
+    end
+
+    # Renders the header sections of the page.
+    #
+    # @return [String] the rendered header sections
+    def render_header_sections
+      @render_header_sections ||= layout_sections.find_all { |section| section.role == 'header' }.map do |section|
+        render_section(section)
+      end.join.html_safe
+    end
+
+    # Renders the footer sections of the page.
+    #
+    # @return [String] the rendered footer sections
+    def render_footer_sections
+      @render_footer_sections ||= layout_sections.find_all { |section| section.role == 'footer' }.map do |section|
+        render_section(section)
+      end.join.html_safe
+    end
+
+    # Returns the includes for the section.
+    #
+    # @return [Array] the includes for the section
+    def section_includes
+      [
+        :links, :rich_text_text,
+        :rich_text_description, { asset_attachment: :blob },
+        { blocks: [:rich_text_text, :links] }
+      ]
+    end
+
     # Renders a link to the page builder for the given link.
     def page_builder_link_to(link, options = {}, &block)
       if link.present?

data/app/helpers/spree/payment_methods_helper.rb

@@ -0,0 +1,7 @@
+module Spree
+  module PaymentMethodsHelper
+    def credit_card_icons
+      %w[visa mastercard american_express discover]
+    end
+  end
+end

data/app/helpers/spree/storefront_helper.rb

@@ -5,6 +5,24 @@ module Spree
     include Spree::ShipmentHelper
     include Heroicon::Engine.helpers
 
+    # Returns the cache key for the storefront including the current wishlist and order.
+    #
+    # @return [Array] The cache key
+    def spree_storefront_base_cache_key
+      @spree_storefront_base_cache_key ||= [
+        spree_base_cache_key,
+        current_wishlist,
+        current_order
+      ].compact
+    end
+
+    # Returns the cache scope for the storefront including the current wishlist and order.
+    #
+    # @return [Proc] The cache scope
+    def spree_storefront_base_cache_scope
+      ->(record = nil) { [*spree_storefront_base_cache_key, record].compact_blank }
+    end
+
     # Renders the storefront partials for the given section.
     #
     # @param section [String] The section to render

data/app/helpers/spree/theme_helper.rb

@@ -68,12 +68,20 @@ module Spree
       @page_builder_enabled ||= current_theme_preview.present? || current_page_preview.present?
     end
 
+    # Returns whether the page cache is enabled
+    #
+    # @return [Boolean] whether the page cache is enabled
+    def page_cache_enabled?
+      @page_cache_enabled ||= Spree::Storefront::Config.page_cache_enabled
+    end
+
     # Returns the theme layout sections, eg. header, footer, etc.
     #
     # @return [Hash] the theme layout sections
     def theme_layout_sections
-      @theme_layout_sections ||= current_theme_or_preview.sections.includes(:links, :rich_text_text, :rich_text_description, { asset_attachment: :blob },
-                                                                            { blocks: [:rich_text_text, :links] }).all.each_with_object({}) do |section, hash|
+      Spree::Deprecation.warn('theme_layout_sections is deprecated and will be removed in Spree 6.0. Please use render_header_sections and render_footer_sections instead.')
+
+      @theme_layout_sections ||= current_theme_or_preview.sections.includes(section_includes).all.each_with_object({}) do |section, hash|
         hash[section.type.to_s.demodulize.underscore] = section
       end
     rescue StandardError => e

data/app/helpers/spree/turbo_helper.rb

@@ -7,7 +7,8 @@ module Spree
     end
 
     def spree_turbo_update_cart(order = current_order)
-      turbo_stream.update_all '.cart-counter', order.item_count.positive? ? order.item_count : ''
+      turbo_stream.update_all '.cart-counter', order&.item_count&.positive? ? order&.item_count : ''
+      turbo_stream.update_all '.cart-total', order&.display_item_total.to_s
     end
   end
 end

data/app/javascript/spree/storefront/application.js

@@ -47,6 +47,7 @@ const controllers = [
   'no-ui-slider',
   'pdp-desktop-gallery',
   'plp-variant-picker',
+  'prefetch-lazy',
   'product-form',
   'quantity-picker',
   'read-more',

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

@@ -0,0 +1,26 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static values = {
+    rootMargin: { type: Number, default: 200 }
+  }
+
+  connect() {
+    if (this.element.getAttribute("loading") == "lazy") {
+      this.observer = new IntersectionObserver(this.intersect, { rootMargin: `0px 0px ${this.rootMarginValue}px 0px` })
+      this.observer.observe(this.element)
+    }
+  }
+
+  disconnect() {
+    this.observer?.disconnect()
+  }
+
+  intersect = (entries) => {
+    const lastEntry = entries.slice(-1)[0]
+    if (lastEntry?.isIntersecting) {
+      this.observer.unobserve(this.element) // We only need to do this once
+      this.element.setAttribute("loading", "eager")
+    }
+  }
+}

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

@@ -17,7 +17,6 @@ export default class ToggleMenu extends Toggle {
   }
 
   toggle(e) {
-    this.contentTarget.style.paddingBottom = `${this.contentTarget.offsetTop}px`
     super.toggle(e)
     if (this.openValue) {
       this.buttonTarget.classList.add('menu-open')

data/app/views/layouts/spree/storefront.html.erb

@@ -10,21 +10,12 @@
     <%= render_storefront_partials(:body_start_partials) %>
     <%= current_store.storefront_custom_code_body_start&.html_safe %>
 
-    <% if theme_layout_sections.empty? %>
-      <%= render template: 'errors/500' %>
-    <% else %>
-      <%= render_section(theme_layout_sections['announcement_bar']) if theme_layout_sections['announcement_bar'].present? %>
-      <%= render_section(theme_layout_sections['header']) if theme_layout_sections['header'].present? %>
-
-      <%= turbo_frame_tag :flash do %>
-        <%= render('spree/shared/flashes') %>
-      <% end %>
-
-      <%= yield %>
-
-      <%= render_section(theme_layout_sections['newsletter']) if  theme_layout_sections['newsletter'].present? %>
-      <%= render_section(theme_layout_sections['footer']) if theme_layout_sections['footer'].present? %>
+    <%= render_header_sections %>
+    <%= turbo_frame_tag :flash do %>
+      <%= render('spree/shared/flashes') %>
     <% end %>
+    <%= yield %>
+    <%= render_footer_sections %>
 
     <%= current_store.storefront_custom_code_body_end&.html_safe %>
     <%= render_storefront_partials(:body_end_partials) %>

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

@@ -1,10 +1,15 @@
-<% cache spree_base_cache_scope.call(current_store) do %>
-  <div class="flex flex-col gap-4 text-sm">
-    <ul class="flex justify-center flex-wrap gap-4">
-      <%= link_to Spree.t(:privacy_policy), "/policies/privacy_policy", target: '_blank' if legal_policy('privacy_policy').present? %>
-      <%= link_to Spree.t(:terms_of_service), "/policies/terms_of_service", target: '_blank' if legal_policy('terms_of_service').present? %>
-      <%= link_to Spree.t(:returns_policy), "/policies/returns_policy", target: '_blank' if legal_policy('returns_policy').present? %>
-      <%= link_to Spree.t(:shipping_policy), "/policies/shipping_policy", target: '_blank' if legal_policy('shipping_policy').present? %>
-    </ul>
-  </div>
+<% cache spree_storefront_base_cache_scope.call(current_store) do %>
+  <% if current_store.links.any? %>
+    <div class="flex flex-col gap-4 text-sm">
+      <ul class="flex justify-center flex-wrap gap-4">
+        <% current_store.links.each do |link| %>
+          <li>
+            <%= page_builder_link_to link, { target: ('_blank' if link.open_in_new_tab), rel: ('noopener noreferrer' if link.open_in_new_tab) } do %>
+              <%= link.label %>
+            <% end %>
+          </li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
 <% end %>

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

@@ -1,7 +1,7 @@
 <%= turbo_frame_tag :checkout_line_items, id: 'line_items', target: '_top' do %>
-  <% cache spree_base_cache_scope.call(order.line_items.cache_key_with_version) do %>
+  <% cache spree_storefront_base_cache_scope.call(order.line_items.cache_key_with_version) do %>
     <div class="overflow-y-auto line-items flex flex-col gap-5 pt-5 md:pt-0" data-checkout-summary-target="line_items">
-      <%= render collection: order.line_items, partial: 'spree/checkout/line_item', cached: spree_base_cache_scope %>
+      <%= render collection: order.line_items, partial: 'spree/checkout/line_item', cached: spree_storefront_base_cache_scope %>
     </div>
   <% end %>
 <% end %>

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

@@ -9,7 +9,7 @@
           </p>
 
           <div class="mb-5 overflow-y-auto pt-3 mx-3 lg:mx-8 lg:mt-4 lg:pt-6 line-items" data-checkout-summary-target="line_items">
-            <%= render collection: @order.line_items_without_shipping_rates, partial: 'spree/checkout/line_item', cached: spree_base_cache_scope %>
+            <%= render collection: @order.line_items_without_shipping_rates, partial: 'spree/checkout/line_item', cached: spree_storefront_base_cache_scope %>
           </div>
 
           <div class="flex justify-end items-center flex-wrap mt-6">

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

@@ -0,0 +1,15 @@
+<li class="list-group-item p-0 m-0 border-b delivery-list-item border-default">
+  <%= link_to spree.checkout_state_path(token: @order.token, state: 'payment', payment_method_id: method.id), class: 'custom-control custom-radio flex items-center px-5 py-4 cursor-pointer w-full' do %>
+    <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
+          method.id,
+          selected_method == method,
+          class: 'mr-3' %>
+    <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
+  <% end %>
+
+  <% if selected_method == method %>
+    <div class="px-5 py-4">
+      <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
+    </div>
+  <% end %>
+</li>

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

@@ -29,24 +29,7 @@
     <% if checkout_available_payment_methods.size > 1 %>
       <ul id="payment-method-fields" class="rounded-md list-group mb-4 border border-default border-b-0 text-sm border-default">
         <% selected_method = params[:payment_method_id].present? ? checkout_available_payment_methods.find { |method| method.id.to_s == params[:payment_method_id].to_s } : checkout_available_payment_methods.first %>
-
-        <% checkout_available_payment_methods.each do |method| %>
-          <li class="list-group-item p-0 m-0 border-b delivery-list-item border-default">
-            <%= link_to spree.checkout_state_path(token: @order.token, state: 'payment', payment_method_id: method.id), class: 'custom-control custom-radio flex items-center px-5 py-4 cursor-pointer w-full' do %>
-              <%= radio_button_tag "order[payments_attributes][][payment_method_id]",
-                    method.id,
-                    selected_method == method,
-                    class: 'mr-3' %>
-              <%= Spree.t(method.name, scope: :payment_methods, default: method.name) %>
-            <% end %>
-
-            <% if selected_method == method %>
-              <div class="px-5 py-4">
-                <%= render partial: "spree/checkout/payment/#{method.method_type}", locals: { payment_method: method } %>
-              </div>
-            <% end %>
-          </li>
-        <% end %>
+        <%= render collection: checkout_available_payment_methods, partial: 'spree/checkout/payment_method', as: :method, locals: { selected_method: selected_method } %>
       </ul>
     <% elsif checkout_available_payment_methods.any? %>
       <%= hidden_field_tag "order[payments_attributes][][payment_method_id]", checkout_available_payment_methods.first&.id %>

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

@@ -1,6 +1,6 @@
 <%= turbo_frame_tag :checkout_summary, id: 'summary' do %>
   <div class="checkout-content-summary text-sm">
-    <% cache [*spree_base_cache_scope.call(order.cache_key_with_version), order.state] do %>
+    <% cache [*spree_storefront_base_cache_scope.call(order.cache_key_with_version), order.state] do %>
       <div data-hook="order_summary">
         <div class="flex justify-between items-center mb-2">
           <span><%= Spree.t(:subtotal) %>:</span>
@@ -8,7 +8,7 @@
         </div>
         <div class="d-table-cell text-right font-weight-bold"></div>
 
-        <% cache spree_base_cache_scope.call(order.line_item_adjustments.nonzero.cache_key_with_version) do %>
+        <% cache spree_storefront_base_cache_scope.call(order.line_item_adjustments.nonzero.cache_key_with_version) do %>
           <% if order.line_item_adjustments.nonzero.exists? %>
             <% order.line_item_adjustments.nonzero.promotion.eligible.group_by(&:label).each do |label, adjustments| %>
               <div class="flex justify-between items-center mb-2">
@@ -59,7 +59,7 @@
         <% end %>
 
         <% if order.payment? || order.completed? %>
-          <% cache spree_base_cache_scope.call(order.all_adjustments.nonzero.tax.eligible.cache_key_with_version) do %>
+          <% cache spree_storefront_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>

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

@@ -65,9 +65,9 @@
         data: { card_validation_target: "ccType" }
     %>
 
-    <% PaymentIcon.credit_cards.each do |card| %>
-      <div id="credit-card-icon-<%= card.name %>" class="hidden">
-        <%= image_tag card.path, style: 'height: 32px;' %>
+    <% credit_card_icons.each do |card| %>
+      <div id="credit-card-icon-<%= card %>" class="hidden">
+        <%= payment_method_icon_tag card %>
       </div>
     <% end %>
   </div>

data/app/views/spree/errors/403.html.erb

@@ -0,0 +1,7 @@
+<div class="w-full">
+  <div class="flex flex-col items-center justify-center py-6 gap-4">
+    <h2 class="text-4xl font-bold"><%= Spree.t(:forbidden) %></h2>
+    <p><%= Spree.t(:forbidden_message) %></p>
+    <%= link_to Spree.t(:back), :back, class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/errors/403.json.erb

@@ -0,0 +1 @@
+{"status":403,"error":"<%= Spree.t(:forbidden) %>"}

data/app/views/spree/errors/404.html.erb

@@ -0,0 +1,7 @@
+<div class="w-full">
+  <div class="flex flex-col items-center justify-center py-6 gap-4">
+    <h2 class="text-4xl font-bold"><%= Spree.t(:page_not_found) %></h2>
+    <p><%= Spree.t(:page_not_found_message) %></p>
+    <%= link_to Spree.t(:back), :back, class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/errors/404.json.erb

@@ -0,0 +1 @@
+{"status":404,"error":"<%= Spree.t(:page_not_found) %>"}

data/app/views/spree/errors/422.html.erb

@@ -0,0 +1,7 @@
+<div class="w-full">
+  <div class="flex flex-col items-center justify-center py-6 gap-4">
+    <h2 class="text-4xl font-bold"><%= Spree.t(:unprocessable_entity) %></h2>
+    <p><%= Spree.t(:unprocessable_entity_message) %></p>
+    <%= link_to Spree.t(:back), :back, class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/errors/422.json.erb

@@ -0,0 +1 @@
+{"status":422,"error":"<%= Spree.t(:unprocessable_entity) %>"}

data/app/views/spree/errors/500.html.erb

@@ -0,0 +1,7 @@
+<div class="w-full">
+  <div class="flex flex-col items-center justify-center py-6 gap-4">
+    <h2 class="text-4xl font-bold"><%= Spree.t(:internal_server_error) %></h2>
+    <p><%= Spree.t(:internal_server_error_message) %></p>
+    <%= link_to Spree.t(:back), :back, class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/errors/500.json.erb

@@ -0,0 +1 @@
+{"status":500,"error":"<%= Spree.t(:internal_server_error) %>"}

data/app/views/spree/errors/503.html.erb

@@ -0,0 +1,7 @@
+<div class="w-full">
+  <div class="flex flex-col items-center justify-center py-6 gap-4">
+    <h2 class="text-4xl font-bold"><%= Spree.t(:service_unavailable) %></h2>
+    <p><%= Spree.t(:service_unavailable_message) %></p>
+    <%= link_to Spree.t(:back), :back, class: "btn btn-primary" %>
+  </div>
+</div>

data/app/views/spree/errors/503.json.erb

@@ -0,0 +1 @@
+{"status":503,"error":"<%= Spree.t(:service_unavailable) %>"}

data/app/views/spree/home/index.html.erb

@@ -1 +1,3 @@
-<%= render_page(current_page) %>
+<% cache_if page_cache_enabled? && !page_builder_enabled?, spree_storefront_base_cache_scope.call(current_page), expires_in: Spree::Storefront::Config.page_cache_ttl do %>
+  <%= render_page(current_page) %>
+<% end %>

data/app/views/spree/newsletter_subscribers/create.turbo_stream.erb

@@ -2,6 +2,6 @@
 
 <% if @newsletter_section.present? %>
   <%= turbo_stream.update "section-#{@newsletter_section.id}" do %>
-    <%= render 'spree/page_sections/newsletter', section: @newsletter_section %>
+    <%= render 'spree/page_sections/newsletter', section: @newsletter_section, loaded: true %>
   <% end %>
 <% end %>

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

@@ -10,7 +10,7 @@
     </tr>
   </thead>
   <tbody class="block md:table-row-group">
-    <%= render collection: orders, partial: 'spree/account/order', cached: spree_base_cache_scope %>
+    <%= render collection: orders, partial: 'spree/account/order', cached: spree_storefront_base_cache_scope %>
   </tbody>
 </table>
 

data/app/views/themes/default/spree/account/addresses/index.html.erb

@@ -9,7 +9,7 @@
       </div>
       <% if @addresses.any? %>
         <ul>
-          <%= render partial: 'spree/account/addresses/address', collection: @addresses, cached: ->a {[*spree_base_cache_scope.call(a), try_spree_current_user.ship_address_id, try_spree_current_user.bill_address_id]}, as: :address %>
+          <%= render partial: 'spree/account/addresses/address', collection: @addresses, cached: ->a {[*spree_storefront_base_cache_scope.call(a), try_spree_current_user.ship_address_id, try_spree_current_user.bill_address_id]}, as: :address %>
         </ul>
         <div class="flex">
           <div data-controller="modal" data-modal-allow-background-close="true">

data/app/views/themes/default/spree/account/gift_cards/index.html.erb

@@ -18,7 +18,7 @@
           </tr>
         </thead>
         <tbody class="block md:table-row-group">
-          <%= render collection: @gift_cards, partial: 'spree/account/gift_cards/gift_card', cached: spree_base_cache_scope %>
+          <%= render collection: @gift_cards, partial: 'spree/account/gift_cards/gift_card', cached: spree_storefront_base_cache_scope %>
         </tbody>
       </table>
     <% else %>

data/app/views/themes/default/spree/account/store_credits/index.html.erb

@@ -21,7 +21,7 @@
           </tr>
         </thead>
         <tbody class="block md:table-row-group">
-          <%= render collection: @store_credit_events, partial: 'spree/account/store_credits/store_credit_event', cached: spree_base_cache_scope %>
+          <%= render collection: @store_credit_events, partial: 'spree/account/store_credits/store_credit_event', cached: spree_storefront_base_cache_scope %>
         </tbody>
       </table>
     <% else %>

data/app/views/themes/default/spree/metafields/_boolean.html.erb

@@ -0,0 +1,5 @@
+<% if metafield.value == 'true' %>
+  <%= Spree.t(:say_yes) %>
+<% else %>
+  <%= Spree.t(:say_no) %>
+<% end %>

data/app/views/themes/default/spree/metafields/_json.html.erb

@@ -0,0 +1,3 @@
+<code>
+  <%= metafield.value.as_json.as_json %>
+</code>

data/app/views/themes/default/spree/metafields/_long_text.html.erb

@@ -0,0 +1 @@
+<%= metafield.value %>

data/app/views/themes/default/spree/metafields/_number.html.erb

@@ -0,0 +1 @@
+<%= metafield.value %>

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

@@ -0,0 +1 @@
+<%= metafield.value.to_s %>