spree_storefront 5.0.5 → 5.1.0.beta

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

@@ -1,6 +1,4 @@
-<% item_count ||= current_order&.item_count %>
-
-<%= turbo_frame_tag "cart-icon-#{item_count}", target: '_top' do %>
+<%= turbo_frame_tag "cart-icon-#{current_order&.item_count}", target: '_top' do %>
   <%= link_to spree.cart_path,
     class: 'relative block w-6',
     id: "cart-pane-link",
@@ -8,7 +6,7 @@
     onclick: 'event.preventDefault()' do %>
     <%= render 'spree/shared/icons/cart' %>
     <span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>
-      <%= item_count if item_count&.positive? %>
+      <%= current_order.item_count if current_order&.item_count&.positive? %>
     </span>
     <span class='sr-only'><%= Spree.t('storefront.cart.items_in_cart') %>, <%= Spree.t('storefront.cart.view_bag') %></span>
   <% end %>

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

@@ -1,6 +1,3 @@
-<% order ||= current_order %>
-<% item_count ||= order&.item_count %>
-
 <!-- begin sidebar/slideover -->
 <div
   id="cart-pane"
@@ -28,13 +25,13 @@
       <span class='relative block w-6'>
         <%= render 'spree/shared/icons/cart' %>
         <span class='cart-counter w-full text-[8px] font-extrabold absolute top-[10px] text-center'>
-          <%= item_count if item_count&.positive? %>
+          <%= current_order.item_count if current_order.present? && current_order.item_count.to_i > 0 %>
         </span>
         <span class='sr-only'><%= Spree.t('storefront.cart.items_in_cart') %>, <%= Spree.t('storefront.cart.view_bag') %></span>
       </span>
     </div>
     <div class='flex-1 h-0 overflow-y-auto'>
-      <%= turbo_frame_tag cart_id(order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %>
+      <%= turbo_frame_tag cart_id(current_order), class: 'cart-contents', src: spree.cart_path, data: { turbo_permanent: true } %>
     </div>
   </div>
 </div>

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/app/views/themes/default/spree/shared/_meta_tags.html.erb

@@ -32,9 +32,9 @@
   <meta property="twitter:image" content="<%= image_url %>" />
 <% end %>
 
-<% if @product.present? && @product.price_in(current_currency).present? %>
+<% if @product && @product.price_in(current_currency).present? %>
   <meta property="og:price:amount" content="<%= @product.price_in(current_currency).amount.to_s %>">
-  <meta property="og:price:currency" content="<%= current_currency %>">
+  <meta property="og:price:currency" content="<%= current_order&.currency || current_store.default_currency %>">
 <% end %>
 
 <% if current_store.twitter.present? %>

data/config/locales/en.yml

@@ -20,7 +20,6 @@ en:
       checkout:
         all_transactions_are_secure_and_encrypted: All transactions are secure and encrypted
         already_have_an_account: Already have an account?
-        backorder_notice: 'Some products in your cart will be dispatched a bit later than the rest of your order:'
         by_placing_this_order_you_agree_to: By placing this order you agree to
         calculated_at_next_step: Calculated at next step
         continue_to_cart: Continue to cart
@@ -31,13 +30,11 @@ en:
             one: This item will be removed from your cart because there are no delivery methods available for your address.
             other: These %{count} items will be removed from your cart because there are no delivery methods available for your address.
         gift_card_amount_applied: Gift card %{code} applied %{amount} to your order.
-        it_seems_you_already_have_an_account_html: It seems you already have an account with us. Please %{link} to continue.
         or_continue_below: or continue below
         order_already_paid: You don't need to pay anything, just click Place now button to confirm the order.
         order_success: Your order is confirmed!
         order_success_message: When your order is ready, you will receive an email confirmation.
         payment_processing_message: You will receive an email confirmation when your payment is processed.
-        return_to_cart: Return to cart
         shipping_not_available: Shipping not available
         signup_for_an_account: Create an account for faster future purchases, order tracking, and more.
         store_credits_amount_applied: You applied a %{amount} store credit to your order.
@@ -53,10 +50,6 @@ en:
         description: Take control of your settings and tailor your experience according to your preferences. Customize your notifications to suit your needs.
         join: Email me about new products, sales, and more. You can unsubscribe at any time.
         status: You are currently %{status} to the newsletters.
-      policies:
-        last_update_at: Last update %{date}
-      products:
-        pinch_to_zoom_html: Pinch to<br>zoom
       refund_action_not_required_message:
         order_canceled:
           fully: This order has been canceled. No further action is required. You will receive a refund within couple business days.
@@ -73,7 +66,6 @@ en:
           partially: This order has been partially refunded. The amount paid by the selected payment method will be refunded within couple business days. Please reach out to %{customer_support_email} to receive new voucher.
       variant_picker:
         please_choose: Please choose %{option_type}
-        please_choose_all_options: Please choose all options
       wished_items:
         add: Add to wishlist
         no_wished_items:

data/lib/generators/spree/storefront/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/generators/spree/storefront/theme/templates/model.rb.tt

@@ -8,97 +8,10 @@ module Spree
         }
       end
 
