spree_storefront 5.2.5 → 5.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc8589dcfb75063c9c8730ad1f2f0912b4b167faf52bb7ddf2b6483967d8c66e
-  data.tar.gz: 23134df31cfed598ed91bcec9501b9c3c019b4bd73c3ddf5ea7579e9e2043215
+  metadata.gz: 2d2469dfa268f4b5001def6a8efc6c6c69ee8e1cfcbec059f09b1b369f99f003
+  data.tar.gz: cbf4c3c04197c8c9b283efc23e04fe886b035159603e40ef36a30eb05a260252
 SHA512:
-  metadata.gz: 1e94f62c94ff8d7ae85c11ac84753a40ba2d523fc83087b7db3eb9bf0bcc2606e789f39b5d681c6baee4729785d6d67e693bdfef45c7c54fe967634ea02ef993
-  data.tar.gz: f24717be8ef70ae6414fc76dd1c7acc7cdfe705a303966a71a14be3549e7d42e5a3ece3fc3925a29cfb3e7f5b65cba9793d83c1be894af45d6694153eb9df75a
+  metadata.gz: 1bc5443c86a416f3d3145f5da3e5c19581c0e1955ca66dddfe680a9a3f81cf60b412acc5fb43dcc8af1e51b11e4ea1bb499cd1c6ba7347f22c4d577c56aed667
+  data.tar.gz: 78cc85fcae54894e3df300517534ee7163df515eb1cc76ac6ddab2de2a45ea0049ad903b20890da119d6605c1488e4b3e540eabf6d696445ba4c37c6d61001d9

data/Rakefile

@@ -13,9 +13,11 @@ task :test_app do
   ENV['LIB_NAME'] = 'spree/storefront'
 
   Rake::Task['common:test_app'].execute(
-    user_class: 'User',
+    user_class: 'Spree::User',
+    admin_user_class: 'Spree::AdminUser',
     authentication: 'devise',
-    install_storefront: 'true',
-    install_admin: 'false'
+    install_admin: true,
+    css: true,
+    javascript: true
   )
 end

data/app/controllers/concerns/spree/cart_methods.rb

