A tax provider should never be activated without any merchant interaction

mgesing · mgesing · commit db547dcf2b07 · 2015-10-06T17:20:14.000+02:00
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,4 @@
-# Release Notes
+﻿# Release Notes
 
 ## SmartStore.NET 2.5
 
@@ -56,6 +56,7 @@
 * #770 Resizing browser with product details page causes product image to disappear
 * GMC feed: Availability value "available for order" deprecated
 * Mobile: Shopping cart warnings weren't displayed to customers
+* Tax provider and payment method were automatically activated when there were no active provider\method
 
 
 ## SmartStore.NET 2.2.2
diff --git a/src/Libraries/SmartStore.Services/Tax/TaxService.cs b/src/Libraries/SmartStore.Services/Tax/TaxService.cs
@@ -8,11 +8,9 @@
 using SmartStore.Core.Domain.Customers;
 using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Tax;
-using SmartStore.Core.Infrastructure;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Common;
 using SmartStore.Services.Directory;
-using SmartStore.Services.Configuration;
 
 namespace SmartStore.Services.Tax
 {
@@ -44,7 +42,6 @@ public TaxAddressKey(int customerId, bool productIsEsd)
         private readonly IPluginFinder _pluginFinder;
         private readonly IDictionary<TaxRateCacheKey, decimal> _cachedTaxRates;
 		private readonly IDictionary<TaxAddressKey, Address> _cachedTaxAddresses;
-		private readonly ISettingService _settingService;
 		private readonly IProviderManager _providerManager;
 		private readonly IGeoCountryLookup _geoCountryLookup;
 
@@ -65,10 +62,8 @@ public TaxService(
             TaxSettings taxSettings,
 			ShoppingCartSettings cartSettings,
             IPluginFinder pluginFinder,
-			ISettingService settingService,
 			IGeoCountryLookup geoCountryLookup,
-			IProviderManager providerManager
-			)
+			IProviderManager providerManager)
         {
             this._addressService = addressService;
 			this._workContext = workContext;
@@ -77,7 +72,6 @@ IProviderManager providerManager
 			this._pluginFinder = pluginFinder;
 			this._cachedTaxRates = new Dictionary<TaxRateCacheKey, decimal>();
 			this._cachedTaxAddresses = new Dictionary<TaxAddressKey, Address>();
-			this._settingService = settingService;
 			this._providerManager = providerManager;
 			this._geoCountryLookup = geoCountryLookup;
         }
@@ -274,9 +268,7 @@ public virtual Provider<ITaxProvider> LoadActiveTaxProvider()
             if (taxProvider == null)
             {
                 taxProvider = LoadAllTaxProviders().FirstOrDefault();
-                _taxSettings.ActiveTaxProviderSystemName = taxProvider.Metadata.SystemName;
-                _settingService.SaveSetting(_taxSettings);
-            }
+			}
             return taxProvider;
         }
 
diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderProcessingServiceTests.cs
@@ -159,7 +159,7 @@ public class OrderProcessingServiceTests : ServiceTest
 			_httpRequestBase = MockRepository.GenerateMock<HttpRequestBase>();
 			_geoCountryLookup = MockRepository.GenerateMock<IGeoCountryLookup>();
 
-			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _settingService, _geoCountryLookup, this.ProviderManager);
+			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _geoCountryLookup, this.ProviderManager);
 
             _rewardPointsSettings = new RewardPointsSettings();
 
diff --git a/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Orders/OrderTotalCalculationServiceTests.cs
@@ -133,7 +133,7 @@ public class OrderTotalCalculationServiceTests : ServiceTest
 			_httpRequestBase = MockRepository.GenerateMock<HttpRequestBase>();
 			_geoCountryLookup = MockRepository.GenerateMock<IGeoCountryLookup>();
 
-			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _settingService, _geoCountryLookup, this.ProviderManager);
+			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _shoppingCartSettings, pluginFinder, _geoCountryLookup, this.ProviderManager);
 
             _rewardPointsSettings = new RewardPointsSettings();
 
diff --git a/src/Tests/SmartStore.Services.Tests/Tax/TaxServiceTests.cs b/src/Tests/SmartStore.Services.Tests/Tax/TaxServiceTests.cs
@@ -1,22 +1,19 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.Linq;
+using NUnit.Framework;
+using Rhino.Mocks;
 using SmartStore.Core;
 using SmartStore.Core.Domain.Catalog;
 using SmartStore.Core.Domain.Common;
 using SmartStore.Core.Domain.Customers;
+using SmartStore.Core.Domain.Orders;
 using SmartStore.Core.Domain.Tax;
-using SmartStore.Core.Infrastructure;
+using SmartStore.Core.Events;
 using SmartStore.Core.Plugins;
 using SmartStore.Services.Common;
-using SmartStore.Core.Events;
+using SmartStore.Services.Directory;
 using SmartStore.Services.Tax;
 using SmartStore.Tests;
-using NUnit.Framework;
-using Rhino.Mocks;
-using SmartStore.Core.Domain.Orders;
-using SmartStore.Services.Configuration;
-using SmartStore.Services.Directory;
 
 namespace SmartStore.Services.Tests.Tax
 {
@@ -29,7 +26,6 @@ public class TaxServiceTests : ServiceTest
 		ShoppingCartSettings _cartSettings;
         IEventPublisher _eventPublisher;
         ITaxService _taxService;
-		ISettingService _settingService;
 		IGeoCountryLookup _geoCountryLookup;
 
         [SetUp]
@@ -51,10 +47,9 @@ public class TaxServiceTests : ServiceTest
             _eventPublisher = MockRepository.GenerateMock<IEventPublisher>();
             _eventPublisher.Expect(x => x.Publish(Arg<object>.Is.Anything));
 
-			_settingService = MockRepository.GenerateMock<ISettingService>();
 			_geoCountryLookup = MockRepository.GenerateMock<IGeoCountryLookup>();
 
-			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _cartSettings, pluginFinder, _settingService, _geoCountryLookup, this.ProviderManager);
+			_taxService = new TaxService(_addressService, _workContext, _taxSettings, _cartSettings, pluginFinder, _geoCountryLookup, this.ProviderManager);
         }
 
         [Test]
