spree_core 4.2.0.rc4 → 4.2.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661697daa0303090a2d39f0b439929bf8b54e59722ad738cee547487ba27aaf2
-  data.tar.gz: 8de83da0c8c3aa629f8389e40c63c178391d5a51a370da3595f0e1ce6edf431f
+  metadata.gz: 3d0f9d56b3e68e0ff69cfa46d00d61872b775e2e92ddf76a3eccd85899ca863b
+  data.tar.gz: 80879be83858cb06f69c5e78f975b9cbf1846941d62282290c8403bd8b509363
 SHA512:
-  metadata.gz: 1b2cffe1a5872d559bb2ff7b0361e99c3d2cf6436a57e6ba1779550fb587651316c6c031c019b8e2150feae8df15f5d04ec500ae245585b9886f5584cb89ae2c
-  data.tar.gz: 83bba2eb568b84622dd523b4b943bcfee3cba206bce126ba9cf2a094b671e53d6094e8129edc4b8d620630fccf0783f962e3311fa1d41baf149575155bd7cf4e
+  metadata.gz: 82e15e51f5847c472eac8cd4e24e549dc28705b328f082860009c638277f203adbfe42ff898105862e3385b4ed5935e102200cd247ee998b09b4b2f3912b77d3
+  data.tar.gz: c843177415698e0d50d2d9d81b2803f84713db0dfe7d9098c41a7de69cb9c1c15158d97b93a2ecc97dc62752078797adbd03436bad2a8674c87eef07ecb97e35

data/app/controllers/spree/base_controller.rb

@@ -7,7 +7,8 @@ class Spree::BaseController < ApplicationController
   include Spree::Core::ControllerHelpers::Search
   include Spree::Core::ControllerHelpers::Store
   include Spree::Core::ControllerHelpers::StrongParameters
-  include Spree::Core::ControllerHelpers::CurrencyHelpers
+  include Spree::Core::ControllerHelpers::Locale
+  include Spree::Core::ControllerHelpers::Currency
 
   respond_to :html
 end

data/app/controllers/spree/errors_controller.rb

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

data/app/finders/spree/orders/find_current.rb

@@ -9,7 +9,7 @@ module Spree
         return order unless order.nil?
         return if user.nil?
 
-        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user)
+        incomplete_orders.order(created_at: :desc).find_by(store: store, user: user, currency: params[:currency])
       end
 
       private

data/app/finders/spree/products/find.rb

@@ -22,6 +22,7 @@ module Spree
         products = by_ids(scope)
         products = by_skus(products)
         products = by_price(products)
+        products = by_currency(products)
         products = by_taxons(products)
         products = by_concat_taxons(products)
         products = by_name(products)
@@ -51,6 +52,10 @@ module Spree
         price.present?
       end
 
+      def currency?
+        currency.present?
+      end
+
       def taxons?
         taxons.present?
       end
@@ -94,7 +99,7 @@ module Spree
       def by_price(products)
         return products unless price?
 
-        products.joins(master: :default_price).
+        products.joins(master: :prices).
           where(
             spree_prices: {
               amount: price.min..price.max,
@@ -103,6 +108,12 @@ module Spree
           )
       end
 
+      def by_currency(products)
+        return products unless currency?
+
+        products.joins(master: :prices).where(spree_prices: { currency: currency })
+      end
+
       def by_taxons(products)
         return products unless taxons?
 

data/app/helpers/spree/locale_helper.rb

@@ -0,0 +1,19 @@
+module Spree
+  module LocaleHelper
+    def all_locales_options
+      supported_locales_for_all_stores.map { |locale| locale_presentation(locale) }
+    end
+
+    def available_locales_options
+      available_locales.map { |locale| locale_presentation(locale) }
+    end
+
+    def locale_presentation(locale)
+      if defined?(SpreeI18n)
+        [Spree.t('i18n.this_file_language', locale: locale), locale]
+      else
+        locale.to_s == 'en' ? ['English (US)', :en] : [locale, locale]
+      end
+    end
+  end
+end

data/app/helpers/spree/products_helper.rb

@@ -35,6 +35,11 @@ module Spree
       variants_option_types_presenter(variants, product).default_variant || product.default_variant
     end
 
+    def should_display_compare_at_price?(default_variant)
+      default_variant_price = default_variant.price_in(current_currency)
+      default_variant_price.compare_at_amount.present? && (default_variant_price.compare_at_amount > default_variant_price.amount)
+    end
+
     def used_variants_options(variants, product)
       variants_option_types_presenter(variants, product).options
     end
@@ -115,19 +120,39 @@ module Spree
       ).call.to_json
     end
 
+    def product_relation_types
+      @product_relation_types ||= @product.respond_to?(:relation_types) ? @product.relation_types : []
+    end
+
+    def product_relations_by_type(relation_type)
+      return [] if product_relation_types.none? || !@product.respond_to?(:relations)
+
+      product_ids = @product.relations.where(relation_type: relation_type).pluck(:related_to_id).uniq
+
+      return [] if product_ids.empty?
+
+      Spree::Product.
+        available.not_discontinued.distinct.
+        where(id: product_ids).
+        includes(
+          :tax_category,
+          master: [
+            :prices,
+            { images: { attachment_attachment: :blob } },
+          ]
+        ).
+        limit(Spree::Config[:products_per_page])
+    end
+
     def related_products
-      return [] unless @product.respond_to?(:has_related_products?) && @product.has_related_products?(:related_products)
-
-      @related_products ||= @product.
-                            related_products.
-                            includes(
-                              :tax_category,
-                              master: [
-                                :prices,
-                                images: { attachment_attachment: :blob },
-                              ]
-                            ).
-                            limit(Spree::Config[:products_per_page])
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
+        Please use ProductsHelper#relations from now on.
+      DEPRECATION
+
+      return [] unless @product.respond_to?(:has_related_products?)
+
+      @related_products ||= relations_by_type('related_products')
     end
 
     def product_available_in_currency?

data/app/models/concerns/spree/user_payment_source.rb

@@ -9,7 +9,7 @@ module Spree
       end
 
       def payment_sources
-        credit_cards.with_payment_profile.not_expired
+        credit_cards.with_payment_profile.not_expired.where(payment_method: Spree::PaymentMethod.active)
       end
 
       def drop_payment_source(source)

data/app/models/spree/app_configuration.rb

@@ -69,7 +69,7 @@ module Spree
     preference :credit_to_new_allocation, :boolean, default: false
 
     # Multi store configurations
-    preference :show_store_selector, :boolean, default: false
+    preference :show_store_selector, :boolean, default: true
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/image.rb

@@ -15,13 +15,13 @@ module Spree
         width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(combine_options: {
-                                                     gravity: 'center',
-                                                     resize: size,
-                                                     extent: size,
-                                                     background: 'snow2',
-                                                     quality: 80
-                                                   }), only_path: true),
+          url: polymorphic_path(attachment.variant(
+                                  gravity: 'center',
+                                  resize: size,
+                                  extent: size,
+                                  background: 'snow2',
+                                  quality: 80
+                                ), only_path: true),
           width: width,
           height: height
         }
@@ -35,13 +35,13 @@ module Spree
       width, height = size.chop.split('x')
 
       {
-        url: polymorphic_path(attachment.variant(combine_options: {
-                                                   gravity: 'center',
-                                                   resize: size,
-                                                   extent: size,
-                                                   background: 'snow2',
-                                                   quality: 80
-                                                 }), only_path: true),
+        url: polymorphic_path(attachment.variant(
+                                gravity: 'center',
+                                resize: size,
+                                extent: size,
+                                background: 'snow2',
+                                quality: 80
+                              ), only_path: true),
         size: size,
         width: width,
         height: height

data/app/models/spree/product.rb

@@ -160,7 +160,7 @@ module Spree
     #
     # @return [Spree::Variant]
     def default_variant
-      Rails.cache.fetch(default_variant_cache_key) do
+      @default_variant ||= Rails.cache.fetch(default_variant_cache_key) do
         if Spree::Config[:track_inventory_levels] && variants.in_stock_or_backorderable.any?
           variants.in_stock_or_backorderable.first
         else
@@ -172,11 +172,11 @@ module Spree
     # Returns default Variant ID for Product
     # @return [Integer]
     def default_variant_id
-      default_variant.id
+      @default_variant_id ||= default_variant.id
     end
 
     def tax_category
-      super || TaxCategory.find_by(is_default: true)
+      @tax_category ||= super || TaxCategory.find_by(is_default: true)
     end
 
     # Adding properties and option types on creation based on a chosen prototype
@@ -288,11 +288,11 @@ module Spree
     end
 
     def total_on_hand
-      if any_variants_not_track_inventory?
-        Float::INFINITY
-      else
-        stock_items.sum(:count_on_hand)
-      end
+      @total_on_hand ||= if any_variants_not_track_inventory?
+                           Float::INFINITY
+                         else
+                           stock_items.sum(:count_on_hand)
+                         end
     end
 
     # Master variant may be deleted (i.e. when the product is deleted)
@@ -303,14 +303,11 @@ module Spree
     end
 
     def brand
-      taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_brands_name) })
+      @brand ||= taxons.joins(:taxonomy).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_brands_name) })
     end
 
     def category
-      taxons.joins(:taxonomy).
-        where(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) }).
-        order(depth: :desc).
-        first
+      @category ||= taxons.joins(:taxonomy).order(depth: :desc).find_by(spree_taxonomies: { name: Spree.t(:taxonomy_categories_name) })
     end
 
     private
@@ -440,12 +437,12 @@ module Spree
     end
 
     def taxon_and_ancestors
-      taxons.map(&:self_and_ancestors).flatten.uniq
+      @taxon_and_ancestors ||= taxons.map(&:self_and_ancestors).flatten.uniq
     end
 
     # Get the taxonomy ids of all taxons assigned to this product and their ancestors.
     def taxonomy_ids
-      taxon_and_ancestors.map(&:taxonomy_id).flatten.uniq
+      @taxonomy_ids ||= taxon_and_ancestors.map(&:taxonomy_id).flatten.uniq
     end
 
     # Iterate through this products taxons and taxonomies and touch their timestamps in a batch

data/app/models/spree/promotion/rules/option_value.rb

@@ -31,7 +31,7 @@ module Spree
         end
 
         def actionable?(line_item)
-          product_id = line_item.product.id
+          product_id = line_item.product_id
           option_values_ids = line_item.variant.option_value_ids
           eligible_product_ids = preferred_eligible_values.keys
           eligible_value_ids = preferred_eligible_values[product_id]

data/app/models/spree/store.rb

@@ -43,28 +43,39 @@ module Spree
       end
     end
 
+    def self.available_locales
+      Rails.cache.fetch('stores_available_locales') do
+        Spree::Store.all.map(&:supported_locales_list).flatten.uniq
+      end
+    end
+
     def supported_currencies_list
