solidus_core 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4645204b6bf64e52c8af3f52aed742b11aa8a62f
-  data.tar.gz: 3d1f4e3af98b187c25c36ccb4f2f7a8950825299
+  metadata.gz: fb628effcfda240354e15e2ae099740a7e10d5d6
+  data.tar.gz: 1e6540e660eca7a4d3e4b69ea0dd9266a676ea69
 SHA512:
-  metadata.gz: 87bfa13af09f01c373578a2d0ac59ac35fda8f1e3ffdc7a544fce633630e522b8988741c0b117b4cdf322ed5002793c5201450048486e1d19044c2e0725c9a99
-  data.tar.gz: 7ca4d9525c242187157fa20cfce31611e7678017dd964fa904a7bbfafb20e87b791e4196a39aa655f91b55081b3870860adb2dd21c601568f4781dd671719225
+  metadata.gz: 3c8c0564b65175ea0a19830eb1569a59ffca329a530bee748c66f78ea8a23fc12eeccba3da510a56dfcfc2a75e220b7660afee0e961669587eec6031a8501ac3
+  data.tar.gz: 44ab87bbf973df9ba2f092466631bf701f90214755e23287b39b0d298eee3fe84f1ea455e7505ef33cef1326a73341103eb5a78f3fe2af559fef9186febd54e6

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.1.2
+  version: 1.1.3
 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
@@ -1310,3 +1310,4 @@ signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []
+has_rdoc: