solidus_core 3.4.2 → 4.0.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/spree/products_helper.rb +1 -1
- data/app/models/concerns/spree/active_storage_adapter.rb +0 -17
- data/app/models/concerns/spree/default_price.rb +0 -15
- data/app/models/concerns/spree/ransackable_attributes.rb +0 -21
- data/app/models/spree/adjustment.rb +0 -13
- data/app/models/spree/carton.rb +1 -1
- data/app/models/spree/fulfilment_changer.rb +2 -14
- data/app/models/spree/option_value.rb +2 -11
- data/app/models/spree/order.rb +8 -20
- data/app/models/spree/order_updater.rb +0 -29
- data/app/models/spree/payment.rb +5 -37
- data/app/models/spree/product/scopes.rb +0 -5
- data/app/models/spree/product.rb +3 -10
- data/app/models/spree/promotion/rules/item_total.rb +0 -11
- data/app/models/spree/promotion.rb +7 -30
- data/app/models/spree/promotion_rule.rb +0 -5
- data/app/models/spree/taxon.rb +2 -2
- data/app/models/spree/taxonomy.rb +1 -1
- data/app/models/spree/variant/price_selector.rb +1 -14
- data/app/models/spree/variant.rb +1 -17
- data/db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb +16 -0
- data/db/migrate/20230321161854_change_column_null_option_values_option_type_id.rb +5 -0
- data/db/migrate/20230322085416_remove_match_policy_from_spree_promotion.rb +5 -0
- data/db/migrate/20230325132905_remove_unused_columns_from_promotion_rules.rb +6 -0
- data/db/migrate/20230325161633_drop_unused_promo_action_line_items.rb +13 -0
- data/db/migrate/20230425103509_remove_taxon_position.rb +5 -0
- data/db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb +11 -0
- data/lib/generators/solidus/install/app_templates/frontend/none.rb +1 -2
- data/lib/generators/solidus/install/app_templates/frontend/starter.rb +1 -3
- data/lib/generators/solidus/install/app_templates/payment_method/paypal.rb +2 -14
- data/lib/generators/solidus/install/app_templates/payment_method/stripe.rb +5 -0
- data/lib/generators/solidus/install/install_generator.rb +58 -152
- data/lib/spree/app_configuration.rb +2 -82
- data/lib/spree/bus.rb +0 -11
- data/lib/spree/core/controller_helpers/auth.rb +0 -16
- data/lib/spree/core/engine.rb +11 -31
- data/lib/spree/core/validators/email.rb +0 -4
- data/lib/spree/core/version.rb +2 -2
- data/lib/spree/core.rb +0 -2
- data/lib/spree/preferences/preferable_class_methods.rb +1 -25
- data/lib/spree/testing_support/common_rake.rb +5 -1
- data/lib/spree/testing_support/dummy_app/rake_tasks.rb +4 -8
- data/lib/spree/testing_support/dummy_app.rb +1 -6
- data/lib/spree/testing_support/factories/address_factory.rb +0 -7
- data/lib/spree/testing_support/factories/adjustment_factory.rb +0 -11
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +0 -5
- data/lib/spree/testing_support/factories/calculator_factory.rb +0 -5
- data/lib/spree/testing_support/factories/carton_factory.rb +0 -8
- data/lib/spree/testing_support/factories/country_factory.rb +0 -5
- data/lib/spree/testing_support/factories/credit_card_factory.rb +0 -5
- data/lib/spree/testing_support/factories/customer_return_factory.rb +0 -9
- data/lib/spree/testing_support/factories/image_factory.rb +0 -5
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +0 -10
- data/lib/spree/testing_support/factories/line_item_factory.rb +0 -8
- data/lib/spree/testing_support/factories/option_type_factory.rb +0 -8
- data/lib/spree/testing_support/factories/option_value_factory.rb +0 -5
- data/lib/spree/testing_support/factories/order_factory.rb +0 -12
- data/lib/spree/testing_support/factories/order_promotion_factory.rb +0 -8
- data/lib/spree/testing_support/factories/payment_factory.rb +0 -10
- data/lib/spree/testing_support/factories/payment_method_factory.rb +0 -5
- data/lib/spree/testing_support/factories/price_factory.rb +0 -7
- data/lib/spree/testing_support/factories/product_factory.rb +0 -11
- data/lib/spree/testing_support/factories/product_option_type_factory.rb +0 -8
- data/lib/spree/testing_support/factories/product_property_factory.rb +0 -8
- data/lib/spree/testing_support/factories/promotion_category_factory.rb +0 -5
- data/lib/spree/testing_support/factories/promotion_code_factory.rb +0 -8
- data/lib/spree/testing_support/factories/promotion_factory.rb +0 -8
- data/lib/spree/testing_support/factories/property_factory.rb +0 -5
- data/lib/spree/testing_support/factories/refund_factory.rb +0 -8
- data/lib/spree/testing_support/factories/refund_reason_factory.rb +0 -5
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +0 -7
- data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +0 -5
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +0 -9
- data/lib/spree/testing_support/factories/return_item_factory.rb +0 -9
- data/lib/spree/testing_support/factories/return_reason_factory.rb +0 -5
- data/lib/spree/testing_support/factories/role_factory.rb +0 -5
- data/lib/spree/testing_support/factories/shipment_factory.rb +0 -10
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +0 -5
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +0 -9
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +0 -8
- data/lib/spree/testing_support/factories/state_factory.rb +0 -8
- data/lib/spree/testing_support/factories/stock_item_factory.rb +0 -8
- data/lib/spree/testing_support/factories/stock_location_factory.rb +0 -9
- data/lib/spree/testing_support/factories/stock_movement_factory.rb +0 -7
- data/lib/spree/testing_support/factories/stock_package_factory.rb +0 -8
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +0 -5
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +0 -8
- data/lib/spree/testing_support/factories/store_credit_factory.rb +0 -9
- data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +0 -5
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +0 -5
- data/lib/spree/testing_support/factories/store_factory.rb +0 -5
- data/lib/spree/testing_support/factories/tax_category_factory.rb +0 -8
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +0 -9
- data/lib/spree/testing_support/factories/taxon_factory.rb +0 -7
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +0 -5
- data/lib/spree/testing_support/factories/user_factory.rb +0 -9
- data/lib/spree/testing_support/factories/variant_factory.rb +0 -10
- data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +0 -8
- data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +0 -9
- data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +0 -8
- data/lib/spree/testing_support/factories/zone_factory.rb +0 -8
- data/lib/spree/testing_support/factory_bot.rb +4 -28
- data/lib/spree/testing_support/sequences.rb +0 -5
- data/solidus_core.gemspec +2 -2
- metadata +43 -51
- data/app/subscribers/spree/mailer_subscriber.rb +0 -29
- data/lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb +0 -54
- data/lib/generators/solidus/install/app_templates/frontend/classic.rb +0 -16
- data/lib/generators/solidus/install/app_templates/payment_method/bolt.rb +0 -13
- data/lib/spree/core/controller_helpers/current_host.rb +0 -19
- data/lib/spree/event/adapters/active_support_notifications.rb +0 -67
- data/lib/spree/event/configuration.rb +0 -25
- data/lib/spree/event/subscriber.rb +0 -86
- data/lib/spree/event/subscriber_registry.rb +0 -92
- data/lib/spree/event.rb +0 -119
- data/lib/spree/promotion/match_policies.rb +0 -2
- data/lib/spree/rails_compatibility.rb +0 -106
- data/lib/spree/testing_support/factories.rb +0 -11
- data/lib/spree/testing_support.rb +0 -36
- data/lib/tasks/solidus/check_orders_with_invalid_email.rake +0 -18
- data/lib/tasks/solidus/split_promotions_with_any_match_policy.rake +0 -33
@@ -1,12 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/stock_item_factory'
|
8
|
-
end
|
9
|
-
|
10
3
|
FactoryBot.define do
|
11
4
|
factory :stock_movement, class: 'Spree::StockMovement' do
|
12
5
|
quantity { 1 }
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/inventory_unit_factory'
|
8
|
-
require 'spree/testing_support/factories/variant_factory'
|
9
|
-
end
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :stock_package, class: 'Spree::Stock::Package' do
|
13
5
|
skip_create
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
factory :store_credit_category, class: 'Spree::StoreCreditCategory' do
|
10
5
|
name { "Exchange" }
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/store_credit_factory'
|
8
|
-
require 'spree/testing_support/factories/store_credit_reason_factory'
|
9
|
-
end
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :store_credit_event, class: 'Spree::StoreCreditEvent' do
|
13
5
|
store_credit
|
@@ -1,14 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/store_credit_category_factory'
|
8
|
-
require 'spree/testing_support/factories/store_credit_type_factory'
|
9
|
-
require 'spree/testing_support/factories/user_factory'
|
10
|
-
end
|
11
|
-
|
12
3
|
FactoryBot.define do
|
13
4
|
factory :store_credit, class: 'Spree::StoreCredit' do
|
14
5
|
association :user, strategy: :create
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
factory :store_credit_reason, class: 'Spree::StoreCreditReason' do
|
10
5
|
sequence :name do |n|
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
factory :primary_credit_type, class: 'Spree::StoreCreditType' do
|
10
5
|
name { Spree::StoreCreditType::DEFAULT_TYPE_NAME }
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
factory :store, class: 'Spree::Store' do
|
10
5
|
sequence(:code) { |i| "spree_#{i}" }
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/sequences'
|
8
|
-
end
|
9
|
-
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :tax_category, class: 'Spree::TaxCategory' do
|
13
5
|
name { "TaxCategory - #{rand(999_999)}" }
|
@@ -1,14 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/calculator_factory'
|
8
|
-
require 'spree/testing_support/factories/tax_category_factory'
|
9
|
-
require 'spree/testing_support/factories/zone_factory'
|
10
|
-
end
|
11
|
-
|
12
3
|
FactoryBot.define do
|
13
4
|
factory :tax_rate, class: 'Spree::TaxRate' do
|
14
5
|
zone
|
@@ -1,12 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/taxonomy_factory'
|
8
|
-
end
|
9
|
-
|
10
3
|
FactoryBot.define do
|
11
4
|
factory :taxon, class: 'Spree::Taxon' do
|
12
5
|
name { 'Ruby on Rails' }
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
factory :taxonomy, class: 'Spree::Taxonomy' do
|
10
5
|
sequence :name do |seq|
|
@@ -1,14 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/sequences'
|
8
|
-
require 'spree/testing_support/factories/role_factory'
|
9
|
-
require 'spree/testing_support/factories/address_factory'
|
10
|
-
end
|
11
|
-
|
12
3
|
FactoryBot.define do
|
13
4
|
factory :user, class: Spree::UserClassHandle.new do
|
14
5
|
email { generate(:email) }
|
@@ -1,15 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/sequences'
|
8
|
-
require 'spree/testing_support/factories/option_value_factory'
|
9
|
-
require 'spree/testing_support/factories/option_type_factory'
|
10
|
-
require 'spree/testing_support/factories/product_factory'
|
11
|
-
end
|
12
|
-
|
13
3
|
FactoryBot.define do
|
14
4
|
sequence(:random_float) { BigDecimal("#{rand(200)}.#{rand(99)}") }
|
15
5
|
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/option_value_factory'
|
8
|
-
require 'spree/testing_support/factories/variant_property_rule_factory'
|
9
|
-
end
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :variant_property_rule_condition, class: 'Spree::VariantPropertyRuleCondition' do
|
13
5
|
variant_property_rule
|
@@ -1,14 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/product_factory'
|
8
|
-
require 'spree/testing_support/factories/property_factory'
|
9
|
-
require 'spree/testing_support/factories/option_value_factory'
|
10
|
-
end
|
11
|
-
|
12
3
|
FactoryBot.define do
|
13
4
|
factory :variant_property_rule, class: 'Spree::VariantPropertyRule' do
|
14
5
|
product
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/factories/variant_property_rule_factory'
|
8
|
-
require 'spree/testing_support/factories/property_factory'
|
9
|
-
end
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :variant_property_rule_value, class: 'Spree::VariantPropertyRuleValue' do
|
13
5
|
variant_property_rule
|
@@ -1,13 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
|
7
|
-
require 'spree/testing_support/sequences'
|
8
|
-
require 'spree/testing_support/factories/country_factory'
|
9
|
-
end
|
10
|
-
|
11
3
|
FactoryBot.define do
|
12
4
|
factory :global_zone, class: 'Spree::Zone' do
|
13
5
|
initialize_with { Spree::Zone.find_or_initialize_by(name: 'GlobalZone') }
|
@@ -17,30 +17,6 @@ module Spree
|
|
17
17
|
@paths ||= PATHS.map { |path| path.sub(/.rb\z/, '') }
|
18
18
|
end
|
19
19
|
|
20
|
-
def self.when_cherry_picked
|
21
|
-
callsites = caller
|
22
|
-
|
23
|
-
# All good if the factory is being loaded by FactoryBot or from `testing_support/factories.rb`.
|
24
|
-
return if callsites.find do |line|
|
25
|
-
line.include?("/factory_bot/find_definitions.rb") ||
|
26
|
-
line.include?("/spree/testing_support/factories.rb")
|
27
|
-
end
|
28
|
-
|
29
|
-
yield
|
30
|
-
end
|
31
|
-
|
32
|
-
def self.deprecate_cherry_picking
|
33
|
-
callsites = caller
|
34
|
-
core_root = Spree::Core::Engine.root.to_s
|
35
|
-
index = callsites.index { |line| !line.start_with? core_root }
|
36
|
-
|
37
|
-
Spree::Deprecation.warn(
|
38
|
-
"Please do not cherry-pick factories, this is not well supported by FactoryBot, " \
|
39
|
-
'follow the changelog instructions on how to migrate your current setup.',
|
40
|
-
callsites[index..]
|
41
|
-
)
|
42
|
-
end
|
43
|
-
|
44
20
|
def self.check_version
|
45
21
|
require "factory_bot/version"
|
46
22
|
|
@@ -48,10 +24,10 @@ module Spree
|
|
48
24
|
version = Gem::Version.new(::FactoryBot::VERSION)
|
49
25
|
|
50
26
|
unless requirement.satisfied_by? version
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
27
|
+
raise <<~MSG
|
28
|
+
Please be aware that the supported version of FactoryBot is #{requirement},
|
29
|
+
using version #{version} could lead to factory loading issues.
|
30
|
+
MSG
|
55
31
|
end
|
56
32
|
end
|
57
33
|
deprecate :check_version, deprecator: Spree::Deprecation
|
@@ -1,10 +1,5 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require 'spree/testing_support/factory_bot'
|
4
|
-
Spree::TestingSupport::FactoryBot.when_cherry_picked do
|
5
|
-
Spree::TestingSupport::FactoryBot.deprecate_cherry_picking
|
6
|
-
end
|
7
|
-
|
8
3
|
FactoryBot.define do
|
9
4
|
sequence(:sku) { |n| "SKU-#{n}" }
|
10
5
|
sequence(:email) { |n| "email#{n}@example.com" }
|
data/solidus_core.gemspec
CHANGED
@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
|
|
20
20
|
f.match(%r{^(spec|script)/})
|
21
21
|
end
|
22
22
|
|
23
|
-
s.required_ruby_version = '>=
|
23
|
+
s.required_ruby_version = '>= 3.0.0'
|
24
24
|
s.required_rubygems_version = '>= 1.8.23'
|
25
25
|
|
26
26
|
%w[
|
27
27
|
actionmailer actionpack actionview activejob activemodel activerecord
|
28
28
|
activesupport railties
|
29
29
|
].each do |rails_dep|
|
30
|
-
s.add_dependency rails_dep, ['>=
|
30
|
+
s.add_dependency rails_dep, ['>= 7.0', '< 7.1']
|
31
31
|
end
|
32
32
|
|
33
33
|
s.add_dependency 'activemerchant', '~> 1.66'
|
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:
|
4
|
+
version: 4.0.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: 2023-05-
|
11
|
+
date: 2023-05-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -16,160 +16,160 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - ">="
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '7.0'
|
20
20
|
- - "<"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 7.1
|
22
|
+
version: '7.1'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - ">="
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: '
|
29
|
+
version: '7.0'
|
30
30
|
- - "<"
|
31
31
|
- !ruby/object:Gem::Version
|
32
|
-
version: 7.1
|
32
|
+
version: '7.1'
|
33
33
|
- !ruby/object:Gem::Dependency
|
34
34
|
name: actionpack
|
35
35
|
requirement: !ruby/object:Gem::Requirement
|
36
36
|
requirements:
|
37
37
|
- - ">="
|
38
38
|
- !ruby/object:Gem::Version
|
39
|
-
version: '
|
39
|
+
version: '7.0'
|
40
40
|
- - "<"
|
41
41
|
- !ruby/object:Gem::Version
|
42
|
-
version: 7.1
|
42
|
+
version: '7.1'
|
43
43
|
type: :runtime
|
44
44
|
prerelease: false
|
45
45
|
version_requirements: !ruby/object:Gem::Requirement
|
46
46
|
requirements:
|
47
47
|
- - ">="
|
48
48
|
- !ruby/object:Gem::Version
|
49
|
-
version: '
|
49
|
+
version: '7.0'
|
50
50
|
- - "<"
|
51
51
|
- !ruby/object:Gem::Version
|
52
|
-
version: 7.1
|
52
|
+
version: '7.1'
|
53
53
|
- !ruby/object:Gem::Dependency
|
54
54
|
name: actionview
|
55
55
|
requirement: !ruby/object:Gem::Requirement
|
56
56
|
requirements:
|
57
57
|
- - ">="
|
58
58
|
- !ruby/object:Gem::Version
|
59
|
-
version: '
|
59
|
+
version: '7.0'
|
60
60
|
- - "<"
|
61
61
|
- !ruby/object:Gem::Version
|
62
|
-
version: 7.1
|
62
|
+
version: '7.1'
|
63
63
|
type: :runtime
|
64
64
|
prerelease: false
|
65
65
|
version_requirements: !ruby/object:Gem::Requirement
|
66
66
|
requirements:
|
67
67
|
- - ">="
|
68
68
|
- !ruby/object:Gem::Version
|
69
|
-
version: '
|
69
|
+
version: '7.0'
|
70
70
|
- - "<"
|
71
71
|
- !ruby/object:Gem::Version
|
72
|
-
version: 7.1
|
72
|
+
version: '7.1'
|
73
73
|
- !ruby/object:Gem::Dependency
|
74
74
|
name: activejob
|
75
75
|
requirement: !ruby/object:Gem::Requirement
|
76
76
|
requirements:
|
77
77
|
- - ">="
|
78
78
|
- !ruby/object:Gem::Version
|
79
|
-
version: '
|
79
|
+
version: '7.0'
|
80
80
|
- - "<"
|
81
81
|
- !ruby/object:Gem::Version
|
82
|
-
version: 7.1
|
82
|
+
version: '7.1'
|
83
83
|
type: :runtime
|
84
84
|
prerelease: false
|
85
85
|
version_requirements: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - ">="
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
89
|
+
version: '7.0'
|
90
90
|
- - "<"
|
91
91
|
- !ruby/object:Gem::Version
|
92
|
-
version: 7.1
|
92
|
+
version: '7.1'
|
93
93
|
- !ruby/object:Gem::Dependency
|
94
94
|
name: activemodel
|
95
95
|
requirement: !ruby/object:Gem::Requirement
|
96
96
|
requirements:
|
97
97
|
- - ">="
|
98
98
|
- !ruby/object:Gem::Version
|
99
|
-
version: '
|
99
|
+
version: '7.0'
|
100
100
|
- - "<"
|
101
101
|
- !ruby/object:Gem::Version
|
102
|
-
version: 7.1
|
102
|
+
version: '7.1'
|
103
103
|
type: :runtime
|
104
104
|
prerelease: false
|
105
105
|
version_requirements: !ruby/object:Gem::Requirement
|
106
106
|
requirements:
|
107
107
|
- - ">="
|
108
108
|
- !ruby/object:Gem::Version
|
109
|
-
version: '
|
109
|
+
version: '7.0'
|
110
110
|
- - "<"
|
111
111
|
- !ruby/object:Gem::Version
|
112
|
-
version: 7.1
|
112
|
+
version: '7.1'
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: activerecord
|
115
115
|
requirement: !ruby/object:Gem::Requirement
|
116
116
|
requirements:
|
117
117
|
- - ">="
|
118
118
|
- !ruby/object:Gem::Version
|
119
|
-
version: '
|
119
|
+
version: '7.0'
|
120
120
|
- - "<"
|
121
121
|
- !ruby/object:Gem::Version
|
122
|
-
version: 7.1
|
122
|
+
version: '7.1'
|
123
123
|
type: :runtime
|
124
124
|
prerelease: false
|
125
125
|
version_requirements: !ruby/object:Gem::Requirement
|
126
126
|
requirements:
|
127
127
|
- - ">="
|
128
128
|
- !ruby/object:Gem::Version
|
129
|
-
version: '
|
129
|
+
version: '7.0'
|
130
130
|
- - "<"
|
131
131
|
- !ruby/object:Gem::Version
|
132
|
-
version: 7.1
|
132
|
+
version: '7.1'
|
133
133
|
- !ruby/object:Gem::Dependency
|
134
134
|
name: activesupport
|
135
135
|
requirement: !ruby/object:Gem::Requirement
|
136
136
|
requirements:
|
137
137
|
- - ">="
|
138
138
|
- !ruby/object:Gem::Version
|
139
|
-
version: '
|
139
|
+
version: '7.0'
|
140
140
|
- - "<"
|
141
141
|
- !ruby/object:Gem::Version
|
142
|
-
version: 7.1
|
142
|
+
version: '7.1'
|
143
143
|
type: :runtime
|
144
144
|
prerelease: false
|
145
145
|
version_requirements: !ruby/object:Gem::Requirement
|
146
146
|
requirements:
|
147
147
|
- - ">="
|
148
148
|
- !ruby/object:Gem::Version
|
149
|
-
version: '
|
149
|
+
version: '7.0'
|
150
150
|
- - "<"
|
151
151
|
- !ruby/object:Gem::Version
|
152
|
-
version: 7.1
|
152
|
+
version: '7.1'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
154
|
name: railties
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - ">="
|
158
158
|
- !ruby/object:Gem::Version
|
159
|
-
version: '
|
159
|
+
version: '7.0'
|
160
160
|
- - "<"
|
161
161
|
- !ruby/object:Gem::Version
|
162
|
-
version: 7.1
|
162
|
+
version: '7.1'
|
163
163
|
type: :runtime
|
164
164
|
prerelease: false
|
165
165
|
version_requirements: !ruby/object:Gem::Requirement
|
166
166
|
requirements:
|
167
167
|
- - ">="
|
168
168
|
- !ruby/object:Gem::Version
|
169
|
-
version: '
|
169
|
+
version: '7.0'
|
170
170
|
- - "<"
|
171
171
|
- !ruby/object:Gem::Version
|
172
|
-
version: 7.1
|
172
|
+
version: '7.1'
|
173
173
|
- !ruby/object:Gem::Dependency
|
174
174
|
name: activemerchant
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
@@ -697,7 +697,6 @@ files:
|
|
697
697
|
- app/models/spree/wallet_payment_source.rb
|
698
698
|
- app/models/spree/zone.rb
|
699
699
|
- app/models/spree/zone_member.rb
|
700
|
-
- app/subscribers/spree/mailer_subscriber.rb
|
701
700
|
- app/subscribers/spree/order_mailer_subscriber.rb
|
702
701
|
- app/views/layouts/spree/base_mailer.html.erb
|
703
702
|
- app/views/spree/carton_mailer/shipped_email.html.erb
|
@@ -765,22 +764,27 @@ files:
|
|
765
764
|
- db/migrate/20201127212108_add_type_before_removal_to_spree_payment_methods.rb
|
766
765
|
- db/migrate/20210122110141_add_name_to_spree_addresses.rb
|
767
766
|
- db/migrate/20210312061050_change_column_null_on_prices.rb
|
767
|
+
- db/migrate/20210815004823_add_unique_index_to_option_values_variants.rb
|
768
768
|
- db/migrate/20220317165036_set_promotions_with_any_policy_to_all_if_possible.rb
|
769
769
|
- db/migrate/20220805202442_add_level_to_spree_tax_rates.rb
|
770
770
|
- db/migrate/20221123152807_add_shipping_category_to_spree_variants.rb
|
771
|
+
- db/migrate/20230321161854_change_column_null_option_values_option_type_id.rb
|
772
|
+
- db/migrate/20230322085416_remove_match_policy_from_spree_promotion.rb
|
773
|
+
- db/migrate/20230325132905_remove_unused_columns_from_promotion_rules.rb
|
774
|
+
- db/migrate/20230325161633_drop_unused_promo_action_line_items.rb
|
775
|
+
- db/migrate/20230425103509_remove_taxon_position.rb
|
776
|
+
- db/migrate/20230427095534_drop_deprecated_address_id_from_shipments.rb
|
771
777
|
- db/seeds.rb
|
772
778
|
- lib/generators/solidus/install/app_templates/authentication/custom.rb
|
773
779
|
- lib/generators/solidus/install/app_templates/authentication/devise.rb
|
774
780
|
- lib/generators/solidus/install/app_templates/authentication/existing.rb
|
775
781
|
- lib/generators/solidus/install/app_templates/authentication/none.rb
|
776
|
-
- lib/generators/solidus/install/app_templates/frontend/break_down_solidus_gem.rb
|
777
|
-
- lib/generators/solidus/install/app_templates/frontend/classic.rb
|
778
782
|
- lib/generators/solidus/install/app_templates/frontend/none.rb
|
779
783
|
- lib/generators/solidus/install/app_templates/frontend/starter.rb
|
780
|
-
- lib/generators/solidus/install/app_templates/payment_method/bolt.rb
|
781
784
|
- lib/generators/solidus/install/app_templates/payment_method/braintree.rb
|
782
785
|
- lib/generators/solidus/install/app_templates/payment_method/none.rb
|
783
786
|
- lib/generators/solidus/install/app_templates/payment_method/paypal.rb
|
787
|
+
- lib/generators/solidus/install/app_templates/payment_method/stripe.rb
|
784
788
|
- lib/generators/solidus/install/install_generator.rb
|
785
789
|
- lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
|
786
790
|
- lib/generators/solidus/install/templates/vendor/assets/javascripts/spree/backend/all.js
|
@@ -808,7 +812,6 @@ files:
|
|
808
812
|
- lib/spree/core/class_constantizer.rb
|
809
813
|
- lib/spree/core/controller_helpers/auth.rb
|
810
814
|
- lib/spree/core/controller_helpers/common.rb
|
811
|
-
- lib/spree/core/controller_helpers/current_host.rb
|
812
815
|
- lib/spree/core/controller_helpers/order.rb
|
813
816
|
- lib/spree/core/controller_helpers/payment_parameters.rb
|
814
817
|
- lib/spree/core/controller_helpers/pricing.rb
|
@@ -844,11 +847,6 @@ files:
|
|
844
847
|
- lib/spree/core/versioned_value.rb
|
845
848
|
- lib/spree/deprecation.rb
|
846
849
|
- lib/spree/encryptor.rb
|
847
|
-
- lib/spree/event.rb
|
848
|
-
- lib/spree/event/adapters/active_support_notifications.rb
|
849
|
-
- lib/spree/event/configuration.rb
|
850
|
-
- lib/spree/event/subscriber.rb
|
851
|
-
- lib/spree/event/subscriber_registry.rb
|
852
850
|
- lib/spree/i18n.rb
|
853
851
|
- lib/spree/localized_number.rb
|
854
852
|
- lib/spree/mailer_previews/carton_preview.rb
|
@@ -886,9 +884,6 @@ files:
|
|
886
884
|
- lib/spree/preferences/static_model_preferences.rb
|
887
885
|
- lib/spree/preferences/statically_configurable.rb
|
888
886
|
- lib/spree/preferences/store.rb
|
889
|
-
- lib/spree/promotion/match_policies.rb
|
890
|
-
- lib/spree/rails_compatibility.rb
|
891
|
-
- lib/spree/testing_support.rb
|
892
887
|
- lib/spree/testing_support/ability_helpers.rb
|
893
888
|
- lib/spree/testing_support/authorization_helpers.rb
|
894
889
|
- lib/spree/testing_support/blacklist_urls.rb
|
@@ -909,7 +904,6 @@ files:
|
|
909
904
|
- lib/spree/testing_support/dummy_app/routes.rb
|
910
905
|
- lib/spree/testing_support/dummy_app/views/layouts/application.html.erb
|
911
906
|
- lib/spree/testing_support/extension_rake.rb
|
912
|
-
- lib/spree/testing_support/factories.rb
|
913
907
|
- lib/spree/testing_support/factories/address_factory.rb
|
914
908
|
- lib/spree/testing_support/factories/adjustment_factory.rb
|
915
909
|
- lib/spree/testing_support/factories/adjustment_reason_factory.rb
|
@@ -988,9 +982,7 @@ files:
|
|
988
982
|
- lib/spree_core.rb
|
989
983
|
- lib/tasks/colorado_delivery_fee.rake
|
990
984
|
- lib/tasks/payment_method.rake
|
991
|
-
- lib/tasks/solidus/check_orders_with_invalid_email.rake
|
992
985
|
- lib/tasks/solidus/delete_prices_with_nil_amount.rake
|
993
|
-
- lib/tasks/solidus/split_promotions_with_any_match_policy.rake
|
994
986
|
- solidus_core.gemspec
|
995
987
|
- vendor/assets/javascripts/jquery.payment.js
|
996
988
|
- vendor/assets/javascripts/jsuri.js
|
@@ -1030,7 +1022,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
1030
1022
|
requirements:
|
1031
1023
|
- - ">="
|
1032
1024
|
- !ruby/object:Gem::Version
|
1033
|
-
version:
|
1025
|
+
version: 3.0.0
|
1034
1026
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
1035
1027
|
requirements:
|
1036
1028
|
- - ">="
|
@@ -1,29 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require 'spree/event/subscriber'
|
4
|
-
|
5
|
-
module Spree
|
6
|
-
# Legacy subscriber
|
7
|
-
#
|
8
|
-
# This subscriber module is used by the legacy pub/sub system (see
|
9
|
-
# {Spree::Event}).
|
10
|
-
module MailerSubscriber
|
11
|
-
include Spree::Event::Subscriber
|
12
|
-
|
13
|
-
event_action :order_finalized
|
14
|
-
event_action :send_reimbursement_email, event_name: :reimbursement_reimbursed
|
15
|
-
|
16
|
-
def order_finalized(event)
|
17
|
-
order = event.payload[:order]
|
18
|
-
unless order.confirmation_delivered?
|
19
|
-
Spree::Config.order_mailer_class.confirm_email(order).deliver_later
|
20
|
-
order.update_column(:confirmation_delivered, true)
|
21
|
-
end
|
22
|
-
end
|
23
|
-
|
24
|
-
def send_reimbursement_email(event)
|
25
|
-
reimbursement = event.payload[:reimbursement]
|
26
|
-
Spree::Config.reimbursement_mailer_class.reimbursement_email(reimbursement.id).deliver_later
|
27
|
-
end
|
28
|
-
end
|
29
|
-
end
|