From 973ba012940a301252a28fc778d623e5abf6f6fe Mon Sep 17 00:00:00 2001
From: Eugeny Tatarincev <et@virtoway.com>
Date: Thu, 15 Feb 2018 13:55:24 +0200
Subject: [PATCH] 2.17.6

---
 CommonAssemblyInfo.cs                         |  4 ++--
 .../Services/CustomerOrderServiceImpl.cs      |  5 +++++
 .../VirtoCommerce.OrderModule.Data.csproj     | 12 +++++------
 .../packages.config                           |  6 +++---
 .../VirtoCommerce.OrderModule.Test.csproj     | 16 +++++++--------
 .../packages.config                           |  8 ++++----
 .../VirtoCommerce.OrderModule.Web.csproj      | 20 +++++++++----------
 VirtoCommerce.OrderModule.Web/module.manifest |  6 +++---
 VirtoCommerce.OrderModule.Web/packages.config | 10 +++++-----
 9 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
index 89889958..08834ea8 100644
--- a/CommonAssemblyInfo.cs
+++ b/CommonAssemblyInfo.cs
@@ -15,8 +15,8 @@
 [assembly: AssemblyProduct("Virto Commerce Order Module")]
 [assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2017")]
 
-[assembly: AssemblyFileVersion("2.17.5.0")]
-[assembly: AssemblyVersion("2.17.5.0")]
+[assembly: AssemblyFileVersion("2.17.6.0")]
+[assembly: AssemblyVersion("2.17.6.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]
diff --git a/VirtoCommerce.OrderModule.Data/Services/CustomerOrderServiceImpl.cs b/VirtoCommerce.OrderModule.Data/Services/CustomerOrderServiceImpl.cs
index 0a6deb46..b1b7a231 100644
--- a/VirtoCommerce.OrderModule.Data/Services/CustomerOrderServiceImpl.cs
+++ b/VirtoCommerce.OrderModule.Data/Services/CustomerOrderServiceImpl.cs
@@ -143,6 +143,11 @@ public virtual CustomerOrder[] GetByIds(string[] orderIds, string responseGroup
                                 }
                             }
                         }
+                        //Calculate totals only for full responseGroup
+                        if (orderResponseGroup == CustomerOrderResponseGroup.Full)
+                        {
+                            TotalsCalculator.CalculateTotals(customerOrder);
+                        }
                         retVal.Add(customerOrder);
                     }
                 }
diff --git a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
index c78f3250..a0fb0fcd 100644
--- a/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
+++ b/VirtoCommerce.OrderModule.Data/VirtoCommerce.OrderModule.Data.csproj
@@ -68,14 +68,14 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="VirtoCommerce.Domain, Version=2.24.24.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.24.24\lib\net461\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.24.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.24.27\lib\net461\VirtoCommerce.Domain.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.17.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.17\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.21\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.15\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.21\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/VirtoCommerce.OrderModule.Data/packages.config b/VirtoCommerce.OrderModule.Data/packages.config
index 8d874506..b2006831 100644
--- a/VirtoCommerce.OrderModule.Data/packages.config
+++ b/VirtoCommerce.OrderModule.Data/packages.config
@@ -7,7 +7,7 @@
   <package id="EntityFramework" version="6.1.3" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net461" />
-  <package id="VirtoCommerce.Domain" version="2.24.24" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core" version="2.13.17" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.13.15" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.24.27" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.13.21" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.13.21" targetFramework="net461" />
 </packages>
\ 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 68a35c1e..ccfacbed 100644
--- a/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
+++ b/VirtoCommerce.OrderModule.Test/VirtoCommerce.OrderModule.Test.csproj
@@ -85,17 +85,17 @@
     <Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.CoreModule.Data, Version=2.24.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.24.11\lib\net461\VirtoCommerce.CoreModule.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.CoreModule.Data, Version=2.24.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.24.27\lib\net461\VirtoCommerce.CoreModule.Data.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Domain, Version=2.24.24.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.24.24\lib\net461\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.24.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.24.27\lib\net461\VirtoCommerce.Domain.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.17.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.17\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.21\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.15\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.21\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
     </Reference>
     <Reference Include="VirtoCommerce.Platform.Testing, Version=2.13.14.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\VirtoCommerce.Platform.Testing.2.13.14\lib\net461\VirtoCommerce.Platform.Testing.dll</HintPath>
diff --git a/VirtoCommerce.OrderModule.Test/packages.config b/VirtoCommerce.OrderModule.Test/packages.config
index 96e64e5a..cbb0950a 100644
--- a/VirtoCommerce.OrderModule.Test/packages.config
+++ b/VirtoCommerce.OrderModule.Test/packages.config
@@ -11,10 +11,10 @@
   <package id="Moq" version="4.7.99" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net461" />