@@ -39,12 +39,13 @@ module Spree
       {
         variant: [
           :images,
+          :prices,
+          { stock_items: :stock_location },
           { option_values: [:option_type] },
           {
             product: [
-              :variants,
-              :variant_images,
-              { master: :images }
+              { master: :images },
+              { variants: :images }
             ]
           }
         ]

data/app/controllers/concerns/spree/storefront/pagination_concern.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Storefront
+    module PaginationConcern
+      extend ActiveSupport::Concern
+
+      included do
+        include Pagy::Method
+      end
+
+      private
+
+      def paginate_collection(collection, limit:)
+        if Spree::Storefront::Config[:use_kaminari_pagination]
+          collection.page(params[:page]).per(limit)
+        else
+          # Uses countish paginator which is faster as it avoids COUNT queries
+          @pagy, records = pagy(:countish, collection, limit: limit)
+          records
+        end
+      end
+    end
+  end
+end

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

@@ -2,7 +2,7 @@ module Spree
   module Account
     class GiftCardsController < BaseController
       def index
-        @gift_cards = @user.gift_cards.order(created_at: :desc).page(params[:page]).per(25)
+        @gift_cards = paginate_collection(@user.gift_cards.order(created_at: :desc), limit: 25)
       end
 
       private

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

@@ -5,7 +5,7 @@ module Spree
 
       # GET /account/orders
       def index
-        @orders = orders_scope.order(created_at: :desc).page(params[:page]).per(25)
+        @orders = paginate_collection(orders_scope.order(created_at: :desc), limit: 25)
       end
 
       # GET /account/orders/:id
@@ -26,7 +26,7 @@ module Spree
       end
 
       def order_finder
-        Spree::Dependencies.completed_order_finder.constantize
+        Spree.completed_order_finder
       end
 
       def load_order_details

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

@@ -3,10 +3,10 @@ module Spree
     class StoreCreditsController < BaseController
       # GET /account/store_credits
       def index
-        @store_credit_events = Spree::StoreCreditEvent.where(store_credit: user_store_credits).
-                               exposed_events.
-                               reverse_chronological.
-                               page(params[:page]).per(25)
+        events = Spree::StoreCreditEvent.where(store_credit: user_store_credits).
+                 exposed_events.
+                 reverse_chronological
+        @store_credit_events = paginate_collection(events, limit: 25)
       end
 
       private

data/app/controllers/spree/addresses_controller.rb

@@ -92,11 +92,11 @@ module Spree
     end
 
     def create_service
-      Spree::Dependencies.address_create_service.constantize
+      Spree.address_create_service
     end
 
     def update_service
-      Spree::Dependencies.address_update_service.constantize
+      Spree.address_update_service
     end
 
     def load_and_authorize_address

data/app/controllers/spree/checkout_controller.rb

@@ -196,8 +196,14 @@ module Spree
 
       # completed orders shouldn't be updated anymore
       unless @order.completed?
-        @order.assign_attributes(order_tracking_params)
-        @order.update_columns(order_tracking_params)
+        tracking_params = order_tracking_params
+        changed_params = tracking_params.reject { |key, value| @order.public_send(key) == value }
+
+        if changed_params.any?
+          @order.assign_attributes(changed_params)
+          @order.update_columns(changed_params)
+        end
+
         @order.associate_user!(try_spree_current_user) if try_spree_current_user && @order.user.nil?
       end
       @current_order = @order # for compatibility with the rest of storefront, analytics, etc
@@ -342,7 +348,7 @@ module Spree
         packages = @order.shipments.map(&:to_package)
         @differentiator = Spree::Stock::Differentiator.new(@order, packages)
         @differentiator.missing.each do |variant, quantity|
-          Spree::Dependencies.cart_remove_item_service.constantize.call(order: @order, variant: variant, quantity: quantity)
+          Spree.cart_remove_item_service.call(order: @order, variant: variant, quantity: quantity)
         end
       end
     end
@@ -365,19 +371,19 @@ module Spree
     end
 
     def add_store_credit_service
-      Spree::Dependencies.checkout_add_store_credit_service.constantize
+      Spree.checkout_add_store_credit_service
     end
 
     def remove_store_credit_service
-      Spree::Dependencies.checkout_remove_store_credit_service.constantize
+      Spree.checkout_remove_store_credit_service
     end
 
     def remove_line_item_service
-      Spree::Dependencies.cart_remove_line_item_service.constantize
+      Spree.cart_remove_line_item_service
     end
 
     def coupon_handler
-      Spree::Dependencies.coupon_handler.constantize
+      Spree.coupon_handler
     end
 
     def accurate_title
@@ -387,7 +393,7 @@ module Spree
     def remove_expired_gift_card
       return unless @order.gift_card.present? && @order.gift_card.expired?
 
-      Spree::Dependencies.gift_card_remove_service.constantize.call(order: @order)
+      Spree.gift_card_remove_service.call(order: @order)
     end
   end
 end

data/app/controllers/spree/line_items_controller.rb

@@ -89,15 +89,15 @@ module Spree
     end
 
     def cart_add_item_service
-      Spree::Dependencies.cart_add_item_service.constantize
+      Spree.cart_add_item_service
     end
 
     def cart_remove_line_item_service
-      Spree::Dependencies.cart_remove_line_item_service.constantize
+      Spree.cart_remove_line_item_service
     end
 
     def cart_set_item_quantity_service
-      Spree::Dependencies.cart_set_item_quantity_service.constantize
+      Spree.cart_set_item_quantity_service
     end
   end
 end

data/app/controllers/spree/order_status_controller.rb

@@ -26,7 +26,7 @@ module Spree
     end
 
     def order_finder
-      Spree::Dependencies.completed_order_finder.constantize
+      Spree.completed_order_finder
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -81,15 +81,15 @@ module Spree
     end
 
     def cart_remove_out_of_stock_items_service
-      Spree::Dependencies.cart_remove_out_of_stock_items_service.constantize
+      Spree.cart_remove_out_of_stock_items_service
     end
 
     def cart_update_service
-      Spree::Dependencies.cart_update_service.constantize
+      Spree.cart_update_service
     end
 
     def complete_order_finder
-      Spree::Dependencies.completed_order_finder.constantize
+      Spree.completed_order_finder
     end
 
     def remove_out_of_stock_items

data/app/controllers/spree/posts_controller.rb

@@ -13,7 +13,7 @@ module Spree
       scope = scope.where(post_category_id: @category.id) if @category.present?
 
       sorted_posts = scope.order(published_at: :desc)
-      @posts = sorted_posts.page(params[:page]).per(20)
+      @posts = paginate_collection(sorted_posts, limit: 20)
     end
 
     def show

data/app/controllers/spree/products_controller.rb

@@ -25,6 +25,7 @@ module Spree
       # when using not default locale, our related products are different for different locales.
       @products = storefront_products_scope.where.not(id: @product.id).
                   multi_search(@product.name).includes(storefront_products_includes).
+                  preload_associations_lazily.
                   limit(@section.preferred_max_products_to_show)
     end
 

data/app/controllers/spree/search_controller.rb

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

data/app/controllers/spree/store_controller.rb

@@ -9,12 +9,14 @@ module Spree
     include Spree::WishlistHelper
     include Spree::AnalyticsHelper
     include Spree::IntegrationsHelper
+    include Spree::Storefront::PaginationConcern
 
     layout :choose_layout
 
     helper 'spree/base'
     helper 'spree/locale'
     helper 'spree/storefront_locale'
+    helper 'spree/canonical_url'
     helper 'spree/currency'
     helper 'spree/addresses'
     helper 'spree/wishlist'
@@ -27,7 +29,7 @@ module Spree
     helper_method :current_taxon, :store_filter_names
 
     helper_method :permitted_products_params, :products_filters_params,
-                  :storefront_products_scope, :storefront_products,
+                  :storefront_products_scope, :storefront_products, :storefront_pagy,
                   :default_products_sort, :default_products_finder_params,
                   :storefront_products_includes, :storefront_products_finder
 
@@ -124,7 +126,7 @@ module Spree
     end
 
     def storefront_products_finder
-      @storefront_products_finder ||= Spree::Dependencies.products_finder.constantize
+      @storefront_products_finder ||= Spree.products_finder
     end
 
     def storefront_products_scope
@@ -156,38 +158,36 @@ module Spree
     end
 
     def storefront_products
-      @storefront_products ||= begin
-        finder_params = default_products_finder_params
-        finder_params[:sort_by] ||= @taxon&.sort_order || 'manual'
+      return @storefront_products if @storefront_products
 
-        products_finder = storefront_products_finder
-        products = products_finder.
-                   new(scope: storefront_products_scope, params: finder_params).
-                   execute.
-                   includes(storefront_products_includes)
+      finder_params = default_products_finder_params
+      finder_params[:sort_by] ||= @taxon&.sort_order || 'manual'
 
-        default_per_page = Spree::Storefront::Config[:products_per_page]
-        per_page = params[:per_page].present? ? params[:per_page].to_i : default_per_page
-        page = params[:page].present? ? params[:page].to_i : 1
+      products_finder = storefront_products_finder
+      products = products_finder.
+                 new(scope: storefront_products_scope, params: finder_params).
+                 execute.
+                 includes(storefront_products_includes).
+                 preload_associations_lazily
 
-        products.page(page).per(per_page)
-      end
+      default_per_page = Spree::Storefront::Config[:products_per_page]
+      per_page = params[:per_page].present? ? params[:per_page].to_i : default_per_page
+
+      @storefront_products = paginate_collection(products, limit: per_page)
+    end
+
+    def storefront_pagy
+      storefront_products unless @storefront_products
+      @pagy
     end
 
+    # These includes are not picked automatically by ar_lazy_preload gem so we need to specify them manually.
     def storefront_products_includes
-      [
-        :prices_including_master,
-        :variant_images,
-        :option_types,
-        :option_values,
-        { master: [:images, :prices, :stock_items, :stock_locations, { stock_items: :stock_location }],
-          variants: [
-            :images, :prices, :option_values, :stock_items, :stock_locations,
-            { option_values: :option_type, stock_items: :stock_location }
-          ],
-          taxons: [:taxonomy],
-          taggings: [:tag] }
-      ]
+      {
+        taxons: [],
+        master: [:images, :prices, { stock_items: :stock_location }],
+        variants: [:images, :prices, { stock_items: :stock_location }]
+      }
     end
 
     def redirect_unauthorized_access
@@ -204,11 +204,6 @@ module Spree
       end
     end
 
-    def redirect_back_or_default(default)
-      Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
-      redirect_back(fallback_location: default)
-    end
-
     def require_user(return_to: nil, redirect_path: nil)
       return if try_spree_current_user
 

data/app/helpers/spree/canonical_url_helper.rb

@@ -0,0 +1,27 @@
+module Spree
+  module CanonicalUrlHelper
+    # Generates a canonical link tag for the current page
+    #
+    # @param host [String] The host/domain to use (defaults to current store's domain)
+    # @return [ActiveSupport::SafeBuffer] The canonical link tag HTML
+    def canonical_tag(host = nil)
+      tag.link(href: canonical_href(host), rel: :canonical)
+    end
+
+    # Returns the full canonical URL for the current request
+    #
+    # @param host [String] The host/domain to use (defaults to request host)
+    # @return [String] The full canonical URL
+    def canonical_href(host = nil)
+      host ||= request.host
+      "#{request.protocol}#{host}#{canonical_path}"
+    end
+
+    # Returns the canonical path for the current request (without query parameters)
+    #
+    # @return [String] The canonical path
+    def canonical_path
+      request.path.presence || '/'
+    end
+  end
+end

data/app/helpers/spree/checkout_analytics_helper.rb

@@ -19,12 +19,9 @@ module Spree
     end
 
     def order_tracking_params
-      tracking_params = {
+      {
         last_ip_address: request.remote_ip,
       }
-
-      tracking_params[:ahoy_visit_id] = current_visit.id if @order.respond_to?(:ahoy_visit) && defined?(current_visit) && current_visit&.id
-      tracking_params
     end
 
     def track_checkout_started

data/app/helpers/spree/checkout_helper.rb

@@ -49,7 +49,9 @@ module Spree
     end
 
     def quick_checkout_enabled?(order)
-      order.quick_checkout_available?
+      Rails.cache.fetch("#{order.cache_key_with_version}/quick-checkout-enabled") do
+        order.quick_checkout_available?
+      end
     end
 
     def can_use_store_credit_on_checkout?(order)

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(section_includes).map do |section|
+      sections_html = sections.includes(section_includes).preload_associations_lazily.map do |section|
         render_section(section, variables)
       end.join.html_safe
 
@@ -98,9 +98,7 @@ module Spree
     # @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] }
+        { asset_attachment: :blob }
       ]
     end
 

data/app/helpers/spree/products_helper.rb

@@ -15,15 +15,38 @@ module Spree
       ]
     end
 
