spree_frontend 4.2.0.rc3 → 4.2.2

data/app/controllers/spree/currency_controller.rb

@@ -1,16 +1,16 @@
 module Spree
   class CurrencyController < StoreController
     def set
-      @currency = supported_currencies.find { |currency| currency.iso_code == params[:currency] }
-      # Make sure that we update the current order, so the currency change is reflected.
-      current_order&.update(currency: @currency.iso_code)
-      session[:currency] = params[:currency] if Spree::Config[:show_store_currency_selector]
+      new_currency = params[:switch_to_currency]&.upcase
+
+      if new_currency.present? && supported_currency?(new_currency)
+        current_order&.update(currency: new_currency)
+        session[:currency] = new_currency
+      end
+
       respond_to do |format|
-        format.json { render json: !@currency.nil? }
-        format.html do
-          # We want to go back to where we came from!
-          redirect_back_or_default(root_path)
-        end
+        format.html { redirect_back fallback_location: spree.root_path(currency: new_currency) }
+        format.json { head :ok }
       end
     end
   end

data/app/controllers/spree/home_controller.rb

@@ -1,9 +1,13 @@
 module Spree
   class HomeController < Spree::StoreController
+    include Spree::CacheHelper
+
     respond_to :html
 
     def index
-      fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+      if http_cache_enabled?
+        fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+      end
     end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -1,14 +1,31 @@
 module Spree
   class LocaleController < Spree::StoreController
+    def index
+      render :index, layout: false
+    end
+
     def set
-      session['user_return_to'] = request.referer if request.referer&.starts_with?('http://' + request.host)
-      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
-        session[:locale] = I18n.locale = params[:locale]
-        flash.notice = Spree.t(:locale_changed)
+      new_locale = (params[:switch_to_locale] || params[:locale]).to_s
+
+      if new_locale.present? && supported_locale?(new_locale)
+        if should_build_new_url?
+          redirect_to BuildLocalizedRedirectUrl.call(
+            url: request.env['HTTP_REFERER'],
+            locale: new_locale,
+            default_locale: current_store.default_locale
+          ).value
+        else
+          redirect_to root_path(locale: new_locale)
+        end
       else
-        flash[:error] = Spree.t(:locale_not_changed)
+        redirect_to root_path
       end
-      redirect_back_or_default(spree.root_path)
+    end
+
+    private
+
+    def should_build_new_url?
+      request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -20,9 +20,9 @@ module Spree
           format.html do
             if params.key?(:checkout)
               @order.next if @order.cart?
-              redirect_to checkout_state_path(@order.checkout_steps.first)
+              redirect_to spree.checkout_state_path(@order.checkout_steps.first)
             else
-              redirect_to cart_path
+              redirect_to spree.cart_path
             end
           end
         end

data/app/controllers/spree/products_controller.rb

@@ -2,6 +2,7 @@ module Spree
   class ProductsController < Spree::StoreController
     include Spree::ProductsHelper
     include Spree::FrontendHelper
+    include Spree::CacheHelper
 
     before_action :load_product, only: [:show, :related]
     before_action :load_taxon, only: :index
@@ -12,7 +13,9 @@ module Spree
       @searcher = build_searcher(params.merge(include_images: true, current_store_id: current_store.id))
       @products = @searcher.retrieve_products
 
-      fresh_when etag: etag_index, last_modified: last_modified_index, public: true
+      if http_cache_enabled?
+        fresh_when etag: etag_index, last_modified: last_modified_index, public: true
+      end
     end
 
     def show
@@ -20,7 +23,7 @@ module Spree
 
       @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
 
-      if stale?(etag: etag_show, last_modified: last_modified_show, public: true)
+      if !http_cache_enabled? || stale?(etag: etag_show, last_modified: last_modified_show, public: true)
         @product_summary = Spree::ProductSummaryPresenter.new(@product).call
         @product_properties = @product.product_properties.includes(:property)
         @product_price = @product.price_in(current_currency).amount
@@ -30,9 +33,7 @@ module Spree
     end
 
     def related
-      @related_products = related_products
-
-      if @related_products.any?
+      if product_relation_types.any?
         render template: 'spree/products/related', layout: false
       else
         head :no_content

data/app/controllers/spree/store_controller.rb

@@ -1,25 +1,23 @@
 module Spree
   class StoreController < Spree::BaseController
     include Spree::Core::ControllerHelpers::Order
+    include Spree::LocaleUrls
 
-    skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
+    helper 'spree/locale'
+    helper 'spree/currency'
 
-    def forbidden
-      render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403
-    end
+    skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
-    def unauthorized
-      render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
-    end
+    before_action :redirect_to_default_locale
 
     def account_link
       render partial: 'spree/shared/link_to_account'
-      fresh_when(try_spree_current_user)
+      fresh_when(etag: [try_spree_current_user, I18n.locale])
     end
 
     def cart_link
       render partial: 'spree/shared/link_to_cart'
-      fresh_when(simple_current_order)
+      fresh_when(etag: [simple_current_order, I18n.locale])
     end
 
     def api_tokens
@@ -39,16 +37,14 @@ module Spree
       Spree::Frontend::Config[:locale]
     end
 
-    def store_locale
-      current_store.default_locale
-    end
-
     def store_etag
       [
         current_store,
         current_currency,
-        I18n.locale
-      ]
+        I18n.locale,
+        try_spree_current_user.present?,
+        try_spree_current_user.try(:has_spree_role?, 'admin')
+      ].compact
     end
 
     def store_last_modified

data/app/controllers/spree/taxons_controller.rb

@@ -1,6 +1,7 @@
 module Spree
   class TaxonsController < Spree::StoreController
     include Spree::FrontendHelper
+    include Spree::CacheHelper
     helper 'spree/products'
 
     before_action :load_taxon
@@ -8,13 +9,13 @@ module Spree
     respond_to :html
 
     def show
-      if stale?(etag: etag, last_modified: last_modified, public: true)
+      if !http_cache_enabled? || stale?(etag: etag, last_modified: last_modified, public: true)
         load_products
       end
     end
 
     def product_carousel
-      if stale?(etag: carousel_etag, last_modified: last_modified, public: true)
+      if !http_cache_enabled? || stale?(etag: carousel_etag, last_modified: last_modified, public: true)
         load_products
         if @products.reload.any?
           render template: 'spree/taxons/product_carousel', layout: false

data/app/helpers/spree/addresses_helper.rb

@@ -65,9 +65,16 @@ module Spree
     end
 
     def user_available_addresses
-      return unless try_spree_current_user
+      @user_available_addresses ||= begin
+        return [] unless try_spree_current_user
 
-      try_spree_current_user.addresses.where(country: available_countries)
+        states = current_store.countries_available_for_checkout.each_with_object([]) do |country, memo|
+          memo << current_store.states_available_for_checkout(country)
+        end.flatten
+
+        try_spree_current_user.addresses.
+          where(country_id: states.pluck(:country_id).uniq)
+      end
     end
 
     def checkout_zone_applicable_states_for(country)

data/app/helpers/spree/cache_helper.rb

@@ -0,0 +1,7 @@
+module Spree
+  module CacheHelper
+    def http_cache_enabled?
+      @http_cache_enabled ||= Spree::Frontend::Config[:http_cache_enabled]
+    end
+  end
+end

data/app/helpers/spree/frontend_helper.rb

@@ -7,26 +7,6 @@ module Spree
       @body_class
     end
 
