solidus_core 1.0.4 → 1.0.5
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/helpers/spree/base_helper.rb +3 -2
- data/app/models/spree/tax_rate.rb +10 -3
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 952e276836908b8af39db77a1163dfd84c243046
|
|
4
|
+
data.tar.gz: 03bc4b4b64e57d4e04f4ca84adf9bca0b84c505e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 6cafeef6e36e33cfd539daf64ebffea89f79a0f3b18527f0f478a6c94c14f5430db5f336b7dc5280f9e57f2e7fcb3ae7b8f784a8bf239a0ff85ac64f2e191cc2
|
|
7
|
+
data.tar.gz: c0553fee07e117efe50fc80f9ee459266176d061a3e2520c05993cd2f5c6b5260d0b22edf25061f13e1e537086ca30decacb0deac3d5f65712cfa41d055475e7
|
|
@@ -107,13 +107,14 @@ module Spree
|
|
|
107
107
|
def taxons_tree(root_taxon, current_taxon, max_level = 1)
|
|
108
108
|
return '' if max_level < 1 || root_taxon.children.empty?
|
|
109
109
|
content_tag :ul, class: 'taxons-list' do
|
|
110
|
-
root_taxon.children.map do |taxon|
|
|
110
|
+
taxons = root_taxon.children.map do |taxon|
|
|
111
111
|
css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
|
|
112
112
|
content_tag :li, class: css_class do
|
|
113
113
|
link_to(taxon.name, seo_url(taxon)) +
|
|
114
114
|
taxons_tree(taxon, current_taxon, max_level - 1)
|
|
115
115
|
end
|
|
116
|
-
end
|
|
116
|
+
end
|
|
117
|
+
safe_join(taxons, "\n")
|
|
117
118
|
end
|
|
118
119
|
end
|
|
119
120
|
|
|
@@ -51,10 +51,17 @@ module Spree
|
|
|
51
51
|
# This little bit of code at the end stops the Spanish refund from appearing.
|
|
52
52
|
#
|
|
53
53
|
# For further discussion, see #4397 and #4327.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
|
|
55
|
+
remaining_rates = rates.dup
|
|
56
|
+
rates.each do |rate|
|
|
57
|
+
if rate.included_in_price?
|
|
58
|
+
if remaining_rates.any?{|r| r != rate && r.tax_category == rate.tax_category }
|
|
59
|
+
remaining_rates.delete(rate)
|
|
60
|
+
end
|
|
61
|
+
end
|
|
57
62
|
end
|
|
63
|
+
|
|
64
|
+
remaining_rates
|
|
58
65
|
end
|
|
59
66
|
|
|
60
67
|
# Pre-tax amounts must be stored so that we can calculate
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: solidus_core
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Solidus Team
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
11
|
+
date: 2016-02-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activemerchant
|
|
@@ -1255,3 +1255,4 @@ signing_key:
|
|
|
1255
1255
|
specification_version: 4
|
|
1256
1256
|
summary: Essential models, mailers, and classes for the Solidus e-commerce project.
|
|
1257
1257
|
test_files: []
|
|
1258
|
+
has_rdoc:
|