solidus_core 3.1.6 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (96) hide show
  1. checksums.yaml +4 -4
  2. data/app/helpers/spree/products_helper.rb +1 -1
  3. data/app/models/concerns/spree/active_storage_adapter/attachment.rb +23 -10
  4. data/app/models/concerns/spree/active_storage_adapter.rb +1 -1
  5. data/app/models/concerns/spree/user_address_book.rb +11 -1
  6. data/app/models/concerns/spree/user_methods.rb +20 -1
  7. data/app/models/spree/adjustment.rb +1 -0
  8. data/app/models/spree/carton.rb +1 -1
  9. data/app/models/spree/log_entry.rb +74 -1
  10. data/app/models/spree/option_value.rb +9 -0
  11. data/app/models/spree/order.rb +68 -29
  12. data/app/models/spree/order_contents.rb +2 -1
  13. data/app/models/spree/order_inventory.rb +1 -1
  14. data/app/models/spree/order_merger.rb +2 -2
  15. data/app/models/spree/order_taxation.rb +6 -4
  16. data/app/models/spree/order_updater.rb +4 -3
  17. data/app/models/spree/payment_method.rb +11 -0
  18. data/app/models/spree/price.rb +1 -1
  19. data/app/models/spree/product/scopes.rb +21 -3
  20. data/app/models/spree/product.rb +1 -1
  21. data/app/models/spree/promotion/actions/create_adjustment.rb +4 -0
  22. data/app/models/spree/promotion/actions/create_item_adjustments.rb +5 -6
  23. data/app/models/spree/promotion/rules/product.rb +20 -8
  24. data/app/models/spree/promotion/rules/store.rb +4 -0
  25. data/app/models/spree/promotion/rules/taxon.rb +4 -0
  26. data/app/models/spree/promotion/rules/user.rb +4 -0
  27. data/app/models/spree/promotion.rb +34 -23
  28. data/app/models/spree/promotion_action.rb +4 -0
  29. data/app/models/spree/promotion_code.rb +8 -4
  30. data/app/models/spree/promotion_handler/cart.rb +26 -6
  31. data/app/models/spree/promotion_rule.rb +5 -0
  32. data/app/models/spree/reimbursement.rb +2 -2
  33. data/app/models/spree/return_item.rb +1 -2
  34. data/app/models/spree/stock/allocator/on_hand_first.rb +2 -2
  35. data/app/models/spree/stock/quantifier.rb +12 -8
  36. data/app/models/spree/stock/simple_coordinator.rb +2 -1
  37. data/app/models/spree/tax/item_tax.rb +3 -2
  38. data/app/models/spree/tax/order_tax.rb +3 -1
  39. data/app/models/spree/tax/tax_location.rb +4 -7
  40. data/app/models/spree/tax_rate.rb +2 -0
  41. data/app/models/spree/variant.rb +1 -1
  42. data/app/subscribers/spree/mailer_subscriber.rb +4 -0
  43. data/app/subscribers/spree/order_mailer_subscriber.rb +35 -0
  44. data/config/i18n-tasks.yml +134 -0
  45. data/config/locales/en.yml +391 -257
  46. data/db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb +7 -0
  47. data/db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb +20 -0
  48. data/lib/generators/solidus/install/install_generator/bundler_context.rb +97 -0
  49. data/lib/generators/solidus/install/install_generator/install_frontend.rb +53 -0
  50. data/lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb +48 -0
  51. data/lib/generators/solidus/install/install_generator.rb +58 -50
  52. data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt +6 -16
  53. data/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js +2 -2
  54. data/lib/spree/app_configuration.rb +43 -0
  55. data/lib/spree/bus.rb +20 -0
  56. data/lib/spree/core/controller_helpers/auth.rb +9 -1
  57. data/lib/spree/core/controller_helpers/current_host.rb +1 -3
  58. data/lib/spree/core/controller_helpers/order.rb +10 -10
  59. data/lib/spree/core/controller_helpers/search.rb +1 -1
  60. data/lib/spree/core/engine.rb +39 -8
  61. data/lib/spree/core/state_machines/order.rb +1 -1
  62. data/lib/spree/core/stock_configuration.rb +18 -0
  63. data/lib/spree/core/validators/email.rb +3 -1
  64. data/lib/spree/core/version.rb +2 -2
  65. data/lib/spree/core.rb +20 -0
  66. data/lib/spree/event/subscriber_registry.rb +4 -6
  67. data/lib/spree/event.rb +1 -1
  68. data/lib/spree/migrations.rb +1 -1
  69. data/lib/spree/permission_sets/default_customer.rb +8 -1
  70. data/lib/spree/permitted_attributes.rb +4 -4
  71. data/lib/spree/preferences/configuration.rb +34 -12
  72. data/lib/spree/preferences/preferable_class_methods.rb +1 -1
  73. data/lib/spree/preferences/preference_differentiator.rb +2 -1
  74. data/lib/spree/preferences/static_model_preferences.rb +0 -2
  75. data/lib/spree/rails_compatibility.rb +99 -0
  76. data/lib/spree/testing_support/bus_helpers.rb +101 -0
  77. data/lib/spree/testing_support/common_rake.rb +47 -19
  78. data/lib/spree/testing_support/dummy_app/assets/javascripts/spree/backend/all.js +1 -1
  79. data/lib/spree/testing_support/dummy_app/assets/javascripts/spree/frontend/all.js +1 -1
  80. data/lib/spree/testing_support/dummy_app.rb +6 -2
  81. data/lib/spree/testing_support/factories/address_factory.rb +7 -2
  82. data/lib/spree/testing_support/factories/inventory_unit_factory.rb +1 -1
  83. data/lib/spree/testing_support/factories/order_factory.rb +8 -4
  84. data/lib/spree/testing_support/factories/product_factory.rb +4 -1
  85. data/lib/spree/testing_support/factories/store_credit_factory.rb +4 -4
  86. data/lib/spree/testing_support/factories/user_factory.rb +6 -0
  87. data/lib/spree/testing_support/factory_bot.rb +1 -1
  88. data/lib/spree/testing_support/order_walkthrough.rb +5 -4
  89. data/lib/spree/testing_support/silence_deprecations.rb +9 -0
  90. data/lib/tasks/payment_method.rake +29 -0
  91. data/lib/tasks/solidus/delete_prices_with_nil_amount.rake +2 -2
  92. data/lib/tasks/solidus/split_promotions_with_any_match_policy.rake +33 -0
  93. data/solidus_core.gemspec +7 -2
  94. metadata +90 -24
  95. data/lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -10
  96. data/lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css +0 -9
@@ -1,5 +1,5 @@
1
1
  // This is a manifest file that'll be compiled into including all the files listed below.
2
- // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
2
+ // Add new JavaScript code in separate files in this directory and they'll automatically
3
3
  // be included in the compiled file accessible from http://example.com/assets/application.js
4
4
  // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
5
  // the compiled file.
@@ -48,7 +48,6 @@ module DummyApp
48
48
  class Application < ::Rails::Application
49
49
  config.load_defaults("#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}")
50
50
  # Make the test environment more production-like:
51
- config.cache_classes = true
52
51
  config.action_controller.allow_forgery_protection = false
53
52
  config.action_controller.default_protect_from_forgery = false
54
53
  config.action_mailer.perform_caching = false
@@ -60,6 +59,10 @@ module DummyApp
60
59
  # https://github.com/solidusio/solidus/issues/4110
61
60
  config.action_controller.perform_caching = false
62
61
 
62
+ # It needs to be explicitly set from Rails 7
63
+ # https://guides.rubyonrails.org/upgrading_ruby_on_rails.html#upgrading-from-rails-6-1-to-rails-7-0-spring
64
+ config.cache_classes = true
65
+
63
66
  # Make debugging easier:
64
67
  config.consider_all_requests_local = true
65
68
  config.action_dispatch.show_exceptions = false
@@ -96,7 +99,7 @@ module DummyApp
96
99
  }
97
100
  }
98
101
  config.active_storage.service = :test
99
- config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', :mini_magick).to_sym
102
+ config.active_storage.variant_processor = ENV.fetch('ACTIVE_STORAGE_VARIANT_PROCESSOR', Spree::RailsCompatibility.variant_processor).to_sym
100
103
  end
