solidus_core 3.1.7 → 3.2.0.alpha

data/lib/tasks/payment_method.rake

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+namespace :payment_method do
+  desc "Deactivates old payment methods and fixes ActiveRecord::SubclassNotFound error, "\
+  "which happens after switching Payment Service Provider."
+  task deactivate_unsupported_payment_methods: :environment do
+    Spree::PaymentMethod.pluck(:id, :type).select do |id, type|
+      type.constantize
+    rescue NameError
+      fix_payment_method_record(id, type)
+    end
+  end
+
+  def fix_payment_method_record(id, previous_type)
+    connection = ActiveRecord::Base.connection
+    false_value = connection.quoted_false
+    connection.exec_update(<<-SQL
+      UPDATE spree_payment_methods
+      SET
+        type='#{Spree::PaymentMethod.name}',
+        type_before_removal='#{previous_type}',
+        active=#{false_value},
+        available_to_users=#{false_value},
+        available_to_admin=#{false_value}
+      WHERE id=#{id};
+    SQL
+    )
+  end
+end

data/lib/tasks/solidus/delete_prices_with_nil_amount.rake

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 namespace :solidus do
-  desc "Delete Spree::Price records which amount field is NULL"
+  desc "Delete Spree::Price records (including discarded) which amount field is NULL"
   task delete_prices_with_nil_amount: :environment do
-    Spree::Price.where(amount: nil).delete_all
+    Spree::Price.with_discarded.where(amount: nil).delete_all
   end
 end

data/lib/tasks/solidus/split_promotions_with_any_match_policy.rake

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+namespace :solidus do
+  desc "Split Promotions with 'any' match policy"
+  task split_promotions_with_any_match_policy: :environment do
+    Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
+      if promotion.promotion_rules.length <= 1
+        promotion.update!(match_policy: :all)
+      elsif promotion.active?
+        promotion.rules.map do |rule|
+          new_promotion = promotion.dup
+          new_promotion.promotion_rules = [rule]
+          new_promotion.match_policy = "all"
+          new_promotion.promotion_actions = promotion.actions.map do |action|
+            new_action = action.dup
+            if action.respond_to?(:calculator)
+              new_action.calculator = action.calculator.dup
+            end
+            new_action.promotion = new_promotion
+            new_action.save!
+            new_action
+          end
+          new_promotion.expires_at = promotion.expires_at
+          new_promotion.starts_at = Time.current
+          new_promotion.save!
+        end
+        promotion.update!(expires_at: Time.current)
+      end
+    end
+
+    Spree::Order.where(completed_at: nil).each { |order| Spree::PromotionHandler::Cart.new(order).activate }
+  end
+end

data/solidus_core.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata['rubygems_mfa_required'] = 'true'
+
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|script)/})
   end
@@ -25,7 +27,7 @@ Gem::Specification.new do |s|
     actionmailer actionpack actionview activejob activemodel activerecord
     activesupport railties
   ].each do |rails_dep|
-    s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
+    s.add_dependency rails_dep, ['>= 5.2', '< 7.1.x']
   end
 
   s.add_dependency 'activemerchant', '~> 1.66'
@@ -39,10 +41,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'kaminari-activerecord', '~> 1.1'
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
-  s.add_dependency 'kt-paperclip', '~> 6.3'
+  s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
   s.add_dependency 'psych', ['>= 3.1.0', '< 5.0']
   s.add_dependency 'ransack', '~> 2.0'
+  s.add_dependency 'sprockets-rails'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
+  s.add_dependency 'omnes', '~> 0.2.2'
 
   s.post_install_message = <<-MSG
 -------------------------------------------------------------

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.2.0.alpha
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-15 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 6.2.x
+        version: 7.1.x
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -334,16 +334,22 @@ dependencies:
   name: kt-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +384,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: state_machines-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -392,6 +412,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: omnes
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 description: Essential models, mailers, and classes for the Solidus e-commerce project.
 email: contact@solidus.io
 executables: []
@@ -661,6 +695,7 @@ files:
 - app/models/spree/zone.rb
 - app/models/spree/zone_member.rb
 - app/subscribers/spree/mailer_subscriber.rb
+- app/subscribers/spree/order_mailer_subscriber.rb
 - app/views/layouts/spree/base_mailer.html.erb
 - app/views/spree/carton_mailer/shipped_email.html.erb
 - app/views/spree/carton_mailer/shipped_email.text.erb
@@ -723,15 +758,18 @@ files:
 - db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
 - db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
 - db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
+- db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb
 - db/migrate/20210122110141_add_name_to_spree_addresses.rb
 - db/migrate/20210312061050_change_column_null_on_prices.rb
+- db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
 - db/seeds.rb
 - lib/generators/solidus/install/install_generator.rb
+- lib/generators/solidus/install/install_generator/bundler_context.rb
+- lib/generators/solidus/install/install_generator/install_frontend.rb
+- lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb
 - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
 - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
-- lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js
 - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
-- lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
 - lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt
 - lib/generators/solidus/update/update_generator.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -748,6 +786,7 @@ files:
 - lib/solidus/migrations/promotions_with_code_handlers.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
+- lib/spree/bus.rb
 - lib/spree/config.rb
 - lib/spree/core.rb
 - lib/spree/core/active_merchant_dependencies.rb
@@ -832,10 +871,12 @@ files:
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
+- lib/spree/rails_compatibility.rb
 - lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
 - lib/spree/testing_support/blacklist_urls.rb
+- lib/spree/testing_support/bus_helpers.rb
 - lib/spree/testing_support/caching.rb
 - lib/spree/testing_support/capybara_ext.rb
 - lib/spree/testing_support/common_rake.rb
@@ -923,12 +964,15 @@ files:
 - lib/spree/testing_support/rake.rb
 - lib/spree/testing_support/sequences.rb
 - lib/spree/testing_support/shared_examples/gallery.rb
+- lib/spree/testing_support/silence_deprecations.rb
 - lib/spree/testing_support/translations.rb
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
+- lib/tasks/payment_method.rake
 - lib/tasks/solidus/check_orders_with_invalid_email.rake
 - lib/tasks/solidus/delete_prices_with_nil_amount.rake
+- lib/tasks/solidus/split_promotions_with_any_match_policy.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
 - vendor/assets/javascripts/jsuri.js
@@ -936,7 +980,8 @@ files:
 homepage: http://solidus.io
 licenses:
 - BSD-3-Clause
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: |
   -------------------------------------------------------------
                   Thank you for using Solidus

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

@@ -1,10 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// 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 rails-ujs
-//= require spree/frontend
-//= require_tree .

data/lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css

@@ -1,9 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *
- *= require spree/frontend
- *= require_self
- *= require_tree .
-*/