solidus_core 2.7.4 → 2.8.0

data/db/default/spree/store_credit.rb

@@ -19,4 +19,4 @@ Spree::ReimbursementType.create_with(name: "Store Credit").find_or_create_by!(ty
 
 Spree::StoreCreditCategory.find_or_create_by!(name: 'Gift Card')
 
-Spree::StoreCreditUpdateReason.find_or_create_by!(name: 'Credit Given In Error')
+Spree::StoreCreditReason.find_or_create_by!(name: 'Credit Given In Error')

data/db/default/spree/zones.rb

@@ -5,9 +5,9 @@ north_america = Spree::Zone.find_or_create_by!(name: "North America", descriptio
 
 %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 |symbol|
-  eu_vat.zone_members.create!(zoneable: Spree::Country.find_by!(iso: symbol))
+  eu_vat.zone_members.find_or_create_by!(zoneable: Spree::Country.find_by!(iso: symbol))
 end
 
 %w(US CA).each do |symbol|
-  north_america.zone_members.create!(zoneable: Spree::Country.find_by!(iso: symbol))
+  north_america.zone_members.find_or_create_by!(zoneable: Spree::Country.find_by!(iso: symbol))
 end

data/db/migrate/20180710170104_create_spree_store_credit_reasons_table.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+class CreateSpreeStoreCreditReasonsTable < ActiveRecord::Migration[5.1]
+  class StoreCreditUpdateReason < ActiveRecord::Base
+    self.table_name = "spree_store_credit_update_reasons"
+  end
+
+  class StoreCreditReason < ActiveRecord::Base
+    self.table_name = "spree_store_credit_reasons"
+  end
+
+  def up
+    create_table :spree_store_credit_reasons do |t|
+      t.string :name
+      t.boolean :active, default: true
+
+      t.timestamps
+    end
+
+    StoreCreditUpdateReason.all.each do |update_reason|
+      StoreCreditReason.create!(name: update_reason.name)
+    end
+
+    drop_table :spree_store_credit_update_reasons
+    rename_column :spree_store_credit_events, :update_reason_id, :store_credit_reason_id
+  end
+
+  def down
+    create_table :spree_store_credit_update_reasons do |t|
+      t.string :name
+
+      t.timestamps
+    end
+
+    StoreCreditReason.all.each do |store_credit_reason|
+      StoreCreditUpdateReason.create!(name: store_credit_reason.name)
+    end
+
+    drop_table :spree_store_credit_reasons
+    rename_column :spree_store_credit_events, :store_credit_reason_id, :update_reason_id
+  end
+end

data/db/migrate/20190106184413_remove_code_from_spree_promotions.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'solidus/migrations/promotions_with_code_handlers'
+
+class RemoveCodeFromSpreePromotions < ActiveRecord::Migration[5.1]
+  class Promotion < ActiveRecord::Base
+    self.table_name = "spree_promotions"
+  end
+
+  def up
+    promotions_with_code = Promotion.where.not(code: nil)
+
+    if promotions_with_code.any?
+      # You have some promotions with "code" field present! This is not good
+      # since we are going to remove that column.
+      #
+      self.class.promotions_with_code_handler.new(self, promotions_with_code).call
+    end
+
+    remove_index :spree_promotions, name: :index_spree_promotions_on_code
+    remove_column :spree_promotions, :code
+  end
+
+  def down
+    add_column :spree_promotions, :code, :string
+    add_index :spree_promotions, :code, name: :index_spree_promotions_on_code
+  end
+
+  def self.promotions_with_code_handler
+    # We propose different approaches, just pick the one that you prefer or
+    # write your custom one.
+    #
+    # The fist one (raising an exception) is the default but you can
+    # comment/uncomment the one then better fits you needs or use a
+    # custom class or callable object.
+    #
+    Solidus::Migrations::PromotionWithCodeHandlers::RaiseException
+    # Solidus::Migrations::PromotionWithCodeHandlers::MoveToSpreePromotionCode
+    # Solidus::Migrations::PromotionWithCodeHandlers::DoNothing
+  end
+end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -20,9 +20,6 @@ Dummy::Application.configure do
   # Raise exceptions instead of rendering exception templates
   config.action_dispatch.show_exceptions = false
 
-  # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
-
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.

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

@@ -84,12 +84,12 @@ module Spree
     config.to_prepare do
       # Load application's model / class decorators
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
+        require_dependency(c)
       end
 
       # Load application's view overrides
       Dir.glob(File.join(File.dirname(__FILE__), "../app/overrides/*.rb")) do |c|
-        Rails.configuration.cache_classes ? require(c) : load(c)
+        require_dependency(c)
       end
     end
       APP

data/lib/generators/spree/install/templates/config/initializers/spree.rb.tt

@@ -22,7 +22,7 @@ Spree.config do |config|
   # Frontend:
 
   # Custom logo for the frontend
-  # config.logo = "logo/solidus_logo.png"
+  # config.logo = "logo/solidus.svg"
 
   # Template to use when rendering layout
   # config.layout = "spree/layouts/spree_application"
@@ -31,7 +31,7 @@ Spree.config do |config|
   # Admin:
 
   # Custom logo for the admin
-  # config.admin_interface_logo = "logo/solidus_logo.png"
+  # config.admin_interface_logo = "logo/solidus.svg"
 
   # Gateway credentials can be configured statically here and referenced from
   # the admin. They can also be fully configured from the admin.

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

@@ -5,6 +5,6 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require spree/backend
 //= require_tree .

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

@@ -5,6 +5,6 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require spree/frontend
 //= require_tree .

data/lib/solidus/migrations/promotions_with_code_handlers.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+module Solidus
+  module Migrations
+    module PromotionWithCodeHandlers
+      class PromotionCode < ActiveRecord::Base
+        self.table_name = "spree_promotion_codes"
+      end
+
+      class Base
+        attr_reader :migration_context, :promotions
+
+        def initialize(migration_context, promotions)
+          @migration_context = migration_context
+          @promotions = promotions
+        end
+      end
+
+      class RaiseException < Base
+        def call
+          # Please note that this will block the current migration and rollback all
+          # the previous ones run with the same "rails db:migrate" command.
+          #
+          raise StandardError, "You are trying to drop 'code' column from "\
+            "spree_promotions table but you have at least one record with that "\
+            "column filled. Please take care of that or you could lose data. See:" \
+            "\n" \
+            "https://github.com/solidusio/solidus/pull/3028"\
+            "\n"
+        end
+      end
+
+      class MoveToSpreePromotionCode < Base
+        def call
+          # This is another possible approach, it will convert Spree::Promotion#code
+          # to a Spree::PromotionCode before removing the `code` field.
+          #
+          # NOTE: promotion codes will be downcased and stripped
+          promotions.find_each do |promotion|
+            normalized_code = promotion.code.downcase.strip
+
+            PromotionCode.find_or_create_by!(
+              value: normalized_code,
+              promotion_id: promotion.id
+            ) do
+              migration_context.say "Creating Spree::PromotionCode with value "\
+               "'#{normalized_code}' for Spree::Promotion with id '#{promotion.id}'"
+            end
+          end
+        end
+      end
+
+      class DoNothing < Base
+        def call
+          # This approach will delete all codes without taking any action. At
+          # least we could print a message to track what we are deleting.
+          #
+          promotions.find_each do |promotion|
+            migration_context.say "Code '#{promotion.code}' is going to be removed "\
+              "from Spree::Promotion with id '#{promotion.id}'"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/app_configuration.rb

@@ -31,8 +31,8 @@ module Spree
     preference :address_requires_state, :boolean, default: true
 
     # @!attribute [rw] admin_interface_logo
-    #   @return [String] URL of logo used in admin (default: +'logo/solidus_logo.png'+)
-    preference :admin_interface_logo, :string, default: 'logo/solidus_logo.png'
+    #   @return [String] URL of logo used in admin (default: +'logo/solidus.svg'+)
+    preference :admin_interface_logo, :string, default: 'logo/solidus.svg'
 
     # @!attribute [rw] admin_products_per_page
     #   @return [Integer] Number of products to display in admin (default: +10+)
@@ -142,8 +142,8 @@ module Spree
     preference :layout, :string, default: 'spree/layouts/spree_application'
 
     # @!attribute [rw] logo
-    #   @return [String] URL of logo used on frontend (default: +'logo/solidus_logo.png'+)
-    preference :logo, :string, default: 'logo/solidus_logo.png'
+    #   @return [String] URL of logo used on frontend (default: +'logo/solidus.svg'+)
+    preference :logo, :string, default: 'logo/solidus.svg'
 
     # @!attribute [rw] order_bill_address_used
     #   @return [Boolean] Use the order's bill address, as opposed to storing
@@ -295,6 +295,8 @@ module Spree
     # promotion_chooser_class allows extensions to provide their own PromotionChooser
     class_name_attribute :promotion_chooser_class, default: 'Spree::PromotionChooser'
 
+    class_name_attribute :allocator_class, default: 'Spree::Stock::Allocator::OnHandFirst'
+
     class_name_attribute :shipping_rate_sorter_class, default: 'Spree::Stock::ShippingRateSorter'
 
     class_name_attribute :shipping_rate_selector_class, default: 'Spree::Stock::ShippingRateSelector'
@@ -407,6 +409,20 @@ module Spree
     # returns a String
     class_name_attribute :taxon_url_parametizer_class, default: 'ActiveSupport::Inflector'
 
+    # Allows providing your own class for image galleries on Variants
+    #
+    # @!attribute [rw] variant_gallery_class
+    # @return [Class] a class that implements an `images` method and returns an
+    # Enumerable of images adhering to the present_image_class interface
+    class_name_attribute :variant_gallery_class, default: 'Spree::Gallery::VariantGallery'
+
+    # Allows providing your own class for image galleries on Products
+    #
+    # @!attribute [rw] product_gallery_class
+    # @return [Class] a class that implements an `images` method and returns an
+    # Enumerable of images adhering to the present_image_class interface
+    class_name_attribute :product_gallery_class, default: 'Spree::Gallery::ProductGallery'
+
     # Allows providing your own class instance for generating order numbers.
     #
     # @!attribute [rw] order_number_generator

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

@@ -62,7 +62,7 @@ module Spree
             candidate &&
               available_locales.include?(candidate.to_sym)
           end
-          session[:locale] = locale
+          session[set_user_language_locale_key] = locale
           I18n.locale = locale
           Carmen.i18n_backend.locale = locale
         end

data/lib/spree/core/stock_configuration.rb

@@ -5,6 +5,8 @@ module Spree
     class StockConfiguration
       attr_writer :coordinator_class
       attr_writer :estimator_class
+      attr_writer :location_sorter_class
+      attr_writer :allocator_class
 
       def coordinator_class
         @coordinator_class ||= '::Spree::Stock::SimpleCoordinator'
@@ -15,6 +17,16 @@ module Spree
         @estimator_class ||= '::Spree::Stock::Estimator'
         @estimator_class.constantize
       end
+
+      def location_sorter_class
+        @location_sorter_class ||= '::Spree::Stock::LocationSorter::Unsorted'
+        @location_sorter_class.constantize
+      end
+
+      def allocator_class
+        @allocator_class ||= '::Spree::Stock::Allocator::OnHandFirst'
+        @allocator_class.constantize
+      end
     end
   end
 end

data/lib/spree/core/version.rb

@@ -2,7 +2,7 @@
 
 module Spree
   def self.solidus_version
-    "2.7.4"
+    "2.8.0"
   end
 
   def self.solidus_gem_version

data/lib/spree/i18n.rb

@@ -26,6 +26,10 @@ module Spree
     # extra functionality. e.g return reasonable strings for missing translations
 
     def translate(key, options = {})
+      Spree::Deprecation.warn <<-WARN.squish
+        Spree.t & Spree.translate have been deprecated.
+        Instead use I18n.t('spree.your_translation_key')
+      WARN
       options[:scope] = [:spree, *options[:scope]]
       TranslationHelperWrapper.new.translate(key, options)
     end

data/lib/spree/money.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require 'money'
-require 'monetize'
-require 'active_support/core_ext/string/output_safety'
-
 module Spree
   # Spree::Money is a relatively thin wrapper around Monetize which handles
   # formatting via Spree::Config.
@@ -77,16 +73,22 @@ module Spree
       @money.format(@options.merge(options))
     end
 
-    # @note If you pass in options, ensure you pass in the html: true as well.
+    # @note If you pass in options, ensure you pass in the { html_wrap: true } as well.
     # @param options [Hash] additional formatting options
     # @return [String] the value of this money object formatted according to
-    #   its options and any additional options, by default as html.
-    def to_html(options = { html: true })
+    #   its options and any additional options, by default with html_wrap.
+    def to_html(options = { html_wrap: true })
       output = format(options)
-      if options[:html]
-        # 1) prevent blank, breaking spaces
-        # 2) prevent escaping of HTML character entities
-        output = output.sub(" ", " ").html_safe
+      # Maintain compatibility by checking html option renamed to html_wrap.
+      if options[:html] || options[:html] == false
+        Spree::Deprecation.warn <<-WARN.squish, caller
+          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html]}),
+          which will not be supported in the future.
+          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html]})
+        WARN
+      end
+      if options[:html_wrap] || options[:html]
+        output = output.html_safe
       end
       output
     end

data/lib/spree/permission_sets.rb

@@ -11,7 +11,6 @@ require 'spree/permission_sets/product_display'
 require 'spree/permission_sets/product_management'
 require 'spree/permission_sets/promotion_display'
 require 'spree/permission_sets/promotion_management'
-require 'spree/permission_sets/report_display'
 require 'spree/permission_sets/restricted_stock_display'
 require 'spree/permission_sets/restricted_stock_management'
 require 'spree/permission_sets/stock_display'

data/lib/spree/permission_sets/promotion_management.rb

@@ -8,6 +8,7 @@ module Spree
         can :manage, Spree::PromotionRule
         can :manage, Spree::PromotionAction
         can :manage, Spree::PromotionCategory
+        can :manage, Spree::PromotionCode
       end
     end
   end

data/lib/spree/testing_support/dummy_app.rb

@@ -12,9 +12,16 @@ Rails.env = 'test'
 
 require 'solidus_core'
 
+# @private
+def forgery_protected_by_default?
+  Gem::Version.new(Rails.version) >= Gem::Version.new('5.2')
+end
+
 # @private
 class ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
+  if !forgery_protected_by_default?
+    protect_from_forgery with: :exception
+  end
 end
 
 # @private
@@ -50,14 +57,18 @@ module DummyApp
     config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
     config.whiny_nils                                 = true
     config.consider_all_requests_local                = true
+    config.action_controller.allow_forgery_protection = true
     config.action_controller.perform_caching          = false
     config.action_dispatch.show_exceptions            = false
     config.active_support.deprecation                 = :stderr
     config.action_mailer.delivery_method              = :test
-    config.action_controller.allow_forgery_protection = false
     config.active_support.deprecation                 = :stderr
     config.secret_key_base                            = 'SECRET_TOKEN'
 
+    if forgery_protected_by_default?
+      config.action_controller.default_protect_from_forgery = true
+    end
+
     if config.active_record.sqlite3
       # Rails >= 5.2
       config.active_record.sqlite3.represent_boolean_as_integer = true

data/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js

@@ -5,6 +5,6 @@
 // the compiled file.
 //
 //= require jquery
-//= require jquery_ujs
+//= require rails-ujs
 //= require spree/backend
 //= require_tree .