From 3c4ff373e0ff97fb2f4a30dc3a3a948b99642e7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branko=20Peji=C4=87?= <pejic@checkmybus.com>
Date: Fri, 11 Apr 2025 17:30:21 +0200
Subject: [PATCH] Add sorting by in stock (#7661)

---
 src/Libraries/Nop.Core/Domain/Catalog/ProductSortingEnum.cs  | 5 +++++
 src/Libraries/Nop.Services/Catalog/ProductExtensions.cs      | 3 +++
 .../Nop.Web/Views/Catalog/_CatalogSelectors.cshtml           | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/Libraries/Nop.Core/Domain/Catalog/ProductSortingEnum.cs b/src/Libraries/Nop.Core/Domain/Catalog/ProductSortingEnum.cs
index ae7927a756b..0c0ab02a6f5 100644
--- a/src/Libraries/Nop.Core/Domain/Catalog/ProductSortingEnum.cs
+++ b/src/Libraries/Nop.Core/Domain/Catalog/ProductSortingEnum.cs
@@ -34,4 +34,9 @@ public enum ProductSortingEnum
     /// Product creation date
     /// </summary>
     CreatedOn = 15,
+
+    /// <summary>
+    /// Product in stock
+    /// </summary>
+    InStock = 16,
 }
\ No newline at end of file
diff --git a/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs b/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs
index 14457df99b2..8546156c1b7 100644
--- a/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs
+++ b/src/Libraries/Nop.Services/Catalog/ProductExtensions.cs
@@ -65,6 +65,9 @@ orderby item.sortName descending
             ProductSortingEnum.PriceDesc => productsQuery.OrderByDescending(p => p.Price),
             ProductSortingEnum.CreatedOn => productsQuery.OrderByDescending(p => p.CreatedOnUtc),
             ProductSortingEnum.Position when productsQuery is IOrderedQueryable => productsQuery,
+            ProductSortingEnum.InStock =>  productsQuery
+                .OrderByDescending(p => p.StockQuantity > 0)
+                .ThenByDescending(p => p.UpdatedOnUtc),
             _ => productsQuery.OrderBy(p => p.DisplayOrder).ThenBy(p => p.Id)
         };
     }
diff --git a/src/Presentation/Nop.Web/Views/Catalog/_CatalogSelectors.cshtml b/src/Presentation/Nop.Web/Views/Catalog/_CatalogSelectors.cshtml
index 1d7d4818f49..a92ed4bbb59 100644
--- a/src/Presentation/Nop.Web/Views/Catalog/_CatalogSelectors.cshtml
+++ b/src/Presentation/Nop.Web/Views/Catalog/_CatalogSelectors.cshtml
@@ -53,7 +53,7 @@
         </div>
         <script asp-location="Footer">
             $(function() {
-                var $orderByEl = $('#products-orderby');
+                const $orderByEl = $('#products-orderby');
                 $orderByEl.on('change', function () {
                     CatalogProducts.getProducts();
                 });