spree_storefront 5.0.3 → 5.1.0.beta

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

@@ -11,6 +11,8 @@
     <% else %>
       <%= render 'spree/orders/cart' %>
     <% end %>
+
+    <%= render_storefront_partials(:cart_partials) %>
   <% end %>
 
 <% if !turbo_frame_request? && !turbo_stream_request? %>

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

@@ -38,7 +38,7 @@
           <div <%= block_attributes(block) %> class="flex justify-center w-full">
             <% if block.image.attached? && block.image.variable? %>
               <% image_style = "aspect-ratio: #{spree_asset_aspect_ratio(block.image)}; --desktop-height: #{block.preferred_height}px; --mobile-height: #{block.preferred_mobile_height}px;" %>
-              <%= image_tag spree_image_url(block.image, width: 1000, height: 1000), height: block.preferred_height, width: block.preferred_width, class: "custom-desktop-height custom-mobile-height", style: image_style %>
+              <%= image_tag spree_image_url(block.image, width: 1000, height: 1000), height: block.preferred_height, class: "custom-desktop-height custom-mobile-height", style: image_style %>
             <% end %>
           </div>
       <% end %>

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

@@ -37,16 +37,23 @@
     </div>
   </div>
 
-  <% if products %>
-    <div style='<%= section_styles(section) %>'>
-      <div class='page-container'>
-        <div class='grid gap-y-8 gap-x-4 grid-cols-2 lg:grid-cols-4 lg:gap-x-6 lg:gap-y-10 mb-7' id='products'>
+  <div style="<%= section_styles(section) %>">
+    <div class="page-container">
+      <% if products.any? %>
+        <div class="grid gap-y-8 gap-x-4 grid-cols-2 lg:grid-cols-4 lg:gap-x-6 lg:gap-y-10 mb-7" id="products">
           <%= render 'spree/shared/products', products: products %>
         </div>
-      </div>
-      <%= render 'spree/products/show_more_button' %>
-    </div>
 
-    <%= render 'spree/products/json_ld_list', products: products unless turbo_frame_request? %>
-  <% end %>
+        <%= render 'spree/products/show_more_button' %>
+        <%= render('spree/products/json_ld_list', products: products) unless turbo_frame_request? %>
+      <% else %>
+        <div class="grid">
+          <div class="text-center py-10">
+            <h2 class="text-xl font-semibold mb-2"><%= Spree.t(:no_products_found) %></h2>
+            <p class="text-sm"><%= Spree.t(:try_removing_filters) %></p>
+          </div>
+        </div>
+      <% end %>
+    </div>
+  </div>
 <% end %>

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

@@ -16,7 +16,10 @@ variant_not_available = selected_variant.nil? ||
   <%= button_tag type: (variant_not_available || not_all_options_selected ? 'button' : 'submit'),
                   class: 'btn-primary btn-icon w-full h-12 add-to-cart-button',
                   data: {
-                    action: ('modal#open' if variant_not_available),
+                    action: [
+                      'click->product-form#showNotSelectedOptions',
+                      ('click->modal#open' if variant_not_available)
+                    ].compact.join(' '),
                     product_form_target: 'submit'
                   },
                   disabled: product.price_in(current_currency).zero? do %>
@@ -38,7 +41,10 @@ variant_not_available = selected_variant.nil? ||
     <%= button_tag type: (variant_not_available || not_all_options_selected ? 'button' : 'submit'),
                   class: 'btn-primary btn-icon w-full h-12 add-to-cart-button',
                   data: {
-                    action: ('modal#open' if variant_not_available),
+                    action: [
+                      'click->product-form#showNotSelectedOptions',
+                      ('click->modal#open' if variant_not_available)
+                    ].compact.join(' '),
                     product_form_target: 'submit'
                   },
                   disabled: product.price_in(current_currency).zero? do %>

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

@@ -6,6 +6,8 @@
     <div class="wished-item-<%= variant.id %> h-full"
       data-controller="wished-item"
       data-wished-item-variant-id-value="<%= variant.id %>"
+      data-wished-item-create-wishlist-path-value="<%= spree.account_wishlist_wished_items_path %>"
+      data-wished-item-destroy-wishlist-path-value="<%= spree.account_wishlist_wished_item_path(variant.id) %>"
     >
       <%= button_tag type: 'submit',
           class: "#{css_classes} disabled:animate-pulse",

data/app/views/themes/default/spree/products/filters/_taxons.erb

@@ -5,7 +5,7 @@
     class="st-accordion"
     data-controller='accordion'
     data-accordion-close-others-value="false">
-    <%= link_to "#taxonomy_filter_#{taxonomy.id}", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params[:filter].nil? || current_taxon.present? || permitted_products_params.dig(:filter, :taxon_ids)&.present?}", data: { action: 'accordion#toggle:prevent' } do %>
+    <%= link_to "#taxonomy_filter_#{taxonomy.id}", class: "cursor-pointer uppercase flex items-center justify-between h-10 px-4 lg:px-10 text-sm tracking-widest focus:outline-none transition duration-150 ease-in-out #{'st-accordion__icon--opened' if params[:filter].nil? || current_taxon.present? || permitted_products_params.dig(:filter, :taxonomy_ids, taxonomy.id.to_s, :taxon_ids).present?}", data: { action: 'accordion#toggle:prevent' } do %>
       <%= taxonomy.name.singularize %>
       <%= render 'spree/shared/icons/chevron_down' %>
     <% end %>
@@ -27,10 +27,10 @@
         <% first_taxons.each do |taxon| %>
           <li>
             <%= f.label "filter_taxon_#{taxon.id}", class: "flex items-center gap-2 cursor-pointer group text-sm h-10", data: { searchable_list_target: "item", text: taxon.name } do %>
-              <%= f.check_box "filter[taxon_ids][]",
+              <%= f.check_box "filter[taxonomy_ids][#{taxonomy.id}][taxon_ids][]",
                 {
                   id: "filter_taxon_#{taxon.id}",
-                  checked: permitted_products_params.dig(:filter, :taxon_ids)&.include?(taxon.id.to_s),
+                  checked: permitted_products_params.dig(:filter, :taxonomy_ids, taxonomy.id.to_s, :taxon_ids)&.include?(taxon.id.to_s),
                   class: "input-checkbox group-focus-within:outline"
                 },
                 taxon.id,
@@ -49,10 +49,10 @@
           <% rest_of_the_taxons.each do |taxon| %>
             <li class="px-4 lg:px-10">
               <%= f.label "filter_taxon_#{taxon.id}", class: "flex items-center gap-2 cursor-pointer group text-sm h-10", data: { searchable_list_target: "item", text: taxon.name } do %>
-                <%= f.check_box "filter[taxon_ids][]",
+                <%= f.check_box "filter[taxonomy_ids][#{taxonomy.id}][taxon_ids][]",
                   {
                     id: "filter_taxon_#{taxon.id}",
-                    checked: permitted_products_params.dig(:filter, :taxon_ids)&.include?(taxon.id.to_s),
+                    checked: permitted_products_params.dig(:filter, :taxonomy_ids, taxonomy.id.to_s, :taxon_ids)&.include?(taxon.id.to_s),
                     class: "input-checkbox group-focus-within:outline"
                   },
                   taxon.id,

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

@@ -1,5 +1,5 @@
 <% if target && target.errors.any? %>
-  <div id="errorExplanation" class="alert-error text-center mb-4 p-2">
+  <div id="errorExplanation" class="<%= local_assigns[:class] || 'alert-error text-center mb-4 p-2' %>">
     <ul>
       <% target.errors.full_messages.each do |msg| %>
         <li><%= msg %></li>

data/lib/generators/spree/storefront/devise/devise_generator.rb

@@ -0,0 +1,47 @@
+require 'rails/generators'
+
+module Spree
+  module Storefront
+    module Generators
+      class DeviseGenerator < Rails::Generators::Base
+        desc 'Installs Spree Storefront Devise controllers'
+
+        def self.source_paths
+          [
+            File.expand_path('templates', __dir__),
+            File.expand_path('../templates', "../#{__FILE__}"),
+            File.expand_path('../templates', "../../#{__FILE__}")
+          ]
+        end
+
+        def install
+          template 'user_sessions_controller.rb', 'app/controllers/spree/user_sessions_controller.rb'
+          template 'user_registrations_controller.rb', 'app/controllers/spree/user_registrations_controller.rb'
+          template 'user_passwords_controller.rb', 'app/controllers/spree/user_passwords_controller.rb'
+
+          # add devise routes
+          insert_into_file 'config/routes.rb', after: "Rails.application.routes.draw do\n" do
+            <<-ROUTES.strip_heredoc.indent!(2)
+              Spree::Core::Engine.add_routes do
+                # Storefront routes
+                scope '(:locale)', locale: /\#{Spree.available_locales.join('|')\}/, defaults: { locale: nil } do
+                  devise_for(
+                    Spree.user_class.model_name.singular_route_key,
+                    class_name: Spree.user_class.to_s,
+                    path: :user,
+                    controllers: {
+                      sessions: 'spree/user_sessions',
+                      passwords: 'spree/user_passwords',
+                      registrations: 'spree/user_registrations'
+                    },
+                    router_name: :spree
+                  )
+                end
+              end
+            ROUTES
+          end
+        end
+      end
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_passwords_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserPasswordsController < ::Devise::PasswordsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_passwords'
+    end
+
+    private
+
+    def title
+      Spree.t(:forgot_password)
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_registrations_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserRegistrationsController < ::Devise::RegistrationsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_registrations'
+    end
+
+    private
+
+    def title
+      Spree.t(:sign_up)
+    end
+  end
+end

