spree_frontend 4.2.5 → 4.3.0

data/app/controllers/spree/checkout_controller.rb

@@ -141,8 +141,8 @@ module Spree
     def before_address
       # if the user has a default address, a callback takes care of setting
       # that; but if he doesn't, we need to build an empty one here
-      @order.bill_address ||= Address.build_default
-      @order.ship_address ||= Address.build_default if @order.checkout_steps.include?('delivery')
+      @order.bill_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user)
+      @order.ship_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user) if @order.checkout_steps.include?('delivery')
     end
 
     def before_delivery
@@ -161,7 +161,9 @@ module Spree
         end
       end
 
-      @payment_sources = try_spree_current_user.payment_sources if try_spree_current_user&.respond_to?(:payment_sources)
+      return unless try_spree_current_user.respond_to?(:payment_sources)
+
+      @payment_sources = try_spree_current_user.payment_sources.where(payment_method: @order.available_payment_methods)
     end
 
     def add_store_credit_payments

data/app/controllers/spree/cms_pages_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  class CmsPagesController < Spree::StoreController
+    before_action :load_cms_page, only: [:show]
+
+    include Spree::FrontendHelper
+    include Spree::CacheHelper
+
+    def show
+      if @page&.visible?
+        @cms_page = @page
+      elsif @page&.draft_mode? && try_spree_current_user&.admin?
+        @cms_page = @page
+        @edit_mode = true
+      else
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
+    private
+
+    def accurate_title
+      @page&.seo_title || super
+    end
+
+    def load_cms_page
+      @page = Spree::CmsPage.for_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
+    end
+  end
+end

data/app/controllers/spree/content_controller.rb

@@ -3,8 +3,6 @@ module Spree
     # Don't serve local files or static assets
     after_action :fire_visited_path, except: :cvv
 
-    respond_to :html
-
     def test; end
 
     def cvv

data/app/controllers/spree/errors_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class ErrorsController < StoreController
+    def forbidden
+      render status: 403
+    end
+
+    def unauthorized
+      render status: 401
+    end
+  end
+end

data/app/controllers/spree/home_controller.rb

@@ -2,12 +2,45 @@ module Spree
   class HomeController < Spree::StoreController
     include Spree::CacheHelper
 
+    before_action :load_homepage, only: [:index]
+
     respond_to :html
 
     def index
+      if @cms_home_page&.visible?
+        @homepage = @cms_home_page
+      elsif try_spree_current_user&.admin?
+        @homepage = @cms_home_page
+        @edit_mode = true
+      end
+
       if http_cache_enabled?
-        fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+        fresh_when etag: store_etag, last_modified: last_modified_index, public: true
       end
     end
+
+    private
+
+    def etag_index
+      [
+        store_etag,
+        last_modified_index,
+      ]
+    end
+
+    def last_modified_index
+      page_last_modified = @cms_home_page&.maximum(:updated_at)&.utc if @cms_home_page.respond_to?(:maximum)
+      current_store_last_modified = current_store.updated_at.utc
+
+      [page_last_modified, current_store_last_modified].compact.max
+    end
+
+    def accurate_title
+      @cms_home_page&.seo_title || super
+    end
+
+    def load_homepage
+      @cms_home_page = current_store.homepage(I18n.locale)
+    end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -1,5 +1,7 @@
 module Spree
   class LocaleController < Spree::StoreController
+    REDIRECT_TO_ROOT = /\/(#{Spree::Config[:storefront_pages_path]})\//.freeze
+
     def index
       render :index, layout: false
     end
@@ -25,7 +27,11 @@ module Spree
     private
 
     def should_build_new_url?
-      request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+      if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)
+        false
+      else
+        request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+      end
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -5,16 +5,14 @@ module Spree
 
     helper 'spree/products', 'spree/orders'
 
-    respond_to :html
-
     before_action :assign_order_with_lock, only: :update
 
     def show
-      @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
+      @order = current_store.orders.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
     end
 
     def update
-      @variant = Spree::Variant.find(params[:variant_id]) if params[:variant_id]
+      @variant = curret_store.variants.find(params[:variant_id]) if params[:variant_id]
       if Cart::Update.call(order: @order, params: order_params).success?
         respond_with(@order) do |format|
           format.html do
@@ -33,14 +31,14 @@ module Spree
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.incomplete.
+      @order = current_order || current_store.orders.incomplete.
                includes(line_items: [variant: [:images, :product, option_values: :option_type]]).
                find_or_initialize_by(token: cookies.signed[:token])
       associate_user
     end
 
     def empty
-      current_order.try(:empty!)
+      cart_empty_service.call(order: current_order)
 
       redirect_to spree.cart_path
     end
@@ -56,7 +54,7 @@ module Spree
     end
 
     def check_authorization
-      order = Spree::Order.find_by(number: params[:id]) if params[:id].present?
+      order = current_store.orders.find_by(number: params[:id]) if params[:id].present?
       order ||= current_order
 
       if order && action_name.to_sym == :show
@@ -87,5 +85,9 @@ module Spree
     def cart_add_item_service
       Spree::Dependencies.cart_add_item_service.constantize
     end
+
+    def cart_empty_service
+      Spree::Dependencies.cart_empty_service.constantize
+    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -7,10 +7,10 @@ module Spree
     before_action :load_product, only: [:show, :related]
     before_action :load_taxon, only: :index
 
-    respond_to :html
+    before_action :can_show_product?, only: :show
 
     def index
-      @searcher = build_searcher(params.merge(include_images: true, current_store_id: current_store.id))
+      @searcher = build_searcher(params.merge(include_images: true, current_store: current_store))
       @products = @searcher.retrieve_products
 
       if http_cache_enabled?
@@ -21,7 +21,8 @@ module Spree
     def show
       redirect_if_legacy_path
 
-      @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
+      @taxon = params[:taxon_id].present? ? taxons_scope.find_by(id: params[:taxon_id]) : nil
+      @taxon = @product.taxons.first unless @taxon.present?
 
       if !http_cache_enabled? || stale?(etag: etag_show, last_modified: last_modified_show, public: true)
         @product_summary = Spree::ProductSummaryPresenter.new(@product).call
@@ -51,19 +52,15 @@ module Spree
     end
 
     def load_product
-      @products = if try_spree_current_user.try(:has_spree_role?, 'admin')
-                    Product.with_deleted
-                  else
-                    Product.active(current_currency)
-                  end
-
-      @product = @products.includes(:master).
-                 friendly.
-                 find(params[:id])
+      @product = current_store.products.for_user(try_spree_current_user).friendly.find(params[:id])
     end
 
     def load_taxon
-      @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+      @taxon = taxons_scope.find(params[:taxon]) if params[:taxon].present?
+    end
+
+    def can_show_product?
+      raise ActiveRecord::RecordNotFound if @product.stores.exclude?(current_store)
     end
 
     def load_variants
@@ -122,5 +119,9 @@ module Spree
 
       [product_last_modified, current_store_last_modified].compact.max
     end
+
+    def taxons_scope
+      current_store.taxons
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -1,8 +1,18 @@
 module Spree
-  class StoreController < Spree::BaseController
+  class StoreController < ApplicationController
+    include Spree::Core::ControllerHelpers::Auth
+    include Spree::Core::ControllerHelpers::Common
+    include Spree::Core::ControllerHelpers::Search
+    include Spree::Core::ControllerHelpers::Store
+    include Spree::Core::ControllerHelpers::StrongParameters
+    include Spree::Core::ControllerHelpers::Locale
+    include Spree::Core::ControllerHelpers::Currency
     include Spree::Core::ControllerHelpers::Order
     include Spree::LocaleUrls
 
+    respond_to :html
+
+    helper 'spree/base'
     helper 'spree/locale'
     helper 'spree/currency'
 
@@ -50,5 +60,19 @@ module Spree
     def store_last_modified
       (current_store.updated_at || Time.current).utc
     end
+
+    def redirect_unauthorized_access
+      if try_spree_current_user
+        flash[:error] = Spree.t(:authorization_failure)
+        redirect_to spree.forbidden_path
+      else
+        store_location
+        if respond_to?(:spree_login_path)
+          redirect_to spree_login_path
+        else
+          redirect_to spree.root_path
+        end
+      end
+    end
   end
 end

data/app/controllers/spree/taxons_controller.rb

@@ -6,8 +6,6 @@ module Spree
 
     before_action :load_taxon
 
-    respond_to :html
-
     def show
       if !http_cache_enabled? || stale?(etag: etag, last_modified: last_modified, public: true)
         load_products
@@ -32,11 +30,17 @@ module Spree
     end
 
     def load_taxon
-      @taxon = Spree::Taxon.friendly.find(params[:id])
+      @taxon = current_store.taxons.friendly.find(params[:id])
     end
 
     def load_products
-      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
+      search_params = params.merge(
+        current_store: current_store,
+        taxon: @taxon,
+        include_images: true
+      )
+
+      @searcher = build_searcher(search_params)
       @products = @searcher.retrieve_products
     end
 
@@ -57,7 +61,10 @@ module Spree
     end
 
     def last_modified
-      @taxon.updated_at&.utc
+      taxon_last_modified = @taxon&.updated_at&.utc
+      current_store_last_modified = current_store.updated_at.utc
+
+      [taxon_last_modified, current_store_last_modified].compact.max
     end
   end
 end

data/app/helpers/spree/addresses_helper.rb

@@ -22,7 +22,7 @@ module Spree
     end
 
     def address_zipcode(form, country, address_id = 'b')
-      country ||= Spree::Country.default
+      country ||= address_default_country
       is_required = country.zipcode_required?
       method_name = Spree.t(:zipcode)
       required = Spree.t(:required)
@@ -38,7 +38,7 @@ module Spree
     end
 
     def address_state(form, country, address_id = 'b')
-      country ||= Spree::Country.find(Spree::Config[:default_country_id])
+      country ||= address_default_country
       have_states = country.states.any?
       state_elements = [
         form.collection_select(:state_id, checkout_zone_applicable_states_for(country).sort_by(&:name),
@@ -60,8 +60,9 @@ module Spree
                     class: [!have_states ? 'hidden' : nil, 'position-absolute spree-flat-select-arrow'].compact)
       ].join.tr('"', "'").delete("\n")
 
-      content_tag(:noscript, form.text_field(:state_name)) +
-        javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
+      content_tag :span, class: 'd-block position-relative' do
+        state_elements.html_safe
+      end
     end
 
     def user_available_addresses
@@ -80,5 +81,9 @@ module Spree
     def checkout_zone_applicable_states_for(country)
       current_store.states_available_for_checkout(country)
     end
+
+    def address_default_country
+      @address_default_country ||= current_store.default_country
+    end
   end
 end

data/app/helpers/spree/cms_pages_helper.rb

@@ -0,0 +1,23 @@
+module Spree
+  module CmsPagesHelper
+    def simple_page?(page)
+      page.content.present? && !page.sections?
+    end
+
+    def section_tags(section, &block)
+      inner_content = content_tag(:div, class: section.css_classes, &block)
+
+      if section.fullscreen?
+        inner_content
+      else
+        content_tag(:div, inner_content, class: 'container')
+      end
+    end
+
+    def build_section(section)
+      section_tags(section) do
+        render "spree/shared/cms/sections/#{spree_resource_path(section)}", section: section
+      end
+    end
+  end
+end

data/app/helpers/spree/frontend_helper.rb

@@ -1,5 +1,6 @@
 module Spree
   module FrontendHelper
+    include BaseHelper
     include InlineSvg::ActionView::Helpers
 
     def body_class
@@ -7,6 +8,22 @@ module Spree
       @body_class
     end
 
+    def logo(image_path = nil, options = {})
+      image_path ||= if current_store.logo.attached? && current_store.logo.variable?
+                       main_app.url_for(current_store.logo.variant(resize: '244x104>'))
+                     elsif current_store.logo.attached? && current_store.logo.image?
+                       main_app.url_for(current_store.logo)
+                     else
+                       Spree::Config[:logo]
+                     end
+
+      path = spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
+
+      link_to path, 'aria-label': current_store.name, method: options[:method] do
+        image_tag image_path, alt: current_store.name, title: current_store.name
+      end
+    end
+
     def spree_breadcrumbs(taxon, _separator = '', product = nil)
       return '' if current_page?('/') || taxon.nil?
 
@@ -137,10 +154,10 @@ module Spree
     end
 
     def asset_exists?(path)
-      if Rails.env.production?
-        Rails.application.assets_manifest.find_sources(path).present?
+      if Rails.configuration.assets.compile
+        Rails.application.precompiled_assets.include? path
       else
-        Rails.application.assets.find_asset(path).present?
+        Rails.application.assets_manifest.assets[path].present?
       end
     end
 
@@ -150,7 +167,7 @@ module Spree
       image_url = if image.present?
                     main_app.url_for(image.url('plp'))
                   else
-                    asset_path('noimage/plp.png')
+                    asset_path('noimage/plp.svg')
                   end
 
       image_style = image&.style(:plp)
@@ -228,6 +245,11 @@ module Spree
     end
 
     def price_filter_values
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        `FrontendHelper#price_filter_values` is deprecated and will be removed in Spree 5.0.
+        Please use `ProductsFiltersHelper#price_filters` method
+      DEPRECATION
+
       @price_filter_values ||= [
         "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{formatted_price(50)}",
         "#{formatted_price(50)} - #{formatted_price(100)}",
@@ -250,18 +272,81 @@ module Spree
     end
 
     def filtering_params_cache_key
-      @filtering_params_cache_key ||= params.permit(*filtering_params)&.reject { |_, v| v.blank? }&.to_param
+      @filtering_params_cache_key ||= begin
+        cache_key_parts = []
+
+        permitted_products_params.each do |key, value|
+          next if value.blank?
+
+          if value.is_a?(String)
+            cache_key_parts << [key, value].join('-')
+          else
+            value.each do |part_key, part_value|
+              next if part_value.blank?
+
+              cache_key_parts << [part_key, part_value].join('-')
+            end
+          end
+        end
+
+        cache_key_parts.join('-').parameterize
+      end
+    end
+
+    def filters_cache_key(kind)
+      base_cache_key + [
+        kind,
+        available_option_types_cache_key,
+        available_properties_cache_key,
+        filtering_params_cache_key,
+        @taxon&.id,
+        params[:menu_open]
+      ].flatten
+    end
+
+    def permitted_products_params
+      @permitted_products_params ||= begin
+        params.permit(*filtering_params, properties: available_properties.map(&:filter_param))
+      end
+    end
+
+    def option_type_cache_key(option_type)
+      filter_param = option_type.filter_param
+      filtered_params = params[filter_param]
+
+      [
+        available_option_types_cache_key,
+        filter_param,
+        filtered_params
+      ]
     end
 
     def available_option_types_cache_key
-      @available_option_types_cache_key ||= Spree::OptionType.filterable.maximum(:updated_at)&.utc&.to_i
+      @available_option_types_cache_key ||= [
+        Spree::OptionType.filterable.maximum(:updated_at).to_f,
+        products_for_filters_cache_key
+      ].flatten.join('/')
     end
 
     def available_option_types
       @available_option_types ||= Rails.cache.fetch("available-option-types/#{available_option_types_cache_key}") do
-        Spree::OptionType.includes(:option_values).filterable.to_a
+        option_values = OptionValues::FindAvailable.new(products_scope: products_for_filters).execute
+        Filters::OptionsPresenter.new(option_values_scope: option_values).to_a
+      end
+    end
+
+    def available_properties_cache_key
+      @available_properties_cache_key ||= [
+        Spree::Property.filterable.maximum(:updated_at).to_f,
+        products_for_filters_cache_key
+      ].flatten.join('/')
+    end
+
+    def available_properties
+      @available_properties ||= Rails.cache.fetch("available-properties/#{available_properties_cache_key}") do
+        product_properties = ProductProperties::FindAvailable.new(products_scope: products_for_filters).execute
+        Filters::PropertiesPresenter.new(product_properties_scope: product_properties).to_a
       end
-      @available_option_types
     end
 
     def spree_social_link(service)
@@ -275,7 +360,7 @@ module Spree
     end
 
     def checkout_available_payment_methods
-      @checkout_available_payment_methods ||= @order.available_payment_methods(current_store)
+      @checkout_available_payment_methods ||= @order.available_payment_methods
     end
 
     def color_option_type_name
@@ -305,7 +390,7 @@ module Spree
     end
 
     def checkout_edit_link(step = 'address', order = @order)
-      return if order.complete?
+      return if order.uneditable?
 
       classes = 'align-text-bottom checkout-confirm-delivery-informations-link'
 
@@ -313,5 +398,19 @@ module Spree
         inline_svg_tag 'edit.svg'
       end
     end
+
+    def products_for_filters
+      @products_for_filters ||= current_store.products.for_filters(current_currency, taxon: @taxon)
+    end
+
+    def products_for_filters_cache_key
+      @products_for_filters_cache_key ||= begin
+        [
+          products_for_filters.maximum(:updated_at).to_f,
+          base_cache_key,
+          @taxon&.permalink
+        ].flatten.compact
+      end
+    end
   end
 end