spree_core 4.1.14 → 4.2.0.beta

data/db/default/spree/stores.rb

@@ -1,15 +1,16 @@
 # Possibly already created by a migration.
 unless Spree::Store.default.persisted?
   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.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/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/20191016134113_add_deafult_value_for_store_default_currency.rb

@@ -1,4 +1,4 @@
-class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[5.2]
+class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[6.0]
   def change
     Spree::Store.where(default_currency: nil).update_all(default_currency: Spree::Config[:currency])
   end

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

@@ -1,7 +1,10 @@
-class AddSocialToSpreeStores < ActiveRecord::Migration[5.2]
+class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
   def change
     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/20200212144523_add_hide_from_nav_to_taxons.rb

@@ -1,4 +1,4 @@
-class AddHideFromNavToTaxons < ActiveRecord::Migration[5.2]
+class AddHideFromNavToTaxons < ActiveRecord::Migration[6.0]
   def change
     add_column :spree_taxons, :hide_from_nav, :boolean, default: false, index: true
   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/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/lib/generators/spree/dummy/dummy_generator.rb

@@ -32,6 +32,7 @@ module Spree
       opts[:skip_bundle] = true
       opts[:skip_gemfile] = true
       opts[:skip_git] = true
+      opts[:skip_keeps] = true
       opts[:skip_listen] = true
       opts[:skip_rc] = true
       opts[:skip_spring] = true

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

@@ -104,3 +104,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/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.14'
+    '4.2.0.beta'
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -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]
 
     @@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: []
     ]

data/lib/spree/testing_support/authorization_helpers.rb

@@ -27,13 +27,14 @@ module Spree
 
         def stub_authorization!
           ability = build_ability
+          ability_class = Spree::Dependencies.ability_class.constantize
 
           after(:all) do
-            Spree::Ability.remove_ability(ability)
+            ability_class.remove_ability(ability)
           end
 
           before(:all) do
-            Spree::Ability.register_ability(ability)
+            ability_class.register_ability(ability)
           end
 
           before do
@@ -45,11 +46,13 @@ module Spree
 
         def custom_authorization!(&block)
           ability = build_ability(&block)
+          ability_class = Spree::Dependencies.ability_class.constantize
+
           after(:all) do
-            Spree::Ability.remove_ability(ability)
+            ability_class.remove_ability(ability)
           end
           before(:all) do
-            Spree::Ability.register_ability(ability)
+            ability_class.register_ability(ability)
           end
         end
       end

data/lib/spree/testing_support/capybara_ext.rb

@@ -63,13 +63,6 @@ rescue Selenium::WebDriver::Error::TimeOutError
   default_options[:error].nil? ? false : raise(default_options[:error])
 end
 
-# Usage examples:
-# fill_in_with_force 'CVC', with: 123
-def fill_in_with_force(locator, with:)
-  field_id = find_field(locator)[:id]
-  page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
-end
-
 Capybara.configure do |config|
   config.match = :smart
   config.ignore_hidden_elements = true

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

@@ -1,12 +1,15 @@
 FactoryBot.define do
   factory :store, class: Spree::Store do
-    sequence(:code)   { |i| "spree_#{i}" }
-    name              { 'Spree Test Store' }
-    url               { 'www.example.com' }
-    mail_from_address { 'spree@example.org' }
-    default_currency  { 'USD' }
-    facebook          { 'spreecommerce' }
-    twitter           { 'spreecommerce' }
-    instagram         { 'spreecommerce' }
+    sequence(:code)        { |i| "spree_#{i}" }
+    name                   { 'Spree Test Store' }
+    url                    { 'www.example.com' }
+    mail_from_address      { 'no-reply@example.com' }
+    customer_support_email { 'support@example.com' }
+    new_order_notifications_email { 'store-owner@example.com' }
+    default_currency       { 'USD' }
+    supported_currencies   { 'USD,EUR,GBP' }
+    facebook               { 'spreecommerce' }
+    twitter                { 'spreecommerce' }
+    instagram              { 'spreecommerce' }
   end
 end

data/spree_core.gemspec

@@ -6,11 +6,11 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_core'
   s.version     = Spree.version
-  s.author      = 'Sean Schofield'
-  s.email       = 'sean@spreecommerce.com'
+  s.authors     = ['Sean Schofield', 'Spark Solutions']
+  s.email       = 'hello@spreecommerce.org'
   s.summary     = 'The bare bones necessary for Spree.'
   s.description = 'The bare bones necessary for Spree.'
-  s.homepage    = 'http://spreecommerce.org'
+  s.homepage    = 'https://spreecommerce.org'
   s.license     = 'BSD-3-Clause'
 
   s.metadata = {
@@ -32,14 +32,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'carmen', '>= 1.0', '< 1.2'
   s.add_dependency 'cancancan', '~> 3.0'
   s.add_dependency 'ffaker', '~> 2.9'
-  s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.4.0'
+  s.add_dependency 'friendly_id', '>= 5.2.1', '< 5.5.0'
   s.add_dependency 'highline', '~> 2.0.0' # Necessary for the install generator
   s.add_dependency 'kaminari', '~> 1.2.1'
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4.2'
   s.add_dependency 'premailer-rails'
-  s.add_dependency 'rails', '>= 5.2', '< 6.1'
+  s.add_dependency 'rails', '~> 6.0.0'
   s.add_dependency 'ransack', '~> 2.3.0'
   s.add_dependency 'responders'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'twitter_cldr', '>= 4.3', '< 7.0'
   s.add_dependency 'sprockets', '~> 3.7'
   s.add_dependency 'sprockets-rails'
-  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.12.0'
+  s.add_dependency 'mini_magick', '>= 4.9.4', '< 4.11.0'
   s.add_dependency 'image_processing', '~> 1.2'
 
   s.add_development_dependency 'email_spec', '~> 2.2'