data/lib/generators/spree/storefront/devise/templates/user_sessions_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class UserSessionsController < ::Devise::SessionsController
+    include Spree::Storefront::DeviseConcern
+
+    protected
+
+    def translation_scope
+      'devise.user_sessions'
+    end
+
+    private
+
+    def title
+      Spree.t(:login)
+    end
+  end
+end

data/lib/spree/storefront/engine.rb

@@ -7,11 +7,14 @@ module Spree
         :head_partials,
         :body_start_partials,
         :body_end_partials,
+        :cart_partials,
         :add_to_cart_partials,
         :remove_from_cart_partials,
         :checkout_partials,
         :checkout_complete_partials,
-        :quick_checkout_partials
+        :quick_checkout_partials,
+        :product_partials,
+        :add_to_wishlist_partials
       )
 
       # accessible via Rails.application.config.spree_storefront
@@ -44,11 +47,14 @@ module Spree
         Rails.application.config.spree_storefront.head_partials = []
         Rails.application.config.spree_storefront.body_start_partials = []
         Rails.application.config.spree_storefront.body_end_partials = []
+        Rails.application.config.spree_storefront.cart_partials = []
         Rails.application.config.spree_storefront.add_to_cart_partials = []
         Rails.application.config.spree_storefront.remove_from_cart_partials = []
         Rails.application.config.spree_storefront.checkout_partials = []
         Rails.application.config.spree_storefront.checkout_complete_partials = []
         Rails.application.config.spree_storefront.quick_checkout_partials = []
+        Rails.application.config.spree_storefront.product_partials = []
+        Rails.application.config.spree_storefront.add_to_wishlist_partials = []
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_storefront
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.0.beta
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-06 00:00:00.000000000 Z
+date: 2025-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 5.1.0.beta
 - !ruby/object:Gem::Dependency
   name: active_link_to
   requirement: !ruby/object:Gem::Requirement
@@ -205,6 +205,7 @@ files:
 - app/controllers/concerns/spree/cart_methods.rb
 - 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/theme_concern.rb
 - app/controllers/spree/account/addresses_controller.rb
 - app/controllers/spree/account/base_controller.rb
@@ -371,6 +372,8 @@ files:
 - app/views/themes/default/spree/account/_order.html.erb
 - app/views/themes/default/spree/account/_orders.html.erb
 - app/views/themes/default/spree/account/addresses/_address.html.erb
+- app/views/themes/default/spree/account/addresses/_edit_address_modal.html.erb
+- app/views/themes/default/spree/account/addresses/_new_address_modal.html.erb
 - app/views/themes/default/spree/account/addresses/index.html.erb
 - app/views/themes/default/spree/account/newsletter/_newsletter_settings.html.erb
 - app/views/themes/default/spree/account/newsletter/edit.html.erb
@@ -514,6 +517,10 @@ files:
 - config/initializers/heroicon.rb
 - config/locales/en.yml
 - config/routes.rb
+- lib/generators/spree/storefront/devise/devise_generator.rb
+- lib/generators/spree/storefront/devise/templates/user_passwords_controller.rb
+- lib/generators/spree/storefront/devise/templates/user_registrations_controller.rb
+- lib/generators/spree/storefront/devise/templates/user_sessions_controller.rb
 - lib/generators/spree/storefront/install/install_generator.rb
 - lib/generators/spree/storefront/install/templates/application.tailwind.css
 - lib/generators/spree/storefront/install/templates/dev
@@ -542,9 +549,9 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
 post_install_message:
 rdoc_options: []
 require_paths: