spree_core 4.2.0.rc1 → 4.2.0

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/default/spree/zones.rb

@@ -1,13 +1,16 @@
 eu_vat = Spree::Zone.where(name: 'EU_VAT', description: 'Countries that make up the EU VAT zone.', kind: 'country').first_or_create!
+uk_vat = Spree::Zone.where(name: 'UK_VAT', kind: 'country').first_or_create!
 north_america = Spree::Zone.where(name: 'North America', description: 'USA + Canada', kind: 'country').first_or_create!
 south_america = Spree::Zone.where(name: 'South America', description: 'South America', kind: 'country').first_or_create!
 middle_east = Spree::Zone.where(name: 'Middle East', description: 'Middle East', kind: 'country').first_or_create!
 asia = Spree::Zone.where(name: 'Asia', description: 'Asia', kind: 'country').first_or_create!
 
-%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG GB LT CY LU MT DK NL EE HR CZ GR).each do |name|
+%w(PL FI PT RO DE FR SK HU SI IE AT ES IT BE SE LV BG LT CY LU MT DK NL EE HR CZ GR).each do |name|
   eu_vat.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
 
+uk_vat.zone_members.where(zoneable: Spree::Country.find_by(iso: 'GB')).first_or_create!
+
 %w(US CA).each do |name|
   north_america.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end

data/db/migrate/20130326175857_add_stock_location_to_rma.rb

@@ -1,4 +1,4 @@
-class AddStockLocationToRma < ActiveRecord::Migration[4.2]
+class AddStockLocationToRMA < ActiveRecord::Migration[4.2]
   def change
     add_column :spree_return_authorizations, :stock_location_id, :integer
   end

data/db/migrate/20191017121054_add_supported_currencies_to_store.rb

@@ -2,6 +2,7 @@ class AddSupportedCurrenciesToStore < ActiveRecord::Migration[6.0]
   def change
     unless column_exists?(:spree_stores, :supported_currencies)
       add_column :spree_stores, :supported_currencies, :string
+      Spree::Store.reset_column_information
       Spree::Store.all.each do |store|
         store.update_attribute(:supported_currencies, store.default_currency)
       end

data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb

@@ -0,0 +1,12 @@
+class AddCheckoutZoneFieldToStore < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :checkout_zone_id)
+      add_column :spree_stores, :checkout_zone_id, :integer
+
+      Spree::Store.reset_column_information
+
+      default_zone = Spree::Zone.default_checkout_zone
+      Spree::Store.update_all(checkout_zone_id: default_zone.id) if default_zone.present?
+    end
+  end
+end

data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb

@@ -0,0 +1,10 @@
+class AddFilterableColumnToSpreeOptionTypes < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_option_types, :filterable)
+      add_column :spree_option_types, :filterable, :boolean, default: true, null: false
+    end
+    unless index_exists?(:spree_option_types, :filterable)
+      add_index :spree_option_types, :filterable
+    end
+  end
+end

data/db/migrate/20201127084048_add_default_country_kind_to_spree_zones.rb

@@ -0,0 +1,5 @@
+class AddDefaultCountryKindToSpreeZones < ActiveRecord::Migration[6.0]
+  def change
+    change_column_default(:spree_zones, :kind, :state)
+  end
+end

data/db/migrate/20210112193440_remove_contact_email_from_spree_stores.rb

@@ -0,0 +1,5 @@
+class RemoveContactEmailFromSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    remove_column :spree_stores, :contact_email
+  end
+end

data/db/migrate/20210114182625_create_spree_payment_methods_stores.rb

@@ -0,0 +1,10 @@
+class CreateSpreePaymentMethodsStores < ActiveRecord::Migration[6.0]
+  def change
+    create_table :spree_payment_methods_stores, id: false do |t|
+      t.belongs_to :payment_method
+      t.belongs_to :store
+    end
+
+    add_index :spree_payment_methods_stores, [:payment_method_id, :store_id], unique: true, name: 'payment_mentod_id_store_id_unique_index'
+  end
+end

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,47 @@
+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
+          @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
+      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/importer/order.rb

@@ -38,7 +38,7 @@ module Spree
             end
           end
           order.reload
-        rescue Exception => e
+        rescue StandardError => e
           order.destroy if order&.persisted?
           raise e.message
         end
@@ -80,7 +80,7 @@ module Spree
 
             adjustments = s.delete(:adjustments_attributes)
             create_adjustments_from_params(adjustments, order, shipment)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import shipments: #{e.message} #{s}"
           end
         end
@@ -115,7 +115,7 @@ module Spree
               line_item.save!
             end
             create_adjustments_from_params(adjustments, order, line_item)
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import line items: #{e.message} #{line_item}"
           end
         end
@@ -132,7 +132,7 @@ module Spree
             )
             adjustment.save!
             adjustment.close!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import adjustments: #{e.message} #{a}"
           end
         end
@@ -150,7 +150,7 @@ module Spree
             payment.payment_method = Spree::PaymentMethod.find_by!(name: p[:payment_method])
             payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
             payment.save!
-          rescue Exception => e
+          rescue StandardError => e
             raise "Order import payments: #{e.message} #{p}"
           end
         end
@@ -167,7 +167,7 @@ module Spree
             gateway_payment_profile_id: source_hash[:gateway_payment_profile_id],
             imported: true
           )
-        rescue Exception => e
+        rescue StandardError => e
           raise "Order import source payments: #{e.message} #{source_hash}"
         end
 
@@ -179,7 +179,7 @@ module Spree
           hash
         rescue ActiveRecord::RecordNotFound => e
           raise "Ensure order import variant: Variant w/SKU #{sku} not found."
-        rescue Exception => e
+        rescue StandardError => e
           raise "Ensure order import variant: #{e.message} #{hash}"
         end
 
@@ -200,7 +200,7 @@ module Spree
 
             address.delete(:country)
             address[:country_id] = Spree::Country.where(search).first!.id
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address country: #{e.message} #{search}"
           end
         end
@@ -224,7 +224,7 @@ module Spree
             else
               address[:state_name] = search[:name] || search[:abbr]
             end
-          rescue Exception => e
+          rescue StandardError => e
             raise "Ensure order import address state: #{e.message} #{search}"
           end
         end