101
104
  end
102
105
 
@@ -135,6 +138,7 @@ Spree.user_class = 'Spree::LegacyUser'
135
138
  Spree.load_defaults(Spree.solidus_version)
136
139
  Spree.config do |config|
137
140
  config.mails_from = "store@example.com"
141
+ config.use_legacy_events = ENV['USE_LEGACY_EVENTS'].present?
138
142
 
139
143
  if ENV['DISABLE_ACTIVE_STORAGE']
140
144
  config.image_attachment_module = 'Spree::Image::PaperclipAttachment'
@@ -26,14 +26,19 @@ FactoryBot.define do
26
26
 
27
27
  state do |address|
28
28
  Spree::State.joins(:country).where('spree_countries.iso = (?)', country_iso_code).find_by(abbr: state_code) ||
29
- address.association(:state, country_iso: country_iso_code, state_code: state_code)
29
+ address.association(
30
+ :state,
31
+ strategy: :create,
32
+ country_iso: country_iso_code,
33
+ state_code: state_code
34
+ )
30
35
  end
31
36
 
32
37
  country do |address|
33
38
  if address.state
34
39
  address.state.country
35
40
  else
36
- address.association(:country, iso: country_iso_code)
41
+ address.association(:country, strategy: :create, iso: country_iso_code)
37
42
  end
38
43
  end
39
44
  end
@@ -17,7 +17,7 @@ FactoryBot.define do
17
17
  stock_location { nil }
18
18
  end
19
19
 
20
- variant
20
+ association :variant, strategy: :create
21
21
  line_item do
22
22
  if order
23
23
  build(:line_item, variant: variant, order: order)
@@ -19,7 +19,7 @@ FactoryBot.define do
19
19
  ship_address
20
20
  completed_at { nil }
21
21
  email { user.try(:email) }
22
- store
22
+ association :store, strategy: :create
23
23
 
24
24
  transient do
25
25
  line_items_price { BigDecimal(10) }
@@ -68,6 +68,7 @@ FactoryBot.define do
68
68
 
69
69
  factory :completed_order_with_promotion do
70
70
  transient do
71
+ completed_at { Time.current }
71
72
  promotion { nil }
72
73
  end
73
74
 
@@ -79,7 +80,7 @@ FactoryBot.define do
79
80
  order.order_promotions.create!(promotion: promotion, promotion_code: promotion_code)
80
81
 
81
82
  # Complete the order after the promotion has been activated
82
- order.update_column(:completed_at, Time.current)
83
+ order.update_column(:completed_at, evaluator.completed_at)
83
84
  order.update_column(:state, "complete")
84
85
  end
85
86
  end
@@ -104,13 +105,16 @@ FactoryBot.define do
104
105
  end
105
106
 
106
107
  factory :completed_order_with_totals do
108
+ transient do
109
+ completed_at { Time.current }
110
+ end
107
111
  state { 'complete' }
108
112
 
109
- after(:create) do |order|
113
+ after(:create) do |order, evaluator|
110
114
  order.shipments.each do |shipment|
111
115
  shipment.inventory_units.update_all state: 'on_hand', pending: false
112
116
  end
113
- order.update_column(:completed_at, Time.current)
117
+ order.update_column(:completed_at, evaluator.completed_at)
114
118
  end
115
119
 
116
120
  factory :completed_order_with_pending_payment do
@@ -20,7 +20,10 @@ FactoryBot.define do
20
20
  sku { generate(:sku) }
21
21
  available_on { 1.year.ago }
22
22
  deleted_at { nil }
23
- shipping_category { |r| Spree::ShippingCategory.first || r.association(:shipping_category) }
23
+ shipping_category do |r|
24
+ Spree::ShippingCategory.first ||
25
+ r.association(:shipping_category, strategy: :create)
26
+ end
24
27
 
25
28
  # ensure stock item will be created for this products master
26
29
  before(:create) { create(:stock_location) if Spree::StockLocation.count == 0 }
@@ -11,11 +11,11 @@ end
11
11
 
12
12
  FactoryBot.define do
