spree_core 4.2.0.rc2 → 4.2.1

data/db/migrate/20210114220232_migrate_data_payment_methods_stores.rb

@@ -0,0 +1,15 @@
+class MigrateDataPaymentMethodsStores < ActiveRecord::Migration[6.0]
+  def up
+    Spree::PaymentMethod.all.each do |payment_method|
+      next if payment_method.store_ids.any?
+
+      if payment_method[:store_id].present?
+        payment_method.store_ids = payment_method[:store_id]
+      else
+        payment_method.store_ids = Spree::Store.ids
+      end
+
+      payment_method.save
+    end
+  end
+end

data/db/migrate/20210117112551_remove_store_id_from_spree_payment_methods.rb

@@ -0,0 +1,5 @@
+class RemoveStoreIdFromSpreePaymentMethods < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :spree_payment_methods, :store_id, :integer
+  end
+end

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/db/migrate/20210205211040_add_supported_locales_to_spree_stores.rb

@@ -0,0 +1,11 @@
+class AddSupportedLocalesToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :supported_locales)
+      add_column :spree_stores, :supported_locales, :string
+      Spree::Store.reset_column_information
+      Spree::Store.all.each do |store|
+        store.update_attribute(:supported_locales, store.default_locale)
+      end
+    end
+  end
+end

data/db/migrate/20210215202602_migrate_spree_i18n_globalize_config.rb

@@ -0,0 +1,22 @@
+class MigrateSpreeI18nGlobalizeConfig < ActiveRecord::Migration[6.0]
+  def up
+    locales = []
+
+    if defined?(SpreeI18n) && defined?(SpreeI18n::Config)
+      locales = (locales << SpreeI18n::Config[:available_locales]).flatten.uniq.compact
+    end
+
+    if defined?(SpreeGlobalize) && defined?(SpreeGlobalize::Config)
+      locales = (locales << SpreeGlobalize::Config[:supported_locales]).flatten.uniq.compact
+    end
+
+    default_store = Spree::Store.default
+    if default_store.supported_locales.blank? || default_store.supported_locales == default_store.default_locale
+      locales = (locales << default_store.default_locale).uniq.compact.join(',')
+      default_store.update(supported_locales: locales)
+    end
+  end
+
+  def down
+  end
+end

data/lib/generators/spree/install/install_generator.rb

@@ -10,7 +10,8 @@ module Spree
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :copy_storefront, type: :boolean, default: true, banner: 'copy storefront from spree frontend to your application for easy customization'
+    class_option :install_storefront, type: :boolean, default: true, banner: 'installs storefront configuration files'
+    class_option :copy_storefront, type: :boolean, default: false, banner: 'copy all storefront views and stylesheets'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -30,6 +31,7 @@ module Spree
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
+      @install_storefront = options[:install_storefront]
       @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
@@ -40,11 +42,6 @@ module Spree
 
     def add_files
       template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
-
-      if Spree::Core::Engine.frontend_available? || Rails.env.test?
-        template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
-        template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
-      end
     end
 
     def additional_tweaks
@@ -91,6 +88,12 @@ module Spree
       empty_directory 'app/overrides'
     end
 
+    def install_storefront
+      if @install_storefront && Spree::Core::Engine.frontend_available?
+        generate 'spree:frontend:install'
+      end
+    end
+
     def copy_storefront
       if @copy_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:frontend:copy_storefront'

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,54 @@
+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?
+          helper_method :currency_param
+        end
+
+        def current_currency
+          @current_currency ||= if defined?(session) && session.key?(:currency) && supported_currency?(session[:currency])
+                                  session[:currency]
+                                elsif params[:currency].present? && supported_currency?(params[:currency])
+                                  params[:currency]
+                                elsif current_store.present?
+                                  current_store.default_currency
+                                else
+                                  Spree::Config[:currency]
+                                end&.upcase
+        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)
+          return false if supported_currencies.nil?
+
+          supported_currencies.map(&:iso_code).include?(currency_iso_code.upcase)
+        end
+
+        def currency_param
+          return if current_currency == current_store.default_currency
+
+          current_currency
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,58 @@
+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
+          helper_method :locale_param
+        end
+
+        def set_locale
+          I18n.locale = current_locale
+        end
+
+        def current_locale
+          @current_locale ||= if 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)
+          return false if supported_locales.nil?
+
+          supported_locales.include?(locale_code&.to_s)
+        end
+
+        def supported_locales_for_all_stores
+          @supported_locales_for_all_stores ||= Spree.available_locales
+        end
+
+        def available_locales
+          Spree::Store.available_locales
+        end
+
+        def locale_param
+          return if I18n.locale.to_s == current_store.default_locale || current_store.default_locale.nil?
+
+          I18n.locale.to_s
+        end
+      end
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Spree
         def build_searcher(params)
           Spree::Config.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
-            searcher.current_currency = current_currency
+            searcher.current_currency = current_currency&.upcase
           end
         end
       end

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

@@ -5,30 +5,18 @@ 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
 
+        def store_locale
+          current_store.default_locale
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/product_filters.rb

@@ -68,9 +68,9 @@ module Spree
       def self.price_filter
         v = Spree::Price.arel_table
         conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
+                 ["#{format_price(10)} - #{format_price(15)}", v[:amount].between(10..15)],
+                 ["#{format_price(15)} - #{format_price(18)}", v[:amount].between(15..18)],
+                 ["#{format_price(18)} - #{format_price(20)}", v[:amount].between(18..20)],
                  [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
         {
           name: Spree.t(:price_range),

data/lib/spree/core/version.rb

@@ -1,5 +1,7 @@
 module Spree
+  VERSION = '4.2.1'.freeze
+
   def self.version
-    '4.2.0.rc2'
+    VERSION
   end
 end

data/lib/spree/i18n.rb

@@ -1,35 +1,33 @@
 require 'i18n'
 require 'active_support/core_ext/array/extract_options'
-require 'spree/i18n/base'
+require 'action_view'
 
 module Spree
-  extend ActionView::Helpers::TranslationHelper
-  extend ActionView::Helpers::TagHelper
+  class TranslationHelperWrapper
+    include ActionView::Helpers::TranslationHelper
+  end
 
   class << self
     # Add spree namespace and delegate to Rails TranslationHelper for some nice
     # extra functionality. e.g return reasonable strings for missing translations
-    def translate(*args)
-      @virtual_path = virtual_path
+    def translate(key, options = {})
+      options[:scope] = [*options[:scope]].unshift(:spree).uniq
 
-      options = args.extract_options!
-      options[:scope] = [*options[:scope]].unshift(:spree)
-      args << options
-      super(*args)
+      TranslationHelperWrapper.new.translate(key, **options)
     end
 
-    alias t translate
+    def available_locales
+      locales_from_i18n = I18n.available_locales
+      locales =
+        if defined?(SpreeI18n)
+          (SpreeI18n::Locale.all << :en).map(&:to_s)
+        else
+          [Rails.application.config.i18n.default_locale, I18n.locale, :en]
+        end
 
-    def context
-      Spree::ViewContext.context
+      (locales + locales_from_i18n).uniq.compact
     end
 
-    def virtual_path
-      if context
-        path = context.instance_variable_get('@virtual_path')
-
-        path&.gsub(/spree/, '')
-      end
-    end
+    alias t translate
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -99,9 +99,9 @@ module Spree
     @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
                           :customer_support_email, :facebook, :twitter, :instagram,
-                          :description, :address, :contact_email, :contact_phone,
+                          :description, :address, :contact_phone, :supported_locales,
                           :default_locale, :default_country_id, :supported_currencies,
-                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id]
+                          :new_order_notifications_email, :mailer_logo, :checkout_zone_id, :seo_robots]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 

data/lib/spree/service_module.rb

@@ -1,8 +1,8 @@
 module Spree
   module ServiceModule
     module Callable
-      def call(*args)
-        new.call(*args).tap do |result|
+      def call(*args, **kwargs)
+        new.call(*args, **kwargs).tap do |result|
           return yield(result) if block_given?
         end
       end
@@ -47,7 +47,11 @@ module Spree
       def call(input = nil)
         input ||= {}
         @_passed_input = Result.new(true, input)
-        result = super
+        result = if input.is_a?(Hash)
+                   super(**input)
+                 else
+                   super(input)
+                 end
         @_passed_input = result if result.is_a? Result
         enforce_data_format
         @_passed_input
@@ -71,7 +75,7 @@ module Spree
         end
 
         begin
-          @_passed_input = callable.call(@_passed_input.value)
+          @_passed_input = callable.call(**@_passed_input.value)
         rescue ArgumentError => e
           if e.message.include? 'missing'
             raise IncompatibleParamsPassed, "You didn't pass #{e.message} to callable '#{callable.name}'"

data/lib/spree/testing_support/capybara_config.rb

@@ -23,4 +23,4 @@ else
   end
 end
 Capybara.default_max_wait_time = 45
-Capybara.server = :webrick
+Capybara.server = :puma