spree_core 4.0.9 → 4.1.0.rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree.js +0 -1
- data/app/finders/spree/products/find.rb +19 -6
- data/app/finders/spree/variants/option_types_finder.rb +21 -0
- data/app/finders/spree/variants/visible_finder.rb +22 -0
- data/app/helpers/spree/base_helper.rb +48 -18
- data/app/helpers/spree/products_helper.rb +76 -8
- data/app/models/concerns/spree/user_methods.rb +2 -2
- data/app/models/spree/app_dependencies.rb +1 -7
- data/app/models/spree/credit_card.rb +4 -5
- data/app/models/spree/image/configuration/active_storage.rb +9 -1
- data/app/models/spree/image.rb +52 -3
- data/app/models/spree/line_item.rb +1 -2
- data/app/models/spree/option_type.rb +4 -0
- data/app/models/spree/order/address_book.rb +20 -7
- data/app/models/spree/order/store_credit.rb +0 -8
- data/app/models/spree/order.rb +12 -12
- data/app/models/spree/payment_method.rb +8 -0
- data/app/models/spree/preferences/preferable.rb +1 -1
- data/app/models/spree/product.rb +7 -6
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +1 -1
- data/app/models/spree/promotion_handler/coupon.rb +2 -1
- data/app/models/spree/return_item/eligibility_validator/base_validator.rb +1 -1
- data/app/models/spree/store.rb +2 -1
- data/app/models/spree/taxon.rb +2 -6
- data/app/models/spree/variant.rb +2 -14
- data/app/models/spree/zone.rb +6 -3
- data/app/presenters/spree/product_summary_presenter.rb +26 -0
- data/app/presenters/spree/variant_presenter.rb +69 -0
- data/app/presenters/spree/variants/option_types_presenter.rb +74 -0
- data/app/presenters/spree/variants/options_presenter.rb +49 -0
- data/app/services/spree/checkout/get_shipping_rates.rb +10 -7
- data/app/services/spree/checkout/update.rb +2 -13
- data/config/locales/en.yml +156 -14
- data/db/default/spree/stores.rb +8 -3
- data/db/migrate/20140309033438_create_store_from_preferences.rb +8 -4
- data/db/migrate/20191005121504_add_store_id_to_payment_methods.rb +7 -0
- data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb +5 -0
- data/db/migrate/20200102141311_add_social_to_spree_stores.rb +7 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +3 -1
- data/lib/generators/spree/dummy/templates/initializers/bullet.rb +5 -0
- data/lib/generators/spree/install/install_generator.rb +13 -5
- data/lib/generators/spree/install/templates/config/initializers/spree.rb +0 -1
- data/lib/generators/spree/install/templates/config/initializers/spree_storefront.rb +1 -0
- data/lib/generators/spree/install/templates/config/spree_storefront.yml +67 -0
- data/lib/spree/core/controller_helpers/order.rb +12 -6
- data/lib/spree/core/controller_helpers/store.rb +2 -2
- data/lib/spree/core/search/base.rb +59 -22
- data/lib/spree/core/version.rb +1 -3
- data/lib/spree/core.rb +0 -1
- data/lib/spree/money.rb +8 -1
- data/lib/spree/permitted_attributes.rb +3 -2
- data/lib/spree/testing_support/capybara_ext.rb +0 -52
- data/lib/spree/testing_support/common_rake.rb +1 -1
- data/lib/spree/testing_support/factories/store_factory.rb +3 -0
- data/lib/spree/testing_support/order_walkthrough.rb +7 -3
- data/spree_core.gemspec +9 -15
- metadata +49 -35
- data/app/finders/spree/addresses/find.rb +0 -17
- data/app/models/spree/order_contents.rb +0 -31
- data/app/services/spree/account/addresses/base.rb +0 -39
- data/app/services/spree/account/addresses/create.rb +0 -18
- data/app/services/spree/account/addresses/update.rb +0 -18
- data/lib/spree/database_type_utilities.rb +0 -12
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.1.0.rc1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2020-01-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activemerchant
|
@@ -144,16 +144,22 @@ dependencies:
|
|
144
144
|
name: kaminari
|
145
145
|
requirement: !ruby/object:Gem::Requirement
|
146
146
|
requirements:
|
147
|
-
- - "
|
147
|
+
- - ">="
|
148
|
+
- !ruby/object:Gem::Version
|
149
|
+
version: 1.0.1
|
150
|
+
- - "<"
|
148
151
|
- !ruby/object:Gem::Version
|
149
|
-
version: 1.2.
|
152
|
+
version: 1.2.0
|
150
153
|
type: :runtime
|
151
154
|
prerelease: false
|
152
155
|
version_requirements: !ruby/object:Gem::Requirement
|
153
156
|
requirements:
|
154
|
-
- - "
|
157
|
+
- - ">="
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: 1.0.1
|
160
|
+
- - "<"
|
155
161
|
- !ruby/object:Gem::Version
|
156
|
-
version: 1.2.
|
162
|
+
version: 1.2.0
|
157
163
|
- !ruby/object:Gem::Dependency
|
158
164
|
name: money
|
159
165
|
requirement: !ruby/object:Gem::Requirement
|
@@ -214,22 +220,16 @@ dependencies:
|
|
214
220
|
name: rails
|
215
221
|
requirement: !ruby/object:Gem::Requirement
|
216
222
|
requirements:
|
217
|
-
- - "
|
218
|
-
- !ruby/object:Gem::Version
|
219
|
-
version: '5.2'
|
220
|
-
- - "<"
|
223
|
+
- - "~>"
|
221
224
|
- !ruby/object:Gem::Version
|
222
|
-
version:
|
225
|
+
version: 6.0.0
|
223
226
|
type: :runtime
|
224
227
|
prerelease: false
|
225
228
|
version_requirements: !ruby/object:Gem::Requirement
|
226
229
|
requirements:
|
227
|
-
- - "
|
228
|
-
- !ruby/object:Gem::Version
|
229
|
-
version: '5.2'
|
230
|
-
- - "<"
|
230
|
+
- - "~>"
|
231
231
|
- !ruby/object:Gem::Version
|
232
|
-
version:
|
232
|
+
version: 6.0.0
|
233
233
|
- !ruby/object:Gem::Dependency
|
234
234
|
name: ransack
|
235
235
|
requirement: !ruby/object:Gem::Requirement
|
@@ -304,16 +304,22 @@ dependencies:
|
|
304
304
|
name: twitter_cldr
|
305
305
|
requirement: !ruby/object:Gem::Requirement
|
306
306
|
requirements:
|
307
|
-
- - "
|
307
|
+
- - ">="
|
308
308
|
- !ruby/object:Gem::Version
|
309
309
|
version: '4.3'
|
310
|
+
- - "<"
|
311
|
+
- !ruby/object:Gem::Version
|
312
|
+
version: '6.0'
|
310
313
|
type: :runtime
|
311
314
|
prerelease: false
|
312
315
|
version_requirements: !ruby/object:Gem::Requirement
|
313
316
|
requirements:
|
314
|
-
- - "
|
317
|
+
- - ">="
|
315
318
|
- !ruby/object:Gem::Version
|
316
319
|
version: '4.3'
|
320
|
+
- - "<"
|
321
|
+
- !ruby/object:Gem::Version
|
322
|
+
version: '6.0'
|
317
323
|
- !ruby/object:Gem::Dependency
|
318
324
|
name: sprockets
|
319
325
|
requirement: !ruby/object:Gem::Requirement
|
@@ -346,16 +352,22 @@ dependencies:
|
|
346
352
|
name: mini_magick
|
347
353
|
requirement: !ruby/object:Gem::Requirement
|
348
354
|
requirements:
|
349
|
-
- - "
|
355
|
+
- - ">="
|
350
356
|
- !ruby/object:Gem::Version
|
351
357
|
version: 4.9.4
|
358
|
+
- - "<"
|
359
|
+
- !ruby/object:Gem::Version
|
360
|
+
version: 4.11.0
|
352
361
|
type: :runtime
|
353
362
|
prerelease: false
|
354
363
|
version_requirements: !ruby/object:Gem::Requirement
|
355
364
|
requirements:
|
356
|
-
- - "
|
365
|
+
- - ">="
|
357
366
|
- !ruby/object:Gem::Version
|
358
367
|
version: 4.9.4
|
368
|
+
- - "<"
|
369
|
+
- !ruby/object:Gem::Version
|
370
|
+
version: 4.11.0
|
359
371
|
- !ruby/object:Gem::Dependency
|
360
372
|
name: image_processing
|
361
373
|
requirement: !ruby/object:Gem::Requirement
|
@@ -400,7 +412,6 @@ files:
|
|
400
412
|
- app/assets/images/noimage/small.png
|
401
413
|
- app/assets/javascripts/spree.js
|
402
414
|
- app/controllers/spree/base_controller.rb
|
403
|
-
- app/finders/spree/addresses/find.rb
|
404
415
|
- app/finders/spree/countries/find.rb
|
405
416
|
- app/finders/spree/credit_cards/find.rb
|
406
417
|
- app/finders/spree/line_items/find_by_variant.rb
|
@@ -408,6 +419,8 @@ files:
|
|
408
419
|
- app/finders/spree/orders/find_current.rb
|
409
420
|
- app/finders/spree/products/find.rb
|
410
421
|
- app/finders/spree/taxons/find.rb
|
422
|
+
- app/finders/spree/variants/option_types_finder.rb
|
423
|
+
- app/finders/spree/variants/visible_finder.rb
|
411
424
|
- app/helpers/spree/base_helper.rb
|
412
425
|
- app/helpers/spree/products_helper.rb
|
413
426
|
- app/mailers/spree/base_mailer.rb
|
@@ -482,7 +495,6 @@ files:
|
|
482
495
|
- app/models/spree/order/currency_updater.rb
|
483
496
|
- app/models/spree/order/payments.rb
|
484
497
|
- app/models/spree/order/store_credit.rb
|
485
|
-
- app/models/spree/order_contents.rb
|
486
498
|
- app/models/spree/order_inventory.rb
|
487
499
|
- app/models/spree/order_merger.rb
|
488
500
|
- app/models/spree/order_promotion.rb
|
@@ -608,9 +620,10 @@ files:
|
|
608
620
|
- app/models/spree/zone.rb
|
609
621
|
- app/models/spree/zone_member.rb
|
610
622
|
- app/paginators/spree/shared/paginate.rb
|
611
|
-
- app/
|
612
|
-
- app/
|
613
|
-
- app/
|
623
|
+
- app/presenters/spree/product_summary_presenter.rb
|
624
|
+
- app/presenters/spree/variant_presenter.rb
|
625
|
+
- app/presenters/spree/variants/option_types_presenter.rb
|
626
|
+
- app/presenters/spree/variants/options_presenter.rb
|
614
627
|
- app/services/spree/cart/add_item.rb
|
615
628
|
- app/services/spree/cart/create.rb
|
616
629
|
- app/services/spree/cart/estimate_shipping_rates.rb
|
@@ -929,6 +942,9 @@ files:
|
|
929
942
|
- db/migrate/20181024100754_add_deleted_at_to_spree_credit_cards.rb
|
930
943
|
- db/migrate/20190305121659_add_iso_and_iso3_validation_on_presence_and_uniqueness.rb
|
931
944
|
- db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
|
945
|
+
- db/migrate/20191005121504_add_store_id_to_payment_methods.rb
|
946
|
+
- db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
|
947
|
+
- db/migrate/20200102141311_add_social_to_spree_stores.rb
|
932
948
|
- db/seeds.rb
|
933
949
|
- lib/friendly_id/slug_rails5_patch.rb
|
934
950
|
- lib/generators/spree/custom_user/custom_user_generator.rb
|
@@ -936,6 +952,7 @@ files:
|
|
936
952
|
- lib/generators/spree/custom_user/templates/initializer.rb.tt
|
937
953
|
- lib/generators/spree/custom_user/templates/migration.rb.tt
|
938
954
|
- lib/generators/spree/dummy/dummy_generator.rb
|
955
|
+
- lib/generators/spree/dummy/templates/initializers/bullet.rb
|
939
956
|
- lib/generators/spree/dummy/templates/initializers/devise.rb
|
940
957
|
- lib/generators/spree/dummy/templates/rails/application.rb
|
941
958
|
- lib/generators/spree/dummy/templates/rails/boot.rb
|
@@ -948,6 +965,8 @@ files:
|
|
948
965
|
- lib/generators/spree/dummy_model/templates/model.rb.tt
|
949
966
|
- lib/generators/spree/install/install_generator.rb
|
950
967
|
- lib/generators/spree/install/templates/config/initializers/spree.rb
|
968
|
+
- lib/generators/spree/install/templates/config/initializers/spree_storefront.rb
|
969
|
+
- lib/generators/spree/install/templates/config/spree_storefront.yml
|
951
970
|
- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js
|
952
971
|
- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
|
953
972
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
|
@@ -976,7 +995,6 @@ files:
|
|
976
995
|
- lib/spree/core/search/base.rb
|
977
996
|
- lib/spree/core/token_generator.rb
|
978
997
|
- lib/spree/core/version.rb
|
979
|
-
- lib/spree/database_type_utilities.rb
|
980
998
|
- lib/spree/dependencies_helper.rb
|
981
999
|
- lib/spree/i18n.rb
|
982
1000
|
- lib/spree/i18n/base.rb
|
@@ -1068,12 +1086,8 @@ files:
|
|
1068
1086
|
homepage: http://spreecommerce.org
|
1069
1087
|
licenses:
|
1070
1088
|
- BSD-3-Clause
|
1071
|
-
metadata:
|
1072
|
-
|
1073
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v4.0.9
|
1074
|
-
documentation_uri: https://guides.spreecommerce.org/
|
1075
|
-
source_code_uri: https://github.com/spree/spree/tree/v4.0.9
|
1076
|
-
post_install_message:
|
1089
|
+
metadata: {}
|
1090
|
+
post_install_message:
|
1077
1091
|
rdoc_options: []
|
1078
1092
|
require_paths:
|
1079
1093
|
- lib
|
@@ -1088,8 +1102,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1088
1102
|
- !ruby/object:Gem::Version
|
1089
1103
|
version: 1.8.23
|
1090
1104
|
requirements: []
|
1091
|
-
rubygems_version: 3.
|
1092
|
-
signing_key:
|
1105
|
+
rubygems_version: 3.0.3
|
1106
|
+
signing_key:
|
1093
1107
|
specification_version: 4
|
1094
1108
|
summary: The bare bones necessary for Spree.
|
1095
1109
|
test_files: []
|
@@ -1,31 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
class OrderContents
|
3
|
-
attr_accessor :order, :currency
|
4
|
-
|
5
|
-
def initialize(order)
|
6
|
-
@order = order
|
7
|
-
end
|
8
|
-
|
9
|
-
def add(variant, quantity = 1, options = {})
|
10
|
-
Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
|
11
|
-
variant: variant,
|
12
|
-
quantity: quantity,
|
13
|
-
options: options).value
|
14
|
-
end
|
15
|
-
|
16
|
-
def remove(variant, quantity = 1, options = {})
|
17
|
-
Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
|
18
|
-
variant: variant,
|
19
|
-
quantity: quantity,
|
20
|
-
options: options).value
|
21
|
-
end
|
22
|
-
|
23
|
-
def remove_line_item(line_item, options = {})
|
24
|
-
Spree::Cart::RemoveLineItem.call(order: @order, line_item: line_item, options: options).value
|
25
|
-
end
|
26
|
-
|
27
|
-
def update_cart(params)
|
28
|
-
Spree::Dependencies.cart_update_service.constantize.call(order: order, params: params).value
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
@@ -1,39 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
module Account
|
3
|
-
module Addresses
|
4
|
-
class Base
|
5
|
-
prepend Spree::ServiceModule::Base
|
6
|
-
|
7
|
-
private
|
8
|
-
|
9
|
-
attr_accessor :country
|
10
|
-
|
11
|
-
def fill_country_and_state_ids(params)
|
12
|
-
replace_country_iso_with_id(params)
|
13
|
-
fill_state_id(params)
|
14
|
-
end
|
15
|
-
|
16
|
-
def replace_country_iso_with_id(params)
|
17
|
-
iso = params[:country_iso]
|
18
|
-
return params unless iso.present?
|
19
|
-
|
20
|
-
country = Spree::Country.by_iso(iso)
|
21
|
-
params[:country_id] = country&.id
|
22
|
-
params.delete(:country_iso)
|
23
|
-
params
|
24
|
-
end
|
25
|
-
|
26
|
-
def fill_state_id(params)
|
27
|
-
state_name = params[:state_name]
|
28
|
-
return params unless state_name.present?
|
29
|
-
|
30
|
-
country ||= Spree::Country.find(params[:country_id]) if params[:country_id].present?
|
31
|
-
return params unless country
|
32
|
-
|
33
|
-
params[:state_id] = country.states.find_by(name: state_name)&.id
|
34
|
-
params
|
35
|
-
end
|
36
|
-
end
|
37
|
-
end
|
38
|
-
end
|
39
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
module Account
|
3
|
-
module Addresses
|
4
|
-
class Create < ::Spree::Account::Addresses::Base
|
5
|
-
def call(user:, address_params:)
|
6
|
-
fill_country_and_state_ids(address_params)
|
7
|
-
|
8
|
-
address = user.addresses.new(address_params)
|
9
|
-
if address.save
|
10
|
-
success(address)
|
11
|
-
else
|
12
|
-
failure(address)
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
@@ -1,18 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
module Account
|
3
|
-
module Addresses
|
4
|
-
class Update < ::Spree::Account::Addresses::Base
|
5
|
-
def call(address:, address_params:)
|
6
|
-
address_params[:country_id] ||= address.country_id
|
7
|
-
fill_country_and_state_ids(address_params)
|
8
|
-
|
9
|
-
if address.update(address_params)
|
10
|
-
success(address)
|
11
|
-
else
|
12
|
-
failure(address)
|
13
|
-
end
|
14
|
-
end
|
15
|
-
end
|
16
|
-
end
|
17
|
-
end
|
18
|
-
end
|
@@ -1,12 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
module DatabaseTypeUtilities
|
3
|
-
def self.maximum_value_for(data_type)
|
4
|
-
case data_type
|
5
|
-
when :integer
|
6
|
-
ActiveModel::Type::Integer.new.instance_eval { range.max }
|
7
|
-
else
|
8
|
-
raise ArgumentError.new('Currently only :integer argument is acceptable')
|
9
|
-
end
|
10
|
-
end
|
11
|
-
end
|
12
|
-
end
|