solidus_core 2.11.4 → 2.11.9
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of solidus_core might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/app/models/concerns/spree/active_storage_adapter.rb +2 -0
- data/app/models/concerns/spree/active_storage_adapter/attachment.rb +11 -11
- data/app/models/spree/address.rb +28 -5
- data/app/models/spree/base.rb +39 -13
- data/app/models/spree/calculator.rb +4 -0
- data/app/models/spree/image/active_storage_attachment.rb +10 -2
- data/app/models/spree/image/paperclip_attachment.rb +1 -1
- data/app/models/spree/order_merger.rb +1 -1
- data/app/models/spree/payment.rb +10 -3
- data/app/models/spree/payment_method.rb +3 -0
- data/app/models/spree/payment_method/bogus_credit_card.rb +13 -9
- data/app/models/spree/payment_method/simple_bogus_credit_card.rb +4 -4
- data/app/models/spree/product.rb +8 -2
- data/app/models/spree/promotion_action.rb +3 -0
- data/app/models/spree/promotion_rule.rb +4 -0
- data/app/models/spree/refund.rb +5 -3
- data/app/models/spree/shipping_method.rb +1 -1
- data/app/models/spree/stock/availability_validator.rb +2 -2
- data/app/models/spree/stock/inventory_validator.rb +2 -2
- data/app/models/spree/taxon/active_storage_attachment.rb +1 -2
- data/app/models/spree/taxon/paperclip_attachment.rb +1 -0
- data/db/migrate/20210122110141_add_name_to_spree_addresses.rb +13 -0
- data/lib/generators/solidus/install/install_generator.rb +1 -1
- data/lib/generators/spree/dummy/templates/rails/test.rb +3 -0
- data/lib/spree/app_configuration.rb +8 -0
- data/lib/spree/core.rb +0 -4
- data/lib/spree/core/engine.rb +6 -7
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/preferences/persistable.rb +23 -0
- data/lib/spree/testing_support.rb +19 -28
- data/lib/spree/testing_support/dummy_app.rb +4 -2
- data/lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb +4 -0
- data/lib/spree/testing_support/factories.rb +8 -2
- data/lib/spree/testing_support/factories/address_factory.rb +6 -2
- data/lib/spree/testing_support/factories/adjustment_factory.rb +10 -2
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +4 -2
- data/lib/spree/testing_support/factories/calculator_factory.rb +4 -2
- data/lib/spree/testing_support/factories/carton_factory.rb +7 -2
- data/lib/spree/testing_support/factories/country_factory.rb +4 -2
- data/lib/spree/testing_support/factories/credit_card_factory.rb +4 -2
- data/lib/spree/testing_support/factories/customer_return_factory.rb +8 -2
- data/lib/spree/testing_support/factories/image_factory.rb +4 -2
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +9 -2
- data/lib/spree/testing_support/factories/line_item_factory.rb +7 -2
- data/lib/spree/testing_support/factories/option_type_factory.rb +7 -2
- data/lib/spree/testing_support/factories/option_value_factory.rb +4 -2
- data/lib/spree/testing_support/factories/order_factory.rb +11 -2
- data/lib/spree/testing_support/factories/order_promotion_factory.rb +7 -2
- data/lib/spree/testing_support/factories/payment_factory.rb +9 -2
- data/lib/spree/testing_support/factories/payment_method_factory.rb +4 -2
- data/lib/spree/testing_support/factories/price_factory.rb +6 -2
- data/lib/spree/testing_support/factories/product_factory.rb +10 -2
- data/lib/spree/testing_support/factories/product_option_type_factory.rb +7 -2
- data/lib/spree/testing_support/factories/product_property_factory.rb +7 -2
- data/lib/spree/testing_support/factories/promotion_category_factory.rb +4 -2
- data/lib/spree/testing_support/factories/promotion_code_factory.rb +7 -2
- data/lib/spree/testing_support/factories/promotion_factory.rb +7 -2
- data/lib/spree/testing_support/factories/property_factory.rb +4 -2
- data/lib/spree/testing_support/factories/refund_factory.rb +7 -2
- data/lib/spree/testing_support/factories/refund_reason_factory.rb +4 -2
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +6 -2
- data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +4 -2
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +8 -2
- data/lib/spree/testing_support/factories/return_item_factory.rb +8 -2
- data/lib/spree/testing_support/factories/return_reason_factory.rb +4 -2
- data/lib/spree/testing_support/factories/role_factory.rb +4 -2
- data/lib/spree/testing_support/factories/shipment_factory.rb +9 -2
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +4 -2
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +8 -2
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +7 -2
- data/lib/spree/testing_support/factories/state_factory.rb +7 -2
- data/lib/spree/testing_support/factories/stock_item_factory.rb +7 -2
- data/lib/spree/testing_support/factories/stock_location_factory.rb +8 -2
- data/lib/spree/testing_support/factories/stock_movement_factory.rb +6 -2
- data/lib/spree/testing_support/factories/stock_package_factory.rb +7 -2
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +4 -2
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +7 -2
- data/lib/spree/testing_support/factories/store_credit_factory.rb +8 -2
- data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +4 -2
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +4 -2
- data/lib/spree/testing_support/factories/store_factory.rb +4 -2
- data/lib/spree/testing_support/factories/tax_category_factory.rb +7 -2
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +8 -2
- data/lib/spree/testing_support/factories/taxon_factory.rb +6 -2
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +4 -2
- data/lib/spree/testing_support/factories/user_factory.rb +8 -2
- data/lib/spree/testing_support/factories/variant_factory.rb +9 -2
- data/lib/spree/testing_support/factories/variant_property_rule_condition_factory.rb +7 -2
- data/lib/spree/testing_support/factories/variant_property_rule_factory.rb +8 -2
- data/lib/spree/testing_support/factories/variant_property_rule_value_factory.rb +7 -2
- data/lib/spree/testing_support/factories/zone_factory.rb +7 -2
- data/lib/spree/testing_support/factory_bot.rb +68 -0
- data/lib/spree/testing_support/fixtures/file.txt +1 -0
- data/lib/spree/testing_support/order_walkthrough.rb +9 -9
- data/lib/spree/testing_support/sequences.rb +4 -1
- data/lib/tasks/migrations/migrate_address_names.rake +158 -0
- data/lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake +26 -0
- data/lib/tasks/upgrade.rake +13 -0
- data/solidus_core.gemspec +23 -1
- metadata +32 -6
- data/lib/spree/awesome_nested_set_override.rb +0 -44
@@ -0,0 +1,26 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
namespace :solidus do
|
4
|
+
namespace :migrations do
|
5
|
+
namespace :migrate_default_billing_addresses_to_address_book do
|
6
|
+
task up: :environment do
|
7
|
+
print "Migrating default billing addresses to address book ... "
|
8
|
+
if Spree::UserAddress.where(default_billing: true).any?
|
9
|
+
Spree.user_class.joins(:bill_address).update_all(bill_address_id: nil) # rubocop:disable Rails/SkipsModelValidations
|
10
|
+
end
|
11
|
+
Spree::UserAddress.joins(
|
12
|
+
<<~SQL
|
13
|
+
JOIN spree_users ON spree_user_addresses.user_id = spree_users.id
|
14
|
+
AND spree_user_addresses.address_id = spree_users.bill_address_id
|
15
|
+
SQL
|
16
|
+
).update_all(default_billing: true)
|
17
|
+
puts "Success"
|
18
|
+
end
|
19
|
+
|
20
|
+
task down: :environment do
|
21
|
+
Spree::UserAddress.update_all(default_billing: false) # rubocop:disable Rails/SkipsModelValidations
|
22
|
+
puts "Rolled back default billing address migration to address book"
|
23
|
+
end
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
@@ -0,0 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
namespace :solidus do
|
4
|
+
namespace :upgrade do
|
5
|
+
desc "Upgrade Solidus to version 2.11"
|
6
|
+
task two_point_eleven: [
|
7
|
+
'solidus:migrations:migrate_default_billing_addresses_to_address_book:up',
|
8
|
+
'solidus:migrations:migrate_address_names:up'
|
9
|
+
] do
|
10
|
+
puts "Your Solidus install is ready for Solidus 2.11"
|
11
|
+
end
|
12
|
+
end
|
13
|
+
end
|
data/solidus_core.gemspec
CHANGED
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
|
|
30
30
|
|
31
31
|
s.add_dependency 'activemerchant', '~> 1.66'
|
32
32
|
s.add_dependency 'acts_as_list', '< 2.0'
|
33
|
-
s.add_dependency 'awesome_nested_set', '~> 3.
|
33
|
+
s.add_dependency 'awesome_nested_set', '~> 3.3'
|
34
34
|
s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
|
35
35
|
s.add_dependency 'carmen', '~> 1.1.0'
|
36
36
|
s.add_dependency 'discard', '~> 1.0'
|
@@ -43,4 +43,26 @@ Gem::Specification.new do |s|
|
|
43
43
|
s.add_dependency 'paranoia', '~> 2.4'
|
44
44
|
s.add_dependency 'ransack', '~> 2.0'
|
45
45
|
s.add_dependency 'state_machines-activerecord', '~> 0.6'
|
46
|
+
|
47
|
+
s.post_install_message = <<-MSG
|
48
|
+
-------------------------------------------------------------
|
49
|
+
Thank you for using Solidus
|
50
|
+
-------------------------------------------------------------
|
51
|
+
If this is a fresh install, don't forget to run the Solidus
|
52
|
+
installer with the following command:
|
53
|
+
|
54
|
+
$ bin/rails g solidus:install
|
55
|
+
|
56
|
+
If you are updating Solidus from an older version, please run
|
57
|
+
the following commands to complete the update:
|
58
|
+
|
59
|
+
$ bin/rails railties:install:migrations
|
60
|
+
$ bin/rails db:migrate
|
61
|
+
$ bin/rails solidus:upgrade:two_point_eleven
|
62
|
+
|
63
|
+
Please report any issues at:
|
64
|
+
- https://github.com/solidusio/solidus/issues
|
65
|
+
- http://slack.solidus.io/
|
66
|
+
-------------------------------------------------------------
|
67
|
+
MSG
|
46
68
|
end
|
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: 2.11.
|
4
|
+
version: 2.11.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2021-
|
11
|
+
date: 2021-04-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: actionmailer
|
@@ -204,14 +204,14 @@ dependencies:
|
|
204
204
|
requirements:
|
205
205
|
- - "~>"
|
206
206
|
- !ruby/object:Gem::Version
|
207
|
-
version: '3.
|
207
|
+
version: '3.3'
|
208
208
|
type: :runtime
|
209
209
|
prerelease: false
|
210
210
|
version_requirements: !ruby/object:Gem::Requirement
|
211
211
|
requirements:
|
212
212
|
- - "~>"
|
213
213
|
- !ruby/object:Gem::Version
|
214
|
-
version: '3.
|
214
|
+
version: '3.3'
|
215
215
|
- !ruby/object:Gem::Dependency
|
216
216
|
name: cancancan
|
217
217
|
requirement: !ruby/object:Gem::Requirement
|
@@ -729,6 +729,7 @@ files:
|
|
729
729
|
- db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
|
730
730
|
- db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
|
731
731
|
- db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
|
732
|
+
- db/migrate/20210122110141_add_name_to_spree_addresses.rb
|
732
733
|
- db/seeds.rb
|
733
734
|
- lib/generators/solidus/install/install_generator.rb
|
734
735
|
- lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
|
@@ -751,7 +752,6 @@ files:
|
|
751
752
|
- lib/solidus/migrations/rename_gateways.rb
|
752
753
|
- lib/solidus_core.rb
|
753
754
|
- lib/spree/app_configuration.rb
|
754
|
-
- lib/spree/awesome_nested_set_override.rb
|
755
755
|
- lib/spree/config.rb
|
756
756
|
- lib/spree/core.rb
|
757
757
|
- lib/spree/core/active_merchant_dependencies.rb
|
@@ -829,6 +829,7 @@ files:
|
|
829
829
|
- lib/spree/permission_sets/user_management.rb
|
830
830
|
- lib/spree/permitted_attributes.rb
|
831
831
|
- lib/spree/preferences/configuration.rb
|
832
|
+
- lib/spree/preferences/persistable.rb
|
832
833
|
- lib/spree/preferences/preferable.rb
|
833
834
|
- lib/spree/preferences/preferable_class_methods.rb
|
834
835
|
- lib/spree/preferences/scoped_store.rb
|
@@ -851,6 +852,7 @@ files:
|
|
851
852
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
|
852
853
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
|
853
854
|
- lib/spree/testing_support/dummy_app/database.yml
|
855
|
+
- lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
|
854
856
|
- lib/spree/testing_support/dummy_app/migrations.rb
|
855
857
|
- lib/spree/testing_support/dummy_app/rake_tasks.rb
|
856
858
|
- lib/spree/testing_support/dummy_app/routes.rb
|
@@ -915,7 +917,9 @@ files:
|
|
915
917
|
- lib/spree/testing_support/factories/variant_property_rule_factory.rb
|
916
918
|
- lib/spree/testing_support/factories/variant_property_rule_value_factory.rb
|
917
919
|
- lib/spree/testing_support/factories/zone_factory.rb
|
920
|
+
- lib/spree/testing_support/factory_bot.rb
|
918
921
|
- lib/spree/testing_support/fixtures/blank.jpg
|
922
|
+
- lib/spree/testing_support/fixtures/file.txt
|
919
923
|
- lib/spree/testing_support/flash.rb
|
920
924
|
- lib/spree/testing_support/job_helpers.rb
|
921
925
|
- lib/spree/testing_support/order_walkthrough.rb
|
@@ -932,10 +936,13 @@ files:
|
|
932
936
|
- lib/tasks/core.rake
|
933
937
|
- lib/tasks/email.rake
|
934
938
|
- lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
|
939
|
+
- lib/tasks/migrations/migrate_address_names.rake
|
940
|
+
- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
|
935
941
|
- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
|
936
942
|
- lib/tasks/migrations/migrate_user_addresses.rake
|
937
943
|
- lib/tasks/migrations/rename_gateways.rake
|
938
944
|
- lib/tasks/order_capturing.rake
|
945
|
+
- lib/tasks/upgrade.rake
|
939
946
|
- solidus_core.gemspec
|
940
947
|
- vendor/assets/javascripts/jquery.payment.js
|
941
948
|
- vendor/assets/javascripts/jsuri.js
|
@@ -944,7 +951,26 @@ homepage: http://solidus.io
|
|
944
951
|
licenses:
|
945
952
|
- BSD-3-Clause
|
946
953
|
metadata: {}
|
947
|
-
post_install_message:
|
954
|
+
post_install_message: |
|
955
|
+
-------------------------------------------------------------
|
956
|
+
Thank you for using Solidus
|
957
|
+
-------------------------------------------------------------
|
958
|
+
If this is a fresh install, don't forget to run the Solidus
|
959
|
+
installer with the following command:
|
960
|
+
|
961
|
+
$ bin/rails g solidus:install
|
962
|
+
|
963
|
+
If you are updating Solidus from an older version, please run
|
964
|
+
the following commands to complete the update:
|
965
|
+
|
966
|
+
$ bin/rails railties:install:migrations
|
967
|
+
$ bin/rails db:migrate
|
968
|
+
$ bin/rails solidus:upgrade:two_point_eleven
|
969
|
+
|
970
|
+
Please report any issues at:
|
971
|
+
- https://github.com/solidusio/solidus/issues
|
972
|
+
- http://slack.solidus.io/
|
973
|
+
-------------------------------------------------------------
|
948
974
|
rdoc_options: []
|
949
975
|
require_paths:
|
950
976
|
- lib
|
@@ -1,44 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module AwesomeNestedSetOvveride
|
4
|
-
# Add :polimorphic key option only when used to make it work with Rails 6.1+,
|
5
|
-
# required since rails/rails@2c008d9
|
6
|
-
# This can be removed when upgrading to an awesome_nested_set version
|
7
|
-
# compliant with Rails 6.1+, already addressed in
|
8
|
-
# collectiveidea/awesome_nested_set#421
|
9
|
-
module RelateParent
|
10
|
-
def acts_as_nested_set_relate_parent!
|
11
|
-
# Disable Rubocop to keep original code for diffs
|
12
|
-
# rubocop:disable
|
13
|
-
options = {
|
14
|
-
:class_name => self.base_class.to_s,
|
15
|
-
:foreign_key => parent_column_name,
|
16
|
-
:primary_key => primary_column_name,
|
17
|
-
:counter_cache => acts_as_nested_set_options[:counter_cache],
|
18
|
-
:inverse_of => (:children unless acts_as_nested_set_options[:polymorphic]),
|
19
|
-
:touch => acts_as_nested_set_options[:touch]
|
20
|
-
}
|
21
|
-
options[:polymorphic] = true if acts_as_nested_set_options[:polymorphic]
|
22
|
-
options[:optional] = true if ActiveRecord::VERSION::MAJOR >= 5
|
23
|
-
belongs_to :parent, options
|
24
|
-
# rubocop:enable
|
25
|
-
end
|
26
|
-
|
27
|
-
CollectiveIdea::Acts::NestedSet.prepend self
|
28
|
-
end
|
29
|
-
|
30
|
-
# Skip breaking model reload before update depth. Already addressed in
|
31
|
-
# collectiveidea/awesome_nested_set#413
|
32
|
-
# This can be removed when a new version of awesome_nested_set is released.
|
33
|
-
module Model
|
34
|
-
def set_depth!
|
35
|
-
return unless has_depth_column?
|
36
|
-
|
37
|
-
in_tenacious_transaction do
|
38
|
-
update_depth(level)
|
39
|
-
end
|
40
|
-
end
|
41
|
-
|
42
|
-
CollectiveIdea::Acts::NestedSet::Model.prepend self
|
43
|
-
end
|
44
|
-
end
|