-      (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
+      @supported_currencies_list ||= (read_attribute(:supported_currencies).to_s.split(',') << default_currency).map(&:to_s).map do |code|
         ::Money::Currency.find(code.strip)
       end.uniq.compact
     end
 
+    def supported_locales_list
+      # TODO: add support of multiple supported languages to a single Store
+      @supported_locales_list ||= [default_locale].compact.uniq
+    end
+
     def unique_name
-      "#{name} (#{code})"
+      @unique_name ||= "#{name} (#{code})"
     end
 
     def formatted_url
       return if url.blank?
 
-      if url.match(/http:\/\/|https:\/\//)
-        url
-      else
-        Rails.env.development? ? "http://#{url}" : "https://#{url}"
-      end
+      @formatted_url ||= if url.match(/http:\/\/|https:\/\//)
+                           url
+                         else
+                           Rails.env.development? ? "http://#{url}" : "https://#{url}"
+                         end
     end
 
     def countries_available_for_checkout
-      checkout_zone_or_default.try(:country_list) || Spree::Country.all
+      @countries_available_for_checkout ||= checkout_zone_or_default.try(:country_list) || Spree::Country.all
     end
 
     def states_available_for_checkout(country)
@@ -72,7 +83,7 @@ module Spree
     end
 
     def checkout_zone_or_default
-      checkout_zone || Spree::Zone.default_checkout_zone
+      @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
     end
 
     private
@@ -94,6 +105,7 @@ module Spree
 
     def clear_cache
       Rails.cache.delete('default_store')
+      Rails.cache.delete('stores_available_locales')
     end
   end
 end

data/app/models/spree/variant.rb

@@ -123,15 +123,15 @@ module Spree
     end
 
     def tax_category
-      if self[:tax_category_id].nil?
-        product.tax_category
-      else
-        Spree::TaxCategory.find(self[:tax_category_id])
-      end
+      @tax_category ||= if self[:tax_category_id].nil?
+                          product.tax_category
+                        else
+                          Spree::TaxCategory.find(self[:tax_category_id])
+                        end
     end
 
     def options_text
-      Spree::Variants::OptionsPresenter.new(self).to_sentence
+      @options_text ||= Spree::Variants::OptionsPresenter.new(self).to_sentence
     end
 
     # Default to master name
@@ -226,7 +226,7 @@ module Spree
     end
 
     def compare_at_price
-      price_in(cost_currency).try(:compare_at_amount)
+      @compare_at_price ||= price_in(cost_currency).try(:compare_at_amount)
     end
 
     def name_and_sku

data/app/presenters/spree/variant_presenter.rb

@@ -2,6 +2,7 @@ module Spree
   class VariantPresenter
     include Rails.application.routes.url_helpers
     include Spree::BaseHelper
+    include Spree::ProductsHelper
 
     attr_reader :current_currency, :current_price_options, :current_store
 
@@ -19,7 +20,7 @@ module Spree
           display_price: display_price(variant),
           price: variant.price_in(current_currency),
           display_compare_at_price: display_compare_at_price(variant),
-          should_display_compare_at_price: should_display_compare_at_price(variant),
+          should_display_compare_at_price: should_display_compare_at_price?(variant),
           is_product_available_in_currency: @is_product_available_in_currency,
           backorderable: backorderable?(variant),
           in_stock: in_stock?(variant),
@@ -75,9 +76,5 @@ module Spree
         purchasable: variant.purchasable?
       }
     end
-
-    def should_display_compare_at_price(variant)
-      variant.compare_at_price.present? && variant.compare_at_price > variant.price
-    end
   end
 end

data/app/services/spree/cart/estimate_shipping_rates.rb

@@ -24,7 +24,7 @@ module Spree
         if country_iso.present?
           ::Spree::Country.by_iso(country_iso)&.id
         else
-          ::Spree::Country.default.id
+          Spree::Config[:default_country_id]
         end
       end
 

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

@@ -249,11 +249,9 @@
     color: #51545E;
     font-size: 15px;
     line-height: 18px;
-    width: 62%;
   }
 
   .purchase_image {
-    width: 18%;
     padding: 5px;
   }
 

data/app/views/spree/shared/purchased_items_table/_line_item.html.erb

@@ -20,7 +20,7 @@
   </td>
   <td class="align-right">
     <span class="f-fallback purchase_item_price">
-      <%= line_item.quantity %> x <%= line_item.single_money %>
+      <%= line_item.quantity %> x <%= line_item.single_money %><br>
       <%= line_item.display_amount %>
     </span>
   </td>

data/config/locales/en.yml

@@ -663,7 +663,6 @@ en:
       jackets_and_coats: JACKET & COASTS
       new_collection: NEW COLLECTION
       special_offers: SPECIAL OFFERS
-      summer_2019: SUMMER 2019
     channel: Channel
     charged: Charged
     checkout: Checkout
@@ -760,38 +759,10 @@ en:
     date: Date
     date_completed: Date Completed
     date_picker:
-      am: 'AM'
       first_day: 0
       format: ! '%Y/%m/%d'
-      hourAriaLabel: 'Hour'
       js_format: Y/m/d
       js_date_time: Y/m/d - H:i
-      minuteAriaLabel: 'Minute'
-      pm: 'PM'
-      rangeSeparator: ' to '
-      scrollTitle: 'Scroll to increment'
-      toggleTitle: 'Click to toggle'
-      weekAbbreviation: 'Wk'
-      yearAriaLabel: 'Year'
-      sun: 'Sun'
-      mon: 'Mon'
-      tue: 'Tue'
-      wed: 'Wed'
-      thu: 'Thu'
-      fri: 'Fri'
-      sat: 'Sat'
-      lh_jan: 'January'
-      lh_feb: 'February'
-      lh_mar: 'March'
-      lh_apr: 'April'
-      lh_may: 'May'
-      lh_jun: 'June'
-      lh_jul: 'July'
-      lh_aug: 'August'
-      lh_sep: 'September'
-      lh_oct: 'October'
-      lh_nov: 'November'
-      lh_dec: 'December'
     date_range: Date Range
     default: Default
     default_country_cannot_be_deleted: Default country cannot be deleted
@@ -926,24 +897,6 @@ en:
     hide_from_subcategories_nav: Hide from subcategories navigation
     home: Home
     home_page: homepage
-    homepage:
-      bestsellers: BESTSELLERS
-      fashion_trends: FASHION TRENDS
-      fashion_trends_note: Want to rock this season’s hottest trend in style? These are the top fashion from Summer 2020 Fashion Weeks that are coming our way this season.
-      men: MEN
-      new: NEW
-      new_collection: NEW COLLECTION
-      read_more: READ MORE
-      shoes: SHOES
-      shop_now: SHOP NOW
-      sportswear: SPORTSWEAR
-      streetstyle: STREETSTYLE
-      summer_2020: Summer 2020
-      summer_collection:  Summer Collection
-      summer_sale: SUMMER SALE
-      trending: TRENDING
-      up_to_60: UP TO 60%
-      women: WOMEN
     help_center: Help Center
     i18n:
       available_locales: Available Locales

data/config/routes.rb

@@ -1,5 +1,6 @@
 Spree::Core::Engine.add_routes do
-  get '/forbidden', to: 'home#forbidden', as: :forbidden
+  get '/forbidden', to: 'errors#forbidden', as: :forbidden
+  get '/unauthorized', to: 'errors#unauthorized', as: :unauthorized
 end
 
 Spree::Core::Engine.draw_routes

data/db/default/spree/stores.rb

@@ -11,6 +11,7 @@ else
     s.customer_support_email       = 'support@example.com'
     s.default_currency             = 'USD'
     s.default_country_id           = Spree::Config[:default_country_id]
+    s.default_locale               = I18n.locale
     s.seo_title                    = 'Spree Commerce Demo Shop'
     s.meta_description             = 'This is the new Spree UX DEMO | OVERVIEW: http://bit.ly/new-spree-ux | DOCS: http://bit.ly/spree-ux-customization-docs | CONTACT: https://spreecommerce.org/contact/'
     s.facebook                     = 'spreecommerce'

data/db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb

@@ -0,0 +1,5 @@
+class EnsureDefaultLocaleInSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    Spree::Store.where(default_locale: nil).update_all(default_locale: I18n.locale)
+  end
+end

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -18,12 +18,12 @@ default:
           :url: /t/women/jackets-and-coats
       promo_banners:
         - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
           image: 'meganav/promo_banner_left-first-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers/30-off
+          url: /t/special-offers/30-percent-off
           image: 'meganav/promo_banner_right-first-category.jpg'
     - title: Men
       subtitle: Categories
@@ -39,12 +39,12 @@ default:
           :url: /t/men/jackets-and-coats
       promo_banners:
         - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
           image: 'meganav/promo_banner_left-second-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers/30-off
+          url: /t/special-offers/30-percent-off
           image: 'meganav/promo_banner_right-second-category.jpg'
     - title: Sportswear
       subtitle: Categories
@@ -58,10 +58,10 @@ default:
           :url: /t/sportswear/pants
       promo_banners:
         - subtitle: New collection
-          title: Summer 2019
-          url: /t/new-collection/summer-2019
+          title: Summer 2021
+          url: /t/new-collection/summer-2021
           image: 'meganav/promo_banner_left-third-category.jpg'
         - subtitle: Special Offers
           title: Get up to 30% off
-          url: /t/special-offers/30-off
+          url: /t/special-offers/30-percent-off
           image: 'meganav/promo_banner_right-third-category.jpg'

data/lib/spree/core.rb

@@ -105,4 +105,5 @@ require 'spree/core/controller_helpers/order'
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/controller_helpers/currency_helpers'
+require 'spree/core/controller_helpers/locale'
+require 'spree/core/controller_helpers/currency'

data/lib/spree/core/controller_helpers/auth.rb

@@ -76,7 +76,9 @@ module Spree
             redirect_to spree.forbidden_path
           else
             store_location
-            if respond_to?(:spree_login_path)
+            if request.fullpath.match(Spree.admin_path) && defined?(spree.admin_login_path)
+              redirect_to spree.admin_login_path
+            elsif respond_to?(:spree_login_path)
               redirect_to spree_login_path
             elsif spree.respond_to?(:root_path)
               redirect_to spree.root_path

data/lib/spree/core/controller_helpers/common.rb

@@ -10,8 +10,6 @@ module Spree
 
           layout :get_layout
 
-          before_action :set_user_language
-
           protected
 
           # can be used in views as well as controllers.
@@ -43,12 +41,12 @@ module Spree
           private
 
           def set_user_language
-            locale = session[:locale]
-            locale = store_locale if respond_to?(:store_locale, true) && locale.blank?
-            locale = config_locale if respond_to?(:config_locale, true) && locale.blank?
-            locale = Rails.application.config.i18n.default_locale if locale.blank?
-            locale = I18n.default_locale unless I18n.available_locales.map(&:to_s).include?(locale.to_s)
-            I18n.locale = locale
+            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+              ControllerHelpers::Common#set_user_language is deprecated and will be removed in Spree 5.0.
+              Please use `before_action :set_locale` instead
+            DEPRECATION
+
+            set_locale
           end
 
           # Returns which layout to render.

data/lib/spree/core/controller_helpers/currency.rb

@@ -0,0 +1,45 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Currency
+        extend ActiveSupport::Concern
+
+        included do
+          helper_method :supported_currencies
+          helper_method :supported_currencies_for_all_stores
+          helper_method :current_currency
+          helper_method :supported_currency?
+        end
+
+        def current_currency
+          # session support was previously in SpreeMultiCurrency so we would like
+          # to keep it for now
+          @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
+                                  session[:currency]
+                                elsif params[:currency].present? && supported_currency?(params[:currency])
+                                  params[:currency]
+                                else
+                                  current_store.default_currency
+                                end
+        end
+
+        def supported_currencies
+          @supported_currencies ||= current_store.supported_currencies_list
+        end
+
+        def supported_currencies_for_all_stores
+          @supported_currencies_for_all_stores ||= begin
+            (
+              Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)
+            ).
+              compact.uniq.map { |code| ::Money::Currency.find(code.strip) }
+          end
+        end
+
+        def supported_currency?(currency_iso_code)
+          supported_currencies.map(&:iso_code).include?(currency_iso_code)
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/locale.rb

