spree_core 4.1.8 → 4.2.0.rc1

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,15 +1,20 @@
-# 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 = 'spree@example.com'
-    s.default_currency  = 'USD'
-    s.seo_title         = 'Spree Commerce Demo Shop'
-    s.meta_description  = 'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
-    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.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

@@ -16,7 +16,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/20140309033438_create_store_from_preferences.rb

@@ -28,7 +28,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
         end
 
         s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') do
-          'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
+          '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/'
         end
         s.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
         s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') do

data/db/migrate/20191017121054_add_supported_currencies_to_store.rb

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

data/db/migrate/20200102141311_add_social_to_spree_stores.rb

@@ -3,5 +3,8 @@ class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
     add_column :spree_stores, :facebook, :string
     add_column :spree_stores, :twitter, :string
     add_column :spree_stores, :instagram, :string
+
+    # Fix cache issue #10381
+    Rails.cache.delete('default_store')
   end
 end

data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb

@@ -0,0 +1,7 @@
+class AddDefaultLocaleToSpreeStore < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :default_locale)
+      add_column :spree_stores, :default_locale, :string
+    end
+  end
+end

data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb

@@ -0,0 +1,7 @@
+class AddCustomerSupportEmailToSpreeStore < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :customer_support_email)
+      add_column :spree_stores, :customer_support_email, :string
+    end
+  end
+end

data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb

@@ -0,0 +1,7 @@
+class AddCompareAtAmountToSpreePrices < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_prices, :compare_at_amount)
+      add_column :spree_prices, :compare_at_amount, :decimal, precision: 10, scale: 2
+    end
+  end
+end

data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb

@@ -0,0 +1,9 @@
+class AddDefaultCountryIdToSpreeStore < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :default_country_id)
+      add_column :spree_stores, :default_country_id, :integer
+      Spree::Store.reset_column_information
+      Spree::Store.update_all(default_country_id: Spree::Config[:default_country_id])
+    end
+  end
+end

data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb

@@ -0,0 +1,8 @@
+class AddFooterFieldsToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :description, :text unless column_exists?(:spree_stores, :description)
+    add_column :spree_stores, :address, :text unless column_exists?(:spree_stores, :address)
+    add_column :spree_stores, :contact_phone, :string unless column_exists?(:spree_stores, :contact_phone)
+    add_column :spree_stores, :contact_email, :string unless column_exists?(:spree_stores, :contact_email)
+  end
+end

data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb

@@ -0,0 +1,5 @@
+class AddShowPropertyToSpreeProductProperties < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_product_properties, :show_property, :boolean, default: true unless column_exists?(:spree_product_properties, :show_property)
+  end
+end

data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb

@@ -0,0 +1,7 @@
+class AddStoreOwnerOrderNotificationDeliveredToSpreeOrders < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_orders, :store_owner_notification_delivered)
+      add_column :spree_orders, :store_owner_notification_delivered, :boolean
+    end
+  end
+end

data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb

@@ -0,0 +1,7 @@
+class AddNewOrderNotificationsEmailToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    unless column_exists?(:spree_stores, :new_order_notifications_email)
+      add_column :spree_stores, :new_order_notifications_email, :string
+    end
+  end
+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/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb

@@ -0,0 +1,5 @@
+class AddUniqueIndexOnTaxonIdAndProductIdToSpreeProductsTaxons < ActiveRecord::Migration[6.0]
+  def change
+    add_index :spree_products_taxons, [:product_id, :taxon_id], unique: true unless index_exists? :spree_products_taxons, [:product_id, :taxon_id]
+  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/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js

@@ -4,8 +4,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
-//= require jquery_ujs
 //= require spree/backend
 <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/backend' %>
   <% filename = "spree/backend/#{ options[:lib_name].gsub("/", "_") }" %>

data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js

@@ -4,8 +4,6 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
-//= require jquery_ujs
 //= require accounting.min
 //= require spree/frontend
 <% unless options[:lib_name] == 'spree' || options[:lib_name] == 'spree/frontend' %>

data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb

@@ -0,0 +1,23 @@
+require 'rails/generators'
+require 'spree/core'
+
+module Spree
+  class MailersPreviewGenerator < Rails::Generators::Base
+    desc 'Generates mailers preview for development proposes'
+
+    def self.source_paths
+      [
+        File.expand_path('templates', __dir__)
+      ]
+    end
+
+    def copy_mailers_previews
+      preview_path = Rails.application.config.action_mailer.preview_path || 'test/mailers/previews'
+
+      template 'mailers/previews/order_preview.rb', "#{preview_path}/order_preview.rb"
+      template 'mailers/previews/shipment_preview.rb', "#{preview_path}/shipment_preview.rb"
+      template 'mailers/previews/reimbursement_preview.rb', "#{preview_path}/reimbursement_preview.rb"
+      template 'mailers/previews/user_preview.rb', "#{preview_path}/user_preview.rb"
+    end
+  end
+end

