Reverted setting class renaming

Michael-Herzog · Michael-Herzog · commit 4d30a337ef45 · 2014-10-31T16:50:50.000+01:00
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalDirectController.cs
@@ -30,14 +30,14 @@ public class PayPalDirectController : PaymentControllerBase
 		private readonly IPaymentService _paymentService;
 		private readonly IOrderService _orderService;
 		private readonly IOrderProcessingService _orderProcessingService;
-		private readonly PayPalDirectSettings _paypalDirectSettings;
+		private readonly PayPalDirectPaymentSettings _paypalDirectSettings;
 		private readonly PaymentSettings _paymentSettings;
 		private readonly ILocalizationService _localizationService;
 
 		public PayPalDirectController(ISettingService settingService,
 			IPaymentService paymentService, IOrderService orderService,
 			IOrderProcessingService orderProcessingService,
-			PayPalDirectSettings paypalDirectSettings,
+			PayPalDirectPaymentSettings paypalDirectSettings,
 			PaymentSettings paymentSettings, ILocalizationService localizationService,
 			IComponentContext ctx)
 		{
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalExpressController.cs
@@ -42,7 +42,7 @@ public class PayPalExpressController : PaymentControllerBase
 		private readonly IOrderService _orderService;
 		private readonly IOrderProcessingService _orderProcessingService;
 		private readonly ILogger _logger;
-		private readonly PayPalExpressSettings _payPalExpressPaymentSettings;
+		private readonly PayPalExpressPaymentSettings _payPalExpressPaymentSettings;
 		private readonly PaymentSettings _paymentSettings;
 		private readonly ILocalizationService _localizationService;
 		private readonly IWorkContext _workContext;
@@ -58,7 +58,7 @@ public class PayPalExpressController : PaymentControllerBase
 		public PayPalExpressController(ISettingService settingService,
 			IPaymentService paymentService, IOrderService orderService,
 			IOrderProcessingService orderProcessingService,
-			ILogger logger, PayPalExpressSettings PayPalExpressPaymentSettings,
+			ILogger logger, PayPalExpressPaymentSettings PayPalExpressPaymentSettings,
 			PaymentSettings paymentSettings, ILocalizationService localizationService,
 			IWorkContext workContext, OrderSettings orderSettings,
 			ICurrencyService currencyService, CurrencySettings currencySettings,
diff --git a/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs b/src/Plugins/SmartStore.PayPal/Controllers/PayPalStandardController.cs
@@ -31,7 +31,7 @@ public class PayPalStandardController : PaymentControllerBase
 		private readonly IStoreContext _storeContext;
 		private readonly IWorkContext _workContext;
 		private readonly IWebHelper _webHelper;
-		private readonly PayPalStandardSettings _paypalStandardSettings;
+		private readonly PayPalStandardPaymentSettings _paypalStandardSettings;
 		private readonly PaymentSettings _paymentSettings;
 		private readonly ILocalizationService _localizationService;
 
@@ -41,7 +41,7 @@ public PayPalStandardController(ISettingService settingService,
 			IStoreContext storeContext,
 			IWorkContext workContext,
 			IWebHelper webHelper,
-            PayPalStandardSettings paypalStandardSettings,
+            PayPalStandardPaymentSettings paypalStandardSettings,
 			PaymentSettings paymentSettings,
 			ILocalizationService localizationService)
 		{
diff --git a/src/Plugins/SmartStore.PayPal/Plugin.cs b/src/Plugins/SmartStore.PayPal/Plugin.cs
@@ -25,27 +25,27 @@ public Plugin(
 
 		public override void Install()
 		{
-            var paypalExpressSettings = new PayPalExpressSettings()
+            var paypalExpressSettings = new PayPalExpressPaymentSettings()
             {
                 UseSandbox = true,
                 TransactMode = TransactMode.Authorize
             };
-            _settingService.SaveSetting<PayPalExpressSettings>(paypalExpressSettings);
+            _settingService.SaveSetting<PayPalExpressPaymentSettings>(paypalExpressSettings);
 
-            var paypalDirectSettings = new PayPalDirectSettings()
+            var paypalDirectSettings = new PayPalDirectPaymentSettings()
             {
                 TransactMode = TransactMode.Authorize,
                 UseSandbox = true,
             };
-            _settingService.SaveSetting<PayPalDirectSettings>(paypalDirectSettings);
+            _settingService.SaveSetting<PayPalDirectPaymentSettings>(paypalDirectSettings);
 
-            var paypalStandardSettings = new PayPalStandardSettings()
+            var paypalStandardSettings = new PayPalStandardPaymentSettings()
             {
                 UseSandbox = true,
                 PdtValidateOrderTotal = true,
                 EnableIpn = true,
             };
-            _settingService.SaveSetting<PayPalStandardSettings>(paypalStandardSettings);
+            _settingService.SaveSetting<PayPalStandardPaymentSettings>(paypalStandardSettings);
 
 			_localizationService.ImportPluginResourcesFromXml(this.PluginDescriptor);
 
@@ -54,9 +54,9 @@ public override void Install()
 
 		public override void Uninstall()
 		{
-            _settingService.DeleteSetting<PayPalExpressSettings>();
-            _settingService.DeleteSetting<PayPalDirectSettings>();
-            _settingService.DeleteSetting<PayPalStandardSettings>();
+            _settingService.DeleteSetting<PayPalExpressPaymentSettings>();
+            _settingService.DeleteSetting<PayPalDirectPaymentSettings>();
+            _settingService.DeleteSetting<PayPalStandardPaymentSettings>();
 
 			_localizationService.DeleteLocaleStringResources(PluginDescriptor.ResourceRootKey);
 
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalDirectProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalDirectProvider.cs
@@ -34,7 +34,7 @@ namespace SmartStore.PayPal
     [SystemName("Payments.PayPalDirect")]
     [FriendlyName("PayPal Direct")]
     [DisplayOrder(1)]
-    public class PayPalDirectProvider : PayPalProviderBase<PayPalDirectSettings>
+    public class PayPalDirectProvider : PayPalProviderBase<PayPalDirectPaymentSettings>
 	{
 		#region Fields
 
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalExpressProvider.cs
@@ -32,7 +32,7 @@ namespace SmartStore.PayPal
     [SystemName("Payments.PayPalExpress")]
     [FriendlyName("PayPal Express")]
     [DisplayOrder(0)]
-    public partial class PayPalExpress : PayPalProviderBase<PayPalExpressSettings>
+    public partial class PayPalExpress : PayPalProviderBase<PayPalExpressPaymentSettings>
     {
         private readonly ICurrencyService _currencyService;
         private readonly CurrencySettings _currencySettings;
diff --git a/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs b/src/Plugins/SmartStore.PayPal/Providers/PayPalStandardProvider.cs
@@ -46,7 +46,7 @@ public partial class PayPalStandardProvider : PaymentPluginBase, IConfigurable
 		private readonly ICheckoutAttributeParser _checkoutAttributeParser;
 		private readonly ITaxService _taxService;
         private readonly HttpContextBase _httpContext;
-        private readonly PayPalStandardSettings _paypalStandardSettings;
+        private readonly PayPalStandardPaymentSettings _paypalStandardSettings;
         private readonly ICommonServices _commonServices;
         private readonly ILogger _logger;
 
@@ -60,7 +60,7 @@ public PayPalStandardProvider(ICurrencyService currencyService,
             IOrderTotalCalculationService orderTotalCalculationService,
             ICheckoutAttributeParser checkoutAttributeParser,
             ITaxService taxService, 
-            PayPalStandardSettings paypalStandardSettings,
+            PayPalStandardPaymentSettings paypalStandardSettings,
             ICommonServices commonServices, 
             ILogger logger)
 		{
diff --git a/src/Plugins/SmartStore.PayPal/Services/PayPalHelper.cs b/src/Plugins/SmartStore.PayPal/Services/PayPalHelper.cs
@@ -212,7 +212,7 @@ public static CreditCardTypeType GetPaypalCreditCardType(string creditCardType)
             return creditCardTypeType;
         }
 
-        public static PaymentActionCodeType GetPaymentAction(PayPalExpressSettings payPalExpressPaymentSettings)
+        public static PaymentActionCodeType GetPaymentAction(PayPalExpressPaymentSettings payPalExpressPaymentSettings)
         {
             if (payPalExpressPaymentSettings.TransactMode == TransactMode.Authorize)
             {
diff --git a/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs b/src/Plugins/SmartStore.PayPal/Settings/PayPalSettings.cs
@@ -24,11 +24,11 @@ public abstract class PayPalApiSettingsBase : PayPalSettingsBase
 		public string Signature { get; set; }
 	}
 
-    public class PayPalDirectSettings : PayPalApiSettingsBase, ISettings
+    public class PayPalDirectPaymentSettings : PayPalApiSettingsBase, ISettings
     {
     }
 
-    public class PayPalExpressSettings : PayPalApiSettingsBase, ISettings 
+    public class PayPalExpressPaymentSettings : PayPalApiSettingsBase, ISettings 
     {
         /// <summary>
         /// Determines whether the checkout button is displayed beneath the cart
@@ -56,7 +56,7 @@ public class PayPalExpressSettings : PayPalApiSettingsBase, ISettings
         public decimal DefaultShippingPrice { get; set; }
     }
 
-    public class PayPalStandardSettings : PayPalSettingsBase, ISettings
+    public class PayPalStandardPaymentSettings : PayPalSettingsBase, ISettings
     {
         public string BusinessEmail { get; set; }
         public string PdtToken { get; set; }
diff --git a/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs b/src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs
@@ -20,7 +20,7 @@ public class ByTotalController : PluginControllerBase
 		private readonly IStoreService _storeService;
         private readonly ISettingService _settingService;
         private readonly IShippingByTotalService _shippingByTotalService;
-        private readonly ByTotalSettings _shippingByTotalSettings;
+        private readonly ShippingByTotalSettings _shippingByTotalSettings;
         private readonly ICountryService _countryService;
         private readonly ICurrencyService _currencyService;
         private readonly CurrencySettings _currencySettings;
@@ -30,7 +30,7 @@ public ByTotalController(IShippingService shippingService,
 			IStoreService storeService, 
             ISettingService settingService, 
             IShippingByTotalService shippingByTotalService,
-            ByTotalSettings shippingByTotalSettings, 
+            ShippingByTotalSettings shippingByTotalSettings, 
             ICountryService countryService,
             ICurrencyService currencyService, 
             CurrencySettings currencySettings,
diff --git a/src/Plugins/SmartStore.Shipping/Plugin.cs b/src/Plugins/SmartStore.Shipping/Plugin.cs
@@ -45,13 +45,13 @@ public Plugin(ILogger logger,
         /// </summary>
         public override void Install()
         {            
-            var byTotalSettings = new ByTotalSettings()
+            var shippingByTotalSettings = new ShippingByTotalSettings()
             {
                 LimitMethodsToCreated = false,
                 SmallQuantityThreshold = 0,
                 SmallQuantitySurcharge = 0
             };
-            _settingService.SaveSetting(byTotalSettings);
+            _settingService.SaveSetting(shippingByTotalSettings);
 
             _localizationService.ImportPluginResourcesFromXml(this.PluginDescriptor);
 
@@ -65,7 +65,7 @@ public override void Install()
         /// </summary>
         public override void Uninstall()
         {
-            _settingService.DeleteSetting<ByTotalSettings>();
+            _settingService.DeleteSetting<ShippingByTotalSettings>();
 
 			_localizationService.DeleteLocaleStringResources(PluginDescriptor.ResourceRootKey);
 
diff --git a/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs b/src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs
@@ -22,7 +22,7 @@ public class ByTotalProvider : IShippingRateComputationMethod, IConfigurable
         private readonly IShippingService _shippingService;
 		private readonly IStoreContext _storeContext;
         private readonly IShippingByTotalService _shippingByTotalService;
-        private readonly ByTotalSettings _shippingByTotalSettings;
+        private readonly ShippingByTotalSettings _shippingByTotalSettings;
         private readonly IPriceCalculationService _priceCalculationService;
         private readonly ILogger _logger;
         private readonly ISettingService _settingService;
@@ -42,7 +42,7 @@ public class ByTotalProvider : IShippingRateComputationMethod, IConfigurable
         public ByTotalProvider(IShippingService shippingService,
 			IStoreContext storeContext,
             IShippingByTotalService shippingByTotalService,
-            ByTotalSettings shippingByTotalSettings,
+            ShippingByTotalSettings shippingByTotalSettings,
             IPriceCalculationService priceCalculationService,
             ILogger logger,
             ISettingService settingService,
diff --git a/src/Plugins/SmartStore.Shipping/Settings/ShippingByTotalSettings.cs b/src/Plugins/SmartStore.Shipping/Settings/ShippingByTotalSettings.cs
@@ -2,7 +2,7 @@
 
 namespace SmartStore.Shipping
 {
-    public class ByTotalSettings : ISettings
+    public class ShippingByTotalSettings : ISettings
     {
         public bool LimitMethodsToCreated { get; set; }
 
diff --git a/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj b/src/Plugins/SmartStore.Shipping/SmartStore.Shipping.csproj
@@ -163,7 +163,7 @@
     <Compile Include="RouteProvider.cs" />
     <Compile Include="Services\IShippingByTotalService.cs" />
     <Compile Include="Services\ShippingByTotalService.cs" />
-    <Compile Include="Settings\ByTotalSettings.cs" />
+    <Compile Include="Settings\ShippingByTotalSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Libraries\SmartStore.Core\SmartStore.Core.csproj">

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ namespace SmartStore.PayPal`
`34`	`34`	`[SystemName("Payments.PayPalDirect")]`
`35`	`35`	`[FriendlyName("PayPal Direct")]`
`36`	`36`	`[DisplayOrder(1)]`
`37`		`- public class PayPalDirectProvider : PayPalProviderBase<PayPalDirectSettings>`
	`37`	`+ public class PayPalDirectProvider : PayPalProviderBase<PayPalDirectPaymentSettings>`
`38`	`38`	`{`
`39`	`39`	`#region Fields`
`40`	`40`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ namespace SmartStore.PayPal`
`32`	`32`	`[SystemName("Payments.PayPalExpress")]`
`33`	`33`	`[FriendlyName("PayPal Express")]`
`34`	`34`	`[DisplayOrder(0)]`
`35`		`- public partial class PayPalExpress : PayPalProviderBase<PayPalExpressSettings>`
	`35`	`+ public partial class PayPalExpress : PayPalProviderBase<PayPalExpressPaymentSettings>`
`36`	`36`	`{`
`37`	`37`	`private readonly ICurrencyService _currencyService;`
`38`	`38`	`private readonly CurrencySettings _currencySettings;`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ public static CreditCardTypeType GetPaypalCreditCardType(string creditCardType)`
`212`	`212`	`return creditCardTypeType;`
`213`	`213`	`}`
`214`	`214`
`215`		`- public static PaymentActionCodeType GetPaymentAction(PayPalExpressSettings payPalExpressPaymentSettings)`
	`215`	`+ public static PaymentActionCodeType GetPaymentAction(PayPalExpressPaymentSettings payPalExpressPaymentSettings)`
`216`	`216`	`{`
`217`	`217`	`if (payPalExpressPaymentSettings.TransactMode == TransactMode.Authorize)`
`218`	`218`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,11 @@ public abstract class PayPalApiSettingsBase : PayPalSettingsBase`
`24`	`24`	`public string Signature { get; set; }`
`25`	`25`	`}`
`26`	`26`
`27`		`- public class PayPalDirectSettings : PayPalApiSettingsBase, ISettings`
	`27`	`+ public class PayPalDirectPaymentSettings : PayPalApiSettingsBase, ISettings`
`28`	`28`	`{`
`29`	`29`	`}`
`30`	`30`
`31`		`- public class PayPalExpressSettings : PayPalApiSettingsBase, ISettings`
	`31`	`+ public class PayPalExpressPaymentSettings : PayPalApiSettingsBase, ISettings`
`32`	`32`	`{`
`33`	`33`	`/// <summary>`
`34`	`34`	`/// Determines whether the checkout button is displayed beneath the cart`
`@@ -56,7 +56,7 @@ public class PayPalExpressSettings : PayPalApiSettingsBase, ISettings`
`56`	`56`	`public decimal DefaultShippingPrice { get; set; }`
`57`	`57`	`}`
`58`	`58`
`59`		`- public class PayPalStandardSettings : PayPalSettingsBase, ISettings`
	`59`	`+ public class PayPalStandardPaymentSettings : PayPalSettingsBase, ISettings`
`60`	`60`	`{`
`61`	`61`	`public string BusinessEmail { get; set; }`
`62`	`62`	`public string PdtToken { get; set; }`