13
13
  factory :store_credit, class: 'Spree::StoreCredit' do
14
- user
15
- association :created_by, factory: :user
16
- association :category, factory: :store_credit_category
14
+ association :user, strategy: :create
15
+ association :created_by, factory: :user, strategy: :create
16
+ association :category, factory: :store_credit_category, strategy: :create
17
17
  amount { 150.00 }
18
18
  currency { "USD" }
19
- association :credit_type, factory: :primary_credit_type
19
+ association :credit_type, factory: :primary_credit_type, strategy: :create
20
20
  end
21
21
  end
@@ -21,6 +21,12 @@ FactoryBot.define do
21
21
  end
22
22
  end
23
23
 
24
+ trait :with_orders do
25
+ after(:create) do |user, _|
26
+ create(:order, user: user)
27
+ end
28
+ end
29
+
24
30
  factory :admin_user do
25
31
  after(:create) do |user, _|
26
32
  admin_role = Spree::Role.find_by(name: 'admin') || create(:role, name: 'admin')
@@ -44,7 +44,7 @@ module Spree
44
44
  def self.check_version
45
45
  require "factory_bot/version"
46
46
 
47
- requirement = Gem::Requirement.new("~> 4.8")
47
+ requirement = Gem::Requirement.new(">= 4.8")
48
48
  version = Gem::Version.new(::FactoryBot::VERSION)
49
49
 
50
50
  unless requirement.satisfied_by? version
@@ -3,11 +3,11 @@
3
3
  module Spree
4
4
  module TestingSupport
5
5
  class OrderWalkthrough
6
- def self.up_to(state)
7
- new.up_to(state)
6
+ def self.up_to(state, user: nil)
7
+ new.up_to(state, user: user)
8
8
  end
9
9
 
10
- def up_to(state)
10
+ def up_to(state, user: nil)
11
11
  # Need to create a valid zone too...
12
12
  @zone = ::FactoryBot.create(:zone)
13
13
  @country = ::FactoryBot.create(:country)
@@ -23,6 +23,7 @@ module Spree
23
23
  end
24
24
 
25
25
  order = Spree::Order.create!(
26
+ user: user,
26
27
  email: "solidus@example.com",
27
28
  store: Spree::Store.first || ::FactoryBot.create(:store)
28
29
  )
@@ -61,7 +62,7 @@ module Spree
61
62
  end
62
63
 
63
64
  def payment(order)
64
- credit_card = ::FactoryBot.create(:credit_card)
65
+ credit_card = ::FactoryBot.create(:credit_card, user: order.user)
65
66
  order.payments.create!(payment_method: credit_card.payment_method, amount: order.total, source: credit_card)
66
67
  # TODO: maybe look at some way of making this payment_state change automatic
67
68
  order.payment_state = 'paid'
@@ -0,0 +1,9 @@
1
+ # frozen_string_literal: true
2
+
3
+ RSpec.configure do |config|
4
+ config.around(:each, silence_deprecations: true) do |example|
5
+ Spree::Deprecation.silence do
6
+ example.run
7
+ end
8
+ end
9
+ end
@@ -0,0 +1,29 @@
1
+ # frozen_string_literal: true
2
+
3
+ namespace :payment_method do
4
+ desc "Deactivates old payment methods and fixes ActiveRecord::SubclassNotFound error, "\
5
+ "which happens after switching Payment Service Provider."
6
+ task deactivate_unsupported_payment_methods: :environment do
7
+ Spree::PaymentMethod.pluck(:id, :type).select do |id, type|
8
+ type.constantize
9
+ rescue NameError
10
+ fix_payment_method_record(id, type)
11
+ end
12
+ end
13
+
14
+ def fix_payment_method_record(id, previous_type)
15
+ connection = ActiveRecord::Base.connection
16
+ false_value = connection.quoted_false
17
+ connection.exec_update(<<-SQL
18
+ UPDATE spree_payment_methods
19
+ SET
20
+ type='#{Spree::PaymentMethod.name}',
21
+ type_before_removal='#{previous_type}',
22
+ active=#{false_value},
23
+ available_to_users=#{false_value},
24
+ available_to_admin=#{false_value}
25
+ WHERE id=#{id};
26
+ SQL
27
+ )
28
+ end
29
+ end
@@ -1,8 +1,8 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  namespace :solidus do
4
- desc "Delete Spree::Price records which amount field is NULL"
4
+ desc "Delete Spree::Price records (including discarded) which amount field is NULL"
5
5
  task delete_prices_with_nil_amount: :environment do