data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb

@@ -0,0 +1,13 @@
+class OrderPreview < ActionMailer::Preview
+  def confirm_email
+    Spree::OrderMailer.confirm_email(Spree::Order.complete.first)
+  end
+
+  def cancel_email
+    Spree::OrderMailer.cancel_email(Spree::Order.complete.first)
+  end
+
+  def store_owner_notification_email
+    Spree::OrderMailer.store_owner_notification_email(Spree::Order.complete.first)
+  end
+end

data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb

@@ -0,0 +1,5 @@
+class ReimbursementPreview < ActionMailer::Preview
+  def reimbursement_email
+    Spree::ReimbursementMailer.reimbursement_email(Spree::Reimbursement.first)
+  end
+end

data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb

@@ -0,0 +1,5 @@
+class ShipmentPreview < ActionMailer::Preview
+  def shipped_email
+    Spree::ShipmentMailer.shipped_email(Spree::Shipment.shipped.first)
+  end
+end

data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb

@@ -0,0 +1,11 @@
+class UserPreview < ActionMailer::Preview
+  def reset_password_instructions
+    Spree::UserMailer.reset_password_instructions(Spree.user_class.first, 'your_token', { current_store_id: Spree::Store.default.id })
+  end
+
+  if Spree::Auth::Config[:confirmable]
+    def confirmation_instructions
+      Spree::UserMailer.confirmation_instructions(Spree.user_class.first, 'your_token')
+    end
+  end
+end

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,3 +105,4 @@ 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'

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

@@ -44,6 +44,7 @@ module Spree
 
           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)

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

@@ -0,0 +1,15 @@
+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

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

@@ -52,10 +52,15 @@ module Spree
         end
 
         def set_current_order
-          if try_spree_current_user && current_order
-            try_spree_current_user.orders.incomplete.where('id != ?', current_order.id).each do |order|
-              current_order.merge!(order, try_spree_current_user)
-            end
+          return unless try_spree_current_user && current_order
+
+          orders_scope = try_spree_current_user.orders.
+                         incomplete.
+                         where.not(id: current_order.id).
+                         where(store_id: current_store.id)
+
+          orders_scope.each do |order|
+            current_order.merge!(order, try_spree_current_user)
           end
         end
 

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

@@ -5,13 +5,24 @@ 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
-          current_store.default_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

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    '4.1.8'
+    '4.2.0.rc1'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -33,7 +33,7 @@ module Spree
       :id, :firstname, :lastname, :first_name, :last_name,
       :address1, :address2, :city, :country_iso, :country_id, :state_id,
       :zipcode, :phone, :state_name, :alternative_phone, :company,
-      :user_id, :deleted_at,
+      :user_id, :deleted_at, :label,
       country: [:iso, :name, :iso3, :iso_name],
       state: [:name, :abbr]
     ]
@@ -64,7 +64,7 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :cost_currency, :cost_price,
+      :cost_currency, :cost_price, :compare_at_price,
       option_type_ids: [], taxon_ids: []
     ]
 
@@ -96,9 +96,12 @@ module Spree
       :quantity, :stock_item, :stock_item_id, :originator, :action
     ]
 
-    @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords,
+    @@store_attributes = [:name, :url, :seo_title, :code, :meta_keywords, :logo,
                           :meta_description, :default_currency, :mail_from_address,
-                          :facebook, :twitter, :instagram]
+                          :customer_support_email, :facebook, :twitter, :instagram,
+                          :description, :address, :contact_email, :contact_phone,
+                          :default_locale, :default_country_id, :supported_currencies,
+                          :new_order_notifications_email, :mailer_logo]
 
     @@store_credit_attributes = %i[amount currency category_id memo]
 
@@ -115,7 +118,7 @@ module Spree
     @@variant_attributes = [
       :name, :presentation, :cost_price, :discontinue_on, :lock_version,
       :position, :track_inventory,
-      :product_id, :product, :option_values_attributes, :price,
+      :product_id, :product, :option_values_attributes, :price, :compare_at_price,
       :weight, :height, :width, :depth, :sku, :cost_currency,
       options: [:name, :value], option_value_ids: []
     ]