-      # COLORS
-      # main colors
-      preference :primary_color, :string, default: '#000000'
-      preference :accent_color, :string, default: '#F0EFE9'
-      preference :danger_color, :string, default: '#C73528'
-      preference :neutral_color, :string, default: '#999999'
-      preference :background_color, :string, default: '#FFFFFF'
-      preference :text_color, :string, default: '#000000'
-      preference :success_color, :string, default: '#00C773'
-
-      # buttons
-      preference :button_background_color, :string
-      preference :button_text_color, :string, default: '#ffffff'
-      preference :button_hover_background_color, :string
-      preference :button_hover_text_color, :string
-      preference :button_border_color, :string
-
-      # borders
-      preference :border_color, :string, default: '#E9E7DC'
-      preference :sidebar_border_color, :string
-
-      preference :secondary_button_background_color, :string
-      preference :secondary_button_text_color, :string
-      preference :secondary_button_hover_background_color, :string
-      preference :secondary_button_hover_text_color, :string
-
-      # inputs
-      preference :input_text_color, :string, default: '#6b7280'
-      preference :input_background_color, :string, default: '#ffffff'
-      preference :input_border_color, :string
-      preference :input_focus_border_color, :string
-      preference :input_focus_background_color, :string
-      preference :input_focus_text_color, :string
-
-      # sidebar (checkout)
-      preference :checkout_sidebar_background_color, :string, default: '#f3f4f6'
-      preference :checkout_divider_background_color, :string
-      preference :checkout_sidebar_text_color, :string
-
-      # TYPOGRAPHY
-      preference :custom_font_code, :string, default: nil
-      # body
-      preference :font_family, :string, default: 'Inter'
-      preference :font_size_scale, :integer, default: 100
-      # headers
-      preference :header_font_family, :string, default: 'Inter'
-      preference :header_font_size_scale, :integer, default: 100
-      preference :headings_uppercase, :boolean, default: true
-
-      # BUTTONS
-      preference :button_border_thickness, :integer, default: 1
-      preference :button_border_opacity, :integer, default: 100
-      preference :button_border_radius, :integer, default: 100
-      preference :button_shadow_opacity, :integer, default: 0
-      preference :button_shadow_horizontal_offset, :integer, default: 0
-      preference :button_shadow_vertical_offset, :integer, default: 4
-      preference :button_shadow_blur, :integer, default: 5
-
-      # INPUTS
-      preference :input_border_thickness, :integer, default: 1
-      preference :input_border_opacity, :integer, default: 100
-      preference :input_border_radius, :integer, default: 8
-      preference :input_shadow_opacity, :integer, default: 0
-      preference :input_shadow_horizontal_offset, :integer, default: 0
-      preference :input_shadow_vertical_offset, :integer, default: 4
-      preference :input_shadow_blur, :integer, default: 5
-
-      # BORDERS
-      preference :border_width, :integer, default: 1
-      preference :border_radius, :integer, default: 6
-      preference :border_shadow_opacity, :integer, default: 0
-      preference :border_shadow_horizontal_offset, :integer, default: 0
-      preference :border_shadow_vertical_offset, :integer, default: 4
-      preference :border_shadow_blur, :integer, default: 5
-
-      # PRODUCT IMAGES
-      preference :product_listing_image_height, :integer, default: 300
-      preference :product_listing_image_width, :integer, default: 300
-      preference :product_listing_image_height_mobile, :integer, default: 190
-      preference :product_listing_image_width_mobile, :integer, default: 190
-
-      # Returns an array of available layout section classes for the theme, eg. header, footer, newsletter, etc.
-      #
-      # @return [Array<Class>]
-      def available_layout_sections
-        [
-          Spree::PageSections::AnnouncementBar,
-          Spree::PageSections::Header,
-          Spree::PageSections::Newsletter,
-          Spree::PageSections::Footer
-        ]
+      def custom_page_sections
+        # you can override this method in your theme to return a list of custom page sections for your theme
+        # [Spree::PageSections::Custom, Spree::PageSections::Custom2]
+        []
       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.5
+  version: 5.1.0.beta
 platform: ruby
 authors:
 - Vendo Connect Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-30 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.5
+        version: 5.1.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.5
+        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
@@ -392,7 +395,6 @@ files:
 - app/views/themes/default/spree/orders/show.html.erb
 - app/views/themes/default/spree/page_sections/_announcement_bar.html.erb
 - app/views/themes/default/spree/page_sections/_custom_code.html.erb
-- app/views/themes/default/spree/page_sections/_featured_posts.html.erb
 - app/views/themes/default/spree/page_sections/_featured_product.html.erb
 - app/views/themes/default/spree/page_sections/_featured_taxon.html.erb
 - app/views/themes/default/spree/page_sections/_featured_taxons.html.erb
@@ -515,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
@@ -543,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.5
+  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.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
 post_install_message:
 rdoc_options: []
 require_paths:

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

@@ -1,56 +0,0 @@
-<div style='<%= section_styles(section) %>' class='animate-fadeIn'>
-  <div class='page-container'>
-    <% heading_size =
-      case section.preferred_heading_size
-      when "small"
-        "text-base font-medium"
-      when "medium"
-        "text-lg lg:text-xl font-medium"
-      when "large"
-        "text-xl lg:text-2xl font-medium"
-      end %>
-    <% if section.preferred_heading.present? %>
-      <div class='mb-8 flex flex-col'>
-        <h3
-          class='
-            <%= heading_size %> featured-taxon--title font-medium
-            text-<%= section.preferred_heading_alignment %>
-          '
-          data-title="<%= section.preferred_heading.downcase %>"
-          style='<%= section_heading_styles(section) %>'
-        >
-          <%= section.preferred_heading %>
-        </h3>
-
-        <% if section.description.present? %>
-          <div class='pt-4 text-<%= section.preferred_description_alignment %>'>
-            <%= section.description %>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
-    <div class='flex h-full relative'>
-      <div
-        class='
-          swiper-container overflow-hidden flex-1 pr-8 lg:pr-0 -mx-4 lg:mx-0 flex flex-col
-          lg:flex-col-reverse
-        '
-        data-controller='carousel'
-        data-carousel-options-value='{ "slidesPerView": 1, "centeredSlides": false, "spaceBetween": 16, "grabCursor": true, "breakpoints": { "768": { "slidesPerView": 3, "spaceBetween": 24 } }, "navigation": { "nextEl": ".swiper-custom-button-next-<%= section.id %>", "prevEl": ".swiper-custom-button-prev-<%= section.id %>" } }'
-      >
-        <div class='swiper-wrapper px-4 lg:px-0 h-auto'>
-          <%= render partial: "spree/posts/post",
-          collection: section.posts,
-          cached: spree_base_cache_scope,
-          as: :post %>
-        </div>
-        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent left-0 disabled:hidden hover:border-primary ml-2 lg:ml-0 swiper-custom-button-prev-#{section.id} block top-[100px]", aria: { label: "Previous posts" }, style: "transform: translate(-50%, -50%);" do %>
-          <%= render "spree/shared/icons/chevron" %>
-        <% end %>
-        <%= button_tag class: "absolute p-2 bg-white rounded-full z-10 border border-accent right-0 disabled:hidden hover:border-primary mr-2 lg:mr-0 swiper-custom-button-next-#{section.id} block top-[100px]", aria: { label: "Next posts" }, style: "transform: translate(50%, -50%);" do %>
-          <%= render "spree/shared/icons/chevron_right" %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>