spree_core 4.1.5 → 4.2.0.beta
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/finders/spree/products/find.rb +46 -11
- data/app/helpers/spree/base_helper.rb +26 -3
- data/app/helpers/spree/mail_helper.rb +24 -0
- data/app/helpers/spree/products_helper.rb +15 -14
- 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/product_scopes.rb +2 -2
- data/app/models/concerns/spree/user_methods.rb +11 -5
- data/app/models/spree/app_configuration.rb +6 -0
- data/app/models/spree/line_item.rb +10 -1
- data/app/models/spree/option_type.rb +5 -1
- data/app/models/spree/order.rb +26 -5
- data/app/models/spree/price.rb +26 -2
- data/app/models/spree/product.rb +19 -9
- data/app/models/spree/promotion/actions/create_item_adjustments.rb +1 -1
- data/app/models/spree/promotion_handler/coupon.rb +1 -1
- 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 +19 -2
- data/app/models/spree/taxon.rb +6 -0
- data/app/models/spree/variant.rb +29 -2
- data/app/presenters/spree/variant_presenter.rb +7 -0
- data/app/presenters/spree/variants/option_types_presenter.rb +1 -0
- data/app/services/spree/checkout/get_shipping_rates.rb +7 -10
- 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 +113 -13
- data/db/default/spree/stores.rb +11 -10
- 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/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb +5 -0
- data/lib/generators/spree/install/templates/config/initializers/spree.rb +1 -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 +1 -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/store.rb +12 -1
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/permitted_attributes.rb +7 -4
- data/lib/spree/testing_support/authorization_helpers.rb +7 -4
- data/lib/spree/testing_support/factories/store_factory.rb +11 -8
- data/spree_core.gemspec +14 -8
- data/vendor/assets/javascripts/cleave.js +1669 -0
- metadata +43 -22
- 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.beta
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
|
+
- Spark Solutions
|
8
9
|
autorequire:
|
9
10
|
bindir: bin
|
10
11
|
cert_chain: []
|
11
|
-
date: 2020-
|
12
|
+
date: 2020-09-07 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
|
@@ -144,22 +145,16 @@ dependencies:
|
|
144
145
|
name: kaminari
|
145
146
|
requirement: !ruby/object:Gem::Requirement
|
146
147
|
requirements:
|
147
|
-
- - "
|
148
|
-
- !ruby/object:Gem::Version
|
149
|
-
version: 1.0.1
|
150
|
-
- - "<"
|
148
|
+
- - "~>"
|
151
149
|
- !ruby/object:Gem::Version
|
152
|
-
version: 1.2.
|
150
|
+
version: 1.2.1
|
153
151
|
type: :runtime
|
154
152
|
prerelease: false
|
155
153
|
version_requirements: !ruby/object:Gem::Requirement
|
156
154
|
requirements:
|
157
|
-
- - "
|
158
|
-
- !ruby/object:Gem::Version
|
159
|
-
version: 1.0.1
|
160
|
-
- - "<"
|
155
|
+
- - "~>"
|
161
156
|
- !ruby/object:Gem::Version
|
162
|
-
version: 1.2.
|
157
|
+
version: 1.2.1
|
163
158
|
- !ruby/object:Gem::Dependency
|
164
159
|
name: money
|
165
160
|
requirement: !ruby/object:Gem::Requirement
|
@@ -309,7 +304,7 @@ dependencies:
|
|
309
304
|
version: '4.3'
|
310
305
|
- - "<"
|
311
306
|
- !ruby/object:Gem::Version
|
312
|
-
version: '
|
307
|
+
version: '7.0'
|
313
308
|
type: :runtime
|
314
309
|
prerelease: false
|
315
310
|
version_requirements: !ruby/object:Gem::Requirement
|
@@ -319,7 +314,7 @@ dependencies:
|
|
319
314
|
version: '4.3'
|
320
315
|
- - "<"
|
321
316
|
- !ruby/object:Gem::Version
|
322
|
-
version: '
|
317
|
+
version: '7.0'
|
323
318
|
- !ruby/object:Gem::Dependency
|
324
319
|
name: sprockets
|
325
320
|
requirement: !ruby/object:Gem::Requirement
|
@@ -397,7 +392,7 @@ dependencies:
|
|
397
392
|
- !ruby/object:Gem::Version
|
398
393
|
version: '2.2'
|
399
394
|
description: The bare bones necessary for Spree.
|
400
|
-
email:
|
395
|
+
email: hello@spreecommerce.org
|
401
396
|
executables: []
|
402
397
|
extensions: []
|
403
398
|
extra_rdoc_files: []
|
@@ -422,6 +417,7 @@ files:
|
|
422
417
|
- app/finders/spree/variants/option_types_finder.rb
|
423
418
|
- app/finders/spree/variants/visible_finder.rb
|
424
419
|
- app/helpers/spree/base_helper.rb
|
420
|
+
- app/helpers/spree/mail_helper.rb
|
425
421
|
- app/helpers/spree/products_helper.rb
|
426
422
|
- app/mailers/spree/base_mailer.rb
|
427
423
|
- app/mailers/spree/order_mailer.rb
|
@@ -646,13 +642,12 @@ files:
|
|
646
642
|
- app/validators/db_maximum_length_validator.rb
|
647
643
|
- app/validators/email_validator.rb
|
648
644
|
- app/views/layouts/spree/base_mailer.html.erb
|
649
|
-
- app/views/spree/order_mailer/_adjustment.html.erb
|
650
|
-
- app/views/spree/order_mailer/_subtotal.html.erb
|
651
|
-
- app/views/spree/order_mailer/_total.html.erb
|
652
645
|
- app/views/spree/order_mailer/cancel_email.html.erb
|
653
646
|
- app/views/spree/order_mailer/cancel_email.text.erb
|
654
647
|
- app/views/spree/order_mailer/confirm_email.html.erb
|
655
648
|
- app/views/spree/order_mailer/confirm_email.text.erb
|
649
|
+
- app/views/spree/order_mailer/store_owner_notification_email.html.erb
|
650
|
+
- app/views/spree/order_mailer/store_owner_notification_email.text.erb
|
656
651
|
- app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
|
657
652
|
- app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
|
658
653
|
- app/views/spree/shared/_base_mailer_footer.html.erb
|
@@ -661,6 +656,11 @@ files:
|
|
661
656
|
- app/views/spree/shared/_error_messages.html.erb
|
662
657
|
- app/views/spree/shared/_mailer_line_item.html.erb
|
663
658
|
- app/views/spree/shared/_paths.html.erb
|
659
|
+
- app/views/spree/shared/_purchased_items_table.html.erb
|
660
|
+
- app/views/spree/shared/purchased_items_table/_adjustment.html.erb
|
661
|
+
- app/views/spree/shared/purchased_items_table/_line_item.html.erb
|
662
|
+
- app/views/spree/shared/purchased_items_table/_subtotal.html.erb
|
663
|
+
- app/views/spree/shared/purchased_items_table/_total.html.erb
|
664
664
|
- app/views/spree/shipment_mailer/shipped_email.html.erb
|
665
665
|
- app/views/spree/shipment_mailer/shipped_email.text.erb
|
666
666
|
- app/views/spree/test_mailer/test_email.html.erb
|
@@ -945,8 +945,18 @@ files:
|
|
945
945
|
- db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
|
946
946
|
- db/migrate/20191005121504_add_store_id_to_payment_methods.rb
|
947
947
|
- db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
|
948
|
+
- db/migrate/20191017121054_add_supported_currencies_to_store.rb
|
948
949
|
- db/migrate/20200102141311_add_social_to_spree_stores.rb
|
949
950
|
- db/migrate/20200212144523_add_hide_from_nav_to_taxons.rb
|
951
|
+
- db/migrate/20200308210757_add_default_locale_to_spree_store.rb
|
952
|
+
- db/migrate/20200310145140_add_customer_support_email_to_spree_store.rb
|
953
|
+
- db/migrate/20200421095017_add_compare_at_amount_to_spree_prices.rb
|
954
|
+
- db/migrate/20200423123001_add_default_country_id_to_spree_store.rb
|
955
|
+
- db/migrate/20200430072209_add_footer_fields_to_spree_stores.rb
|
956
|
+
- db/migrate/20200513154939_add_show_property_to_spree_product_properties.rb
|
957
|
+
- db/migrate/20200607161221_add_store_owner_order_notification_delivered_to_spree_orders.rb
|
958
|
+
- db/migrate/20200607161222_add_new_order_notifications_email_to_spree_stores.rb
|
959
|
+
- db/migrate/20200826075557_add_unique_index_on_taxon_id_and_product_id_to_spree_products_taxons.rb
|
950
960
|
- db/seeds.rb
|
951
961
|
- lib/friendly_id/slug_rails5_patch.rb
|
952
962
|
- lib/generators/spree/custom_user/custom_user_generator.rb
|
@@ -973,10 +983,16 @@ files:
|
|
973
983
|
- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
|
974
984
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
|
975
985
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/frontend/all.css
|
986
|
+
- lib/generators/spree/mailers_preview/mailers_preview_generator.rb
|
987
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/order_preview.rb
|
988
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/reimbursement_preview.rb
|
989
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/shipment_preview.rb
|
990
|
+
- lib/generators/spree/mailers_preview/templates/mailers/previews/user_preview.rb
|
976
991
|
- lib/spree/core.rb
|
977
992
|
- lib/spree/core/components.rb
|
978
993
|
- lib/spree/core/controller_helpers/auth.rb
|
979
994
|
- lib/spree/core/controller_helpers/common.rb
|
995
|
+
- lib/spree/core/controller_helpers/currency_helpers.rb
|
980
996
|
- lib/spree/core/controller_helpers/order.rb
|
981
997
|
- lib/spree/core/controller_helpers/search.rb
|
982
998
|
- lib/spree/core/controller_helpers/store.rb
|
@@ -1082,14 +1098,19 @@ files:
|
|
1082
1098
|
- spec/fixtures/text-file.txt
|
1083
1099
|
- spec/fixtures/thinking-cat.jpg
|
1084
1100
|
- spree_core.gemspec
|
1101
|
+
- vendor/assets/javascripts/cleave.js
|
1085
1102
|
- vendor/assets/javascripts/fetch.umd.js
|
1086
1103
|
- vendor/assets/javascripts/jquery.payment.js
|
1087
1104
|
- vendor/assets/javascripts/jsuri.js
|
1088
1105
|
- vendor/assets/javascripts/polyfill.min.js
|
1089
|
-
homepage:
|
1106
|
+
homepage: https://spreecommerce.org
|
1090
1107
|
licenses:
|
1091
1108
|
- BSD-3-Clause
|
1092
|
-
metadata:
|
1109
|
+
metadata:
|
1110
|
+
bug_tracker_uri: https://github.com/spree/spree/issues
|
1111
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
|
1112
|
+
documentation_uri: https://guides.spreecommerce.org/
|
1113
|
+
source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
|
1093
1114
|
post_install_message:
|
1094
1115
|
rdoc_options: []
|
1095
1116
|
require_paths:
|