Merge pull request #1605 from mamhoff/use-current-store-cart-tax-coun…

…try-iso-for-frontend-pricing

Make frontend prices depend on `store.cart_tax_country_iso`

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Solidus 2.1.0 (master, unreleased)
 
+*   Make frontend prices depend on `store.cart_tax_country_iso`
+
+    Prices in the frontend now depend on `store.cart_tax_country_iso` instead of `Spree::Config.admin_vat_country_iso`.
+
 *   Deprecate methods related to Spree::Order#tax_zone
 
     We're not using `Spree::Order#tax_zone`, `Spree::Zone.default_tax`,

core/lib/spree/core/controller_helpers/pricing.rb

@@ -13,7 +13,8 @@ module Pricing
 
         def current_pricing_options
           Spree::Config.pricing_options_class.new(
-            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency]
+            currency: current_store.try!(:default_currency).presence || Spree::Config[:currency],
+            country_iso: current_store.try!(:cart_tax_country_iso).presence
           )
         end
 

core/spec/lib/spree/core/controller_helpers/pricing_spec.rb

@@ -59,5 +59,21 @@ class FakesController < ApplicationController
         it { is_expected.to eq('EUR') }
       end
     end
+
+    context "country_iso" do
+      subject { controller.current_pricing_options.country_iso }
+
+      let(:store) { FactoryGirl.create(:store, cart_tax_country_iso: cart_tax_country_iso) }
+
+      context "when the store has a cart tax country set" do
+        let(:cart_tax_country_iso) { "DE" }
+        it { is_expected.to eq("DE") }
+      end
+
+      context "when the store has no cart tax country set" do
+        let(:cart_tax_country_iso) { nil }
+        it { is_expected.to be_nil }
+      end
+    end
   end
 end