-    def store_country_iso(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_country
-
-      store.default_country.iso.downcase
-    end
-
-    def stores
-      @stores ||= Spree::Store.includes(:default_country)
-    end
-
-    def store_currency_symbol(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_currency
-
-      ::Money::Currency.find(store.default_currency).symbol
-    end
-
     def spree_breadcrumbs(taxon, _separator = '', product = nil)
       return '' if current_page?('/') || taxon.nil?
 
@@ -248,7 +228,7 @@ module Spree
     end
 
     def price_filter_values
-      [
+      @price_filter_values ||= [
         "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{formatted_price(50)}",
         "#{formatted_price(50)} - #{formatted_price(100)}",
         "#{formatted_price(101)} - #{formatted_price(150)}",
@@ -295,7 +275,17 @@ module Spree
     end
 
     def checkout_available_payment_methods
-      @order.available_payment_methods(current_store)
+      @checkout_available_payment_methods ||= @order.available_payment_methods(current_store)
+    end
+
+    def color_option_type_name
+      @color_option_type_name ||= Spree::OptionType.color&.name
+    end
+
+    def country_flag_icon(country_iso_code = nil)
+      return if country_iso_code.blank?
+
+      content_tag :span, nil, class: "flag-icon flag-icon-#{country_iso_code.downcase}"
     end
 
     private
@@ -314,7 +304,9 @@ module Spree
       end
     end
 
-    def checkout_edit_link(step = 'address')
+    def checkout_edit_link(step = 'address', order = @order)
+      return if order.complete?
+
       classes = 'align-text-bottom checkout-confirm-delivery-informations-link'
 
       link_to spree.checkout_state_path(step), class: classes, method: :get do

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
+      @spree_navigation_data ||= SpreeStorefrontConfig.dig(I18n.locale, :navigation) || SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
     # safeguard for older Spree installs that don't have spree_navigation initializer
     # or spree.yml file present
     rescue
@@ -28,6 +28,11 @@ module Spree
       )
     end
 
+    def should_render_internationalization_dropdown?
+      (defined?(should_render_locale_dropdown?) && should_render_locale_dropdown?) ||
+        (defined?(should_render_currency_dropdown?) && should_render_currency_dropdown?)
+    end
+
     private
 
     def spree_navigation_data_cache_key

data/app/helpers/spree/store_helper.rb

@@ -0,0 +1,39 @@
+module Spree
+  module StoreHelper
+    def store_country_iso(store = nil)
+      store ||= current_store if defined?(current_store)
+
+      store&.default_country&.iso&.downcase
+    end
+
+    def stores
+      @stores ||= Spree::Store.includes(:default_country).order(:id)
+    end
+
+    def store_currency_symbol(store = nil)
+      store ||= current_store  if defined?(current_store)
+      return unless store&.default_currency
+
+      ::Money::Currency.find(store.default_currency).symbol
+    end
+
+    def store_locale_name(store = nil)
+      store ||= current_store if defined?(current_store)
+      return unless store
+      return store.name if store.default_locale.blank?
+
+      Spree.t('i18n.this_file_language', locale: store.default_locale)
+    end
+
+    def should_render_store_chooser?
+      Spree::Config.show_store_selector && stores.size > 1
+    end
+
+    def store_link(store = nil, html_opts = {})
+      store ||= current_store if defined?(current_store)
+      return unless store
+
+      link_to "#{store_locale_name(store)} (#{store_currency_symbol(store)})", store.formatted_url, **html_opts
+    end
+  end
+end

data/app/helpers/spree/taxons_helper.rb

@@ -5,7 +5,7 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        TaxonsHelper is deprecated and will be removed in Spree 4.2.
+        TaxonsHelper is deprecated and will be removed in Spree 5.0.
         Please remove any `helper 'spree/taxons'` from your controllers.
       DEPRECATION
       products = taxon.active_products.distinct.select('spree_products.*, spree_products_taxons.position').limit(max)

data/app/models/spree/frontend_configuration.rb

@@ -1,7 +1,8 @@
 module Spree
   class FrontendConfiguration < Preferences::Configuration
     preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :http_cache_enabled, :boolean, default: true
+    preference :locale, :string, default: nil
     preference :products_filters, :array, default: %w(keywords price sort_by)
     preference :additional_filters_partials, :array, default: %w()
     preference :remember_me_enabled, :boolean, default: true

data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="first page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>

data/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb

@@ -3,8 +3,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page gap disabled page-item d-none d-lg-flex">
   <a href="#" onclick="return false;" class="page-link">
     <%= raw(t 'views.pagination.truncate') %>

data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>

data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="next_page page-item">
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>

data/app/views/kaminari/twitter-bootstrap-4/_page.html.erb

@@ -5,8 +5,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page<%= ' active' if page.current? %> page-item">
   <%= link_to page,
     url,