-  <package id="VirtoCommerce.CoreModule.Data" version="2.24.11" targetFramework="net461" />
-  <package id="VirtoCommerce.Domain" version="2.24.24" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core" version="2.13.17" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.13.15" targetFramework="net461" />
+  <package id="VirtoCommerce.CoreModule.Data" version="2.24.27" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.24.27" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.13.21" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.13.21" targetFramework="net461" />
   <package id="VirtoCommerce.Platform.Testing" version="2.13.14" targetFramework="net461" />
   <package id="xunit" version="2.2.0" targetFramework="net461" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net461" />
diff --git a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
index ae8b8b46..a17ed586 100644
--- a/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
+++ b/VirtoCommerce.OrderModule.Web/VirtoCommerce.OrderModule.Web.csproj
@@ -128,20 +128,20 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="VirtoCommerce.CoreModule.Data, Version=2.24.11.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.24.11\lib\net461\VirtoCommerce.CoreModule.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.CoreModule.Data, Version=2.24.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.CoreModule.Data.2.24.27\lib\net461\VirtoCommerce.CoreModule.Data.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Domain, Version=2.24.24.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Domain.2.24.24\lib\net461\VirtoCommerce.Domain.dll</HintPath>
+    <Reference Include="VirtoCommerce.Domain, Version=2.24.27.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Domain.2.24.27\lib\net461\VirtoCommerce.Domain.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.17.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.17\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.2.13.21\lib\net461\VirtoCommerce.Platform.Core.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.13.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.13.15\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Core.Web, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Core.Web.2.13.21\lib\net461\VirtoCommerce.Platform.Core.Web.dll</HintPath>
     </Reference>
-    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.15.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.15\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
+    <Reference Include="VirtoCommerce.Platform.Data, Version=2.13.21.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\VirtoCommerce.Platform.Data.2.13.21\lib\net461\VirtoCommerce.Platform.Data.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/VirtoCommerce.OrderModule.Web/module.manifest b/VirtoCommerce.OrderModule.Web/module.manifest
index 60a816c9..4c05311c 100644
--- a/VirtoCommerce.OrderModule.Web/module.manifest
+++ b/VirtoCommerce.OrderModule.Web/module.manifest
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <module>
     <id>VirtoCommerce.Orders</id>
-    <version>2.17.5</version>
-    <platformVersion>2.13.15</platformVersion>
+    <version>2.17.6</version>
+    <platformVersion>2.13.21</platformVersion>
     <dependencies>
-        <dependency id="VirtoCommerce.Core" version="2.24.11" />
+        <dependency id="VirtoCommerce.Core" version="2.24.27" />
         <dependency id="VirtoCommerce.Catalog" version="2.12.0" />
         <dependency id="VirtoCommerce.Pricing" version="2.11.0" />
         <dependency id="VirtoCommerce.Customer" version="2.11.0" />
diff --git a/VirtoCommerce.OrderModule.Web/packages.config b/VirtoCommerce.OrderModule.Web/packages.config
index cb6e0fc6..b28f3420 100644
--- a/VirtoCommerce.OrderModule.Web/packages.config
+++ b/VirtoCommerce.OrderModule.Web/packages.config
@@ -17,10 +17,10 @@
   <package id="PDFsharp" version="1.32.3057.0" targetFramework="net461" />
   <package id="Unity" version="4.0.1" targetFramework="net461" />
   <package id="valueinjecter" version="2.3.3" targetFramework="net461" />
-  <package id="VirtoCommerce.CoreModule.Data" version="2.24.11" targetFramework="net461" />
-  <package id="VirtoCommerce.Domain" version="2.24.24" targetFramework="net461" />
+  <package id="VirtoCommerce.CoreModule.Data" version="2.24.27" targetFramework="net461" />
+  <package id="VirtoCommerce.Domain" version="2.24.27" targetFramework="net461" />
   <package id="VirtoCommerce.Module" version="0.17.0" targetFramework="net461" developmentDependency="true" />
-  <package id="VirtoCommerce.Platform.Core" version="2.13.17" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Core.Web" version="2.13.15" targetFramework="net461" />
-  <package id="VirtoCommerce.Platform.Data" version="2.13.15" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core" version="2.13.21" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Core.Web" version="2.13.21" targetFramework="net461" />
+  <package id="VirtoCommerce.Platform.Data" version="2.13.21" targetFramework="net461" />
 </packages>
\ No newline at end of file