-    def should_display_compare_at_price?(product_or_variant)
-      price = product_or_variant.price_in(current_currency)
-      price.compare_at_amount.present? && (price.compare_at_amount > price.amount)
+    # Builds a pricing context for a variant with current request context
+    #
+    # @param product_or_variant [Spree::Product, Spree::Variant] The product or variant to build context for
+    # @param options [Hash] Optional overrides for context attributes
+    # @option options [String] :currency Override the currency (defaults to current_currency)
+    # @option options [Spree::Store] :store Override the store (defaults to current_store)
+    # @option options [Spree::Zone] :zone Override the zone (defaults to current_order.tax_zone || current_store.checkout_zone)
+    # @option options [Spree::User] :user Override the user (defaults to try_spree_current_user)
+    # @option options [Integer] :quantity Specify quantity for volume pricing
+    # @option options [Time] :date Specify date for date-based pricing
+    # @option options [Spree::Order] :order Specify the order
+    # @return [Spree::Pricing::Context] The pricing context
+    def pricing_context_for_variant(product_or_variant, **options)
+      variant = product_or_variant.is_a?(Spree::Product) ? product_or_variant.default_variant : product_or_variant
+
+      Spree::Pricing::Context.new(
+        variant: variant,
+        currency: options[:currency] || current_currency,
+        store: options[:store] || current_store,
+        zone: options[:zone] || current_order&.tax_zone || current_store.checkout_zone,
+        user: options[:user] || try_spree_current_user,
+        quantity: options[:quantity],
+        date: options[:date],
+        order: options[:order] || current_order
+      )
     end
 
