spree_storefront 5.2.6 → 5.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c186ef5bda630498c3468d11a61144b479179026bb2178d341b1b10d85ede273
-  data.tar.gz: a83841e5ed48fb94a94511b5b6bf849b56ddbea3ed2ba3039e3b7854e17f52fc
+  metadata.gz: 2d2469dfa268f4b5001def6a8efc6c6c69ee8e1cfcbec059f09b1b369f99f003
+  data.tar.gz: cbf4c3c04197c8c9b283efc23e04fe886b035159603e40ef36a30eb05a260252
 SHA512:
-  metadata.gz: 169a0eead13f4e94330d83d93a30e5b66734d8d0a83b40365c24588649c02e040859a611636e1e90c11a119295fcac06f263b4ff89a6529b7795ff89872393ca
-  data.tar.gz: 793f3e4698d50a1f271225ac10cd2f2033774a3bf38bcfb76a8493bdb4c9ba9eec123a5e6d82ae2ec23fc10db6185a911dd1821b279c4795614cafd2bbdaee5b
+  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

@@ -44,7 +44,6 @@ module Spree
           { option_values: [:option_type] },
           {
             product: [
-              :variant_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

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/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,6 +9,7 @@ module Spree
     include Spree::WishlistHelper
     include Spree::AnalyticsHelper
     include Spree::IntegrationsHelper
+    include Spree::Storefront::PaginationConcern
 
     layout :choose_layout
 
@@ -28,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
 
@@ -157,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
@@ -205,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/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)

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/_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
 ) %>

data/app/views/spree/shared/_load_more_products.turbo_stream.erb

@@ -3,5 +3,5 @@
 <% end %>
 
 <%= turbo_stream.append "products" do %>
-  <%= render 'spree/shared/products', products: storefront_products.records %>
+  <%= render 'spree/shared/products', products: storefront_products %>
 <% end %>

data/app/views/spree/shared/_product_listing_page.html.erb

@@ -1,11 +1,11 @@
 <% if turbo_frame_request? && current_theme_preview.nil? %>
-  <%= render 'spree/page_sections/product_grid', products: storefront_products.records, section: current_page.sections.find_by(type: 'Spree::PageSections::ProductGrid') %>
+  <%= render 'spree/page_sections/product_grid', products: storefront_products, section: current_page.sections.find_by(type: 'Spree::PageSections::ProductGrid') %>
 <% else %>
   <%= render_page(
     current_page,
     taxon: @taxon,
     collection: @collection,
-    products: storefront_products.records,
+    products: storefront_products,
   ) %>
 <% end %>
 

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

@@ -47,15 +47,15 @@
                   <div <%= block_attributes(block) %>>
                     <% case block.type %>
                     <% when 'Spree::PageBlocks::Products::Brand' %>
-                      <% if presenter.product&.brand&.page_builder_url %>
-                        <%= link_to spree_storefront_resource_url(presenter.product&.brand), title: strip_tags(presenter.product&.brand&.name).strip, data: { turbo_frame: '_top' } do %>
+                      <% if presenter.product&.brand_taxon&.page_builder_url %>
+                        <%= link_to spree_storefront_resource_url(presenter.product&.brand_taxon), title: strip_tags(presenter.product&.brand_taxon&.name).strip, data: { turbo_frame: '_top' } do %>
                           <h3 class="text-sm uppercase font-semibold">
-                            <%= presenter.product&.brand&.name %>
+                            <%= presenter.product&.brand_taxon&.name %>
                           </h3>
                         <% end %>
                       <% else %>
                         <h3 class="text-sm uppercase font-semibold">
-                          <%= presenter.product&.brand&.name %>
+                          <%= presenter.product&.brand_taxon&.name %>
                         </h3>
                       <% end %>
                     <% when 'Spree::PageBlocks::Products::Title' %>

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

@@ -14,11 +14,11 @@
         <%= 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.page_builder_image&.attached? && link.linkable.page_builder_image&.variable? %>
             <div class="flex space-y-2 flex-col">
-              <%= 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) %>
+              <%= 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-border', loading: :lazy, alt: link.label) %>
               <span><%= link.label %></span>
             </div>
           <% else %>
-            <div class="aspect-1 w-full group-hover:bg-gray-100 bg-gray-200 rounded-md flex items-center justify-center relative">
+            <div class="aspect-1 w-full group-hover:bg-gray-100 bg-border rounded-md flex items-center justify-center relative">
               <span><%= link.label %></span>
             </div>
           <% end %>
@@ -49,10 +49,10 @@
               <%= 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.page_builder_image.attached? %>
                   <div class="flex space-y-2 flex-col">
-                    <%= 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) %>
+                    <%= 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-border', 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">
+                  <div class="aspect-1 w-full group-hover:bg-gray-100 bg-border flex items-center justify-center relative">
                     <span><%= link.label %></span>
                   </div>
                 <% end %>

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

@@ -5,7 +5,7 @@
         <%= render partial: 'spree/posts/post', collection: @posts, cached: true %>
       </div>
 
-      <%= paginate @posts, theme: 'storefront', outer_window: 1, inner_window: 2 %>
+      <%= render 'spree/shared/pagination' %>
     </div>
   <% end %>
 </div>

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

@@ -47,9 +47,9 @@
                       </h1>
                     <% when 'Spree::PageBlocks::Products::Brand' %>
                       <% if product.brand_taxon %>
-                        <%= link_to spree.nested_taxons_path(product.brand_taxon), title: product.brand_name do %>
+                        <%= link_to spree.nested_taxons_path(product.brand_taxon), title: product.brand_taxon.name do %>
                           <h3 class="text-sm lg:mt-0 inline-block mb-1">
-                            <%= product.brand_name %>
+                            <%= product.brand_taxon.name %>
                           </h3>
                         <% end %>
                       <% end %>

data/app/views/themes/default/spree/posts/_pagination.html.erb

@@ -1 +1 @@
-<%= paginate @posts, theme: 'storefront', outer_window: 1, inner_window: 2 %>
+<%= render 'spree/shared/pagination' %>

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

@@ -5,11 +5,24 @@ options_param_name ||= :options
 not_selected_options = product_not_selected_options(product, selected_variant, options_param_name: options_param_name)
 all_options_selected = (params[options_param_name].present? || @variant_from_options.present?) && not_selected_options.empty?
 not_all_options_selected = !all_options_selected && product.any_variant_available?(current_currency)
+
+# Build pricing context for selected variant
+if selected_variant
+  variant_pricing_context = pricing_context_for_variant(selected_variant)
+  variant_price = selected_variant.price_for(variant_pricing_context)
+else
+  variant_price = nil
+end
+
 variant_not_available = selected_variant.nil? ||
                         product.discontinued? ||
                         selected_variant.discontinued? ||
                         !selected_variant.purchasable? ||
-                        selected_variant.price_in(current_currency).amount.nil?
+                        variant_price&.amount.nil?
+
+# Build pricing context for product
+product_pricing_context = pricing_context_for_variant(product)
+product_price = product.default_variant.price_for(product_pricing_context)
 %>
 
 <div class='<%= sticky_button_classes %> bottom-0 flex flex-col gap-4 z-10' data-sticky-button-target='stickyButton'>
@@ -22,7 +35,7 @@ variant_not_available = selected_variant.nil? ||
                     ].compact.join(' '),
                     product_form_target: 'submit'
                   },
-                  disabled: product.price_in(current_currency).zero? do %>
+                  disabled: product_price.zero? do %>
     <% if not_selected_options.size == 1 %>
       <span><%= Spree.t('storefront.variant_picker.please_choose', option_type: not_selected_options[0].presentation) %></span>
     <% elsif not_all_options_selected %>
@@ -47,7 +60,7 @@ variant_not_available = selected_variant.nil? ||
                     ].compact.join(' '),
                     product_form_target: 'submit'
                   },
-                  disabled: product.price_in(current_currency).zero? do %>
+                  disabled: product_price.zero? do %>
       <% if not_selected_options.size == 1 %>
         <span><%= Spree.t('storefront.variant_picker.please_choose', option_type: not_selected_options[0].presentation) %></span>
       <% elsif not_all_options_selected %>

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

@@ -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.default_image %>
+            <% if selected_variant.has_images? || selected_variant.default_image.present? %>
               <template data-featured-image-template>
                 <%= render 'spree/products/featured_image',
                   object: selected_variant %>

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

@@ -1,5 +1,6 @@
 <% with_cover_image ||= true %>
 <% object ||= product %>
+
 <% if object.default_image.present? && object.default_image.attached? %>
   <% height ||= theme_setting('product_listing_image_height') %>
   <% width ||= theme_setting('product_listing_image_width') %>
@@ -13,7 +14,7 @@
          "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) %>
-    <% if object.secondary_image.present? && object.secondary_image.attached? %>
+    <% 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) %>
     <% end %>

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

@@ -5,9 +5,9 @@
     "@type": "Product",
     "name": <%= product.name.to_json.html_safe %>,
     "url": <%= spree.product_url(product, host: current_store.url_or_custom_domain).to_json.html_safe %>,
