spree_storefront 5.0.4 → 5.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2558511bde3c23461f7d59985b314ea15d992912d29ba2566ce9d057b6a8cff2
-  data.tar.gz: 99bff2e39e457da5b2bec3fab6ab64b5953128bae0b2a42945c19e16d2b682f3
+  metadata.gz: d8b5f53e77331921922ac1da27123087c2b06413b7e77bb9061709a3f4c331a6
+  data.tar.gz: 72d769742b732a7d2500dc4ce2ab6d25217198ac40d5010273b9ffb55a815a01
 SHA512:
-  metadata.gz: 709743a94e95bed8ef6a542231843103f60bf7699c610da106d96cd73178fe8a354eeeed5960d71349319ab77ee2915e11e97ec6efd12642f0af3d5af96175a5
-  data.tar.gz: bf929b7256f749ce99590d6f293326f157e2489700411d25e513a9ec0c4359d1352519fb1e1dea0cedfb6881771085e634af4b25b8f012ee4dbee474bd2e81f5
+  metadata.gz: e9eb50e07eee8427553b3ff7afb6e4e87a409c7a2bfdd0aa1fae44d31e146ef1595750f79e3a1e4a296390dfc3c9e9b589d17f3e3bf7131f277f859be4ea841d
+  data.tar.gz: 20e8fc5511fbedf98f50cdfe492e4765ca15fe39de324bd4988a2d03ac8b80b5e0a098cb59f0488d73b03cb75f086f02ef3bea757dbd6d0b5e3c434286cf7d88

data/app/controllers/spree/line_items_controller.rb

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

data/app/controllers/spree/products_controller.rb

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

data/app/controllers/spree/search_controller.rb

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

data/app/controllers/spree/store_controller.rb

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

data/app/helpers/spree/cart_helper.rb

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

data/app/helpers/spree/filters_helper.rb

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

data/app/helpers/spree/products_helper.rb

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

data/app/helpers/spree/storefront_helper.rb

@@ -53,6 +53,7 @@ module Spree
 
     def svg_country_icon(country_code)
       country_code = :us if country_code.to_s.downcase == 'en'
+      country_code = :jp if country_code.to_s.downcase == 'ja'
       tag.span(class: "fi fi-#{country_code.downcase}")
     end
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/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/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/_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:

data/lib/generators/spree/storefront/theme/templates/model.rb.tt

@@ -8,10 +8,97 @@ module Spree
         }
       end
 
-      def custom_page_sections
-        # you can override this method in your theme to return a list of custom page sections for your theme
-        # [Spree::PageSections::Custom, Spree::PageSections::Custom2]
-        []
+      # COLORS
+      # main colors
+      preference :primary_color, :string, default: '#000000'
+      preference :accent_color, :string, default: '#F0EFE9'
+      preference :danger_color, :string, default: '#C73528'
+      preference :neutral_color, :string, default: '#999999'
+      preference :background_color, :string, default: '#FFFFFF'
+      preference :text_color, :string, default: '#000000'
+      preference :success_color, :string, default: '#00C773'
+
+      # buttons
+      preference :button_background_color, :string
+      preference :button_text_color, :string, default: '#ffffff'
+      preference :button_hover_background_color, :string
+      preference :button_hover_text_color, :string
+      preference :button_border_color, :string
+
+      # borders
+      preference :border_color, :string, default: '#E9E7DC'
+      preference :sidebar_border_color, :string
+
+      preference :secondary_button_background_color, :string
+      preference :secondary_button_text_color, :string
+      preference :secondary_button_hover_background_color, :string
+      preference :secondary_button_hover_text_color, :string
+
+      # inputs
+      preference :input_text_color, :string, default: '#6b7280'
+      preference :input_background_color, :string, default: '#ffffff'
+      preference :input_border_color, :string
+      preference :input_focus_border_color, :string
+      preference :input_focus_background_color, :string
+      preference :input_focus_text_color, :string
+
+      # sidebar (checkout)
+      preference :checkout_sidebar_background_color, :string, default: '#f3f4f6'
+      preference :checkout_divider_background_color, :string
+      preference :checkout_sidebar_text_color, :string
+
+      # TYPOGRAPHY
+      preference :custom_font_code, :string, default: nil
+      # body
+      preference :font_family, :string, default: 'Inter'
+      preference :font_size_scale, :integer, default: 100
+      # headers
+      preference :header_font_family, :string, default: 'Inter'
+      preference :header_font_size_scale, :integer, default: 100
+      preference :headings_uppercase, :boolean, default: true
+
+      # BUTTONS
+      preference :button_border_thickness, :integer, default: 1
+      preference :button_border_opacity, :integer, default: 100
+      preference :button_border_radius, :integer, default: 100
+      preference :button_shadow_opacity, :integer, default: 0
+      preference :button_shadow_horizontal_offset, :integer, default: 0
+      preference :button_shadow_vertical_offset, :integer, default: 4
+      preference :button_shadow_blur, :integer, default: 5
+
+      # INPUTS
+      preference :input_border_thickness, :integer, default: 1
+      preference :input_border_opacity, :integer, default: 100
+      preference :input_border_radius, :integer, default: 8
+      preference :input_shadow_opacity, :integer, default: 0
+      preference :input_shadow_horizontal_offset, :integer, default: 0
+      preference :input_shadow_vertical_offset, :integer, default: 4
+      preference :input_shadow_blur, :integer, default: 5
+
+      # BORDERS
+      preference :border_width, :integer, default: 1
+      preference :border_radius, :integer, default: 6
+      preference :border_shadow_opacity, :integer, default: 0
+      preference :border_shadow_horizontal_offset, :integer, default: 0
+      preference :border_shadow_vertical_offset, :integer, default: 4
+      preference :border_shadow_blur, :integer, default: 5
+
+      # PRODUCT IMAGES
+      preference :product_listing_image_height, :integer, default: 300
+      preference :product_listing_image_width, :integer, default: 300
+      preference :product_listing_image_height_mobile, :integer, default: 190
+      preference :product_listing_image_width_mobile, :integer, default: 190
+
+      # Returns an array of available layout section classes for the theme, eg. header, footer, newsletter, etc.
+      #
+      # @return [Array<Class>]
+      def available_layout_sections
+        [
+          Spree::PageSections::AnnouncementBar,
+          Spree::PageSections::Header,
+          Spree::PageSections::Newsletter,
+          Spree::PageSections::Footer
+        ]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +392,7 @@ files:
 - app/views/themes/default/spree/orders/show.html.erb
 - app/views/themes/default/spree/page_sections/_announcement_bar.html.erb
 - app/views/themes/default/spree/page_sections/_custom_code.html.erb
+- app/views/themes/default/spree/page_sections/_featured_posts.html.erb
 - app/views/themes/default/spree/page_sections/_featured_product.html.erb
 - app/views/themes/default/spree/page_sections/_featured_taxon.html.erb
 - app/views/themes/default/spree/page_sections/_featured_taxons.html.erb
@@ -542,9 +543,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.5
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.4
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
 post_install_message:
 rdoc_options: []
 require_paths: