solidus_core 2.11.0 → 2.11.5
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/spree/address.rb +28 -5
- data/app/models/spree/base.rb +1 -2
- data/app/models/spree/calculator.rb +4 -4
- data/app/models/spree/calculator/free_shipping.rb +1 -0
- data/app/models/spree/calculator/percent_per_item.rb +2 -0
- data/app/models/spree/calculator/price_sack.rb +1 -0
- data/app/models/spree/order/payments.rb +2 -2
- data/app/models/spree/order_merger.rb +1 -1
- data/app/models/spree/payment.rb +10 -3
- data/app/models/spree/payment/cancellation.rb +3 -22
- data/app/models/spree/payment_source.rb +2 -2
- data/app/models/spree/product.rb +8 -2
- data/app/models/spree/product/scopes.rb +0 -1
- data/app/models/spree/refund.rb +7 -1
- 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/20180416083007_add_apply_to_all_to_variant_property_rule.rb +1 -1
- data/db/migrate/20210122110141_add_name_to_spree_addresses.rb +13 -0
- data/lib/generators/spree/dummy/templates/rails/test.rb +4 -1
- data/lib/spree/app_configuration.rb +1 -1
- data/lib/spree/core.rb +1 -4
- data/lib/spree/core/engine.rb +7 -8
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/permitted_attributes.rb +5 -5
- data/lib/spree/testing_support.rb +31 -0
- 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 -4
- data/lib/spree/testing_support/factories/address_factory.rb +6 -2
- data/lib/spree/testing_support/factories/adjustment_factory.rb +10 -5
- data/lib/spree/testing_support/factories/adjustment_reason_factory.rb +5 -0
- data/lib/spree/testing_support/factories/calculator_factory.rb +5 -0
- data/lib/spree/testing_support/factories/carton_factory.rb +7 -2
- data/lib/spree/testing_support/factories/country_factory.rb +5 -0
- data/lib/spree/testing_support/factories/credit_card_factory.rb +5 -0
- data/lib/spree/testing_support/factories/customer_return_factory.rb +8 -3
- data/lib/spree/testing_support/factories/image_factory.rb +6 -1
- data/lib/spree/testing_support/factories/inventory_unit_factory.rb +9 -4
- data/lib/spree/testing_support/factories/line_item_factory.rb +7 -2
- data/lib/spree/testing_support/factories/option_type_factory.rb +8 -0
- data/lib/spree/testing_support/factories/option_value_factory.rb +5 -0
- data/lib/spree/testing_support/factories/order_factory.rb +11 -6
- data/lib/spree/testing_support/factories/order_promotion_factory.rb +7 -2
- data/lib/spree/testing_support/factories/payment_factory.rb +9 -4
- data/lib/spree/testing_support/factories/payment_method_factory.rb +5 -0
- data/lib/spree/testing_support/factories/price_factory.rb +6 -1
- data/lib/spree/testing_support/factories/product_factory.rb +10 -5
- 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 +5 -0
- 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 +5 -0
- data/lib/spree/testing_support/factories/refund_factory.rb +7 -2
- data/lib/spree/testing_support/factories/refund_reason_factory.rb +5 -0
- data/lib/spree/testing_support/factories/reimbursement_factory.rb +6 -1
- data/lib/spree/testing_support/factories/reimbursement_type_factory.rb +5 -0
- data/lib/spree/testing_support/factories/return_authorization_factory.rb +8 -3
- data/lib/spree/testing_support/factories/return_item_factory.rb +8 -3
- data/lib/spree/testing_support/factories/return_reason_factory.rb +5 -0
- data/lib/spree/testing_support/factories/role_factory.rb +5 -0
- data/lib/spree/testing_support/factories/shipment_factory.rb +9 -3
- data/lib/spree/testing_support/factories/shipping_category_factory.rb +5 -0
- data/lib/spree/testing_support/factories/shipping_method_factory.rb +8 -3
- data/lib/spree/testing_support/factories/shipping_rate_factory.rb +7 -2
- data/lib/spree/testing_support/factories/state_factory.rb +7 -1
- data/lib/spree/testing_support/factories/stock_item_factory.rb +7 -2
- data/lib/spree/testing_support/factories/stock_location_factory.rb +8 -3
- data/lib/spree/testing_support/factories/stock_movement_factory.rb +6 -1
- data/lib/spree/testing_support/factories/stock_package_factory.rb +7 -2
- data/lib/spree/testing_support/factories/store_credit_category_factory.rb +5 -0
- data/lib/spree/testing_support/factories/store_credit_event_factory.rb +7 -2
- data/lib/spree/testing_support/factories/store_credit_factory.rb +8 -3
- data/lib/spree/testing_support/factories/store_credit_reason_factory.rb +5 -0
- data/lib/spree/testing_support/factories/store_credit_type_factory.rb +5 -0
- data/lib/spree/testing_support/factories/store_factory.rb +6 -1
- data/lib/spree/testing_support/factories/tax_category_factory.rb +7 -1
- data/lib/spree/testing_support/factories/tax_rate_factory.rb +8 -3
- data/lib/spree/testing_support/factories/taxon_factory.rb +7 -2
- data/lib/spree/testing_support/factories/taxonomy_factory.rb +5 -0
- data/lib/spree/testing_support/factories/user_factory.rb +8 -3
- data/lib/spree/testing_support/factories/variant_factory.rb +9 -4
- 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 -3
- 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/blank.jpg +0 -0
- data/lib/spree/testing_support/order_walkthrough.rb +10 -10
- data/lib/spree/testing_support/sequences.rb +4 -1
- data/{app/models → lib}/spree/user_class_handle.rb +0 -0
- data/lib/tasks/email.rake +3 -2
- data/lib/tasks/migrations/migrate_address_names.rake +158 -0
- data/lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake +38 -0
- data/lib/tasks/upgrade.rake +13 -0
- data/solidus_core.gemspec +24 -2
- metadata +50 -24
- data/lib/spree/awesome_nested_set_override.rb +0 -44
@@ -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
@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
|
|
25
25
|
actionmailer actionpack actionview activejob activemodel activerecord
|
26
26
|
activesupport railties
|
27
27
|
].each do |rails_dep|
|
28
|
-
s.add_dependency rails_dep, ['>= 5.2', '<
|
28
|
+
s.add_dependency rails_dep, ['>= 5.2', '< 6.2.x']
|
29
29
|
end
|
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.5
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-03-10 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:
|
22
|
+
version: 6.2.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:
|
32
|
+
version: 6.2.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:
|
42
|
+
version: 6.2.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:
|
52
|
+
version: 6.2.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:
|
62
|
+
version: 6.2.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:
|
72
|
+
version: 6.2.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:
|
82
|
+
version: 6.2.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:
|
92
|
+
version: 6.2.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:
|
102
|
+
version: 6.2.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:
|
112
|
+
version: 6.2.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:
|
122
|
+
version: 6.2.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:
|
132
|
+
version: 6.2.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:
|
142
|
+
version: 6.2.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:
|
152
|
+
version: 6.2.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:
|
162
|
+
version: 6.2.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:
|
172
|
+
version: 6.2.x
|
173
173
|
- !ruby/object:Gem::Dependency
|
174
174
|
name: activemerchant
|
175
175
|
requirement: !ruby/object:Gem::Requirement
|
@@ -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
|
@@ -648,7 +648,6 @@ files:
|
|
648
648
|
- app/models/spree/taxonomy.rb
|
649
649
|
- app/models/spree/unit_cancel.rb
|
650
650
|
- app/models/spree/user_address.rb
|
651
|
-
- app/models/spree/user_class_handle.rb
|
652
651
|
- app/models/spree/user_last_url_storer.rb
|
653
652
|
- app/models/spree/user_last_url_storer/rules/authentication_rule.rb
|
654
653
|
- app/models/spree/user_stock_location.rb
|
@@ -730,6 +729,7 @@ files:
|
|
730
729
|
- db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
|
731
730
|
- db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
|
732
731
|
- db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
|
732
|
+
- db/migrate/20210122110141_add_name_to_spree_addresses.rb
|
733
733
|
- db/seeds.rb
|
734
734
|
- lib/generators/solidus/install/install_generator.rb
|
735
735
|
- lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
|
@@ -752,7 +752,6 @@ files:
|
|
752
752
|
- lib/solidus/migrations/rename_gateways.rb
|
753
753
|
- lib/solidus_core.rb
|
754
754
|
- lib/spree/app_configuration.rb
|
755
|
-
- lib/spree/awesome_nested_set_override.rb
|
756
755
|
- lib/spree/config.rb
|
757
756
|
- lib/spree/core.rb
|
758
757
|
- lib/spree/core/active_merchant_dependencies.rb
|
@@ -837,6 +836,7 @@ files:
|
|
837
836
|
- lib/spree/preferences/statically_configurable.rb
|
838
837
|
- lib/spree/preferences/store.rb
|
839
838
|
- lib/spree/promo/environment.rb
|
839
|
+
- lib/spree/testing_support.rb
|
840
840
|
- lib/spree/testing_support/ability_helpers.rb
|
841
841
|
- lib/spree/testing_support/authorization_helpers.rb
|
842
842
|
- lib/spree/testing_support/bar_ability.rb
|
@@ -851,6 +851,7 @@ files:
|
|
851
851
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
|
852
852
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
|
853
853
|
- lib/spree/testing_support/dummy_app/database.yml
|
854
|
+
- lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
|
854
855
|
- lib/spree/testing_support/dummy_app/migrations.rb
|
855
856
|
- lib/spree/testing_support/dummy_app/rake_tasks.rb
|
856
857
|
- lib/spree/testing_support/dummy_app/routes.rb
|
@@ -915,6 +916,8 @@ files:
|
|
915
916
|
- lib/spree/testing_support/factories/variant_property_rule_factory.rb
|
916
917
|
- lib/spree/testing_support/factories/variant_property_rule_value_factory.rb
|
917
918
|
- lib/spree/testing_support/factories/zone_factory.rb
|
919
|
+
- lib/spree/testing_support/factory_bot.rb
|
920
|
+
- lib/spree/testing_support/fixtures/blank.jpg
|
918
921
|
- lib/spree/testing_support/flash.rb
|
919
922
|
- lib/spree/testing_support/job_helpers.rb
|
920
923
|
- lib/spree/testing_support/order_walkthrough.rb
|
@@ -926,14 +929,18 @@ files:
|
|
926
929
|
- lib/spree/testing_support/shared_examples/gallery.rb
|
927
930
|
- lib/spree/testing_support/translations.rb
|
928
931
|
- lib/spree/testing_support/url_helpers.rb
|
932
|
+
- lib/spree/user_class_handle.rb
|
929
933
|
- lib/spree_core.rb
|
930
934
|
- lib/tasks/core.rake
|
931
935
|
- lib/tasks/email.rake
|
932
936
|
- lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
|
937
|
+
- lib/tasks/migrations/migrate_address_names.rake
|
938
|
+
- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
|
933
939
|
- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
|
934
940
|
- lib/tasks/migrations/migrate_user_addresses.rake
|
935
941
|
- lib/tasks/migrations/rename_gateways.rake
|
936
942
|
- lib/tasks/order_capturing.rake
|
943
|
+
- lib/tasks/upgrade.rake
|
937
944
|
- solidus_core.gemspec
|
938
945
|
- vendor/assets/javascripts/jquery.payment.js
|
939
946
|
- vendor/assets/javascripts/jsuri.js
|
@@ -942,7 +949,26 @@ homepage: http://solidus.io
|
|
942
949
|
licenses:
|
943
950
|
- BSD-3-Clause
|
944
951
|
metadata: {}
|
945
|
-
post_install_message:
|
952
|
+
post_install_message: |
|
953
|
+
-------------------------------------------------------------
|
954
|
+
Thank you for using Solidus
|
955
|
+
-------------------------------------------------------------
|
956
|
+
If this is a fresh install, don't forget to run the Solidus
|
957
|
+
installer with the following command:
|
958
|
+
|
959
|
+
$ bin/rails g solidus:install
|
960
|
+
|
961
|
+
If you are updating Solidus from an older version, please run
|
962
|
+
the following commands to complete the update:
|
963
|
+
|
964
|
+
$ bin/rails railties:install:migrations
|
965
|
+
$ bin/rails db:migrate
|
966
|
+
$ bin/rails solidus:upgrade:two_point_eleven
|
967
|
+
|
968
|
+
Please report any issues at:
|
969
|
+
- https://github.com/solidusio/solidus/issues
|
970
|
+
- http://slack.solidus.io/
|
971
|
+
-------------------------------------------------------------
|
946
972
|
rdoc_options: []
|
947
973
|
require_paths:
|
948
974
|
- lib
|
@@ -957,7 +983,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
957
983
|
- !ruby/object:Gem::Version
|
958
984
|
version: 1.8.23
|
959
985
|
requirements: []
|
960
|
-
rubygems_version: 3.
|
986
|
+
rubygems_version: 3.1.4
|
961
987
|
signing_key:
|
962
988
|
specification_version: 4
|
963
989
|
summary: Essential models, mailers, and classes for the Solidus e-commerce project.
|
@@ -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
|