-  <% if product.featured_image %>
+  <% if product.has_images? %>
     "image": [
-      <%= spree_image_url(product.featured_image, variant: :large).to_json.html_safe %>
+      <%= spree_image_url(product.default_image, variant: :large).to_json.html_safe %>
     ],
   <% end %>
   <% if product.description.present? %>
@@ -18,10 +18,10 @@
   <% elsif selected_variant %>
     <% if selected_variant.sku.present? %>"sku": <%= selected_variant.sku.to_json.html_safe %>,<% end %>
   <% end %>
-  <% if product.brand_name %>
+  <% if product.brand_taxon %>
     "brand": {
       "@type": "Brand",
-      "name": <%= product.brand_name.to_json.html_safe %>
+      "name": <%= product.brand_taxon.name.to_json.html_safe %>
     },
   <% end %>
 "offers": [

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

@@ -20,7 +20,9 @@
 
       target ||= product
 
-      price = target.price_in(current_currency)
+      variant_for_context = target.is_a?(Spree::Product) ? target.default_variant : target
+      pricing_context = pricing_context_for_variant(variant_for_context)
+      price = variant_for_context.price_for(pricing_context)
       money_price = price.display_amount
 
       if target.is_a?(Spree::Product) && !use_variant && product.price_varies?(current_currency)

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

@@ -24,9 +24,9 @@
         <%= render 'spree/products/label', product: product %>
       </div>
       <div class="product-card-inner">
-        <% if product.brand_name.present? %>
+        <% if product.brand_taxon.present? %>
           <h3 class="text-xs font-semibold uppercase inline-block product-card-brand">
-            <%= product.brand_name %>
+            <%= product.brand_taxon.name %>
           </h3>
         <% end %>
         <h3 class="line-clamp-1 product-card-title">
@@ -55,7 +55,7 @@
       </div>
     <% end %>
     <div class="absolute right-1 top-1 z-10" data-plp-variant-picker-target="addToWishlist">
-      <%= render 'spree/products/add_to_wishlist', variant: product.first_or_default_variant(current_currency) if product %>
+      <%= render 'spree/products/add_to_wishlist', variant: selected_variant %>
     </div>
     <%= render 'spree/products/color_swatches', product: product if product && (defined?(show_variant_picker) ? show_variant_picker : true) %>
   </div>

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

@@ -1,7 +1,7 @@
-<% unless storefront_products.last_page? %>
-  <%= turbo_frame_tag "next_page", src: url_for(params.to_unsafe_h.merge(page: storefront_products.next_page, format: :turbo_stream)), class: "block relative w-full", data: { controller: "infinite-scroll", infinite_scroll_offset_value: "1350px" }, loading: "lazy" do %>
+<% if storefront_pagy&.next %>
+  <%= turbo_frame_tag "next_page", src: url_for(params.to_unsafe_h.merge(page: storefront_pagy.next, format: :turbo_stream)), class: "block relative w-full", data: { controller: "infinite-scroll", infinite_scroll_offset_value: "1350px" }, loading: "lazy" do %>
     <span class="flex justify-center gap-2 items-center py-4 left-0 w-full h-full">
-        <%= render 'spree/shared/icons/spinner' %>
+      <%= render 'spree/shared/icons/spinner' %>
       <%= Spree.t(:loading) %>...
     </span>
   <% end %>

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

@@ -0,0 +1,7 @@
+<%# Renders pagination - supports both Pagy and Kaminari %>
+<% if Spree::Storefront::Config[:use_kaminari_pagination] %>
+  <%= paginate @posts || @orders || @gift_cards || @store_credit_events || @storefront_products,
+      theme: 'storefront', outer_window: 1, inner_window: 2 %>
+<% elsif @pagy && @pagy.pages > 1 %>
+  <%== @pagy.series_nav(aria_label: 'Pages') %>
+<% end %>

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

@@ -6,6 +6,8 @@ module Spree
       class InstallGenerator < Rails::Generators::Base
         desc 'Installs Spree Storefront'
 
+        class_option :migrate, type: :boolean, default: true, banner: 'Run migrations'
+
         def self.source_paths
           [
             File.expand_path('templates', __dir__),
@@ -14,10 +16,16 @@ module Spree
           ]
         end
 
+        def install_page_builder
+          say_status :installing, 'page builder'
+          migrate_option = options[:migrate] == false ? ' --migrate=false' : ''
+          generate "spree:page_builder:install --force#{migrate_option}"
+        end
+
         def install
           empty_directory Rails.root.join('app/assets/tailwind') if Rails.root && !Rails.root.join('app/assets/tailwind').exist?
-          template 'application.css', 'app/assets/tailwind/application.css'
-          template 'tailwind.config.js', 'config/tailwind.config.js'
+          template 'application.css', 'app/assets/tailwind/application.css', force: options[:force]
+          template 'tailwind.config.js', 'config/tailwind.config.js', force: options[:force]
 
           if Rails.root && Rails.root.join("Procfile.dev").exist?
             append_to_file 'Procfile.dev', "\nstorefront_css: bin/rails tailwindcss:watch" unless File.read('Procfile.dev').include?('storefront_css:')
@@ -40,8 +48,8 @@ module Spree
             append_to_file 'app/assets/config/manifest.js', "\n//= link_tree ../builds" unless File.read('app/assets/config/manifest.js').include?('//= link_tree ../builds')
           end
 
-          # remove static robots.txt as we use robots.txt.erb
-          remove_file Rails.root.join('public/robots.txt') if Rails.root && Rails.root.join('public/robots.txt').exist?
+          # remove static robots.txt as storefront serves it dynamically via seo#robots
+          remove_file 'public/robots.txt'
         end
       end
     end

data/lib/generators/spree/storefront/install/templates/application.css

@@ -1850,3 +1850,47 @@ body:has(.currency-and-locale-modal:not(.hidden)) .page-contents {
     aspect-ratio: 1.77;
   }
 }
+
+/* Pagy pagination styles */
+.pagy.series-nav {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.25rem;
+  margin-top: 4rem;
+}
+
+.pagy.series-nav a {
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 2rem;
+  text-align: center;
+  padding: 0.25rem;
+  border-radius: 0.25rem;
+}
+
+.pagy.series-nav a[rel="prev"],
+.pagy.series-nav a[rel="next"] {
+  width: auto;
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+
+.pagy.series-nav a[aria-disabled="true"] {
+  opacity: 0.5;
+  cursor: default;
+}
+
+.pagy.series-nav a[aria-current="page"] {
+  font-weight: 600;
+  text-decoration: underline;
+}
+
+.pagy.series-nav a:not([aria-disabled="true"]):hover {
+  background-color: rgba(0, 0, 0, 0.05);
+}
+
+.pagy.series-nav a[role="separator"] {
+  width: 2rem;
+}

data/lib/spree/storefront/configuration.rb

@@ -9,6 +9,9 @@ module Spree
       preference :products_per_page, :integer, default: 20
 
       preference :search_min_query_length, :integer, default: 2
+
+      # Pagination preference - set to true to use legacy Kaminari pagination
+      preference :use_kaminari_pagination, :boolean, default: false
     end
   end
 end

data/lib/spree/storefront.rb

@@ -1,4 +1,5 @@
-require 'spree_core'
+require 'spree'
+require 'spree_page_builder'
 
 require 'active_link_to'
 require 'heroicon'
@@ -9,6 +10,7 @@ require 'stimulus-rails'
 require 'tailwindcss-rails'
 require 'turbo-rails'
 require 'inline_svg'
+require 'pagy'
 
 require 'spree/storefront/engine'
 require 'spree/core/partials'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 5.3.0.rc1
 platform: ruby
 authors:
 - Vendo Connect Inc.
@@ -10,19 +10,33 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: spree_core
+  name: spree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 5.3.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 5.3.0.rc1
+- !ruby/object:Gem::Dependency
+  name: spree_page_builder
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.3.0.rc1
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +177,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '43.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '43.0'
 description: Modern fully featured storefront and checkout for Spree Commerce
 email: hello@spreecommerce.org
 executables: []
@@ -177,6 +205,7 @@ files:
 - app/controllers/concerns/spree/locale_urls.rb
 - app/controllers/concerns/spree/password_protected.rb
 - app/controllers/concerns/spree/storefront/devise_concern.rb
+- app/controllers/concerns/spree/storefront/pagination_concern.rb
 - app/controllers/concerns/spree/theme_concern.rb
 - app/controllers/spree/account/addresses_controller.rb
 - app/controllers/spree/account/base_controller.rb
@@ -475,6 +504,7 @@ files:
 - app/views/themes/default/spree/shared/_order_details.html.erb
 - app/views/themes/default/spree/shared/_order_line_item.html.erb
 - app/views/themes/default/spree/shared/_order_shipment.html.erb
+- app/views/themes/default/spree/shared/_pagination.html.erb
 - app/views/themes/default/spree/shared/_search.html.erb
 - app/views/themes/default/spree/shared/_title.html.erb
 - app/views/themes/default/spree/shared/_wishlist_icon.html.erb
@@ -557,9 +587,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.2.6
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.3.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.6
+  source_code_uri: https://github.com/spree/spree/tree/v5.3.0.rc1
 rdoc_options: []
 require_paths:
 - lib
@@ -567,12 +597,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.8.23
+      version: '0'
 requirements: []
 rubygems_version: 4.0.2
 specification_version: 4