6
- Spree::Price.where(amount: nil).delete_all
6
+ Spree::Price.with_discarded.where(amount: nil).delete_all
7
7
  end
8
8
  end
@@ -0,0 +1,33 @@
1
+ # frozen_string_literal: true
2
+
3
+ namespace :solidus do
4
+ desc "Split Promotions with 'any' match policy"
5
+ task split_promotions_with_any_match_policy: :environment do
6
+ Spree::Promotion.where(match_policy: :any).includes(:promotion_rules).all.each do |promotion|
7
+ if promotion.promotion_rules.length <= 1
8
+ promotion.update!(match_policy: :all)
9
+ elsif promotion.active?
10
+ promotion.rules.map do |rule|
11
+ new_promotion = promotion.dup
12
+ new_promotion.promotion_rules = [rule]
13
+ new_promotion.match_policy = "all"
14
+ new_promotion.promotion_actions = promotion.actions.map do |action|
15
+ new_action = action.dup
16
+ if action.respond_to?(:calculator)
17
+ new_action.calculator = action.calculator.dup
18
+ end
19
+ new_action.promotion = new_promotion
20
+ new_action.save!
21
+ new_action
22
+ end
23
+ new_promotion.expires_at = promotion.expires_at
24
+ new_promotion.starts_at = Time.current
25
+ new_promotion.save!
26
+ end
27
+ promotion.update!(expires_at: Time.current)
28
+ end
29
+ end
30
+
31
+ Spree::Order.where(completed_at: nil).each { |order| Spree::PromotionHandler::Cart.new(order).activate }
32
+ end
33
+ end
data/solidus_core.gemspec CHANGED
@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
14
14
  s.homepage = 'http://solidus.io'
15
15
  s.license = 'BSD-3-Clause'
16
16
 
17
+ s.metadata['rubygems_mfa_required'] = 'true'
18
+
17
19
  s.files = `git ls-files -z`.split("\x0").reject do |f|
18
20
  f.match(%r{^(spec|script)/})
19
21
  end
@@ -25,7 +27,7 @@ Gem::Specification.new do |s|
25
27
  actionmailer actionpack actionview activejob activemodel activerecord
26
28
  activesupport railties
27
29
  ].each do |rails_dep|
28
- s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
30
+ s.add_dependency rails_dep, ['>= 5.2', '< 7.1.x']
29
31
  end
30
32
 
31
33
  s.add_dependency 'activemerchant', '~> 1.66'
@@ -39,9 +41,12 @@ Gem::Specification.new do |s|
39
41
  s.add_dependency 'kaminari-activerecord', '~> 1.1'
40
42
  s.add_dependency 'mini_magick', '~> 4.10'
41
43
  s.add_dependency 'monetize', '~> 1.8'
42
- s.add_dependency 'kt-paperclip', '~> 6.3'
44
+ s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
45
+ s.add_dependency 'psych', ['>= 3.1.0', '< 5.0']
43
46
  s.add_dependency 'ransack', '~> 2.0'
47
+ s.add_dependency 'sprockets-rails'
44
48
  s.add_dependency 'state_machines-activerecord', '~> 0.6'
49
+ s.add_dependency 'omnes', '~> 0.2.2'
45
50
 
46
51
  s.post_install_message = <<-MSG
47
52
  -------------------------------------------------------------
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.6
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-06-01 00:00:00.000000000 Z
11
+ date: 2022-08-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: actionmailer
@@ -19,7 +19,7 @@ dependencies:
19
19
  version: '5.2'
20
20
  - - "<"
21
21
  - !ruby/object:Gem::Version
22
- version: 6.2.x
22
+ version: 7.1.x
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  version: '5.2'
30
30
  - - "<"
31
31
  - !ruby/object:Gem::Version
