Merge branch 'release/3.832.0'

VirtoCommerce · Oct 24, 2024 · cd54776 · cd54776
2 parents 133d57c + 3e03a7d
commit cd54776
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 <Project>
   <!-- These properties will be shared for all projects -->
   <PropertyGroup>
-    <VersionPrefix>3.831.0</VersionPrefix>
+    <VersionPrefix>3.832.0</VersionPrefix>
     <VersionSuffix>
     </VersionSuffix>
     <VersionSuffix Condition=" '$(VersionSuffix)' != '' AND '$(BuildNumber)' != '' ">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>

diff --git a/src/VirtoCommerce.OrdersModule.Core/Model/Search/CustomerOrderSearchCriteria.cs b/src/VirtoCommerce.OrdersModule.Core/Model/Search/CustomerOrderSearchCriteria.cs
@@ -84,5 +84,10 @@ public string[] OrganizationIds
                 _organizationIds = value;
             }
         }
+
+        /// <summary>
+        /// Search orders with a certain product
+        /// </summary>
+        public string ProductId { get; set; }
     }
 }
diff --git a/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderSearchService.cs b/src/VirtoCommerce.OrdersModule.Data/Services/CustomerOrderSearchService.cs
@@ -71,6 +71,11 @@ protected override IQueryable<CustomerOrderEntity> BuildQuery(IRepository reposi
 
             query = WithSubscriptionConditions(query, criteria);
 
+            if (!string.IsNullOrEmpty(criteria.ProductId))
+            {
+                query = query.Where(o => o.Items.Any(i => i.ProductId == criteria.ProductId));
+            }
+
             return query;
         }
 

diff --git a/src/VirtoCommerce.OrdersModule.Web/module.manifest b/src/VirtoCommerce.OrdersModule.Web/module.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
   <id>VirtoCommerce.Orders</id>
-  <version>3.831.0</version>
+  <version>3.832.0</version>
   <version-tag />
 
   <platformVersion>3.853.0</platformVersion>