@@ -0,0 +1,57 @@
+module Spree
+  module Core
+    module ControllerHelpers
+      module Locale
+        extend ActiveSupport::Concern
+
+        included do
+          before_action :set_locale
+
+          helper_method :supported_locales
+          helper_method :supported_locales_for_all_stores
+          helper_method :current_locale
+          helper_method :supported_locale?
+          helper_method :available_locales
+        end
+
+        def set_locale
+          I18n.locale = current_locale
+        end
+
+        def current_locale
+          # session support was previously in SpreeI18n so we would like to keep it for now
+          # for easer upgrade
+          @current_locale ||= if defined?(session) && session.key?(:locale) && supported_locale?(session[:locale])
+                                session[:locale]
+                              elsif params[:locale].present? && supported_locale?(params[:locale])
+                                params[:locale]
+                              elsif respond_to?(:config_locale, true) && config_locale.present?
+                                config_locale
+                              else
+                                current_store.default_locale || Rails.application.config.i18n.default_locale || I18n.default_locale
+                              end
+        end
+
+        def supported_locales
+          @supported_locales ||= current_store.supported_locales_list
+        end
+
+        def supported_locale?(locale_code)
+          supported_locales.include?(locale_code&.to_s)
+        end
+
+        def supported_locales_for_all_stores
+          @supported_locales_for_all_stores ||= (if defined?(SpreeI18n)
+                                                   (SpreeI18n::Locale.all << :en).map(&:to_s)
+                                                 else
+                                                   [Rails.application.config.i18n.default_locale, I18n.locale, :en]
+                                                 end).uniq.compact
+        end
+
+        def available_locales
+          Spree::Store.available_locales
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/controller_helpers/store.rb

@@ -5,26 +5,10 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :supported_currencies
-          helper_method :current_currency
           helper_method :current_store
           helper_method :current_price_options
         end
 
-        def current_currency
-          if defined?(session) && session.key?(:currency) && supported_currencies.map(&:iso_code).include?(session[:currency])
-            session[:currency]
-          elsif params[:currency].present? && supported_currencies.map(&:iso_code).include?(params[:currency])
-            params[:currency]
-          else
-            current_store.default_currency
-          end
-        end
-
-        def supported_currencies
-          current_store.supported_currencies_list
-        end
-
         def current_store
           @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
         end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.2.0.rc4'
+    '4.2.0.rc5'
   end
 end

data/lib/spree/testing_support/factories/stock_location_factory.rb

@@ -20,8 +20,8 @@ FactoryBot.define do
         product_1 = create(:product)
         product_2 = create(:product)
 
-        stock_location.stock_items.where(variant_id: product_1.master.id).first.adjust_count_on_hand(10)
-        stock_location.stock_items.where(variant_id: product_2.master.id).first.adjust_count_on_hand(20)
+        stock_location.stock_items.where(variant_id: product_1.master_id).first.adjust_count_on_hand(10)
+        stock_location.stock_items.where(variant_id: product_2.master_id).first.adjust_count_on_hand(20)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.2.0.rc4
+  version: 4.2.0.rc5
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -447,6 +447,7 @@ files:
 - app/assets/images/noimage/small.png
 - app/assets/javascripts/spree.js
 - app/controllers/spree/base_controller.rb
+- app/controllers/spree/errors_controller.rb
 - app/finders/spree/addresses/find.rb
 - app/finders/spree/base_finder.rb
 - app/finders/spree/countries/find.rb
@@ -459,6 +460,7 @@ files:
 - app/finders/spree/variants/option_types_finder.rb
 - app/finders/spree/variants/visible_finder.rb
 - app/helpers/spree/base_helper.rb
+- app/helpers/spree/locale_helper.rb
 - app/helpers/spree/mail_helper.rb
 - app/helpers/spree/products_helper.rb
 - app/mailers/spree/base_mailer.rb
@@ -688,6 +690,8 @@ files:
 - app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
 - app/views/layouts/spree/base_mailer.html.erb
+- app/views/spree/errors/forbidden.html.erb
+- app/views/spree/errors/unauthorized.html.erb
 - app/views/spree/order_mailer/cancel_email.html.erb
 - app/views/spree/order_mailer/cancel_email.text.erb
 - app/views/spree/order_mailer/confirm_email.html.erb
@@ -1014,6 +1018,7 @@ files:
 - db/migrate/20210114182625_create_spree_payment_methods_stores.rb
 - db/migrate/20210114220232_migrate_data_payment_methods_stores.rb
 - db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb
+- db/migrate/20210120142527_ensure_default_locale_in_spree_stores.rb
 - db/seeds.rb
 - lib/friendly_id/slug_rails5_patch.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -1049,7 +1054,8 @@ files:
 - lib/spree/core/components.rb
 - lib/spree/core/controller_helpers/auth.rb
 - lib/spree/core/controller_helpers/common.rb
-- lib/spree/core/controller_helpers/currency_helpers.rb
+- lib/spree/core/controller_helpers/currency.rb
+- lib/spree/core/controller_helpers/locale.rb
 - lib/spree/core/controller_helpers/order.rb
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
@@ -1164,9 +1170,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc5
   documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc4
+  source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc5
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/spree/core/controller_helpers/currency_helpers.rb

@@ -1,15 +0,0 @@
-module Spree
-  module Core
-    module ControllerHelpers
-      module CurrencyHelpers
-        def self.included(receiver)
-          receiver.send :helper_method, :supported_currencies
-        end
-
-        def supported_currencies
-          current_store.supported_currencies_list
-        end
-      end
-    end
-  end
-end