solidus_core 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3263e651c249f7132a2822dbe5a4508617b682
-  data.tar.gz: c88646c2c93f76d322257972c5a3f66a6f4a944c
+  metadata.gz: 952e276836908b8af39db77a1163dfd84c243046
+  data.tar.gz: 03bc4b4b64e57d4e04f4ca84adf9bca0b84c505e
 SHA512:
-  metadata.gz: fef0c334be6323fabe146a766925b2b96dec8d483a66976bf6c80a5789120b51d7391260ad4ca28ac739f0586188bdd1ddc8ac11676e0d1d624dac0f19cf2544
-  data.tar.gz: 345deaecc760306238af01d9499d0898d54851fa2f7c600408bd8385ba1243c011ae8ce8f1e84595d43a76b083a4a7ba216cd373a1573b6c6f9917cb6ae55660
+  metadata.gz: 6cafeef6e36e33cfd539daf64ebffea89f79a0f3b18527f0f478a6c94c14f5430db5f336b7dc5280f9e57f2e7fcb3ae7b8f784a8bf239a0ff85ac64f2e191cc2
+  data.tar.gz: c0553fee07e117efe50fc80f9ee459266176d061a3e2520c05993cd2f5c6b5260d0b22edf25061f13e1e537086ca30decacb0deac3d5f65712cfa41d055475e7

data/app/helpers/spree/base_helper.rb

@@ -107,13 +107,14 @@ module Spree
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
       return '' if max_level < 1 || root_taxon.children.empty?
       content_tag :ul, class: 'taxons-list' do
-        root_taxon.children.map do |taxon|
+        taxons = root_taxon.children.map do |taxon|
           css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
           content_tag :li, class: css_class do
            link_to(taxon.name, seo_url(taxon)) +
            taxons_tree(taxon, current_taxon, max_level - 1)
           end
-        end.join("\n").html_safe
+        end
+        safe_join(taxons, "\n")
       end
     end
 

data/app/models/spree/tax_rate.rb

@@ -51,10 +51,17 @@ module Spree
       # This little bit of code at the end stops the Spanish refund from appearing.
       #
       # For further discussion, see #4397 and #4327.
-      rates.delete_if do |rate|
-        rate.included_in_price? &&
-        (rates - [rate]).map(&:tax_category).include?(rate.tax_category)
+
+      remaining_rates = rates.dup
+      rates.each do |rate|
+        if rate.included_in_price?
+          if remaining_rates.any?{|r| r != rate && r.tax_category == rate.tax_category }
+            remaining_rates.delete(rate)
+          end
+        end
       end
+
+      remaining_rates
     end
 
     # Pre-tax amounts must be stored so that we can calculate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1255,3 +1255,4 @@ signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []
+has_rdoc: