[publish] 2.14.0

VirtoCommerce · Jan 12, 2017 · edc99b4 · edc99b4
1 parent 6f848a8
commit edc99b4
Show file tree

Hide file tree

Showing 10 changed files with 36 additions and 36 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -15,8 +15,8 @@
 [assembly: AssemblyProduct("Virto Commerce Order Module")]
 [assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2016")]
 
-[assembly: AssemblyFileVersion("2.13.2.0")]
-[assembly: AssemblyVersion("2.13.2.0")]
+[assembly: AssemblyFileVersion("2.14.0.0")]
+[assembly: AssemblyVersion("2.14.0.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]

diff --git a/VirtoCommerce.OrderModule.Data/Model/PaymentInEntity.cs b/VirtoCommerce.OrderModule.Data/Model/PaymentInEntity.cs
@@ -109,7 +109,7 @@ public override OperationEntity FromModel(OrderOperation operation, PrimaryKeyRe
 
             if(payment.PaymentMethod != null)
             {
-                this.GatewayCode = payment.PaymentMethod.Code;
+                this.GatewayCode = payment.PaymentMethod != null ? payment.PaymentMethod.Code : payment.GatewayCode;
             }
             if (payment.BillingAddress != null)
             {

diff --git a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
@@ -70,16 +70,16 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="VirtoCommerce.Domain, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec
@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>$id$</id>
-        <version>2.13.2</version>
+        <version>2.14.0</version>
         <title>$title$</title>
         <authors>VirtoCommerce</authors>
         <owners>VirtoCommerce</owners>

diff --git a/VirtoCommerce.OrderModule.Data/packages.config b/VirtoCommerce.OrderModule.Data/packages.config
@@ -6,7 +6,7 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net451" />
-  <package id="VirtoCommerce.Domain" version="2.19.3-rc4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core" version="2.12.4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.12.4" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.19.3" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.12.5" targetFramework="net461" />
 </packages>
diff --git a/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj b/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
@@ -94,16 +94,16 @@
       <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.18.0\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Domain, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="VirtoCommerce.Platform.Testing, Version=2.11.2.0, Culture=neutral, processorArchitecture=MSIL">

diff --git a/VirtoCommerce.OrderModule.Test/packages.config b/VirtoCommerce.OrderModule.Test/packages.config
@@ -11,9 +11,9 @@
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net451" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net451" />
   <package id="VirtoCommerce.CoreModule.Data" version="2.18.0" targetFramework="net451" />
-  <package id="VirtoCommerce.Domain" version="2.19.3-rc4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core" version="2.12.4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.12.4" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.19.3" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.12.5" targetFramework="net461" />
   <package id="VirtoCommerce.Platform.Testing" version="2.11.2" targetFramework="net451" />
   <package id="xunit" version="2.1.0" targetFramework="net451" />
   <package id="xunit.abstractions" version="2.0.0" targetFramework="net451" />

diff --git a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
@@ -129,20 +129,20 @@
       <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.18.0\lib\net451\VirtoCommerce.CoreModule.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Domain, Version=2.19.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.19.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.12.4\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.12.5\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.12.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/VirtoCommerce.OrderModule.Web/module.manifest b/VirtoCommerce.OrderModule.Web/module.manifest
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <module>
     <id>VirtoCommerce.Orders</id>
-    <version>2.13.2</version>
-    <platformVersion>2.12.2</platformVersion>
+    <version>2.14.0</version>
+    <platformVersion>2.12.4</platformVersion>
     <dependencies>
         <dependency id="VirtoCommerce.Core" version="2.18.0" />
         <dependency id="VirtoCommerce.Catalog" version="2.12.0" />

diff --git a/VirtoCommerce.OrderModule.Web/packages.config b/VirtoCommerce.OrderModule.Web/packages.config
@@ -13,9 +13,9 @@
   <package id="Unity" version="4.0.1" targetFramework="net451" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net451" />
   <package id="VirtoCommerce.CoreModule.Data" version="2.18.0" targetFramework="net451" />
-  <package id="VirtoCommerce.Domain" version="2.19.3-rc4" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.19.3" targetFramework="net461" />
   <package id="VirtoCommerce.Module" version="0.10.0" targetFramework="net451" developmentDependency="true" />
-  <package id="VirtoCommerce.Platform.Core" version="2.12.4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core.Web" version="2.12.4" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.12.4" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.12.6" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core.Web" version="2.12.5" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.12.5" targetFramework="net461" />
 </packages>