spree_core 4.2.0.beta → 4.2.0.rc5

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/countries.rb

@@ -1,18 +1,24 @@
 require 'carmen'
 
+EXCLUDED_COUNTRIES = ['AQ', 'AX', 'GS', 'UM', 'HM', 'IO', 'EH', 'BV', 'TF'].freeze
+
 Carmen::Country.all.each do |country|
+  # Skip the creation of some territories, uninhabited islands and the Antarctic.
+  next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)
+
   Spree::Country.where(
     name: country.name,
     iso3: country.alpha_3_code,
     iso: country.alpha_2_code,
     iso_name: country.name.upcase,
-    numcode: country.numeric_code,
-    states_required: country.subregions?
+    numcode: country.numeric_code
   ).first_or_create
 end
 
 Spree::Config[:default_country_id] = Spree::Country.find_by(iso: 'US').id
 
-# find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.
-
+# Find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.
 Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)
+
+# Find all countries that require a state (province) at checkout and set 'states_required' to true.
+Spree::Country.where(iso: Spree::Address::STATES_REQUIRED).update_all(states_required: true)

data/db/default/spree/states.rb

@@ -1,12 +1,49 @@
+# frozen_string_literal: true
+
+EXCLUDED_US_STATES = ['UM', 'AS', 'MP', 'VI', 'PR', 'GU'].freeze
+EXCLUDED_CN_STATES = ['HK', 'MO', 'TW'].freeze
+
+def state_level(country, subregion)
+  country.states.where(
+    name: subregion.name,
+    abbr: subregion.code
+  ).first_or_create
+end
+
+def province_level(country, subregion)
+  subregion.subregions.each do |province|
+    country.states.where(
+      name: province.name,
+      abbr: province.code
+    ).first_or_create
+  end
+end
+
 Spree::Country.where(states_required: true).each do |country|
   carmen_country = Carmen::Country.named(country.name)
   next unless carmen_country
 
   carmen_country.subregions.each do |subregion|
-    country.states.where(
-      name: subregion.name,
-      abbr: subregion.code,
-      country_id: country.id
-    ).first_or_create
+    if carmen_country.alpha_2_code == 'US'
+      # Produces 50 states, one postal district (Washington DC)
+      # and 3 APO's as you would expect to see on any good U.S. states list.
+      next if EXCLUDED_US_STATES.include?(subregion.code)
+
+      state_level(country, subregion)
+    elsif carmen_country.alpha_2_code == 'CA' || carmen_country.alpha_2_code == 'MX'
+      # Force Canada and Mexico to use state-level data import from Carmen Gem
+      # else we pull in a subset of provinces that are not common at checkout.
+      state_level(country, subregion)
+    elsif carmen_country.alpha_2_code == 'CN'
+      # Removes 3 "States" from that list that are also listed as Countries,
+      # Hong Kong, Taiwan and Macao
+      next if EXCLUDED_CN_STATES.include?(subregion.code)
+
+      state_level(country, subregion)
+    elsif subregion.subregions?
+      province_level(country, subregion)
+    else
+      state_level(country, subregion)
+    end
   end
 end

data/db/default/spree/stores.rb

@@ -1,16 +1,21 @@
-# Possibly already created by a migration.
-unless Spree::Store.default.persisted?
+default_store = Spree::Store.default
+
+if default_store.persisted?
+  default_store.update!(default_country_id: Spree::Config[:default_country_id])
+else
   Spree::Store.new do |s|
-    s.name                    = 'Spree Demo Site'
-    s.code                    = 'spree'
-    s.url                     = Rails.application.routes.default_url_options[:host] || 'demo.spreecommerce.org'
-    s.mail_from_address       = 'no-reply@example.com'
-    s.customer_support_email  = 'support@example.com'
-    s.default_currency        = 'USD'
-    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'
-    s.twitter                 = 'spreecommerce'
-    s.instagram               = 'spreecommerce'
+    s.name                         = 'Spree Demo Site'
+    s.code                         = 'spree'
+    s.url                          = Rails.application.routes.default_url_options[:host] || 'demo.spreecommerce.org'
+    s.mail_from_address            = 'no-reply@example.com'
+    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'
+    s.twitter                      = 'spreecommerce'
+    s.instagram                    = 'spreecommerce'
   end.save!
 end

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
@@ -16,7 +19,7 @@ end
   middle_east.zone_members.where(zoneable: Spree::Country.find_by!(iso: name)).first_or_create!
 end
 
-%w(AF AM AZ BH BD BT BN KH CN CX CC IO GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
+%w(AF AM AZ BH BD BT BN KH CN CX CC GE HK IN ID IR IQ IL JP JO KZ KW KG LA LB MO MY MV MN MM NP
   KP OM PK PS PH QA SA SG KR LK SY TW TJ TH TR TM AE UZ VN YE).each do |name|
   asia.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/20200610113542_add_label_to_spree_addresses.rb

@@ -0,0 +1,5 @@
+class AddLabelToSpreeAddresses < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_addresses, :label, :string unless column_exists?(:spree_addresses, :label)
+  end
+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,6 @@
+class AddFilterableColumnToSpreeOptionTypes < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_option_types, :filterable, :boolean, default: true, null: false
+    add_index :spree_option_types, :filterable
+  end
+end

data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb

@@ -0,0 +1,5 @@
+class AddSeoRobotsToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :seo_robots, :string unless column_exists?(:spree_stores, :seo_robots)
+  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/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

@@ -13,6 +13,7 @@ require 'premailer/rails'
 require 'ransack'
 require 'responders'
 require 'state_machines-activerecord'
+require 'active_storage_validations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -104,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