From 7efbbe45bf899e4d12fa6e1d264dc04b03932d73 Mon Sep 17 00:00:00 2001
From: Michael Jones <acetousk@gmail.com>
Date: Wed, 12 Jan 2022 22:47:48 -0700
Subject: [PATCH] Fix REST API for
 popstore.ProductServices.get#SortedProductList

---
 service/popstore/ProductServices.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/service/popstore/ProductServices.xml b/service/popstore/ProductServices.xml
index e032b412..e0d5925e 100755
--- a/service/popstore/ProductServices.xml
+++ b/service/popstore/ProductServices.xml
@@ -291,12 +291,22 @@ along with this software (see the LICENSE.md file). If not, see
             </if>
 
             <!-- default sorting -->
-            <entity-find entity-name="ProductCategoryMemberProduct" list="productList">
-                <econdition field-name="productCategoryId"/>
-                <date-filter/>
-                <date-filter thru-field-name="salesDiscontinuationDate"/>
-                <order-by field-name="sequenceNum,productName"/>
-            </entity-find>
+            <if condition="productCategoryId">
+                <then>
+                    <entity-find entity-name="ProductCategoryMemberProduct" list="productList">
+                        <econdition field-name="productCategoryId"/>
+                        <date-filter/>
+                        <date-filter thru-field-name="salesDiscontinuationDate"/>
+                        <order-by field-name="sequenceNum,productName"/>
+                    </entity-find>
+                </then><else>
+                    <entity-find entity-name="ProductCategoryMemberProduct" list="productList">
+                        <date-filter/>
+                        <date-filter thru-field-name="salesDiscontinuationDate"/>
+                        <order-by field-name="sequenceNum,productName"/>
+                    </entity-find>
+                </else>
+            </if>
             <if condition="orderBy=='default'">
                 <script>ec.web.sessionAttributes.remove('defaultSorting')</script>
             </if>