-    def weeks_online(product)
-      Spree::Deprecation.warn('weeks_online is deprecated and will be removed in Spree 5.2')
-
-      (Time.current - product.activated_at.in_time_zone(current_store.preferred_timezone)).seconds.in_weeks.to_i.abs
+    def should_display_compare_at_price?(product_or_variant)
+      variant = product_or_variant.is_a?(Spree::Product) ? product_or_variant.default_variant : product_or_variant
+      context = pricing_context_for_variant(variant)
+      price = variant.price_for(context)
+      price.compare_at_amount.present? && (price.compare_at_amount > price.amount)
     end
 
     def product_not_selected_options(product, selected_variant, options_param_name: :options)
@@ -147,7 +170,7 @@ module Spree
       return Spree::Taxon.none if product.main_taxon.blank?
 
       # using find_all as we already iterate over the taxons in #product_json_ld_breadcrumbs
-      product.main_taxon.self_and_ancestors.find_all { |taxon| taxon.depth != 0 }
+      product.main_taxon.self_and_ancestors.includes(:translations).find_all { |taxon| taxon.depth != 0 }
     end
 
     # Generates the JSON-LD elements for a list of products.

data/app/helpers/spree/storefront_helper.rb

@@ -12,7 +12,8 @@ module Spree
       @spree_storefront_base_cache_key ||= [
         spree_base_cache_key,
         current_wishlist,
-        current_order
+        current_order,
+        Spree::Current.price_lists.cache_key_with_version
       ].compact
     end
 