32
- version: 6.2.x
32
+ version: 7.1.x
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: actionpack
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: '5.2'
40
40
  - - "<"
41
41
  - !ruby/object:Gem::Version
42
- version: 6.2.x
42
+ version: 7.1.x
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: '5.2'
50
50
  - - "<"
51
51
  - !ruby/object:Gem::Version
52
- version: 6.2.x
52
+ version: 7.1.x
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: actionview
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
59
59
  version: '5.2'
60
60
  - - "<"
61
61
  - !ruby/object:Gem::Version
62
- version: 6.2.x
62
+ version: 7.1.x
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
69
69
  version: '5.2'
70
70
  - - "<"
71
71
  - !ruby/object:Gem::Version
72
- version: 6.2.x
72
+ version: 7.1.x
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: activejob
75
75
  requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ dependencies:
79
79
  version: '5.2'
80
80
  - - "<"
81
81
  - !ruby/object:Gem::Version
82
- version: 6.2.x
82
+ version: 7.1.x
83
83
  type: :runtime
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ dependencies:
89
89
  version: '5.2'
90
90
  - - "<"
91
91
  - !ruby/object:Gem::Version
92
- version: 6.2.x
92
+ version: 7.1.x
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: activemodel
95
95
  requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ dependencies:
99
99
  version: '5.2'
100
100
  - - "<"
101
101
  - !ruby/object:Gem::Version
102
- version: 6.2.x
102
+ version: 7.1.x
103
103
  type: :runtime
104
104
  prerelease: false
105
105
  version_requirements: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
109
109
  version: '5.2'
110
110
  - - "<"
111
111
  - !ruby/object:Gem::Version
112
- version: 6.2.x
112
+ version: 7.1.x
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: activerecord
115
115
  requirement: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
119
119
  version: '5.2'
120
120
  - - "<"
121
121
  - !ruby/object:Gem::Version
122
- version: 6.2.x
122
+ version: 7.1.x
123
123
  type: :runtime
124
124
  prerelease: false
125
125
  version_requirements: !ruby/object:Gem::Requirement
@@ -129,7 +129,7 @@ dependencies:
129
129
  version: '5.2'
130
130
  - - "<"
131
131
  - !ruby/object:Gem::Version
132
- version: 6.2.x
132
+ version: 7.1.x
133
133
  - !ruby/object:Gem::Dependency
134
134
  name: activesupport
135
135
  requirement: !ruby/object:Gem::Requirement
@@ -139,7 +139,7 @@ dependencies:
139
139
  version: '5.2'
140
140
  - - "<"
141
141
  - !ruby/object:Gem::Version
142
- version: 6.2.x
142
+ version: 7.1.x
143
143
  type: :runtime
144
144
  prerelease: false
145
145
  version_requirements: !ruby/object:Gem::Requirement
@@ -149,7 +149,7 @@ dependencies:
149
149
  version: '5.2'
150
150
  - - "<"
151
151
  - !ruby/object:Gem::Version
152
- version: 6.2.x
152
+ version: 7.1.x
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: railties
155
155
  requirement: !ruby/object:Gem::Requirement
@@ -159,7 +159,7 @@ dependencies:
159
159
  version: '5.2'
160
160
  - - "<"
161
161
  - !ruby/object:Gem::Version
162
- version: 6.2.x
162
+ version: 7.1.x
163
163
  type: :runtime
164
164
  prerelease: false
165
165
  version_requirements: !ruby/object:Gem::Requirement
@@ -169,7 +169,7 @@ dependencies:
169
169
  version: '5.2'
170
170
  - - "<"
171
171
  - !ruby/object:Gem::Version
172
- version: 6.2.x
172
+ version: 7.1.x
173
173
  - !ruby/object:Gem::Dependency
174
174
  name: activemerchant
175
175
  requirement: !ruby/object:Gem::Requirement
@@ -334,16 +334,42 @@ dependencies:
334
334
  name: kt-paperclip
335
335
  requirement: !ruby/object:Gem::Requirement
336
336
  requirements:
337
- - - "~>"
337
+ - - ">="
338
338
  - !ruby/object:Gem::Version
339
339
  version: '6.3'
