diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
index 296f6fb9..eda2703f 100644
--- 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
index 2404175d..0973de6f 100644
--- 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
index 453e469a..7192beef 100644
--- a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
+++ b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
@@ -70,16 +70,16 @@
-
- ..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll
+
+ ..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll
True
-
- ..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll
+
+ ..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll
True
-
- ..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll
+
+ ..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll
True
diff --git a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec
index 304d5a18..68107a88 100644
--- a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec
+++ b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.nuspec
@@ -2,7 +2,7 @@
$id$
- 2.13.2
+ 2.14.0
$title$
VirtoCommerce
VirtoCommerce
diff --git a/VirtoCommerce.OrderModule.Data/packages.config b/VirtoCommerce.OrderModule.Data/packages.config
index ce9c413d..8bbf84b3 100644
--- a/VirtoCommerce.OrderModule.Data/packages.config
+++ b/VirtoCommerce.OrderModule.Data/packages.config
@@ -6,7 +6,7 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj b/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
index 0da06653..f18ec98c 100644
--- a/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
+++ b/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
@@ -94,16 +94,16 @@
..\packages\VirtoCommerce.CoreModule.Data.2.18.0\lib\net451\VirtoCommerce.CoreModule.Data.dll
True
-
- ..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll
+
+ ..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll
True
-
- ..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll
+
+ ..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll
True
-
- ..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll
+
+ ..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll
True
diff --git a/VirtoCommerce.OrderModule.Test/packages.config b/VirtoCommerce.OrderModule.Test/packages.config
index 7cf8730a..791aea54 100644
--- a/VirtoCommerce.OrderModule.Test/packages.config
+++ b/VirtoCommerce.OrderModule.Test/packages.config
@@ -11,9 +11,9 @@
-
-
-
+
+
+
diff --git a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
index 61f76260..2f49f0de 100644
--- a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
+++ b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
@@ -129,20 +129,20 @@
..\packages\VirtoCommerce.CoreModule.Data.2.18.0\lib\net451\VirtoCommerce.CoreModule.Data.dll
True
-
- ..\packages\VirtoCommerce.Domain.2.19.3-rc4\lib\net451\VirtoCommerce.Domain.dll
+
+ ..\packages\VirtoCommerce.Domain.2.19.3\lib\net451\VirtoCommerce.Domain.dll
True
-
- ..\packages\VirtoCommerce.Platform.Core.2.12.4\lib\net461\VirtoCommerce.Platform.Core.dll
+
+ ..\packages\VirtoCommerce.Platform.Core.2.12.6\lib\net461\VirtoCommerce.Platform.Core.dll
True
-
- ..\packages\VirtoCommerce.Platform.Core.Web.2.12.4\lib\net461\VirtoCommerce.Platform.Core.Web.dll
+
+ ..\packages\VirtoCommerce.Platform.Core.Web.2.12.5\lib\net461\VirtoCommerce.Platform.Core.Web.dll
True
-
- ..\packages\VirtoCommerce.Platform.Data.2.12.4\lib\net461\VirtoCommerce.Platform.Data.dll
+
+ ..\packages\VirtoCommerce.Platform.Data.2.12.5\lib\net461\VirtoCommerce.Platform.Data.dll
True
diff --git a/VirtoCommerce.OrderModule.Web/module.manifest b/VirtoCommerce.OrderModule.Web/module.manifest
index 13134a9e..5ff0d9f1 100644
--- a/VirtoCommerce.OrderModule.Web/module.manifest
+++ b/VirtoCommerce.OrderModule.Web/module.manifest
@@ -1,8 +1,8 @@
VirtoCommerce.Orders
- 2.13.2
- 2.12.2
+ 2.14.0
+ 2.12.4
diff --git a/VirtoCommerce.OrderModule.Web/packages.config b/VirtoCommerce.OrderModule.Web/packages.config
index 35cdcd4c..0abb3608 100644
--- a/VirtoCommerce.OrderModule.Web/packages.config
+++ b/VirtoCommerce.OrderModule.Web/packages.config
@@ -13,9 +13,9 @@
-
+
-
-
-
+
+
+
\ No newline at end of file