Skip to content
This repository has been archived by the owner on Jan 16, 2020. It is now read-only.

Commit

Permalink
Updated to support latest version of NopCommerce
Browse files Browse the repository at this point in the history
Updated to .NET 4.5.1
Added logo
  • Loading branch information
storkie committed May 19, 2014
1 parent 71eff53 commit f0bb835
Show file tree
Hide file tree
Showing 10 changed files with 182 additions and 58 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.user
2 changes: 1 addition & 1 deletion Controllers/PaymentEPayController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

namespace Nop.Plugin.Payments.EPay.Controllers
{
public class PaymentEPayController : BaseNopPaymentController
public class PaymentEPayController : BasePaymentController
{
private readonly ISettingService settingService;
private readonly IPaymentService paymentService;
Expand Down
4 changes: 2 additions & 2 deletions Description.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Group: Payment methods
FriendlyName: ePay Payment Solutions
SystemName: Payments.EPay
Version: 1.4
SupportedVersions: 3.20
Version: 1.5
SupportedVersions: 3.30
Author: ePay - Michael Korsgaard
DisplayOrder: 1
FileName: Nop.Plugin.Payments.EPay.dll
37 changes: 24 additions & 13 deletions Nop.Plugin.Payments.EPay.csproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
Expand All @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Nop.Plugin.Payments.EPay</RootNamespace>
<AssemblyName>Nop.Plugin.Payments.EPay</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<TargetFrameworkProfile>
</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand Down Expand Up @@ -67,11 +67,19 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer">
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\EntityFramework.6.1.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
<Reference Include="System.EnterpriseServices" />
<Reference Include="System.Net.Http" />
Expand All @@ -85,28 +93,28 @@
<Reference Include="System.Web" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.Helpers.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.WebPages.3.1.1\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Reference Include="System.Web.Mvc, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.Mvc.5.0.0\lib\net45\System.Web.Mvc.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.Mvc.5.1.1\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.Razor.3.0.0\lib\net45\System.Web.Razor.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.Razor.3.1.1\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.Services" />
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.WebPages.3.1.1\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.WebPages.3.1.1\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\dev\NopCommerce3.20\packages\Microsoft.AspNet.WebPages.3.0.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>..\..\..\..\..\dev\NopCommerce3.30\packages\Microsoft.AspNet.WebPages.3.1.1\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
Expand Down Expand Up @@ -147,6 +155,9 @@
<Content Include="Description.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="logo.jpg">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Views\Web.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
Expand Down Expand Up @@ -213,19 +224,19 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\..\dev\NopCommerce3.20\Libraries\Nop.Core\Nop.Core.csproj">
<ProjectReference Include="..\..\..\..\..\dev\NopCommerce3.30\Libraries\Nop.Core\Nop.Core.csproj">
<Project>{6bda8332-939f-45b7-a25e-7a797260ae59}</Project>
<Name>Nop.Core</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\dev\NopCommerce3.20\Libraries\Nop.Services\Nop.Services.csproj">
<ProjectReference Include="..\..\..\..\..\dev\NopCommerce3.30\Libraries\Nop.Services\Nop.Services.csproj">
<Project>{210541ad-f659-47da-8763-16f36c5cd2f4}</Project>
<Name>Nop.Services</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\dev\NopCommerce3.20\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj">
<ProjectReference Include="..\..\..\..\..\dev\NopCommerce3.30\Presentation\Nop.Web.Framework\Nop.Web.Framework.csproj">
<Project>{75fd4163-333c-4dd5-854d-2ef294e45d94}</Project>
<Name>Nop.Web.Framework</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\..\..\..\dev\NopCommerce3.20\Presentation\Nop.Web\Nop.Web.csproj">
<ProjectReference Include="..\..\..\..\..\dev\NopCommerce3.30\Presentation\Nop.Web\Nop.Web.csproj">
<Project>{4f1f649c-1020-45be-a487-f416d9297ff3}</Project>
<Name>Nop.Web</Name>
</ProjectReference>
Expand Down
4 changes: 2 additions & 2 deletions Properties/Settings.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f0bb835

Please sign in to comment.