data/app/helpers/spree/taxons_helper.rb

@@ -12,7 +12,9 @@ module Spree
           sort_by: 'default'
         }
 
-        storefront_products_finder.new(scope: current_store.products.includes(storefront_products_includes), params: finder_params).execute
+        scope = current_store.products.includes(storefront_products_includes).preload_associations_lazily
+
+        storefront_products_finder.new(scope: scope, params: finder_params).execute
       end
     end
   end

data/app/helpers/spree/theme_helper.rb

@@ -79,7 +79,7 @@ module Spree
     #
     # @return [Hash] the theme layout sections
     def theme_layout_sections
-      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.')
+      Spree::Deprecation.warn('theme_layout_sections is deprecated and will be removed in Spree 5.5. 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

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

@@ -33,7 +33,7 @@
       </div>
 
       <div class="flex flex-col items-center gap-4">
-        <p class="text-sm text-gray-600"><%= Spree.t(:continue_without_logging_in) %></p>
+        <p class="text-sm text-muted"><%= Spree.t(:continue_without_logging_in) %></p>
         <%= link_to Spree.t(:continue_as_guest), spree.checkout_path(current_order.token, guest: true), class: 'btn btn-secondary w-full max-w-sm', data: { turbo: false } %>
       </div>
     <% end %>

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

@@ -73,7 +73,7 @@
           </h5>
           <% if !already_have_an_account? && defined?(spree_login_path) %>
             <div class="lg:text-right">
-              <span class="text-gray-600 text-sm">
+              <span class="text-muted text-sm">
                 <%= Spree.t('storefront.checkout.already_have_an_account') %> <span class="text-primary"><%= link_to Spree.t(:login), spree_login_path, data: { turbo_frame: '_top' } %></span>
               </span>
             </div>
@@ -134,7 +134,7 @@
       <%= render 'spree/checkout/special_instructions', form: form %>
 
     </div>
-    <div class="flex justify-end w-full">
+    <div class="flex justify-end w-full gap-2">
       <%= button_tag Spree.t(:save_and_continue),
                       class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
                       data: {

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

@@ -16,7 +16,7 @@
       <%= hidden_field_tag :coupon_code, promotion.code_for_order(@order) %>
       <div class="m-0">
         <div class="flex items-center justify-between text-sm">
-          <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-gray-200">
+          <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-border">
             <%= heroicon('tag', options: { class: 'h-4 w-4 mr-2' }) %>
             <%= promotion.name_for_order(@order) %>
           </span>
@@ -31,7 +31,7 @@
       <%= hidden_field_tag :gift_card, @order.gift_card.code %>
       <div class="m-0">
         <div class="flex items-center justify-between text-sm">
-          <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-gray-200">
+          <span class="max-w-[250px] truncate flex items-center p-2 rounded-sm bg-border">
             <%= heroicon('gift', options: { class: 'h-4 w-4 mr-2' }) %>
             <%= @order.gift_card.code.upcase %>
           </span>

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

@@ -24,8 +24,8 @@
       </div>
     </div>
   </div>
-  <div class="flex justify-end w-full mt-5">
-    <div class="flex justify-end w-full">
+  <div class="flex justify-end w-full gap-2 mt-5">
+    <div class="flex justify-end w-full gap-2">
       <%= button_tag Spree.t(:save_and_continue),
                       class: 'btn-primary w-full lg:w-2/5 font-semibold checkout-content-save-continue-button my-5 !py-4',
                       data: { action: 'click->checkout-delivery#disableShippingRates',

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

@@ -12,7 +12,7 @@
     <label class="select-none cursor-pointer px-2 word-break w-full" for="<%= "shipping-rate-#{rate.id}" %>">
       <%= rate.name %>
       <% if rate.delivery_range %>
-        <span class="text-gray-600 text-xs ml-3"><%= rate.display_delivery_range %></span>
+        <span class="text-muted text-xs ml-3"><%= rate.display_delivery_range %></span>
       <% end %>
     </label>
     <span class="text-right">

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

@@ -1,7 +1,5 @@
 <%= turbo_frame_tag :checkout_line_items, id: 'line_items', target: '_top' 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_storefront_base_cache_scope %>
-    </div>
-  <% end %>
+  <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_storefront_base_cache_scope %>
+  </div>
 <% end %>

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

@@ -39,7 +39,7 @@
 
   <%= render 'spree/checkout/terms_and_conditions' %>
 
-  <div class="flex justify-end w-full">
+  <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"

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

@@ -1 +1 @@
-<%= render_page(current_page, products: storefront_products.records, sort: products_sort) %>
+<%= render_page(current_page, products: storefront_products, sort: products_sort) %>

data/app/views/spree/search/show.html.erb

@@ -1,6 +1,6 @@
 <%= render_page(
       current_page,
-      products: storefront_products.records,
+      products: storefront_products,
       query: query,
       sort: products_sort
 ) %>