solidus_core 2.11.1 → 3.0.0.rc2
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/assets/javascripts/spree.js.erb +0 -51
- data/app/helpers/spree/store_helper.rb +0 -11
- data/app/mailers/spree/carton_mailer.rb +1 -5
- data/app/models/concerns/spree/adjustment_source.rb +0 -15
- data/app/models/concerns/spree/calculated_adjustments.rb +0 -18
- data/app/models/concerns/spree/soft_deletable.rb +2 -4
- data/app/models/concerns/spree/user_address_book.rb +0 -37
- data/app/models/concerns/spree/user_methods.rb +2 -11
- data/app/models/spree/ability.rb +0 -37
- data/app/models/spree/address.rb +7 -162
- data/app/models/spree/address/name.rb +2 -20
- data/app/models/spree/adjustment.rb +0 -28
- data/app/models/spree/base.rb +1 -12
- data/app/models/spree/calculator.rb +4 -11
- data/app/models/spree/calculator/flexi_rate.rb +0 -5
- data/app/models/spree/country.rb +1 -6
- data/app/models/spree/credit_card.rb +0 -27
- data/app/models/spree/customer_return.rb +1 -4
- data/app/models/spree/image.rb +0 -7
- data/app/models/spree/inventory_unit.rb +0 -21
- data/app/models/spree/line_item.rb +2 -45
- data/app/models/spree/order.rb +3 -136
- data/app/models/spree/order/payments.rb +2 -2
- data/app/models/spree/order_cancellations.rb +4 -24
- data/app/models/spree/order_merger.rb +1 -1
- data/app/models/spree/order_updater.rb +2 -11
- data/app/models/spree/payment.rb +10 -6
- data/app/models/spree/payment/cancellation.rb +3 -22
- data/app/models/spree/payment_create.rb +1 -13
- data/app/models/spree/payment_method.rb +2 -103
- data/app/models/spree/payment_method/credit_card.rb +1 -3
- data/app/models/spree/payment_source.rb +2 -2
- data/app/models/spree/product.rb +8 -41
- data/app/models/spree/product/scopes.rb +0 -28
- data/app/models/spree/promotion.rb +2 -6
- data/app/models/spree/promotion/actions/create_adjustment.rb +0 -3
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +0 -3
- data/app/models/spree/promotion/actions/create_quantity_adjustments.rb +0 -3
- data/app/models/spree/promotion/rules/taxon.rb +2 -15
- data/app/models/spree/promotion_action.rb +2 -9
- data/app/models/spree/promotion_code/batch_builder.rb +0 -14
- data/app/models/spree/refund.rb +3 -47
- data/app/models/spree/reimbursement.rb +3 -41
- data/app/models/spree/reimbursement_performer.rb +2 -8
- data/app/models/spree/reimbursement_type/credit.rb +1 -4
- data/app/models/spree/reimbursement_type/reimbursement_helpers.rb +1 -2
- data/app/models/spree/reimbursement_type/store_credit.rb +1 -4
- data/app/models/spree/return_authorization.rb +1 -4
- data/app/models/spree/return_item.rb +1 -19
- data/app/models/spree/shipment.rb +1 -54
- data/app/models/spree/shipping_method.rb +1 -26
- data/app/models/spree/shipping_rate.rb +0 -2
- data/app/models/spree/state.rb +0 -4
- data/app/models/spree/stock/availability_validator.rb +2 -2
- data/app/models/spree/stock/inventory_validator.rb +2 -2
- data/app/models/spree/stock/simple_coordinator.rb +0 -14
- data/app/models/spree/stock/splitter/base.rb +2 -7
- data/app/models/spree/stock_item.rb +1 -7
- data/app/models/spree/store.rb +0 -12
- data/app/models/spree/store_credit_category.rb +0 -32
- data/app/models/spree/tax_calculator/shipping_rate.rb +1 -12
- data/app/models/spree/tax_rate.rb +0 -27
- data/app/models/spree/taxon.rb +0 -11
- data/app/models/spree/taxon/active_storage_attachment.rb +0 -6
- data/app/models/spree/taxon/paperclip_attachment.rb +0 -4
- data/app/models/spree/user_address.rb +0 -5
- data/app/models/spree/variant.rb +1 -45
- data/config/locales/en.yml +0 -8
- data/db/migrate/20210122110141_add_name_to_spree_addresses.rb +13 -0
- data/lib/generators/solidus/install/install_generator.rb +12 -1
- data/lib/generators/solidus/install/templates/config/initializers/spree.rb.tt +3 -39
- data/lib/generators/spree/dummy/dummy_generator.rb +2 -1
- data/lib/generators/spree/dummy/templates/rails/database.yml +6 -1
- data/lib/generators/spree/dummy/templates/rails/storage.yml +3 -0
- data/lib/generators/spree/dummy/templates/rails/test.rb +6 -1
- data/lib/spree/app_configuration.rb +7 -66
- data/lib/spree/core.rb +10 -12
- data/lib/spree/core/class_constantizer.rb +2 -0
- data/lib/spree/core/controller_helpers/auth.rb +1 -14
- data/lib/spree/core/controller_helpers/order.rb +2 -22
- data/lib/spree/core/controller_helpers/payment_parameters.rb +0 -54
- data/lib/spree/core/controller_helpers/pricing.rb +0 -8
- data/lib/spree/core/controller_helpers/strong_parameters.rb +0 -4
- data/lib/spree/core/engine.rb +6 -42
- data/lib/spree/core/environment_extension.rb +0 -9
- data/lib/spree/core/product_filters.rb +0 -40
- data/lib/spree/core/role_configuration.rb +0 -14
- data/lib/spree/core/search/base.rb +0 -26
- data/lib/spree/core/state_machines.rb +2 -11
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/event.rb +0 -31
- data/lib/spree/event/configuration.rb +0 -5
- data/lib/spree/event/subscriber.rb +0 -18
- data/lib/spree/event/subscriber_registry.rb +3 -1
- data/lib/spree/i18n.rb +0 -22
- data/lib/spree/money.rb +3 -18
- data/lib/spree/permitted_attributes.rb +2 -53
- data/lib/spree/testing_support.rb +31 -0
- data/lib/spree/testing_support/capybara_ext.rb +0 -30
- data/lib/spree/testing_support/controller_requests.rb +0 -82
- data/lib/spree/testing_support/dummy_app.rb +10 -16
- data/lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb +4 -0
- data/lib/spree/testing_support/dummy_app/migrations.rb +0 -3
- 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 +5 -0
- 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 -7
- 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 -3
- 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 +6 -1
- 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/order_walkthrough.rb +10 -13
- data/lib/spree/testing_support/preferences.rb +0 -25
- data/lib/spree/testing_support/sequences.rb +4 -1
- data/{app/models → lib}/spree/user_class_handle.rb +0 -0
- 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 +3 -4
- metadata +32 -63
- data/app/mailers/spree/test_mailer.rb +0 -13
- data/app/models/concerns/spree/user_payment_source.rb +0 -26
- data/app/models/spree/calculator/free_shipping.rb +0 -21
- data/app/models/spree/calculator/percent_per_item.rb +0 -49
- data/app/models/spree/calculator/price_sack.rb +0 -27
- data/app/models/spree/gateway.rb +0 -14
- data/app/models/spree/gateway/bogus.rb +0 -13
- data/app/models/spree/gateway/bogus_simple.rb +0 -13
- data/app/models/spree/order/checkout.rb +0 -244
- data/app/models/spree/order_capturing.rb +0 -50
- data/app/models/spree/promotion_handler/free_shipping.rb +0 -9
- data/lib/generators/spree/install/install_generator.rb +0 -15
- data/lib/solidus/migrations/rename_gateways.rb +0 -41
- data/lib/spree/awesome_nested_set_override.rb +0 -44
- data/lib/spree/core/current_store.rb +0 -24
- data/lib/spree/paranoia_deprecations.rb +0 -41
- data/lib/spree/promo/environment.rb +0 -12
- data/lib/spree/testing_support/bar_ability.rb +0 -19
- data/lib/tasks/core.rake +0 -104
- data/lib/tasks/email.rake +0 -11
- data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake +0 -119
- data/lib/tasks/migrations/migrate_shipping_rate_taxes.rake +0 -22
- data/lib/tasks/migrations/migrate_user_addresses.rake +0 -34
- data/lib/tasks/migrations/rename_gateways.rake +0 -23
- data/lib/tasks/order_capturing.rake +0 -27
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: 3.0.0.rc2
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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: 6.
|
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
|
@@ -331,33 +331,19 @@ dependencies:
|
|
331
331
|
- !ruby/object:Gem::Version
|
332
332
|
version: '1.8'
|
333
333
|
- !ruby/object:Gem::Dependency
|
334
|
-
name: paperclip
|
335
|
-
requirement: !ruby/object:Gem::Requirement
|
336
|
-
requirements:
|
337
|
-
- - ">="
|
338
|
-
- !ruby/object:Gem::Version
|
339
|
-
version: '4.2'
|
340
|
-
type: :runtime
|
341
|
-
prerelease: false
|
342
|
-
version_requirements: !ruby/object:Gem::Requirement
|
343
|
-
requirements:
|
344
|
-
- - ">="
|
345
|
-
- !ruby/object:Gem::Version
|
346
|
-
version: '4.2'
|
347
|
-
- !ruby/object:Gem::Dependency
|
348
|
-
name: paranoia
|
334
|
+
name: kt-paperclip
|
349
335
|
requirement: !ruby/object:Gem::Requirement
|
350
336
|
requirements:
|
351
337
|
- - "~>"
|
352
338
|
- !ruby/object:Gem::Version
|
353
|
-
version: '
|
339
|
+
version: '6.3'
|
354
340
|
type: :runtime
|
355
341
|
prerelease: false
|
356
342
|
version_requirements: !ruby/object:Gem::Requirement
|
357
343
|
requirements:
|
358
344
|
- - "~>"
|
359
345
|
- !ruby/object:Gem::Version
|
360
|
-
version: '
|
346
|
+
version: '6.3'
|
361
347
|
- !ruby/object:Gem::Dependency
|
362
348
|
name: ransack
|
363
349
|
requirement: !ruby/object:Gem::Requirement
|
@@ -415,7 +401,6 @@ files:
|
|
415
401
|
- app/mailers/spree/order_mailer.rb
|
416
402
|
- app/mailers/spree/promotion_code_batch_mailer.rb
|
417
403
|
- app/mailers/spree/reimbursement_mailer.rb
|
418
|
-
- app/mailers/spree/test_mailer.rb
|
419
404
|
- app/models/concerns/spree/active_storage_adapter.rb
|
420
405
|
- app/models/concerns/spree/active_storage_adapter/attachment.rb
|
421
406
|
- app/models/concerns/spree/active_storage_adapter/normalization.rb
|
@@ -430,7 +415,6 @@ files:
|
|
430
415
|
- app/models/concerns/spree/user_address_book.rb
|
431
416
|
- app/models/concerns/spree/user_api_authentication.rb
|
432
417
|
- app/models/concerns/spree/user_methods.rb
|
433
|
-
- app/models/concerns/spree/user_payment_source.rb
|
434
418
|
- app/models/concerns/spree/user_reporting.rb
|
435
419
|
- app/models/spree/ability.rb
|
436
420
|
- app/models/spree/address.rb
|
@@ -447,10 +431,7 @@ files:
|
|
447
431
|
- app/models/spree/calculator/flat_percent_item_total.rb
|
448
432
|
- app/models/spree/calculator/flat_rate.rb
|
449
433
|
- app/models/spree/calculator/flexi_rate.rb
|
450
|
-
- app/models/spree/calculator/free_shipping.rb
|
451
434
|
- app/models/spree/calculator/percent_on_line_item.rb
|
452
|
-
- app/models/spree/calculator/percent_per_item.rb
|
453
|
-
- app/models/spree/calculator/price_sack.rb
|
454
435
|
- app/models/spree/calculator/returns/default_refund_amount.rb
|
455
436
|
- app/models/spree/calculator/shipping/flat_percent_item_total.rb
|
456
437
|
- app/models/spree/calculator/shipping/flat_rate.rb
|
@@ -469,9 +450,6 @@ files:
|
|
469
450
|
- app/models/spree/fulfilment_changer.rb
|
470
451
|
- app/models/spree/gallery/product_gallery.rb
|
471
452
|
- app/models/spree/gallery/variant_gallery.rb
|
472
|
-
- app/models/spree/gateway.rb
|
473
|
-
- app/models/spree/gateway/bogus.rb
|
474
|
-
- app/models/spree/gateway/bogus_simple.rb
|
475
453
|
- app/models/spree/image.rb
|
476
454
|
- app/models/spree/image/active_storage_attachment.rb
|
477
455
|
- app/models/spree/image/paperclip_attachment.rb
|
@@ -484,11 +462,9 @@ files:
|
|
484
462
|
- app/models/spree/option_value.rb
|
485
463
|
- app/models/spree/option_values_variant.rb
|
486
464
|
- app/models/spree/order.rb
|
487
|
-
- app/models/spree/order/checkout.rb
|
488
465
|
- app/models/spree/order/number_generator.rb
|
489
466
|
- app/models/spree/order/payments.rb
|
490
467
|
- app/models/spree/order_cancellations.rb
|
491
|
-
- app/models/spree/order_capturing.rb
|
492
468
|
- app/models/spree/order_contents.rb
|
493
469
|
- app/models/spree/order_inventory.rb
|
494
470
|
- app/models/spree/order_merger.rb
|
@@ -542,7 +518,6 @@ files:
|
|
542
518
|
- app/models/spree/promotion_code_batch.rb
|
543
519
|
- app/models/spree/promotion_handler/cart.rb
|
544
520
|
- app/models/spree/promotion_handler/coupon.rb
|
545
|
-
- app/models/spree/promotion_handler/free_shipping.rb
|
546
521
|
- app/models/spree/promotion_handler/page.rb
|
547
522
|
- app/models/spree/promotion_handler/shipping.rb
|
548
523
|
- app/models/spree/promotion_rule.rb
|
@@ -648,7 +623,6 @@ files:
|
|
648
623
|
- app/models/spree/taxonomy.rb
|
649
624
|
- app/models/spree/unit_cancel.rb
|
650
625
|
- app/models/spree/user_address.rb
|
651
|
-
- app/models/spree/user_class_handle.rb
|
652
626
|
- app/models/spree/user_last_url_storer.rb
|
653
627
|
- app/models/spree/user_last_url_storer/rules/authentication_rule.rb
|
654
628
|
- app/models/spree/user_stock_location.rb
|
@@ -730,6 +704,7 @@ files:
|
|
730
704
|
- db/migrate/20200320144521_add_default_billng_flag_to_user_addresses.rb
|
731
705
|
- db/migrate/20200530111458_add_bcc_email_to_spree_stores.rb
|
732
706
|
- db/migrate/20201008213609_add_discontinue_on_to_spree_products.rb
|
707
|
+
- db/migrate/20210122110141_add_name_to_spree_addresses.rb
|
733
708
|
- db/seeds.rb
|
734
709
|
- lib/generators/solidus/install/install_generator.rb
|
735
710
|
- lib/generators/solidus/install/templates/config/initializers/spree.rb.tt
|
@@ -746,13 +721,11 @@ files:
|
|
746
721
|
- lib/generators/spree/dummy/templates/rails/database.yml
|
747
722
|
- lib/generators/spree/dummy/templates/rails/routes.rb
|
748
723
|
- lib/generators/spree/dummy/templates/rails/script/rails
|
724
|
+
- lib/generators/spree/dummy/templates/rails/storage.yml
|
749
725
|
- lib/generators/spree/dummy/templates/rails/test.rb
|
750
|
-
- lib/generators/spree/install/install_generator.rb
|
751
726
|
- lib/solidus/migrations/promotions_with_code_handlers.rb
|
752
|
-
- lib/solidus/migrations/rename_gateways.rb
|
753
727
|
- lib/solidus_core.rb
|
754
728
|
- lib/spree/app_configuration.rb
|
755
|
-
- lib/spree/awesome_nested_set_override.rb
|
756
729
|
- lib/spree/config.rb
|
757
730
|
- lib/spree/core.rb
|
758
731
|
- lib/spree/core/active_merchant_dependencies.rb
|
@@ -766,7 +739,6 @@ files:
|
|
766
739
|
- lib/spree/core/controller_helpers/search.rb
|
767
740
|
- lib/spree/core/controller_helpers/store.rb
|
768
741
|
- lib/spree/core/controller_helpers/strong_parameters.rb
|
769
|
-
- lib/spree/core/current_store.rb
|
770
742
|
- lib/spree/core/engine.rb
|
771
743
|
- lib/spree/core/environment.rb
|
772
744
|
- lib/spree/core/environment/calculators.rb
|
@@ -808,7 +780,6 @@ files:
|
|
808
780
|
- lib/spree/migration_helpers.rb
|
809
781
|
- lib/spree/migrations.rb
|
810
782
|
- lib/spree/money.rb
|
811
|
-
- lib/spree/paranoia_deprecations.rb
|
812
783
|
- lib/spree/permission_sets.rb
|
813
784
|
- lib/spree/permission_sets/base.rb
|
814
785
|
- lib/spree/permission_sets/configuration_display.rb
|
@@ -836,10 +807,9 @@ files:
|
|
836
807
|
- lib/spree/preferences/static_model_preferences.rb
|
837
808
|
- lib/spree/preferences/statically_configurable.rb
|
838
809
|
- lib/spree/preferences/store.rb
|
839
|
-
- lib/spree/
|
810
|
+
- lib/spree/testing_support.rb
|
840
811
|
- lib/spree/testing_support/ability_helpers.rb
|
841
812
|
- lib/spree/testing_support/authorization_helpers.rb
|
842
|
-
- lib/spree/testing_support/bar_ability.rb
|
843
813
|
- lib/spree/testing_support/blacklist_urls.rb
|
844
814
|
- lib/spree/testing_support/caching.rb
|
845
815
|
- lib/spree/testing_support/capybara_ext.rb
|
@@ -851,6 +821,7 @@ files:
|
|
851
821
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/backend/all.css
|
852
822
|
- lib/spree/testing_support/dummy_app/assets/stylesheets/spree/frontend/all.css
|
853
823
|
- lib/spree/testing_support/dummy_app/database.yml
|
824
|
+
- lib/spree/testing_support/dummy_app/mailer_previews/test_mailer_preview.rb
|
854
825
|
- lib/spree/testing_support/dummy_app/migrations.rb
|
855
826
|
- lib/spree/testing_support/dummy_app/rake_tasks.rb
|
856
827
|
- lib/spree/testing_support/dummy_app/routes.rb
|
@@ -915,6 +886,7 @@ files:
|
|
915
886
|
- lib/spree/testing_support/factories/variant_property_rule_factory.rb
|
916
887
|
- lib/spree/testing_support/factories/variant_property_rule_value_factory.rb
|
917
888
|
- lib/spree/testing_support/factories/zone_factory.rb
|
889
|
+
- lib/spree/testing_support/factory_bot.rb
|
918
890
|
- lib/spree/testing_support/fixtures/blank.jpg
|
919
891
|
- lib/spree/testing_support/flash.rb
|
920
892
|
- lib/spree/testing_support/job_helpers.rb
|
@@ -927,14 +899,11 @@ files:
|
|
927
899
|
- lib/spree/testing_support/shared_examples/gallery.rb
|
928
900
|
- lib/spree/testing_support/translations.rb
|
929
901
|
- lib/spree/testing_support/url_helpers.rb
|
902
|
+
- lib/spree/user_class_handle.rb
|
930
903
|
- lib/spree_core.rb
|
931
|
-
- lib/tasks/
|
932
|
-
- lib/tasks/
|
933
|
-
- lib/tasks/
|
934
|
-
- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
|
935
|
-
- lib/tasks/migrations/migrate_user_addresses.rake
|
936
|
-
- lib/tasks/migrations/rename_gateways.rake
|
937
|
-
- lib/tasks/order_capturing.rake
|
904
|
+
- lib/tasks/migrations/migrate_address_names.rake
|
905
|
+
- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
|
906
|
+
- lib/tasks/upgrade.rake
|
938
907
|
- solidus_core.gemspec
|
939
908
|
- vendor/assets/javascripts/jquery.payment.js
|
940
909
|
- vendor/assets/javascripts/jsuri.js
|
@@ -1,13 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Spree
|
4
|
-
class TestMailer < BaseMailer
|
5
|
-
def test_email(email)
|
6
|
-
Spree::Deprecation.warn("Spree::TestMailer has been deprecated and will be removed with Solidus 3.0")
|
7
|
-
|
8
|
-
store = Spree::Store.default
|
9
|
-
subject = "#{store.name} #{t('.subject')}"
|
10
|
-
mail(to: email, from: from_address(store), subject: subject)
|
11
|
-
end
|
12
|
-
end
|
13
|
-
end
|
@@ -1,26 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
module Spree
|
4
|
-
module UserPaymentSource
|
5
|
-
extend ActiveSupport::Concern
|
6
|
-
|
7
|
-
def default_credit_card
|
8
|
-
Spree::Deprecation.warn(
|
9
|
-
"user.default_credit_card is deprecated. Please use user.wallet.default_wallet_payment_source instead.",
|
10
|
-
caller
|
11
|
-
)
|
12
|
-
default = wallet.default_wallet_payment_source
|
13
|
-
if default && default.payment_source.is_a?(Spree::CreditCard)
|
14
|
-
default.payment_source
|
15
|
-
end
|
16
|
-
end
|
17
|
-
|
18
|
-
def payment_sources
|
19
|
-
Spree::Deprecation.warn(
|
20
|
-
"user.payment_sources is deprecated. Please use user.wallet.wallet_payment_sources instead.",
|
21
|
-
caller
|
22
|
-
)
|
23
|
-
credit_cards.with_payment_profile
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
@@ -1,21 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_dependency 'spree/calculator'
|
4
|
-
|
5
|
-
module Spree
|
6
|
-
# @deprecated This calculator will be removed in future versions of Spree.
|
7
|
-
# The only case where it was used was for Free Shipping Promotions. There is
|
8
|
-
# now a Promotion Action which deals with these types of promotions instead.
|
9
|
-
class Calculator::FreeShipping < Calculator
|
10
|
-
def compute(object)
|
11
|
-
if object.is_a?(Array)
|
12
|
-
return if object.empty?
|
13
|
-
order = object.first.order
|
14
|
-
else
|
15
|
-
order = object
|
16
|
-
end
|
17
|
-
|
18
|
-
order.ship_total
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
@@ -1,49 +0,0 @@
|
|
1
|
-
# frozen_string_literal: true
|
2
|
-
|
3
|
-
require_dependency 'spree/calculator'
|
4
|
-
|
5
|
-
module Spree
|
6
|
-
# A calculator for promotions that calculates a percent-off discount
|
7
|
-
# for all matching products in an order. This should not be used as a
|
8
|
-
# shipping calculator since it would be the same thing as a flat percent
|
9
|
-
# off the entire order.
|
10
|
-
#
|
11
|
-
#
|
12
|
-
# TODO Should be deprecated now that we have adjustments at the line item level in spree core
|
13
|
-
|
14
|
-
class Calculator::PercentPerItem < Calculator
|
15
|
-
preference :percent, :decimal, default: 0
|
16
|
-
|
17
|
-
def compute(object = nil)
|
18
|
-
return 0 if object.nil?
|
19
|
-
object.line_items.sum { |line_item|
|
20
|
-
value_for_line_item(line_item)
|
21
|
-
}
|
22
|
-
end
|
23
|
-
|
24
|
-
private
|
25
|
-
|
26
|
-
# Returns all products that match this calculator, but only if the calculator
|
27
|
-
# is attached to a promotion. If attached to a ShippingMethod, nil is returned.
|
28
|
-
# Copied from per_item.rb
|
29
|
-
def matching_products
|
30
|
-
if compute_on_promotion?
|
31
|
-
calculable.promotion.rules.flat_map do |rule|
|
32
|
-
rule.respond_to?(:products) ? rule.products : []
|
33
|
-
end
|
34
|
-
end
|
35
|
-
end
|
36
|
-
|
37
|
-
def value_for_line_item(line_item)
|
38
|
-
if compute_on_promotion?
|
39
|
-
return 0 unless matching_products.blank? || matching_products.include?(line_item.product)
|
40
|
-
end
|
41
|
-
((line_item.price * line_item.quantity) * preferred_percent) / 100
|
42
|
-
end
|
43
|
-
|
44
|
-
# Determines wether or not the calculable object is a promotion
|
45
|
-
def compute_on_promotion?
|
46
|
-
@compute_on_promotion ||= calculable.respond_to?(:promotion)
|
47
|
-
end
|
48
|
-
end
|
49
|
-
end
|