spree_core 4.1.10 → 4.2.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/spree/base_controller.rb +1 -0
- data/app/helpers/spree/base_helper.rb +61 -14
- data/app/helpers/spree/mail_helper.rb +29 -0
- data/app/helpers/spree/products_helper.rb +2 -1
- data/app/mailers/spree/base_mailer.rb +17 -3
- data/app/mailers/spree/order_mailer.rb +11 -2
- data/app/mailers/spree/reimbursement_mailer.rb +4 -2
- data/app/mailers/spree/shipment_mailer.rb +4 -2
- data/app/models/concerns/spree/default_price.rb +2 -1
- data/app/models/concerns/spree/user_methods.rb +11 -5
- data/app/models/concerns/spree/user_payment_source.rb +1 -1
- data/app/models/spree/address.rb +13 -1
- data/app/models/spree/adjustment.rb +1 -0
- data/app/models/spree/app_configuration.rb +4 -0
- data/app/models/spree/credit_card.rb +5 -0
- data/app/models/spree/line_item.rb +12 -2
- data/app/models/spree/log_entry.rb +1 -1
- data/app/models/spree/option_type.rb +7 -1
- data/app/models/spree/order.rb +33 -7
- data/app/models/spree/order/address_book.rb +7 -20
- data/app/models/spree/order/payments.rb +10 -2
- data/app/models/spree/preferences/store.rb +1 -1
- data/app/models/spree/price.rb +26 -2
- data/app/models/spree/product.rb +17 -7
- data/app/models/spree/promotion.rb +10 -15
- data/app/models/spree/promotion_handler/coupon.rb +2 -3
- data/app/models/spree/promotion_handler/promotion_duplicator.rb +9 -3
- data/app/models/spree/reimbursement.rb +2 -0
- data/app/models/spree/shipment.rb +2 -5
- data/app/models/spree/stock_location.rb +13 -2
- data/app/models/spree/store.rb +27 -2
- data/app/models/spree/variant.rb +15 -2
- data/app/models/spree/zone.rb +4 -0
- data/app/presenters/spree/variant_presenter.rb +9 -1
- data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
- data/app/views/layouts/spree/base_mailer.html.erb +45 -40
- data/app/views/spree/order_mailer/cancel_email.html.erb +19 -25
- data/app/views/spree/order_mailer/cancel_email.text.erb +24 -2
- data/app/views/spree/order_mailer/confirm_email.html.erb +18 -65
- data/app/views/spree/order_mailer/confirm_email.text.erb +2 -1
- data/app/views/spree/order_mailer/store_owner_notification_email.html.erb +23 -0
- data/app/views/spree/order_mailer/store_owner_notification_email.text.erb +38 -0
- data/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb +53 -58
- data/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb +3 -1
- data/app/views/spree/shared/_base_mailer_footer.html.erb +6 -14
- data/app/views/spree/shared/_base_mailer_header.html.erb +12 -32
- data/app/views/spree/shared/_base_mailer_stylesheets.html.erb +293 -625
- data/app/views/spree/shared/_purchased_items_table.html.erb +60 -0
- data/app/views/spree/shared/purchased_items_table/_adjustment.html.erb +13 -0
- data/app/views/spree/shared/purchased_items_table/_line_item.html.erb +27 -0
- data/app/views/spree/shared/purchased_items_table/_subtotal.html.erb +13 -0
- data/app/views/spree/shared/purchased_items_table/_total.html.erb +13 -0
- data/app/views/spree/shipment_mailer/shipped_email.html.erb +31 -36
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +2 -1
- data/config/initializers/assets.rb +1 -0
- data/config/locales/en.yml +125 -16
- data/db/default/spree/countries.rb +10 -4
- data/db/default/spree/states.rb +42 -5
- data/db/default/spree/stores.rb +17 -12
- data/db/default/spree/zones.rb +1 -1
- data/db/migrate/20140309033438_create_store_from_preferences.rb +1 -1
- data/db/migrate/20191017121054_add_supported_currencies_to_store.rb +10 -0
- data/db/migrate/20200102141311_add_social_to_spree_stores.rb +3 -0
- data/db/migrate/20200308210757_add_default_locale_to_spree_store.rb +7 -0
- data/db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb +7 -0
- data/db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb +7 -0
- data/db/migrate/20200423123001_add_default_country_id_to_spree_store.rb +9 -0
- data/db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb +8 -0
- data/db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb +5 -0
- data/db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb +7 -0
- data/db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb +7 -0
- data/db/migrate/20200610113542_add_label_to_spree_addresses.rb +5 -0
- data/db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
- data/db/migrate/20201006110150_add_checkout_zone_field_to_store.rb +12 -0
- data/db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb +6 -0
- data/db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb +5 -0
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/backend/all.js +0 -2
- data/lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js +0 -2
- data/lib/generators/spree/mailers_preview/mailers_preview_generator.rb +23 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb +13 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb +5 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb +5 -0
- data/lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb +11 -0
- data/lib/spree/core.rb +2 -0
- data/lib/spree/core/controller_helpers/common.rb +1 -0
- data/lib/spree/core/controller_helpers/currency_helpers.rb +15 -0
- data/lib/spree/core/controller_helpers/order.rb +9 -4
- data/lib/spree/core/controller_helpers/store.rb +12 -1
- data/lib/spree/core/importer/order.rb +9 -9
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/permitted_attributes.rb +8 -5
- data/lib/spree/testing_support/authorization_helpers.rb +7 -4
- data/lib/spree/testing_support/factories/promotion_factory.rb +29 -17
- data/lib/spree/testing_support/factories/store_factory.rb +11 -8
- data/lib/spree/testing_support/factories/zone_factory.rb +1 -1
- data/lib/spree/testing_support/i18n.rb +1 -1
- data/spree_core.gemspec +6 -5
- data/vendor/assets/javascripts/cleave.js +1669 -0
- metadata +57 -16
- data/app/views/spree/order_mailer/_adjustment.html.erb +0 -8
- data/app/views/spree/order_mailer/_subtotal.html.erb +0 -8
- data/app/views/spree/order_mailer/_total.html.erb +0 -8
metadata
CHANGED
@@ -1,14 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.2.0.rc2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
|
-
|
8
|
+
- Spark Solutions
|
9
|
+
autorequire:
|
9
10
|
bindir: bin
|
10
11
|
cert_chain: []
|
11
|
-
date: 2020-
|
12
|
+
date: 2020-11-10 00:00:00.000000000 Z
|
12
13
|
dependencies:
|
13
14
|
- !ruby/object:Gem::Dependency
|
14
15
|
name: activemerchant
|
@@ -115,7 +116,7 @@ dependencies:
|
|
115
116
|
version: 5.2.1
|
116
117
|
- - "<"
|
117
118
|
- !ruby/object:Gem::Version
|
118
|
-
version: 5.
|
119
|
+
version: 5.5.0
|
119
120
|
type: :runtime
|
120
121
|
prerelease: false
|
121
122
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -125,7 +126,7 @@ dependencies:
|
|
125
126
|
version: 5.2.1
|
126
127
|
- - "<"
|
127
128
|
- !ruby/object:Gem::Version
|
128
|
-
version: 5.
|
129
|
+
version: 5.5.0
|
129
130
|
- !ruby/object:Gem::Dependency
|
130
131
|
name: highline
|
131
132
|
requirement: !ruby/object:Gem::Requirement
|
@@ -351,7 +352,7 @@ dependencies:
|
|
351
352
|
version: 4.9.4
|
352
353
|
- - "<"
|
353
354
|
- !ruby/object:Gem::Version
|
354
|
-
version: 4.
|
355
|
+
version: 4.12.0
|
355
356
|
type: :runtime
|
356
357
|
prerelease: false
|
357
358
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -361,7 +362,7 @@ dependencies:
|
|
361
362
|
version: 4.9.4
|
362
363
|
- - "<"
|
363
364
|
- !ruby/object:Gem::Version
|
364
|
-
version: 4.
|
365
|
+
version: 4.12.0
|
365
366
|
- !ruby/object:Gem::Dependency
|
366
367
|
name: image_processing
|
367
368
|
requirement: !ruby/object:Gem::Requirement
|
@@ -376,6 +377,20 @@ dependencies:
|
|
376
377
|
- - "~>"
|
377
378
|
- !ruby/object:Gem::Version
|
378
379
|
version: '1.2'
|
380
|
+
- !ruby/object:Gem::Dependency
|
381
|
+
name: active_storage_validations
|
382
|
+
requirement: !ruby/object:Gem::Requirement
|
383
|
+
requirements:
|
384
|
+
- - "~>"
|
385
|
+
- !ruby/object:Gem::Version
|
386
|
+
version: '0.9'
|
387
|
+
type: :runtime
|
388
|
+
prerelease: false
|
389
|
+
version_requirements: !ruby/object:Gem::Requirement
|
390
|
+
requirements:
|
391
|
+
- - "~>"
|
392
|
+
- !ruby/object:Gem::Version
|
393
|
+
version: '0.9'
|
379
394
|
- !ruby/object:Gem::Dependency
|
380
395
|
name: email_spec
|
381
396
|
requirement: !ruby/object:Gem::Requirement
|
@@ -391,7 +406,7 @@ dependencies:
|
|
391
406
|
- !ruby/object:Gem::Version
|
392
407
|
version: '2.2'
|
393
408
|
description: The bare bones necessary for Spree.
|
394
|
-
email:
|
409
|
+
email: hello@spreecommerce.org
|
395
410
|
executables: []
|
396
411
|
extensions: []
|
397
412
|
extra_rdoc_files: []
|
@@ -417,6 +432,7 @@ files:
|
|
417
432
|
- app/finders/spree/variants/option_types_finder.rb
|
418
433
|
- app/finders/spree/variants/visible_finder.rb
|
419
434
|
- app/helpers/spree/base_helper.rb
|
435
|
+
- app/helpers/spree/mail_helper.rb
|
420
436
|
- app/helpers/spree/products_helper.rb
|
421
437
|
- app/mailers/spree/base_mailer.rb
|
422
438
|
- app/mailers/spree/order_mailer.rb
|
@@ -644,13 +660,12 @@ files:
|
|
644
660
|
- app/validators/db_maximum_length_validator.rb
|
645
661
|
- app/validators/email_validator.rb
|
646
662
|
- app/views/layouts/spree/base_mailer.html.erb
|
647
|
-
- app/views/spree/order_mailer/_adjustment.html.erb
|
648
|
-
- app/views/spree/order_mailer/_subtotal.html.erb
|
649
|
-
- app/views/spree/order_mailer/_total.html.erb
|
650
663
|
- app/views/spree/order_mailer/cancel_email.html.erb
|
651
664
|
- app/views/spree/order_mailer/cancel_email.text.erb
|
652
665
|
- app/views/spree/order_mailer/confirm_email.html.erb
|
653
666
|
- app/views/spree/order_mailer/confirm_email.text.erb
|
667
|
+
- app/views/spree/order_mailer/store_owner_notification_email.html.erb
|
668
|
+
- app/views/spree/order_mailer/store_owner_notification_email.text.erb
|
654
669
|
- app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
|
655
670
|
- app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
|
656
671
|
- app/views/spree/shared/_base_mailer_footer.html.erb
|
@@ -659,6 +674,11 @@ files:
|
|
659
674
|
- app/views/spree/shared/_error_messages.html.erb
|
660
675
|
- app/views/spree/shared/_mailer_line_item.html.erb
|
661
676
|
- app/views/spree/shared/_paths.html.erb
|
677
|
+
- app/views/spree/shared/_purchased_items_table.html.erb
|
678
|
+
- app/views/spree/shared/purchased_items_table/_adjustment.html.erb
|
679
|
+
- app/views/spree/shared/purchased_items_table/_line_item.html.erb
|
680
|
+
- app/views/spree/shared/purchased_items_table/_subtotal.html.erb
|
681
|
+
- app/views/spree/shared/purchased_items_table/_total.html.erb
|
662
682
|
- app/views/spree/shipment_mailer/shipped_email.html.erb
|
663
683
|
- app/views/spree/shipment_mailer/shipped_email.text.erb
|
664
684
|
- app/views/spree/test_mailer/test_email.html.erb
|
@@ -943,8 +963,22 @@ files:
|
|
943
963
|
- db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
|
944
964
|
- db/migrate/20191005121504_add_store_id_to_payment_methods.rb
|
945
965
|
- db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
|
966
|
+
- db/migrate/20191017121054_add_supported_currencies_to_store.rb
|
946
967
|
- db/migrate/20200102141311_add_social_to_spree_stores.rb
|
947
968
|
- db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb
|
969
|
+
- db/migrate/20200308210757_add_default_locale_to_spree_store.rb
|
970
|
+
- db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb
|
971
|
+
- db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb
|
972
|
+
- db/migrate/20200423123001_add_default_country_id_to_spree_store.rb
|
973
|
+
- db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb
|
974
|
+
- db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb
|
975
|
+
- db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb
|
976
|
+
- db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
|
977
|
+
- db/migrate/20200610113542_add_label_to_spree_addresses.rb
|
978
|
+
- db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
|
979
|
+
- db/migrate/20201006110150_add_checkout_zone_field_to_store.rb
|
980
|
+
- db/migrate/20201012091259_add_filterable_column_to_spree_option_types.rb
|
981
|
+
- db/migrate/20201013084504_add_seo_robots_to_spree_stores.rb
|
948
982
|
- db/seeds.rb
|
949
983
|
- lib/friendly_id/slug_rails5_patch.rb
|
950
984
|
- lib/generators/spree/custom_user/custom_user_generator.rb
|
@@ -971,10 +1005,16 @@ files:
|
|
971
1005
|
- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
|
972
1006
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
|
973
1007
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
|
1008
|
+
- lib/generators/spree/mailers_preview/mailers_preview_generator.rb
|
1009
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb
|
1010
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb
|
1011
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb
|
1012
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb
|
974
1013
|
- lib/spree/core.rb
|
975
1014
|
- lib/spree/core/components.rb
|
976
1015
|
- lib/spree/core/controller_helpers/auth.rb
|
977
1016
|
- lib/spree/core/controller_helpers/common.rb
|
1017
|
+
- lib/spree/core/controller_helpers/currency_helpers.rb
|
978
1018
|
- lib/spree/core/controller_helpers/order.rb
|
979
1019
|
- lib/spree/core/controller_helpers/search.rb
|
980
1020
|
- lib/spree/core/controller_helpers/store.rb
|
@@ -1080,19 +1120,20 @@ files:
|
|
1080
1120
|
- spec/fixtures/text-file.txt
|
1081
1121
|
- spec/fixtures/thinking-cat.jpg
|
1082
1122
|
- spree_core.gemspec
|
1123
|
+
- vendor/assets/javascripts/cleave.js
|
1083
1124
|
- vendor/assets/javascripts/fetch.umd.js
|
1084
1125
|
- vendor/assets/javascripts/jquery.payment.js
|
1085
1126
|
- vendor/assets/javascripts/jsuri.js
|
1086
1127
|
- vendor/assets/javascripts/polyfill.min.js
|
1087
|
-
homepage:
|
1128
|
+
homepage: https://spreecommerce.org
|
1088
1129
|
licenses:
|
1089
1130
|
- BSD-3-Clause
|
1090
1131
|
metadata:
|
1091
1132
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
1092
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v4.
|
1133
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.rc2
|
1093
1134
|
documentation_uri: https://guides.spreecommerce.org/
|
1094
|
-
source_code_uri: https://github.com/spree/spree/tree/v4.
|
1095
|
-
post_install_message:
|
1135
|
+
source_code_uri: https://github.com/spree/spree/tree/v4.2.0.rc2
|
1136
|
+
post_install_message:
|
1096
1137
|
rdoc_options: []
|
1097
1138
|
require_paths:
|
1098
1139
|
- lib
|
@@ -1108,7 +1149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1108
1149
|
version: 1.8.23
|
1109
1150
|
requirements: []
|
1110
1151
|
rubygems_version: 3.1.2
|
1111
|
-
signing_key:
|
1152
|
+
signing_key:
|
1112
1153
|
specification_version: 4
|
1113
1154
|
summary: The bare bones necessary for Spree.
|
1114
1155
|
test_files: []
|