spree_storefront 5.3.5 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 798daa308afdbd8f2f636114c013744bafec9dad364624d494052f8dee209dad
-  data.tar.gz: 3e47218e8e1f56dcd14f42c3a840d5768f57ecb34e4173ba2dcf0534b8f4465c
+  metadata.gz: e4f4278e4de4bbae1edaebfb19c6f5aaa3d9715a460435997521404c55777ec0
+  data.tar.gz: fa94ea40e743864d935d550e178a710fa6aad34b264efdfe9faaa3bb85e7cbb1
 SHA512:
-  metadata.gz: 0ad7a112edd84357b63afb788dae88ea515e173c473b4050751382f42959d1585324a9e2ae8c321b7a63f735f7d3cedf7f0e0062c5c925f69a1f4b33fb4bbe4c
-  data.tar.gz: 1c3b513f445d85021a4b75db0e52c49ab117ac07421b79578627c02f2b9c552da50484716dea20572974b3cdb17e97cef8163fa5527c65e1f1950959af2249d6
+  metadata.gz: 2e01ff11030ec87b69fbc6f6c265d8a446dd5b4f6b5f085a5d7ce80a275cc13a02f127f138f85c5cad96b793ada8cdb6e4077a0e52c5f643e33c5c90306d7407
+  data.tar.gz: e9d6530f6e12c1646558028f2bdec15cca750bec1dcc4385840aa78af00cffdd97cf6c43476c574fef4192a8625a1322bae757be4ec3b547cdea07ed2fccd585

data/LICENSE.md

@@ -1,13 +1,21 @@
-# License
+The MIT License (MIT)
 
-Copyright © 2024-present, Vendo Connect Inc.
+Copyright (c) 2024-present Vendo Connect Inc., Vendo Sp z o.o.
 
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -4,6 +4,8 @@
 
 Spree Storefront provides a modern, fully-featured Rails-based storefront for Spree Commerce with a responsive design and optimized shopping experience.
 
+![Spree Storefront](storefront.png)
+
 ## Overview
 
 This gem includes:

data/Rakefile

@@ -1,23 +1,30 @@
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rspec/core/rake_task'
-require 'spree/testing_support/common_rake'
+require 'spree/testing_support/extension_rake'
 
 RSpec::Core::RakeTask.new
 
-task default: :spec
+task :default do
+  if Dir['spec/dummy'].empty?
+    Rake::Task[:test_app].invoke
+    Dir.chdir('../../')
+  end
+  Rake::Task[:spec].invoke
+end
 
-desc "Generates a dummy app for testing"
+desc 'Generates a dummy app for testing'
 task :test_app do
   ENV['LIB_NAME'] = 'spree/storefront'
-
-  Rake::Task['common:test_app'].execute(
+  Rake::Task['extension:test_app'].execute(
     user_class: 'Spree::User',
     admin_user_class: 'Spree::AdminUser',
     authentication: 'devise',
     install_admin: true,
+    install_storefront: true,
     css: true,
     javascript: true
   )
+  system({ 'BUNDLE_GEMFILE' => File.expand_path('Gemfile', __dir__) }, 'bundle exec rails g spree_posts:install')
 end

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

@@ -30,7 +30,7 @@ module Spree
       end
 
       def load_order_details
-        @order = orders_scope.find_by!(number: params[:id])
+        @order = order_finder.new(user: try_spree_current_user, store: current_store, param: params[:id]).execute.first!
         @shipments = @order.shipments.includes(:stock_location, :address, selected_shipping_rate: :shipping_method, inventory_units: :line_item)
       end
     end

data/app/controllers/spree/addresses_controller.rb

@@ -105,7 +105,7 @@ module Spree
       @address ||= if [:new, :create].include?(action)
                     Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
                   else
-                    Spree::Address.find(params[:id])
+                    Spree::Address.find_by_param!(params[:id])
                   end
 
       authorize! action, @address

data/app/controllers/spree/line_items_controller.rb

@@ -81,7 +81,7 @@ module Spree
     end
 
     def load_line_item
-      @line_item = @order.line_items.find(params[:id])
+      @line_item = @order.line_items.find_by_param!(params[:id])
     end
 
     def line_item_params

data/app/controllers/spree/orders_controller.rb

@@ -16,7 +16,7 @@ module Spree
 
     # GET /orders/:id
     def show
-      @order = complete_order_finder.new(number: params[:id], token: params[:token], store: current_store).execute.first
+      @order = complete_order_finder.new(param: params[:id], token: params[:token], store: current_store).execute.first
 
       raise ActiveRecord::RecordNotFound if @order.blank?
 

data/app/controllers/spree/store_controller.rb

@@ -184,9 +184,10 @@ module Spree
     # These includes are not picked automatically by ar_lazy_preload gem so we need to specify them manually.
     def storefront_products_includes
       {
+        primary_media: [attachment_attachment: :blob],
         taxons: [],
-        master: [:images, :prices, { stock_items: :stock_location }],
-        variants: [:images, :prices, { stock_items: :stock_location }]
+        master: [:prices, { stock_items: :stock_location }],
+        variants: [:prices, { stock_items: :stock_location }]
       }
     end
 

data/app/finders/spree/storefront/variant_finder.rb

@@ -48,7 +48,7 @@ module Spree
             variant = @product.variants.find(variant_id)
             @variant_from_options = variant
             @selected_variant = variant
-          elsif product_option_types.size == 1 && product_option_types.first.color?
+          elsif product_option_types.size == 1 && product_option_types.first.color_swatch?
             @selected_variant = @variant_from_options = @product.variants.find { |v| v.purchasable? && v.price_in(current_currency).amount.present? }
           elsif @product.variants.size == 1 || product_has_only_one_secondary_option_type_value?
             @variant_from_options = @product.variants.first
@@ -64,7 +64,7 @@ module Spree
 
       def product_has_only_one_secondary_option_type_value?
         return false unless product_option_types.size == 2
-        return false unless product_option_types.first.color?
+        return false unless product_option_types.first.color_swatch?
 
         @product.
           option_values.

data/app/helpers/spree/cart_helper.rb

@@ -31,7 +31,7 @@ module Spree
       @color_options_style_for_line_items = begin
         colors = line_items.map(&:variant).map do |v|
           color_option_values = v.option_values.includes(:option_type).find_all do |ov|
-            ov.option_type.color?
+            ov.option_type.color_swatch?
           end
 
           color_option_values.map do |ov|

data/app/helpers/spree/filters_helper.rb

@@ -26,7 +26,7 @@ module Spree
     def product_filters_aggregations
       @product_filters_aggregations ||= Rails.cache.fetch(["product-filters-aggregations", storefront_products_for_filters.cache_key_with_version], expires_in: 1.day) do
         storefront_products_for_filters.
-        joins(variants_including_master: :option_values).
+        joins(variants: :option_values).
         group("#{Spree::OptionValue.table_name}.id").
         distinct.
         count
@@ -36,7 +36,7 @@ module Spree
     def product_single_filter_aggregations
       @product_single_filter_aggregations ||= Rails.cache.fetch(["product-single-filter-aggregations", default_storefront_products_for_filters.cache_key_with_version], expires_in: 1.day) do
         default_storefront_products_for_filters.
-        joins(variants_including_master: :option_values).
+        joins(variants: :option_values).
         group("#{Spree::OptionValue.table_name}.id").
         distinct.
         count

data/app/helpers/spree/page_helper.rb

@@ -28,6 +28,9 @@ module Spree
     def render_section(section, variables = {}, lazy_allowed: true)
       return '' if section.blank?
 
+      hidden = section.can_be_hidden? && !section.preferred_visible
+      return '' if hidden && !page_builder_enabled?
+
       variables[:section] = section
       variables[:loaded] = true
 
@@ -41,7 +44,8 @@ module Spree
               editor_id: css_id,
               editor_name: section.name,
               editor_link: spree.edit_admin_page_section_path(section)
-            }
+            },
+            style: (hidden ? 'opacity: 0.4;' : nil)
           ) do
             render('/' + section.to_partial_path, **variables)
           end

data/app/helpers/spree/products_helper.rb

@@ -82,9 +82,9 @@ module Spree
           selected_variant.option_values.find { |ov| ov.option_type_id == option_type.id }
         elsif product_selected_options_hash.present? && product_selected_options_hash[option_type.id.to_s].present? # user selected variant which is not available
           option_type.option_values.find { |v| v.name == product_selected_options_hash[option_type.id.to_s] }
-        elsif option_type.color? && (available_variant = product.first_available_variant(current_currency))
+        elsif option_type.color_swatch? && (available_variant = product.first_available_variant(current_currency))
           available_variant.option_values.find { |ov| ov.option_type_id == option_type.id }
-        elsif option_type.color? && product.first_available_variant(current_currency).nil?
+        elsif option_type.color_swatch? && product.first_available_variant(current_currency).nil?
           product.variants.first&.option_values&.find { |ov| ov.option_type_id == option_type.id }
         end
     end
@@ -112,7 +112,7 @@ module Spree
       end
 
       images << product.master&.images&.to_a
-      images << product.default_image if images.flatten.compact.empty?
+      images << product.primary_media if images.flatten.compact.empty?
 
       images.flatten.compact.uniq(&:id)
     end
@@ -226,7 +226,7 @@ module Spree
     end
 
     def option_type_colors_preview_styles(option_type)
-      return unless option_type.color?
+      return unless option_type.color_swatch?
 
       Spree::ColorsPreviewStylesPresenter.new(option_type.option_values.map { |ov| { name: ov.name, filter_name: ov.name } }).to_s
     end

data/app/helpers/spree/storefront_helper.rb

@@ -60,7 +60,7 @@ module Spree
       return @page_image if @page_image.present?
 
       if object.is_a? Spree::Product
-        @page_image = object.default_image&.attachment
+        @page_image = object.primary_media&.attachment
       elsif object.respond_to?(:image)
         @page_image = object.image
       end

data/app/helpers/spree/turbo_helper.rb

@@ -1,8 +1,10 @@
 module Spree
   module TurboHelper
     def spree_turbo_update_flashes
-      turbo_stream.update 'flash' do
-        render 'spree/shared/flashes'
+      turbo_stream.update 'flashes' do
+        flash.map do |key, value|
+          render partial: 'spree/shared/flash', locals: { key: key, value: value, for_template: false }
+        end.join.html_safe
       end
     end
 

data/app/views/spree/admin/shared/_page_section_image.html.erb

@@ -0,0 +1,4 @@
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:image) %>
+<% if f.object.has_preference?(:image_alt) %>
+  <%= f.spree_text_field :preferred_image_alt, label: Spree.t(:alt_text), data: { action: 'auto-submit#submit' } %>
+<% end %>

data/app/views/spree/admin/shared/_page_section_logo.html.erb

@@ -0,0 +1 @@
+<%= f.spree_file_field :asset, width: 400, height: 128, auto_submit: true, label: Spree.t(:logo) %>

data/app/views/spree/admin/stores/form/_checkout.html.erb

@@ -0,0 +1,49 @@
+<%= content_for(:page_title) do %>
+<%= Spree.t(:checkout) %> <%= Spree.t(:settings) %>
+<% end %>
+
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:settings) %></h5>
+  </div>
+
+  <div class="card-body">
+    <p class="text-muted mb-4">
+      <%= Spree.t('admin.checkout_settings.countries_managed_by_markets_html',
+            link: link_to(Spree.t('admin.markets.list'), spree.admin_markets_path)).html_safe %>
+    </p>
+
+    <hr class="my-6">
+
+    <%= f.spree_check_box :preferred_guest_checkout, label: Spree.t('admin.checkout_settings.guest_checkout.label'), help: Spree.t('admin.checkout_settings.guest_checkout.description') %>
+    <%= f.spree_check_box :preferred_company_field_enabled, label: Spree.t('admin.store_form.company_field.label'), help: Spree.t('admin.store_form.company_field.description') %>
+    <%= f.spree_check_box :preferred_special_instructions_enabled, label: Spree.t('admin.checkout_settings.special_instructions.label'), help: Spree.t('admin.checkout_settings.special_instructions.description') %>
+  </div>
+</div>
+
+<div class="card mb-6">
+  <div class="card-header">
+    <h5 class="card-title"><%= Spree.t(:checkout_message) %></h5>
+  </div>
+
+  <div class="card-body">
+    <%= f.spree_rich_text_area :checkout_message, label: false, help: Spree.t('admin.checkout_settings.checkout_message_description') %>
+  </div>
+</div>
+
+<% if current_store.respond_to?(:links) %>
+  <div class="card mb-6">
+    <div class="card-header">
+      <h5 class="card-title"><%= Spree.t('admin.checkout_settings.checkout_links.label') %></h5>
+    </div>
+
+    <div class="card-body">
+      <div class="alert alert-info">
+        <div>
+          <%= Spree.t('admin.checkout_settings.checkout_links.description') %>
+        </div>
+      </div>
+      <%= render 'spree/admin/stores/form/checkout_links' %>
+    </div>
+  </div>
+<% end %>