340
+ - - "<"
341
+ - !ruby/object:Gem::Version
342
+ version: '8'
340
343
  type: :runtime
341
344
  prerelease: false
342
345
  version_requirements: !ruby/object:Gem::Requirement
343
346
  requirements:
344
- - - "~>"
347
+ - - ">="
345
348
  - !ruby/object:Gem::Version
346
349
  version: '6.3'
350
+ - - "<"
351
+ - !ruby/object:Gem::Version
352
+ version: '8'
353
+ - !ruby/object:Gem::Dependency
354
+ name: psych
355
+ requirement: !ruby/object:Gem::Requirement
356
+ requirements:
357
+ - - ">="
358
+ - !ruby/object:Gem::Version
359
+ version: 3.1.0
360
+ - - "<"
361
+ - !ruby/object:Gem::Version
362
+ version: '5.0'
363
+ type: :runtime
364
+ prerelease: false
365
+ version_requirements: !ruby/object:Gem::Requirement
366
+ requirements:
367
+ - - ">="
368
+ - !ruby/object:Gem::Version
369
+ version: 3.1.0
370
+ - - "<"
371
+ - !ruby/object:Gem::Version
372
+ version: '5.0'
347
373
  - !ruby/object:Gem::Dependency
348
374
  name: ransack
349
375
  requirement: !ruby/object:Gem::Requirement
@@ -358,6 +384,20 @@ dependencies:
358
384
  - - "~>"
359
385
  - !ruby/object:Gem::Version
360
386
  version: '2.0'
387
+ - !ruby/object:Gem::Dependency
388
+ name: sprockets-rails
389
+ requirement: !ruby/object:Gem::Requirement
390
+ requirements:
391
+ - - ">="
392
+ - !ruby/object:Gem::Version
393
+ version: '0'
394
+ type: :runtime
395
+ prerelease: false
396
+ version_requirements: !ruby/object:Gem::Requirement
397
+ requirements:
398
+ - - ">="
399
+ - !ruby/object:Gem::Version
400
+ version: '0'
361
401
  - !ruby/object:Gem::Dependency
362
402
  name: state_machines-activerecord
363
403
  requirement: !ruby/object:Gem::Requirement
@@ -372,6 +412,20 @@ dependencies:
372
412
  - - "~>"
373
413
  - !ruby/object:Gem::Version
374
414
  version: '0.6'
415
+ - !ruby/object:Gem::Dependency
416
+ name: omnes
417
+ requirement: !ruby/object:Gem::Requirement
418
+ requirements:
419
+ - - "~>"
420
+ - !ruby/object:Gem::Version
421
+ version: 0.2.2
422
+ type: :runtime
423
+ prerelease: false
424
+ version_requirements: !ruby/object:Gem::Requirement
425
+ requirements:
426
+ - - "~>"
427
+ - !ruby/object:Gem::Version
428
+ version: 0.2.2
375
429
  description: Essential models, mailers, and classes for the Solidus e-commerce project.
376
430
  email: contact@solidus.io
377
431
  executables: []
@@ -641,6 +695,7 @@ files:
641
695
  - app/models/spree/zone.rb
642
696
  - app/models/spree/zone_member.rb
643
697
  - app/subscribers/spree/mailer_subscriber.rb
698
+ - app/subscribers/spree/order_mailer_subscriber.rb
644
699
  - app/views/layouts/spree/base_mailer.html.erb
645
700
  - app/views/spree/carton_mailer/shipped_email.html.erb
646
701
  - app/views/spree/carton_mailer/shipped_email.text.erb
@@ -659,6 +714,7 @@ files:
659
714
  - app/views/spree/shared/_error_messages.html.erb
660
715
  - app/views/spree/test_mailer/test_email.html.erb
661
716
  - app/views/spree/test_mailer/test_email.text.erb
717
+ - config/i18n-tasks.yml
662
718
  - config/initializers/assets.rb
663
719
  - config/initializers/friendly_id.rb
664
720
  - config/initializers/inflections.rb
@@ -703,15 +759,18 @@ files:
703
759
  - db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
704
760
  - db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
705
761
  - db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
762
+ - db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb
706
763
  - db/migrate/20210122110141_add_name_to_spree_addresses.rb
