Merge pull request #1588 from dpfaffenbauer/issues/currency-context

[Core] remove country-aware currency context as it messes with the Storage Based Currency Context

features/currency/context.feature

@@ -17,12 +17,12 @@ Feature: Adding a new Currency
   Scenario: Site should be using currency "USD"
     And I am using currency "USD"
     Then the site should be using currency "USD"
-
-  Scenario: Customer comes from Country "USA" and should use currency "USD"
-    And I am in country "USA"
-    Then the site should be using currency "USD"
-
-  Scenario: Customer comes from Country "USA" and should use currency "EUR"
-    Given the country "USA" is invalid for store "Austria"
-    And I am in country "USA"
-    Then the site should be using currency "EUR"
+#
+#  Scenario: Customer comes from Country "USA" and should use currency "USD"
+#    And I am in country "USA"
+#    Then the site should be using currency "USD"CountryAwareCurrencyContext
+#
+#  Scenario: Customer comes from Country "USA" and should use currency "EUR"
+#    Given the country "USA" is invalid for store "Austria"
+#    And I am in country "USA"
+#    Then the site should be using currency "EUR"

src/CoreShop/Bundle/CoreBundle/Resources/config/services/context.yml

@@ -54,9 +54,3 @@ services:
             - '@CoreShop\Component\Core\Context\Country\StoreAwareCountryContext.inner'
             - '@coreshop.context.store'
 
-    coreshop.context.currency.country_currency_based: '@CoreShop\Component\Core\Context\Currency\CountryAwareCurrencyContext'
-    CoreShop\Component\Core\Context\Currency\CountryAwareCurrencyContext:
-        arguments:
-            - '@coreshop.context.country'
-        tags:
-            - { name: 'coreshop.context.currency' }