data/app/views/spree/admin/stores/form/_checkout_links.html.erb

@@ -0,0 +1,28 @@
+<div id="checkout_links">
+  <% if current_store.links.any? %>
+    <ul class="list-group rounded-lg mb-6 border-gray-200"
+        data-controller="sortable"
+        data-sortable-handle-value=".handle"
+        data-sortable-resource-name-value="page_link"
+        data-sortable-response-kind-value="turbo-stream">
+      <% current_store.links.each do |link| %>
+        <li class="list-group-item p-0 hover:bg-gray-25"
+            data-sortable-update-url="<%= spree.admin_page_link_path(link, sorting_only: true, format: :turbo_stream) %>"
+        >
+          <%= turbo_frame_tag spree_dom_id(link), class: 'flex items-center w-full py-2 pl-6 pr-2' do %>
+            <%= link_to link.label, spree.edit_admin_page_link_path(link), class: 'block text-gray-900 flex-1 no-underline' %>
+            <span class="btn btn-sm handle shadow-none hover:bg-gray-100 px-1 cursor-move ml-4">
+              <%= icon 'grip-vertical', class: 'mr-0' %>
+            </span>
+          <% end %>
+        </li>
+      <% end %>
+    </ul>
+  <% else %>
+    <p class="text-gray-600 text-center p-12">
+      <%= Spree.t(:no_resource_found, resource: Spree::PageLink.model_name.human) %>
+    </p>
+  <% end %>
+
+  <%= link_to_with_icon 'plus', Spree.t(:add_link), spree.admin_store_links_path(current_store), class: 'btn btn-primary w-full', data: { turbo_method: :post } %>
+</div>

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

@@ -3,7 +3,7 @@
     <span class="rounded-full text-xs text-center font-bold pl-[0.5px] py-1 w-6 text-sidebar-text bg-background absolute -right-2 -top-3">
       <%= line_item.quantity %>
     </span>
-    <% image = line_item.variant.default_image %>
+    <% image = line_item.variant.primary_media %>
     <% if image.present? && image.attached? && image.variable? %>
       <%= spree_image_tag(image, class: 'rounded-sm border border-default bg-transparent object-cover object-center', loading: :lazy, variant: :mini, width: 64, height: 64) %>
     <% else %>

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

@@ -1,10 +1,10 @@
 <%= turbo_frame_tag :checkout_payment_methods do %>
-  <% if !@order.payment_required? && @order.using_store_credit? %>
+  <% unless @order.payment_required? %>
     <div class="d-flex flex-column mb-5">
       <p>
         <% if @order.respond_to?(:gift_card) && @order.gift_card.present? %>
           <%= Spree.t('storefront.checkout.gift_card_amount_applied', amount: @order.display_gift_card_total, code: @order.gift_card.code) %>
-        <% else %>
+        <% elsif @order.using_store_credit? %>
           <%= Spree.t('storefront.checkout.store_credits_amount_applied', amount: @order.display_total_applicable_store_credit.abs) %>
         <% end %>
 
@@ -39,13 +39,15 @@
 
   <%= render 'spree/checkout/terms_and_conditions' %>
 
-  <div class="flex justify-end w-full gap-2">
-    <button type="submit"
-            id="checkout-payment-submit"
-            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) %>
-    </button>
-  </div>
-<% end %>
+	<% if @order.payment_required? %>
+		<div class="flex justify-end w-full gap-2">
+				<button type="submit"
+								id="checkout-payment-submit"
+								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) %>
+				</button>
+		</div>
+	<% end %>
+<% end %>

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

@@ -2,7 +2,7 @@
   <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 shrink-0" id="<%= dom_id(line_item) %>-image" data-turbo-permanent>
-        <% image = line_item.variant.default_image %>
+        <% image = line_item.variant.primary_media %>
         <% if image.present? && image.attached? && image.variable? %>
           <%= link_to spree_storefront_resource_url(line_item.product), data: { 'turbo-frame': '_top' } do %>
             <%= spree_image_tag(image, width: 128, height: 128, variant: :small, class: 'object-cover', loading: :lazy) %>

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

@@ -1,4 +1,4 @@
-<% color_option = product.option_types.find { |option_type| option_type.color? } %>
+<% color_option = product.option_types.find { |option_type| option_type.color_swatch? } %>
 <% 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 %>
@@ -31,7 +31,7 @@
                 color_preview_container_class: "lg:w-[28px] lg:h-[28px]",
                 color_preview_class: "lg:top-[2px] lg:left-[2px]" %>
             <% end %>
-            <% if selected_variant.has_images? || selected_variant.default_image.present? %>
+            <% if selected_variant.has_images? || selected_variant.primary_media.present? %>
               <template data-featured-image-template>
                 <%= render 'spree/products/featured_image',
                   object: selected_variant %>

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

@@ -26,15 +26,15 @@
       </div>
     <% end %>
 
-    <% shipping_policy = current_store.customer_shipping_policy %>
-    <% if shipping_policy.present? %>
+    <% shipping_policy = current_store.policies.find_by(slug: 'shipping-policy') %>
+    <% if shipping_policy&.with_body? %>
       <div class="product-property py-4 border-b border-default">
         <%= link_to "#property_shipping_policy", class: 'text-sm uppercase tracking-widest inline-flex w-full justify-between !border-b-transparent', data: { action: 'accordion#toggle' } do %>
           <%= Spree.t(:shipping_policy) %>
           <%= render 'spree/shared/icons/chevron_down' %>
         <% end %>
         <div class="text-sm st-accordion__content" data-accordion-id="property_shipping_policy">
-          <div class="pt-4"><%= shipping_policy %></div>
+          <div class="pt-4"><%= shipping_policy.body %></div>
         </div>
       </div>
     <% end %>

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

@@ -1,7 +1,7 @@
 <% with_cover_image ||= true %>
 <% object ||= product %>
 
-<% if object.default_image.present? && object.default_image.attached? %>
+<% if object.primary_media.present? && object.primary_media.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">
@@ -13,7 +13,7 @@
     <% 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, variant: :medium, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.primary_image', default: 'primary image')}", class: image_hover_class) %>
+    <%= spree_image_tag(object.primary_media, width: width, height: height, variant: :medium, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.primary_image', default: 'primary image')}", class: image_hover_class) %>
     <% if object.has_images? && object.image_count > 1 && 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, variant: :medium, loading: :lazy, alt: "#{object.name} #{Spree.t('storefront.products.secondary_image', default: 'secondary image')}", class: secondary_image_class) %>

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

@@ -24,7 +24,7 @@
         <% end %>
 
         <% Spree::OptionType.filterable.order(:position).includes(:option_values).each do |filter| %>
-          <% if filter.color? %>
+          <% if filter.color_swatch? %>
             <%= render 'spree/products/filters/colors', filter: filter, f: f %>
           <% else %>
             <%= render 'spree/products/filters/generic', filter: filter, f: f %>

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

@@ -7,7 +7,7 @@
     "url": <%= spree.product_url(product, host: current_store.url_or_custom_domain).to_json.html_safe %>,
   <% if product.has_images? %>
     "image": [
-      <%= spree_image_url(product.default_image, variant: :large).to_json.html_safe %>
+      <%= spree_image_url(product.primary_media, variant: :large).to_json.html_safe %>
     ],
   <% end %>
   <% if product.description.present? %>

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

@@ -31,7 +31,7 @@
       <% end %>
     <% end %>
   <% end %>
-  <% if option_type.color? %>
+  <% if option_type.color_swatch? %>
     <li role="option" aria-label="<%= value.presentation %>">
       <label class="cursor-pointer"  aria-label="<%= value.presentation %>">
         <%= radio_button_tag option_type.presentation, value.name, selected_option == value,

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

@@ -3,7 +3,7 @@
   <div id='product-variant-picker' class="flex flex-col gap-y-4 mb-4 mt-2">
     <% product.option_types.each_with_index do |option_type, index| %>
       <% selected_option = product_selected_option_for_option(option_type, product: product, selected_variant: selected_variant, options_param_name: options_param_name) %>
-      <% if option_type.color? %>
+      <% if option_type.color_swatch? %>
         <%= option_type_colors_preview_styles(option_type).html_safe %>
         <fieldset data-option-id="<%= option_type.id %>" class="flex flex-col gap-y-2">
           <span class="text-sm leading-4 uppercase tracking-widest"><%= option_type.presentation %>: <%= selected_option.presentation %></span>

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

@@ -1,6 +1,6 @@
 <% options = line_item.variant.option_values %>
 
-<% options.select { |ov| ov.option_type.color? }.each do |option| %>
+<% options.select { |ov| ov.option_type.color_swatch? }.each do |option| %>
   <div>
     <input class="hidden color-input" value="<%= option.name %>" >
     <div class="label-container h-[30px] border border-default p-0.5 inline-flex items-center hover:border-dashed hover:border-primary">
@@ -11,7 +11,7 @@
     </div>
   </div>
 <% end %>
-<% options.reject { |ov| ov.option_type.color? }.each do |option| %>
+<% options.reject { |ov| ov.option_type.color_swatch? }.each do |option| %>
   <div>
     <div class="h-[30px] border border-default px-2 inline-flex items-center hover:border-dashed hover:border-primary text-sm">
       <%= option.presentation %>

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

@@ -3,7 +3,7 @@
 <div class="flex flex-col gap-4">
   <div class="flex gap-4">
     <div class="shrink-0">
-      <% image = line_item.variant.default_image %>
+      <% image = line_item.variant.primary_media %>
       <% if image.present? && image.attached? && image.variable? %>
         <%= link_to spree_storefront_resource_url(line_item.product, relative: true) do %>
           <%= spree_image_tag(image, width: 128, height: 128, variant: :small, loading: :lazy) %>

data/config/locales/en.yml

@@ -1,6 +1,29 @@
 ---
 en:
   spree:
+    admin:
+      checkout_settings:
+        checkout_links:
+          description: Links to these pages will be displayed in the checkout footer.
+          label: Checkout links
+        checkout_message_description: Visible to your customers on the checkout page in the right sidebar.
+        countries_managed_by_markets_html: Countries and shipping zones are managed through %{link}.
+        guest_checkout:
+          description: Allow customers to checkout without creating an account.
+          label: Allow guest checkout
+        special_instructions:
+          description: Allow customers to add special instructions to their order.
+          label: Display the special instructions field
+      markets:
+        list: Markets
+      store_form:
+        company_field:
+          description: It shows the company field on the address form in the My Account section and on the checkout address step.
+          label: Display the company address field
+    all_posts: All Posts
+    all_posts_with_tag: All Posts tagged with %{tag}
+    blog: Blog
+    order_already_updated: The order has already been updated.
     storefront:
       account:
         change_password: Change password

data/lib/spree/storefront/engine.rb

@@ -45,6 +45,12 @@ module Spree
         ENV['SPREE_STOREFRONT_PATH'] = root.to_s
       end
 
+      config.to_prepare do
+        Dir.glob(File.join(Spree::Storefront::Engine.root, 'app/**/*_decorator*.rb')) do |c|
+          Rails.configuration.cache_classes ? require(c) : load(c)
+        end
+      end
+
       config.after_initialize do
         Rails.application.config.spree_storefront.head_partials = []
         Rails.application.config.spree_storefront.body_start_partials = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.3.5
+  version: 5.4.0
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -9,34 +9,20 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: spree
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.3.5
 - !ruby/object:Gem::Dependency
   name: spree_page_builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: 5.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.5
+        version: 5.4.0
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -191,6 +177,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '43.0'
+- !ruby/object:Gem::Dependency
+  name: spree_dev_tools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Modern fully featured storefront and checkout for Spree Commerce
 email: hello@spreecommerce.org
 executables: []
@@ -312,6 +312,10 @@ files:
 - app/views/spree/addresses/destroy.turbo_stream.erb
 - app/views/spree/addresses/edit.html.erb
 - app/views/spree/addresses/new.html.erb
+- app/views/spree/admin/shared/_page_section_image.html.erb
+- app/views/spree/admin/shared/_page_section_logo.html.erb
+- app/views/spree/admin/stores/form/_checkout.html.erb
+- app/views/spree/admin/stores/form/_checkout_links.html.erb
 - app/views/spree/checkout/_address.html.erb
 - app/views/spree/checkout/_address_list_item.html.erb
 - app/views/spree/checkout/_button_processing.html.erb
@@ -585,12 +589,12 @@ files:
 - vendor/javascript/swiper--bundle.js
 homepage: https://getvendo.com
 licenses:
-- AGPL-3.0-or-later
+- MIT
 metadata:
-  bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.5
+  bug_tracker_uri: https://github.com/spree/spree-rails-storefront/issues
+  changelog_uri: https://github.com/spree/spree-rails-storefront/releases/tag/v5.4.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.3.5
+  source_code_uri: https://github.com/spree/spree-rails-storefront/tree/v5.4.0
 rdoc_options: []
 require_paths:
 - lib
@@ -605,7 +609,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Modern fully featured storefront and checkout for Spree Commerce
 test_files: []