From 55fcccd1110e13bcc7f11b95e81271ca4ad12b3a Mon Sep 17 00:00:00 2001
From: Eugeny Tatarincev <et@virtoway.com>
Date: Sat, 23 Jun 2018 10:04:51 +0200
Subject: [PATCH] 2.17.14

---
 CommonAssemblyInfo.cs                                 |  4 ++--
 .../Controllers/Api/OrderModuleController.cs          | 11 ++++++-----
 VirtoCommerce.OrderModule.Web/module.manifest         |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
index a6bf2f3e..5a2d408d 100644
--- a/CommonAssemblyInfo.cs
+++ b/CommonAssemblyInfo.cs
@@ -15,8 +15,8 @@
 [assembly: AssemblyProduct("Virto Commerce Order Module")]
 [assembly: AssemblyCopyright("Copyright © VirtoCommerce 2011-2018")]
 
-[assembly: AssemblyFileVersion("2.17.13.0")]
-[assembly: AssemblyVersion("2.17.13.0")]
+[assembly: AssemblyFileVersion("2.17.14.0")]
+[assembly: AssemblyVersion("2.17.14.0")]
 
 #if DEBUG
 [assembly: AssemblyConfiguration("Debug")]
diff --git a/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs b/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs
index e4a0eecd..1acce737 100644
--- a/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs
+++ b/VirtoCommerce.OrderModule.Web/Controllers/Api/OrderModuleController.cs
@@ -98,14 +98,15 @@ public IHttpActionResult Search(CustomerOrderSearchCriteria criteria)
         /// </summary>
         /// <remarks>Return a single customer order with all nested documents or null if order was not found</remarks>
         /// <param name="number">customer order number</param>
+        /// <param name="respGroup"></param>
         [HttpGet]
         [Route("number/{number}")]
         [ResponseType(typeof(CustomerOrder))]
-        public IHttpActionResult GetByNumber(string number)
+        public IHttpActionResult GetByNumber(string number, [FromUri] string respGroup = null)
         {
             var searchCriteria = AbstractTypeFactory<CustomerOrderSearchCriteria>.TryCreateInstance();
             searchCriteria.Number = number;
-            searchCriteria.ResponseGroup = CustomerOrderResponseGroup.Full.ToString();
+            searchCriteria.ResponseGroup = respGroup;
 
             var result = _searchService.SearchCustomerOrders(searchCriteria);
 
@@ -129,13 +130,13 @@ public IHttpActionResult GetByNumber(string number)
         /// </summary>
         /// <remarks>Return a single customer order with all nested documents or null if order was not found</remarks>
         /// <param name="id">customer order id</param>
-        /// <param name="responseGroup"></param>
+        /// <param name="respGroup"></param>
         [HttpGet]
         [Route("{id}")]
         [ResponseType(typeof(CustomerOrder))]
-        public IHttpActionResult GetById(string id, string responseGroup = null)
+        public IHttpActionResult GetById(string id, [FromUri] string respGroup = null)
         {
-            var retVal = _customerOrderService.GetByIds(new[] { id }, responseGroup ?? CustomerOrderResponseGroup.Full.ToString()).FirstOrDefault();
+            var retVal = _customerOrderService.GetByIds(new[] { id }, respGroup).FirstOrDefault();
             if (retVal == null)
             {
                 return NotFound();
diff --git a/VirtoCommerce.OrderModule.Web/module.manifest b/VirtoCommerce.OrderModule.Web/module.manifest
index 457a0ab0..1124b03b 100644
--- a/VirtoCommerce.OrderModule.Web/module.manifest
+++ b/VirtoCommerce.OrderModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <module>
     <id>VirtoCommerce.Orders</id>
-    <version>2.17.13</version>
+    <version>2.17.14</version>
     <platformVersion>2.13.24</platformVersion>
     <dependencies>
         <dependency id="VirtoCommerce.Core" version="2.25.1" />