707
764
  - db/migrate/20210312061050_change_column_null_on_prices.rb
765
+ - db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
708
766
  - db/seeds.rb
709
767
  - lib/generators/solidus/install/install_generator.rb
768
+ - lib/generators/solidus/install/install_generator/bundler_context.rb
769
+ - lib/generators/solidus/install/install_generator/install_frontend.rb
770
+ - lib/generators/solidus/install/install_generator/support_solidus_frontend_extraction.rb
710
771
  - lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
711
772
  - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
712
- - lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/frontend/all.js
713
773
  - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/backend/all.css
714
- - lib/generators/solidus/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
715
774
  - lib/generators/solidus/update/templates/config/initializers/new_solidus_defaults.rb.tt
716
775
  - lib/generators/solidus/update/update_generator.rb
717
776
  - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -728,6 +787,7 @@ files:
728
787
  - lib/solidus/migrations/promotions_with_code_handlers.rb
729
788
  - lib/solidus_core.rb
730
789
  - lib/spree/app_configuration.rb
790
+ - lib/spree/bus.rb
731
791
  - lib/spree/config.rb
732
792
  - lib/spree/core.rb
733
793
  - lib/spree/core/active_merchant_dependencies.rb
@@ -812,10 +872,12 @@ files:
812
872
  - lib/spree/preferences/static_model_preferences.rb
813
873
  - lib/spree/preferences/statically_configurable.rb
814
874
  - lib/spree/preferences/store.rb
875
+ - lib/spree/rails_compatibility.rb
815
876
  - lib/spree/testing_support.rb
816
877
  - lib/spree/testing_support/ability_helpers.rb
817
878
  - lib/spree/testing_support/authorization_helpers.rb
818
879
  - lib/spree/testing_support/blacklist_urls.rb
880
+ - lib/spree/testing_support/bus_helpers.rb
819
881
  - lib/spree/testing_support/caching.rb
820
882
  - lib/spree/testing_support/capybara_ext.rb
821
883
  - lib/spree/testing_support/common_rake.rb
@@ -903,12 +965,15 @@ files:
903
965
  - lib/spree/testing_support/rake.rb
904
966
  - lib/spree/testing_support/sequences.rb
905
967
  - lib/spree/testing_support/shared_examples/gallery.rb
968
+ - lib/spree/testing_support/silence_deprecations.rb
906
969
  - lib/spree/testing_support/translations.rb
907
970
  - lib/spree/testing_support/url_helpers.rb
908
971
  - lib/spree/user_class_handle.rb
909
972
  - lib/spree_core.rb
973
+ - lib/tasks/payment_method.rake
910
974
  - lib/tasks/solidus/check_orders_with_invalid_email.rake
911
975
  - lib/tasks/solidus/delete_prices_with_nil_amount.rake
976
+ - lib/tasks/solidus/split_promotions_with_any_match_policy.rake
912
977
  - solidus_core.gemspec
913
978
  - vendor/assets/javascripts/jquery.payment.js
914
979
  - vendor/assets/javascripts/jsuri.js
@@ -916,7 +981,8 @@ files:
916
981
  homepage: http://solidus.io
917
982
  licenses:
918
983
  - BSD-3-Clause
919
- metadata: {}
984
+ metadata:
985
+ rubygems_mfa_required: 'true'
920
986
  post_install_message: |
921
987
  -------------------------------------------------------------
922
988
  Thank you for using Solidus
@@ -954,7 +1020,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
954
1020
  - !ruby/object:Gem::Version
955
1021
  version: 1.8.23
956
1022
  requirements: []
957
- rubygems_version: 3.2.31
1023
+ rubygems_version: 3.1.2
958
1024
  signing_key:
959
1025
  specification_version: 4
960
1026
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
@@ -1,10 +0,0 @@
1
- // This is a manifest file that'll be compiled into including all the files listed below.
2
- // Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
3
- // be included in the compiled file accessible from http://example.com/assets/application.js
4
- // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
5
- // the compiled file.
6
- //
7
- //= require jquery
8
- //= require rails-ujs
9
- //= require spree/frontend
10
- //= require_tree .