solidus_core 4.6.2 → 4.6.3

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.
Files changed (12) hide show
  1. checksums.yaml +4 -4
  2. data/app/models/spree/permission_sets/default_customer.rb +3 -3
  3. data/app/models/spree/product.rb +5 -0
  4. data/app/models/spree/return_item.rb +4 -4
  5. data/app/views/layouts/spree/base_mailer.html.erb +1 -0
  6. data/app/views/layouts/spree/ink.license.txt +28 -0
  7. data/lib/spree/core/version.rb +1 -1
  8. data/lib/spree/permitted_attributes.rb +2 -1
  9. data/lib/spree/testing_support/order_walkthrough.rb +1 -1
  10. data/vendor/assets/javascripts/jquery.payment.license.txt +25 -0
  11. data/vendor/assets/javascripts/jsuri.license.txt +12 -0
  12. metadata +5 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 54346c8f091dd2395832f0e0118d80c50e52f6fc7bda852c0147164061f28055
4
- data.tar.gz: 445ada16ce8a53ae7f4904fdacae27215954de7f2f1387a39ae4f6b8c8ee73be
3
+ metadata.gz: 03c5f9ed344221d9efde0c16e7d40604521c067f36abbf3e09b050fbc9efd3de
4
+ data.tar.gz: 920e1ac4c8266d2110c1eed180d5ffe32e8d16bab3a92ff02eab5446ecba6a2c
5
5
  SHA512:
6
- metadata.gz: 92d7572979dddd22c078e452a0ade011ac4f230876ea24cbb130917d7c088086d316685e2efe6618d73ed5317a24aa17aeb9376cb6d18c4a4704c56f0f3caf51
7
- data.tar.gz: e815c14e8992cdb3549c44711338c43e24f8dfe2195b6f0540b9427f0f7043832d94e7f78c32028af579ea842a53a8edbb53714d5fa7ee97fda962e12b8b19c6
6
+ metadata.gz: 3f81fd0110e433d54dc81e4f73f9f3c0e3dfc37a81c30a443ea2e9c72d0e9882362e917f121b917bfac36300cd2aae7495eec86b40c624873c4cfc5d070d6bf8
7
+ data.tar.gz: 3cedf567b53ad2a9ddee3b4da7f863787092c9d72daccc7fbd02fa4244d9447a1a8a5e3a84c9eeec080b759e57656c8a56dd3ae173f982283cb531169e715aed
data/app/models/spree/permission_sets/default_customer.rb CHANGED
@@ -63,18 +63,18 @@ module Spree
63
63
  can :create, ReturnAuthorization do |return_authorization|
64
64
  return_authorization.order.user == user
65
65
  end
66
- can [:read, :update], CreditCard, user_id: user.id
66
+ can [:read, :update], CreditCard, user_id: user.id if user.persisted?
67
67
  can :read, Product
68
68
  can :read, ProductProperty
69
69
  can :read, Property
70
70
  can :create, Spree.user_class
71
- can [:show, :update, :update_email], Spree.user_class, id: user.id
71
+ can [:show, :update, :update_email], Spree.user_class, id: user.id if user.persisted?
72
72
  can :read, State
73
73
  can :read, StockItem, stock_location: { active: true }
74
74
  can :read, StockLocation, active: true
75
75
  can :read, Taxon
76
76
  can :read, Taxonomy
77
- can [:save_in_address_book, :remove_from_address_book], Spree.user_class, id: user.id
77
+ can [:save_in_address_book, :remove_from_address_book], Spree.user_class, id: user.id if user.persisted?
78
78
  can [:read, :view_out_of_stock], Variant
79
79
  can :read, Zone
80
80
  end
data/app/models/spree/product.rb CHANGED
@@ -147,6 +147,11 @@ module Spree
147
147
  super || Spree::TaxCategory.find_by(is_default: true)
148
148
  end
149
149
 
150
+ # @return [Integer] tax category id for this product, or the default tax category id
151
+ def tax_category_id
152
+ super || tax_category&.id
153
+ end
154
+
150
155
  # Ensures option_types and product_option_types exist for keys in
151
156
  # option_values_hash.
152
157
  #
data/app/models/spree/return_item.rb CHANGED
@@ -177,16 +177,16 @@ module Spree
177
177
  exchange_requested? || sibling_intended_for_exchange('unexchanged')
178
178
  end
179
179
 
180
+ def currency
181
+ return_authorization.try(:currency) || Spree::Config[:currency]
182
+ end
183
+
180
184
  private
181
185
 
182
186
  def persist_acceptance_status_errors
183
187
  update(acceptance_status_errors: validator.errors)
184
188
  end
185
189
 
186
- def currency
187
- return_authorization.try(:currency) || Spree::Config[:currency]
188
- end
189
-
190
190
  def process_inventory_unit!
191
191
  inventory_unit.return!
192
192
 
data/app/views/layouts/spree/base_mailer.html.erb CHANGED
@@ -3,6 +3,7 @@
3
3
  <head>
4
4
  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
5
5
  <meta name="viewport" content="width=device-width">
6
+ <%# The Ink CSS below is MIT licensed; see ink.license.txt in this directory. %>
6
7
  <style>
7
8
  /**********************************************
8
9
  * Ink v1.0.5 - Copyright 2013 ZURB Inc *
data/app/views/layouts/spree/ink.license.txt ADDED
@@ -0,0 +1,28 @@
1
+ The mailer layout in this directory (base_mailer.html.erb) inlines the
2
+ CSS of Ink v1.0.5, ZURB's responsive email framework, from
3
+ https://github.com/foundation/foundation-emails (formerly zurb/ink).
4
+
5
+ --------------------------------------------------------------------------------
6
+
7
+ Copyright (c) 2013 ZURB, inc.
8
+
9
+ MIT License
10
+
11
+ Permission is hereby granted, free of charge, to any person obtaining
12
+ a copy of this software and associated documentation files (the
13
+ "Software"), to deal in the Software without restriction, including
14
+ without limitation the rights to use, copy, modify, merge, publish,
15
+ distribute, sublicense, and/or sell copies of the Software, and to
16
+ permit persons to whom the Software is furnished to do so, subject to
17
+ the following conditions:
18
+
19
+ The above copyright notice and this permission notice shall be
20
+ included in all copies or substantial portions of the Software.
21
+
22
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
23
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
24
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
25
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
26
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
27
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
28
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/lib/spree/core/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Spree
4
- VERSION = "4.6.2"
4
+ VERSION = "4.6.3"
5
5
 
6
6
  def self.solidus_version = VERSION
7
7
 
data/lib/spree/permitted_attributes.rb CHANGED
@@ -73,7 +73,7 @@ module Spree
73
73
 
74
74
  @@option_type_attributes = [:name, :presentation, option_values_attributes: option_value_attributes]
75
75
 
76
- @@payment_attributes = [:amount, :payment_method_id, :payment_method, customer_metadata: {}]
76
+ @@payment_attributes = [:payment_method_id, :payment_method, customer_metadata: {}]
77
77
 
78
78
  @@product_properties_attributes = [:property_name, :value, :position]
79
79
 
@@ -165,6 +165,7 @@ module Spree
165
165
 
166
166
  @@checkout_payment_attributes = [
167
167
  payments_attributes: payment_attributes + [
168
+ :amount,
168
169
  source_attributes:
169
170
  ]
170
171
  ]
data/lib/spree/testing_support/order_walkthrough.rb CHANGED
@@ -10,7 +10,7 @@ module Spree
10
10
  def up_to(state, user: nil)
11
11
  # Need to create a valid zone too...
12
12
  @zone = ::FactoryBot.create(:zone)
13
- @country = ::FactoryBot.create(:country)
13
+ @country = Spree::Country.find_by(iso: "US") || ::FactoryBot.create(:country)
14
14
  @state = ::FactoryBot.create(:state, country: @country)
15
15
 
16
16
  @zone.members << Spree::ZoneMember.create(zoneable: @country)
data/vendor/assets/javascripts/jquery.payment.license.txt ADDED
@@ -0,0 +1,25 @@
1
+ This license covers the vendored jQuery.payment v1.3.2 (jquery.payment.js
2
+ in this directory), from https://github.com/stripe-archive/jquery.payment.
3
+
4
+ --------------------------------------------------------------------------------
5
+
6
+ Copyright (c) 2014 Stripe
7
+
8
+ Permission is hereby granted, free of charge, to any person obtaining
9
+ a copy of this software and associated documentation files (the
10
+ "Software"), to deal in the Software without restriction, including
11
+ without limitation the rights to use, copy, modify, merge, publish,
12
+ distribute, sublicense, and/or sell copies of the Software, and to
13
+ permit persons to whom the Software is furnished to do so, subject to
14
+ the following conditions:
15
+
16
+ The above copyright notice and this permission notice shall be
17
+ included in all copies or substantial portions of the Software.
18
+
19
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
21
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
22
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
23
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
24
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
25
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/vendor/assets/javascripts/jsuri.license.txt ADDED
@@ -0,0 +1,12 @@
1
+ This license covers the vendored jsUri v1.1.1 (jsuri.js in this
2
+ directory), from https://github.com/derek-watson/jsUri.
3
+
4
+ --------------------------------------------------------------------------------
5
+
6
+ Copyright (c) 2014, Derek Watson
7
+
8
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
9
+
10
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
11
+
12
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.6.2
4
+ version: 4.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
@@ -768,6 +768,7 @@ files:
768
768
  - app/subscribers/spree/order_mailer_subscriber.rb
769
769
  - app/subscribers/spree/reimbursement_mailer_subscriber.rb
770
770
  - app/views/layouts/spree/base_mailer.html.erb
771
+ - app/views/layouts/spree/ink.license.txt
771
772
  - app/views/spree/carton_mailer/shipped_email.html.erb
772
773
  - app/views/spree/carton_mailer/shipped_email.text.erb
773
774
  - app/views/spree/order_mailer/cancel_email.html.erb
@@ -1070,7 +1071,9 @@ files:
1070
1071
  - lib/tasks/solidus/delete_prices_with_nil_amount.rake
1071
1072
  - solidus_core.gemspec
1072
1073
  - vendor/assets/javascripts/jquery.payment.js
1074
+ - vendor/assets/javascripts/jquery.payment.license.txt
1073
1075
  - vendor/assets/javascripts/jsuri.js
1076
+ - vendor/assets/javascripts/jsuri.license.txt
1074
1077
  - vendor/assets/stylesheets/normalize.css
1075
1078
  homepage: http://solidus.io
1076
1079
  licenses:
@@ -1114,7 +1117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1114
1117
  - !ruby/object:Gem::Version
1115
1118
  version: 1.8.23
1116
1119
  requirements: []
1117
- rubygems_version: 3.7.2
1120
+ rubygems_version: 4.0.10
1118
1121
  specification_version: 4
1119
1122
  summary: Essential models, mailers, and classes for the Solidus e-commerce project.
1120
1123
  test_files: []