Updated to support NopCommerce 3.50

AButler · Feb 22, 2015 · f013eb4 · f013eb4
1 parent 9ac34e7
commit f013eb4
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/Payments.Nochex/Description.txt b/Payments.Nochex/Description.txt
@@ -1,8 +1,8 @@
 Group: Payment methods
 FriendlyName: Nochex
 SystemName: Payments.Nochex
-Version: 3.41
-SupportedVersions: 3.40
+Version: 3.50
+SupportedVersions: 3.50
 Author: webbutler
 DisplayOrder: 1
 FileName: Nop.Plugin.Payments.Nochex.dll
diff --git a/Payments.Nochex/NochexPaymentProcessor.cs b/Payments.Nochex/NochexPaymentProcessor.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Web;
 using System.Web.Routing;
 using Nop.Core;
 using Nop.Core.Domain.Orders;
@@ -28,15 +26,13 @@ public class NochexPaymentProcessor: BasePlugin, IPaymentMethod {
     private readonly NochexPaymentSettings _settings;
     private readonly ISettingService _settingService;
     private readonly IWebHelper _webHelper;
-    private readonly HttpContextBase _httpContext;
     private readonly IOrderTotalCalculationService _orderTotalCalculationService;
     private readonly ITokenizer _tokenizer;
 
-    public NochexPaymentProcessor( NochexPaymentSettings settings, ISettingService settingService, IWebHelper webHelper, HttpContextBase httpContext, IOrderTotalCalculationService orderTotalCalculationService, ITokenizer tokenizer ) {
+    public NochexPaymentProcessor( NochexPaymentSettings settings, ISettingService settingService, IWebHelper webHelper, IOrderTotalCalculationService orderTotalCalculationService, ITokenizer tokenizer ) {
       _settings = settings;
       _settingService = settingService;
       _webHelper = webHelper;
-      _httpContext = httpContext;
       _orderTotalCalculationService = orderTotalCalculationService;
       _tokenizer = tokenizer;
     }
@@ -98,6 +94,10 @@ public void PostProcessPayment( PostProcessPaymentRequest postProcessPaymentRequ
       post.Post();
     }
 
+    public bool HidePaymentMethod( IList<ShoppingCartItem> cart ) {
+      return false;
+    }
+
     public decimal GetAdditionalHandlingFee( IList<ShoppingCartItem> cart ) {
       return this.CalculateAdditionalFee( _orderTotalCalculationService, cart, _settings.AdditionalFee, _settings.AdditionalFeePercentage );
     }

diff --git a/Payments.Nochex/Payments.Nochex.csproj b/Payments.Nochex/Payments.Nochex.csproj
@@ -51,32 +51,32 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.Helpers.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.0\lib\net45\System.Web.Mvc.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.0\lib\net45\System.Web.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
       <Private>False</Private>
     </Reference>
   </ItemGroup>

diff --git a/Payments.Nochex/Properties/AssemblyInfo.cs b/Payments.Nochex/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -32,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.4.1.0" )]
-[assembly: AssemblyFileVersion( "3.4.1.0" )]
+[assembly: AssemblyVersion( "3.5.0.0" )]
+[assembly: AssemblyFileVersion( "3.5.0.0" )]
diff --git a/Payments.Nochex/Views/PaymentNochex/Configure.cshtml b/Payments.Nochex/Views/PaymentNochex/Configure.cshtml
@@ -51,6 +51,7 @@
 </script>
 
 @using ( Html.BeginForm() ) {
+  @Html.AntiForgeryToken()
   <table class="adminContent">
     <tr>
       <td colspan="2">

diff --git a/Payments.Nochex/packages.config b/Payments.Nochex/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.0" targetFramework="net451" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.0" targetFramework="net451" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.0" targetFramework="net451" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net451" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net451" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net451" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net451" />
 </packages>
diff --git a/References/NopCommerce/Nop.Core.dll b/References/NopCommerce/Nop.Core.dll
diff --git a/References/NopCommerce/Nop.Services.dll b/References/NopCommerce/Nop.Services.dll
diff --git a/References/NopCommerce/Nop.Web.Framework.dll b/References/NopCommerce/Nop.Web.Framework.dll