spree_core 4.1.11 → 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/helpers/spree/base_helper.rb +23 -2
- data/app/helpers/spree/mail_helper.rb +24 -0
- 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/spree/app_configuration.rb +5 -0
- data/app/models/spree/app_dependencies.rb +1 -7
- data/app/models/spree/line_item.rb +11 -3
- data/app/models/spree/option_type.rb +5 -1
- data/app/models/spree/order.rb +28 -12
- data/app/models/spree/price.rb +26 -2
- data/app/models/spree/product.rb +17 -7
- 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/variant.rb +15 -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/update.rb +2 -13
- 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/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 +4 -4
- data/vendor/assets/javascripts/cleave.js +1669 -0
- metadata +37 -18
- data/app/finders/spree/addresses/find.rb +0 -17
- 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/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
|
-
|
8
|
+
- Spark Solutions
|
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
|
@@ -391,7 +392,7 @@ dependencies:
|
|
391
392
|
- !ruby/object:Gem::Version
|
392
393
|
version: '2.2'
|
393
394
|
description: The bare bones necessary for Spree.
|
394
|
-
email:
|
395
|
+
email: hello@spreecommerce.org
|
395
396
|
executables: []
|
396
397
|
extensions: []
|
397
398
|
extra_rdoc_files: []
|
@@ -406,7 +407,6 @@ files:
|
|
406
407
|
- app/assets/images/noimage/small.png
|
407
408
|
- app/assets/javascripts/spree.js
|
408
409
|
- app/controllers/spree/base_controller.rb
|
409
|
-
- app/finders/spree/addresses/find.rb
|
410
410
|
- app/finders/spree/countries/find.rb
|
411
411
|
- app/finders/spree/credit_cards/find.rb
|
412
412
|
- app/finders/spree/line_items/find_by_variant.rb
|
@@ -417,6 +417,7 @@ files:
|
|
417
417
|
- app/finders/spree/variants/option_types_finder.rb
|
418
418
|
- app/finders/spree/variants/visible_finder.rb
|
419
419
|
- app/helpers/spree/base_helper.rb
|
420
|
+
- app/helpers/spree/mail_helper.rb
|
420
421
|
- app/helpers/spree/products_helper.rb
|
421
422
|
- app/mailers/spree/base_mailer.rb
|
422
423
|
- app/mailers/spree/order_mailer.rb
|
@@ -619,9 +620,6 @@ files:
|
|
619
620
|
- app/presenters/spree/variant_presenter.rb
|
620
621
|
- app/presenters/spree/variants/option_types_presenter.rb
|
621
622
|
- app/presenters/spree/variants/options_presenter.rb
|
622
|
-
- app/services/spree/account/addresses/base.rb
|
623
|
-
- app/services/spree/account/addresses/create.rb
|
624
|
-
- app/services/spree/account/addresses/update.rb
|
625
623
|
- app/services/spree/cart/add_item.rb
|
626
624
|
- app/services/spree/cart/create.rb
|
627
625
|
- app/services/spree/cart/estimate_shipping_rates.rb
|
@@ -644,13 +642,12 @@ files:
|
|
644
642
|
- app/validators/db_maximum_length_validator.rb
|
645
643
|
- app/validators/email_validator.rb
|
646
644
|
- 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
645
|
- app/views/spree/order_mailer/cancel_email.html.erb
|
651
646
|
- app/views/spree/order_mailer/cancel_email.text.erb
|
652
647
|
- app/views/spree/order_mailer/confirm_email.html.erb
|
653
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
|
654
651
|
- app/views/spree/reimbursement_mailer/reimbursement_email.html.erb
|
655
652
|
- app/views/spree/reimbursement_mailer/reimbursement_email.text.erb
|
656
653
|
- app/views/spree/shared/_base_mailer_footer.html.erb
|
@@ -659,6 +656,11 @@ files:
|
|
659
656
|
- app/views/spree/shared/_error_messages.html.erb
|
660
657
|
- app/views/spree/shared/_mailer_line_item.html.erb
|
661
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
|
662
664
|
- app/views/spree/shipment_mailer/shipped_email.html.erb
|
663
665
|
- app/views/spree/shipment_mailer/shipped_email.text.erb
|
664
666
|
- app/views/spree/test_mailer/test_email.html.erb
|
@@ -943,8 +945,18 @@ files:
|
|
943
945
|
- db/migrate/20190523092729_add_user_id_and_deleted_at_to_spree_addresses.rb
|
944
946
|
- db/migrate/20191005121504_add_store_id_to_payment_methods.rb
|
945
947
|
- db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb
|
948
|
+
- db/migrate/20191017121054_add_supported_currencies_to_store.rb
|
946
949
|
- db/migrate/20200102141311_add_social_to_spree_stores.rb
|
947
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
|
948
960
|
- db/seeds.rb
|
949
961
|
- lib/friendly_id/slug_rails5_patch.rb
|
950
962
|
- lib/generators/spree/custom_user/custom_user_generator.rb
|
@@ -971,10 +983,16 @@ files:
|
|
971
983
|
- lib/generators/spree/install/templates/vendor/assets/javascripts/spree/frontend/all.js
|
972
984
|
- lib/generators/spree/install/templates/vendor/assets/stylesheets/spree/backend/all.css
|
973
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
|
974
991
|
- lib/spree/core.rb
|
975
992
|
- lib/spree/core/components.rb
|
976
993
|
- lib/spree/core/controller_helpers/auth.rb
|
977
994
|
- lib/spree/core/controller_helpers/common.rb
|
995
|
+
- lib/spree/core/controller_helpers/currency_helpers.rb
|
978
996
|
- lib/spree/core/controller_helpers/order.rb
|
979
997
|
- lib/spree/core/controller_helpers/search.rb
|
980
998
|
- lib/spree/core/controller_helpers/store.rb
|
@@ -1080,19 +1098,20 @@ files:
|
|
1080
1098
|
- spec/fixtures/text-file.txt
|
1081
1099
|
- spec/fixtures/thinking-cat.jpg
|
1082
1100
|
- spree_core.gemspec
|
1101
|
+
- vendor/assets/javascripts/cleave.js
|
1083
1102
|
- vendor/assets/javascripts/fetch.umd.js
|
1084
1103
|
- vendor/assets/javascripts/jquery.payment.js
|
1085
1104
|
- vendor/assets/javascripts/jsuri.js
|
1086
1105
|
- vendor/assets/javascripts/polyfill.min.js
|
1087
|
-
homepage:
|
1106
|
+
homepage: https://spreecommerce.org
|
1088
1107
|
licenses:
|
1089
1108
|
- BSD-3-Clause
|
1090
1109
|
metadata:
|
1091
1110
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
1092
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v4.
|
1111
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.0.beta
|
1093
1112
|
documentation_uri: https://guides.spreecommerce.org/
|
1094
|
-
source_code_uri: https://github.com/spree/spree/tree/v4.
|
1095
|
-
post_install_message:
|
1113
|
+
source_code_uri: https://github.com/spree/spree/tree/v4.2.0.beta
|
1114
|
+
post_install_message:
|
1096
1115
|
rdoc_options: []
|
1097
1116
|
require_paths:
|
1098
1117
|
- lib
|
@@ -1108,7 +1127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1108
1127
|
version: 1.8.23
|
1109
1128
|
requirements: []
|
1110
1129
|
rubygems_version: 3.1.2
|
1111
|
-
signing_key:
|
1130
|
+
signing_key:
|
1112
1131
|
specification_version: 4
|
1113
1132
|
summary: The bare bones necessary for Spree.
|
1114
1133
|
test_files: []
|
@@ -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
|